@party-stack/ontology 0.14.0 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. package/lib/examples/blog.d.ts +29 -24
  2. package/lib/examples/blog.d.ts.map +1 -1
  3. package/lib/examples/blog.js +16 -9
  4. package/lib/examples/blog.js.map +1 -1
  5. package/lib/generate/ontology.test.js +9 -3
  6. package/lib/generate/ontology.test.js.map +1 -1
  7. package/lib/generate/types.test.js +3 -3
  8. package/lib/generate/types.test.js.map +1 -1
  9. package/lib/infer.test.js +1 -1
  10. package/lib/infer.test.js.map +1 -1
  11. package/lib/ir/generated/builders.d.ts +92 -36
  12. package/lib/ir/generated/builders.d.ts.map +1 -1
  13. package/lib/ir/generated/builders.js +25 -8
  14. package/lib/ir/generated/builders.js.map +1 -1
  15. package/lib/ir/generated/types.d.ts +50 -15
  16. package/lib/ir/generated/types.d.ts.map +1 -1
  17. package/lib/ir/schema.d.ts +196 -32
  18. package/lib/ir/schema.d.ts.map +1 -1
  19. package/lib/ir/schema.js +162 -24
  20. package/lib/ir/schema.js.map +1 -1
  21. package/lib/ir/validate.d.ts.map +1 -1
  22. package/lib/ir/validate.js +236 -84
  23. package/lib/ir/validate.js.map +1 -1
  24. package/lib/ir/validate.test.js +218 -19
  25. package/lib/ir/validate.test.js.map +1 -1
  26. package/lib/lenses.d.ts.map +1 -1
  27. package/lib/lenses.js +6 -7
  28. package/lib/lenses.js.map +1 -1
  29. package/lib/live/expression.d.ts +6 -4
  30. package/lib/live/expression.d.ts.map +1 -1
  31. package/lib/live/expression.js +183 -42
  32. package/lib/live/expression.js.map +1 -1
  33. package/lib/live/expression.test.js +194 -7
  34. package/lib/live/expression.test.js.map +1 -1
  35. package/lib/live/mutators/OntologyEdits.d.ts.map +1 -1
  36. package/lib/live/mutators/OntologyEdits.js +5 -5
  37. package/lib/live/mutators/OntologyEdits.js.map +1 -1
  38. package/lib/live/mutators/createMutatorTx.d.ts.map +1 -1
  39. package/lib/live/mutators/createMutatorTx.js +13 -3
  40. package/lib/live/mutators/createMutatorTx.js.map +1 -1
  41. package/lib/live/mutators/createMutatorTx.test.js +95 -2
  42. package/lib/live/mutators/createMutatorTx.test.js.map +1 -1
  43. package/lib/meta/generated/live.d.ts +1 -2
  44. package/lib/meta/generated/live.d.ts.map +1 -1
  45. package/lib/meta/generated/live.js.map +1 -1
  46. package/lib/meta/generated/types.d.ts +50 -15
  47. package/lib/meta/generated/types.d.ts.map +1 -1
  48. package/lib/utils/index.d.ts +2 -0
  49. package/lib/utils/index.d.ts.map +1 -1
  50. package/lib/utils/index.js +2 -0
  51. package/lib/utils/index.js.map +1 -1
  52. package/lib/utils/links.d.ts +47 -0
  53. package/lib/utils/links.d.ts.map +1 -0
  54. package/lib/utils/links.js +20 -0
  55. package/lib/utils/links.js.map +1 -0
  56. package/lib/utils/links.test.d.ts +2 -0
  57. package/lib/utils/links.test.d.ts.map +1 -0
  58. package/lib/utils/links.test.js +109 -0
  59. package/lib/utils/links.test.js.map +1 -0
  60. package/lib/utils/paths.d.ts +4 -0
  61. package/lib/utils/paths.d.ts.map +1 -0
  62. package/lib/utils/paths.js +54 -0
  63. package/lib/utils/paths.js.map +1 -0
  64. package/lib/utils/paths.test.d.ts +2 -0
  65. package/lib/utils/paths.test.d.ts.map +1 -0
  66. package/lib/utils/paths.test.js +33 -0
  67. package/lib/utils/paths.test.js.map +1 -0
  68. package/package.json +1 -3
