@contember/engine-content-api 2.1.0-alpha.9 → 2.1.0-beta.2

package/dist/production/src/mapper/update/UpdateBuilder.cjs

@@ -41,76 +41,72 @@ class UpdateBuilder {
     this.addOldWhere(predicate);
   }
   async execute(mapper) {
-    try {
-      const resolvedData = [...this.rowData.values()];
-      if (Object.keys(resolvedData).length === 0) {
-        return { values: [], affectedRows: null, executed: false };
-      }
-      const oldColSuffix = "_old__";
-      const qb = Database.UpdateBuilder.create().with("newData_", (qb2) => {
-        qb2 = resolvedData.reduce(
-          (qb3, value) => qb3.select(
-            (expr) => expr.selectValue(
-              ColumnValue.normalizeDbValue(value.value, value.columnType),
-              value.columnType
-            ),
-            value.columnName
-          ).select(["root_", value.columnName], value.columnName + oldColSuffix),
-          qb2
-        );
-        const columns = new Set(resolvedData.map((it) => it.columnName));
-        const allColumns = Object.values(
-          schemaUtils.acceptEveryFieldVisitor(this.schema, this.entity, {
-            visitColumn: ({ column }) => column.columnName,
-            visitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,
-            visitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,
-            visitManyHasManyInverse: () => null,
-            visitManyHasManyOwning: () => null,
-            visitOneHasOneInverse: () => null,
-            visitOneHasMany: () => null
-          })
-        ).filter((it) => it !== null);
-        const remainingColumns = allColumns.filter((it) => !columns.has(it));
-        qb2 = qb2.from(this.entity.tableName, "root_");
-        qb2 = remainingColumns.reduce((qb3, columnName) => qb3.select(["root_", columnName]), qb2);
-        qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([]), {
-          and: [{
-            [this.entity.primary]: { eq: this.primary }
-          }, this.oldWhere]
-        });
-        return qb2;
-      }).table(this.entity.tableName).values(
-        resolvedData.reduce(
-          (result2, item) => ({
-            ...result2,
-            [item.columnName]: (expr) => expr.select(["newData_", item.columnName])
-          }),
-          {}
-        )
-      ).returning(...resolvedData.map((it) => it.columnName + oldColSuffix)).from((qb2) => {
-        qb2 = qb2.from("newData_");
-        const col1 = tuple.tuple(this.entity.tableName, this.entity.primaryColumn);
-        const col2 = tuple.tuple("newData_", this.entity.primaryColumn);
-        qb2 = qb2.where((expr) => expr.compareColumns(col1, Database.Operator.eq, col2));
-        qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([], "newData_"), this.newWhere);
-        return qb2;
+    const resolvedData = [...this.rowData.values()];
+    if (Object.keys(resolvedData).length === 0) {
+      return { values: [], affectedRows: null, executed: false };
+    }
+    const oldColSuffix = "_old__";
+    const qb = Database.UpdateBuilder.create().with("newData_", (qb2) => {
+      qb2 = resolvedData.reduce(
+        (qb3, value) => qb3.select(
+          (expr) => expr.selectValue(
+            ColumnValue.normalizeDbValue(value.value, value.columnType),
+            value.columnType
+          ),
+          value.columnName
+        ).select(["root_", value.columnName], value.columnName + oldColSuffix),
+        qb2
+      );
+      const columns = new Set(resolvedData.map((it) => it.columnName));
+      const allColumns = Object.values(
+        schemaUtils.acceptEveryFieldVisitor(this.schema, this.entity, {
+          visitColumn: ({ column }) => column.columnName,
+          visitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,
+          visitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,
+          visitManyHasManyInverse: () => null,
+          visitManyHasManyOwning: () => null,
+          visitOneHasOneInverse: () => null,
+          visitOneHasMany: () => null
+        })
+      ).filter((it) => it !== null);
+      const remainingColumns = allColumns.filter((it) => !columns.has(it));
+      qb2 = qb2.from(this.entity.tableName, "root_");
+      qb2 = remainingColumns.reduce((qb3, columnName) => qb3.select(["root_", columnName]), qb2);
+      qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([]), {
+        and: [{
+          [this.entity.primary]: { eq: this.primary }
+        }, this.oldWhere]
       });
-      const beforeEvent = new EventManager.BeforeUpdateEvent(this.entity, resolvedData, this.primary);
-      await mapper.eventManager.fire(beforeEvent);
-      const result = await qb.execute(mapper.db);
-      if (result.length === 1) {
-        const eventData = resolvedData.map((it) => ({
-          ...it,
-          old: result[0][it.columnName + oldColSuffix]
-        }));
-        const afterUpdateEvent = new EventManager.AfterUpdateEvent(this.entity, eventData, this.primary);
-        beforeEvent.afterEvent = afterUpdateEvent;
-        await mapper.eventManager.fire(afterUpdateEvent);
-      }
-      return { values: resolvedData, affectedRows: result.length, executed: true };
-    } catch (e) {
-      throw e;
+      return qb2;
+    }).table(this.entity.tableName).values(
+      resolvedData.reduce(
+        (result2, item) => ({
+          ...result2,
+          [item.columnName]: (expr) => expr.select(["newData_", item.columnName])
+        }),
+        {}
+      )
+    ).returning(...resolvedData.map((it) => it.columnName + oldColSuffix)).from((qb2) => {
+      qb2 = qb2.from("newData_");
+      const col1 = tuple.tuple(this.entity.tableName, this.entity.primaryColumn);
+      const col2 = tuple.tuple("newData_", this.entity.primaryColumn);
+      qb2 = qb2.where((expr) => expr.compareColumns(col1, Database.Operator.eq, col2));
+      qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([], "newData_"), this.newWhere);
+      return qb2;
+    });
+    const beforeEvent = new EventManager.BeforeUpdateEvent(this.entity, resolvedData, this.primary);
+    await mapper.eventManager.fire(beforeEvent);
+    const result = await qb.execute(mapper.db);
+    if (result.length === 1) {
+      const eventData = resolvedData.map((it) => ({
+        ...it,
+        old: result[0][it.columnName + oldColSuffix]
+      }));
+      const afterUpdateEvent = new EventManager.AfterUpdateEvent(this.entity, eventData, this.primary);
+      beforeEvent.afterEvent = afterUpdateEvent;
+      await mapper.eventManager.fire(afterUpdateEvent);
     }
+    return { values: resolvedData, affectedRows: result.length, executed: true };
   }
 }
 exports.UpdateBuilder = UpdateBuilder;

