objection 3.1.0 → 3.1.2

package/lib/queryBuilder/operations/UpsertGraphOperation.js

@@ -10,7 +10,7 @@ class UpsertGraphOperation extends QueryBuilderOperation {
       name,
       Object.assign({}, opt, {
         upsertOptions: {},
-      })
+      }),
     );
 
     this.upsertOptions = opt.upsertOptions || {};
@@ -43,7 +43,7 @@ class UpsertGraphOperation extends QueryBuilderOperation {
   onAfter1(builder) {
     if (hasOtherSqlModifyingQueryBuilderCalls(builder)) {
       throw new Error(
-        'upsertGraph query should contain no other query builder calls like `findById`, `where` or `$relatedQuery` that would affect the SQL. They have no effect.'
+        'upsertGraph query should contain no other query builder calls like `findById`, `where` or `$relatedQuery` that would affect the SQL. They have no effect.',
       );
     }
 

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

@@ -41,7 +41,7 @@ class WhereInEagerOperation extends EagerOperation {
   onBuild(builder) {
     const relationsToFetch = findRelationsToFetch(
       builder.modelClass(),
-      this.buildFinalExpression()
+      this.buildFinalExpression(),
     );
 
     const { selectionsToAdd, selectedProps } = findRelationPropsToSelect(builder, relationsToFetch);
@@ -71,7 +71,7 @@ class WhereInEagerOperation extends EagerOperation {
     await promiseUtils.map(
       this.relationsToFetch,
       (it) => this.fetchRelation(builder, models, it.relation, it.childExpression),
-      { concurrency: modelClass.getConcurrency(builder.unsafeKnex()) }
+      { concurrency: modelClass.getConcurrency(builder.unsafeKnex()) },
     );
 
     const intOpt = builder.internalOptions();
@@ -103,7 +103,7 @@ class WhereInEagerOperation extends EagerOperation {
       (batch) => this.fetchRelationBatch(builder, batch, relation, expr),
       {
         concurrency: modelClass.getConcurrency(builder.unsafeKnex()),
-      }
+      },
     );
 
     return flatten(result);

package/lib/queryBuilder/operations/jsonApi/WhereJsonHasPostgresOperation.js

@@ -11,7 +11,7 @@ class WhereJsonHasPostgresOperation extends ObjectionToKnexConvertingOperation {
       builder.knex(),
       args[0],
       this.opt.operator,
-      args[1]
+      args[1],
     );
 
     if (this.opt.bool === 'or') {

package/lib/queryBuilder/operations/jsonApi/WhereJsonNotObjectPostgresOperation.js

@@ -15,7 +15,7 @@ class WhereJsonNotObjectPostgresOperation extends ObjectionToKnexConvertingOpera
         fieldExpression,
         '@>',
         this.opt.compareValue,
-        'not'
+        'not',
       );
 
       builder.orWhereRaw(jsonApi.whereJsonFieldQuery(knex, fieldExpression, 'IS', null));

package/lib/queryBuilder/operations/jsonApi/WhereJsonPostgresOperation.js

@@ -11,7 +11,7 @@ class WhereJsonPostgresOperation extends ObjectionToKnexConvertingOperation {
       args[0],
       this.opt.operator,
       args[1],
-      this.opt.prefix
+      this.opt.prefix,
     );
 
     if (this.opt.bool === 'or') {

package/lib/queryBuilder/operations/jsonApi/postgresJsonApi.js

@@ -55,13 +55,13 @@ function whereJsonbRefOnLeftJsonbValOrRefOnRight(
   fieldExpression,
   operator,
   jsonObjectOrFieldExpression,
-  queryPrefix
+  queryPrefix,
 ) {
   let queryParams = whereJsonbRefOnLeftJsonbValOrRefOnRightRawQueryParams(
     fieldExpression,
     operator,
     jsonObjectOrFieldExpression,
-    queryPrefix
+    queryPrefix,
   );
   return builder.whereRaw.apply(builder, queryParams);
 }
@@ -70,7 +70,7 @@ function whereJsonbRefOnLeftJsonbValOrRefOnRightRawQueryParams(
   fieldExpression,
   operator,
   jsonObjectOrFieldExpression,
-  queryPrefix
+  queryPrefix,
 ) {
   let fieldReference = parseFieldExpression(fieldExpression);
 

package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeMsSqlOperation.js

@@ -36,7 +36,7 @@ class WhereInCompositeMsSqlOperation extends ObjectionToKnexConvertingOperation
         knexBuilder,
         columns,
         helperColumns,
-        values.as(knex.raw(`V(${helperColumns.map((_) => '??')})`, helperColumns))
+        values.as(knex.raw(`V(${helperColumns.map((_) => '??')})`, helperColumns)),
       );
     }
   }
@@ -51,8 +51,8 @@ class WhereInCompositeMsSqlOperation extends ObjectionToKnexConvertingOperation
         `(VALUES ${values
           .map((value) => `(${value.map((_) => '?').join(',')})`)
           .join(',')}) AS V(${helperColumns.map((_) => '??').join(',')})`,
-        flatten(values).concat(helperColumns)
-      )
+        flatten(values).concat(helperColumns),
+      ),
     );
   }
 
