@party-stack/ontology 0.7.0 → 0.9.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.
- package/lib/OntologyConfig.d.ts +2 -0
- package/lib/OntologyConfig.d.ts.map +1 -1
- package/lib/cli/generate.d.ts.map +1 -1
- package/lib/cli/generate.js +9 -0
- package/lib/cli/generate.js.map +1 -1
- package/lib/cli/pull.d.ts.map +1 -1
- package/lib/cli/pull.js +4 -1
- package/lib/cli/pull.js.map +1 -1
- package/lib/examples/generated/constants.d.ts +2 -0
- package/lib/examples/generated/constants.d.ts.map +1 -0
- package/lib/examples/generated/constants.js +3 -0
- package/lib/examples/generated/constants.js.map +1 -0
- package/lib/generate/constants.d.ts +3 -0
- package/lib/generate/constants.d.ts.map +1 -0
- package/lib/generate/constants.js +31 -0
- package/lib/generate/constants.js.map +1 -0
- package/lib/generate/index.d.ts +1 -0
- package/lib/generate/index.d.ts.map +1 -1
- package/lib/generate/index.js +1 -0
- package/lib/generate/index.js.map +1 -1
- package/lib/generate/types.d.ts.map +1 -1
- package/lib/generate/types.js +10 -2
- package/lib/generate/types.js.map +1 -1
- package/lib/generate/types.test.js +67 -0
- package/lib/generate/types.test.js.map +1 -1
- package/lib/infer.d.ts +13 -2
- package/lib/infer.d.ts.map +1 -1
- package/lib/infer.js.map +1 -1
- package/lib/infer.test.js +9 -0
- package/lib/infer.test.js.map +1 -1
- package/lib/ir/generated/builders.d.ts +16 -0
- package/lib/ir/generated/builders.d.ts.map +1 -1
- package/lib/ir/generated/builders.js +4 -0
- package/lib/ir/generated/builders.js.map +1 -1
- package/lib/ir/generated/constants.d.ts +30 -0
- package/lib/ir/generated/constants.d.ts.map +1 -0
- package/lib/ir/generated/constants.js +15 -0
- package/lib/ir/generated/constants.js.map +1 -0
- package/lib/ir/generated/types.d.ts +32 -1
- package/lib/ir/generated/types.d.ts.map +1 -1
- package/lib/ir/schema.d.ts +254 -0
- package/lib/ir/schema.d.ts.map +1 -1
- package/lib/ir/schema.js +141 -1
- package/lib/ir/schema.js.map +1 -1
- package/lib/ir/validate.d.ts.map +1 -1
- package/lib/ir/validate.js +70 -1
- package/lib/ir/validate.js.map +1 -1
- package/lib/ir/validate.test.js +46 -0
- package/lib/ir/validate.test.js.map +1 -1
- package/lib/live/LiveOntology.d.ts +12 -1
- package/lib/live/LiveOntology.d.ts.map +1 -1
- package/lib/live/LiveOntology.js +45 -13
- package/lib/live/LiveOntology.js.map +1 -1
- package/lib/live/LiveOntology.test.js +123 -1
- package/lib/live/LiveOntology.test.js.map +1 -1
- package/lib/live/OntologyBackendAdapter.d.ts +25 -5
- package/lib/live/OntologyBackendAdapter.d.ts.map +1 -1
- package/lib/live/attachments/attachmentMetadata.test.d.ts +2 -0
- package/lib/live/attachments/attachmentMetadata.test.d.ts.map +1 -0
- package/lib/live/attachments/attachmentMetadata.test.js +73 -0
- package/lib/live/attachments/attachmentMetadata.test.js.map +1 -0
- package/lib/live/attachments/createLiveOntologyAttachments.d.ts +31 -11
- package/lib/live/attachments/createLiveOntologyAttachments.d.ts.map +1 -1
- package/lib/live/attachments/createLiveOntologyAttachments.js +43 -15
- package/lib/live/attachments/createLiveOntologyAttachments.js.map +1 -1
- package/lib/live/attachments/createLiveOntologyAttachments.test.js +100 -1
- package/lib/live/attachments/createLiveOntologyAttachments.test.js.map +1 -1
- package/lib/live/attachments/types.d.ts +15 -0
- package/lib/live/attachments/types.d.ts.map +1 -0
- package/lib/live/attachments/types.js +2 -0
- package/lib/live/attachments/types.js.map +1 -0
- package/lib/live/attachments/unsupportedOntologyAttachmentsAdapter.d.ts.map +1 -1
- package/lib/live/attachments/unsupportedOntologyAttachmentsAdapter.js +0 -1
- package/lib/live/attachments/unsupportedOntologyAttachmentsAdapter.js.map +1 -1
- package/lib/live/index.d.ts +2 -0
- package/lib/live/index.d.ts.map +1 -1
- package/lib/live/index.js +1 -0
- package/lib/live/index.js.map +1 -1
- package/lib/live/outbox/createOntologyOutbox.d.ts.map +1 -1
- package/lib/live/outbox/createOntologyOutbox.js +13 -1
- package/lib/live/outbox/createOntologyOutbox.js.map +1 -1
- package/lib/live/waitForCollectionReady.d.ts +15 -0
- package/lib/live/waitForCollectionReady.d.ts.map +1 -0
- package/lib/live/waitForCollectionReady.js +69 -0
- package/lib/live/waitForCollectionReady.js.map +1 -0
- package/lib/meta/generated/constants.d.ts +30 -0
- package/lib/meta/generated/constants.d.ts.map +1 -0
- package/lib/meta/generated/constants.js +15 -0
- package/lib/meta/generated/constants.js.map +1 -0
- package/lib/meta/generated/types.d.ts +32 -1
- package/lib/meta/generated/types.d.ts.map +1 -1
- package/lib/meta/pull.d.ts.map +1 -1
- package/lib/meta/pull.js +3 -1
- package/lib/meta/pull.js.map +1 -1
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.d.ts.map +1 -1
- package/lib/utils/index.js +1 -0
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/values.d.ts +2 -4
- package/lib/utils/values.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MemoryBlobBytesStore, SingleProcessCoordination } from "@party-stack/runtime";
|
|
2
2
|
import { describe, expect, it, vi } from "vitest";
|
|
3
3
|
import { o } from "../ir/index.js";
|
|
4
|
-
import { createLiveOntology } from "./LiveOntology.js";
|
|
4
|
+
import { createLiveOntology, waitForLiveOntologyReady } from "./LiveOntology.js";
|
|
5
5
|
const ir = {
|
|
6
6
|
types: [],
|
|
7
7
|
objectTypes: [],
|
|
@@ -151,5 +151,127 @@ describe("createLiveOntology", () => {
|
|
|
151
151
|
await ontology.cleanup();
|
|
152
152
|
await coordination.close();
|
|
153
153
|
});
|
|
154
|
+
it("exposes ready and settles immediate cleanup without unhandled rejections", async () => {
|
|
155
|
+
const unhandled = [];
|
|
156
|
+
const onUnhandled = (reason) => {
|
|
157
|
+
unhandled.push(reason);
|
|
158
|
+
};
|
|
159
|
+
process.on("unhandledRejection", onUnhandled);
|
|
160
|
+
const coordination = new SingleProcessCoordination({
|
|
161
|
+
scope: "lifecycle-cleanup",
|
|
162
|
+
});
|
|
163
|
+
const backendAdapter = {
|
|
164
|
+
name: "test",
|
|
165
|
+
getCollectionOptions: () => ({
|
|
166
|
+
syncMode: "on-demand",
|
|
167
|
+
sync: {
|
|
168
|
+
sync: ({ markReady }) => {
|
|
169
|
+
markReady();
|
|
170
|
+
return {};
|
|
171
|
+
},
|
|
172
|
+
},
|
|
173
|
+
}),
|
|
174
|
+
applyAction: () => Promise.resolve(),
|
|
175
|
+
runQueryFunction: () => Promise.resolve(undefined),
|
|
176
|
+
};
|
|
177
|
+
try {
|
|
178
|
+
const ontology = await createLiveOntology({
|
|
179
|
+
id: "lifecycle-cleanup",
|
|
180
|
+
ir: {
|
|
181
|
+
...ir,
|
|
182
|
+
objectTypes: [
|
|
183
|
+
{
|
|
184
|
+
name: "Note",
|
|
185
|
+
displayName: "Note",
|
|
186
|
+
pluralDisplayName: "Notes",
|
|
187
|
+
primaryKey: "id",
|
|
188
|
+
properties: [
|
|
189
|
+
{
|
|
190
|
+
name: "id",
|
|
191
|
+
displayName: "ID",
|
|
192
|
+
type: o.string({}),
|
|
193
|
+
},
|
|
194
|
+
],
|
|
195
|
+
},
|
|
196
|
+
],
|
|
197
|
+
queryFunctionTypes: [],
|
|
198
|
+
},
|
|
199
|
+
backend: () => backendAdapter,
|
|
200
|
+
runtime: () => ({
|
|
201
|
+
owner: "user",
|
|
202
|
+
namespace: "lifecycle-cleanup",
|
|
203
|
+
blobBytes: new MemoryBlobBytesStore(),
|
|
204
|
+
coordination,
|
|
205
|
+
}),
|
|
206
|
+
});
|
|
207
|
+
const ready = ontology.ready;
|
|
208
|
+
await expect(Promise.all([ready, ontology.cleanup()])).resolves.toBeDefined();
|
|
209
|
+
await expect(ontology.cleanup()).resolves.toBeUndefined();
|
|
210
|
+
expect(unhandled).toEqual([]);
|
|
211
|
+
}
|
|
212
|
+
finally {
|
|
213
|
+
process.off("unhandledRejection", onUnhandled);
|
|
214
|
+
await coordination.close();
|
|
215
|
+
}
|
|
216
|
+
});
|
|
217
|
+
it("waits for on-demand collections via waitForLiveOntologyReady", async () => {
|
|
218
|
+
let syncStarted = false;
|
|
219
|
+
const coordination = new SingleProcessCoordination({
|
|
220
|
+
scope: "wait-ready",
|
|
221
|
+
});
|
|
222
|
+
const backendAdapter = {
|
|
223
|
+
name: "test",
|
|
224
|
+
getCollectionOptions: () => ({
|
|
225
|
+
syncMode: "on-demand",
|
|
226
|
+
sync: {
|
|
227
|
+
sync: ({ markReady }) => {
|
|
228
|
+
syncStarted = true;
|
|
229
|
+
// Defer ready so waitForCollectionReady must start sync first.
|
|
230
|
+
queueMicrotask(() => markReady());
|
|
231
|
+
return {
|
|
232
|
+
loadSubset: () => true,
|
|
233
|
+
};
|
|
234
|
+
},
|
|
235
|
+
},
|
|
236
|
+
}),
|
|
237
|
+
applyAction: () => Promise.resolve(),
|
|
238
|
+
runQueryFunction: () => Promise.resolve(undefined),
|
|
239
|
+
};
|
|
240
|
+
const ontology = await createLiveOntology({
|
|
241
|
+
id: "wait-ready",
|
|
242
|
+
ir: {
|
|
243
|
+
...ir,
|
|
244
|
+
objectTypes: [
|
|
245
|
+
{
|
|
246
|
+
name: "Note",
|
|
247
|
+
displayName: "Note",
|
|
248
|
+
pluralDisplayName: "Notes",
|
|
249
|
+
primaryKey: "id",
|
|
250
|
+
properties: [
|
|
251
|
+
{
|
|
252
|
+
name: "id",
|
|
253
|
+
displayName: "ID",
|
|
254
|
+
type: o.string({}),
|
|
255
|
+
},
|
|
256
|
+
],
|
|
257
|
+
},
|
|
258
|
+
],
|
|
259
|
+
queryFunctionTypes: [],
|
|
260
|
+
},
|
|
261
|
+
backend: () => backendAdapter,
|
|
262
|
+
runtime: () => ({
|
|
263
|
+
owner: "user",
|
|
264
|
+
namespace: "wait-ready",
|
|
265
|
+
blobBytes: new MemoryBlobBytesStore(),
|
|
266
|
+
coordination,
|
|
267
|
+
}),
|
|
268
|
+
});
|
|
269
|
+
expect(ontology.objects.Note.status).toBe("idle");
|
|
270
|
+
await expect(waitForLiveOntologyReady(ontology)).resolves.toBeUndefined();
|
|
271
|
+
expect(syncStarted).toBe(true);
|
|
272
|
+
expect(ontology.objects.Note.status).toBe("ready");
|
|
273
|
+
await ontology.cleanup();
|
|
274
|
+
await coordination.close();
|
|
275
|
+
});
|
|
154
276
|
});
|
|
155
277
|
//# sourceMappingURL=LiveOntology.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiveOntology.test.js","sourceRoot":"","sources":["../../src/live/LiveOntology.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAA2B,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"LiveOntology.test.js","sourceRoot":"","sources":["../../src/live/LiveOntology.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as v from "../utils/values.js";
|
|
2
2
|
import type { AttachmentTypeDef, OntologyIR } from "../ir/index.js";
|
|
3
|
+
import type { PartialAttachmentMetadata } from "./attachments/types.js";
|
|
3
4
|
import type { Collection, CollectionConfig } from "@tanstack/db";
|
|
4
5
|
export type OntologyCollectionOptions = Omit<CollectionConfig<Record<string, unknown>, string | number>, "getKey">;
|
|
5
6
|
export interface OntologyAttachmentUpload {
|
|
@@ -13,6 +14,29 @@ export interface OntologyAttachmentIdMapping {
|
|
|
13
14
|
}
|
|
14
15
|
export interface OntologyApplyActionResult {
|
|
15
16
|
attachmentIdMappings?: OntologyAttachmentIdMapping[];
|
|
17
|
+
/**
|
|
18
|
+
* Object types that may have changed as a result of the action.
|
|
19
|
+
* When omitted, clients may fall back to refreshing all known object types.
|
|
20
|
+
*/
|
|
21
|
+
invalidatedObjectTypes?: string[];
|
|
22
|
+
}
|
|
23
|
+
export interface OntologyActionRefreshResult {
|
|
24
|
+
status: "ok" | "error" | "aborted";
|
|
25
|
+
objectType: string;
|
|
26
|
+
error?: {
|
|
27
|
+
name: string;
|
|
28
|
+
message: string;
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
export interface OntologyActionRefreshDiagnostics {
|
|
32
|
+
/**
|
|
33
|
+
* Best-effort cache refresh after a confirmed write.
|
|
34
|
+
* Never rejects; failures are reported in the resolved results.
|
|
35
|
+
*/
|
|
36
|
+
completed: Promise<OntologyActionRefreshResult[]>;
|
|
37
|
+
}
|
|
38
|
+
export interface OntologyApplyActionClientResult extends OntologyApplyActionResult {
|
|
39
|
+
refresh?: OntologyActionRefreshDiagnostics;
|
|
16
40
|
}
|
|
17
41
|
export interface ApplyActionLiveOpts {
|
|
18
42
|
objects: Record<string, Collection<Record<string, unknown>>>;
|
|
@@ -35,11 +59,7 @@ export interface OntologyAttachmentsAdapter {
|
|
|
35
59
|
target?: AttachmentTypeDef;
|
|
36
60
|
}) => Promise<v.attachment | void>;
|
|
37
61
|
getAttachmentContent: (attachment: v.attachment) => Promise<Blob>;
|
|
38
|
-
getAttachmentMetadata
|
|
39
|
-
size: number;
|
|
40
|
-
type: string;
|
|
41
|
-
name?: string;
|
|
42
|
-
}>;
|
|
62
|
+
getAttachmentMetadata?: (attachment: v.attachment, selection: readonly (keyof PartialAttachmentMetadata)[]) => Promise<PartialAttachmentMetadata>;
|
|
43
63
|
}
|
|
44
64
|
export interface OntologyBackendAdapter {
|
|
45
65
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OntologyBackendAdapter.d.ts","sourceRoot":"","sources":["../../src/live/OntologyBackendAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,oBAAoB,CAAC;AACxC,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEjE,MAAM,MAAM,yBAAyB,GAAG,IAAI,CACxC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,EAC1D,QAAQ,CACX,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACrC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC;IACzB,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAED,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,oBAAoB,CAAC,EAAE,2BAA2B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"OntologyBackendAdapter.d.ts","sourceRoot":"","sources":["../../src/live/OntologyBackendAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attachmentMetadata.test.d.ts","sourceRoot":"","sources":["../../../src/live/attachments/attachmentMetadata.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { describe, expect, expectTypeOf, it, vi } from "vitest";
|
|
2
|
+
import { createLiveOntologyAttachments } from "./createLiveOntologyAttachments.js";
|
|
3
|
+
describe("attachment metadata", () => {
|
|
4
|
+
it("only exposes dimensions for image selections", () => {
|
|
5
|
+
expectTypeOf().toEqualTypeOf();
|
|
6
|
+
expectTypeOf().toEqualTypeOf();
|
|
7
|
+
});
|
|
8
|
+
it("infers created attachment types from targets", () => {
|
|
9
|
+
const attachments = undefined;
|
|
10
|
+
const check = async () => {
|
|
11
|
+
const image = await attachments.create(new Blob(), {
|
|
12
|
+
target: {
|
|
13
|
+
kind: "objectProperty",
|
|
14
|
+
objectType: "Document",
|
|
15
|
+
property: "image",
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
expectTypeOf(image.attachment).toEqualTypeOf();
|
|
19
|
+
const images = await attachments.create(new Blob(), {
|
|
20
|
+
target: {
|
|
21
|
+
kind: "objectProperty",
|
|
22
|
+
objectType: "Document",
|
|
23
|
+
property: "images",
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
expectTypeOf(images.attachment).toEqualTypeOf();
|
|
27
|
+
const parameter = await attachments.create(new Blob(), {
|
|
28
|
+
target: {
|
|
29
|
+
kind: "actionParameter",
|
|
30
|
+
actionType: "upload",
|
|
31
|
+
parameter: "image",
|
|
32
|
+
},
|
|
33
|
+
});
|
|
34
|
+
expectTypeOf(parameter.attachment).toEqualTypeOf();
|
|
35
|
+
const targetless = await attachments.create(new Blob());
|
|
36
|
+
expectTypeOf(targetless.attachment).toEqualTypeOf();
|
|
37
|
+
};
|
|
38
|
+
expectTypeOf(check).toBeFunction();
|
|
39
|
+
});
|
|
40
|
+
it("delegates missing selected fields to the blob manager", async () => {
|
|
41
|
+
const metadata = vi.fn(() => Promise.resolve({
|
|
42
|
+
id: "image-1",
|
|
43
|
+
size: 10,
|
|
44
|
+
dimensions: { width: 800, height: 600 },
|
|
45
|
+
}));
|
|
46
|
+
const attachments = createLiveOntologyAttachments({
|
|
47
|
+
ir: {
|
|
48
|
+
types: [],
|
|
49
|
+
objectTypes: [],
|
|
50
|
+
linkTypes: [],
|
|
51
|
+
actionTypes: [],
|
|
52
|
+
queryFunctionTypes: [],
|
|
53
|
+
},
|
|
54
|
+
attachmentsAdapter: {},
|
|
55
|
+
blobManager: { metadata },
|
|
56
|
+
});
|
|
57
|
+
const attachment = {
|
|
58
|
+
id: "image-1",
|
|
59
|
+
type: "image/png",
|
|
60
|
+
};
|
|
61
|
+
await expect(attachments.metadata(attachment, {
|
|
62
|
+
select: ["type", "dimensions"],
|
|
63
|
+
})).resolves.toMatchObject({
|
|
64
|
+
type: "image/png",
|
|
65
|
+
dimensions: { width: 800, height: 600 },
|
|
66
|
+
});
|
|
67
|
+
expect(metadata).toHaveBeenCalledWith("image-1", {
|
|
68
|
+
meta: { attachment },
|
|
69
|
+
select: ["type", "dimensions"],
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
//# sourceMappingURL=attachmentMetadata.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attachmentMetadata.test.js","sourceRoot":"","sources":["../../../src/live/attachments/attachmentMetadata.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEhE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAOnF,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,YAAY,EAA8C,CAAC,aAAa,EAErE,CAAC;QACJ,YAAY,EAAwC,CAAC,aAAa,EAE/D,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QAiBpD,MAAM,WAAW,GAAG,SAA6D,CAAC;QAElF,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE;gBAC/C,MAAM,EAAE;oBACJ,IAAI,EAAE,gBAAgB;oBACtB,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,OAAO;iBACpB;aACJ,CAAC,CAAC;YACH,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,aAAa,EAEzC,CAAC;YAEJ,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE;gBAChD,MAAM,EAAE;oBACJ,IAAI,EAAE,gBAAgB;oBACtB,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,QAAQ;iBACrB;aACJ,CAAC,CAAC;YACH,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,aAAa,EAE1C,CAAC;YAEJ,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE;gBACnD,MAAM,EAAE;oBACJ,IAAI,EAAE,iBAAiB;oBACvB,UAAU,EAAE,QAAQ;oBACpB,SAAS,EAAE,OAAO;iBACrB;aACJ,CAAC,CAAC;YACH,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,aAAa,EAE7C,CAAC;YAEJ,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACxD,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,aAAa,EAAgB,CAAC;QACtE,CAAC,CAAC;QACF,YAAY,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CACxB,OAAO,CAAC,OAAO,CAAC;YACZ,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;SAC1C,CAAC,CACL,CAAC;QACF,MAAM,WAAW,GAAG,6BAA6B,CAAC;YAC9C,EAAE,EAAE;gBACA,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,EAAE;gBACf,SAAS,EAAE,EAAE;gBACb,WAAW,EAAE,EAAE;gBACf,kBAAkB,EAAE,EAAE;aACJ;YACtB,kBAAkB,EAAE,EAAgC;YACpD,WAAW,EAAE,EAAE,QAAQ,EAA4B;SACtD,CAAC,CAAC;QACH,MAAM,UAAU,GAAG;YACf,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,WAAoB;SAC7B,CAAC;QAEF,MAAM,MAAM,CACR,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE;YAC7B,MAAM,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;SACjC,CAAC,CACL,CAAC,QAAQ,CAAC,aAAa,CAAC;YACrB,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;SAC1C,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC,SAAS,EAAE;YAC7C,IAAI,EAAE,EAAE,UAAU,EAAE;YACpB,MAAM,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;SACjC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BlobManager } from "@party-stack/blobs";
|
|
2
2
|
import * as v from "../../utils/values.js";
|
|
3
|
+
import type { AttachmentMetadata, AttachmentMetadataSelection } from "./types.js";
|
|
3
4
|
import type { OntologyIR } from "../../ir/index.js";
|
|
4
5
|
import type { OntologyAttachmentCreateTarget } from "../../utils/targets.js";
|
|
5
6
|
import type { OntologyAttachmentsAdapter } from "../OntologyBackendAdapter.js";
|
|
@@ -11,8 +12,26 @@ interface LiveOntologyAttachmentCreateOptions {
|
|
|
11
12
|
target?: OntologyAttachmentCreateTarget;
|
|
12
13
|
eager?: boolean;
|
|
13
14
|
}
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
interface AttachmentOntologyDefinition {
|
|
16
|
+
objectTypes: Record<string, Record<string, unknown>>;
|
|
17
|
+
actionTypes: Record<string, {
|
|
18
|
+
parameters: Record<string, unknown>;
|
|
19
|
+
}>;
|
|
20
|
+
}
|
|
21
|
+
type ExtractAttachment<Value> = Value extends v.attachment<infer Type> ? v.attachment<Type> : NonNullable<Value> extends ReadonlyArray<infer Element> ? ExtractAttachment<Element> : never;
|
|
22
|
+
type AttachmentAtTarget<Ontology extends AttachmentOntologyDefinition, Target> = string extends keyof Ontology["objectTypes"] ? v.attachment : Target extends {
|
|
23
|
+
kind: "objectProperty";
|
|
24
|
+
objectType: infer ObjectType;
|
|
25
|
+
property: infer Property;
|
|
26
|
+
} ? ObjectType extends keyof Ontology["objectTypes"] ? Property extends keyof Ontology["objectTypes"][ObjectType] ? ExtractAttachment<Ontology["objectTypes"][ObjectType][Property]> : never : never : Target extends {
|
|
27
|
+
kind: "actionParameter";
|
|
28
|
+
actionType: infer ActionType;
|
|
29
|
+
parameter: infer Parameter;
|
|
30
|
+
} ? ActionType extends keyof Ontology["actionTypes"] ? Parameter extends keyof Ontology["actionTypes"][ActionType]["parameters"] ? ExtractAttachment<Ontology["actionTypes"][ActionType]["parameters"][Parameter]> : never : never : v.attachment;
|
|
31
|
+
type LiveOntologyAttachmentCreateResult<Ontology extends AttachmentOntologyDefinition, Options extends LiveOntologyAttachmentCreateOptions | undefined> = {
|
|
32
|
+
attachment: Options extends {
|
|
33
|
+
target: infer Target;
|
|
34
|
+
} ? AttachmentAtTarget<Ontology, Target> : v.attachment;
|
|
16
35
|
} & (Options extends {
|
|
17
36
|
eager: true;
|
|
18
37
|
} ? {
|
|
@@ -20,19 +39,20 @@ type LiveOntologyAttachmentCreateResult<Options extends LiveOntologyAttachmentCr
|
|
|
20
39
|
} : {
|
|
21
40
|
isMaterialized?: never;
|
|
22
41
|
});
|
|
23
|
-
export interface LiveOntologyAttachments {
|
|
24
|
-
create: <Options extends LiveOntologyAttachmentCreateOptions | undefined = undefined>(blob: Blob | File, opts?: Options) => Promise<LiveOntologyAttachmentCreateResult<Options>>;
|
|
25
|
-
metadata:
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
42
|
+
export interface LiveOntologyAttachments<Ontology extends AttachmentOntologyDefinition = AttachmentOntologyDefinition> {
|
|
43
|
+
create: <const Options extends LiveOntologyAttachmentCreateOptions | undefined = undefined>(blob: Blob | File, opts?: Options) => Promise<LiveOntologyAttachmentCreateResult<Ontology, Options>>;
|
|
44
|
+
metadata: {
|
|
45
|
+
<Type extends string>(attachment: v.attachment<Type>): Promise<AttachmentMetadata<Type>>;
|
|
46
|
+
<Type extends string, const Selection extends AttachmentMetadataSelection<Type>>(attachment: v.attachment<Type>, options: {
|
|
47
|
+
select: Selection;
|
|
48
|
+
}): Promise<AttachmentMetadata<Type, Selection[number]>>;
|
|
49
|
+
};
|
|
30
50
|
blob: (attachment: v.attachment) => Promise<Blob>;
|
|
31
51
|
}
|
|
32
|
-
export declare function createLiveOntologyAttachments(opts: {
|
|
52
|
+
export declare function createLiveOntologyAttachments<Ontology extends AttachmentOntologyDefinition = AttachmentOntologyDefinition>(opts: {
|
|
33
53
|
ir: OntologyIR;
|
|
34
54
|
attachmentsAdapter: OntologyAttachmentsAdapter;
|
|
35
55
|
blobManager: BlobManager;
|
|
36
|
-
}): LiveOntologyAttachments
|
|
56
|
+
}): LiveOntologyAttachments<Ontology>;
|
|
37
57
|
export {};
|
|
38
58
|
//# sourceMappingURL=createLiveOntologyAttachments.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createLiveOntologyAttachments.d.ts","sourceRoot":"","sources":["../../../src/live/attachments/createLiveOntologyAttachments.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"createLiveOntologyAttachments.d.ts","sourceRoot":"","sources":["../../../src/live/attachments/createLiveOntologyAttachments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { invariant } from "@bobbyfidz/panic";
|
|
2
|
+
import { ImageMediaTypeOptions } from "../../ir/generated/constants.js";
|
|
2
3
|
import { getTargetValueType } from "../../utils/types.js";
|
|
4
|
+
function satisfiesRange(value, range) {
|
|
5
|
+
return (range.min === undefined || value >= range.min) && (range.max === undefined || value <= range.max);
|
|
6
|
+
}
|
|
3
7
|
export function createLiveOntologyAttachments(opts) {
|
|
4
8
|
const { attachmentsAdapter, blobManager } = opts;
|
|
5
9
|
const create = async (blob, createOpts) => {
|
|
@@ -8,17 +12,24 @@ export function createLiveOntologyAttachments(opts) {
|
|
|
8
12
|
? getTargetValueType(opts.ir, normalizedOpts.target)
|
|
9
13
|
: undefined;
|
|
10
14
|
invariant(targetType === undefined || targetType.kind === "attachment", "Target is not an attachment.");
|
|
15
|
+
const constraint = targetType?.kind === "attachment" ? targetType.value.constraint : undefined;
|
|
16
|
+
invariant(!constraint?.size || satisfiesRange(blob.size, constraint.size), `Attachment size ${blob.size} is outside the allowed range.`);
|
|
17
|
+
const content = constraint?.content;
|
|
18
|
+
if (content?.kind === "image") {
|
|
19
|
+
invariant(content.value.mediaTypes
|
|
20
|
+
? content.value.mediaTypes.some((mediaType) => mediaType === blob.type)
|
|
21
|
+
: ImageMediaTypeOptions.some((option) => option.value === blob.type), `Attachment media type "${blob.type || "(empty)"}" is not allowed by the target.`);
|
|
22
|
+
// TODO: Validate image dimensions once runtimes expose a portable media-inspection capability.
|
|
23
|
+
}
|
|
11
24
|
const id = targetType?.kind === "attachment" && attachmentsAdapter.generateAttachmentId
|
|
12
25
|
? await attachmentsAdapter.generateAttachmentId(blob, {
|
|
13
26
|
target: targetType.value,
|
|
14
27
|
})
|
|
15
28
|
: crypto.randomUUID();
|
|
16
|
-
|
|
29
|
+
await blobManager.stage(id, blob);
|
|
17
30
|
const attachment = {
|
|
18
|
-
id
|
|
19
|
-
|
|
20
|
-
type: ref.type,
|
|
21
|
-
name: ref.name,
|
|
31
|
+
id,
|
|
32
|
+
type: blob.type,
|
|
22
33
|
};
|
|
23
34
|
const materializeAttachment = attachmentsAdapter.materializeAttachment;
|
|
24
35
|
const materializeOptions = {
|
|
@@ -28,12 +39,12 @@ export function createLiveOntologyAttachments(opts) {
|
|
|
28
39
|
(attachmentsAdapter.canMaterializeAttachment?.(attachment, materializeOptions) ?? true);
|
|
29
40
|
if (normalizedOpts.eager && canMaterialize) {
|
|
30
41
|
const promise = blobManager
|
|
31
|
-
.read(
|
|
42
|
+
.read(id)
|
|
32
43
|
.then((storedBlob) => materializeAttachment(attachment, storedBlob, materializeOptions))
|
|
33
44
|
.then(async (materialized) => {
|
|
34
45
|
if (materialized) {
|
|
35
|
-
if (materialized.id !==
|
|
36
|
-
await blobManager.bindRemoteId(
|
|
46
|
+
if (materialized.id !== id) {
|
|
47
|
+
await blobManager.bindRemoteId(id, materialized.id);
|
|
37
48
|
}
|
|
38
49
|
Object.assign(attachment, materialized);
|
|
39
50
|
}
|
|
@@ -44,16 +55,33 @@ export function createLiveOntologyAttachments(opts) {
|
|
|
44
55
|
isMaterialized: promise,
|
|
45
56
|
};
|
|
46
57
|
}
|
|
47
|
-
return {
|
|
58
|
+
return {
|
|
59
|
+
attachment,
|
|
60
|
+
};
|
|
48
61
|
};
|
|
62
|
+
const blob = (attachment) => blobManager.read(attachment.id, {
|
|
63
|
+
meta: { attachment },
|
|
64
|
+
});
|
|
65
|
+
async function metadata(attachment, options) {
|
|
66
|
+
const selection = options?.select ?? ["size", "type", "name"];
|
|
67
|
+
const resolved = await blobManager.metadata(attachment.id, {
|
|
68
|
+
meta: { attachment },
|
|
69
|
+
select: selection,
|
|
70
|
+
});
|
|
71
|
+
if (selection.includes("dimensions") && resolved.dimensions === null) {
|
|
72
|
+
throw new Error(`Dimensions are unavailable for attachment "${attachment.id}".`);
|
|
73
|
+
}
|
|
74
|
+
const { name, ...metadata } = resolved;
|
|
75
|
+
return {
|
|
76
|
+
...attachment,
|
|
77
|
+
...metadata,
|
|
78
|
+
...(typeof name === "string" ? { name } : {}),
|
|
79
|
+
};
|
|
80
|
+
}
|
|
49
81
|
return {
|
|
50
82
|
create,
|
|
51
|
-
metadata
|
|
52
|
-
|
|
53
|
-
}),
|
|
54
|
-
blob: (attachment) => blobManager.read(attachment.id, {
|
|
55
|
-
meta: { source: attachment.source },
|
|
56
|
-
}),
|
|
83
|
+
metadata,
|
|
84
|
+
blob,
|
|
57
85
|
};
|
|
58
86
|
}
|
|
59
87
|
//# sourceMappingURL=createLiveOntologyAttachments.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createLiveOntologyAttachments.js","sourceRoot":"","sources":["../../../src/live/attachments/createLiveOntologyAttachments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"createLiveOntologyAttachments.js","sourceRoot":"","sources":["../../../src/live/attachments/createLiveOntologyAttachments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { MemoryBlobBytesStore, SingleProcessCoordination } from "@party-stack/runtime";
|
|
2
|
-
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { describe, expect, it, vi } from "vitest";
|
|
3
3
|
import { o } from "../../ir/index.js";
|
|
4
4
|
import { createLiveOntology } from "../LiveOntology.js";
|
|
5
|
+
import { createLiveOntologyAttachments } from "./createLiveOntologyAttachments.js";
|
|
5
6
|
const ir = {
|
|
6
7
|
types: [],
|
|
7
8
|
objectTypes: [
|
|
@@ -38,6 +39,104 @@ const actionIr = {
|
|
|
38
39
|
],
|
|
39
40
|
};
|
|
40
41
|
describe("createLiveOntologyAttachments", () => {
|
|
42
|
+
it("rejects blobs outside a target's allowed media types", async () => {
|
|
43
|
+
const constrainedIr = {
|
|
44
|
+
...ir,
|
|
45
|
+
objectTypes: [
|
|
46
|
+
{
|
|
47
|
+
...ir.objectTypes[0],
|
|
48
|
+
properties: [
|
|
49
|
+
ir.objectTypes[0].properties[0],
|
|
50
|
+
{
|
|
51
|
+
name: "file",
|
|
52
|
+
displayName: "File",
|
|
53
|
+
type: o.attachment({
|
|
54
|
+
constraint: {
|
|
55
|
+
content: o.AttachmentContentConstraint.image({
|
|
56
|
+
mediaTypes: ["image/png", "image/jpeg"],
|
|
57
|
+
}),
|
|
58
|
+
},
|
|
59
|
+
}),
|
|
60
|
+
},
|
|
61
|
+
],
|
|
62
|
+
},
|
|
63
|
+
],
|
|
64
|
+
};
|
|
65
|
+
const stage = vi.fn();
|
|
66
|
+
const attachments = createLiveOntologyAttachments({
|
|
67
|
+
ir: constrainedIr,
|
|
68
|
+
attachmentsAdapter: {},
|
|
69
|
+
blobManager: { stage },
|
|
70
|
+
});
|
|
71
|
+
await expect(attachments.create(new Blob(["pdf"], { type: "application/pdf" }), {
|
|
72
|
+
target: {
|
|
73
|
+
kind: "objectProperty",
|
|
74
|
+
objectType: "Document",
|
|
75
|
+
property: "file",
|
|
76
|
+
},
|
|
77
|
+
})).rejects.toThrow('Attachment media type "application/pdf" is not allowed by the target.');
|
|
78
|
+
expect(stage).not.toHaveBeenCalled();
|
|
79
|
+
});
|
|
80
|
+
it("enforces cheap attachment constraints before staging", async () => {
|
|
81
|
+
const constrainedIr = {
|
|
82
|
+
...ir,
|
|
83
|
+
objectTypes: [
|
|
84
|
+
{
|
|
85
|
+
...ir.objectTypes[0],
|
|
86
|
+
properties: [
|
|
87
|
+
ir.objectTypes[0].properties[0],
|
|
88
|
+
{
|
|
89
|
+
name: "file",
|
|
90
|
+
displayName: "File",
|
|
91
|
+
type: o.attachment({
|
|
92
|
+
constraint: {
|
|
93
|
+
size: { max: 10 },
|
|
94
|
+
content: o.AttachmentContentConstraint.image({
|
|
95
|
+
dimensions: {
|
|
96
|
+
width: { max: 100 },
|
|
97
|
+
},
|
|
98
|
+
}),
|
|
99
|
+
},
|
|
100
|
+
}),
|
|
101
|
+
},
|
|
102
|
+
],
|
|
103
|
+
},
|
|
104
|
+
],
|
|
105
|
+
};
|
|
106
|
+
const stage = vi.fn(() => Promise.resolve());
|
|
107
|
+
const attachments = createLiveOntologyAttachments({
|
|
108
|
+
ir: constrainedIr,
|
|
109
|
+
attachmentsAdapter: {
|
|
110
|
+
generateAttachmentId: () => "image-1",
|
|
111
|
+
getAttachmentContent: () => Promise.reject(new Error("unexpected content read")),
|
|
112
|
+
},
|
|
113
|
+
blobManager: { stage },
|
|
114
|
+
});
|
|
115
|
+
await expect(attachments.create(new Blob(["gif"], { type: "image/gif" }), {
|
|
116
|
+
target: {
|
|
117
|
+
kind: "objectProperty",
|
|
118
|
+
objectType: "Document",
|
|
119
|
+
property: "file",
|
|
120
|
+
},
|
|
121
|
+
})).rejects.toThrow('Attachment media type "image/gif" is not allowed by the target.');
|
|
122
|
+
await expect(attachments.create(new Blob(["12345678901"], { type: "image/png" }), {
|
|
123
|
+
target: {
|
|
124
|
+
kind: "objectProperty",
|
|
125
|
+
objectType: "Document",
|
|
126
|
+
property: "file",
|
|
127
|
+
},
|
|
128
|
+
})).rejects.toThrow("Attachment size 11 is outside the allowed range.");
|
|
129
|
+
await expect(attachments.create(new Blob(["image"], { type: "image/png" }), {
|
|
130
|
+
target: {
|
|
131
|
+
kind: "objectProperty",
|
|
132
|
+
objectType: "Document",
|
|
133
|
+
property: "file",
|
|
134
|
+
},
|
|
135
|
+
})).resolves.toMatchObject({
|
|
136
|
+
attachment: { id: "image-1" },
|
|
137
|
+
});
|
|
138
|
+
expect(stage).toHaveBeenCalledOnce();
|
|
139
|
+
});
|
|
41
140
|
it("starts eager materialization in the background when the adapter supports it", async () => {
|
|
42
141
|
const runtime = {
|
|
43
142
|
owner: "test-user",
|