package/dist/production/src/mapper/update/UpdateBuilder.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateBuilder.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilder.ts"],"sourcesContent":["import { tuple } from '../../utils'\nimport { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptEveryFieldVisitor, getColumnName, getColumnType } from '@contember/schema-utils'\nimport { Operator, QueryBuilder, UpdateBuilder as DbUpdateBuilder, Value as DbValue } from '@contember/database'\nimport { PathFactory, WhereBuilder } from '../select'\nimport { ColumnValue, normalizeDbValue } from '../ColumnValue'\nimport { PredicateFactory } from '../../acl'\nimport { AfterUpdateEvent, BeforeUpdateEvent } from '../EventManager'\nimport { Mapper } from '../Mapper'\n\nexport interface UpdateResult {\n\tvalues: ColumnValue[]\n\texecuted: boolean\n\taffectedRows: number | null\n}\n\nexport class UpdateBuilder {\n\tprivate rowData: Map<string, ColumnValue> = new Map()\n\n\tprivate newWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\tprivate oldWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly entity: Model.Entity,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly primary: Input.PrimaryValue,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic addFieldValue(\n\t\tfieldName: string,\n\t\tvalue: Value.FieldValue | undefined,\n\t): void {\n\t\tif (value === undefined) {\n\t\t\treturn\n\t\t}\n\t\tconst columnName = getColumnName(this.schema, this.entity, fieldName)\n\t\tconst columnType = getColumnType(this.schema, this.entity, fieldName)\n\n\t\tthis.rowData.set(columnName, { columnName, value, columnType, fieldName })\n\t}\n\n\tpublic addNewWhere(where: Input.OptionalWhere): void {\n\t\tthis.newWhere.and.push(where)\n\t}\n\n\tpublic addOldWhere(where: Input.OptionalWhere): void {\n\t\tthis.oldWhere.and.push(where)\n\t}\n\n\tpublic addPredicates(fields: string[]): void {\n\t\tconst predicate = this.predicateFactory.create(this.entity, Acl.Operation.update, fields)\n\t\tthis.addNewWhere(predicate)\n\t\tthis.addOldWhere(predicate)\n\t}\n\n\tpublic async execute(mapper: Mapper): Promise<UpdateResult> {\n\t\ttry {\n\t\t\tconst resolvedData = [...this.rowData.values()]\n\t\t\tif (Object.keys(resolvedData).length === 0) {\n\t\t\t\treturn { values: [], affectedRows: null, executed: false }\n\t\t\t}\n\t\t\tconst oldColSuffix = '_old__'\n\n\t\t\tconst qb = DbUpdateBuilder.create()\n\t\t\t\t.with('newData_', qb => {\n\t\t\t\t\tqb = resolvedData.reduce(\n\t\t\t\t\t\t(qb, value) =>\n\t\t\t\t\t\t\tqb\n\t\t\t\t\t\t\t\t.select(\n\t\t\t\t\t\t\t\t\texpr => expr.selectValue(\n\t\t\t\t\t\t\t\t\t\tnormalizeDbValue(value.value, value.columnType),\n\t\t\t\t\t\t\t\t\t\tvalue.columnType,\n\t\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t\t\tvalue.columnName,\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t.select(['root_', value.columnName], value.columnName + oldColSuffix),\n\t\t\t\t\t\tqb,\n\t\t\t\t\t)\n\t\t\t\t\tconst columns = new Set(resolvedData.map(it => it.columnName))\n\t\t\t\t\tconst allColumns: string[] = Object.values(\n\t\t\t\t\t\tacceptEveryFieldVisitor(this.schema, this.entity, {\n\t\t\t\t\t\t\tvisitColumn: ({ column }) => column.columnName,\n\t\t\t\t\t\t\tvisitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\t\tvisitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\t\tvisitManyHasManyInverse: () => null,\n\t\t\t\t\t\t\tvisitManyHasManyOwning: () => null,\n\t\t\t\t\t\t\tvisitOneHasOneInverse: () => null,\n\t\t\t\t\t\t\tvisitOneHasMany: () => null,\n\t\t\t\t\t\t}),\n\t\t\t\t\t).filter((it): it is string => it !== null)\n\n\t\t\t\t\tconst remainingColumns = allColumns.filter(it => !columns.has(it))\n\t\t\t\t\tqb = qb.from(this.entity.tableName, 'root_')\n\n\t\t\t\t\tqb = remainingColumns.reduce((qb, columnName) => qb.select(['root_', columnName]), qb)\n\n\t\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([]), {\n\t\t\t\t\t\tand: [{\n\t\t\t\t\t\t\t[this.entity.primary]: { eq: this.primary },\n\t\t\t\t\t\t}, this.oldWhere],\n\t\t\t\t\t})\n\n\t\t\t\t\treturn qb\n\t\t\t\t})\n\t\t\t\t.table(this.entity.tableName)\n\t\t\t\t.values(\n\t\t\t\t\tresolvedData.reduce<QueryBuilder.ColumnExpressionMap>(\n\t\t\t\t\t\t(result: object, item) => ({\n\t\t\t\t\t\t\t...result,\n\t\t\t\t\t\t\t[item.columnName]: expr => expr.select(['newData_', item.columnName]),\n\t\t\t\t\t\t}),\n\t\t\t\t\t\t{},\n\t\t\t\t\t),\n\t\t\t\t)\n\t\t\t\t.returning(...resolvedData.map(it => it.columnName + oldColSuffix))\n\t\t\t\t.from(qb => {\n\t\t\t\t\tqb = qb.from('newData_')\n\t\t\t\t\tconst col1 = tuple(this.entity.tableName, this.entity.primaryColumn)\n\t\t\t\t\tconst col2 = tuple('newData_', this.entity.primaryColumn)\n\t\t\t\t\tqb = qb.where(expr => expr.compareColumns(col1, Operator.eq, col2))\n\t\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([], 'newData_'), this.newWhere)\n\t\t\t\t\treturn qb\n\t\t\t\t})\n\n\n\t\t\tconst beforeEvent = new BeforeUpdateEvent(this.entity, resolvedData, this.primary)\n\t\t\tawait mapper.eventManager.fire(beforeEvent)\n\n\t\t\tconst result = await qb.execute(mapper.db)\n\n\t\t\tif (result.length === 1) {\n\t\t\t\tconst eventData = (resolvedData).map(it => ({\n\t\t\t\t\t...it,\n\t\t\t\t\told: result[0][it.columnName + oldColSuffix],\n\t\t\t\t}))\n\t\t\t\tconst afterUpdateEvent = new AfterUpdateEvent(this.entity, eventData, this.primary)\n\t\t\t\tbeforeEvent.afterEvent = afterUpdateEvent\n\t\t\t\tawait mapper.eventManager.fire(afterUpdateEvent)\n\t\t\t}\n\n\t\t\treturn { values: resolvedData, affectedRows: result.length, executed: true }\n\t\t} catch (e) {\n\t\t\tthrow e\n\t\t}\n\t}\n}\n"],"names":["schema","getColumnName","getColumnType","Acl","DbUpdateBuilder","qb","normalizeDbValue","acceptEveryFieldVisitor","result","tuple","Operator","BeforeUpdateEvent","AfterUpdateEvent"],"mappings":"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"}
+{"version":3,"file":"UpdateBuilder.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilder.ts"],"sourcesContent":["import { tuple } from '../../utils'\nimport { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptEveryFieldVisitor, getColumnName, getColumnType } from '@contember/schema-utils'\nimport { Operator, QueryBuilder, UpdateBuilder as DbUpdateBuilder, Value as DbValue } from '@contember/database'\nimport { PathFactory, WhereBuilder } from '../select'\nimport { ColumnValue, normalizeDbValue } from '../ColumnValue'\nimport { PredicateFactory } from '../../acl'\nimport { AfterUpdateEvent, BeforeUpdateEvent } from '../EventManager'\nimport { Mapper } from '../Mapper'\n\nexport interface UpdateResult {\n\tvalues: ColumnValue[]\n\texecuted: boolean\n\taffectedRows: number | null\n}\n\nexport class UpdateBuilder {\n\tprivate rowData: Map<string, ColumnValue> = new Map()\n\n\tprivate newWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\tprivate oldWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly entity: Model.Entity,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly primary: Input.PrimaryValue,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic addFieldValue(\n\t\tfieldName: string,\n\t\tvalue: Value.FieldValue | undefined,\n\t): void {\n\t\tif (value === undefined) {\n\t\t\treturn\n\t\t}\n\t\tconst columnName = getColumnName(this.schema, this.entity, fieldName)\n\t\tconst columnType = getColumnType(this.schema, this.entity, fieldName)\n\n\t\tthis.rowData.set(columnName, { columnName, value, columnType, fieldName })\n\t}\n\n\tpublic addNewWhere(where: Input.OptionalWhere): void {\n\t\tthis.newWhere.and.push(where)\n\t}\n\n\tpublic addOldWhere(where: Input.OptionalWhere): void {\n\t\tthis.oldWhere.and.push(where)\n\t}\n\n\tpublic addPredicates(fields: string[]): void {\n\t\tconst predicate = this.predicateFactory.create(this.entity, Acl.Operation.update, fields)\n\t\tthis.addNewWhere(predicate)\n\t\tthis.addOldWhere(predicate)\n\t}\n\n\tpublic async execute(mapper: Mapper): Promise<UpdateResult> {\n\t\tconst resolvedData = [...this.rowData.values()]\n\t\tif (Object.keys(resolvedData).length === 0) {\n\t\t\treturn { values: [], affectedRows: null, executed: false }\n\t\t}\n\t\tconst oldColSuffix = '_old__'\n\n\t\tconst qb = DbUpdateBuilder.create()\n\t\t\t.with('newData_', qb => {\n\t\t\t\tqb = resolvedData.reduce(\n\t\t\t\t\t(qb, value) =>\n\t\t\t\t\t\tqb\n\t\t\t\t\t\t\t.select(\n\t\t\t\t\t\t\t\texpr =>\n\t\t\t\t\t\t\t\t\texpr.selectValue(\n\t\t\t\t\t\t\t\t\t\tnormalizeDbValue(value.value, value.columnType),\n\t\t\t\t\t\t\t\t\t\tvalue.columnType,\n\t\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t\tvalue.columnName,\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t.select(['root_', value.columnName], value.columnName + oldColSuffix),\n\t\t\t\t\tqb,\n\t\t\t\t)\n\t\t\t\tconst columns = new Set(resolvedData.map(it => it.columnName))\n\t\t\t\tconst allColumns: string[] = Object.values(\n\t\t\t\t\tacceptEveryFieldVisitor(this.schema, this.entity, {\n\t\t\t\t\t\tvisitColumn: ({ column }) => column.columnName,\n\t\t\t\t\t\tvisitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\tvisitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\tvisitManyHasManyInverse: () => null,\n\t\t\t\t\t\tvisitManyHasManyOwning: () => null,\n\t\t\t\t\t\tvisitOneHasOneInverse: () => null,\n\t\t\t\t\t\tvisitOneHasMany: () => null,\n\t\t\t\t\t}),\n\t\t\t\t).filter((it): it is string => it !== null)\n\n\t\t\t\tconst remainingColumns = allColumns.filter(it => !columns.has(it))\n\t\t\t\tqb = qb.from(this.entity.tableName, 'root_')\n\n\t\t\t\tqb = remainingColumns.reduce((qb, columnName) => qb.select(['root_', columnName]), qb)\n\n\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([]), {\n\t\t\t\t\tand: [{\n\t\t\t\t\t\t[this.entity.primary]: { eq: this.primary },\n\t\t\t\t\t}, this.oldWhere],\n\t\t\t\t})\n\n\t\t\t\treturn qb\n\t\t\t})\n\t\t\t.table(this.entity.tableName)\n\t\t\t.values(\n\t\t\t\tresolvedData.reduce<QueryBuilder.ColumnExpressionMap>(\n\t\t\t\t\t(result: object, item) => ({\n\t\t\t\t\t\t...result,\n\t\t\t\t\t\t[item.columnName]: expr => expr.select(['newData_', item.columnName]),\n\t\t\t\t\t}),\n\t\t\t\t\t{},\n\t\t\t\t),\n\t\t\t)\n\t\t\t.returning(...resolvedData.map(it => it.columnName + oldColSuffix))\n\t\t\t.from(qb => {\n\t\t\t\tqb = qb.from('newData_')\n\t\t\t\tconst col1 = tuple(this.entity.tableName, this.entity.primaryColumn)\n\t\t\t\tconst col2 = tuple('newData_', this.entity.primaryColumn)\n\t\t\t\tqb = qb.where(expr => expr.compareColumns(col1, Operator.eq, col2))\n\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([], 'newData_'), this.newWhere)\n\t\t\t\treturn qb\n\t\t\t})\n\n\t\tconst beforeEvent = new BeforeUpdateEvent(this.entity, resolvedData, this.primary)\n\t\tawait mapper.eventManager.fire(beforeEvent)\n\n\t\tconst result = await qb.execute(mapper.db)\n\n\t\tif (result.length === 1) {\n\t\t\tconst eventData = resolvedData.map(it => ({\n\t\t\t\t...it,\n\t\t\t\told: result[0][it.columnName + oldColSuffix],\n\t\t\t}))\n\t\t\tconst afterUpdateEvent = new AfterUpdateEvent(this.entity, eventData, this.primary)\n\t\t\tbeforeEvent.afterEvent = afterUpdateEvent\n\t\t\tawait mapper.eventManager.fire(afterUpdateEvent)\n\t\t}\n\n\t\treturn { values: resolvedData, affectedRows: result.length, executed: true }\n\t}\n}\n"],"names":["schema","getColumnName","getColumnType","Acl","DbUpdateBuilder","qb","normalizeDbValue","acceptEveryFieldVisitor","result","tuple","Operator","BeforeUpdateEvent","AfterUpdateEvent"],"mappings":"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"}

package/dist/production/src/mapper/update/UpdateBuilder.js

