objection 3.0.4 → 3.0.5

package/lib/model/AjvValidator.js

@@ -1,17 +1,11 @@
 'use strict';
 
+const Ajv = require('ajv');
+const addFormats = require('ajv-formats');
 const { Validator } = require('./Validator');
 const { ValidationErrorType } = require('../model/ValidationError');
 const { isObject, once, cloneDeep: lodashCloneDeep, omit } = require('../utils/objectUtils');
 
-const getAjv = once(() => {
-  try {
-    return require('ajv');
-  } catch (err) {
-    throw new Error('Optional ajv dependency not installed. Please run `npm install ajv --save`');
-  }
-});
-
 class AjvValidator extends Validator {
   static init(self, conf) {
     super.init(self, conf);
@@ -20,8 +14,6 @@ class AjvValidator extends Validator {
       allErrors: true,
     });
 
-    const Ajv = getAjv();
-
     // Create a normal Ajv instance.
     self.ajv = new Ajv(
       Object.assign(
@@ -43,8 +35,13 @@ class AjvValidator extends Validator {
     // A cache for the compiled validator functions.
     self.cache = new Map();
 
-    conf.onCreateAjv(self.ajv);
-    conf.onCreateAjv(self.ajvNoDefaults);
+    const setupAjv = (ajv) => {
+      addFormats(ajv);
+      conf.onCreateAjv(ajv);
+    };
+
+    setupAjv(self.ajv);
+    setupAjv(self.ajvNoDefaults);
   }
 
   beforeValidate({ json, model, options, ctx }) {
@@ -256,7 +253,7 @@ function jsonSchemaWithoutRequired(jsonSchema) {
   return Object.assign(
     omit(jsonSchema, ['required', ...subSchemaProps]),
     ...subSchemaProps.map((prop) => subSchemaWithoutRequired(jsonSchema, prop)),
-    jsonSchema && jsonSchema.definitions
+    jsonSchema && jsonSchema.definitions && Object.keys(jsonSchema.definitions).length > 0
       ? {
           definitions: Object.assign(
             ...Object.keys(jsonSchema.definitions).map((prop) => ({
@@ -264,6 +261,9 @@ function jsonSchemaWithoutRequired(jsonSchema) {
             }))
           ),
         }
+      : {},
+    jsonSchema.discriminator && jsonSchema.discriminator.propertyName
+      ? { required: [jsonSchema.discriminator.propertyName] }
       : {}
   );
 }

package/lib/queryBuilder/QueryBuilderBase.js

@@ -345,6 +345,10 @@ class QueryBuilderBase extends QueryBuilderOperationSupport {
     return this.addOperation(new KnexOperation('intersect'), args);
   }
 
+  except(...args) {
+    return this.addOperation(new KnexOperation('except'), args);
+  }
+
   having(...args) {
     return this.addOperation(new KnexOperation('having'), args);
   }

package/lib/queryBuilder/operations/eager/WhereInEagerOperation.js

@@ -4,7 +4,7 @@ const promiseUtils = require('../../../utils/promiseUtils');
 
 const { EagerOperation } = require('./EagerOperation');
 const { isMsSql, isOracle, isSqlite } = require('../../../utils/knexUtils');
-const { asArray, flatten, chunk } = require('../../../utils/objectUtils');
+const { isObject, asArray, flatten, chunk } = require('../../../utils/objectUtils');
 const { ValidationErrorType } = require('../../../model/ValidationError');
 const { createModifier } = require('../../../utils/createModifier');
 const { RelationDoesNotExistError } = require('../../../model/RelationDoesNotExistError');
@@ -63,7 +63,8 @@ class WhereInEagerOperation extends EagerOperation {
 
     const models = asArray(result);
 
-    if (!models.length) {
+    // Check models to be actual objects, to filter out `count` results (#2397).
+    if (!models.length || !isObject(models[0])) {
       return result;
     }
 

package/lib/relations/RelationOwner.js

@@ -187,7 +187,10 @@ function isQueryBuilder(item) {
 
 function findFirstNonPartialAncestorQuery(builder) {
   builder = builder.parentQuery();
-
+  if (!builder)
+    throw Error(
+      'query method `for` ommitted outside a subquery, can not figure out relation target'
+    );
   while (builder.isPartial()) {
     if (!builder.parentQuery()) {
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -54,6 +54,7 @@
   "types": "./typings/objection/index.d.ts",
   "dependencies": {
     "ajv": "^8.6.2",
+    "ajv-formats": "^2.1.1",
     "db-errors": "^0.2.3"
   },
   "peerDependencies": {

package/typings/objection/index.d.ts

@@ -194,9 +194,7 @@ declare namespace Objection {
   /**
    * A Pojo version of model.
    */
-  type ModelObject<T extends Model> = {
-    [K in DataPropertyNames<T>]: T[K];
-  };
+  type ModelObject<T extends Model> = Pick<T, DataPropertyNames<T>>;
 
   /**
    * Any object that has some of the properties of model class T match this type.
@@ -234,10 +232,10 @@ declare namespace Objection {
   type PartialModelGraphField<F> = Defined<F> extends Model
     ? PartialModelGraph<Defined<F>>
     : Defined<F> extends Array<infer I>
-      ? I extends Model
-        ? PartialModelGraph<I>[]
-        : Expression<F>
-      : Expression<F>;
+    ? I extends Model
+      ? PartialModelGraph<I>[]
+      : Expression<F>
+    : Expression<F>;
 
   /**
    * Extracts the property names (excluding relations) of a model class.
@@ -709,9 +707,7 @@ declare namespace Objection {
     <QB extends AnyQueryBuilder>(
       this: QB,
       column: string | Raw | (string | Raw)[]
-    ): QB extends NumberQueryBuilder<QB>
-      ? ArrayQueryBuilder<QB>
-      : QB;
+    ): QB extends NumberQueryBuilder<QB> ? ArrayQueryBuilder<QB> : QB;
   }
 
   interface TimeoutOptions {
@@ -995,6 +991,7 @@ declare namespace Objection {
     union: UnionMethod<this>;
     unionAll: UnionMethod<this>;
     intersect: SetOperationsMethod<this>;
+    except: SetOperationsMethod<this>;
 
     with: WithMethod<this>;
     withRecursive: WithMethod<this>;