@@ -60,8 +60,8 @@ class WhereInCompositeMsSqlOperation extends ObjectionToKnexConvertingOperation
     const wrapperQuery = knex.from(subQuery).where(
       zipObject(
         helperColumns,
-        columns.map((column) => knex.raw('??', column))
-      )
+        columns.map((column) => knex.raw('??', column)),
+      ),
     );
 
     if (this.prefix === 'not') {

package/lib/queryBuilder/parsers/jsonFieldExpressionParser.js

@@ -229,7 +229,7 @@ function peg$parse(input, options) {
     throw peg$buildStructuredError(
       [peg$otherExpectation(description)],
       input.substring(peg$savedPos, peg$currPos),
-      location
+      location,
     );
   }
 
@@ -333,7 +333,7 @@ function peg$parse(input, options) {
       peg$SyntaxError.buildMessage(expected, found),
       expected,
       found,
-      location
+      location,
     );
   }
 
@@ -875,7 +875,7 @@ function peg$parse(input, options) {
       peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos),
     );
   }
 }

package/lib/queryBuilder/parsers/relationExpressionParser.js

@@ -229,7 +229,7 @@ function peg$parse(input, options) {
     peg$c9 = peg$classExpectation(
       ['[', ']', '(', ')', ',', '.', ' ', '\t', '\r', '\n'],
       true,
-      false
+      false,
     ),
     peg$c10 = '(',
     peg$c11 = peg$literalExpectation('(', false),
@@ -293,7 +293,7 @@ function peg$parse(input, options) {
     throw peg$buildStructuredError(
       [peg$otherExpectation(description)],
       input.substring(peg$savedPos, peg$currPos),
-      location
+      location,
     );
   }
 
@@ -397,7 +397,7 @@ function peg$parse(input, options) {
       peg$SyntaxError.buildMessage(expected, found),
       expected,
       found,
-      location
+      location,
     );
   }
 
@@ -996,7 +996,7 @@ function peg$parse(input, options) {
   function assertDuplicateRelation(node, expr) {
     if (expr.$name in node) {
       console.warn(
-        `Duplicate relation "${expr.$name}" in a relation expression. You should use "a.[b, c]" instead of "[a.b, a.c]". This will cause an error in objection 2.0`
+        `Duplicate relation "${expr.$name}" in a relation expression. You should use "a.[b, c]" instead of "[a.b, a.c]". This will cause an error in objection 2.0`,
       );
 
       // TODO: enable for v2.0.
@@ -1031,7 +1031,7 @@ function peg$parse(input, options) {
       peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos),
     );
   }
 }

package/lib/relations/Relation.js

