objection 3.0.0-rc.2 → 3.0.1

package/lib/model/Model.js

@@ -858,8 +858,8 @@ function getReadOnlyAttributes(modelClass) {
 }
 
 function getReadOnlyAttributesRecursively(modelClass) {
-  if (modelClass === Model) {
-    // Stop recursion to the model class.
+  if (modelClass === Model || modelClass.prototype == undefined) {
+    // Stop recursion to the model class or its prototype is null or undefined.
     return [];
   }
 

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/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/lib/utils/knexUtils.js

@@ -37,25 +37,29 @@ function isMsSql(knex) {
 }
 
 function isKnexQueryBuilder(value) {
-  return hasConstructor(value, 'Builder') && 'client' in value;
+  return (
+    hasConstructor(value) &&
+    isFunction(value.select) &&
+    isFunction(value.column) &&
+    value.select === value.column &&
+    'client' in value
+  );
 }
 
 function isKnexJoinBuilder(value) {
-  return hasConstructor(value, 'JoinClause') && 'joinType' in value;
+  return hasConstructor(value) && value.grouping === 'join' && 'joinType' in value;
 }
 
 function isKnexRaw(value) {
-  return hasConstructor(value, 'Raw') && 'client' in value;
+  return hasConstructor(value) && value.isRawInstance && 'client' in value;
 }
 
 function isKnexTransaction(knex) {
   return !!getDialect(knex) && isFunction(knex.commit) && isFunction(knex.rollback);
 }
 
-function hasConstructor(value, constructorName) {
-  return (
-    isObject(value) && isFunction(value.constructor) && value.constructor.name === constructorName
-  );
+function hasConstructor(value) {
+  return isObject(value) && isFunction(value.constructor);
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.1",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -73,7 +73,7 @@
     "pg": "^8.7.1",
     "prettier": "2.4.1",
     "sqlite3": "^5.0.2",
-    "typescript": "^4.4.4",
+    "typescript": "^4.5.4",
     "vuepress": "1.8.2"
   }
 }

package/typings/objection/index.d.ts

@@ -179,6 +179,11 @@ declare namespace Objection {
    */
   type NonFunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? never : K }[keyof T];
 
+  /**
+   * Type that attempts to only select the user-defined model properties.
+   */
+  type DataPropertyNames<T> = Exclude<NonFunctionPropertyNames<T>, 'QueryBuilderType'>;
+
   /**
    * Removes `undefined` from a type.
    */
@@ -188,14 +193,14 @@ declare namespace Objection {
    * A Pojo version of model.
    */
   type ModelObject<T extends Model> = {
-    [K in Exclude<NonFunctionPropertyNames<T>, 'QueryBuilderType'>]: T[K];
+    [K in DataPropertyNames<T>]: T[K];
   };
 
   /**
    * Any object that has some of the properties of model class T match this type.
    */
   type PartialModelObject<T extends Model> = {
-    [K in NonFunctionPropertyNames<T>]?: Defined<T[K]> extends Model
+    [K in DataPropertyNames<T>]?: Defined<T[K]> extends Model
       ? T[K]
       : Defined<T[K]> extends Array<infer I>
       ? I extends Model
@@ -217,7 +222,7 @@ declare namespace Objection {
    * Just like PartialModelObject but this is applied recursively to relations.
    */
   type PartialModelGraph<M, T = M & GraphParameters> = {
-    [K in NonFunctionPropertyNames<T>]?: Defined<T[K]> extends Model
+    [K in DataPropertyNames<T>]?: Defined<T[K]> extends Model
       ? PartialModelGraph<Defined<T[K]>>
       : Defined<T[K]> extends Array<infer I>
       ? I extends Model

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