objection 3.0.0-alpha.6 → 3.0.0-rc.4

package/lib/model/Model.js

@@ -4,8 +4,6 @@ const { clone } = require('./modelClone');
 const { bindKnex } = require('./modelBindKnex');
 const { validate } = require('./modelValidate');
 const { isMsSql } = require('../utils/knexUtils');
-const { deprecate } = require('../utils/deprecate');
-const { omit, pick } = require('./modelFilter');
 const { visitModels } = require('./modelVisitor');
 const { hasId, getSetId } = require('./modelId');
 const { map: promiseMap } = require('../utils/promiseUtils');
@@ -79,11 +77,6 @@ class Model {
     }).for(this);
   }
 
-  $loadRelated(relationExpression, modifiers, transaction) {
-    deprecate('$loadRelated is deprected and will be removed in 3.0. Use $fetchGraph instead');
-    return this.$fetchGraph(relationExpression, { transaction }).modifiers(modifiers);
-  }
-
   $fetchGraph(relationExpression, options) {
     return this.constructor.fetchGraph(this, relationExpression, options);
   }
@@ -179,7 +172,7 @@ class Model {
     // Do nothing by default.
   }
 
-  // TODO: Deprecate & remove in 3.0
+  // TODO: Deprecate & remove
   $afterGet(queryContext) {
     // Do nothing by default.
   }
@@ -196,16 +189,6 @@ class Model {
     // Do nothing by default.
   }
 
-  $omit(...args) {
-    deprecate('Model#$omit is deprected and will be removed in 3.0.');
-    return omit(this, args);
-  }
-
-  $pick(...args) {
-    deprecate('Model#$pick is deprected and will be removed in 3.0.');
-    return pick(this, args);
-  }
-
   $values(props) {
     return values(this, props);
   }
