objection 3.1.5 → 3.3.0

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

@@ -0,0 +1,12 @@
+'use strict';
+
+const { ManyToManyUpdateOperationBase } = require('./ManyToManyUpdateOperationBase');
+const { ManyToManyMySqlModifyMixin } = require('../ManyToManyMySqlModifyMixin');
+
+class ManyToManyUpdateMySqlOperation extends ManyToManyMySqlModifyMixin(
+  ManyToManyUpdateOperationBase,
+) {}
+
+module.exports = {
+  ManyToManyUpdateMySqlOperation,
+};

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const { UpdateOperation } = require('../../../queryBuilder/operations/UpdateOperation');
+const { addWhereGroup } = require('../../../queryBuilder/whereGroups');
 
 class ManyToManyUpdateOperationBase extends UpdateOperation {
   constructor(name, opt) {
@@ -44,9 +45,14 @@ class ManyToManyUpdateOperationBase extends UpdateOperation {
         .childQueryOf(builder)
         .patch(this.joinTablePatch);
 
-      await this.applyModifyFilterForJoinTable(joinTableUpdateQuery).modify(
-        this.relation.joinTableModify,
+      addWhereGroup(joinTableUpdateQuery, () =>
+        this.applyModifyFilterForJoinTable(joinTableUpdateQuery),
       );
+      addWhereGroup(joinTableUpdateQuery, () =>
+        joinTableUpdateQuery.modify(this.relation.joinTableModify),
+      );
+
+      await joinTableUpdateQuery;
       return result;
     } else {
       return result;

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

@@ -0,0 +1,12 @@
+'use strict';
+
+const { ManyToManyUpdateOperationBase } = require('./ManyToManyUpdateOperationBase');
+const { ManyToManyPostgresModifyMixin } = require('../ManyToManyPostgresModifyMixin');
+
+class ManyToManyUpdatePostgresOperation extends ManyToManyPostgresModifyMixin(
+  ManyToManyUpdateOperationBase,
+) {}
+
+module.exports = {
+  ManyToManyUpdatePostgresOperation,
+};

package/lib/utils/deprecate.js

@@ -10,6 +10,12 @@ function deprecate(message) {
   }
 }
 
+// Only meant for tests that need to see a deprecation message again.
+function resetDeprecations() {
+  LOGGED_DEPRECATIONS.clear();
+}
+
 module.exports = {
   deprecate,
+  resetDeprecations,
 };

package/lib/utils/identifierMapping.js

@@ -27,6 +27,7 @@ function snakeCase(
     upperCase = false,
     underscoreBeforeDigits = false,
     underscoreBetweenUppercaseLetters = false,
+    noDoubleUnderscores = false,
   } = {},
 ) {
   if (str.length === 0) {
@@ -48,11 +49,16 @@ function snakeCase(
     const lowerChar = lower[i];
     const prevLowerChar = lower[i - 1];
 
+    // If noDoubleUnderscores is true, never insert an underscore directly
+    // after an existing one (e.g. "foo_1" stays "foo_1" instead of becoming
+    // "foo__1" when underscoreBeforeDigits is true).
+    const canInsertUnderscore = !noDoubleUnderscores || prevChar !== '_';
+
     // If underScoreBeforeDigits is true then, well, insert an underscore
     // before digits :). Only the first digit gets an underscore if
     // there are multiple.
     if (underscoreBeforeDigits && isDigit(char) && !isDigit(prevChar)) {
-      out += '_' + char;
+      out += canInsertUnderscore ? '_' + char : char;
       continue;
     }
 
@@ -65,7 +71,7 @@ function snakeCase(
       // If underscoreBetweenUppercaseLetters is true, we always place an underscore
       // before consecutive uppercase letters (e.g. "fooBAR" becomes "foo_b_a_r").
       // Otherwise, we don't (e.g. "fooBAR" becomes "foo_bar").
-      if (underscoreBetweenUppercaseLetters || !prevCharacterIsUppercase) {
+      if (canInsertUnderscore && (underscoreBetweenUppercaseLetters || !prevCharacterIsUppercase)) {
         out += '_' + lowerChar;
       } else {
         out += lowerChar;
@@ -162,10 +168,24 @@ function keyMapper(mapper) {
   };
 }
 
+// Returns a function that only calls `mapper` for the part of the input string
+// before the first `separator`, and leaves the rest untouched. For field
+// expressions like `jsonColumn:some.jsonPath` this maps the column but keeps
+// the json path as is. Column names can't contain `:`, so the first one marks
+// the boundary.
+function mapFirstPart(mapper, separator) {
+  return (str) => {
+    const idx = str.indexOf(separator);
+    return idx === -1 ? mapper(str) : mapper(str.slice(0, idx)) + str.slice(idx);
+  };
+}
+
 function snakeCaseMappers(opt = {}) {
+  const format = (str) => snakeCase(str, opt);
+
   return {
     parse: keyMapper(memoize((str) => camelCase(str, opt))),
-    format: keyMapper(memoize((str) => snakeCase(str, opt))),
+    format: keyMapper(memoize(opt.preserveJsonKeys ? mapFirstPart(format, ':') : format)),
   };
 }
 

package/lib/utils/objectUtils.js

@@ -123,13 +123,17 @@ function union(arr1, arr2) {
 }
 
 function unionSmall(arr1, arr2) {
-  const all = arr1.slice();
+  const all = [];
 
-  for (let i = 0, l = arr2.length; i < l; ++i) {
-    const item = arr2[i];
+  for (let i = 0, l = arr1.length; i < l; ++i) {
+    if (all.indexOf(arr1[i]) === -1) {
+      all.push(arr1[i]);
+    }
+  }
 
-    if (all.indexOf(item) === -1) {
-      all.push(item);
+  for (let i = 0, l = arr2.length; i < l; ++i) {
+    if (all.indexOf(arr2[i]) === -1) {
+      all.push(arr2[i]);
     }
   }
 

package/lib/utils/parseFieldExpression.js

@@ -46,6 +46,34 @@ function freezeParsedExpr(parsedExpr) {
   return parsedExpr;
 }
 
+// Formats the json path of a parsed field expression as a Postgres text array
+// literal, e.g. `{a,"",b}`. Keys that would otherwise be misread (empty keys,
+// keys with whitespace, delimiters, quotes or backslashes and `NULL`) are
+// double-quoted, with quotes and backslashes escaped.
+function toPostgresJsonPath(access) {
+  const keys = access.map(({ ref }) => {
+    const key = String(ref);
+    return key === '' || /[{}",\\\s]/.test(key) || key.toUpperCase() === 'NULL'
+      ? `"${key.replace(/["\\]/g, '\\$&')}"`
+      : key;
+  });
+  return `{${keys.join(',')}}`;
+}
+
+// Formats the json path of a parsed field expression as a quoted string literal
+// to be used in raw knex SQL, e.g. `'{a,b}'`. The path can't be passed as a
+// binding, as knex doesn't keep the order of bindings in raw columns (e.g. in
+// `whereIn(ref(...), values)`), so the keys need to be escaped instead: single
+// quotes are doubled, and `?` is escaped so that knex doesn't read it as a
+// binding placeholder. Backslashes are always doubled by `toPostgresJsonPath()`,
+// so they can't escape the closing quote either.
+function toPostgresJsonPathLiteral(access) {
+  const path = toPostgresJsonPath(access).replace(/'/g, "''").replace(/\?/g, '\\?');
+  return `'${path}'`;
+}
+
 module.exports = {
   parseFieldExpression,
+  toPostgresJsonPath,
+  toPostgresJsonPathLiteral,
 };

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "objection",
-  "version": "3.1.5",
+  "version": "3.3.0",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
   "scripts": {
     "test": "npm run eslint && mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\" && npm run test:typings",
     "test:fast": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --bail --exclude \"tests/unit/relations/files/**\"",
-    "test:typings": "tsc",
+    "test:typings": "tsc && prettier --check \"typings/**/*.ts\" \"tests/ts/**/*.ts\"",
     "prettier": "prettier --write \"{examples,lib,tests,testUtils,typings,doc}/**/*.{js,ts}\"",
     "eslint": "eslint --format codeframe \"examples/**/*.js\" \"lib/**/*.js\" \"tests/**/*.js\"",
-    "docs:dev": "vuepress dev doc",
-    "docs:build": "vuepress build doc"
+    "docs:dev": "vitepress dev doc",
+    "docs:build": "vitepress build doc",
+    "docs:preview": "vitepress preview doc"
   },
   "publishConfig": {
     "tag": "latest"
@@ -30,8 +31,12 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/vincit/objection.js.git"
+    "url": "git+https://github.com/ditojs/objection.git"
   },
+  "bugs": {
+    "url": "https://github.com/ditojs/objection/issues"
+  },
+  "homepage": "https://ditojs.github.io/objection/",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -54,27 +59,30 @@
   "types": "./typings/objection/index.d.ts",
   "dependencies": {
     "ajv": "^8.17.1",
-    "ajv-formats": "^2.1.1",
+    "ajv-formats": "^3.0.1",
     "db-errors": "^0.2.3"
   },
   "peerDependencies": {
     "knex": ">=1.0.1"
   },
   "devDependencies": {
-    "@types/node": "^22.7.0",
+    "@types/node": "^22.15.3",
+    "bluebird": "^3.7.2",
     "chai": "^4.3.10",
     "chai-subset": "^1.6.0",
     "eslint": "^8.54.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.3.1",
     "expect.js": "^0.3.1",
-    "knex": "^3.1.0",
-    "mocha": "^10.7.3",
+    "knex": "^3.3.0",
+    "lodash": "^4.18.1",
+    "mocha": "^11.2.2",
     "mysql": "^2.18.1",
-    "pg": "^8.13.0",
-    "prettier": "3.3.3",
+    "pg": "^8.15.6",
+    "prettier": "3.9.9",
     "sqlite3": "^5.1.7",
-    "typescript": ">=5.6.2",
-    "vuepress": "1.9.10"
+    "typescript": ">=5.8.3",
+    "uuid": "^9.0.1",
+    "vitepress": "1.6.4"
   }
 }