@@ -39,76 +39,72 @@ class UpdateBuilder {
     this.addOldWhere(predicate);
   }
   async execute(mapper) {
-    try {
-      const resolvedData = [...this.rowData.values()];
-      if (Object.keys(resolvedData).length === 0) {
-        return { values: [], affectedRows: null, executed: false };
-      }
-      const oldColSuffix = "_old__";
-      const qb = UpdateBuilder$1.create().with("newData_", (qb2) => {
-        qb2 = resolvedData.reduce(
-          (qb3, value) => qb3.select(
-            (expr) => expr.selectValue(
-              normalizeDbValue(value.value, value.columnType),
-              value.columnType
-            ),
-            value.columnName
-          ).select(["root_", value.columnName], value.columnName + oldColSuffix),
-          qb2
-        );
-        const columns = new Set(resolvedData.map((it) => it.columnName));
-        const allColumns = Object.values(
-          acceptEveryFieldVisitor(this.schema, this.entity, {
-            visitColumn: ({ column }) => column.columnName,
-            visitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,
-            visitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,
-            visitManyHasManyInverse: () => null,
-            visitManyHasManyOwning: () => null,
-            visitOneHasOneInverse: () => null,
-            visitOneHasMany: () => null
-          })
-        ).filter((it) => it !== null);
-        const remainingColumns = allColumns.filter((it) => !columns.has(it));
-        qb2 = qb2.from(this.entity.tableName, "root_");
-        qb2 = remainingColumns.reduce((qb3, columnName) => qb3.select(["root_", columnName]), qb2);
-        qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([]), {
-          and: [{
-            [this.entity.primary]: { eq: this.primary }
-          }, this.oldWhere]
-        });
-        return qb2;
-      }).table(this.entity.tableName).values(
-        resolvedData.reduce(
-          (result2, item) => ({
-            ...result2,
-            [item.columnName]: (expr) => expr.select(["newData_", item.columnName])
-          }),
-          {}
-        )
-      ).returning(...resolvedData.map((it) => it.columnName + oldColSuffix)).from((qb2) => {
-        qb2 = qb2.from("newData_");
-        const col1 = tuple(this.entity.tableName, this.entity.primaryColumn);
-        const col2 = tuple("newData_", this.entity.primaryColumn);
-        qb2 = qb2.where((expr) => expr.compareColumns(col1, Operator.eq, col2));
-        qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([], "newData_"), this.newWhere);
-        return qb2;
+    const resolvedData = [...this.rowData.values()];
+    if (Object.keys(resolvedData).length === 0) {
+      return { values: [], affectedRows: null, executed: false };
+    }
+    const oldColSuffix = "_old__";
+    const qb = UpdateBuilder$1.create().with("newData_", (qb2) => {
+      qb2 = resolvedData.reduce(
+        (qb3, value) => qb3.select(
+          (expr) => expr.selectValue(
+            normalizeDbValue(value.value, value.columnType),
+            value.columnType
+          ),
+          value.columnName
+        ).select(["root_", value.columnName], value.columnName + oldColSuffix),
+        qb2
+      );
+      const columns = new Set(resolvedData.map((it) => it.columnName));
+      const allColumns = Object.values(
+        acceptEveryFieldVisitor(this.schema, this.entity, {
+          visitColumn: ({ column }) => column.columnName,
+          visitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,
+          visitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,
+          visitManyHasManyInverse: () => null,
+          visitManyHasManyOwning: () => null,
+          visitOneHasOneInverse: () => null,
+          visitOneHasMany: () => null
+        })
+      ).filter((it) => it !== null);
+      const remainingColumns = allColumns.filter((it) => !columns.has(it));
+      qb2 = qb2.from(this.entity.tableName, "root_");
+      qb2 = remainingColumns.reduce((qb3, columnName) => qb3.select(["root_", columnName]), qb2);
+      qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([]), {
+        and: [{
+          [this.entity.primary]: { eq: this.primary }
+        }, this.oldWhere]
       });
-      const beforeEvent = new BeforeUpdateEvent(this.entity, resolvedData, this.primary);
-      await mapper.eventManager.fire(beforeEvent);
-      const result = await qb.execute(mapper.db);
-      if (result.length === 1) {
-        const eventData = resolvedData.map((it) => ({
-          ...it,
-          old: result[0][it.columnName + oldColSuffix]
-        }));
-        const afterUpdateEvent = new AfterUpdateEvent(this.entity, eventData, this.primary);
-        beforeEvent.afterEvent = afterUpdateEvent;
-        await mapper.eventManager.fire(afterUpdateEvent);
-      }
-      return { values: resolvedData, affectedRows: result.length, executed: true };
-    } catch (e) {
-      throw e;
+      return qb2;
+    }).table(this.entity.tableName).values(
+      resolvedData.reduce(
+        (result2, item) => ({
+          ...result2,
+          [item.columnName]: (expr) => expr.select(["newData_", item.columnName])
+        }),
+        {}
+      )
+    ).returning(...resolvedData.map((it) => it.columnName + oldColSuffix)).from((qb2) => {
+      qb2 = qb2.from("newData_");
+      const col1 = tuple(this.entity.tableName, this.entity.primaryColumn);
+      const col2 = tuple("newData_", this.entity.primaryColumn);
+      qb2 = qb2.where((expr) => expr.compareColumns(col1, Operator.eq, col2));
+      qb2 = this.whereBuilder.build(qb2, this.entity, this.pathFactory.create([], "newData_"), this.newWhere);
+      return qb2;
+    });
+    const beforeEvent = new BeforeUpdateEvent(this.entity, resolvedData, this.primary);
+    await mapper.eventManager.fire(beforeEvent);
+    const result = await qb.execute(mapper.db);
+    if (result.length === 1) {
+      const eventData = resolvedData.map((it) => ({
+        ...it,
+        old: result[0][it.columnName + oldColSuffix]
+      }));
+      const afterUpdateEvent = new AfterUpdateEvent(this.entity, eventData, this.primary);
+      beforeEvent.afterEvent = afterUpdateEvent;
+      await mapper.eventManager.fire(afterUpdateEvent);
     }
+    return { values: resolvedData, affectedRows: result.length, executed: true };
   }
 }
 export {

package/dist/production/src/mapper/update/UpdateBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateBuilder.js","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilder.ts"],"sourcesContent":["import { tuple } from '../../utils'\nimport { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptEveryFieldVisitor, getColumnName, getColumnType } from '@contember/schema-utils'\nimport { Operator, QueryBuilder, UpdateBuilder as DbUpdateBuilder, Value as DbValue } from '@contember/database'\nimport { PathFactory, WhereBuilder } from '../select'\nimport { ColumnValue, normalizeDbValue } from '../ColumnValue'\nimport { PredicateFactory } from '../../acl'\nimport { AfterUpdateEvent, BeforeUpdateEvent } from '../EventManager'\nimport { Mapper } from '../Mapper'\n\nexport interface UpdateResult {\n\tvalues: ColumnValue[]\n\texecuted: boolean\n\taffectedRows: number | null\n}\n\nexport class UpdateBuilder {\n\tprivate rowData: Map<string, ColumnValue> = new Map()\n\n\tprivate newWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\tprivate oldWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly entity: Model.Entity,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly primary: Input.PrimaryValue,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic addFieldValue(\n\t\tfieldName: string,\n\t\tvalue: Value.FieldValue | undefined,\n\t): void {\n\t\tif (value === undefined) {\n\t\t\treturn\n\t\t}\n\t\tconst columnName = getColumnName(this.schema, this.entity, fieldName)\n\t\tconst columnType = getColumnType(this.schema, this.entity, fieldName)\n\n\t\tthis.rowData.set(columnName, { columnName, value, columnType, fieldName })\n\t}\n\n\tpublic addNewWhere(where: Input.OptionalWhere): void {\n\t\tthis.newWhere.and.push(where)\n\t}\n\n\tpublic addOldWhere(where: Input.OptionalWhere): void {\n\t\tthis.oldWhere.and.push(where)\n\t}\n\n\tpublic addPredicates(fields: string[]): void {\n\t\tconst predicate = this.predicateFactory.create(this.entity, Acl.Operation.update, fields)\n\t\tthis.addNewWhere(predicate)\n\t\tthis.addOldWhere(predicate)\n\t}\n\n\tpublic async execute(mapper: Mapper): Promise<UpdateResult> {\n\t\ttry {\n\t\t\tconst resolvedData = [...this.rowData.values()]\n\t\t\tif (Object.keys(resolvedData).length === 0) {\n\t\t\t\treturn { values: [], affectedRows: null, executed: false }\n\t\t\t}\n\t\t\tconst oldColSuffix = '_old__'\n\n\t\t\tconst qb = DbUpdateBuilder.create()\n\t\t\t\t.with('newData_', qb => {\n\t\t\t\t\tqb = resolvedData.reduce(\n\t\t\t\t\t\t(qb, value) =>\n\t\t\t\t\t\t\tqb\n\t\t\t\t\t\t\t\t.select(\n\t\t\t\t\t\t\t\t\texpr => expr.selectValue(\n\t\t\t\t\t\t\t\t\t\tnormalizeDbValue(value.value, value.columnType),\n\t\t\t\t\t\t\t\t\t\tvalue.columnType,\n\t\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t\t\tvalue.columnName,\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t.select(['root_', value.columnName], value.columnName + oldColSuffix),\n\t\t\t\t\t\tqb,\n\t\t\t\t\t)\n\t\t\t\t\tconst columns = new Set(resolvedData.map(it => it.columnName))\n\t\t\t\t\tconst allColumns: string[] = Object.values(\n\t\t\t\t\t\tacceptEveryFieldVisitor(this.schema, this.entity, {\n\t\t\t\t\t\t\tvisitColumn: ({ column }) => column.columnName,\n\t\t\t\t\t\t\tvisitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\t\tvisitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\t\tvisitManyHasManyInverse: () => null,\n\t\t\t\t\t\t\tvisitManyHasManyOwning: () => null,\n\t\t\t\t\t\t\tvisitOneHasOneInverse: () => null,\n\t\t\t\t\t\t\tvisitOneHasMany: () => null,\n\t\t\t\t\t\t}),\n\t\t\t\t\t).filter((it): it is string => it !== null)\n\n\t\t\t\t\tconst remainingColumns = allColumns.filter(it => !columns.has(it))\n\t\t\t\t\tqb = qb.from(this.entity.tableName, 'root_')\n\n\t\t\t\t\tqb = remainingColumns.reduce((qb, columnName) => qb.select(['root_', columnName]), qb)\n\n\t\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([]), {\n\t\t\t\t\t\tand: [{\n\t\t\t\t\t\t\t[this.entity.primary]: { eq: this.primary },\n\t\t\t\t\t\t}, this.oldWhere],\n\t\t\t\t\t})\n\n\t\t\t\t\treturn qb\n\t\t\t\t})\n\t\t\t\t.table(this.entity.tableName)\n\t\t\t\t.values(\n\t\t\t\t\tresolvedData.reduce<QueryBuilder.ColumnExpressionMap>(\n\t\t\t\t\t\t(result: object, item) => ({\n\t\t\t\t\t\t\t...result,\n\t\t\t\t\t\t\t[item.columnName]: expr => expr.select(['newData_', item.columnName]),\n\t\t\t\t\t\t}),\n\t\t\t\t\t\t{},\n\t\t\t\t\t),\n\t\t\t\t)\n\t\t\t\t.returning(...resolvedData.map(it => it.columnName + oldColSuffix))\n\t\t\t\t.from(qb => {\n\t\t\t\t\tqb = qb.from('newData_')\n\t\t\t\t\tconst col1 = tuple(this.entity.tableName, this.entity.primaryColumn)\n\t\t\t\t\tconst col2 = tuple('newData_', this.entity.primaryColumn)\n\t\t\t\t\tqb = qb.where(expr => expr.compareColumns(col1, Operator.eq, col2))\n\t\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([], 'newData_'), this.newWhere)\n\t\t\t\t\treturn qb\n\t\t\t\t})\n\n\n\t\t\tconst beforeEvent = new BeforeUpdateEvent(this.entity, resolvedData, this.primary)\n\t\t\tawait mapper.eventManager.fire(beforeEvent)\n\n\t\t\tconst result = await qb.execute(mapper.db)\n\n\t\t\tif (result.length === 1) {\n\t\t\t\tconst eventData = (resolvedData).map(it => ({\n\t\t\t\t\t...it,\n\t\t\t\t\told: result[0][it.columnName + oldColSuffix],\n\t\t\t\t}))\n\t\t\t\tconst afterUpdateEvent = new AfterUpdateEvent(this.entity, eventData, this.primary)\n\t\t\t\tbeforeEvent.afterEvent = afterUpdateEvent\n\t\t\t\tawait mapper.eventManager.fire(afterUpdateEvent)\n\t\t\t}\n\n\t\t\treturn { values: resolvedData, affectedRows: result.length, executed: true }\n\t\t} catch (e) {\n\t\t\tthrow e\n\t\t}\n\t}\n}\n"],"names":["DbUpdateBuilder","qb","result"],"mappings":"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"}
+{"version":3,"file":"UpdateBuilder.js","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilder.ts"],"sourcesContent":["import { tuple } from '../../utils'\nimport { Acl, Input, Model, Value } from '@contember/schema'\nimport { acceptEveryFieldVisitor, getColumnName, getColumnType } from '@contember/schema-utils'\nimport { Operator, QueryBuilder, UpdateBuilder as DbUpdateBuilder, Value as DbValue } from '@contember/database'\nimport { PathFactory, WhereBuilder } from '../select'\nimport { ColumnValue, normalizeDbValue } from '../ColumnValue'\nimport { PredicateFactory } from '../../acl'\nimport { AfterUpdateEvent, BeforeUpdateEvent } from '../EventManager'\nimport { Mapper } from '../Mapper'\n\nexport interface UpdateResult {\n\tvalues: ColumnValue[]\n\texecuted: boolean\n\taffectedRows: number | null\n}\n\nexport class UpdateBuilder {\n\tprivate rowData: Map<string, ColumnValue> = new Map()\n\n\tprivate newWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\tprivate oldWhere: { and: Input.OptionalWhere[] } = { and: [] }\n\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly entity: Model.Entity,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly primary: Input.PrimaryValue,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic addFieldValue(\n\t\tfieldName: string,\n\t\tvalue: Value.FieldValue | undefined,\n\t): void {\n\t\tif (value === undefined) {\n\t\t\treturn\n\t\t}\n\t\tconst columnName = getColumnName(this.schema, this.entity, fieldName)\n\t\tconst columnType = getColumnType(this.schema, this.entity, fieldName)\n\n\t\tthis.rowData.set(columnName, { columnName, value, columnType, fieldName })\n\t}\n\n\tpublic addNewWhere(where: Input.OptionalWhere): void {\n\t\tthis.newWhere.and.push(where)\n\t}\n\n\tpublic addOldWhere(where: Input.OptionalWhere): void {\n\t\tthis.oldWhere.and.push(where)\n\t}\n\n\tpublic addPredicates(fields: string[]): void {\n\t\tconst predicate = this.predicateFactory.create(this.entity, Acl.Operation.update, fields)\n\t\tthis.addNewWhere(predicate)\n\t\tthis.addOldWhere(predicate)\n\t}\n\n\tpublic async execute(mapper: Mapper): Promise<UpdateResult> {\n\t\tconst resolvedData = [...this.rowData.values()]\n\t\tif (Object.keys(resolvedData).length === 0) {\n\t\t\treturn { values: [], affectedRows: null, executed: false }\n\t\t}\n\t\tconst oldColSuffix = '_old__'\n\n\t\tconst qb = DbUpdateBuilder.create()\n\t\t\t.with('newData_', qb => {\n\t\t\t\tqb = resolvedData.reduce(\n\t\t\t\t\t(qb, value) =>\n\t\t\t\t\t\tqb\n\t\t\t\t\t\t\t.select(\n\t\t\t\t\t\t\t\texpr =>\n\t\t\t\t\t\t\t\t\texpr.selectValue(\n\t\t\t\t\t\t\t\t\t\tnormalizeDbValue(value.value, value.columnType),\n\t\t\t\t\t\t\t\t\t\tvalue.columnType,\n\t\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t\tvalue.columnName,\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t.select(['root_', value.columnName], value.columnName + oldColSuffix),\n\t\t\t\t\tqb,\n\t\t\t\t)\n\t\t\t\tconst columns = new Set(resolvedData.map(it => it.columnName))\n\t\t\t\tconst allColumns: string[] = Object.values(\n\t\t\t\t\tacceptEveryFieldVisitor(this.schema, this.entity, {\n\t\t\t\t\t\tvisitColumn: ({ column }) => column.columnName,\n\t\t\t\t\t\tvisitManyHasOne: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\tvisitOneHasOneOwning: ({ relation }) => relation.joiningColumn.columnName,\n\t\t\t\t\t\tvisitManyHasManyInverse: () => null,\n\t\t\t\t\t\tvisitManyHasManyOwning: () => null,\n\t\t\t\t\t\tvisitOneHasOneInverse: () => null,\n\t\t\t\t\t\tvisitOneHasMany: () => null,\n\t\t\t\t\t}),\n\t\t\t\t).filter((it): it is string => it !== null)\n\n\t\t\t\tconst remainingColumns = allColumns.filter(it => !columns.has(it))\n\t\t\t\tqb = qb.from(this.entity.tableName, 'root_')\n\n\t\t\t\tqb = remainingColumns.reduce((qb, columnName) => qb.select(['root_', columnName]), qb)\n\n\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([]), {\n\t\t\t\t\tand: [{\n\t\t\t\t\t\t[this.entity.primary]: { eq: this.primary },\n\t\t\t\t\t}, this.oldWhere],\n\t\t\t\t})\n\n\t\t\t\treturn qb\n\t\t\t})\n\t\t\t.table(this.entity.tableName)\n\t\t\t.values(\n\t\t\t\tresolvedData.reduce<QueryBuilder.ColumnExpressionMap>(\n\t\t\t\t\t(result: object, item) => ({\n\t\t\t\t\t\t...result,\n\t\t\t\t\t\t[item.columnName]: expr => expr.select(['newData_', item.columnName]),\n\t\t\t\t\t}),\n\t\t\t\t\t{},\n\t\t\t\t),\n\t\t\t)\n\t\t\t.returning(...resolvedData.map(it => it.columnName + oldColSuffix))\n\t\t\t.from(qb => {\n\t\t\t\tqb = qb.from('newData_')\n\t\t\t\tconst col1 = tuple(this.entity.tableName, this.entity.primaryColumn)\n\t\t\t\tconst col2 = tuple('newData_', this.entity.primaryColumn)\n\t\t\t\tqb = qb.where(expr => expr.compareColumns(col1, Operator.eq, col2))\n\t\t\t\tqb = this.whereBuilder.build(qb, this.entity, this.pathFactory.create([], 'newData_'), this.newWhere)\n\t\t\t\treturn qb\n\t\t\t})\n\n\t\tconst beforeEvent = new BeforeUpdateEvent(this.entity, resolvedData, this.primary)\n\t\tawait mapper.eventManager.fire(beforeEvent)\n\n\t\tconst result = await qb.execute(mapper.db)\n\n\t\tif (result.length === 1) {\n\t\t\tconst eventData = resolvedData.map(it => ({\n\t\t\t\t...it,\n\t\t\t\told: result[0][it.columnName + oldColSuffix],\n\t\t\t}))\n\t\t\tconst afterUpdateEvent = new AfterUpdateEvent(this.entity, eventData, this.primary)\n\t\t\tbeforeEvent.afterEvent = afterUpdateEvent\n\t\t\tawait mapper.eventManager.fire(afterUpdateEvent)\n\t\t}\n\n\t\treturn { values: resolvedData, affectedRows: result.length, executed: true }\n\t}\n}\n"],"names":["DbUpdateBuilder","qb","result"],"mappings":"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"}