@@ -427,7 +410,7 @@ class Model {
   }
 
   static getModifiers() {
-    return this.modifiers || this.namedFilters || {};
+    return this.modifiers || {};
   }
 
   static columnNameToPropertyName(columnName) {
@@ -503,22 +486,14 @@ class Model {
   }
 
   static getDefaultGraphOptions() {
-    return this.defaultGraphOptions || this.defaultEagerOptions;
+    return this.defaultGraphOptions;
   }
 
   static getRelatedFindQueryMutates() {
-    if (this.relatedFindQueryMutates) {
-      deprecate('Model.relatedFindQueryMutates is deprected and will be removed in 3.0.');
-    }
-
     return this.relatedFindQueryMutates;
   }
 
   static getRelatedInsertQueryMutates() {
-    if (this.relatedInsertQueryMutates) {
-      deprecate('Model.relatedInsertQueryMutates is deprected and will be removed in 3.0.');
-    }
-
     return this.relatedInsertQueryMutates;
   }
 
@@ -662,11 +637,6 @@ class Model {
     return relation;
   }
 
-  static loadRelated(models, expression, modifiers, transaction) {
-    deprecate('loadRelated is deprected and will be removed in 3.0. Use fetchGraph instead');
-    return this.fetchGraph(models, expression, { transaction }).modifiers(modifiers);
-  }
-
   static fetchGraph($models, expression, options = {}) {
     return this.query(options.transaction)
       .resolve(this.ensureModelArray($models))
@@ -765,20 +735,12 @@ Model.virtualAttributes = null;
 Model.relationMappings = null;
 Model.modelPaths = [];
 Model.pickJsonSchemaProperties = false;
-// Deprecated.
-Model.defaultEagerAlgorithm = Model.WhereInEagerAlgorithm;
-// Deprecated.
-Model.defaultEagerOptions = Object.freeze({ minimize: false, separator: ':', aliases: {} });
 Model.defaultGraphOptions = null;
 Model.defaultFindOptions = Object.freeze({});
 Model.modifiers = null;
-// Deprecated.
-Model.namedFilters = null;
 Model.useLimitInFirst = false;
 Model.columnNameMappers = null;
-// Deprecated.
 Model.relatedFindQueryMutates = false;
-// Deprecated.
 Model.relatedInsertQueryMutates = false;
 Model.concurrency = null;
 

package/lib/model/modelClone.js

@@ -56,7 +56,13 @@ function cloneWithOpt(model, shallow, stripInternal) {
     const key = keys[i];
     const value = model[key];
 
-    if ((shallow && relationNames.includes(key)) || (stripInternal && isInternalProp(key))) {
+    if (shallow && relationNames.includes(key)) {
+      // The constructor may have given default values for relations.
+      delete clone[key];
+      continue;
+    }
+
+    if (stripInternal && isInternalProp(key)) {
       continue;
     }
 

package/lib/model/modelTableMetadata.js

@@ -52,6 +52,10 @@ function fetchTableMetadata(
 
         modelClass[TABLE_METADATA].set(table, metadata);
         return metadata;
+      })
+      .catch((err) => {
+        modelClass[TABLE_METADATA].delete(table);
+        throw err;
       });
 
     modelClass[TABLE_METADATA].set(table, promise);

package/lib/objection.js

@@ -29,9 +29,7 @@ const { ref } = require('./queryBuilder/ReferenceBuilder');
 const { val } = require('./queryBuilder/ValueBuilder');
 const { raw } = require('./queryBuilder/RawBuilder');
 const { fn } = require('./queryBuilder/FunctionBuilder');
-
 const { inherit } = require('../lib/utils/classUtils');
-const { deprecate } = require('../lib/utils/deprecate');
 
 // We need to wrap the classes, that people can inherit, with ES5 classes
 // so that babel is able to use ES5 inheritance. sigh... Maybe people
@@ -86,12 +84,6 @@ module.exports = {
   val,
   raw,
   fn,
-
-  get lit() {
-    deprecate('`lit` is deprecated. Use `val` instead. `lit` will be removed in 3.0');
-    return val;
-  },
-
   snakeCaseMappers,
   knexSnakeCaseMappers,
   knexIdentifierMapping,

package/lib/queryBuilder/QueryBuilder.js

@@ -3,7 +3,6 @@
 const { wrapError } = require('db-errors');
 
 const { raw } = require('./RawBuilder');
-const { deprecate } = require('../utils/deprecate');
 const { createModifier } = require('../utils/createModifier');
 const { ValidationErrorType } = require('../model/ValidationError');
 const { isObject, isString, isFunction, last, flatten } = require('../utils/objectUtils');
@@ -112,22 +111,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this.fullIdColumnFor(this.modelClass());
   }
 
-  applyModifier(...args) {
-    deprecate(
-      'applyModifier is deprecated. Use the modify method instead. applyModifier will be removed in objection 3.0'
-    );
-
-    return this.modify(flatten(args));
-  }
-
-  applyFilter(...args) {
-    deprecate(
-      'applyFilter is deprecated. Use the modify method instead. applyFilter will be removed in objection 3.0'
-    );
-
-    return this.modify(flatten(args));
-  }
-
   modifiers(modifiers) {
     if (arguments.length === 0) {
       return { ...this._modifiers };
@@ -224,102 +207,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  eagerAlgorithm(...args) {
-    deprecate(
-      '`QueryBuilder#eagerAlgorithm` method is deprecated. You should explicitly use either withGraphFetched or withGraphJoined methods. `eagerAlgoritm` method will be removed in 3.0'
-    );
-
-    return this._eagerAlgorithm(...args);
-  }
-
-  _eagerAlgorithm(algorithm, eagerOptions) {
-    ensureEagerOperation(this, algorithm);
-
-    if (eagerOptions) {
-      this._eagerOptions(eagerOptions);
-    }
-
-    return this;
-  }
-
-  eager(...args) {
-    deprecate(
-      '`QueryBuilder#eager` method is deprecated. You should use the `withGraphFetched` method instead. `eager` method will be removed in 3.0'
-    );
-
-    return this._eager(...args);
-  }
-
-  _eager(exp, modifiers) {
-    const eagerOp = ensureEagerOperation(this);
-
-    eagerOp.expression = parseRelationExpression(this.modelClass(), exp);
-    checkEager(this);
-
-    if (modifiers) {
-      this.clearModifiers().modifiers(modifiers);
-    }
-
-    return this;
-  }
-
-  joinEager(exp, modifiers) {
-    deprecate(
-      '`QueryBuilder#joinEager` method is deprecated. You should use the `withGraphJoined` method instead. `joinEager` method will be removed in 3.0'
-    );
-
-    return this._eagerAlgorithm(getJoinEagerAlgorithm(this))._eager(exp, modifiers);
-  }
-
-  naiveEager(exp, modifiers) {
-    deprecate(
-      '`QueryBuilder#naiveEager` method is deprecated. You should use the `withGraphFetched` method with the `maxBatchSize: 1` option instead. `naiveEager` method will be removed in 3.0'
-    );
-
-    return this._eagerAlgorithm(getNaiveEagerAlgorithm(this))._eager(exp, modifiers);
-  }
-
-  mergeEager(...args) {
-    deprecate(
-      '`QueryBuilder#mergeEager` method is deprecated. You should use the `withGraphFetched` method instead. `mergeEager` method will be removed in 3.0'
-    );
-
-    return this._mergeEager(...args);
-  }
-
-  _mergeEager(exp, modifiers) {
-    const eagerOp = ensureEagerOperation(this);
-
-    eagerOp.expression = eagerOp.expression.merge(parseRelationExpression(this.modelClass(), exp));
-    checkEager(this);
-
-    return this.modifiers(modifiers);
-  }
-
-  mergeJoinEager(exp, modifiers) {
-    deprecate(
-      '`QueryBuilder#mergeJoinEager` method is deprecated. You should use the `withGraphJoined` method instead. `mergeJoinEager` method will be removed in 3.0'
-    );
-
-    return this._eagerAlgorithm(this.modelClass().JoinEagerAlgorithm)._mergeEager(exp, modifiers);
-  }
-
-  mergeNaiveEager(exp, modifiers) {
-    deprecate(
-      '`QueryBuilder#mergeNaiveEager` method is deprecated. You should use the `withGraphFetched` method with the `maxBatchSize: 1` option instead. `mergeNaiveEager` method will be removed in 3.0'
-    );
-
-    return this._eagerAlgorithm(this.modelClass().NaiveEagerAlgorithm)._mergeEager(exp, modifiers);
-  }
-
-  allowEager(exp) {
-    deprecate(
-      '`QueryBuilder#allowEager` method is deprecated. You should use `allowGraph` instead. `allowEager` method will be removed in 3.0'
-    );
-
-    return this.clearAllowGraph().allowGraph(exp);
-  }
-
   allowGraph(exp) {
     const currentExpr = this._allowedGraphExpression || RelationExpression.create();
 
@@ -335,22 +222,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this._allowedGraphExpression;
   }
 
-  mergeAllowEager(exp) {
-    deprecate(
-      '`QueryBuilder#mergeAllowEager` method is deprecated. You should use `allowGraph` instead. `mergeAllowEager` method will be removed in 3.0'
-    );
-
-    return this.allowGraph(exp);
-  }
-
-  eagerObject() {
-    deprecate(
-      '`QueryBuilder#eagerObject` method is deprecated. You should use `graphExpressionObject` instead. `eagerObject` method will be removed in 3.0'
-    );
-
-    return this.graphExpressionObject();
-  }
-
   graphExpressionObject() {
     const eagerOp = this.findOperation(EagerOperation);
 
@@ -361,22 +232,6 @@ class QueryBuilder extends QueryBuilderBase {
     }
   }
 
-  eagerModifiers() {
-    deprecate(
-      '`QueryBuilder#eagerModifiers` method is deprecated. You should use `modifiers` instead. `eagerModifiers` method will be removed in 3.0'
-    );
-
-    return this.modifiers();
-  }
-
-  eagerModifiersAtPath() {
-    deprecate(
-      '`QueryBuilder#eagerModifiersAtPath` method is deprecated. You should use `graphModifiersAtPath` instead. `eagerModifiersAtPath` method will be removed in 3.0'
-    );
-
-    return this.graphModifiersAtPath();
-  }
-
   graphModifiersAtPath() {
     const eagerOp = this.findOperation(EagerOperation);
 
@@ -387,58 +242,12 @@ class QueryBuilder extends QueryBuilderBase {
     }
   }
 
-  modifyEager(...args) {
-    deprecate(
-      '`QueryBuilder#modifyEager` method is deprecated. You should use `modifyGraph` instead. `modifyEager` method will be removed in 3.0'
-    );
-
-    return this.modifyGraph(...args);
-  }
-
   modifyGraph(path, modifier) {
     const eagerOp = ensureEagerOperation(this);
     eagerOp.modifiersAtPath.push({ path, modifier });
     return this;
   }
 
-  filterEager(...args) {
-    deprecate(
-      '`QueryBuilder#filterEager` method is deprecated. You should use `modifyGraph` instead. `filterEager` method will be removed in 3.0'
-    );
-
-    return this.modifyGraph(...args);
-  }
-
-  allowUpsert(exp) {
-    deprecate(
-      '`QueryBuilder#allowUpsert` method is deprecated. You should use `allowGraph` instead. `allowUpsert` method will be removed in 3.0'
-    );
-
-    return this.clearAllowGraph().allowGraph(exp);
-  }
-
-  allowInsert(exp) {
-    deprecate(
-      '`QueryBuilder#allowInsert` method is deprecated. You should use `allowGraph` instead. `allowInsert` method will be removed in 3.0'
-    );
-
-    return this.clearAllowGraph().allowGraph(exp);
-  }
-
-  eagerOptions(...args) {
-    deprecate(
-      '`QueryBuilder#eagerOptions` method is deprecated. You should use `withGraphFetched` or `withGraphJoined` and pass options in the second argument. `eagerOptions` method will be removed in 3.0'
-    );
-
-    return this._eagerOptions(...args);
-  }
-
-  _eagerOptions(opt) {
-    const eagerOp = ensureEagerOperation(this);
-    eagerOp.graphOptions = Object.assign({}, eagerOp.graphOptions, opt);
-    return this;
-  }
-
   findOptions(opt) {
     if (arguments.length !== 0) {
       this._findOperationOptions = Object.assign({}, this._findOperationOptions, opt);
@@ -491,14 +300,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this.has(QueryBuilderBase.SelectSelector);
   }
 
-  hasEager() {
-    deprecate(
-      `QueryBuilder#hasEager is deprecated. Use hasWithGraph instead. This method will be removed in version 3.0`
-    );
-
-    return this.hasWithGraph();
-  }
-
   hasWithGraph() {
     const eagerOp = this.findOperation(EagerOperation);
     return !!eagerOp && !eagerOp.expression.isEmpty;
@@ -532,20 +333,6 @@ class QueryBuilder extends QueryBuilderBase {
     });
   }
 
-  isFindQuery() {
-    deprecate(
-      `isFindQuery is deprecated. Use isFind instead. This method will be removed in version 2.0`
-    );
-    return this.isFind();
-  }
-
-  isEagerQuery() {
-    deprecate(
-      `isEagerQuery is deprecated. Use hasWithGraph instead. This method will be removed in version 2.0`
-    );
-    return this.hasEager();
-  }
-
   toString() {
     return '[object QueryBuilder]';
   }
@@ -584,14 +371,6 @@ class QueryBuilder extends QueryBuilderBase {
     return builder;
   }
 
-  clearEager() {
-    deprecate(
-      '`QueryBuilder#clearEager` method is deprecated. You should use `clearWithGraph` instead. `clearEager` method will be removed in 3.0'
-    );
-
-    return this.clearWithGraph();
-  }
-
   clearWithGraph() {
     this.clear(EagerOperation);
     return this;
@@ -671,20 +450,6 @@ class QueryBuilder extends QueryBuilderBase {
     }
   }
 
-  pluck(propertyName) {
-    deprecate(`QueryBuilder#pluck is deprecated. This method will be removed in version 3.0`);
-
-    return this.runAfter((result) => {
-      if (Array.isArray(result)) {
-        return result.map((it) => it && it[propertyName]);
-      } else if (isObject(result)) {
-        return result[propertyName];
-      } else {
-        return result;
-      }
-    });
-  }
-
   throwIfNotFound(data = {}) {
     return this.runAfter((result) => {
       if (
@@ -776,47 +541,6 @@ class QueryBuilder extends QueryBuilderBase {
     });
   }
 
-  pick(modelClass, properties) {
-    deprecate(`QueryBuilder#pick is deprecated. This method will be removed in version 3.0`);
-
-    if (typeof properties === 'undefined') {
-      properties = modelClass;
-      modelClass = null;
-    }
-
-    // Turn the properties into a hash for performance.
-    properties = properties.reduce((obj, prop) => {
-      obj[prop] = true;
-      return obj;
-    }, {});
-
-    return this.traverse(modelClass, (model) => {
-      model.$pick(properties);
-    });
-  }
-
-  omit(modelClass, properties) {
-    deprecate(`QueryBuilder#omit is deprecated. This method will be removed in version 3.0`);
-
-    if (typeof properties === 'undefined') {
-      properties = modelClass;
-      modelClass = null;
-    }
-
-    if (Array.isArray(properties)) {
-      // Turn the properties into a hash for performance.
-      properties = properties.reduce((obj, prop) => {
-        obj[prop] = true;
-        return obj;
-      }, {});
-    } else {
-      properties = { [properties]: true };
-    }
-    return this.traverse(modelClass, (model) => {
-      model.$omit(properties);
-    });
-  }
-
   page(page, pageSize) {
     return this.range(+page * +pageSize, (+page + 1) * +pageSize - 1);
   }
@@ -897,13 +621,6 @@ class QueryBuilder extends QueryBuilderBase {
     });
   }
 
-  insertWithRelated(...args) {
-    deprecate(
-      `insertWithRelated is deprecated. Use insertGraph instead. This method will be removed in version 2.0`
-    );
-    return this.insertGraph(...args);
-  }
-
   insertGraphAndFetch(modelsOrObjects, opt) {
     return writeOperation(this, () => {
       const insertOperation = this._insertOperationFactory(this);
@@ -921,13 +638,6 @@ class QueryBuilder extends QueryBuilderBase {
     });
   }
 
-  insertWithRelatedAndFetch(...args) {
-    deprecate(
-      `insertWithRelatedAndFetch is deprecated. Use insertGraphAndFetch instead. This method will be removed in version 2.0`
-    );
-    return this.insertGraphAndFetch(...args);
-  }
-
   update(modelOrObject) {
     return writeOperation(this, () => {
       const updateOperation = this._updateOperationFactory(this);
@@ -1107,14 +817,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  joinRelation(...args) {
-    deprecate(
-      `joinRelation is deprecated. Use joinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.joinRelated(...args);
-  }
-
   innerJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'innerJoin').addCall({
       expression,
@@ -1124,14 +826,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  innerJoinRelation(...args) {
-    deprecate(
-      `innerJoinRelation is deprecated. Use innerJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.innerJoinRelated(...args);
-  }
-
   outerJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'outerJoin').addCall({
       expression,
@@ -1141,14 +835,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  outerJoinRelation(...args) {
-    deprecate(
-      `outerJoinRelation is deprecated. Use outerJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.outerJoinRelated(...args);
-  }
-
   fullOuterJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'fullOuterJoin').addCall({
       expression,
@@ -1158,14 +844,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  fullOuterJoinRelation(...args) {
-    deprecate(
-      `fullOuterJoinRelation is deprecated. Use fullOuterJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.fullOuterJoinRelated(...args);
-  }
-
   leftJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'leftJoin').addCall({
       expression,
@@ -1175,14 +853,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  leftJoinRelation(...args) {
-    deprecate(
-      `leftJoinRelation is deprecated. Use leftJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.leftJoinRelated(...args);
-  }
-
   leftOuterJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'leftOuterJoin').addCall({
       expression,
@@ -1192,14 +862,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  leftOuterJoinRelation(...args) {
-    deprecate(
-      `leftOuterJoinRelation is deprecated. Use leftOuterJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.leftOuterJoinRelated(...args);
-  }
-
   rightJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'rightJoin').addCall({
       expression,
@@ -1209,14 +871,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  rightJoinRelation(...args) {
-    deprecate(
-      `rightJoinRelation is deprecated. Use rightJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.rightJoinRelated(...args);
-  }
-
   rightOuterJoinRelated(expression, options) {
     ensureJoinRelatedOperation(this, 'rightOuterJoin').addCall({
       expression,
@@ -1226,14 +880,6 @@ class QueryBuilder extends QueryBuilderBase {
     return this;
   }
 
-  rightOuterJoinRelation(...args) {
-    deprecate(
-      `rightOuterJoinRelation is deprecated. Use rightOuterJoinRelated instead. This method will be removed in version 3.0`
-    );
-
-    return this.rightOuterJoinRelated(...args);
-  }
-
   deleteById(id) {
     return this.findById(id)
       .delete()
@@ -1336,7 +982,7 @@ function ensureEagerOperation(builder, algorithm = null) {
     } else {
       const EagerOperationClass = getOperationClassForEagerAlgorithm(
         builder,
-        getDefaultEagerAlgorithm(builder)
+        getWhereInEagerAlgorithm(builder)
       );
 
       const newEagerOp = new EagerOperationClass('eager', {
@@ -1350,18 +996,6 @@ function ensureEagerOperation(builder, algorithm = null) {
   }
 }
 
-function getDefaultEagerAlgorithm(builder) {
-  const eagerAlgorithm = builder.modelClass().defaultEagerAlgorithm;
-
-  if (eagerAlgorithm !== getWhereInEagerAlgorithm(builder)) {
-    deprecate(
-      'Model.defaultEagerAlgorithm is deprecated. You need to use `withGraphFetched` or `withGraphJoined` explicitly. `defaultEagerAlgorithm` will be removed in 3.0'
-    );
-  }
-
-  return eagerAlgorithm;
-}
-
 function getWhereInEagerAlgorithm(builder) {
   return builder.modelClass().WhereInEagerAlgorithm;
 }

package/lib/queryBuilder/QueryBuilderOperationSupport.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const { deprecate } = require('../utils/deprecate');
 const { isString, isFunction, isRegExp, last } = require('../utils/objectUtils');
 const { QueryBuilderContextBase } = require('./QueryBuilderContextBase');
 const { QueryBuilderUserContext } = require('./QueryBuilderUserContext');
+const { deprecate } = require('../utils/deprecate');
 
 const AllSelector = () => true;
 const SelectSelector =
@@ -83,14 +83,6 @@ class QueryBuilderOperationSupport {
     }
   }
 
-  mergeContext(obj) {
-    deprecate(
-      '`QueryBuilder#mergeContext` method is deprecated. The `context` method now behaves just like `mergeContext`. `mergeContext` method will be removed in 3.0'
-    );
-
-    return this.context(obj || {});
-  }
-
   clearContext() {
     const ctx = this._context;
     ctx.userContext = new this.constructor.QueryBuilderUserContext(this);
@@ -503,6 +495,7 @@ class QueryBuilderOperationSupport {
   }
 
   skipUndefined() {
+    deprecate('skipUndefined() is deprecated and will be removed in objection 4.0');
     this.internalOptions().skipUndefined = true;
     return this;
   }

package/lib/queryBuilder/ReferenceBuilder.js

@@ -2,7 +2,6 @@
 
 const { parseFieldExpression } = require('../utils/parseFieldExpression');
 const { isObject } = require('../utils/objectUtils');
-const { deprecate } = require('../utils/deprecate');
 
 class ReferenceBuilder {
   constructor(expr) {
@@ -120,13 +119,6 @@ class ReferenceBuilder {
     return this;
   }
 
-  castType(sqlType) {
-    deprecate(
-      'castType(type) is deprecated. Use castTo(type) instead. castType(type) will be removed in 2.0'
-    );
-    return this.castTo(sqlType);
-  }
-
   castTo(sqlType) {
     this._cast = sqlType;
     return this;

package/lib/queryBuilder/RelationExpression.js

@@ -291,7 +291,7 @@ function modelToNode(model, node) {
   for (let r = 0, lr = relationNames.length; r < lr; ++r) {
     const relName = relationNames[r];
 
-    if (model.hasOwnProperty(relName)) {
+    if (model[relName] !== undefined) {
       let childNode = node[relName];
 
       if (!childNode) {

package/lib/queryBuilder/graph/recursiveUpsert/GraphRecursiveUpsert.js

@@ -18,7 +18,7 @@ class GraphRecursiveUpsert extends GraphOperation {
 
 function hasRelations(obj) {
   for (const relationName of obj.constructor.getRelationNames()) {
-    if (obj.hasOwnProperty(relationName)) {
+    if (obj[relationName] !== undefined) {
       return true;
     }
   }

package/lib/queryBuilder/operations/MergeOperation.js

@@ -8,10 +8,13 @@ class MergeOperation extends QueryBuilderOperation {
   constructor(name, opt) {
     super(name, opt);
     this.model = null;
+    this.args = null;
   }
 
   onAdd(builder, args) {
-    if (!isEmpty(args) && isObject(args[0])) {
+    this.args = args;
+
+    if (!isEmpty(args) && isObject(args[0]) && !Array.isArray(args[0])) {
       const json = args[0];
       const modelClass = builder.modelClass();
 
@@ -33,7 +36,7 @@ class MergeOperation extends QueryBuilderOperation {
       return knexBuilder.merge(convertedJson);
     }
 
-    return knexBuilder.merge();
+    return knexBuilder.merge(...this.args);
   }
 
   toFindOperation() {
@@ -43,6 +46,7 @@ class MergeOperation extends QueryBuilderOperation {
   clone() {
     const clone = super.clone();
     clone.model = this.model;
+    clone.args = this.args;
     return clone;
   }
 }

package/lib/relations/RelationOwner.js

@@ -71,12 +71,10 @@ class RelationOwner {
       if (values) {
         builder.whereInComposite(relatedRefs, values);
       } else {
-        builder.where(false);
-        builder.resolve([]);
+        builder.where(false).resolve([]);
       }
     } else {
-      builder.where(false);
-      builder.resolve([]);
+      builder.where(false).resolve([]);
     }
 
     return builder;

package/package.json

@@ -1,17 +1,13 @@
 {
   "name": "objection",
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.0-rc.4",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
   "scripts": {
-    "test": "npm run eslint && mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\"",
-    "test-fast": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --bail --exclude \"tests/unit/relations/files/**\"",
-    "test-typings": "tsc",
-    "coveralls": "cat ./testCoverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-    "perf": "mocha --slow 60000 --timeout 60000 --reporter spec --recursive perf",
-    "perf-debug": "mocha --slow 60000 --timeout 60000 --reporter spec --inspect-brk perf",
-    "perf-opt": "mocha --slow 60000 --timeout 60000 --reporter spec --recursive perf --trace_opt --trace_deopt",
+    "test": "npm run eslint && mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\" && npm run test:typings",
+    "test:fast": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --bail --exclude \"tests/unit/relations/files/**\"",
+    "test:typings": "tsc",
     "prettier": "prettier --write \"{examples,lib,tests,typings,doc}/**/*.{js,ts}\"",
     "eslint": "eslint --format codeframe \"examples/**/*.js\" \"lib/**/*.js\" \"tests/**/*.js\"",
     "docs:dev": "vuepress dev doc",
@@ -64,38 +60,20 @@
     "knex": ">=0.95.0"
   },
   "devDependencies": {
-    "@types/node": "^16.3.2",
+    "@types/node": "^16.11.6",
     "chai": "^4.3.4",
     "chai-subset": "^1.6.0",
-    "coveralls": "^3.1.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^7.30.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint": "^8.1.0",
+    "eslint-formatter-codeframe": "^7.32.1",
+    "eslint-plugin-prettier": "^4.0.0",
     "expect.js": "^0.3.1",
-    "fs-extra": "^10.0.0",
-    "glob": "^7.1.7",
-    "knex": "0.95.7",
-    "mocha": "^9.0.2",
+    "knex": "0.95.13",
+    "mocha": "^9.1.3",
     "mysql": "^2.18.1",
-    "nyc": "^15.1.0",
-    "pg": "^8.6.0",
-    "prettier": "2.3.2",
+    "pg": "^8.7.1",
+    "prettier": "2.4.1",
     "sqlite3": "^5.0.2",
     "typescript": "^4.4.4",
     "vuepress": "1.8.2"
-  },
-  "nyc": {
-    "description": "test coverage",
-    "exclude": [
-      "lib/queryBuilder/parsers/jsonFieldExpressionParser.js",
-      "lib/queryBuilder/parsers/relationExpressionParser.js",
-      "testUtils/*",
-      "lib/utils/clone.js"
-    ],
-    "reporter": [
-      "lcov",
-      "text"
-    ],
-    "report-dir": "./testCoverage"
   }
 }

package/typings/objection/index.d.ts

@@ -21,8 +21,6 @@ export = Objection;
 
 declare namespace Objection {
   const raw: RawFunction;
-  // Deprecated
-  const lit: ValueFunction;
   const val: ValueFunction;
   const ref: ReferenceFunction;
   const fn: FunctionFunction;
@@ -138,7 +136,7 @@ declare namespace Objection {
 
   type Expression<T> = T | Raw | ReferenceBuilder | ValueBuilder | AnyQueryBuilder;
 
-  type Id = string | number;
+  type Id = string | number | BigInt;
   type CompositeId = Id[];
   type MaybeCompositeId = Id | CompositeId;
 
@@ -577,11 +575,6 @@ declare namespace Objection {
 
   type ForIdValue = MaybeCompositeId | AnyQueryBuilder;
 
-  // Deprecated
-  interface EagerMethod<QB extends AnyQueryBuilder> {
-    (expr: RelationExpression<ModelType<QB>>, modifiers?: Modifiers): QB;
-  }
-
   interface AllowGraphMethod<QB extends AnyQueryBuilder> {
     (expr: RelationExpression<ModelType<QB>>): QB;
   }
@@ -736,22 +729,6 @@ declare namespace Objection {
     (): any;
   }
 
-  // Deprecated
-  export interface EagerAlgorithm {}
-
-  // Deprecated
-  interface EagerAlgorithmMethod<QB extends AnyQueryBuilder> {
-    (algorithm: EagerAlgorithm): QB;
-  }
-
-  // Deprecated
-  export interface EagerOptions {
-    minimize?: boolean;
-    separator?: string;
-    aliases?: string[];
-    joinOperation: string;
-  }
-
   export interface GraphOptions {
     minimize?: boolean;
     separator?: string;
@@ -760,11 +737,6 @@ declare namespace Objection {
     maxBatchSize?: number;
   }
 
-  // Deprecated
-  interface EagerOptionsMethod<QB extends AnyQueryBuilder> {
-    (options: EagerOptions): QB;
-  }
-
   interface ModifyGraphMethod<QB extends AnyQueryBuilder> {
     <M extends Model>(
       expr: RelationExpression<ModelType<QB>>,
@@ -790,11 +762,6 @@ declare namespace Objection {
     (): QB;
   }
 
-  // Deprecated
-  interface ApplyFilterMethod<QB extends AnyQueryBuilder> {
-    (...filters: string[]): QB;
-  }
-
   export interface Pojo {
     [key: string]: any;
   }
@@ -921,23 +888,6 @@ declare namespace Objection {
     withRecursive: WithMethod<this>;
     withWrapped: WithMethod<this>;
 
-    // Deprecated
-    joinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    innerJoinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    outerJoinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    leftJoinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    leftOuterJoinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    rightJoinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    rightOuterJoinRelation: JoinRelatedMethod<this>;
-    // Deprecated
-    fullOuterJoinRelation: JoinRelatedMethod<this>;
-
     joinRelated: JoinRelatedMethod<this>;
     innerJoinRelated: JoinRelatedMethod<this>;
     outerJoinRelated: JoinRelatedMethod<this>;
@@ -1010,7 +960,7 @@ declare namespace Objection {
 
     onConflict(column?: string | string[] | true): this;
     ignore(): this;
-    merge(merge?: PartialModelObject<M>): this;
+    merge(merge?: PartialModelObject<M> | string[]): this;
 
     insertAndFetch(insert: PartialModelObject<M>): SingleQueryBuilder<this>;
     insertAndFetch(insert: PartialModelObject<M>[]): ArrayQueryBuilder<this>;
@@ -1027,32 +977,7 @@ declare namespace Objection {
     withGraphJoined(expr: RelationExpression<M>, options?: GraphOptions): this;
 
     truncate(): Promise<void>;
-
-    // Deprecated
-    eager: EagerMethod<this>;
-    // Deprecated
-    mergeEager: EagerMethod<this>;
-
-    // Deprecated
-    joinEager: EagerMethod<this>;
-    // Deprecated
-    mergeJoinEager: EagerMethod<this>;
-
-    // Deprecated
-    naiveEager: EagerMethod<this>;
-    // Deprecated
-    mergeNaiveEager: EagerMethod<this>;
-
-    // Deprecated
-    allowEager: AllowGraphMethod<this>;
-    // Deprecated
-    mergeAllowEager: AllowGraphMethod<this>;
-
     allowGraph: AllowGraphMethod<this>;
-    // Deprecated
-    allowInsert: AllowGraphMethod<this>;
-    // Deprecated
-    allowUpsert: AllowGraphMethod<this>;
 
     throwIfNotFound: (
       arg?: any
@@ -1081,17 +1006,6 @@ declare namespace Objection {
     toKnexQuery<T = ModelObject<M>>(): Knex.QueryBuilder<T, T[]>;
     clone(): this;
 
-    // Deprecated
-    pluck(property: string): this;
-    // Deprecated
-    pick(modelClass: typeof Model, properties: string[]): this;
-    // Deprecated
-    pick(properties: string[]): this;
-    // Deprecated
-    omit(modelClass: typeof Model, properties: string[]): this;
-    // Deprecated
-    omit(properties: string[]): this;
-
     page(page: number, pageSize: number): PageQueryBuilder<this>;
     range(): PageQueryBuilder<this>;
     range(start: number, end: number): PageQueryBuilder<this>;
@@ -1108,33 +1022,19 @@ declare namespace Objection {
 
     insertGraph: InsertGraphMethod<M>;
     insertGraphAndFetch: InsertGraphMethod<M>;
-    insertWithRelated: InsertGraphMethod<M>;
-    insertWithRelatedAndFetch: InsertGraphMethod<M>;
 
     upsertGraph: UpsertGraphMethod<M>;
     upsertGraphAndFetch: UpsertGraphMethod<M>;
 
     graphExpressionObject: GraphExpressionObjectMethod<this>;
 
-    // Deprecated
-    eagerAlgorithm: EagerAlgorithmMethod<this>;
-    // Deprecated
-    eagerOptions: EagerOptionsMethod<this>;
-    // Deprecated
-    modifyEager: ModifyGraphMethod<this>;
-    // Deprecated
-    filterEager: ModifyGraphMethod<this>;
     modifyGraph: ModifyGraphMethod<this>;
 
     context: ContextMethod<this>;
     clearContext: ClearContextMethod<this>;
-    // Deprecated
-    mergeContext: ContextMethod<this>;
 
     modify: ModifyMethod<this>;
     modifiers: ModifiersMethod<this>;
-    // Deprecated
-    applyFilter: ApplyFilterMethod<this>;
 
     isFind: BooleanReturningMethod;
     isExecutable: BooleanReturningMethod;
@@ -1146,8 +1046,6 @@ declare namespace Objection {
     isInternal: BooleanReturningMethod;
     hasWheres: BooleanReturningMethod;
     hasSelects: BooleanReturningMethod;
-    // Deprecated
-    hasEager: BooleanReturningMethod;
     hasWithGraph: BooleanReturningMethod;
 
     has: HasMethod;
@@ -1158,8 +1056,6 @@ declare namespace Objection {
     clearWhere: IdentityMethod<this>;
     clearWithGraph: IdentityMethod<this>;
     clearAllowGraph: IdentityMethod<this>;
-    // Deprecated
-    clearEager: IdentityMethod<this>;
 
     ModelType: M;
     ResultType: R;
@@ -1444,17 +1340,6 @@ declare namespace Objection {
     HasOneThroughRelation: RelationType;
 
     defaultGraphOptions?: GraphOptions;
-    // Deprecated
-    defaultEagerAlgorithm?: EagerAlgorithm;
-    // Deprecated
-    defaultEagerOptions?: EagerOptions;
-
-    // Deprecated
-    WhereInEagerAlgorithm: EagerAlgorithm;
-    // Deprecated
-    NaiveEagerAlgorithm: EagerAlgorithm;
-    // Deprecated
-    JoinEagerAlgorithm: EagerAlgorithm;
 
     query(this: Constructor<M>, trxOrKnex?: TransactionOrKnex): QueryBuilderType<M>;
 
@@ -1491,22 +1376,6 @@ declare namespace Objection {
     bindKnex(trxOrKnex: TransactionOrKnex): this;
     bindTransaction(trxOrKnex: TransactionOrKnex): this;
 
-    // Deprecated
-    loadRelated(
-      modelOrObject: PartialModelObject<M>,
-      expression: RelationExpression<M>,
-      modifiers?: Modifiers<QueryBuilderType<M>>,
-      trxOrKnex?: TransactionOrKnex
-    ): SingleQueryBuilder<QueryBuilderType<M>>;
-
-    // Deprecated
-    loadRelated(
-      modelOrObject: PartialModelObject<M>[],
-      expression: RelationExpression<M>,
-      modifiers?: Modifiers<QueryBuilderType<M>>,
-      trxOrKnex?: TransactionOrKnex
-    ): QueryBuilderType<M>;
-
     fetchGraph(
       modelOrObject: PartialModelObject<M>,
       expression: RelationExpression<M>,
@@ -1577,17 +1446,6 @@ declare namespace Objection {
     static HasOneThroughRelation: RelationType;
 
     static defaultGraphOptions?: GraphOptions;
-    // Deprecated
-    static defaultEagerAlgorithm?: EagerAlgorithm;
-    // Deprecated
-    static defaultEagerOptions?: EagerOptions;
-
-    // Deprecated
-    static WhereInEagerAlgorithm: EagerAlgorithm;
-    // Deprecated
-    static NaiveEagerAlgorithm: EagerAlgorithm;
-    // Deprecated
-    static JoinEagerAlgorithm: EagerAlgorithm;
 
     static query<M extends Model>(
       this: Constructor<M>,
@@ -1628,24 +1486,6 @@ declare namespace Objection {
     static bindKnex<M>(this: M, trxOrKnex: TransactionOrKnex): M;
     static bindTransaction<M>(this: M, trxOrKnex: TransactionOrKnex): M;
 
-    // Deprecated
-    static loadRelated<M extends Model>(
-      this: Constructor<M>,
-      modelOrObject: PartialModelObject<M>,
-      expression: RelationExpression<M>,
-      modifiers?: Modifiers<QueryBuilderType<M>>,
-      trxOrKnex?: TransactionOrKnex
-    ): SingleQueryBuilder<QueryBuilderType<M>>;
-
-    // Deprecated
-    static loadRelated<M extends Model>(
-      this: Constructor<M>,
-      modelOrObject: PartialModelObject<M>[],
-      expression: RelationExpression<M>,
-      modifiers?: Modifiers<QueryBuilderType<M>>,
-      trxOrKnex?: TransactionOrKnex
-    ): QueryBuilderType<M>;
-
     static fetchGraph<M extends Model>(
       this: Constructor<M>,
       modelOrObject: PartialModelObject<M>,
@@ -1702,13 +1542,6 @@ declare namespace Objection {
     $id(id: any): void;
     $id(): any;
 
-    // Deprecated
-    $loadRelated(
-      expression: RelationExpression<this>,
-      modifiers?: Modifiers<QueryBuilderType<this>>,
-      trxOrKnex?: TransactionOrKnex
-    ): SingleQueryBuilder<QueryBuilderType<this>>;
-
     $fetchGraph(
       expression: RelationExpression<this>,
       options?: FetchGraphOptions

package/lib/model/modelFilter.js

@@ -1,103 +0,0 @@
-'use strict';
-
-const { isObject } = require('../utils/objectUtils');
-const { isInternalProp } = require('../utils/internalPropUtils');
-
-function omit(model, args) {
-  if (args.length === 1 && isObject(args[0])) {
-    const keys = args[0];
-
-    if (Array.isArray(keys)) {
-      omitArray(model, keys);
-    } else {
-      omitObject(model, keys);
-    }
-  } else {
-    omitArray(model, args);
-  }
-
-  return model;
-}
-
-function pick(model, args) {
-  if (args.length === 1 && isObject(args[0])) {
-    const keys = args[0];
-
-    if (Array.isArray(keys)) {
-      pickArray(model, keys);
-    } else {
-      pickObject(model, keys);
-    }
-  } else {
-    pickArray(model, args);
-  }
-
-  return model;
-}
-
-function omitObject(model, keyObj) {
-  const modelClass = model.constructor;
-  const keys = Object.keys(keyObj);
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-    const value = keyObj[key];
-
-    if (value && !isInternalProp(key) && model.hasOwnProperty(key)) {
-      modelClass.omitImpl(model, key);
-    }
-  }
-}
-
-function omitArray(model, keys) {
-  const modelClass = model.constructor;
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-
-    if (!isInternalProp(key) && model.hasOwnProperty(key)) {
-      modelClass.omitImpl(model, key);
-    }
-  }
-}
-
-function pickObject(model, keyObj) {
-  const modelClass = model.constructor;
-  const keys = Object.keys(model);
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-
-    if (!isInternalProp(key) && !keyObj[key]) {
-      modelClass.omitImpl(model, key);
-    }
-  }
-}
-
-function pickArray(model, pick) {
-  const modelClass = model.constructor;
-  const keys = Object.keys(model);
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-
-    if (!isInternalProp(key) && !contains(pick, key)) {
-      modelClass.omitImpl(model, key);
-    }
-  }
-}
-
-function contains(arr, value) {
-  for (let i = 0, l = arr.length; i < l; ++i) {
-    if (arr[i] === value) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-module.exports = {
-  omit,
-  pick,
-};