@abedmurrar/objection 4.0.0-beta.6 → 4.0.0-beta.8

package/README.md

@@ -18,7 +18,7 @@ npm install @abedmurrar/objection@next knex
 - **MySQL and MariaDB as first-class databases**, not only postgres: JSON field expressions, the `whereJson*` methods, batch inserts and an `fn.*` helper for every MySQL 8.4 function. MariaDB 10.6 and 11.4 are tested in CI. See [MySQL and MariaDB](doc/fork/mysql.md).
 - **Expressions without raw SQL**, like `Pet.ref('age').gte(3)`, `fn.count().filter(...)`, `fn.case()` and window functions. See [Expressions](doc/fork/expressions.md).
 - **Safer.** JSON field keys are escaped (in objection.js 3.1.5 they allowed SQL injection), an `orWhere()` can no longer match the rows of other relation owners, and `for()` is no longer silently ignored. See [Breaking changes](doc/fork/breaking-changes.md).
-- **Modern.** Node.js 24+, ES modules and CommonJS from one package, knex 3.3, the knex methods objection didn't have, TypeScript 7, no lodash and no bluebird, and `npm audit` reports nothing. The source is moving to TypeScript.
+- **Modern.** Node.js 24+, ES modules and CommonJS from one package, knex 3.3, the knex methods objection didn't have, no lodash and no bluebird, and `npm audit` reports nothing. The source is written in strict TypeScript and compiled with TypeScript 7.
 
 ## A quick look
 

package/lib/initialize.js

@@ -1,11 +1,10 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialize = initialize;
 async function initialize(knex, modelClasses) {
     if (!modelClasses) {
         modelClasses = knex;
         knex = modelClasses[0].knex();
     }
-    await Promise.all(modelClasses.map((modelClass) => modelClass.fetchTableMetadata({ knex })));
+    await Promise.all(modelClasses.map((modelClass) => modelClass.fetchTableMetadata({ knex: knex })));
 }
-module.exports = {
-    initialize,
-};

package/lib/model/AjvValidator.js

