objection - npm Package Compare versions

Comparing version 0.5.0 to 0.5.1

lib/model/Model.js

@@ -377,3 +377,3 @@ 'use strict';
    * @param {ModelOptions} opt
-   * @param {Object} queryContext
+   * @param {QueryBuilderContext} queryContext
    * @returns {Promise|*}
@@ -387,3 +387,3 @@ */
    * @param {ModelOptions} opt
-   * @param {Object} queryContext
+   * @param {QueryBuilderContext} queryContext
    * @returns {Promise|*}
@@ -396,2 +396,10 @@ */
   /**
+   * @param {QueryBuilderContext} queryContext
+   * @returns {Promise|*}
+   */
+
+
+  Model.prototype.$afterGet = function $afterGet(queryContext) {};
+
+  /**
    * @returns {QueryBuilder}
@@ -398,0 +406,0 @@ */

lib/queryBuilder/operations/InstanceFindOperation.js

@@ -20,10 +20,10 @@ 'use strict';
 
-var _QueryBuilderOperation = require('./QueryBuilderOperation');
+var _FindOperation2 = require('./FindOperation');
 
-var _QueryBuilderOperation2 = _interopRequireDefault(_QueryBuilderOperation);
+var _FindOperation3 = _interopRequireDefault(_FindOperation2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var InstanceFindOperation = function (_QueryBuilderOperatio) {
-  (0, _inherits3.default)(InstanceFindOperation, _QueryBuilderOperatio);
+var InstanceFindOperation = function (_FindOperation) {
+  (0, _inherits3.default)(InstanceFindOperation, _FindOperation);
 
@@ -33,3 +33,3 @@ function InstanceFindOperation(builder, name, opt) {
 
-    var _this = (0, _possibleConstructorReturn3.default)(this, _QueryBuilderOperatio.call(this, builder, name, opt));
+    var _this = (0, _possibleConstructorReturn3.default)(this, _FindOperation.call(this, builder, name, opt));
 
@@ -45,4 +45,4 @@ _this.instance = opt.instance;
   return InstanceFindOperation;
-}(_QueryBuilderOperation2.default);
+}(_FindOperation3.default);
 
 exports.default = InstanceFindOperation;

lib/queryBuilder/QueryBuilder.js

@@ -66,2 +66,6 @@ 'use strict';
 
+var _FindOperation = require('./operations/FindOperation');
+
+var _FindOperation2 = _interopRequireDefault(_FindOperation);
+
 var _DeleteOperation = require('./operations/DeleteOperation');
@@ -161,3 +165,3 @@
     _this._findOperationFactory = function (builder) {
-      return new _QueryBuilderOperation2.default(builder, 'find');
+      return new _FindOperation2.default(builder, 'find');
     };
@@ -767,3 +771,5 @@ _this._insertOperationFactory = function (builder) {
   QueryBuilder.prototype._callFindOperation = function _callFindOperation() {
-    this.callQueryBuilderOperation(this._findOperationFactory(this), []);
+    if (!this.has(_FindOperation2.default)) {
+      this.callQueryBuilderOperation(this._findOperationFactory(this), [], /* pushFront = */true);
+    }
   };
@@ -770,0 +776,0 @@

lib/queryBuilder/QueryBuilderBase.js

@@ -253,3 +253,3 @@ 'use strict';
   /**
-   * @param {RegExp} methodNameRegex
+   * @param {RegExp|Constructor.<? extends QueryBuilderOperation>} operationSelector
    * @returns {boolean}
@@ -259,6 +259,12 @@ */
 
-  QueryBuilderBase.prototype.has = function has(methodNameRegex) {
-    return _lodash2.default.some(this._operations, function (method) {
-      return methodNameRegex.test(method.name);
-    });
+  QueryBuilderBase.prototype.has = function has(operationSelector) {
+    if (_lodash2.default.isRegExp(operationSelector)) {
+      return _lodash2.default.some(this._operations, function (operation) {
+        return operationSelector.test(operation.name);
+      });
+    } else {
+      return _lodash2.default.some(this._operations, function (operation) {
+        return operation instanceof operationSelector;
+      });
+    }
   };
@@ -269,2 +275,3 @@
    * @param {Array.<*>} args
+   * @param {Boolean=} pushFront
    * @returns {QueryBuilderBase}
@@ -274,5 +281,9 @@ */
 
-  QueryBuilderBase.prototype.callQueryBuilderOperation = function callQueryBuilderOperation(operation, args) {
+  QueryBuilderBase.prototype.callQueryBuilderOperation = function callQueryBuilderOperation(operation, args, pushFront) {
     if (operation.call(this, args || [])) {
-      this._operations.push(operation);
+      if (pushFront) {
+        this._operations.splice(0, 0, operation);
+      } else {
+        this._operations.push(operation);
+      }
     }
@@ -279,0 +290,0 @@

lib/relations/manyToMany/ManyToManyFindOperation.js

@@ -24,5 +24,5 @@ 'use strict';
 
-var _QueryBuilderOperation = require('../../queryBuilder/operations/QueryBuilderOperation');
+var _FindOperation2 = require('../../queryBuilder/operations/FindOperation');
 
-var _QueryBuilderOperation2 = _interopRequireDefault(_QueryBuilderOperation);
+var _FindOperation3 = _interopRequireDefault(_FindOperation2);
 
@@ -33,4 +33,4 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var ManyToManyFindOperation = function (_QueryBuilderOperatio) {
-  (0, _inherits3.default)(ManyToManyFindOperation, _QueryBuilderOperatio);
+var ManyToManyFindOperation = function (_FindOperation) {
+  (0, _inherits3.default)(ManyToManyFindOperation, _FindOperation);
 
@@ -40,3 +40,3 @@ function ManyToManyFindOperation(builder, name, opt) {
 
-    var _this = (0, _possibleConstructorReturn3.default)(this, _QueryBuilderOperatio.call(this, builder, name, opt));
+    var _this = (0, _possibleConstructorReturn3.default)(this, _FindOperation.call(this, builder, name, opt));
 
@@ -107,4 +107,4 @@ _this.relation = opt.relation;
   return ManyToManyFindOperation;
-}(_QueryBuilderOperation2.default);
+}(_FindOperation3.default);
 
 exports.default = ManyToManyFindOperation;

lib/relations/RelationFindOperation.js

@@ -24,10 +24,10 @@ 'use strict';
 
-var _QueryBuilderOperation = require('../queryBuilder/operations/QueryBuilderOperation');
+var _FindOperation2 = require('../queryBuilder/operations/FindOperation');
 
-var _QueryBuilderOperation2 = _interopRequireDefault(_QueryBuilderOperation);
+var _FindOperation3 = _interopRequireDefault(_FindOperation2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var RelationFindOperation = function (_QueryBuilderOperatio) {
-  (0, _inherits3.default)(RelationFindOperation, _QueryBuilderOperatio);
+var RelationFindOperation = function (_FindOperation) {
+  (0, _inherits3.default)(RelationFindOperation, _FindOperation);
 
@@ -37,3 +37,3 @@ function RelationFindOperation(builder, name, opt) {
 
-    var _this = (0, _possibleConstructorReturn3.default)(this, _QueryBuilderOperatio.call(this, builder, name, opt));
+    var _this = (0, _possibleConstructorReturn3.default)(this, _FindOperation.call(this, builder, name, opt));
 
@@ -61,4 +61,4 @@ _this.relation = opt.relation;
   return RelationFindOperation;
-}(_QueryBuilderOperation2.default);
+}(_FindOperation3.default);
 
 exports.default = RelationFindOperation;

lib/utils/promiseUtils.js

@@ -11,7 +11,5 @@ 'use strict';
 
-exports.containsPromise = containsPromise;
 exports.isPromise = isPromise;
 exports.after = after;
 exports.afterReturn = afterReturn;
-exports.afterAllReturn = afterAllReturn;
 exports.mapAfterAllReturn = mapAfterAllReturn;
@@ -25,12 +23,2 @@
 
-function containsPromise(arr) {
-  for (var i = 0, l = arr.length; i < l; ++i) {
-    if (isPromise(arr[i])) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
 function isPromise(obj) {
@@ -56,10 +44,2 @@ return obj && (typeof obj === 'undefined' ? 'undefined' : (0, _typeof3.default)(obj)) === 'object' && typeof obj.then === 'function';
 
-function afterAllReturn(arr, value) {
-  if (containsPromise(arr)) {
-    return _bluebird2.default.all(arr).return(value);
-  } else {
-    return value;
-  }
-}
-
 function mapAfterAllReturn(arr, mapper, returnValue) {
@@ -66,0 +46,0 @@ var results = new Array(arr.length);

package.json

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

src/model/Model.js

@@ -298,3 +298,3 @@ import _ from 'lodash';
    * @param {ModelOptions} opt
-   * @param {Object} queryContext
+   * @param {QueryBuilderContext} queryContext
    * @returns {Promise|*}
@@ -306,3 +306,3 @@ */
    * @param {ModelOptions} opt
-   * @param {Object} queryContext
+   * @param {QueryBuilderContext} queryContext
    * @returns {Promise|*}
@@ -313,2 +313,8 @@ */
   /**
+   * @param {QueryBuilderContext} queryContext
+   * @returns {Promise|*}
+   */
+  $afterGet(queryContext) {}
+
+  /**
    * @returns {QueryBuilder}
@@ -315,0 +321,0 @@ */

src/queryBuilder/operations/InstanceFindOperation.js

@@ -1,4 +0,4 @@
-import QueryBuilderOperation from './QueryBuilderOperation';
+import FindOperation from './FindOperation';
 
-export default class InstanceFindOperation extends QueryBuilderOperation {
+export default class InstanceFindOperation extends FindOperation {
 
@@ -5,0 +5,0 @@ constructor(builder, name, opt) {

src/queryBuilder/QueryBuilder.js

@@ -11,2 +11,3 @@ import _ from 'lodash';
 
+import FindOperation from './operations/FindOperation';
 import DeleteOperation from './operations/DeleteOperation';
@@ -40,3 +41,3 @@ import UpdateOperation from './operations/UpdateOperation';
 
-    this._findOperationFactory = builder => new QueryBuilderOperation(builder, 'find');
+    this._findOperationFactory = builder => new FindOperation(builder, 'find');
     this._insertOperationFactory = builder => new InsertOperation(builder, 'insert');
@@ -546,3 +547,5 @@ this._updateOperationFactory = builder => new UpdateOperation(builder, 'update');
   _callFindOperation() {
-    this.callQueryBuilderOperation(this._findOperationFactory(this), []);
+    if (!this.has(FindOperation)) {
+      this.callQueryBuilderOperation(this._findOperationFactory(this), [], /* pushFront = */ true);
+    }
   }
@@ -549,0 +552,0 @@

src/queryBuilder/QueryBuilderBase.js

@@ -148,9 +148,15 @@ import _ from 'lodash';
   /**
-   * @param {RegExp} methodNameRegex
+   * @param {RegExp|Constructor.<? extends QueryBuilderOperation>} operationSelector
    * @returns {boolean}
    */
-  has(methodNameRegex) {
-    return _.some(this._operations, method => {
-      return methodNameRegex.test(method.name);
-    });
+  has(operationSelector) {
+    if (_.isRegExp(operationSelector)) {
+      return _.some(this._operations, operation => {
+        return operationSelector.test(operation.name);
+      });
+    } else {
+      return _.some(this._operations, operation => {
+        return operation instanceof operationSelector;
+      });
+    }
   }
@@ -161,7 +167,12 @@
    * @param {Array.<*>} args
+   * @param {Boolean=} pushFront
    * @returns {QueryBuilderBase}
    */
-   callQueryBuilderOperation(operation, args) {
+   callQueryBuilderOperation(operation, args, pushFront) {
     if (operation.call(this, args || [])) {
-      this._operations.push(operation);
+      if (pushFront) {
+        this._operations.splice(0, 0, operation);
+      } else {
+        this._operations.push(operation);
+      }
     }
@@ -168,0 +179,0 @@

src/relations/manyToMany/ManyToManyFindOperation.js

 import _ from 'lodash';
-import QueryBuilderOperation from '../../queryBuilder/operations/QueryBuilderOperation';
+import FindOperation from '../../queryBuilder/operations/FindOperation';
 
 const ownerJoinColumnAliasPrefix = 'objectiontmpjoin';
 
-export default class ManyToManyFindOperation extends QueryBuilderOperation {
+export default class ManyToManyFindOperation extends FindOperation {
 
@@ -8,0 +8,0 @@ constructor(builder, name, opt) {

src/relations/RelationFindOperation.js

 import _ from 'lodash';
-import QueryBuilderOperation from '../queryBuilder/operations/QueryBuilderOperation';
+import FindOperation from '../queryBuilder/operations/FindOperation';
 
-export default class RelationFindOperation extends QueryBuilderOperation {
+export default class RelationFindOperation extends FindOperation {
 
@@ -6,0 +6,0 @@ constructor(builder, name, opt) {

src/utils/promiseUtils.js

 import Promise from 'bluebird';
 
-export function containsPromise(arr) {
-  for (let i = 0, l = arr.length; i < l; ++i) {
-    if (isPromise(arr[i])) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
 export function isPromise(obj) {
@@ -33,10 +23,2 @@ return obj && (typeof obj === 'object') && (typeof obj.then === 'function');
 
-export function afterAllReturn(arr, value) {
-  if (containsPromise(arr)) {
-    return Promise.all(arr).return(value);
-  } else {
-    return value;
-  }
-}
-
 export function mapAfterAllReturn(arr, mapper, returnValue) {
@@ -43,0 +25,0 @@ const results = new Array(arr.length);

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

637629

increased by0.53%

Number of package files

160

increased by1.27%

Lines of code

16824

increased by0.45%

No dependency changes