objection 4.0.0-rc.2 → 4.0.0-rc.4

package/lib/queryBuilder/jsonDialects/JsonDialect.js

@@ -17,6 +17,12 @@ export class JsonDialect {
     return sql;
   }
 
+  // The value that the path updates of a column start from, an empty one where
+  // the column is NULL, as `set()` leaves NULL as it is.
+  setBase(sql, access) {
+    return `COALESCE(${sql}, '${access[0].type === 'array' ? '[]' : '{}'}')`;
+  }
+
   // Reference the bare column if there is no path, so that the database can use
   // its indexes.
   field(sql, access) {

package/lib/queryBuilder/operations/UpdateOperation.js

@@ -70,8 +70,11 @@ export class UpdateOperation extends QueryBuilderOperation {
     if (this.modelOptions.patch) {
       return knexBuilder.update(convertFieldExpressionsToRaw(builder, json));
     } else {
-      checkFieldExpressions(builder.modelClass(), this.model, 'update');
-      return knexBuilder.update(json);
+      const { fieldExpressionKeys } = builder.internalOptions();
+      checkFieldExpressions(builder.modelClass(), this.model, 'update', fieldExpressionKeys);
+      return knexBuilder.update(
+        fieldExpressionKeys.length > 0 ? convertFieldExpressionsToRaw(builder, json) : json,
+      );
     }
   }
 

package/lib/queryBuilder/operations/fieldExpressions.js

@@ -7,13 +7,14 @@ import { ValidationErrorType } from '../../model/ValidationError.js';
 import { getQueryPropKeys } from '../../model/modelQueryProps.js';
 
 // Inserts and updates write whole values, so they can't write into json
-// columns with field expressions like `'meta:color'`. Keys with a ':' that don't
-// parse as field expressions are columns, as in the query properties.
-export function checkFieldExpressions(modelClass, model, operation) {
+// columns with field expressions like `'meta:color'`, except for the
+// `allowedKeys` of internal writes. Keys with a ':' that don't parse as field
+// expressions are columns, as in the query properties.
+export function checkFieldExpressions(modelClass, model, operation, allowedKeys = []) {
   const keys = getFieldExpressionKeys(modelClass, [
     ...Object.keys(model),
     ...getQueryPropKeys(model),
-  ]);
+  ]).filter((key) => !allowedKeys.includes(key));
 
   if (keys.length > 0) {
     throw modelClass.createValidationError({
@@ -48,7 +49,7 @@ export function convertFieldExpressionsToRaw(builder, json) {
 
     if (getFieldExpressionColumn(key, declaredColumns) !== null) {
       // 'col:attr' : ref('other:lol') is transformed to
-      // "col" : raw(`jsonb_set("table"."col", '{attr}', to_jsonb("other"#>'{lol}'), true)`)
+      // "col" : raw(`jsonb_set(COALESCE("table"."col", '{}'), '{attr}', to_jsonb("other"#>'{lol}'), true)`)
       // on Postgres, with the column qualified, as it is ambiguous with
       // `excluded` in merge().
       dialect.checkSupport();
@@ -82,9 +83,11 @@ export function convertFieldExpressionsToRaw(builder, json) {
         val = JSON.stringify(val);
       }
 
+      const { access } = parsed.parsedExpr;
+      const previous = convertedJson[parsed.column];
       convertedJson[parsed.column] = knex.raw(
-        dialect.set('??', parsed.parsedExpr.access, valuePlaceholder),
-        [convertedJson[parsed.column] || `${builder.tableRef()}.${parsed.column}`, val],
+        dialect.set(previous ? '??' : dialect.setBase('??', access), access, valuePlaceholder),
+        [previous || `${builder.tableRef()}.${parsed.column}`, val],
       );
     } else {
       convertedJson[key] = val;

package/lib/relations/RelationProperty.js

@@ -126,6 +126,12 @@ export class RelationProperty {
     return this._propSetters[index](obj, value);
   }
 
+  // Returns true if the index:th column is a key at the top level of a json
+  // column.
+  isJsonKey(index) {
+    return this._refs[index].parsedExpr.access.length === 1;
+  }
+
   // Returns an instance of ReferenceBuilder that points to the index:th
   // value of a row.
   ref(builder, index) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objection",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.4",
   "description": "An SQL-friendly ORM for Node.js",
   "type": "module",
   "main": "lib/objection.js",
@@ -17,7 +17,7 @@
     "test": "pnpm eslint && vitest run && pnpm test:typings",
     "test:fast": "vitest run --bail 1",
     "test:watch": "vitest",
-    "test:typings": "tsc && tsc -p tests/ts/strict && tsc -p tests/bench/typings && prettier --check \"typings/**/*.ts\" \"tests/ts/**/*.ts\" \"tests/bench/typings/app/*.ts\"",
+    "test:typings": "tsc && tsc -p tests/ts/strict && tsc -p tests/bench/typings && node tests/ts/completions.js && prettier --check \"typings/**/*.ts\" \"tests/ts/**/*.ts\" \"tests/bench/typings/*.ts\" \"tests/bench/typings/app/*.ts\"",
     "bench:typings": "node tests/bench/typings/bench.js",
     "db:up": "docker compose up -d --wait",
     "db:down": "docker compose --profile mssql down -v",
@@ -91,6 +91,7 @@
     "sqlite3": "^6.0.1",
     "tedious": "^20.3.7",
     "typescript": "^7.0.0",
+    "typescript-5": "npm:typescript@5.8.3",
     "vitepress": "1.6.4",
     "vitest": "^4.1.11"
   }