objection 3.0.0 → 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/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",
+  "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