objection 3.0.0 → 3.0.2

package/README.md

@@ -1,3 +1,5 @@
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua)
+
 [![Tests](https://github.com/Vincit/objection.js/actions/workflows/test.yml/badge.svg)](https://github.com/Vincit/objection.js)
 [![Join the chat at https://gitter.im/Vincit/objection.js](https://badges.gitter.im/Vincit/objection.js.svg)](https://gitter.im/Vincit/objection.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -7,7 +9,7 @@ Objection.js is an [ORM](https://en.wikipedia.org/wiki/Object-relational_mapping
 
 Even though ORM is the best commonly known acronym to describe objection, a more accurate description is to call it **a relational query builder**. You get all the benefits of an SQL query builder but also a powerful set of tools for working with relations.
 
-Objection.js is built on an SQL query builder called [knex](http://knexjs.org). All databases supported by knex are supported by objection.js. **SQLite3**, **Postgres** and **MySQL** are [thoroughly tested](https://travis-ci.org/Vincit/objection.js).
+Objection.js is built on an SQL query builder called [knex](http://knexjs.org). All databases supported by knex are supported by objection.js. **SQLite3**, **Postgres** and **MySQL** are [thoroughly tested](https://github.com/Vincit/objection.js/actions).
 
 What objection.js gives you:
 

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/objection.js

@@ -1,6 +1,14 @@
 'use strict';
 
-const { wrapError, ...DbErrorClasses } = require('db-errors');
+const {
+  DBError,
+  UniqueViolationError,
+  NotNullViolationError,
+  ForeignKeyViolationError,
+  ConstraintViolationError,
+  CheckViolationError,
+  DataError,
+} = require('db-errors');
 const { Model: NativeModel } = require('./model/Model');
 const { QueryBuilder: NativeQueryBuilder } = require('./queryBuilder/QueryBuilder');
 const { QueryBuilderBase } = require('./queryBuilder/QueryBuilderBase');
@@ -88,5 +96,11 @@ module.exports = {
   knexSnakeCaseMappers,
   knexIdentifierMapping,
 
-  ...DbErrorClasses,
+  DBError,
+  UniqueViolationError,
+  NotNullViolationError,
+  ForeignKeyViolationError,
+  ConstraintViolationError,
+  CheckViolationError,
+  DataError,
 };

package/lib/utils/identifierMapping.js

@@ -135,6 +135,7 @@ function isDigit(char) {
 // If no separators are found, `mapper` is called for the entire string.
 function mapLastPart(mapper, separator) {
   return (str) => {
+    if (!str) return str;
     const idx = str.lastIndexOf(separator);
     const mapped = mapper(str.slice(idx + separator.length));
     return str.slice(0, idx + separator.length) + mapped;

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.2",
   "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

@@ -132,7 +132,8 @@ declare namespace Objection {
     | boolean[]
     | Date[]
     | null
-    | Buffer;
+    | Buffer
+    | Buffer[];
 
   type Expression<T> = T | Raw | ReferenceBuilder | ValueBuilder | AnyQueryBuilder;
 
@@ -179,6 +180,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 +194,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 +223,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
@@ -1003,7 +1009,7 @@ declare namespace Objection {
     timeout: TimeoutMethod<this>;
     columnInfo: ColumnInfoMethod<this>;
 
-    toKnexQuery<T = ModelObject<M>>(): Knex.QueryBuilder<T, T[]>;
+    toKnexQuery<T extends {} = ModelObject<M>>(): Knex.QueryBuilder<T, T[]>;
     clone(): this;
 
     page(page: number, pageSize: number): PageQueryBuilder<this>;