package/dist/production/src/mapper/update/UpdateBuilderFactory.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateBuilderFactory.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilderFactory.ts"],"sourcesContent":["import { PathFactory, WhereBuilder } from '../select'\nimport { Input, Model } from '@contember/schema'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { PredicateFactory } from '../../acl'\n\nexport class UpdateBuilderFactory {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic create(entity: Model.Entity, primary: Input.PrimaryValue): UpdateBuilder {\n\t\treturn new UpdateBuilder(\n\t\t\tthis.schema,\n\t\t\tentity,\n\t\t\tthis.whereBuilder,\n\t\t\tprimary,\n\t\t\tthis.pathFactory,\n\t\t\tthis.predicateFactory,\n\t\t)\n\t}\n}\n"],"names":["UpdateBuilder"],"mappings":";;;AAKO,MAAM,qBAAqB;AAAA,EACjC,YACkB,QACA,cACA,aACA,kBAChB;AAJgB,SAAA,SAAA;AACA,SAAA,eAAA;AACA,SAAA,cAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGX,OAAO,QAAsB,SAA4C;AAC/E,WAAO,IAAIA,cAAA;AAAA,MACV,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IACN;AAAA,EAAA;AAEF;;"}
+{"version":3,"file":"UpdateBuilderFactory.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilderFactory.ts"],"sourcesContent":["import { PathFactory, WhereBuilder } from '../select'\nimport { Input, Model } from '@contember/schema'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { PredicateFactory } from '../../acl'\n\nexport class UpdateBuilderFactory {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic create(entity: Model.Entity, primary: Input.PrimaryValue): UpdateBuilder {\n\t\treturn new UpdateBuilder(\n\t\t\tthis.schema,\n\t\t\tentity,\n\t\t\tthis.whereBuilder,\n\t\t\tprimary,\n\t\t\tthis.pathFactory,\n\t\t\tthis.predicateFactory,\n\t\t)\n\t}\n}\n"],"names":["UpdateBuilder"],"mappings":";;;AAKO,MAAM,qBAAqB;AAAA,EACjC,YACkB,QACA,cACA,aACA,kBAChB;AAJgB,SAAA,SAAA;AACA,SAAA,eAAA;AACA,SAAA,cAAA;AACA,SAAA,mBAAA;AAAA,EACf;AAAA,EAEI,OAAO,QAAsB,SAA4C;AAC/E,WAAO,IAAIA,cAAAA;AAAAA,MACV,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAEP;AACD;;"}