@@ -140,7 +140,7 @@ class Relation {
       relatedJoinSelectQuery = this.relatedModelClass.query().childQueryOf(builder),
       relatedTable = builder.tableNameFor(this.relatedModelClass),
       ownerTable = builder.tableRefFor(this.ownerModelClass),
-    } = {}
+    } = {},
   ) {
     let relatedJoinSelect = this.applyModify(relatedJoinSelectQuery).as(relatedTableAlias);
 
@@ -278,7 +278,7 @@ function resolveRelatedModelClass(ctx) {
     relatedModelClass = resolveModel(
       ctx.mapping.modelClass,
       ctx.ownerModelClass.modelPaths,
-      'modelClass'
+      'modelClass',
     );
   } catch (err) {
     throw ctx.createError(err.message);
@@ -304,7 +304,7 @@ function createJoinProperties(ctx) {
 
   if (!mapping.join || !mapping.join.from || !mapping.join.to) {
     throw ctx.createError(
-      'join must be an object that maps the columns of the related models together. For example: {from: "SomeTable.id", to: "SomeOtherTable.someModelId"}'
+      'join must be an object that maps the columns of the related models together. For example: {from: "SomeTable.id", to: "SomeOtherTable.someModelId"}',
     );
   }
 
@@ -326,7 +326,7 @@ function createJoinProperties(ctx) {
 
   if (ownerProp.props.some((it) => it === ctx.name)) {
     throw ctx.createError(
-      `join: relation name and join property '${ctx.name}' cannot have the same name. If you cannot change one or the other, you can use $parseDatabaseJson and $formatDatabaseJson methods to convert the column name.`
+      `join: relation name and join property '${ctx.name}' cannot have the same name. If you cannot change one or the other, you can use $parseDatabaseJson and $formatDatabaseJson methods to convert the column name.`,
     );
   }
 
@@ -345,11 +345,11 @@ function createRelationProperty(ctx, refString, propName) {
   } catch (err) {
     if (err instanceof RelationProperty.ModelNotFoundError) {
       throw ctx.createError(
-        `join: either \`from\` or \`to\` must point to the owner model table and the other one to the related table. It might be that specified table '${err.tableName}' is not correct`
+        `join: either \`from\` or \`to\` must point to the owner model table and the other one to the related table. It might be that specified table '${err.tableName}' is not correct`,
       );
     } else if (err instanceof RelationProperty.InvalidReferenceError) {
       throw ctx.createError(
-        `${propName} must have format TableName.columnName. For example "SomeTable.id" or in case of composite key ["SomeTable.a", "SomeTable.b"].`
+        `${propName} must have format TableName.columnName. For example "SomeTable.id" or in case of composite key ["SomeTable.a", "SomeTable.b"].`,
       );
     } else {
       throw err;

package/lib/relations/RelationOwner.js

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

package/lib/relations/belongsToOne/BelongsToOneUnrelateOperation.js

@@ -48,7 +48,7 @@ class BelongsToOneUnrelateOperation extends UnrelateOperation {
         this.relation.ownerModelClass
           .relatedQuery(this.relation.name)
           .copyFrom(builder, builder.constructor.JoinSelector)
-          .copyFrom(builder, builder.constructor.WhereSelector)
+          .copyFrom(builder, builder.constructor.WhereSelector),
       );
     }
 

package/lib/relations/hasMany/HasManyInsertOperation.js

@@ -51,7 +51,7 @@ function assertOwnerIsSingleItem(owner, relation) {
 
         'If you need to insert items for multiple parents, simply loop through them.',
         `That's the most performant way.`,
-      ].join(' ')
+      ].join(' '),
     );
   }
 }

package/lib/relations/hasMany/HasManyRelateOperation.js

@@ -50,7 +50,7 @@ function assertOwnerIsSingleItem(owner, relation) {
 
         'If you need to relate items for multiple parents, simply loop through them.',
         `That's the most performant way.`,
-      ].join(' ')
+      ].join(' '),
     );
   }
 }

package/lib/relations/manyToMany/ManyToManyRelation.js

@@ -104,7 +104,7 @@ class ManyToManyRelation extends Relation {
       relatedTable = defaultRelatedTable(this, builder),
       ownerTable = defaultOwnerTable(this, builder),
       joinTableAlias = defaultJoinTableAlias(this, relatedTableAlias, builder),
-    } = {}
+    } = {},
   ) {
     let relatedJoinSelect = this.applyModify(relatedJoinSelectQuery).as(relatedTableAlias);
 
@@ -274,7 +274,7 @@ class ManyToManyRelation extends Relation {
     return mapAfterAllReturn(
       models,
       (model) => this.joinTableBeforeInsert(model, queryContext),
-      result
+      result,
     );
   }
 }