@@ -1,22 +1,27 @@
-'use strict';
-const Ajv = require('ajv');
-const addFormats = require('ajv-formats');
-const { Validator } = require('./Validator');
-const { ValidationErrorType } = require('../model/ValidationError');
-const { isObject, cloneDeep: cloneDeepValue, omit } = require('../utils/objectUtils');
-class AjvValidator extends Validator {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AjvValidator = void 0;
+const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
+const Validator_1 = require("./Validator");
+const ValidationError_1 = require("../model/ValidationError");
+const objectUtils_1 = require("../utils/objectUtils");
+class AjvValidator extends Validator_1.Validator {
     static init(self, conf) {
         super.init(self, conf);
         self.ajvOptions = Object.assign({}, conf.options, {
             allErrors: true,
         });
         // Create a normal Ajv instance.
-        self.ajv = new Ajv(Object.assign({
+        self.ajv = new ajv_1.default(Object.assign({
             useDefaults: true,
         }, self.ajvOptions));
         // Create an instance that doesn't set default values. We need this one
         // to validate `patch` objects (objects that have a subset of properties).
-        self.ajvNoDefaults = new Ajv(Object.assign({}, self.ajvOptions, {
+        self.ajvNoDefaults = new ajv_1.default(Object.assign({}, self.ajvOptions, {
             useDefaults: false,
         }));
         // Caches for the compiled validator functions: by the serialized schema,
@@ -29,7 +34,7 @@ class AjvValidator extends Validator {
             }
             // Only add Ajv formats if they weren't added in user-space already
             if (!ajv.formats['date-time']) {
-                addFormats(ajv);
+                (0, ajv_formats_1.default)(ajv);
             }
         };
         setupAjv(self.ajv);
@@ -74,7 +79,7 @@ class AjvValidator extends Validator {
         // runs once per schema object. Classes bound to a knex instance share their
         // validator with the class they are bound from, and a bound class can have
         // a schema of its own, so the cache isn't keyed by the class name.
-        const isClassSchema = jsonSchema === modelClass.getJsonSchema() && isObject(jsonSchema);
+        const isClassSchema = jsonSchema === modelClass.getJsonSchema() && (0, objectUtils_1.isObject)(jsonSchema);
         let validators = isClassSchema ? this.schemaCache.get(jsonSchema) : undefined;
         let validator = null;
         if (!validators) {
@@ -119,6 +124,7 @@ class AjvValidator extends Validator {
         return this.ajv.compile(jsonSchema);
     }
 }
+exports.AjvValidator = AjvValidator;
 function parseValidationError(errors, modelClass, options, ajvOptions) {
     if (!errors) {
         return null;
@@ -165,23 +171,23 @@ function parseValidationError(errors, modelClass, options, ajvOptions) {
         return null;
     }
     return modelClass.createValidationError({
-        type: ValidationErrorType.ModelValidation,
+        type: ValidationError_1.ValidationErrorType.ModelValidation,
         data: errorHash,
     });
 }
 function cloneDeep(obj) {
-    if (isObject(obj) && obj.$isObjectionModel) {
+    if ((0, objectUtils_1.isObject)(obj) && obj.$isObjectionModel) {
         return obj.$clone();
     }
     else {
-        return cloneDeepValue(obj);
+        return (0, objectUtils_1.cloneDeep)(obj);
     }
 }
 // Whether a schema has default values is checked for every validated model,
 // so the answer is cached per schema object.
 const setsDefaultValuesCache = new WeakMap();
 function setsDefaultValues(jsonSchema) {
-    if (!isObject(jsonSchema)) {
+    if (!(0, objectUtils_1.isObject)(jsonSchema)) {
         return jsonSchema && jsonSchema.properties && hasDefaults(jsonSchema.properties);
     }
     let result = setsDefaultValuesCache.get(jsonSchema);
@@ -202,7 +208,7 @@ function hasDefaults(obj) {
 function arrayHasDefaults(arr) {
     for (let i = 0, l = arr.length; i < l; ++i) {
         const val = arr[i];
-        if (isObject(val) && hasDefaults(val)) {
+        if ((0, objectUtils_1.isObject)(val) && hasDefaults(val)) {
             return true;
         }
     }
@@ -217,7 +223,7 @@ function objectHasDefaults(obj) {
         }
         else {
             const val = obj[key];
-            if (isObject(val) && hasDefaults(val)) {
+            if ((0, objectUtils_1.isObject)(val) && hasDefaults(val)) {
                 return true;
             }
         }
@@ -226,7 +232,7 @@ function objectHasDefaults(obj) {
 }
 function jsonSchemaWithoutRequired(jsonSchema) {
     const subSchemaProps = ['anyOf', 'oneOf', 'allOf', 'not', 'then', 'else', 'properties'];
-    return Object.assign(omit(jsonSchema, ['required', ...subSchemaProps]), ...subSchemaProps.map((prop) => subSchemaWithoutRequired(jsonSchema, prop)), jsonSchema && jsonSchema.definitions && Object.keys(jsonSchema.definitions).length > 0
+    return Object.assign((0, objectUtils_1.omit)(jsonSchema, ['required', ...subSchemaProps]), ...subSchemaProps.map((prop) => subSchemaWithoutRequired(jsonSchema, prop)), jsonSchema && jsonSchema.definitions && Object.keys(jsonSchema.definitions).length > 0
         ? {
             definitions: Object.assign(...Object.keys(jsonSchema.definitions).map((prop) => ({
                 [prop]: jsonSchemaWithoutRequired(jsonSchema.definitions[prop]),
@@ -273,6 +279,3 @@ function jsonSchemaArrayWithoutRequired(jsonSchemaArray) {
 function isNotEmptyObject(obj) {
     return Object.keys(obj).length !== 0;
 }
-module.exports = {
-    AjvValidator,
-};