package/dist/production/src/mapper/update/UpdateBuilderFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateBuilderFactory.js","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilderFactory.ts"],"sourcesContent":["import { PathFactory, WhereBuilder } from '../select'\nimport { Input, Model } from '@contember/schema'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { PredicateFactory } from '../../acl'\n\nexport class UpdateBuilderFactory {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic create(entity: Model.Entity, primary: Input.PrimaryValue): UpdateBuilder {\n\t\treturn new UpdateBuilder(\n\t\t\tthis.schema,\n\t\t\tentity,\n\t\t\tthis.whereBuilder,\n\t\t\tprimary,\n\t\t\tthis.pathFactory,\n\t\t\tthis.predicateFactory,\n\t\t)\n\t}\n}\n"],"names":[],"mappings":";AAKO,MAAM,qBAAqB;AAAA,EACjC,YACkB,QACA,cACA,aACA,kBAChB;AAJgB,SAAA,SAAA;AACA,SAAA,eAAA;AACA,SAAA,cAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGX,OAAO,QAAsB,SAA4C;AAC/E,WAAO,IAAI;AAAA,MACV,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IACN;AAAA,EAAA;AAEF;"}
+{"version":3,"file":"UpdateBuilderFactory.js","sources":["../../../../../../packages/engine-content-api/src/mapper/update/UpdateBuilderFactory.ts"],"sourcesContent":["import { PathFactory, WhereBuilder } from '../select'\nimport { Input, Model } from '@contember/schema'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { PredicateFactory } from '../../acl'\n\nexport class UpdateBuilderFactory {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly whereBuilder: WhereBuilder,\n\t\tprivate readonly pathFactory: PathFactory,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t) {}\n\n\tpublic create(entity: Model.Entity, primary: Input.PrimaryValue): UpdateBuilder {\n\t\treturn new UpdateBuilder(\n\t\t\tthis.schema,\n\t\t\tentity,\n\t\t\tthis.whereBuilder,\n\t\t\tprimary,\n\t\t\tthis.pathFactory,\n\t\t\tthis.predicateFactory,\n\t\t)\n\t}\n}\n"],"names":[],"mappings":";AAKO,MAAM,qBAAqB;AAAA,EACjC,YACkB,QACA,cACA,aACA,kBAChB;AAJgB,SAAA,SAAA;AACA,SAAA,eAAA;AACA,SAAA,cAAA;AACA,SAAA,mBAAA;AAAA,EACf;AAAA,EAEI,OAAO,QAAsB,SAA4C;AAC/E,WAAO,IAAI;AAAA,MACV,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAEP;AACD;"}

package/dist/production/src/mapper/update/Updater.cjs

