objection 3.0.0-rc.1 → 3.0.0

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/queryBuilder/QueryBuilderOperationSupport.js

@@ -3,6 +3,7 @@
 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 =
@@ -494,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/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,13 +1,13 @@
 {
   "name": "objection",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0",
   "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",
+    "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",

package/typings/objection/index.d.ts

@@ -960,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>;

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,
-};