objection - npm Package Compare versions

Comparing version 2.1.1 to 2.1.2

lib/model/Model.js

@@ -63,30 +63,6 @@ 'use strict';
   $query(trx) {
-    const modelClass = this.constructor;
-
-    return modelClass
-      .query(trx)
-      .findOperationFactory(() => {
-        return new InstanceFindOperation('find', { instance: this });
-      })
-      .insertOperationFactory(() => {
-        return new InstanceInsertOperation('insert', { instance: this });
-      })
-      .updateOperationFactory(() => {
-        return new InstanceUpdateOperation('update', { instance: this });
-      })
-      .patchOperationFactory(() => {
-        return new InstanceUpdateOperation('patch', {
-          instance: this,
-          modelOptions: { patch: true }
-        });
-      })
-      .deleteOperationFactory(() => {
-        return new InstanceDeleteOperation('delete', { instance: this });
-      })
-      .relateOperationFactory(() => {
-        throw new Error('`relate` makes no sense in this context');
-      })
-      .unrelateOperationFactory(() => {
-        throw new Error('`unrelate` makes no sense in this context');
-      });
+    return instanceQuery({
+      instance: this,
+      transaction: trx
+    });
   }
@@ -804,7 +780,39 @@
 
+function instanceQuery({ instance, transaction }) {
+  const modelClass = instance.constructor;
+
+  return modelClass
+    .query(transaction)
+    .findOperationFactory(() => {
+      return new InstanceFindOperation('find', { instance });
+    })
+    .insertOperationFactory(() => {
+      return new InstanceInsertOperation('insert', { instance });
+    })
+    .updateOperationFactory(() => {
+      return new InstanceUpdateOperation('update', { instance });
+    })
+    .patchOperationFactory(() => {
+      return new InstanceUpdateOperation('patch', {
+        instance,
+        modelOptions: { patch: true }
+      });
+    })
+    .deleteOperationFactory(() => {
+      return new InstanceDeleteOperation('delete', { instance });
+    })
+    .relateOperationFactory(() => {
+      throw new Error('`relate` makes no sense in this context');
+    })
+    .unrelateOperationFactory(() => {
+      throw new Error('`unrelate` makes no sense in this context');
+    });
+}
+
 function relatedQuery({ modelClass, relationName, transaction, alwaysReturnArray } = {}) {
   const relation = modelClass.getRelation(relationName);
-  const RelatedModelClass = relation.relatedModelClass;
+  const relatedModelClass = relation.relatedModelClass;
 
-  return RelatedModelClass.query(transaction)
+  return relatedModelClass
+    .query(transaction)
     .findOperationFactory(builder => {
@@ -811,0 +819,0 @@ const isSubQuery = !builder.for();

package.json

 {
   "name": "objection",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "An SQL-friendly ORM for Node.js",
@@ -5,0 +5,0 @@ "main": "lib/objection.js",

typings/objection/index.d.ts

@@ -1437,3 +1437,3 @@ /// <reference types="node" />
     knexQuery(): knex.QueryBuilder;
-    startTransaction(knexOrTransaction?: TransactionOrKnex): Transaction;
+    startTransaction(knexOrTransaction?: TransactionOrKnex): Promise<Transaction>;
 
@@ -1568,3 +1568,3 @@ transaction<T>(callback: (trx: Transaction) => Promise<T>): Promise<T>;
     static knexQuery(): knex.QueryBuilder;
-    static startTransaction(knexOrTransaction?: TransactionOrKnex): Transaction;
+    static startTransaction(knexOrTransaction?: TransactionOrKnex): Promise<Transaction>;
 
@@ -1571,0 +1571,0 @@ static transaction<T>(callback: (trx: Transaction) => Promise<T>): Promise<T>;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

637440

increased by0.01%

Lines of code

19814

increased by0.04%

No dependency changes