objection 3.1.4 → 3.1.5

package/lib/model/AjvValidator.js

@@ -36,8 +36,10 @@ class AjvValidator extends Validator {
     self.cache = new Map();
 
     const setupAjv = (ajv) => {
-      conf.onCreateAjv(ajv);
-      // Only add AJV formats if they weren't added in user-space already
+      if (conf.onCreateAjv) {
+        conf.onCreateAjv(ajv);
+      }
+      // Only add Ajv formats if they weren't added in user-space already
       if (!ajv.formats['date-time']) {
         addFormats(ajv);
       }
@@ -77,7 +79,7 @@ class AjvValidator extends Validator {
     }
 
     validator.call(model, json);
-    const error = parseValidationError(validator.errors, modelClass, options);
+    const error = parseValidationError(validator.errors, modelClass, options, this.ajvOptions);
 
     if (error) {
       throw error;
@@ -87,7 +89,7 @@ class AjvValidator extends Validator {
   }
 
   getValidator(modelClass, jsonSchema, isPatchObject) {
-    // Use the AJV custom serializer if provided.
+    // Use the Ajv custom serializer if provided.
     const createCacheKey = this.ajvOptions.serialize || JSON.stringify;
 
     // Optimization for the common case where jsonSchema is never modified.
@@ -103,7 +105,7 @@ class AjvValidator extends Validator {
     if (!validators) {
       validators = {
         // Validator created for the schema object without `required` properties
-        // using the AJV instance that doesn't set default values.
+        // using the Ajv instance that doesn't set default values.
         patchValidator: null,
 
         // Validator created for the unmodified schema.
@@ -143,7 +145,7 @@ class AjvValidator extends Validator {
   }
 }
 
-function parseValidationError(errors, modelClass, options) {
+function parseValidationError(errors, modelClass, options, ajvOptions) {
   if (!errors) {
     return null;
   }
@@ -178,13 +180,21 @@ function parseValidationError(errors, modelClass, options) {
     // More than one error can occur for the same key in Ajv, merge them in the array:
     const array = errorHash[key] || (errorHash[key] = []);
 
-    // Use unshift instead of push so that the last error ends up at [0],
-    // preserving previous behavior where only the last error was stored.
-    array.unshift({
+    // Prepare error object
+    const errorObj = {
       message: error.message,
       keyword: error.keyword,
       params: error.params,
-    });
+    };
+
+    // Add data if verbose enabled
+    if (ajvOptions.verbose) {
+      errorObj.data = error.data;
+    }
+
+    // Use unshift instead of push so that the last error ends up at [0],
+    // preserving previous behavior where only the last error was stored.
+    array.unshift(errorObj);
 
     ++numErrors;
   }

package/lib/model/Model.js

@@ -317,9 +317,6 @@ class Model {
 
   static createValidator() {
     return new AjvValidator({
-      onCreateAjv: (ajv) => {
-        /* Do Nothing by default */
-      },
       options: {
         allErrors: true,
         validateSchema: false,

package/lib/queryBuilder/QueryBuilderOperationSupport.js

@@ -12,7 +12,7 @@ const WhereSelector = /^(where|orWhere|andWhere|find\w+)/;
 const OnSelector = /^(on|orOn|andOn)/;
 const OrderBySelector = /orderBy/;
 const JoinSelector = /(join|joinRaw|joinRelated)$/i;
-const FromSelector = /^(from|into|table)$/;
+const FromSelector = /^(from|fromRaw|into|table)$/;
 
 class QueryBuilderOperationSupport {
   constructor(...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -53,7 +53,7 @@
   ],
   "types": "./typings/objection/index.d.ts",
   "dependencies": {
-    "ajv": "^8.12.0",
+    "ajv": "^8.17.1",
     "ajv-formats": "^2.1.1",
     "db-errors": "^0.2.3"
   },
@@ -61,20 +61,20 @@
     "knex": ">=1.0.1"
   },
   "devDependencies": {
-    "@types/node": "^20.10.0",
+    "@types/node": "^22.7.0",
     "chai": "^4.3.10",
     "chai-subset": "^1.6.0",
     "eslint": "^8.54.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-prettier": "^5.2.1",
     "expect.js": "^0.3.1",
-    "knex": "^3.0.1",
-    "mocha": "^10.2.0",
+    "knex": "^3.1.0",
+    "mocha": "^10.7.3",
     "mysql": "^2.18.1",
-    "pg": "^8.11.3",
-    "prettier": "3.2.5",
-    "sqlite3": "^5.1.6",
-    "typescript": ">=5.3.2",
+    "pg": "^8.13.0",
+    "prettier": "3.3.3",
+    "sqlite3": "^5.1.7",
+    "typescript": ">=5.6.2",
     "vuepress": "1.9.10"
   }
 }

package/typings/objection/index.d.ts

@@ -1070,7 +1070,7 @@ declare namespace Objection {
     insert(insert: PartialModelObject<M>[]): ArrayQueryBuilder<this>;
     insert(): SingleQueryBuilder<this>;
 
-    onConflict(column?: string | string[] | true): this;
+    onConflict(column?: ColumnRef | ColumnRef[] | true): this;
     ignore(): this;
     merge(merge?: PartialModelObject<M> | string[]): this;
 
@@ -1423,6 +1423,19 @@ declare namespace Objection {
     new (): T;
   }
 
+  interface PrototypeType<T> extends Function {
+    prototype: T;
+  }
+  
+  interface ConstructorFunctionType<T = any> extends PrototypeType<T> {
+    new (...args: any[]): T;
+  }
+  
+  // for internal use on generic static this deduction, copied from https://github.com/microsoft/TypeScript/issues/5863#issuecomment-1483978415
+  type ConstructorType<T = unknown, Static extends Record<string, any> = PrototypeType<T>> = (ConstructorFunctionType<T> | PrototypeType<T>) & {
+    [Key in keyof Static]: Static[Key];
+  };  
+
   export interface ModelConstructor<M extends Model> extends Constructor<M> {}
 
   export interface ModelClass<M extends Model> extends ModelConstructor<M> {
@@ -1473,6 +1486,9 @@ declare namespace Objection {
     fromJson(json: object, opt?: ModelOptions): M;
     fromDatabaseJson(json: object): M;
 
+    columnNameToPropertyName(columnName: string): string;
+    propertyNameToColumnName(propertyName: string): string;
+
     createValidator(): Validator;
     createValidationError(args: CreateValidationErrorArgs): Error;
     createNotFoundError(queryContext: QueryContext, args: CreateNotFoundErrorArgs): Error;
@@ -1570,7 +1586,7 @@ declare namespace Objection {
     ): QueryBuilderType<M>;
 
     static relatedQuery<M extends Model, K extends keyof M>(
-      this: Constructor<M>,
+      this: ConstructorType<M>,
       relationName: K,
       trxOrKnex?: TransactionOrKnex,
     ): ArrayRelatedQueryBuilder<M[K]>;
@@ -1583,6 +1599,9 @@ declare namespace Objection {
     static fromJson<M extends Model>(this: Constructor<M>, json: object, opt?: ModelOptions): M;
     static fromDatabaseJson<M extends Model>(this: Constructor<M>, json: object): M;
 
+    static columnNameToPropertyName(columnName: string): string;
+    static propertyNameToColumnName(propertyName: string): string;
+
     static createValidator(): Validator;
     static createValidationError(args: CreateValidationErrorArgs): Error;
     static createNotFoundError(queryContext: QueryContext, args: CreateNotFoundErrorArgs): Error;
@@ -1596,7 +1615,7 @@ declare namespace Objection {
 
     static transaction<T>(callback: (trx: Transaction) => Promise<T>): Promise<T>;
     static transaction<T>(
-      trxOrKnex: TransactionOrKnex,
+      trxOrKnex: TransactionOrKnex | undefined,
       callback: (trx: Transaction) => Promise<T>,
     ): Promise<T>;