@@ -7,10 +7,8 @@ const UpdateInputVisitor = require("../../inputProcessing/UpdateInputVisitor.cjs
 const Result = require("../Result.cjs");
 const ColumnValue = require("../ColumnValue.cjs");
 class Updater {
-  constructor(schema, schemaDatabaseMetadata, predicateFactory, updateBuilderFactory) {
+  constructor(schema, updateBuilderFactory) {
     this.schema = schema;
-    this.schemaDatabaseMetadata = schemaDatabaseMetadata;
-    this.predicateFactory = predicateFactory;
     this.updateBuilderFactory = updateBuilderFactory;
   }
   async update(mapper, entity, primaryValue, data, filter) {
@@ -49,6 +47,20 @@ class Updater {
     }
     const result = await updateBuilder.execute(mapper);
     if (!result.executed) {
+      if (filter && Object.keys(filter).length > 0) {
+        const where = {
+          and: [
+            filter,
+            {
+              [entity.primary]: { eq: primaryValue }
+            }
+          ]
+        };
+        const count = await mapper.count(entity, where);
+        if (!count) {
+          return [new Result.MutationEntryNotFoundError([], where)];
+        }
+      }
       resultList.unshift(new Result.MutationNothingToDo([], Result.NothingToDoReason.noData));
     } else if (result.affectedRows !== 1) {
       return [new Result.MutationNoResultError([])];

package/dist/production/src/mapper/update/Updater.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Updater.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/update/Updater.ts"],"sourcesContent":["import { SqlUpdateInputProcessor, SqlUpdateInputProcessorResult } from './SqlUpdateInputProcessor'\nimport { UpdateInputVisitor } from '../../inputProcessing'\nimport { Input, Model } from '@contember/schema'\nimport { PredicateFactory } from '../../acl'\nimport { UpdateBuilderFactory } from './UpdateBuilderFactory'\nimport { Mapper } from '../Mapper'\nimport { acceptFieldVisitor } from '@contember/schema-utils'\nimport { MutationNoResultError, MutationNothingToDo, MutationResultList, MutationUpdateOk, NothingToDoReason } from '../Result'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { rowDataToFieldValues } from '../ColumnValue'\nimport { DatabaseMetadata } from '@contember/database'\nimport { MapperInput } from '../types'\n\nexport class Updater {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly schemaDatabaseMetadata: DatabaseMetadata,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t\tprivate readonly updateBuilderFactory: UpdateBuilderFactory,\n\t) {}\n\n\tpublic async update(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tdata: MapperInput.UpdateDataInput,\n\t\tfilter?: Input.OptionalWhere,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tconst predicateFields = Object.keys(data)\n\t\tupdateBuilder.addPredicates(predicateFields)\n\t\tif (filter && Object.keys(filter).length > 0) {\n\t\t\tupdateBuilder.addOldWhere(filter)\n\t\t}\n\n\t\tconst visitor = new UpdateInputVisitor<SqlUpdateInputProcessorResult>(\n\t\t\tnew SqlUpdateInputProcessor(primaryValue, data, updateBuilder, mapper),\n\t\t\tthis.schema,\n\t\t\tdata,\n\t\t)\n\t\tconst resultList: MutationResultList = []\n\t\tconst postUpdates: Exclude<SqlUpdateInputProcessorResult, MutationResultList>[] = []\n\n\t\tfor (const key of Object.keys(data)) {\n\t\t\tconst resultSet = await acceptFieldVisitor(\n\t\t\t\tthis.schema,\n\t\t\t\tentity,\n\t\t\t\tkey,\n\t\t\t\tvisitor,\n\t\t\t)\n\t\t\tfor (const result of resultSet) {\n\t\t\t\tif (typeof result === 'function') {\n\t\t\t\t\tpostUpdates.push(result)\n\t\t\t\t} else {\n\t\t\t\t\tfor (const resultItem of await result) {\n\t\t\t\t\t\tresultList.push(resultItem)\n\t\t\t\t\t\tif (resultItem.error) {\n\t\t\t\t\t\t\treturn resultList\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\tresultList.unshift(new MutationNothingToDo([], NothingToDoReason.noData))\n\t\t} else if (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t} else {\n\t\t\tconst okResult = new MutationUpdateOk([], entity, primaryValue, data, rowDataToFieldValues(result.values))\n\t\t\tresultList.unshift(okResult)\n\t\t}\n\n\t\tfor (const postUpdate of postUpdates) {\n\t\t\tconst postInsertResult = await postUpdate({ primary: primaryValue })\n\t\t\tfor (const result of postInsertResult) {\n\t\t\t\tresultList.push(result)\n\t\t\t\tif (result.error) {\n\t\t\t\t\treturn resultList\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\treturn resultList\n\t}\n\n\tpublic async updateCb(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tbuilderCb: (builder: UpdateBuilder) => void,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tbuilderCb(updateBuilder)\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\treturn [new MutationNothingToDo([], NothingToDoReason.noData)]\n\t\t}\n\t\tif (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t}\n\t\treturn [new MutationUpdateOk([], entity, primaryValue, {}, rowDataToFieldValues(result.values))]\n\t}\n}\n"],"names":["UpdateInputVisitor","SqlUpdateInputProcessor","acceptFieldVisitor","result","MutationNothingToDo","NothingToDoReason","MutationNoResultError","MutationUpdateOk","rowDataToFieldValues"],"mappings":";;;;;;;;AAaO,MAAM,QAAQ;AAAA,EACpB,YACkB,QACA,wBACA,kBACA,sBAChB;AAJgB,SAAA,SAAA;AACA,SAAA,yBAAA;AACA,SAAA,mBAAA;AACA,SAAA,uBAAA;AAAA,EAAA;AAAA,EAGlB,MAAa,OACZ,QACA,QACA,cACA,MACA,QAC8B;AAC9B,UAAM,gBAAgB,KAAK,qBAAqB,OAAO,QAAQ,YAAY;AAErE,UAAA,kBAAkB,OAAO,KAAK,IAAI;AACxC,kBAAc,cAAc,eAAe;AAC3C,QAAI,UAAU,OAAO,KAAK,MAAM,EAAE,SAAS,GAAG;AAC7C,oBAAc,YAAY,MAAM;AAAA,IAAA;AAGjC,UAAM,UAAU,IAAIA,mBAAA;AAAA,MACnB,IAAIC,wBAAA,wBAAwB,cAAc,MAAM,eAAe,MAAM;AAAA,MACrE,KAAK;AAAA,MACL;AAAA,IACD;AACA,UAAM,aAAiC,CAAC;AACxC,UAAM,cAA4E,CAAC;AAEnF,eAAW,OAAO,OAAO,KAAK,IAAI,GAAG;AACpC,YAAM,YAAY,MAAMC,YAAA;AAAA,QACvB,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,MACD;AACA,iBAAWC,WAAU,WAAW;AAC3B,YAAA,OAAOA,YAAW,YAAY;AACjC,sBAAY,KAAKA,OAAM;AAAA,QAAA,OACjB;AACK,qBAAA,cAAc,MAAMA,SAAQ;AACtC,uBAAW,KAAK,UAAU;AAC1B,gBAAI,WAAW,OAAO;AACd,qBAAA;AAAA,YAAA;AAAA,UACR;AAAA,QACD;AAAA,MACD;AAAA,IACD;AAGD,UAAM,SAAS,MAAM,cAAc,QAAQ,MAAM;AAE7C,QAAA,CAAC,OAAO,UAAU;AACrB,iBAAW,QAAQ,IAAIC,OAAAA,oBAAoB,CAAA,GAAIC,OAAAA,kBAAkB,MAAM,CAAC;AAAA,IAAA,WAC9D,OAAO,iBAAiB,GAAG;AACrC,aAAO,CAAC,IAAIC,6BAAsB,CAAA,CAAE,CAAC;AAAA,IAAA,OAC/B;AACA,YAAA,WAAW,IAAIC,wBAAiB,CAAA,GAAI,QAAQ,cAAc,MAAMC,YAAA,qBAAqB,OAAO,MAAM,CAAC;AACzG,iBAAW,QAAQ,QAAQ;AAAA,IAAA;AAG5B,eAAW,cAAc,aAAa;AACrC,YAAM,mBAAmB,MAAM,WAAW,EAAE,SAAS,cAAc;AACnE,iBAAWL,WAAU,kBAAkB;AACtC,mBAAW,KAAKA,OAAM;AACtB,YAAIA,QAAO,OAAO;AACV,iBAAA;AAAA,QAAA;AAAA,MACR;AAAA,IACD;AAGM,WAAA;AAAA,EAAA;AAAA,EAGR,MAAa,SACZ,QACA,QACA,cACA,WAC8B;AAC9B,UAAM,gBAAgB,KAAK,qBAAqB,OAAO,QAAQ,YAAY;AAE3E,cAAU,aAAa;AAEvB,UAAM,SAAS,MAAM,cAAc,QAAQ,MAAM;AAE7C,QAAA,CAAC,OAAO,UAAU;AACrB,aAAO,CAAC,IAAIC,OAAA,oBAAoB,CAAI,GAAAC,OAAA,kBAAkB,MAAM,CAAC;AAAA,IAAA;AAE1D,QAAA,OAAO,iBAAiB,GAAG;AAC9B,aAAO,CAAC,IAAIC,6BAAsB,CAAA,CAAE,CAAC;AAAA,IAAA;AAEtC,WAAO,CAAC,IAAIC,OAAAA,iBAAiB,CAAI,GAAA,QAAQ,cAAc,CAAI,GAAAC,iCAAqB,OAAO,MAAM,CAAC,CAAC;AAAA,EAAA;AAEjG;;"}
+{"version":3,"file":"Updater.cjs","sources":["../../../../../../packages/engine-content-api/src/mapper/update/Updater.ts"],"sourcesContent":["import { SqlUpdateInputProcessor, SqlUpdateInputProcessorResult } from './SqlUpdateInputProcessor'\nimport { UpdateInputVisitor } from '../../inputProcessing'\nimport { Input, Model } from '@contember/schema'\nimport { UpdateBuilderFactory } from './UpdateBuilderFactory'\nimport { Mapper } from '../Mapper'\nimport { acceptFieldVisitor } from '@contember/schema-utils'\nimport {\n\tMutationEntryNotFoundError,\n\tMutationNoResultError,\n\tMutationNothingToDo,\n\tMutationResultList,\n\tMutationUpdateOk,\n\tNothingToDoReason,\n} from '../Result'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { rowDataToFieldValues } from '../ColumnValue'\nimport { MapperInput } from '../types'\n\nexport class Updater {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly updateBuilderFactory: UpdateBuilderFactory,\n\t) {}\n\n\tpublic async update(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tdata: MapperInput.UpdateDataInput,\n\t\tfilter?: Input.OptionalWhere,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tconst predicateFields = Object.keys(data)\n\t\tupdateBuilder.addPredicates(predicateFields)\n\t\tif (filter && Object.keys(filter).length > 0) {\n\t\t\tupdateBuilder.addOldWhere(filter)\n\t\t}\n\n\t\tconst visitor = new UpdateInputVisitor<SqlUpdateInputProcessorResult>(\n\t\t\tnew SqlUpdateInputProcessor(primaryValue, data, updateBuilder, mapper),\n\t\t\tthis.schema,\n\t\t\tdata,\n\t\t)\n\t\tconst resultList: MutationResultList = []\n\t\tconst postUpdates: Exclude<SqlUpdateInputProcessorResult, MutationResultList>[] = []\n\n\t\tfor (const key of Object.keys(data)) {\n\t\t\tconst resultSet = await acceptFieldVisitor(\n\t\t\t\tthis.schema,\n\t\t\t\tentity,\n\t\t\t\tkey,\n\t\t\t\tvisitor,\n\t\t\t)\n\t\t\tfor (const result of resultSet) {\n\t\t\t\tif (typeof result === 'function') {\n\t\t\t\t\tpostUpdates.push(result)\n\t\t\t\t} else {\n\t\t\t\t\tfor (const resultItem of await result) {\n\t\t\t\t\t\tresultList.push(resultItem)\n\t\t\t\t\t\tif (resultItem.error) {\n\t\t\t\t\t\t\treturn resultList\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\tif (filter && Object.keys(filter).length > 0) {\n\t\t\t\t// direct update was not invoked, but we still need to check if the row matches the filter\n\t\t\t\tconst where: Input.OptionalWhere = {\n\t\t\t\t\tand: [\n\t\t\t\t\t\tfilter,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t[entity.primary]: { eq: primaryValue },\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t}\n\t\t\t\tconst count = await mapper.count(entity, where)\n\t\t\t\tif (!count) {\n\t\t\t\t\treturn [new MutationEntryNotFoundError([], where)]\n\t\t\t\t}\n\t\t\t}\n\t\t\tresultList.unshift(new MutationNothingToDo([], NothingToDoReason.noData))\n\t\t} else if (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t} else {\n\t\t\tconst okResult = new MutationUpdateOk([], entity, primaryValue, data, rowDataToFieldValues(result.values))\n\t\t\tresultList.unshift(okResult)\n\t\t}\n\n\t\tfor (const postUpdate of postUpdates) {\n\t\t\tconst postInsertResult = await postUpdate({ primary: primaryValue })\n\t\t\tfor (const result of postInsertResult) {\n\t\t\t\tresultList.push(result)\n\t\t\t\tif (result.error) {\n\t\t\t\t\treturn resultList\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\treturn resultList\n\t}\n\n\tpublic async updateCb(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tbuilderCb: (builder: UpdateBuilder) => void,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tbuilderCb(updateBuilder)\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\treturn [new MutationNothingToDo([], NothingToDoReason.noData)]\n\t\t}\n\t\tif (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t}\n\t\treturn [new MutationUpdateOk([], entity, primaryValue, {}, rowDataToFieldValues(result.values))]\n\t}\n}\n"],"names":["UpdateInputVisitor","SqlUpdateInputProcessor","acceptFieldVisitor","result","MutationEntryNotFoundError","MutationNothingToDo","NothingToDoReason","MutationNoResultError","MutationUpdateOk","rowDataToFieldValues"],"mappings":"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"}

package/dist/production/src/mapper/update/Updater.js

@@ -2,13 +2,11 @@ import { SqlUpdateInputProcessor } from "./SqlUpdateInputProcessor.js";
 import { acceptFieldVisitor } from "@contember/schema-utils";
 import "@contember/schema";
 import { UpdateInputVisitor } from "../../inputProcessing/UpdateInputVisitor.js";
-import { MutationNothingToDo, NothingToDoReason, MutationNoResultError, MutationUpdateOk } from "../Result.js";
+import { MutationEntryNotFoundError, MutationNothingToDo, NothingToDoReason, MutationNoResultError, MutationUpdateOk } from "../Result.js";
 import { rowDataToFieldValues } from "../ColumnValue.js";
 class Updater {
-  constructor(schema, schemaDatabaseMetadata, predicateFactory, updateBuilderFactory) {
+  constructor(schema, updateBuilderFactory) {
     this.schema = schema;
-    this.schemaDatabaseMetadata = schemaDatabaseMetadata;
-    this.predicateFactory = predicateFactory;
     this.updateBuilderFactory = updateBuilderFactory;
   }
   async update(mapper, entity, primaryValue, data, filter) {
@@ -47,6 +45,20 @@ class Updater {
     }
     const result = await updateBuilder.execute(mapper);
     if (!result.executed) {
+      if (filter && Object.keys(filter).length > 0) {
+        const where = {
+          and: [
+            filter,
+            {
+              [entity.primary]: { eq: primaryValue }
+            }
+          ]
+        };
+        const count = await mapper.count(entity, where);
+        if (!count) {
+          return [new MutationEntryNotFoundError([], where)];
+        }
+      }
       resultList.unshift(new MutationNothingToDo([], NothingToDoReason.noData));
     } else if (result.affectedRows !== 1) {
       return [new MutationNoResultError([])];

package/dist/production/src/mapper/update/Updater.js.map

@@ -1 +1 @@
-{"version":3,"file":"Updater.js","sources":["../../../../../../packages/engine-content-api/src/mapper/update/Updater.ts"],"sourcesContent":["import { SqlUpdateInputProcessor, SqlUpdateInputProcessorResult } from './SqlUpdateInputProcessor'\nimport { UpdateInputVisitor } from '../../inputProcessing'\nimport { Input, Model } from '@contember/schema'\nimport { PredicateFactory } from '../../acl'\nimport { UpdateBuilderFactory } from './UpdateBuilderFactory'\nimport { Mapper } from '../Mapper'\nimport { acceptFieldVisitor } from '@contember/schema-utils'\nimport { MutationNoResultError, MutationNothingToDo, MutationResultList, MutationUpdateOk, NothingToDoReason } from '../Result'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { rowDataToFieldValues } from '../ColumnValue'\nimport { DatabaseMetadata } from '@contember/database'\nimport { MapperInput } from '../types'\n\nexport class Updater {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly schemaDatabaseMetadata: DatabaseMetadata,\n\t\tprivate readonly predicateFactory: PredicateFactory,\n\t\tprivate readonly updateBuilderFactory: UpdateBuilderFactory,\n\t) {}\n\n\tpublic async update(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tdata: MapperInput.UpdateDataInput,\n\t\tfilter?: Input.OptionalWhere,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tconst predicateFields = Object.keys(data)\n\t\tupdateBuilder.addPredicates(predicateFields)\n\t\tif (filter && Object.keys(filter).length > 0) {\n\t\t\tupdateBuilder.addOldWhere(filter)\n\t\t}\n\n\t\tconst visitor = new UpdateInputVisitor<SqlUpdateInputProcessorResult>(\n\t\t\tnew SqlUpdateInputProcessor(primaryValue, data, updateBuilder, mapper),\n\t\t\tthis.schema,\n\t\t\tdata,\n\t\t)\n\t\tconst resultList: MutationResultList = []\n\t\tconst postUpdates: Exclude<SqlUpdateInputProcessorResult, MutationResultList>[] = []\n\n\t\tfor (const key of Object.keys(data)) {\n\t\t\tconst resultSet = await acceptFieldVisitor(\n\t\t\t\tthis.schema,\n\t\t\t\tentity,\n\t\t\t\tkey,\n\t\t\t\tvisitor,\n\t\t\t)\n\t\t\tfor (const result of resultSet) {\n\t\t\t\tif (typeof result === 'function') {\n\t\t\t\t\tpostUpdates.push(result)\n\t\t\t\t} else {\n\t\t\t\t\tfor (const resultItem of await result) {\n\t\t\t\t\t\tresultList.push(resultItem)\n\t\t\t\t\t\tif (resultItem.error) {\n\t\t\t\t\t\t\treturn resultList\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\tresultList.unshift(new MutationNothingToDo([], NothingToDoReason.noData))\n\t\t} else if (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t} else {\n\t\t\tconst okResult = new MutationUpdateOk([], entity, primaryValue, data, rowDataToFieldValues(result.values))\n\t\t\tresultList.unshift(okResult)\n\t\t}\n\n\t\tfor (const postUpdate of postUpdates) {\n\t\t\tconst postInsertResult = await postUpdate({ primary: primaryValue })\n\t\t\tfor (const result of postInsertResult) {\n\t\t\t\tresultList.push(result)\n\t\t\t\tif (result.error) {\n\t\t\t\t\treturn resultList\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\treturn resultList\n\t}\n\n\tpublic async updateCb(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tbuilderCb: (builder: UpdateBuilder) => void,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tbuilderCb(updateBuilder)\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\treturn [new MutationNothingToDo([], NothingToDoReason.noData)]\n\t\t}\n\t\tif (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t}\n\t\treturn [new MutationUpdateOk([], entity, primaryValue, {}, rowDataToFieldValues(result.values))]\n\t}\n}\n"],"names":["result"],"mappings":";;;;;;AAaO,MAAM,QAAQ;AAAA,EACpB,YACkB,QACA,wBACA,kBACA,sBAChB;AAJgB,SAAA,SAAA;AACA,SAAA,yBAAA;AACA,SAAA,mBAAA;AACA,SAAA,uBAAA;AAAA,EAAA;AAAA,EAGlB,MAAa,OACZ,QACA,QACA,cACA,MACA,QAC8B;AAC9B,UAAM,gBAAgB,KAAK,qBAAqB,OAAO,QAAQ,YAAY;AAErE,UAAA,kBAAkB,OAAO,KAAK,IAAI;AACxC,kBAAc,cAAc,eAAe;AAC3C,QAAI,UAAU,OAAO,KAAK,MAAM,EAAE,SAAS,GAAG;AAC7C,oBAAc,YAAY,MAAM;AAAA,IAAA;AAGjC,UAAM,UAAU,IAAI;AAAA,MACnB,IAAI,wBAAwB,cAAc,MAAM,eAAe,MAAM;AAAA,MACrE,KAAK;AAAA,MACL;AAAA,IACD;AACA,UAAM,aAAiC,CAAC;AACxC,UAAM,cAA4E,CAAC;AAEnF,eAAW,OAAO,OAAO,KAAK,IAAI,GAAG;AACpC,YAAM,YAAY,MAAM;AAAA,QACvB,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,MACD;AACA,iBAAWA,WAAU,WAAW;AAC3B,YAAA,OAAOA,YAAW,YAAY;AACjC,sBAAY,KAAKA,OAAM;AAAA,QAAA,OACjB;AACK,qBAAA,cAAc,MAAMA,SAAQ;AACtC,uBAAW,KAAK,UAAU;AAC1B,gBAAI,WAAW,OAAO;AACd,qBAAA;AAAA,YAAA;AAAA,UACR;AAAA,QACD;AAAA,MACD;AAAA,IACD;AAGD,UAAM,SAAS,MAAM,cAAc,QAAQ,MAAM;AAE7C,QAAA,CAAC,OAAO,UAAU;AACrB,iBAAW,QAAQ,IAAI,oBAAoB,CAAA,GAAI,kBAAkB,MAAM,CAAC;AAAA,IAAA,WAC9D,OAAO,iBAAiB,GAAG;AACrC,aAAO,CAAC,IAAI,sBAAsB,CAAA,CAAE,CAAC;AAAA,IAAA,OAC/B;AACA,YAAA,WAAW,IAAI,iBAAiB,CAAA,GAAI,QAAQ,cAAc,MAAM,qBAAqB,OAAO,MAAM,CAAC;AACzG,iBAAW,QAAQ,QAAQ;AAAA,IAAA;AAG5B,eAAW,cAAc,aAAa;AACrC,YAAM,mBAAmB,MAAM,WAAW,EAAE,SAAS,cAAc;AACnE,iBAAWA,WAAU,kBAAkB;AACtC,mBAAW,KAAKA,OAAM;AACtB,YAAIA,QAAO,OAAO;AACV,iBAAA;AAAA,QAAA;AAAA,MACR;AAAA,IACD;AAGM,WAAA;AAAA,EAAA;AAAA,EAGR,MAAa,SACZ,QACA,QACA,cACA,WAC8B;AAC9B,UAAM,gBAAgB,KAAK,qBAAqB,OAAO,QAAQ,YAAY;AAE3E,cAAU,aAAa;AAEvB,UAAM,SAAS,MAAM,cAAc,QAAQ,MAAM;AAE7C,QAAA,CAAC,OAAO,UAAU;AACrB,aAAO,CAAC,IAAI,oBAAoB,CAAI,GAAA,kBAAkB,MAAM,CAAC;AAAA,IAAA;AAE1D,QAAA,OAAO,iBAAiB,GAAG;AAC9B,aAAO,CAAC,IAAI,sBAAsB,CAAA,CAAE,CAAC;AAAA,IAAA;AAEtC,WAAO,CAAC,IAAI,iBAAiB,CAAI,GAAA,QAAQ,cAAc,CAAI,GAAA,qBAAqB,OAAO,MAAM,CAAC,CAAC;AAAA,EAAA;AAEjG;"}
+{"version":3,"file":"Updater.js","sources":["../../../../../../packages/engine-content-api/src/mapper/update/Updater.ts"],"sourcesContent":["import { SqlUpdateInputProcessor, SqlUpdateInputProcessorResult } from './SqlUpdateInputProcessor'\nimport { UpdateInputVisitor } from '../../inputProcessing'\nimport { Input, Model } from '@contember/schema'\nimport { UpdateBuilderFactory } from './UpdateBuilderFactory'\nimport { Mapper } from '../Mapper'\nimport { acceptFieldVisitor } from '@contember/schema-utils'\nimport {\n\tMutationEntryNotFoundError,\n\tMutationNoResultError,\n\tMutationNothingToDo,\n\tMutationResultList,\n\tMutationUpdateOk,\n\tNothingToDoReason,\n} from '../Result'\nimport { UpdateBuilder } from './UpdateBuilder'\nimport { rowDataToFieldValues } from '../ColumnValue'\nimport { MapperInput } from '../types'\n\nexport class Updater {\n\tconstructor(\n\t\tprivate readonly schema: Model.Schema,\n\t\tprivate readonly updateBuilderFactory: UpdateBuilderFactory,\n\t) {}\n\n\tpublic async update(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tdata: MapperInput.UpdateDataInput,\n\t\tfilter?: Input.OptionalWhere,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tconst predicateFields = Object.keys(data)\n\t\tupdateBuilder.addPredicates(predicateFields)\n\t\tif (filter && Object.keys(filter).length > 0) {\n\t\t\tupdateBuilder.addOldWhere(filter)\n\t\t}\n\n\t\tconst visitor = new UpdateInputVisitor<SqlUpdateInputProcessorResult>(\n\t\t\tnew SqlUpdateInputProcessor(primaryValue, data, updateBuilder, mapper),\n\t\t\tthis.schema,\n\t\t\tdata,\n\t\t)\n\t\tconst resultList: MutationResultList = []\n\t\tconst postUpdates: Exclude<SqlUpdateInputProcessorResult, MutationResultList>[] = []\n\n\t\tfor (const key of Object.keys(data)) {\n\t\t\tconst resultSet = await acceptFieldVisitor(\n\t\t\t\tthis.schema,\n\t\t\t\tentity,\n\t\t\t\tkey,\n\t\t\t\tvisitor,\n\t\t\t)\n\t\t\tfor (const result of resultSet) {\n\t\t\t\tif (typeof result === 'function') {\n\t\t\t\t\tpostUpdates.push(result)\n\t\t\t\t} else {\n\t\t\t\t\tfor (const resultItem of await result) {\n\t\t\t\t\t\tresultList.push(resultItem)\n\t\t\t\t\t\tif (resultItem.error) {\n\t\t\t\t\t\t\treturn resultList\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\tif (filter && Object.keys(filter).length > 0) {\n\t\t\t\t// direct update was not invoked, but we still need to check if the row matches the filter\n\t\t\t\tconst where: Input.OptionalWhere = {\n\t\t\t\t\tand: [\n\t\t\t\t\t\tfilter,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t[entity.primary]: { eq: primaryValue },\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t}\n\t\t\t\tconst count = await mapper.count(entity, where)\n\t\t\t\tif (!count) {\n\t\t\t\t\treturn [new MutationEntryNotFoundError([], where)]\n\t\t\t\t}\n\t\t\t}\n\t\t\tresultList.unshift(new MutationNothingToDo([], NothingToDoReason.noData))\n\t\t} else if (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t} else {\n\t\t\tconst okResult = new MutationUpdateOk([], entity, primaryValue, data, rowDataToFieldValues(result.values))\n\t\t\tresultList.unshift(okResult)\n\t\t}\n\n\t\tfor (const postUpdate of postUpdates) {\n\t\t\tconst postInsertResult = await postUpdate({ primary: primaryValue })\n\t\t\tfor (const result of postInsertResult) {\n\t\t\t\tresultList.push(result)\n\t\t\t\tif (result.error) {\n\t\t\t\t\treturn resultList\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\treturn resultList\n\t}\n\n\tpublic async updateCb(\n\t\tmapper: Mapper,\n\t\tentity: Model.Entity,\n\t\tprimaryValue: Input.PrimaryValue,\n\t\tbuilderCb: (builder: UpdateBuilder) => void,\n\t): Promise<MutationResultList> {\n\t\tconst updateBuilder = this.updateBuilderFactory.create(entity, primaryValue)\n\n\t\tbuilderCb(updateBuilder)\n\n\t\tconst result = await updateBuilder.execute(mapper)\n\n\t\tif (!result.executed) {\n\t\t\treturn [new MutationNothingToDo([], NothingToDoReason.noData)]\n\t\t}\n\t\tif (result.affectedRows !== 1) {\n\t\t\treturn [new MutationNoResultError([])]\n\t\t}\n\t\treturn [new MutationUpdateOk([], entity, primaryValue, {}, rowDataToFieldValues(result.values))]\n\t}\n}\n"],"names":["result"],"mappings":"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"}

package/dist/production/src/mapper/update/relations/ManyHasManyUpdateInputProcessor.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ManyHasManyUpdateInputProcessor.cjs","sources":["../../../../../../../packages/engine-content-api/src/mapper/update/relations/ManyHasManyUpdateInputProcessor.ts"],"sourcesContent":["import { UpdateInputProcessor } from '../../../inputProcessing'\nimport { Input, Model } from '@contember/schema'\nimport { getInsertPrimary, MutationEntryNotFoundError } from '../../Result'\nimport { Mapper } from '../../Mapper'\nimport { SqlUpdateInputProcessorResult } from '../../update'\nimport { CheckedPrimary } from '../../CheckedPrimary'\nimport { MapperInput } from '../../types'\n\ntype Context = Model.ManyHasManyOwningContext | Model.ManyHasManyInverseContext\n\nexport class ManyHasManyUpdateInputProcessor implements UpdateInputProcessor.HasManyRelationInputProcessor<Context, SqlUpdateInputProcessorResult> {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t) {\n\t}\n\n\tpublic async connect(\n\t\t{ entity, targetEntity, relation, targetRelation, input }: Context & { input: Input.UniqueWhere | CheckedPrimary },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary, err] = await this.mapper.getPrimaryValue(targetEntity, input)\n\t\t\tif (err) return [err]\n\t\t\treturn await this.mapper.connectJunction(entity, relation, primary, otherPrimary)\n\t\t}\n\t}\n\n\tpublic async create(\n\t\t{ entity, targetEntity, relation, input }: Context & { input: MapperInput.CreateDataInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst insertResult = await this.mapper.insert(targetEntity, input)\n\t\t\tconst insertPrimary = getInsertPrimary(insertResult)\n\t\t\tif (!insertPrimary) {\n\t\t\t\treturn insertResult\n\t\t\t}\n\t\t\treturn [\n\t\t\t\t...insertResult,\n\t\t\t\t...(await this.mapper.connectJunction(entity, relation, primary, insertPrimary)),\n\t\t\t]\n\t\t}\n\t}\n\n\tpublic async connectOrCreate(\n\t\tcontext: Context & { input: MapperInput.ConnectOrCreateInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tlet [otherPrimary] = await this.mapper.getPrimaryValue(context.targetEntity, context.input.connect)\n\t\t\tif (!otherPrimary) {\n\t\t\t\tconst insertResult = await this.mapper.insert(context.targetEntity, context.input.create)\n\t\t\t\totherPrimary = getInsertPrimary(insertResult)\n\t\t\t\tif (!otherPrimary) {\n\t\t\t\t\treturn insertResult\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn await this.mapper.connectJunction(context.entity, context.relation, primary, otherPrimary)\n\t\t}\n\t}\n\n\tpublic async update(\n\t\t{ entity, targetEntity, relation, input: { where, data } }: Context & { input: UpdateInputProcessor.UpdateManyInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary, err] = await this.mapper.getPrimaryValue(targetEntity, where)\n\t\t\tif (err) return [err]\n\t\t\treturn [\n\t\t\t\t...(await this.mapper.update(targetEntity, new CheckedPrimary(otherPrimary), data)),\n\t\t\t\t...(await this.mapper.connectJunction(entity, relation, primary, otherPrimary)),\n\t\t\t]\n\t\t}\n\t}\n\n\tpublic async upsert(\n\t\t{ entity, relation, targetEntity, input: { create, update, where } }: Context & { input: UpdateInputProcessor.UpsertManyInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary] = await this.mapper.getPrimaryValue(targetEntity, where)\n\t\t\tif (otherPrimary) {\n\t\t\t\tconst updateResult = await this.mapper.update(targetEntity, new CheckedPrimary(otherPrimary), update)\n\t\t\t\tconst connectResult = await this.mapper.connectJunction(entity, relation, primary, otherPrimary)\n\t\t\t\treturn [...updateResult, ...connectResult]\n\t\t\t} else {\n\t\t\t\tconst insertResult = await this.mapper.insert(targetEntity, create)\n\n\t\t\t\tconst primaryValue = getInsertPrimary(insertResult)\n\t\t\t\tif (!primaryValue) {\n\t\t\t\t\treturn insertResult\n\t\t\t\t}\n\t\t\t\tconst connectResult = await this.mapper.connectJunction(entity, relation, primary, primaryValue)\n\t\t\t\treturn [...insertResult, ...connectResult]\n\t\t\t}\n\t\t}\n\t}\n\n\tpublic async disconnect(\n\t\t{ entity, targetEntity, relation, input }: Context & { input: Input.UniqueWhere },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary, err] = await this.mapper.getPrimaryValue(targetEntity, input)\n\t\t\tif (err) return [err]\n\n\t\t\treturn await this.mapper.disconnectJunction(entity, relation, primary, otherPrimary)\n\t\t}\n\t}\n\n\tpublic async delete(\n\t\t{ entity, targetEntity, relation, targetRelation, input }: Context & { input: Input.UniqueWhere },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\treturn await this.mapper.delete(targetEntity, input)\n\t\t}\n\t}\n}\n"],"names":["getInsertPrimary","CheckedPrimary"],"mappings":"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"}
+{"version":3,"file":"ManyHasManyUpdateInputProcessor.cjs","sources":["../../../../../../../packages/engine-content-api/src/mapper/update/relations/ManyHasManyUpdateInputProcessor.ts"],"sourcesContent":["import { UpdateInputProcessor } from '../../../inputProcessing'\nimport { Input, Model } from '@contember/schema'\nimport { getInsertPrimary, MutationEntryNotFoundError } from '../../Result'\nimport { Mapper } from '../../Mapper'\nimport { SqlUpdateInputProcessorResult } from '../../update'\nimport { CheckedPrimary } from '../../CheckedPrimary'\nimport { MapperInput } from '../../types'\n\ntype Context = Model.ManyHasManyOwningContext | Model.ManyHasManyInverseContext\n\nexport class ManyHasManyUpdateInputProcessor implements UpdateInputProcessor.HasManyRelationInputProcessor<Context, SqlUpdateInputProcessorResult> {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t) {\n\t}\n\n\tpublic async connect(\n\t\t{ entity, targetEntity, relation, targetRelation, input }: Context & { input: Input.UniqueWhere | CheckedPrimary },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary, err] = await this.mapper.getPrimaryValue(targetEntity, input)\n\t\t\tif (err) return [err]\n\t\t\treturn await this.mapper.connectJunction(entity, relation, primary, otherPrimary)\n\t\t}\n\t}\n\n\tpublic async create(\n\t\t{ entity, targetEntity, relation, input }: Context & { input: MapperInput.CreateDataInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst insertResult = await this.mapper.insert(targetEntity, input)\n\t\t\tconst insertPrimary = getInsertPrimary(insertResult)\n\t\t\tif (!insertPrimary) {\n\t\t\t\treturn insertResult\n\t\t\t}\n\t\t\treturn [\n\t\t\t\t...insertResult,\n\t\t\t\t...(await this.mapper.connectJunction(entity, relation, primary, insertPrimary)),\n\t\t\t]\n\t\t}\n\t}\n\n\tpublic async connectOrCreate(\n\t\tcontext: Context & { input: MapperInput.ConnectOrCreateInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tlet [otherPrimary] = await this.mapper.getPrimaryValue(context.targetEntity, context.input.connect)\n\t\t\tif (!otherPrimary) {\n\t\t\t\tconst insertResult = await this.mapper.insert(context.targetEntity, context.input.create)\n\t\t\t\totherPrimary = getInsertPrimary(insertResult)\n\t\t\t\tif (!otherPrimary) {\n\t\t\t\t\treturn insertResult\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn await this.mapper.connectJunction(context.entity, context.relation, primary, otherPrimary)\n\t\t}\n\t}\n\n\tpublic async update(\n\t\t{ entity, targetEntity, relation, input: { where, data } }: Context & { input: UpdateInputProcessor.UpdateManyInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary, err] = await this.mapper.getPrimaryValue(targetEntity, where)\n\t\t\tif (err) return [err]\n\t\t\treturn [\n\t\t\t\t...(await this.mapper.update(targetEntity, new CheckedPrimary(otherPrimary), data)),\n\t\t\t\t...(await this.mapper.connectJunction(entity, relation, primary, otherPrimary)),\n\t\t\t]\n\t\t}\n\t}\n\n\tpublic async upsert(\n\t\t{ entity, relation, targetEntity, input: { create, update, where } }: Context & { input: UpdateInputProcessor.UpsertManyInput },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary] = await this.mapper.getPrimaryValue(targetEntity, where)\n\t\t\tif (otherPrimary) {\n\t\t\t\tconst updateResult = await this.mapper.update(targetEntity, new CheckedPrimary(otherPrimary), update)\n\t\t\t\tconst connectResult = await this.mapper.connectJunction(entity, relation, primary, otherPrimary)\n\t\t\t\treturn [...updateResult, ...connectResult]\n\t\t\t} else {\n\t\t\t\tconst insertResult = await this.mapper.insert(targetEntity, create)\n\n\t\t\t\tconst primaryValue = getInsertPrimary(insertResult)\n\t\t\t\tif (!primaryValue) {\n\t\t\t\t\treturn insertResult\n\t\t\t\t}\n\t\t\t\tconst connectResult = await this.mapper.connectJunction(entity, relation, primary, primaryValue)\n\t\t\t\treturn [...insertResult, ...connectResult]\n\t\t\t}\n\t\t}\n\t}\n\n\tpublic async disconnect(\n\t\t{ entity, targetEntity, relation, input }: Context & { input: Input.UniqueWhere },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\tconst [otherPrimary, err] = await this.mapper.getPrimaryValue(targetEntity, input)\n\t\t\tif (err) return [err]\n\n\t\t\treturn await this.mapper.disconnectJunction(entity, relation, primary, otherPrimary)\n\t\t}\n\t}\n\n\tpublic async delete(\n\t\t{ entity, targetEntity, relation, targetRelation, input }: Context & { input: Input.UniqueWhere },\n\t) {\n\t\treturn async ({ primary }: { primary: Input.PrimaryValue }) => {\n\t\t\treturn await this.mapper.delete(targetEntity, input)\n\t\t}\n\t}\n}\n"],"names":["getInsertPrimary","CheckedPrimary"],"mappings":"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"}