npm - @party-stack/foundry-ontology - Versions diffs - 0.14.2 → 0.14.4 - Mend

@party-stack/foundry-ontology 0.14.2 → 0.14.4

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 (33) hide show

package/lib/adapter/foundryCodec.test.js CHANGED Viewed

@@ -3,6 +3,19 @@ import { describe, expect, it } from "vitest";
 import { createFoundryCodec } from "./foundryCodec.js";
 import { encodeFoundryMediaId } from "./foundryMediaId.js";
 describe("createFoundryCodec", () => {
+    it("preserves explicit nulls while leaving undefined values omitted", () => {
+        const codec = createFoundryCodec({
+            types: [],
+            objectTypes: [],
+            linkTypes: [],
+            actionTypes: [],
+            queryFunctionTypes: [],
+        });
+        const optionalString = o.optional({ type: o.string({}) });
+        expect(codec.encodeValue(optionalString, null)).toBeNull();
+        expect(codec.encodeValue(optionalString, undefined)).toBeUndefined();
+        expect(() => codec.encodeValue(o.attachment({}), {})).toThrow("expected an attachment with a string id");
+    });
     it("decodes attachment rids into serializable pointers", () => {
         const codec = createFoundryCodec({
             types: [],
@@ -15,6 +28,11 @@ describe("createFoundryCodec", () => {
                     properties: [
                         { name: "id", displayName: "ID", type: o.string({}) },
                         { name: "file", displayName: "File", type: o.attachment({}) },
+                        {
+                            name: "optionalFile",
+                            displayName: "Optional file",
+                            type: o.optional({ type: o.attachment({}) }),
+                        },
                     ],
                 },
             ],
@@ -28,12 +46,18 @@ describe("createFoundryCodec", () => {
             file: {
                 rid: "ri.attachments.main.attachment.1",
             },
+            optionalFile: {},
         })).toEqual({
             id: "doc-1",
             file: {
                 id: "ri.attachments.main.attachment.1",
             },
+            optionalFile: undefined,
         });
+        expect(() => codec.decodeObject("Document", {
+            id: "doc-2",
+            file: {},
+        })).toThrow("Invalid required Foundry attachment value");
     });
     it("decodes media references into serializable attachment pointers", () => {
         const codec = createFoundryCodec({
@@ -51,6 +75,13 @@ describe("createFoundryCodec", () => {
                             displayName: "File",
                             type: o.attachment({ meta: { type: "media" } }),
                         },
+                        {
+                            name: "optionalMedia",
+                            displayName: "Optional media",
+                            type: o.optional({
+                                type: o.attachment({ meta: { type: "media" } }),
+                            }),
+                        },
                     ],
                 },
             ],
@@ -76,9 +107,11 @@ describe("createFoundryCodec", () => {
         expect(codec.decodeObject("Document", {
             id: "doc-1",
             file: reference,
+            optionalMedia: {},
         })).toEqual({
             id: "doc-1",
             file: attachment,
+            optionalMedia: undefined,
         });
         expect(codec.encodeValue(o.attachment({
             meta: { type: "media" },

package/lib/adapter/foundryCodec.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"foundryCodec.test.js","sourceRoot":"","sources":["../../src/adapter/foundryCodec.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC1D,MAAM,KAAK,GAAG,kBAAkB,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,UAAU;oBACvB,iBAAiB,EAAE,WAAW;oBAC9B,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;wBACrD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;~~qBAChE~~;iBACJ;aACJ;YACD,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,kCAAkC,EAAE,CAAC,CAAC,CAAC,IAAI,CACxF,kCAAkC,CACrC,CAAC;QACF,MAAM,CACF,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE;YAC3B,EAAE,EAAE,OAAO;YACX,IAAI,EAAE;gBACF,GAAG,EAAE,kCAAkC;aAC1C;~~SACJ~~,CAAC,CACL,CAAC,OAAO,CAAC;YACN,EAAE,EAAE,OAAO;YACX,IAAI,EAAE;gBACF,EAAE,EAAE,kCAAkC;aACzC;~~SACJ~~,CAAC,CAAC;~~IACP~~,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACtE,MAAM,KAAK,GAAG,kBAAkB,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,UAAU;oBACvB,iBAAiB,EAAE,WAAW;oBAC9B,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;wBACrD;4BACI,IAAI,EAAE,MAAM;4BACZ,WAAW,EAAE,MAAM;4BACnB,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;yBAClD;qBACJ;iBACJ;aACJ;YACD,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG;YACd,SAAS,EAAE;gBACP,IAAI,EAAE,kBAA2B;gBACjC,gBAAgB,EAAE;oBACd,YAAY,EAAE,0BAA0B;oBACxC,WAAW,EAAE,yBAAyB;oBACtC,eAAe,EAAE,oBAAoB;iBACxC;aACJ;YACD,QAAQ,EAAE,WAAW;SACxB,CAAC;QACF,MAAM,UAAU,GAAG;YACf,EAAE,EAAE,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC;YAC9D,IAAI,EAAE,WAAW;SACpB,CAAC;QAEF,MAAM,CACF,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE;YAC3B,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,SAAS;~~SAClB~~,CAAC,CACL,CAAC,OAAO,CAAC;YACN,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,UAAU;~~SACnB~~,CAAC,CAAC;QACH,MAAM,CACF,KAAK,CAAC,WAAW,CACb,CAAC,CAAC,UAAU,CAAC;YACT,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;SAC1B,CAAC,EACF,UAAU,CACb,CACJ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"foundryCodec.test.js","sourceRoot":"","sources":["../../src/adapter/foundryCodec.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACvE,MAAM,KAAK,GAAG,kBAAkB,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;SACzB,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAE1D,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACrE,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CACzD,yCAAyC,CAC5C,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC1D,MAAM,KAAK,GAAG,kBAAkB,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,UAAU;oBACvB,iBAAiB,EAAE,WAAW;oBAC9B,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;wBACrD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;wBAC7D;4BACI,IAAI,EAAE,cAAc;4BACpB,WAAW,EAAE,eAAe;4BAC5B,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;yBAC/C;qBACJ;iBACJ;aACJ;YACD,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,kCAAkC,EAAE,CAAC,CAAC,CAAC,IAAI,CACxF,kCAAkC,CACrC,CAAC;QACF,MAAM,CACF,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE;YAC3B,EAAE,EAAE,OAAO;YACX,IAAI,EAAE;gBACF,GAAG,EAAE,kCAAkC;aAC1C;YACD,YAAY,EAAE,EAAE;SACnB,CAAC,CACL,CAAC,OAAO,CAAC;YACN,EAAE,EAAE,OAAO;YACX,IAAI,EAAE;gBACF,EAAE,EAAE,kCAAkC;aACzC;YACD,YAAY,EAAE,SAAS;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,EAAE,CACR,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE;YAC3B,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,EAAE;SACX,CAAC,CACL,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACtE,MAAM,KAAK,GAAG,kBAAkB,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,UAAU;oBACvB,iBAAiB,EAAE,WAAW;oBAC9B,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;wBACrD;4BACI,IAAI,EAAE,MAAM;4BACZ,WAAW,EAAE,MAAM;4BACnB,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;yBAClD;wBACD;4BACI,IAAI,EAAE,eAAe;4BACrB,WAAW,EAAE,gBAAgB;4BAC7B,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;gCACb,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;6BAClD,CAAC;yBACL;qBACJ;iBACJ;aACJ;YACD,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG;YACd,SAAS,EAAE;gBACP,IAAI,EAAE,kBAA2B;gBACjC,gBAAgB,EAAE;oBACd,YAAY,EAAE,0BAA0B;oBACxC,WAAW,EAAE,yBAAyB;oBACtC,eAAe,EAAE,oBAAoB;iBACxC;aACJ;YACD,QAAQ,EAAE,WAAW;SACxB,CAAC;QACF,MAAM,UAAU,GAAG;YACf,EAAE,EAAE,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC;YAC9D,IAAI,EAAE,WAAW;SACpB,CAAC;QAEF,MAAM,CACF,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE;YAC3B,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,SAAS;YACf,aAAa,EAAE,EAAE;SACpB,CAAC,CACL,CAAC,OAAO,CAAC;YACN,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,UAAU;YAChB,aAAa,EAAE,SAAS;SAC3B,CAAC,CAAC;QACH,MAAM,CACF,KAAK,CAAC,WAAW,CACb,CAAC,CAAC,UAAU,CAAC;YACT,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;SAC1B,CAAC,EACF,UAAU,CACb,CACJ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/lib/adapter/objectCollectionOptions.d.ts CHANGED Viewed

@@ -8,7 +8,7 @@ interface OntologyObject extends OntologyObjectV2 {
     __primaryKey: string | number;
 }
 export interface ObjectCollectionUtils extends UtilsRecord {
-    awaitOperationId: (operationId: string, timeout?: number) => Promise<boolean>;
+    awaitOperationId: (operationId: string, timeout?: number) => Promise<void>;
 }
 export interface ObjectCollectionOpts {
     client: OntologyClient;
@@ -16,6 +16,7 @@ export interface ObjectCollectionOpts {
     primaryKeyProperty: string;
     selectedProperties: string[];
     decodeObject?: (object: Record<string, unknown>) => Record<string, unknown>;
+    decodeEditObject?: (object: Record<string, unknown>) => Record<string, unknown>;
 }
 export interface ObjectCollectionConfig<TSchema extends StandardSchema<OntologyObject>> extends ObjectCollectionOpts, Omit<CollectionConfig<InferSchemaOutput<TSchema>, string | number, TSchema>, "sync" | "syncMode" | "getKey" | "onInsert" | "onUpdate" | "onDelete"> {
     schema: TSchema;

package/lib/adapter/objectCollectionOptions.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"objectCollectionOptions.d.ts","sourceRoot":"","sources":["../../src/adapter/objectCollectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,gBAAgB,EAKnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEH,gBAAgB,EAEhB,iBAAiB,EAEjB,cAAc,EACd,UAAU,EACV,WAAW,EACd,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAYlE,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAEnE,UAAU,cAAe,SAAQ,gBAAgB;IAC7C,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAoBD,MAAM,WAAW,qBAAsB,SAAQ,WAAW;IACtD,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,~~OAAO~~,CAAC,CAAC;~~CACjF~~;~~AAwwBD~~,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;~~CAC/E~~;AAED,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,cAAc,CAAC,cAAc,CAAC,CAClF,SAAQ,oBAAoB,EACxB,IAAI,CACA,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EACtE,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CACxE;IACL,MAAM,EAAE,OAAO,CAAC;CACnB;AAMD,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,cAAc,CAAC,cAAc,CAAC,EAClF,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,GACxC,YAAY,CACX,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,qBAAqB,CAAC,EAC7F,QAAQ,CACX,CAAC;AACF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,oBAAoB,GAAG;IACnE,QAAQ,EAAE,WAAW,CAAC;IACtB,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC3D,KAAK,EAAE,qBAAqB,CAAC;CAChC,CAAC"}
1	+ {"version":3,"file":"objectCollectionOptions.d.ts","sourceRoot":"","sources":["../../src/adapter/objectCollectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,gBAAgB,EAKnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEH,gBAAgB,EAEhB,iBAAiB,EAEjB,cAAc,EACd,UAAU,EACV,WAAW,EACd,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAYlE,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAEnE,UAAU,cAAe,SAAQ,gBAAgB;IAC7C,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAoBD,MAAM,WAAW,qBAAsB,SAAQ,WAAW;IACtD,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E;AAiuBD,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5E,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnF;AAED,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,cAAc,CAAC,cAAc,CAAC,CAClF,SAAQ,oBAAoB,EACxB,IAAI,CACA,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EACtE,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CACxE;IACL,MAAM,EAAE,OAAO,CAAC;CACnB;AAMD,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,cAAc,CAAC,cAAc,CAAC,EAClF,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,GACxC,YAAY,CACX,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,qBAAqB,CAAC,EAC7F,QAAQ,CACX,CAAC;AACF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,oBAAoB,GAAG;IACnE,QAAQ,EAAE,WAAW,CAAC;IACtB,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC3D,KAAK,EAAE,qBAAqB,CAAC;CAChC,CAAC"}

package/lib/adapter/objectCollectionOptions.js CHANGED Viewed

@@ -91,12 +91,14 @@ function advanceEditHistoryCursor(cursor, entry) {
     }
     cursor.seenEntryKeysAtTimestamp.add(entryKey);
 }
-function getPrimaryKeyValue(primaryKey) {
+function getPrimaryKeyValue(primaryKey, primaryKeyProperty, decodeEditObject) {
     const values = Object.values(primaryKey);
     if (values.length !== 1) {
         throw new Error("Foundry object collections currently only support single-field primary keys.");
     }
-    const value = normalizeEditPropertyValue(values[0]);
+    const value = decodeEditObject({
+        [primaryKeyProperty]: values[0],
+    })[primaryKeyProperty];
     if (typeof value !== "string" && typeof value !== "number") {
         throw new Error("Foundry object collections currently only support string or number primary keys.");
     }
@@ -105,56 +107,6 @@ function getPrimaryKeyValue(primaryKey) {
 function isPlainObject(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isNullPropertyValue(value) {
-    return value === "NullPropertyValue{}";
-}
-const geoPointPattern = /^GeoPointPropertyValue\{latitude:\s*(-?[\d.]+),\s*longitude:\s*(-?[\d.]+)\}$/;
-function parseGeoPointPropertyValue(value) {
-    if (typeof value !== "string")
-        return undefined;
-    const match = geoPointPattern.exec(value);
-    if (!match)
-        return undefined;
-    const lat = Number(match[1]);
-    const lon = Number(match[2]);
-    if (Number.isNaN(lat) || Number.isNaN(lon))
-        return undefined;
-    return { lat, lon };
-}
-function isWrappedPrimitivePropertyValue(value) {
-    if (!isPlainObject(value) || typeof value.type !== "string" || !("value" in value)) {
-        return false;
-    }
-    return [
-        "stringValue",
-        "integerValue",
-        "doubleValue",
-        "longValue",
-        "booleanValue",
-        "dateValue",
-        "timestampValue",
-    ].includes(value.type);
-}
-function isAttachmentPropertyValue(value) {
-    return isPlainObject(value) && value.type === "attachment" && typeof value.attachment === "string";
-}
-function normalizeEditPropertyValue(value) {
-    if (isNullPropertyValue(value))
-        return undefined;
-    const geoPoint = parseGeoPointPropertyValue(value);
-    if (geoPoint)
-        return geoPoint;
-    if (isWrappedPrimitivePropertyValue(value))
-        return value.value;
-    if (isAttachmentPropertyValue(value))
-        return { rid: value.attachment };
-    if (Array.isArray(value))
-        return value.map(normalizeEditPropertyValue);
-    if (isPlainObject(value)) {
-        return Object.fromEntries(Object.entries(value).map(([key, v]) => [key, normalizeEditPropertyValue(v)]));
-    }
-    return value;
-}
 // ---------------------------------------------------------------------------
 // Foundry object fetching
 // ---------------------------------------------------------------------------
@@ -190,7 +142,7 @@ async function fetchFoundryObjects(client, objectType, selectedProperties, opts,
         .slice(offset, limit === undefined ? undefined : offset + limit)
         .map(decodeObject);
 }
-function createSyncConfig(client, objectType, primaryKeyProperty, selectedProperties, decodeObject = (object) => object) {
+function createSyncConfig(client, objectType, primaryKeyProperty, selectedProperties, decodeObject = (object) => object, decodeEditObject = decodeObject) {
     const seenOperationIds = new Store(new Set());
     const syncDisposed = new Store(false);
     const directWebsocketSyncVersion = new Store(0);
@@ -202,13 +154,19 @@ function createSyncConfig(client, objectType, primaryKeyProperty, selectedProper
             throw new Error("Foundry operationId must be a non-empty string.");
         }
         if (seenOperationIds.state.has(operationId)) {
-            return true;
+            return;
         }
         if (syncDisposed.state) {
             throw new ObjectCollectionSyncAbortedError(objectType);
         }
+        if (!requestEditHistoryCatchUp) {
+            // An on-demand collection has no local state to confirm until its sync starts.
+            // TODO: Track sync activity and edit-history availability separately. If sync is
+            // active but edit-history catch-up is unavailable, request and await a full refresh.
+            return;
+        }
         const directSyncVersionAtStart = directWebsocketSyncVersion.state;
-        requestEditHistoryCatchUp?.();
+        requestEditHistoryCatchUp();
         return new Promise((resolve, reject) => {
             const cleanup = () => {
                 clearTimeout(timeoutId);
@@ -223,7 +181,7 @@ function createSyncConfig(client, objectType, primaryKeyProperty, selectedProper
             const seenOperationIdsSubscription = seenOperationIds.subscribe(() => {
                 if (seenOperationIds.state.has(operationId)) {
                     cleanup();
-                    resolve(true);
+                    resolve();
                 }
             });
             const directWebsocketSyncVersionSubscription = directWebsocketSyncVersion.subscribe(() => {
@@ -231,7 +189,7 @@ function createSyncConfig(client, objectType, primaryKeyProperty, selectedProper
                     directWebsocketSyncVersion.state >
                         directSyncVersionAtStart) {
                     cleanup();
-                    resolve(true);
+                    resolve();
                 }
             });
             const disposedSubscription = syncDisposed.subscribe(() => {
@@ -296,11 +254,8 @@ function createSyncConfig(client, objectType, primaryKeyProperty, selectedProper
                 preview: true,
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             });
-            const decodeEditProperties = (properties, primaryKey) => decodeObject({
-                ...Object.fromEntries(Object.entries(properties).map(([key, value]) => [
-                    key,
-                    normalizeEditPropertyValue(value),
-                ])),
+            const decodeEditProperties = (properties, primaryKey) => decodeEditObject({
+                ...properties,
                 [primaryKeyProperty]: primaryKey,
             });
             const decodeWatcherObject = (object, primaryKey) => decodeObject({
@@ -384,7 +339,7 @@ function createSyncConfig(client, objectType, primaryKeyProperty, selectedProper
                         continue;
                     advanceEditHistoryCursor(nextEditHistoryCursor, entry);
                     newOperationIds.add(entry.operationId);
-                    const primaryKey = getPrimaryKeyValue(entry.objectPrimaryKey);
+                    const primaryKey = getPrimaryKeyValue(entry.objectPrimaryKey, primaryKeyProperty, decodeEditObject);
                     switch (entry.edit.type) {
                         case "createEdit":
                         case "modifyEdit":
@@ -583,8 +538,8 @@ function createSyncConfig(client, objectType, primaryKeyProperty, selectedProper
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function objectCollectionOptions(config) {
-    const { client, objectType, primaryKeyProperty, selectedProperties, decodeObject, schema, ...rest } = config;
-    const { sync, utils } = createSyncConfig(client, objectType, primaryKeyProperty, selectedProperties, decodeObject);
+    const { client, objectType, primaryKeyProperty, selectedProperties, decodeObject, decodeEditObject, schema, ...rest } = config;
+    const { sync, utils } = createSyncConfig(client, objectType, primaryKeyProperty, selectedProperties, decodeObject, decodeEditObject);
     if (schema === undefined) {
         return { syncMode: "on-demand", sync, utils };
     }

package/lib/adapter/objectCollectionOptions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"objectCollectionOptions.js","sourceRoot":"","sources":["../../src/adapter/objectCollectionOptions.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"objectCollectionOptions.js","sourceRoot":"","sources":["../../src/adapter/objectCollectionOptions.ts"],"names":[],"mappings":"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"}

package/lib/adapter/objectCollectionOptions.test.js CHANGED Viewed

@@ -74,6 +74,7 @@ function createSyncHarness(initialObjects = [], opts = {}) {
             "priority",
         ],
         decodeObject: opts.decodeObject,
+        decodeEditObject: opts.decodeEditObject,
     });
     const handle = syncConfig.sync({
         begin,
@@ -552,7 +553,32 @@ describe("objectCollectionOptions", () => {
             ],
             nextPageToken: undefined,
         });
-        const harness = createSyncHarness();
+        const codec = createFoundryCodec({
+            types: [],
+            objectTypes: [
+                {
+                    name: "Employee",
+                    displayName: "Employee",
+                    pluralDisplayName: "Employees",
+                    primaryKey: "employeeId",
+                    properties: [
+                        { name: "employeeId", displayName: "Employee ID", type: o.integer({}) },
+                        { name: "name", displayName: "Name", type: o.string({}) },
+                        {
+                            name: "nickname",
+                            displayName: "Nickname",
+                            type: o.optional({ type: o.string({}) }),
+                        },
+                    ],
+                },
+            ],
+            linkTypes: [],
+            actionTypes: [],
+            queryFunctionTypes: [],
+        });
+        const harness = createSyncHarness([], {
+            decodeEditObject: (object) => codec.decodeEditObject("Employee", object),
+        });
         mockState.subscribeCallback?.({ type: "state", status: "open" });
         await vi.waitFor(() => {
             expect(harness.syncedData.get(3)).toEqual({
@@ -618,6 +644,7 @@ describe("objectCollectionOptions", () => {
         });
         const harness = createSyncHarness([], {
             decodeObject: (object) => codec.decodeObject("Employee", object),
+            decodeEditObject: (object) => codec.decodeEditObject("Employee", object),
         });
         mockState.subscribeCallback?.({ type: "state", status: "open" });
         await vi.waitFor(() => {
@@ -629,6 +656,83 @@ describe("objectCollectionOptions", () => {
         });
         harness.cleanup();
     });
+    it("decodes media-reference wrappers from edit history using the property schema", async () => {
+        const mediaReference = {
+            mimeType: "image/png",
+            reference: {
+                type: "mediaSetViewItem",
+                mediaSetViewItem: {
+                    mediaSetRid: "ri.mio.main.media-set.1",
+                    mediaSetViewRid: "ri.mio.main.view.1",
+                    mediaItemRid: "ri.mio.main.media-item.1",
+                },
+            },
+        };
+        mockState.getEditsHistory.mockResolvedValue({
+            data: [
+                {
+                    objectPrimaryKey: { employeeId: 8 },
+                    operationId: "op-8",
+                    actionTypeRid: "action-1",
+                    userId: "user-1",
+                    timestamp: "2099-03-12T12:00:00.000Z",
+                    edit: {
+                        type: "createEdit",
+                        properties: {
+                            employeeId: 8,
+                            logoMedia: {
+                                type: "mediaReference",
+                                mediaReference,
+                            },
+                        },
+                    },
+                },
+            ],
+            nextPageToken: undefined,
+        });
+        const codec = createFoundryCodec({
+            types: [],
+            objectTypes: [
+                {
+                    name: "Employee",
+                    displayName: "Employee",
+                    pluralDisplayName: "Employees",
+                    primaryKey: "employeeId",
+                    properties: [
+                        { name: "employeeId", displayName: "Employee ID", type: o.integer({}) },
+                        {
+                            name: "logoMedia",
+                            displayName: "Logo media",
+                            type: o.optional({
+                                type: o.attachment({ meta: { type: "media" } }),
+                            }),
+                        },
+                    ],
+                },
+            ],
+            linkTypes: [],
+            actionTypes: [],
+            queryFunctionTypes: [],
+        });
+        const harness = createSyncHarness([], {
+            decodeEditObject: (object) => codec.decodeEditObject("Employee", object),
+        });
+        mockState.subscribeCallback?.({ type: "state", status: "open" });
+        await vi.waitFor(() => {
+            expect(harness.syncedData.get(8)).toEqual({
+                employeeId: 8,
+                logoMedia: {
+                    id: [
+                        "ri.mio.main.media-set.1",
+                        "ri.mio.main.view.1",
+                        "ri.mio.main.media-item.1",
+                    ].join(":"),
+                    type: "image/png",
+                },
+            });
+        });
+        harness.cleanup();
+    });
     it("decodes GeoPointPropertyValue strings from edit history", async () => {
         mockState.getEditsHistory.mockResolvedValue({
             data: [
@@ -650,7 +754,28 @@ describe("objectCollectionOptions", () => {
             ],
             nextPageToken: undefined,
         });
-        const harness = createSyncHarness();
+        const codec = createFoundryCodec({
+            types: [],
+            objectTypes: [
+                {
+                    name: "Employee",
+                    displayName: "Employee",
+                    pluralDisplayName: "Employees",
+                    primaryKey: "employeeId",
+                    properties: [
+                        { name: "employeeId", displayName: "Employee ID", type: o.integer({}) },
+                        { name: "name", displayName: "Name", type: o.string({}) },
+                        { name: "location", displayName: "Location", type: o.geopoint({}) },
+                    ],
+                },
+            ],
+            linkTypes: [],
+            actionTypes: [],
+            queryFunctionTypes: [],
+        });
+        const harness = createSyncHarness([], {
+            decodeEditObject: (object) => codec.decodeEditObject("Employee", object),
+        });
         mockState.subscribeCallback?.({ type: "state", status: "open" });
         await vi.waitFor(() => {
             expect(harness.syncedData.get(5)).toEqual({
@@ -690,7 +815,27 @@ describe("objectCollectionOptions", () => {
             ],
             nextPageToken: undefined,
         });
-        const harness = createSyncHarness();
+        const codec = createFoundryCodec({
+            types: [],
+            objectTypes: [
+                {
+                    name: "Employee",
+                    displayName: "Employee",
+                    pluralDisplayName: "Employees",
+                    primaryKey: "employeeId",
+                    properties: [
+                        { name: "employeeId", displayName: "Employee ID", type: o.string({}) },
+                        { name: "name", displayName: "Name", type: o.string({}) },
+                    ],
+                },
+            ],
+            linkTypes: [],
+            actionTypes: [],
+            queryFunctionTypes: [],
+        });
+        const harness = createSyncHarness([], {
+            decodeEditObject: (object) => codec.decodeEditObject("Employee", object),
+        });
         mockState.subscribeCallback?.({ type: "state", status: "open" });
         await vi.waitFor(() => {
             expect(harness.syncedData.get("employee-4")).toEqual({
@@ -870,6 +1015,21 @@ describe("objectCollectionOptions", () => {
         harness.cleanup();
         warnSpy.mockRestore();
     });
+    it("returns immediately when awaiting an operation before sync has started", async () => {
+        const { utils } = objectCollectionOptions({
+            client: {
+                baseUrl: "https://example.com",
+                fetch: vi.fn(),
+                ontologyRid: "ri.ontology.main",
+                tokenProvider: () => Promise.resolve("token"),
+            },
+            objectType: "Employee",
+            primaryKeyProperty: "employeeId",
+            selectedProperties: ["employeeId", "name"],
+        });
+        await expect(utils.awaitOperationId("op-before-sync")).resolves.toBeUndefined();
+        expect(mockState.getEditsHistory).not.toHaveBeenCalled();
+    });
     it("resolves awaitOperationId after direct websocket sync observes an update", async () => {
         const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => { });
         mockState.getEditsHistory.mockRejectedValue(new Error("Edit history is not enabled"));
@@ -894,7 +1054,7 @@ describe("objectCollectionOptions", () => {
                 },
             ],
         });
-        await expect(operationPromise).resolves.toBe(true);
+        await expect(operationPromise).resolves.toBeUndefined();
         expect(harness.syncedData.get(13)).toEqual({
             employeeId: 13,
             name: "Direct Operation Employee",
@@ -932,7 +1092,7 @@ describe("objectCollectionOptions", () => {
         const harness = createSyncHarness([], {
             commitReceipt: () => commitApplied,
         });
-        await expect(harness.utils.awaitOperationId("op-11")).resolves.toBe(true);
+        await expect(harness.utils.awaitOperationId("op-11")).resolves.toBeUndefined();
         expect(mockState.getEditsHistory).toHaveBeenCalledTimes(1);
         expect(harness.syncedData.get(11)).toEqual({
             employeeId: 11,