@@ -334,7 +334,7 @@ function checkThroughObject(ctx) {
 
   if (!mapping.join.through.from || !mapping.join.through.to) {
     throw ctx.createError(
-      'join.through must be an object that describes the join table. For example: {from: "JoinTable.someId", to: "JoinTable.someOtherId"}'
+      'join.through must be an object that describes the join table. For example: {from: "JoinTable.someId", to: "JoinTable.someOtherId"}',
     );
   }
 
@@ -349,7 +349,7 @@ function resolveJoinModelClassIfDefined(ctx) {
       joinTableModelClass = resolveModel(
         ctx.mapping.join.through.modelClass,
         ctx.ownerModelClass.modelPaths,
-        'join.through.modelClass'
+        'join.through.modelClass',
       );
     } catch (err) {
       throw ctx.createError(err.message);
@@ -420,7 +420,7 @@ function createRelationProperty(ctx, refString, messagePrefix) {
       throw ctx.createError('join.through `from` and `to` must point to the same join table.');
     } else {
       throw ctx.createError(
-        `${messagePrefix} must have format JoinTable.columnName. For example "JoinTable.someId" or in case of composite key ["JoinTable.a", "JoinTable.b"].`
+        `${messagePrefix} must have format JoinTable.columnName. For example "JoinTable.someId" or in case of composite key ["JoinTable.a", "JoinTable.b"].`,
       );
     }
   }

package/lib/relations/manyToMany/delete/ManyToManyDeleteSqliteOperation.js

@@ -4,7 +4,7 @@ const { ManyToManyDeleteOperationBase } = require('./ManyToManyDeleteOperationBa
 const { ManyToManySqliteModifyMixin } = require('../ManyToManySqliteModifyMixin');
 
 class ManyToManyDeleteSqliteOperation extends ManyToManySqliteModifyMixin(
-  ManyToManyDeleteOperationBase
+  ManyToManyDeleteOperationBase,
 ) {}
 
 module.exports = {

package/lib/relations/manyToMany/relate/ManyToManyRelateOperation.js

@@ -21,7 +21,7 @@ class ManyToManyRelateOperation extends RelateOperation {
     for (const ownerValue of ownerValues) {
       for (const relatedValue of this.ids) {
         joinModels.push(
-          joinModelClass.fromJson(this.relation.createJoinModel(ownerValue, relatedValue))
+          joinModelClass.fromJson(this.relation.createJoinModel(ownerValue, relatedValue)),
         );
       }
     }
@@ -58,7 +58,7 @@ function assertOwnerIsSingleItem(builder, owner, relation) {
   if (isPostgres(builder.unsafeKnex())) {
     if (!isModels && !isIdentifiers && !isQueryBuilder) {
       throw new Error(
-        'Parent must be a list of identifiers or a list of models when relating a ManyToManyRelation'
+        'Parent must be a list of identifiers or a list of models when relating a ManyToManyRelation',
       );
     }
   } else {
@@ -70,7 +70,7 @@ function assertOwnerIsSingleItem(builder, owner, relation) {
 
           'If you need to relate items for multiple parents, simply loop through them.',
           `That's the most performant way.`,
-        ].join(' ')
+        ].join(' '),
       );
     }
   }

package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateSqliteOperation.js

@@ -4,7 +4,7 @@ const { ManyToManyUnrelateOperationBase } = require('./ManyToManyUnrelateOperati
 const { ManyToManySqliteModifyMixin } = require('../ManyToManySqliteModifyMixin');
 
 class ManyToManyUnrelateSqliteOperation extends ManyToManySqliteModifyMixin(
-  ManyToManyUnrelateOperationBase
+  ManyToManyUnrelateOperationBase,
 ) {
   get modifyMainQuery() {
     return false;

package/lib/relations/manyToMany/update/ManyToManyUpdateOperationBase.js

@@ -45,7 +45,7 @@ class ManyToManyUpdateOperationBase extends UpdateOperation {
         .patch(this.joinTablePatch);
 
       await this.applyModifyFilterForJoinTable(joinTableUpdateQuery).modify(
-        this.relation.joinTableModify
+        this.relation.joinTableModify,
       );
       return result;
     } else {

package/lib/relations/manyToMany/update/ManyToManyUpdateSqliteOperation.js

@@ -4,7 +4,7 @@ const { ManyToManyUpdateOperationBase } = require('./ManyToManyUpdateOperationBa
 const { ManyToManySqliteModifyMixin } = require('../ManyToManySqliteModifyMixin');
 
 class ManyToManyUpdateSqliteOperation extends ManyToManySqliteModifyMixin(
-  ManyToManyUpdateOperationBase
+  ManyToManyUpdateOperationBase,
 ) {}
 
 module.exports = {

package/lib/transaction.js

@@ -8,8 +8,8 @@ function transaction() {
   if (arguments.length < 2) {
     return Promise.reject(
       new Error(
-        'objection.transaction: provide at least one Model class to bind to the transaction or a knex instance'
-      )
+        'objection.transaction: provide at least one Model class to bind to the transaction or a knex instance',
+      ),
     );
   }
 
@@ -29,7 +29,7 @@ function transaction() {
     for (i = 0; i < modelClasses.length; ++i) {
       if (!isModelClass(modelClasses[i])) {
         return Promise.reject(
-          new Error('objection.transaction: all but the last argument should be Model subclasses')
+          new Error('objection.transaction: all but the last argument should be Model subclasses'),
         );
       }
     }
@@ -39,8 +39,8 @@ function transaction() {
       if (modelClasses[i].knex() !== knex) {
         return Promise.reject(
           new Error(
-            'objection.transaction: all Model subclasses must be bound to the same database'
-          )
+            'objection.transaction: all Model subclasses must be bound to the same database',
+          ),
         );
       }
     }
@@ -71,8 +71,8 @@ transaction.start = function (modelClassOrKnex) {
   if (!knex || !isFunction(knex.transaction)) {
     return Promise.reject(
       new Error(
-        'objection.transaction.start: first argument must be a model class or a knex instance'
-      )
+        'objection.transaction.start: first argument must be a model class or a knex instance',
+      ),
     );
   }
 

package/lib/utils/assert.js

@@ -6,7 +6,7 @@ function assertHasId(model) {
     const ids = modelClass.getIdColumnArray().join(', ');
 
     throw new Error(
-      `one of the identifier columns [${ids}] is null or undefined. Have you specified the correct identifier column for the model '${modelClass.name}' using the 'idColumn' property?`
+      `one of the identifier columns [${ids}] is null or undefined. Have you specified the correct identifier column for the model '${modelClass.name}' using the 'idColumn' property?`,
     );
   }
 }

package/lib/utils/clone.js

@@ -325,7 +325,7 @@
         .call(hasOwnProperty)
         .replace(reRegExpChar, '\\$&')
         .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') +
-      '$'
+      '$',
   );
 
   /** Built-in value references. */
@@ -1923,7 +1923,7 @@
   var isArguments = baseIsArguments(
     (function () {
       return arguments;
-    })()
+    })(),
   )
     ? baseIsArguments
     : function (value) {

package/lib/utils/identifierMapping.js

@@ -27,7 +27,7 @@ function snakeCase(
     upperCase = false,
     underscoreBeforeDigits = false,
     underscoreBetweenUppercaseLetters = false,
-  } = {}
+  } = {},
 ) {
   if (str.length === 0) {
     return str;

package/lib/utils/normalizeIds.js

@@ -122,7 +122,7 @@ function checkProperties(ret, prop) {
 
       if (typeof val === 'undefined') {
         throw new Error(
-          `expected id ${JSON.stringify(obj)} to have property ${prop.propDescription(j)}`
+          `expected id ${JSON.stringify(obj)} to have property ${prop.propDescription(j)}`,
         );
       }
     }

package/lib/utils/resolveModel.js

@@ -20,7 +20,7 @@ function resolveModel(modelRef, modelPaths, errorPrefix) {
 
       if (!isModelClass(modelRef)) {
         throw new ResolveError(
-          `is not a subclass of Model or a file path to a module that exports one. You may be dealing with a require loop. See the documentation section about require loops.`
+          `is not a subclass of Model or a file path to a module that exports one. You may be dealing with a require loop. See the documentation section about require loops.`,
         );
       }
 
@@ -77,7 +77,7 @@ function requireModel(modelPath) {
       if (isModelClass(exp)) {
         if (modelClass !== null) {
           throw new ResolveError(
-            `path ${modelPath} exports multiple models. Don't know which one to choose.`
+            `path ${modelPath} exports multiple models. Don't know which one to choose.`,
           );
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
@@ -66,15 +66,15 @@
     "chai-subset": "^1.6.0",
     "eslint": "^8.1.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "expect.js": "^0.3.1",
     "knex": ">=1.0.1",
     "mocha": "^10.2.0",
     "mysql": "^2.18.1",
     "pg": "^8.7.1",
-    "prettier": "2.8.8",
+    "prettier": "3.0.3",
     "sqlite3": "^5.0.2",
     "typescript": ">=4.5.4",
-    "vuepress": "1.9.9"
+    "vuepress": "1.9.10"
   }
 }