@@ -1,52 +1,197 @@
1
1
  import { eq } from "@tanstack/db";
2
- import { get } from "lodash-es";
3
2
  import { Temporal } from "temporal-polyfill";
3
+ import { isLinkHopFromForeignKeySource, resolveLinkHop, } from "../utils/links.js";
4
+ import { getAtPath } from "../utils/paths.js";
4
5
  import { resolveType, unwrapType } from "../utils/types.js";
5
6
  function getActionType(ir, actionTypeName) {
6
7
  return ir.actionTypes.find((actionType) => actionType.name === actionTypeName);
7
8
  }
9
+ const ontologyReference = Symbol("ontologyReference");
10
+ const ontologyObject = Symbol("ontologyObject");
11
+ function isEvaluatedObjectReference(value) {
12
+ return (typeof value === "object" &&
13
+ value !== null &&
14
+ ontologyReference in value);
15
+ }
16
+ function isEvaluatedOntologyObject(value) {
17
+ return (typeof value === "object" &&
18
+ value !== null &&
19
+ ontologyObject in value);
20
+ }
21
+ function unwrapEvaluatedValue(value) {
22
+ if (isEvaluatedObjectReference(value))
23
+ return value.key;
24
+ if (isEvaluatedOntologyObject(value))
25
+ return value.value;
26
+ if (Array.isArray(value))
27
+ return value.map(unwrapEvaluatedValue);
28
+ if (value !== null &&
29
+ typeof value === "object" &&
30
+ Object.getPrototypeOf(value) === Object.prototype) {
31
+ return Object.fromEntries(Object.entries(value).map(([key, entry]) => [
32
+ key,
33
+ unwrapEvaluatedValue(entry),
34
+ ]));
35
+ }
36
+ return value;
37
+ }
8
38
  export async function evaluateExpression(options) {
9
- const { ir, actionTypeName, expression, resolveParameter, context, tx, } = options;
39
+ return unwrapEvaluatedValue(await evaluateExpressionWithLocals(options, new Map()));
40
+ }
41
+ async function evaluateExpressionWithLocals(options, locals) {
42
+ const { ir, actionTypeName, expression, resolveParameter, context, tx } = options;
10
43
  switch (expression.kind) {
11
- case "valueReference": {
12
- const [parameterName, ...path] = expression.value.path;
13
- const parameterValue = await resolveParameter(parameterName);
14
- if (path.length === 0)
15
- return parameterValue;
44
+ case "inputReference": {
45
+ const parameterValue = await resolveParameter(expression.value.name);
16
46
  const actionType = getActionType(ir, actionTypeName);
17
- const parameter = actionType.parameters.find((candidate) => candidate.name === parameterName);
18
- const { type: parameterType, isOptional: parameterIsOptional, } = unwrapType(resolveType(ir, parameter.type));
19
- if (parameterType.kind !== "objectReference") {
20
- return get(parameterValue, path);
47
+ const parameter = actionType.parameters.find((candidate) => candidate.name === expression.value.name);
48
+ const { type: parameterType, isOptional } = unwrapType(resolveType(ir, parameter.type));
49
+ if (parameterType.kind === "objectReference") {
50
+ return {
51
+ [ontologyReference]: true,
52
+ objectType: parameterType.value.objectType,
53
+ key: parameterValue,
54
+ optional: isOptional,
55
+ };
21
56
  }
22
- const referencedType = ir.objectTypes.find((candidate) => candidate.name ===
23
- parameterType.value.objectType);
24
- // Object-reference values are represented by their primary key.
25
- // Avoid an on-demand subset load just to read that same key.
26
- if (path.length === 1 &&
27
- path[0] === referencedType.primaryKey) {
28
- return parameterValue;
57
+ return parameterValue;
58
+ }
59
+ case "localReference": {
60
+ const { name } = expression.value;
61
+ if (!locals.has(name)) {
62
+ throw new Error(`Unknown expression binding "${name}".`);
29
63
  }
64
+ return locals.get(name);
65
+ }
66
+ case "contextReference":
67
+ return context[expression.value.name];
68
+ case "getAt": {
69
+ const source = await evaluateExpressionWithLocals({
70
+ ...options,
71
+ expression: expression.value.source,
72
+ }, locals);
73
+ if (isEvaluatedObjectReference(source)) {
74
+ throw new Error(`Cannot access field "${expression.value.path.join(".")}" on an object reference without an object lookup.`);
75
+ }
76
+ return getAtPath(isEvaluatedOntologyObject(source)
77
+ ? source.value
78
+ : source, expression.value.path);
79
+ }
80
+ case "objectLookup": {
81
+ const reference = await evaluateExpressionWithLocals({
82
+ ...options,
83
+ expression: expression.value.reference,
84
+ }, locals);
85
+ if (!isEvaluatedObjectReference(reference)) {
86
+ throw new Error("Object lookup source must resolve to an object reference.");
87
+ }
88
+ if (reference.key === undefined || reference.key === null) {
89
+ return undefined;
90
+ }
91
+ const referencedType = ir.objectTypes.find((candidate) => candidate.name === reference.objectType);
30
92
  const referencedObject = await tx.query((query, objects) => query
31
93
  .from({
32
94
  object: objects[referencedType.name],
33
95
  })
34
- .where(({ object }) => eq(object[referencedType.primaryKey], parameterValue))
96
+ .where(({ object }) => eq(object[referencedType.primaryKey], reference.key))
35
97
  .select(({ object }) => object)
36
98
  .findOne());
37
- if (!referencedObject && !parameterIsOptional) {
38
- throw new Error(`Missing loaded "${referencedType.name}" object for parameter "${parameterName}" (${String(parameterValue)}).`);
99
+ if (!referencedObject && !reference.optional) {
100
+ throw new Error(`Missing loaded "${referencedType.name}" object.`);
39
101
  }
40
- return get(referencedObject, path);
102
+ return referencedObject
103
+ ? {
104
+ [ontologyObject]: true,
105
+ objectType: referencedType.name,
106
+ value: referencedObject,
107
+ }
108
+ : undefined;
109
+ }
110
+ case "linkHop": {
111
+ const source = await evaluateExpressionWithLocals({
112
+ ...options,
113
+ expression: expression.value.source,
114
+ }, locals);
115
+ if (!isEvaluatedOntologyObject(source)) {
116
+ throw new Error("Link hop source must resolve to an ontology object.");
117
+ }
118
+ const link = resolveLinkHop(ir, source.objectType, expression.value.link);
119
+ if (!link) {
120
+ throw new Error(`Unknown link "${expression.value.link}" on object type "${source.objectType}".`);
121
+ }
122
+ const foreignKeyOnSource = isLinkHopFromForeignKeySource(link, source.objectType, expression.value.link);
123
+ const cardinality = foreignKeyOnSource
124
+ ? "one"
125
+ : link.cardinality;
126
+ if (cardinality === "many") {
127
+ throw new Error(`Link "${expression.value.link}" on object type "${source.objectType}" is to-many.`);
128
+ }
129
+ const sourceType = ir.objectTypes.find((candidate) => candidate.name === source.objectType);
130
+ const targetType = ir.objectTypes.find((candidate) => candidate.name ===
131
+ (foreignKeyOnSource
132
+ ? link.target.objectType
133
+ : link.source.objectType));
134
+ const foreignKeyPath = link.foreignKey.split(".");
135
+ const sourceKey = foreignKeyOnSource
136
+ ? getAtPath(source.value, foreignKeyPath)
137
+ : source.value[sourceType.primaryKey];
138
+ if (sourceKey === undefined || sourceKey === null) {
139
+ return undefined;
140
+ }
141
+ const targetProperty = foreignKeyOnSource
142
+ ? targetType.primaryKey
143
+ : link.foreignKey;
144
+ const linkedObject = await tx.query((query, objects) => query
145
+ .from({
146
+ object: objects[targetType.name],
147
+ })
148
+ .where(({ object }) => eq(object[targetProperty], sourceKey))
149
+ .select(({ object }) => object)
150
+ .findOne());
151
+ return linkedObject
152
+ ? {
153
+ [ontologyObject]: true,
154
+ objectType: targetType.name,
155
+ value: linkedObject,
156
+ }
157
+ : undefined;
158
+ }
159
+ case "struct": {
160
+ const fields = await Promise.all(expression.value.fields.map(async (field) => [
161
+ field.name,
162
+ await evaluateExpressionWithLocals({
163
+ ...options,
164
+ expression: field.value,
165
+ }, locals),
166
+ ]));
167
+ return Object.fromEntries(fields);
168
+ }
169
+ case "map": {
170
+ const source = await evaluateExpressionWithLocals({
171
+ ...options,
172
+ expression: expression.value.source,
173
+ }, locals);
174
+ if (source === undefined) {
175
+ return undefined;
176
+ }
177
+ if (!Array.isArray(source)) {
178
+ throw new Error("Map expression source must resolve to a list.");
179
+ }
180
+ return Promise.all(source.map((item) => {
181
+ const itemLocals = new Map(locals);
182
+ itemLocals.set(expression.value.binding, item);
183
+ return evaluateExpressionWithLocals({
184
+ ...options,
185
+ expression: expression.value.body,
186
+ }, itemLocals);
187
+ }));
41
188
  }
42
- case "contextReference":
43
- return get(context, expression.value.path);
44
189
  case "literal":
45
190
  return expression.value.value;
46
- case "functionCall":
47
- return expression.value.kind === "uuid"
48
- ? globalThis.crypto.randomUUID()
49
- : Temporal.Now.instant();
191
+ case "uuid":
192
+ return globalThis.crypto.randomUUID();
193
+ case "now":
194
+ return Temporal.Now.instant();
50
195
  }
51
196
  }
52
197
  export async function resolveActionParameters(options) {
@@ -54,10 +199,7 @@ export async function resolveActionParameters(options) {
54
199
  const resolvedParameters = {
55
200
  ...options.initialParameters,
56
201
  };
57
- const parametersByName = new Map(action.parameters.map((parameter) => [
58
- parameter.name,
59
- parameter,
60
- ]));
202
+ const parametersByName = new Map(action.parameters.map((parameter) => [parameter.name, parameter]));
61
203
  const resolving = new Set();
62
204
  const resolveParameter = async (parameterName) => {
63
205
  if (resolvedParameters[parameterName] !== undefined) {
@@ -71,15 +213,14 @@ export async function resolveActionParameters(options) {
71
213
  }
72
214
  resolving.add(parameterName);
73
215
  try {
74
- resolvedParameters[parameterName] =
75
- await evaluateExpression({
76
- ir: options.ir,
77
- actionTypeName: options.actionTypeName,
78
- expression: parameter.defaultValue,
79
- resolveParameter,
80
- context: options.context,
81
- tx: options.tx,
82
- });
216
+ resolvedParameters[parameterName] = await evaluateExpression({
217
+ ir: options.ir,
218
+ actionTypeName: options.actionTypeName,
219
+ expression: parameter.defaultValue,
220
+ resolveParameter,
221
+ context: options.context,
222
+ tx: options.tx,
223
+ });
83
224
  return resolvedParameters[parameterName];
84
225
  }
85
226
  finally {
@@ -93,7 +234,7 @@ export async function resolveActionParameters(options) {
93
234
  }
94
235
  export function getObjectReferenceObjectType(ir, actionTypeName, reference) {
95
236
  const actionType = getActionType(ir, actionTypeName);
96
- const parameter = actionType.parameters.find((candidate) => candidate.name === reference.path[0]);
237
+ const parameter = actionType.parameters.find((candidate) => candidate.name === reference.name);
97
238
  const resolvedType = unwrapType(resolveType(ir, parameter.type)).type;
98
239
  return ir.objectTypes.find((candidate) => candidate.name === resolvedType.value.objectType);
99
240
  }
@@ -1 +1 @@
1
- {"version":3,"file":"expression.js","sourceRoot":"","sources":["../../src/live/expression.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expression.js","sourceRoot":"","sources":["../../src/live/expression.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { createCollection, localOnlyCollectionOptions, } from "@tanstack/db";
1
+ import { createCollection, localOnlyCollectionOptions } from "@tanstack/db";
2
2
  import { describe, expect, it } from "vitest";
3
3
  import { o } from "../ir/index.js";
4
4
  import { evaluateExpression } from "./expression.js";
@@ -39,13 +39,28 @@ const ir = {
39
39
  objectType: "User",
40
40
  }),
41
41
  },
42
+ {
43
+ name: "entries",
44
+ displayName: "Entries",
45
+ type: o.list({
46
+ elementType: o.struct({
47
+ fields: [
48
+ {
49
+ name: "code",
50
+ displayName: "Code",
51
+ type: o.string({}),
52
+ },
53
+ ],
54
+ }),
55
+ }),
56
+ },
42
57
  ],
43
58
  logic: [],
44
59
  },
45
60
  ],
46
61
  };
47
62
  describe("evaluateExpression", () => {
48
- it("resolves object-reference paths through the read transaction", async () => {
63
+ it("resolves explicit object lookups through the read transaction", async () => {
49
64
  const users = createCollection(localOnlyCollectionOptions({
50
65
  id: "expression-users",
51
66
  getKey: (user) => user.id,
@@ -61,9 +76,18 @@ describe("evaluateExpression", () => {
61
76
  ir,
62
77
  actionTypeName: "assign",
63
78
  expression: {
64
- kind: "valueReference",
79
+ kind: "getAt",
65
80
  value: {
66
- path: ["user", "name"],
81
+ source: {
82
+ kind: "objectLookup",
83
+ value: {
84
+ reference: {
85
+ kind: "inputReference",
86
+ value: { name: "user" },
87
+ },
88
+ },
89
+ },
90
+ path: ["name"],
67
91
  },
68
92
  },
69
93
  resolveParameter: () => Promise.resolve("user-1"),
@@ -72,7 +96,7 @@ describe("evaluateExpression", () => {
72
96
  })).resolves.toBe("Ada");
73
97
  await users.cleanup();
74
98
  });
75
- it("returns an object-reference primary key without querying its collection", async () => {
99
+ it("returns an object-reference input without implicitly loading it", async () => {
76
100
  const query = () => {
77
101
  throw new Error("The object collection should not be queried.");
78
102
  };
@@ -80,9 +104,9 @@ describe("evaluateExpression", () => {
80
104
  ir,
81
105
  actionTypeName: "assign",
82
106
  expression: {
83
- kind: "valueReference",
107
+ kind: "inputReference",
84
108
  value: {
85
- path: ["user", "id"],
109
+ name: "user",
86
110
  },
87
111
  },
88
112
  resolveParameter: () => Promise.resolve("user-1"),
@@ -90,5 +114,168 @@ describe("evaluateExpression", () => {
90
114
  tx: { query },
91
115
  })).resolves.toBe("user-1");
92
116
  });
117
+ it("follows an explicit to-one link hop", async () => {
118
+ const projectType = {
119
+ name: "Project",
120
+ displayName: "Project",
121
+ pluralDisplayName: "Projects",
122
+ primaryKey: "id",
123
+ properties: [
124
+ {
125
+ name: "id",
126
+ displayName: "ID",
127
+ type: o.string({}),
128
+ },
129
+ {
130
+ name: "ownerId",
131
+ displayName: "Owner",
132
+ type: o.string({}),
133
+ },
134
+ ],
135
+ };
136
+ const linkIr = {
137
+ ...ir,
138
+ objectTypes: [...ir.objectTypes, projectType],
139
+ linkTypes: [
140
+ {
141
+ id: "projectOwner",
142
+ source: {
143
+ objectType: "Project",
144
+ name: "projects",
145
+ displayName: "Projects",
146
+ },
147
+ target: {
148
+ objectType: "User",
149
+ name: "owner",
150
+ displayName: "Owner",
151
+ },
152
+ foreignKey: "ownerId",
153
+ cardinality: "one",
154
+ },
155
+ ],
156
+ actionTypes: [
157
+ {
158
+ ...ir.actionTypes[0],
159
+ parameters: [
160
+ ...ir.actionTypes[0].parameters,
161
+ {
162
+ name: "project",
163
+ displayName: "Project",
164
+ type: o.objectReference({
165
+ objectType: "Project",
166
+ }),
167
+ },
168
+ ],
169
+ },
170
+ ],
171
+ };
172
+ const users = createCollection(localOnlyCollectionOptions({
173
+ id: "link-hop-users",
174
+ getKey: (user) => user.id,
175
+ initialData: [
176
+ {
177
+ id: "user-1",
178
+ name: "Ada",
179
+ },
180
+ ],
181
+ }));
182
+ const projects = createCollection(localOnlyCollectionOptions({
183
+ id: "link-hop-projects",
184
+ getKey: (project) => project.id,
185
+ initialData: [
186
+ {
187
+ id: "project-1",
188
+ ownerId: "user-1",
189
+ },
190
+ ],
191
+ }));
192
+ await Promise.all([users.preload(), projects.preload()]);
193
+ await expect(evaluateExpression({
194
+ ir: linkIr,
195
+ actionTypeName: "assign",
196
+ expression: o.Expression.getAt({
197
+ source: o.Expression.linkHop({
198
+ source: o.Expression.objectLookup({
199
+ reference: o.Expression.inputReference({
200
+ name: "project",
201
+ }),
202
+ }),
203
+ link: "owner",
204
+ }),
205
+ path: ["name"],
206
+ }),
207
+ resolveParameter: () => Promise.resolve("project-1"),
208
+ context: {},
209
+ tx: createReadTx({
210
+ User: users,
211
+ Project: projects,
212
+ }),
213
+ })).resolves.toBe("Ada");
214
+ await Promise.all([
215
+ users.cleanup(),
216
+ projects.cleanup(),
217
+ ]);
218
+ });
219
+ it("maps list elements into constructed structs", async () => {
220
+ await expect(evaluateExpression({
221
+ ir,
222
+ actionTypeName: "assign",
223
+ expression: o.Expression.map({
224
+ source: o.Expression.inputReference({
225
+ name: "entries",
226
+ }),
227
+ binding: "entry",
228
+ body: o.Expression.struct({
229
+ fields: [
230
+ {
231
+ name: "renamedCode",
232
+ value: o.Expression.getAt({
233
+ source: o.Expression.localReference({
234
+ name: "entry",
235
+ }),
236
+ path: ["code"],
237
+ }),
238
+ },
239
+ {
240
+ name: "actor",
241
+ value: o.Expression.contextReference({
242
+ name: "user",
243
+ }),
244
+ },
245
+ ],
246
+ }),
247
+ }),
248
+ resolveParameter: (name) => Promise.resolve(name === "entries" ? [{ code: "alpha" }, { code: "beta" }] : undefined),
249
+ context: { user: "user-1" },
250
+ tx: createReadTx({}),
251
+ })).resolves.toEqual([
252
+ {
253
+ renamedCode: "alpha",
254
+ actor: "user-1",
255
+ },
256
+ {
257
+ renamedCode: "beta",
258
+ actor: "user-1",
259
+ },
260
+ ]);
261
+ });
262
+ it("preserves an undefined optional map source", async () => {
263
+ await expect(evaluateExpression({
264
+ ir,
265
+ actionTypeName: "assign",
266
+ expression: o.Expression.map({
267
+ source: o.Expression.inputReference({
268
+ name: "entries",
269
+ }),
270
+ binding: "entry",
271
+ body: o.Expression.localReference({
272
+ name: "entry",
273
+ }),
274
+ }),
275
+ resolveParameter: () => Promise.resolve(undefined),
276
+ context: {},
277
+ tx: createReadTx({}),
278
+ })).resolves.toBeUndefined();
279
+ });
93
280
  });
94
281
  //# sourceMappingURL=expression.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"expression.test.js","sourceRoot":"","sources":["../../src/live/expression.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expression.test.js","sourceRoot":"","sources":["../../src/live/expression.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"OntologyEdits.d.ts","sourceRoot":"","sources":["../../../src/live/mutators/OntologyEdits.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACR,sBAAsB,EACtB,iBAAiB,EAGpB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAER,UAAU,EAEb,MAAM,mBAAmB,CAAC;AA0C3B,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACvD,EAAE,EAAE,UAAU,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,sBAAsB,CAAC;IAChC,EAAE,EAAE,iBAAiB,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDhB"}
1
+ {"version":3,"file":"OntologyEdits.d.ts","sourceRoot":"","sources":["../../../src/live/mutators/OntologyEdits.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,sBAAsB,EACtB,iBAAiB,EAGpB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAiB,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AAoCvF,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACvD,EAAE,EAAE,UAAU,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,sBAAsB,CAAC;IAChC,EAAE,EAAE,iBAAiB,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyChB"}
@@ -1,6 +1,6 @@
1
- import { set } from "lodash-es";
1
+ import { setAtPath } from "../../utils/paths.js";
2
2
  import { decorateObjectAttachmentSources } from "../attachments/attachmentSources.js";
3
- import { evaluateExpression, getObjectReferenceObjectType, } from "../expression.js";
3
+ import { evaluateExpression, getObjectReferenceObjectType } from "../expression.js";
4
4
  function objectType(ir, name) {
5
5
  const type = ir.objectTypes.find((candidate) => candidate.name === name);
6
6
  if (!type)
@@ -35,12 +35,12 @@ export async function applyActionLogicToMutatorTx(options) {
35
35
  for (const step of action.logic) {
36
36
  if (step.kind === "createObject") {
37
37
  const type = objectType(options.ir, step.value.objectType);
38
- const object = {};
38
+ let object = {};
39
39
  for (const change of await propertyChanges({
40
40
  ...options,
41
41
  assignments: step.value.values,
42
42
  })) {
43
- set(object, change.path, change.value);
43
+ object = setAtPath(object, change.path, change.value);
44
44
  }
45
45
  decorateObjectAttachmentSources({
46
46
  ir: options.ir,
@@ -51,7 +51,7 @@ export async function applyActionLogicToMutatorTx(options) {
51
51
  continue;
52
52
  }
53
53
  const type = getObjectReferenceObjectType(options.ir, options.actionTypeName, step.value.object);
54
- const key = options.parameters[step.value.object.path[0]];
54
+ const key = options.parameters[step.value.object.name];
55
55
  if (step.kind === "updateObject") {
56
56
  await options.tx.mutate[type.name].update(key, await propertyChanges({
57
57
  ...options,
@@ -1 +1 @@
1
- {"version":3,"file":"OntologyEdits.js","sourceRoot":"","sources":["../../../src/live/mutators/OntologyEdits.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OntologyEdits.js","sourceRoot":"","sources":["../../../src/live/mutators/OntologyEdits.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"createMutatorTx.d.ts","sourceRoot":"","sources":["../../../src/live/mutators/createMutatorTx.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,WAAW,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACR,sBAAsB,EACtB,iBAAiB,EAEjB,cAAc,EACjB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,YAAY,CACxB,OAAO,EAAE,sBAAsB,GAChC,cAAc,CAOhB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,sBAAsB,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,GAAG,iBAAiB,CAoEpB"}
1
+ {"version":3,"file":"createMutatorTx.d.ts","sourceRoot":"","sources":["../../../src/live/mutators/createMutatorTx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhF,OAAO,KAAK,EACR,sBAAsB,EACtB,iBAAiB,EAEjB,cAAc,EACjB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,YAAY,CAAC,OAAO,EAAE,sBAAsB,GAAG,cAAc,CAI5E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,sBAAsB,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,GAAG,iBAAiB,CA2CpB"}