ops

Author: bigmontz

packages/core/src/session.ts

@@ -448,9 +448,7 @@ class Session {
     return this._transactionExecutor.execute(
       () => this._beginTransaction(accessMode, transactionConfig),
       transactionWork,
-      tx => new ManagedTransaction({
-        run: tx.run.bind(tx),
-      })
+      ManagedTransaction.fromTransaction
     )
   }
 

packages/core/src/transaction-managed.ts

@@ -18,6 +18,7 @@
  */
 
 import Result from './result'
+import Transaction from './transaction'
 import { Query } from './types'
 
 interface Run {
@@ -32,13 +33,27 @@ interface Run {
 class ManagedTransaction {
   private _run: Run
 
-  constructor({ run }: { run: Run }) {
+  /**
+   * @private
+   */
+  private constructor({ run }: { run: Run }) {
     /**
      * @private
      */
     this._run = run
   }
 
+  /**
+   * @private
+   * @param {Transaction} tx - Transaction to wrap
+   * @returns {ManagedTransaction} the ManagedTransaction
+   */
+  static fromTransaction(tx: Transaction): ManagedTransaction {
+    return new ManagedTransaction({
+      run: tx.run.bind(tx)
+    })
+  }
+
   /**
    * Run Cypher query
    * Could be called with a query object i.e.: `{text: "MATCH ...", parameters: {param: 1}}`

packages/core/test/session.test.ts

@@ -317,6 +317,7 @@ describe('session', () => {
       expect(status.functionCalled).toEqual(true)
       expect(run).toHaveBeenCalledWith(query, params)
     })
+  })
 })
 
 function mockBeginWithSuccess(connection: FakeConnection) {

packages/neo4j-driver/src/transaction-managed-rx.js

@@ -16,17 +16,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import RxResult from './result-rx'
+import RxTransaction from './transaction-rx'
 
 /**
  * Represents a rx transaction that is managed by the transaction executor.
  * 
  * @public
  */
 class RxManagedTransaction {
+  /**
+   * @private
+   */
   constructor({ run }) {
     this._run = run
   }
 
+  /**
+   * @private
+   * @param {RxTransaction} txc - The transaction to be wrapped
+   * @returns {RxManagedTransaction} The managed transaction
+   */
+  static fromTransaction (txc) {
+    return new RxManagedTransaction({
+      run: txc.run.bind(txc)
+    })
+  }
+
   /**
    * Creates a reactive result that will execute the query in this transaction, with the provided parameters.
    *