@osdk/client 2.2.0-beta.8 → 2.3.0-beta.1

package/build/browser/util/toDataValue.test.js

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { $ontologyRid, Employee, Task } from "@osdk/client.test.ontology";
-import { apiServer, MockOntology, stubData } from "@osdk/shared.test";
-import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
+import { Employee, Task } from "@osdk/client.test.ontology";
+import { LegacyFauxFoundry, startNodeApiServer, stubData } from "@osdk/shared.test";
+import { beforeAll, describe, expect, it, vi } from "vitest";
 import { createClient } from "../createClient.js";
 import { createMinimalClient } from "../createMinimalClient.js";
 import { createAttachmentUpload } from "../object/AttachmentUpload.js";
@@ -26,13 +26,17 @@ describe(toDataValue, () => {
   let client;
   let clientCtx;
   vi.fn();
-  beforeAll(async () => {
-    apiServer.listen();
-    client = createClient("https://stack.palantir.com", $ontologyRid, async () => "myAccessToken");
-    clientCtx = createMinimalClient(MockOntology.metadata, "https://stack.palantir.com", async () => "myAccessToken", {});
-  });
-  afterAll(() => {
-    apiServer.close();
+  beforeAll(() => {
+    const testSetup = startNodeApiServer(new LegacyFauxFoundry(), createClient);
+    ({
+      client
+    } = testSetup);
+    clientCtx = createMinimalClient({
+      ontologyRid: testSetup.fauxFoundry.defaultOntologyRid
+    }, testSetup.fauxFoundry.baseUrl, testSetup.auth, {});
+    return () => {
+      testSetup.apiServer.close();
+    };
   });
   it("converts passthrough values correctly", async () => {
     // basic pass through types
@@ -109,22 +113,39 @@ describe(toDataValue, () => {
     expect(definitionConversion).toMatchInlineSnapshot(expected);
   });
   it("converts blob attachment uploads correctly", async () => {
-    const blob = stubData.attachmentUploadRequestBody[stubData.localAttachment1.filename];
+    const blob = new Blob([JSON.stringify({
+      "hi": "mom"
+    })]);
     const attachmentUpload = createAttachmentUpload(blob, "file1.txt");
     const converted = await toDataValue(attachmentUpload, clientCtx);
-    expect(converted).toEqual("ri.attachments.main.attachment.86016861-707f-4292-b258-6a7108915a75");
+    expect(converted).toMatch(/ri\.attachments.main.attachment\.[a-z0-9\-]+/i);
   });
   it("converts file attachment uploads correctly", async () => {
     // Mimics the Web file API (https://developer.mozilla.org/en-US/docs/Web/API/File). The File constructor is only available in Node 19.2.0 and above
-    const file = Object.assign(stubData.attachmentUploadRequestBody[stubData.localAttachment1.filename], {
+    const file = Object.assign(new Blob([JSON.stringify({
+      name: "Hello World"
+    }, null, 2)], {
+      type: "application/json"
+    }), {
       name: "file1.txt"
     });
     const converted = await toDataValue(file, clientCtx);
-    expect(converted).toEqual("ri.attachments.main.attachment.86016861-707f-4292-b258-6a7108915a75");
+    expect(converted).toMatch(/ri\.attachments.main.attachment\.[a-z0-9\-]+/i);
   });
   it("converts media reference correctly", async () => {
-    const converted = await toDataValue(stubData.mediaReference, clientCtx);
-    expect(converted).toEqual(stubData.mediaReference);
+    const mediaReference = {
+      mimeType: "application/json",
+      reference: {
+        type: "mediaSetViewItem",
+        mediaSetViewItem: {
+          mediaItemRid: "media-item-rid",
+          mediaSetRid: "media-set-rid",
+          mediaSetViewRid: "media-set-view-rid"
+        }
+      }
+    };
+    const converted = await toDataValue(mediaReference, clientCtx);
+    expect(converted).toEqual(mediaReference);
   });
 });
 //# sourceMappingURL=toDataValue.test.js.map

package/build/browser/util/toDataValue.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"toDataValue.test.js","names":["$ontologyRid","Employee","Task","apiServer","MockOntology","stubData","afterAll","beforeAll","describe","expect","it","vi","createClient","createMinimalClient","createAttachmentUpload","getWireObjectSet","toDataValue","client","clientCtx","fn","listen","metadata","close","basic","null","undefined","boolean","date","integer","string","timestamp","convertedBasic","toEqual","attachment","attachmentArray","attachmentSet","Set","recursiveConversion","inner","employee","employee1","ontologyConversion","__primaryKey","task","fetchOne","$primaryKey","clientObjectSet","where","id","definition","expected","objectSetConversion","toMatchInlineSnapshot","definitionConversion","blob","attachmentUploadRequestBody","localAttachment1","filename","attachmentUpload","converted","file","Object","assign","name","mediaReference"],"sources":["toDataValue.test.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { $ontologyRid, Employee, Task } from \"@osdk/client.test.ontology\";\nimport { apiServer, MockOntology, stubData } from \"@osdk/shared.test\";\nimport type { MockedFunction } from \"vitest\";\nimport { afterAll, beforeAll, describe, expect, it, vi } from \"vitest\";\nimport type { Client } from \"../Client.js\";\nimport { createClient } from \"../createClient.js\";\nimport { createMinimalClient } from \"../createMinimalClient.js\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { createAttachmentUpload } from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { toDataValue } from \"./toDataValue.js\";\n\ndescribe(toDataValue, () => {\n  let client: Client;\n  let clientCtx: MinimalClient;\n\n  const mockFetch: MockedFunction<typeof globalThis.fetch> = vi.fn();\n\n  beforeAll(async () => {\n    apiServer.listen();\n    client = createClient(\n      \"https://stack.palantir.com\",\n      $ontologyRid,\n      async () => \"myAccessToken\",\n    );\n\n    clientCtx = createMinimalClient(\n      MockOntology.metadata,\n      \"https://stack.palantir.com\",\n      async () => \"myAccessToken\",\n      {},\n    );\n  });\n\n  afterAll(() => {\n    apiServer.close();\n  });\n\n  it(\"converts passthrough values correctly\", async () => {\n    // basic pass through types\n    const basic = {\n      null: undefined,\n      boolean: false,\n      date: \"2024-01-01\",\n      integer: 0,\n      string: \"string\",\n      timestamp: \"2024-01-01T00:00:00Z\",\n    };\n    const convertedBasic = await toDataValue(basic, clientCtx);\n    expect(convertedBasic).toEqual(basic);\n  });\n\n  it(\"recursively converts arrays and sets into array types\", async () => {\n    const attachment = \"rid\";\n    const attachmentArray = [attachment];\n    const attachmentSet = new Set(attachmentArray);\n\n    const recursiveConversion = await toDataValue({\n      attachment,\n      attachmentArray,\n      attachmentSet,\n    }, clientCtx);\n\n    expect(recursiveConversion).toEqual({\n      attachment: \"rid\",\n      attachmentArray: [\"rid\"],\n      attachmentSet: [\"rid\"],\n    });\n  });\n\n  it(\"recursively handles structs\", async () => {\n    const struct = {\n      inner: {\n        attachment: \"rid\",\n      },\n    };\n\n    const recursiveConversion = await toDataValue(struct, clientCtx);\n\n    expect(recursiveConversion).toEqual({\n      inner: { attachment: \"rid\" },\n    });\n  });\n\n  it(\"maps an ontology object into just its primary key\", async () => {\n    const employee = stubData.employee1;\n    const ontologyConversion = await toDataValue(employee, clientCtx);\n    expect(ontologyConversion).toEqual(\n      stubData.employee1.__primaryKey,\n    );\n  });\n\n  it(\"maps an ontology object into just its primary key with osdk wrapper\", async () => {\n    const task = await client(Employee).fetchOne(50030);\n    const ontologyConversion = await toDataValue(task, clientCtx);\n    expect(ontologyConversion).toEqual(\n      task.$primaryKey,\n    );\n  });\n\n  it(\"passes through object set definitions\", async () => {\n    const clientObjectSet = client(Task).where({ id: 0 });\n    const definition = getWireObjectSet(clientObjectSet);\n\n    const expected = `\n    {\n      \"objectSet\": {\n        \"objectType\": \"Task\",\n        \"type\": \"base\",\n      },\n      \"type\": \"filter\",\n      \"where\": {\n        \"field\": \"id\",\n        \"type\": \"eq\",\n        \"value\": 0,\n      },\n    }\n  `;\n    const objectSetConversion = await toDataValue(clientObjectSet, clientCtx);\n    expect(objectSetConversion).toMatchInlineSnapshot(\n      expected,\n    );\n\n    const definitionConversion = await toDataValue(definition, clientCtx);\n    expect(definitionConversion).toMatchInlineSnapshot(expected);\n  });\n\n  it(\"converts blob attachment uploads correctly\", async () => {\n    const blob =\n      stubData.attachmentUploadRequestBody[stubData.localAttachment1.filename];\n    const attachmentUpload = createAttachmentUpload(blob, \"file1.txt\");\n    const converted = await toDataValue(attachmentUpload, clientCtx);\n\n    expect(converted).toEqual(\n      \"ri.attachments.main.attachment.86016861-707f-4292-b258-6a7108915a75\",\n    );\n  });\n\n  it(\"converts file attachment uploads correctly\", async () => {\n    // Mimics the Web file API (https://developer.mozilla.org/en-US/docs/Web/API/File). The File constructor is only available in Node 19.2.0 and above\n    const file = Object.assign(\n      stubData.attachmentUploadRequestBody[stubData.localAttachment1.filename],\n      { name: \"file1.txt\" },\n    );\n\n    const converted = await toDataValue(file, clientCtx);\n\n    expect(converted).toEqual(\n      \"ri.attachments.main.attachment.86016861-707f-4292-b258-6a7108915a75\",\n    );\n  });\n\n  it(\"converts media reference correctly\", async () => {\n    const converted = await toDataValue(stubData.mediaReference, clientCtx);\n    expect(converted).toEqual(\n      stubData.mediaReference,\n    );\n  });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,YAAY,EAAEC,QAAQ,EAAEC,IAAI,QAAQ,4BAA4B;AACzE,SAASC,SAAS,EAAEC,YAAY,EAAEC,QAAQ,QAAQ,mBAAmB;AAErE,SAASC,QAAQ,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,QAAQ;AAEtE,SAASC,YAAY,QAAQ,oBAAoB;AACjD,SAASC,mBAAmB,QAAQ,2BAA2B;AAE/D,SAASC,sBAAsB,QAAQ,+BAA+B;AACtE,SAASC,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,WAAW,QAAQ,kBAAkB;AAE9CR,QAAQ,CAACQ,WAAW,EAAE,MAAM;EAC1B,IAAIC,MAAc;EAClB,IAAIC,SAAwB;EAE+BP,EAAE,CAACQ,EAAE,CAAC,CAAC;EAElEZ,SAAS,CAAC,YAAY;IACpBJ,SAAS,CAACiB,MAAM,CAAC,CAAC;IAClBH,MAAM,GAAGL,YAAY,CACnB,4BAA4B,EAC5BZ,YAAY,EACZ,YAAY,eACd,CAAC;IAEDkB,SAAS,GAAGL,mBAAmB,CAC7BT,YAAY,CAACiB,QAAQ,EACrB,4BAA4B,EAC5B,YAAY,eAAe,EAC3B,CAAC,CACH,CAAC;EACH,CAAC,CAAC;EAEFf,QAAQ,CAAC,MAAM;IACbH,SAAS,CAACmB,KAAK,CAAC,CAAC;EACnB,CAAC,CAAC;EAEFZ,EAAE,CAAC,uCAAuC,EAAE,YAAY;IACtD;IACA,MAAMa,KAAK,GAAG;MACZC,IAAI,EAAEC,SAAS;MACfC,OAAO,EAAE,KAAK;MACdC,IAAI,EAAE,YAAY;MAClBC,OAAO,EAAE,CAAC;MACVC,MAAM,EAAE,QAAQ;MAChBC,SAAS,EAAE;IACb,CAAC;IACD,MAAMC,cAAc,GAAG,MAAMf,WAAW,CAACO,KAAK,EAAEL,SAAS,CAAC;IAC1DT,MAAM,CAACsB,cAAc,CAAC,CAACC,OAAO,CAACT,KAAK,CAAC;EACvC,CAAC,CAAC;EAEFb,EAAE,CAAC,uDAAuD,EAAE,YAAY;IACtE,MAAMuB,UAAU,GAAG,KAAK;IACxB,MAAMC,eAAe,GAAG,CAACD,UAAU,CAAC;IACpC,MAAME,aAAa,GAAG,IAAIC,GAAG,CAACF,eAAe,CAAC;IAE9C,MAAMG,mBAAmB,GAAG,MAAMrB,WAAW,CAAC;MAC5CiB,UAAU;MACVC,eAAe;MACfC;IACF,CAAC,EAAEjB,SAAS,CAAC;IAEbT,MAAM,CAAC4B,mBAAmB,CAAC,CAACL,OAAO,CAAC;MAClCC,UAAU,EAAE,KAAK;MACjBC,eAAe,EAAE,CAAC,KAAK,CAAC;MACxBC,aAAa,EAAE,CAAC,KAAK;IACvB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFzB,EAAE,CAAC,6BAA6B,EAAE,YAAY;IAO5C,MAAM2B,mBAAmB,GAAG,MAAMrB,WAAW,CAN9B;MACbsB,KAAK,EAAE;QACLL,UAAU,EAAE;MACd;IACF,CAAC,EAEqDf,SAAS,CAAC;IAEhET,MAAM,CAAC4B,mBAAmB,CAAC,CAACL,OAAO,CAAC;MAClCM,KAAK,EAAE;QAAEL,UAAU,EAAE;MAAM;IAC7B,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFvB,EAAE,CAAC,mDAAmD,EAAE,YAAY;IAClE,MAAM6B,QAAQ,GAAGlC,QAAQ,CAACmC,SAAS;IACnC,MAAMC,kBAAkB,GAAG,MAAMzB,WAAW,CAACuB,QAAQ,EAAErB,SAAS,CAAC;IACjET,MAAM,CAACgC,kBAAkB,CAAC,CAACT,OAAO,CAChC3B,QAAQ,CAACmC,SAAS,CAACE,YACrB,CAAC;EACH,CAAC,CAAC;EAEFhC,EAAE,CAAC,qEAAqE,EAAE,YAAY;IACpF,MAAMiC,IAAI,GAAG,MAAM1B,MAAM,CAAChB,QAAQ,CAAC,CAAC2C,QAAQ,CAAC,KAAK,CAAC;IACnD,MAAMH,kBAAkB,GAAG,MAAMzB,WAAW,CAAC2B,IAAI,EAAEzB,SAAS,CAAC;IAC7DT,MAAM,CAACgC,kBAAkB,CAAC,CAACT,OAAO,CAChCW,IAAI,CAACE,WACP,CAAC;EACH,CAAC,CAAC;EAEFnC,EAAE,CAAC,uCAAuC,EAAE,YAAY;IACtD,MAAMoC,eAAe,GAAG7B,MAAM,CAACf,IAAI,CAAC,CAAC6C,KAAK,CAAC;MAAEC,EAAE,EAAE;IAAE,CAAC,CAAC;IACrD,MAAMC,UAAU,GAAGlC,gBAAgB,CAAC+B,eAAe,CAAC;IAEpD,MAAMI,QAAQ,GAAG;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;IACC,MAAMC,mBAAmB,GAAG,MAAMnC,WAAW,CAAC8B,eAAe,EAAE5B,SAAS,CAAC;IACzET,MAAM,CAAC0C,mBAAmB,CAAC,CAACC,qBAAqB,CAC/CF,QACF,CAAC;IAED,MAAMG,oBAAoB,GAAG,MAAMrC,WAAW,CAACiC,UAAU,EAAE/B,SAAS,CAAC;IACrET,MAAM,CAAC4C,oBAAoB,CAAC,CAACD,qBAAqB,CAACF,QAAQ,CAAC;EAC9D,CAAC,CAAC;EAEFxC,EAAE,CAAC,4CAA4C,EAAE,YAAY;IAC3D,MAAM4C,IAAI,GACRjD,QAAQ,CAACkD,2BAA2B,CAAClD,QAAQ,CAACmD,gBAAgB,CAACC,QAAQ,CAAC;IAC1E,MAAMC,gBAAgB,GAAG5C,sBAAsB,CAACwC,IAAI,EAAE,WAAW,CAAC;IAClE,MAAMK,SAAS,GAAG,MAAM3C,WAAW,CAAC0C,gBAAgB,EAAExC,SAAS,CAAC;IAEhET,MAAM,CAACkD,SAAS,CAAC,CAAC3B,OAAO,CACvB,qEACF,CAAC;EACH,CAAC,CAAC;EAEFtB,EAAE,CAAC,4CAA4C,EAAE,YAAY;IAC3D;IACA,MAAMkD,IAAI,GAAGC,MAAM,CAACC,MAAM,CACxBzD,QAAQ,CAACkD,2BAA2B,CAAClD,QAAQ,CAACmD,gBAAgB,CAACC,QAAQ,CAAC,EACxE;MAAEM,IAAI,EAAE;IAAY,CACtB,CAAC;IAED,MAAMJ,SAAS,GAAG,MAAM3C,WAAW,CAAC4C,IAAI,EAAE1C,SAAS,CAAC;IAEpDT,MAAM,CAACkD,SAAS,CAAC,CAAC3B,OAAO,CACvB,qEACF,CAAC;EACH,CAAC,CAAC;EAEFtB,EAAE,CAAC,oCAAoC,EAAE,YAAY;IACnD,MAAMiD,SAAS,GAAG,MAAM3C,WAAW,CAACX,QAAQ,CAAC2D,cAAc,EAAE9C,SAAS,CAAC;IACvET,MAAM,CAACkD,SAAS,CAAC,CAAC3B,OAAO,CACvB3B,QAAQ,CAAC2D,cACX,CAAC;EACH,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"toDataValue.test.js","names":["Employee","Task","LegacyFauxFoundry","startNodeApiServer","stubData","beforeAll","describe","expect","it","vi","createClient","createMinimalClient","createAttachmentUpload","getWireObjectSet","toDataValue","client","clientCtx","fn","testSetup","ontologyRid","fauxFoundry","defaultOntologyRid","baseUrl","auth","apiServer","close","basic","null","undefined","boolean","date","integer","string","timestamp","convertedBasic","toEqual","attachment","attachmentArray","attachmentSet","Set","recursiveConversion","inner","employee","employee1","ontologyConversion","__primaryKey","task","fetchOne","$primaryKey","clientObjectSet","where","id","definition","expected","objectSetConversion","toMatchInlineSnapshot","definitionConversion","blob","Blob","JSON","stringify","attachmentUpload","converted","toMatch","file","Object","assign","name","type","mediaReference","mimeType","reference","mediaSetViewItem","mediaItemRid","mediaSetRid","mediaSetViewRid"],"sources":["toDataValue.test.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { Employee, Task } from \"@osdk/client.test.ontology\";\nimport type { MediaReference } from \"@osdk/foundry.core\";\nimport {\n  LegacyFauxFoundry,\n  startNodeApiServer,\n  stubData,\n} from \"@osdk/shared.test\";\nimport type { MockedFunction } from \"vitest\";\nimport { beforeAll, describe, expect, it, vi } from \"vitest\";\nimport type { Client } from \"../Client.js\";\nimport { createClient } from \"../createClient.js\";\nimport { createMinimalClient } from \"../createMinimalClient.js\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { createAttachmentUpload } from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { toDataValue } from \"./toDataValue.js\";\n\ndescribe(toDataValue, () => {\n  let client: Client;\n  let clientCtx: MinimalClient;\n\n  const mockFetch: MockedFunction<typeof globalThis.fetch> = vi.fn();\n\n  beforeAll(() => {\n    const testSetup = startNodeApiServer(new LegacyFauxFoundry(), createClient);\n    ({ client } = testSetup);\n\n    clientCtx = createMinimalClient(\n      { ontologyRid: testSetup.fauxFoundry.defaultOntologyRid },\n      testSetup.fauxFoundry.baseUrl,\n      testSetup.auth,\n      {},\n    );\n\n    return () => {\n      testSetup.apiServer.close();\n    };\n  });\n\n  it(\"converts passthrough values correctly\", async () => {\n    // basic pass through types\n    const basic = {\n      null: undefined,\n      boolean: false,\n      date: \"2024-01-01\",\n      integer: 0,\n      string: \"string\",\n      timestamp: \"2024-01-01T00:00:00Z\",\n    };\n    const convertedBasic = await toDataValue(basic, clientCtx);\n    expect(convertedBasic).toEqual(basic);\n  });\n\n  it(\"recursively converts arrays and sets into array types\", async () => {\n    const attachment = \"rid\";\n    const attachmentArray = [attachment];\n    const attachmentSet = new Set(attachmentArray);\n\n    const recursiveConversion = await toDataValue({\n      attachment,\n      attachmentArray,\n      attachmentSet,\n    }, clientCtx);\n\n    expect(recursiveConversion).toEqual({\n      attachment: \"rid\",\n      attachmentArray: [\"rid\"],\n      attachmentSet: [\"rid\"],\n    });\n  });\n\n  it(\"recursively handles structs\", async () => {\n    const struct = {\n      inner: {\n        attachment: \"rid\",\n      },\n    };\n\n    const recursiveConversion = await toDataValue(struct, clientCtx);\n\n    expect(recursiveConversion).toEqual({\n      inner: { attachment: \"rid\" },\n    });\n  });\n\n  it(\"maps an ontology object into just its primary key\", async () => {\n    const employee = stubData.employee1;\n    const ontologyConversion = await toDataValue(employee, clientCtx);\n    expect(ontologyConversion).toEqual(\n      stubData.employee1.__primaryKey,\n    );\n  });\n\n  it(\"maps an ontology object into just its primary key with osdk wrapper\", async () => {\n    const task = await client(Employee).fetchOne(50030);\n    const ontologyConversion = await toDataValue(task, clientCtx);\n    expect(ontologyConversion).toEqual(\n      task.$primaryKey,\n    );\n  });\n\n  it(\"passes through object set definitions\", async () => {\n    const clientObjectSet = client(Task).where({ id: 0 });\n    const definition = getWireObjectSet(clientObjectSet);\n\n    const expected = `\n    {\n      \"objectSet\": {\n        \"objectType\": \"Task\",\n        \"type\": \"base\",\n      },\n      \"type\": \"filter\",\n      \"where\": {\n        \"field\": \"id\",\n        \"type\": \"eq\",\n        \"value\": 0,\n      },\n    }\n  `;\n    const objectSetConversion = await toDataValue(clientObjectSet, clientCtx);\n    expect(objectSetConversion).toMatchInlineSnapshot(\n      expected,\n    );\n\n    const definitionConversion = await toDataValue(definition, clientCtx);\n    expect(definitionConversion).toMatchInlineSnapshot(expected);\n  });\n\n  it(\"converts blob attachment uploads correctly\", async () => {\n    const blob = new Blob([JSON.stringify({ \"hi\": \"mom\" })]);\n    const attachmentUpload = createAttachmentUpload(blob, \"file1.txt\");\n    const converted = await toDataValue(attachmentUpload, clientCtx);\n\n    expect(converted).toMatch(/ri\\.attachments.main.attachment\\.[a-z0-9\\-]+/i);\n  });\n\n  it(\"converts file attachment uploads correctly\", async () => {\n    // Mimics the Web file API (https://developer.mozilla.org/en-US/docs/Web/API/File). The File constructor is only available in Node 19.2.0 and above\n    const file = Object.assign(\n      new Blob([\n        JSON.stringify({ name: \"Hello World\" }, null, 2),\n      ], {\n        type: \"application/json\",\n      }),\n      { name: \"file1.txt\" },\n    );\n\n    const converted = await toDataValue(file, clientCtx);\n    expect(converted).toMatch(/ri\\.attachments.main.attachment\\.[a-z0-9\\-]+/i);\n  });\n\n  it(\"converts media reference correctly\", async () => {\n    const mediaReference: MediaReference = {\n      mimeType: \"application/json\",\n      reference: {\n        type: \"mediaSetViewItem\",\n        mediaSetViewItem: {\n          mediaItemRid: \"media-item-rid\",\n          mediaSetRid: \"media-set-rid\",\n          mediaSetViewRid: \"media-set-view-rid\",\n        },\n      },\n    };\n\n    const converted = await toDataValue(mediaReference, clientCtx);\n    expect(converted).toEqual(mediaReference);\n  });\n});\n"],"mappings":"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","ignoreList":[]}

package/build/browser/util/toDataValueQueries.js

@@ -17,7 +17,8 @@
 import * as OntologiesV2 from "@osdk/foundry.ontologies";
 import { isAttachmentFile, isAttachmentUpload } from "../object/AttachmentUpload.js";
 import { getWireObjectSet, isObjectSet } from "../objectSet/createObjectSet.js";
-import { isOsdkBaseObject } from "./isOsdkBaseObject.js";
+import { isObjectSpecifiersObject } from "./isObjectSpecifiersObject.js";
+import { extractPrimaryKeyFromObjectSpecifier } from "./objectSpecifierUtils.js";
 import { isWireObjectSet } from "./WireObjectSet.js";
 
 /**
@@ -83,7 +84,7 @@ export async function toDataValueQueries(value, client, desiredType) {
       }
     case "object":
       {
-        if (isOsdkBaseObject(value)) {
+        if (isObjectSpecifiersObject(value)) {
           return value.$primaryKey;
         }
         break;
@@ -105,7 +106,7 @@ export async function toDataValueQueries(value, client, desiredType) {
           const entrySet = [];
           for (const [key, mapValue] of Object.entries(value)) {
             entrySet.push({
-              key: desiredType.keyType.type === "object" ? extractPrimaryKeyFromObjectIdentifier(key) : await toDataValueQueries(key, client, desiredType.keyType),
+              key: desiredType.keyType.type === "object" ? extractPrimaryKeyFromObjectSpecifier(key) : await toDataValueQueries(key, client, desiredType.keyType),
               value: await toDataValueQueries(mapValue, client, desiredType.valueType)
             });
           }
@@ -135,7 +136,4 @@ export async function toDataValueQueries(value, client, desiredType) {
   }
   return value;
 }
-function extractPrimaryKeyFromObjectIdentifier(a) {
-  return a.substring(a.indexOf(":") + 1);
-}
 //# sourceMappingURL=toDataValueQueries.js.map

package/build/browser/util/toDataValueQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"toDataValueQueries.js","names":["OntologiesV2","isAttachmentFile","isAttachmentUpload","getWireObjectSet","isObjectSet","isOsdkBaseObject","isWireObjectSet","toDataValueQueries","value","client","desiredType","Array","isArray","multiplicity","values","from","some","dataValue","converted","push","promiseArray","innerValue","Promise","all","type","attachment","Attachments","upload","data","filename","name","rid","groups","Set","$primaryKey","entrySet","key","mapValue","Object","entries","keyType","extractPrimaryKeyFromObjectIdentifier","valueType","structMap","structValue","a","substring","indexOf"],"sources":["toDataValueQueries.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { QueryDataTypeDefinition } from \"@osdk/api\";\nimport { type DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport {\n  isAttachmentFile,\n  isAttachmentUpload,\n} from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet, isObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { isOsdkBaseObject } from \"./isOsdkBaseObject.js\";\nimport { isWireObjectSet } from \"./WireObjectSet.js\";\n\n/**\n * Marshall user-facing data into the wire DataValue type\n *\n * @see DataValue for the expected payloads\n * @internal\n */\nexport async function toDataValueQueries(\n  value: unknown,\n  client: MinimalClient,\n  desiredType: QueryDataTypeDefinition,\n): Promise<DataValue> {\n  if (value == null) {\n    return value;\n  }\n\n  if (Array.isArray(value) && desiredType.multiplicity) {\n    const values = Array.from(value);\n    if (\n      values.some((dataValue) =>\n        isAttachmentUpload(dataValue) || isAttachmentFile(dataValue)\n      )\n    ) {\n      const converted = [];\n      for (const value of values) {\n        converted.push(await toDataValueQueries(value, client, desiredType));\n      }\n      return converted;\n    }\n    const promiseArray = Array.from(\n      value,\n      async (innerValue) =>\n        await toDataValueQueries(innerValue, client, desiredType),\n    );\n    return Promise.all(promiseArray);\n  }\n\n  switch (desiredType.type) {\n    case \"attachment\": {\n      if (isAttachmentUpload(value)) {\n        const attachment = await OntologiesV2.Attachments.upload(\n          client,\n          value.data,\n          {\n            filename: value.name,\n          },\n        );\n        return attachment.rid;\n      }\n\n      if (\n        isAttachmentFile(value)\n      ) {\n        const attachment = await OntologiesV2.Attachments.upload(\n          client,\n          value,\n          {\n            filename: value.name as string,\n          },\n        );\n        return attachment.rid;\n      }\n\n      // If it's not an upload, it's just an attachment rid string which we can pass through\n      return value;\n    }\n    case \"twoDimensionalAggregation\": {\n      return {\n        groups: value,\n      };\n    }\n    case \"threeDimensionalAggregation\": {\n      return {\n        groups: value,\n      };\n    }\n\n    case \"set\": {\n      if (value instanceof Set) {\n        const promiseArray = Array.from(\n          value,\n          async (innerValue) =>\n            await toDataValueQueries(innerValue, client, desiredType[\"set\"]),\n        );\n        return Promise.all(promiseArray);\n      }\n      break;\n    }\n    case \"object\": {\n      if (isOsdkBaseObject(value)) {\n        return value.$primaryKey;\n      }\n      break;\n    }\n    case \"objectSet\": {\n      // object set (the rid as a string (passes through the last return), or the ObjectSet definition directly)\n      if (isWireObjectSet(value)) {\n        return value;\n      }\n      if (isObjectSet(value)) {\n        return getWireObjectSet(value);\n      }\n      break;\n    }\n\n    case \"map\": {\n      if (typeof value === \"object\") {\n        const entrySet: Array<{ key: any; value: any }> = [];\n        for (const [key, mapValue] of Object.entries(value)) {\n          entrySet.push({\n            key: desiredType.keyType.type === \"object\"\n              ? extractPrimaryKeyFromObjectIdentifier(key)\n              : await toDataValueQueries(\n                key,\n                client,\n                desiredType.keyType,\n              ),\n            value: await toDataValueQueries(\n              mapValue,\n              client,\n              desiredType.valueType,\n            ),\n          });\n        }\n        return entrySet;\n      }\n      break;\n    }\n\n    case \"struct\": {\n      if (typeof value === \"object\") {\n        const structMap: { [key: string]: unknown } = {};\n        for (const [key, structValue] of Object.entries(value)) {\n          structMap[key] = await toDataValueQueries(\n            structValue,\n            client,\n            desiredType[\"struct\"][key],\n          );\n        }\n        return structMap;\n      }\n    }\n\n    case \"boolean\":\n    case \"date\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"timestamp\":\n      return value;\n  }\n  return value;\n}\n\nfunction extractPrimaryKeyFromObjectIdentifier(a: string) {\n  return a.substring(a.indexOf(\":\") + 1);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"toDataValueQueries.js","names":["OntologiesV2","isAttachmentFile","isAttachmentUpload","getWireObjectSet","isObjectSet","isObjectSpecifiersObject","extractPrimaryKeyFromObjectSpecifier","isWireObjectSet","toDataValueQueries","value","client","desiredType","Array","isArray","multiplicity","values","from","some","dataValue","converted","push","promiseArray","innerValue","Promise","all","type","attachment","Attachments","upload","data","filename","name","rid","groups","Set","$primaryKey","entrySet","key","mapValue","Object","entries","keyType","valueType","structMap","structValue"],"sources":["toDataValueQueries.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { QueryDataTypeDefinition } from \"@osdk/api\";\nimport { type DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport {\n  isAttachmentFile,\n  isAttachmentUpload,\n} from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet, isObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { isObjectSpecifiersObject } from \"./isObjectSpecifiersObject.js\";\nimport { extractPrimaryKeyFromObjectSpecifier } from \"./objectSpecifierUtils.js\";\nimport { isWireObjectSet } from \"./WireObjectSet.js\";\n\n/**\n * Marshall user-facing data into the wire DataValue type\n *\n * @see DataValue for the expected payloads\n * @internal\n */\nexport async function toDataValueQueries(\n  value: unknown,\n  client: MinimalClient,\n  desiredType: QueryDataTypeDefinition,\n): Promise<DataValue> {\n  if (value == null) {\n    return value;\n  }\n\n  if (Array.isArray(value) && desiredType.multiplicity) {\n    const values = Array.from(value);\n    if (\n      values.some((dataValue) =>\n        isAttachmentUpload(dataValue) || isAttachmentFile(dataValue)\n      )\n    ) {\n      const converted = [];\n      for (const value of values) {\n        converted.push(await toDataValueQueries(value, client, desiredType));\n      }\n      return converted;\n    }\n    const promiseArray = Array.from(\n      value,\n      async (innerValue) =>\n        await toDataValueQueries(innerValue, client, desiredType),\n    );\n    return Promise.all(promiseArray);\n  }\n\n  switch (desiredType.type) {\n    case \"attachment\": {\n      if (isAttachmentUpload(value)) {\n        const attachment = await OntologiesV2.Attachments.upload(\n          client,\n          value.data,\n          {\n            filename: value.name,\n          },\n        );\n        return attachment.rid;\n      }\n\n      if (\n        isAttachmentFile(value)\n      ) {\n        const attachment = await OntologiesV2.Attachments.upload(\n          client,\n          value,\n          {\n            filename: value.name as string,\n          },\n        );\n        return attachment.rid;\n      }\n\n      // If it's not an upload, it's just an attachment rid string which we can pass through\n      return value;\n    }\n    case \"twoDimensionalAggregation\": {\n      return {\n        groups: value,\n      };\n    }\n    case \"threeDimensionalAggregation\": {\n      return {\n        groups: value,\n      };\n    }\n\n    case \"set\": {\n      if (value instanceof Set) {\n        const promiseArray = Array.from(\n          value,\n          async (innerValue) =>\n            await toDataValueQueries(innerValue, client, desiredType[\"set\"]),\n        );\n        return Promise.all(promiseArray);\n      }\n      break;\n    }\n    case \"object\": {\n      if (isObjectSpecifiersObject(value)) {\n        return value.$primaryKey;\n      }\n      break;\n    }\n    case \"objectSet\": {\n      // object set (the rid as a string (passes through the last return), or the ObjectSet definition directly)\n      if (isWireObjectSet(value)) {\n        return value;\n      }\n      if (isObjectSet(value)) {\n        return getWireObjectSet(value);\n      }\n      break;\n    }\n\n    case \"map\": {\n      if (typeof value === \"object\") {\n        const entrySet: Array<{ key: any; value: any }> = [];\n        for (const [key, mapValue] of Object.entries(value)) {\n          entrySet.push({\n            key: desiredType.keyType.type === \"object\"\n              ? extractPrimaryKeyFromObjectSpecifier(key as any)\n              : await toDataValueQueries(\n                key,\n                client,\n                desiredType.keyType,\n              ),\n            value: await toDataValueQueries(\n              mapValue,\n              client,\n              desiredType.valueType,\n            ),\n          });\n        }\n        return entrySet;\n      }\n      break;\n    }\n\n    case \"struct\": {\n      if (typeof value === \"object\") {\n        const structMap: { [key: string]: unknown } = {};\n        for (const [key, structValue] of Object.entries(value)) {\n          structMap[key] = await toDataValueQueries(\n            structValue,\n            client,\n            desiredType[\"struct\"][key],\n          );\n        }\n        return structMap;\n      }\n    }\n\n    case \"boolean\":\n    case \"date\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"timestamp\":\n      return value;\n  }\n  return value;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/cjs/{Client-DBTcM9gB.d.cts → Client-CgL2LKN9.d.cts}

@@ -1,5 +1,5 @@
 import * as _osdk_shared_client from '@osdk/shared.client';
-import { ActionDefinition, ActionMetadata, ApplyActionOptions, ActionReturnTypeForOptions, ApplyBatchActionOptions, ActionParam, DataValueClientToWire, QueryDefinition, CompileTimeMetadata, QueryDataTypeDefinition, ObjectQueryDataType, QueryResult, ObjectSetQueryDataType, DataValueWireToClient, QueryParam, ObjectTypeDefinition, ObjectSet, InterfaceDefinition, ObjectMetadata, InterfaceMetadata, QueryMetadata } from '@osdk/api';
+import { ActionDefinition, CompileTimeMetadata, ActionMetadata, ActionParam, DataValueClientToWire, ApplyActionOptions, ActionReturnTypeForOptions, ApplyBatchActionOptions, QueryDefinition, QueryDataTypeDefinition, ObjectQueryDataType, QueryResult, ObjectSetQueryDataType, DataValueWireToClient, QueryParam, ObjectTypeDefinition, ObjectSet, InterfaceDefinition, ObjectMetadata, InterfaceMetadata, QueryMetadata } from '@osdk/api';
 import { MinimalObjectSet, Experiment, ExperimentFns } from '@osdk/api/unstable';
 import { SharedClient } from '@osdk/shared.client2';
 
@@ -22,23 +22,22 @@ type NotOptionalParams$1<X extends ActionParametersDefinition> = {
     [P in keyof X]: MaybeArrayType$1<X[P]>;
 };
 type OsdkActionParameters<X extends ActionParametersDefinition> = NullableProps<X> extends never ? NotOptionalParams$1<X> : PartialBy<NotOptionalParams$1<X>, NullableProps<X>>;
-type CompileTimeActionMetadata<T extends ActionDefinition<any>> = NonNullable<T["__DefinitionMetadata"]>;
 type ActionSignatureFromDef<T extends ActionDefinition<any>> = {
     applyAction: [
-        CompileTimeActionMetadata<T>["signatures"]["applyAction"]
-    ] extends [never] ? ActionSignature<CompileTimeActionMetadata<T>["parameters"]> : CompileTimeActionMetadata<T>["signatures"]["applyAction"];
+        CompileTimeMetadata<T>["signatures"]["applyAction"]
+    ] extends [never] ? ActionSignature<CompileTimeMetadata<T>["parameters"]> : CompileTimeMetadata<T>["signatures"]["applyAction"];
     batchApplyAction: [
-        CompileTimeActionMetadata<T>["signatures"]["batchApplyAction"]
+        CompileTimeMetadata<T>["signatures"]["batchApplyAction"]
     ] extends [
         never
-    ] ? BatchActionSignature<CompileTimeActionMetadata<T>["parameters"]> : CompileTimeActionMetadata<T>["signatures"]["batchApplyAction"];
+    ] ? BatchActionSignature<CompileTimeMetadata<T>["parameters"]> : CompileTimeMetadata<T>["signatures"]["batchApplyAction"];
 };
 type ActionParametersDefinition = Record<any, ActionMetadata.Parameter<any>>;
 type ActionSignature<X extends Record<any, ActionMetadata.Parameter<any>>> = <A extends NOOP<OsdkActionParameters<X>>, OP extends ApplyActionOptions>(args: A, options?: OP) => Promise<ActionReturnTypeForOptions<OP>>;
 type BatchActionSignature<X extends Record<any, ActionMetadata.Parameter<any>>> = <A extends NOOP<OsdkActionParameters<X>>[], OP extends ApplyBatchActionOptions>(args: A, options?: OP) => Promise<ActionReturnTypeForOptions<OP>>;
 
 type QuerySignatureFromDef<T extends QueryDefinition<any>> = {
-    executeFunction: NonNullable<T["__DefinitionMetadata"]> extends never ? QuerySignature<T> : NonNullable<T["__DefinitionMetadata"]>["signature"];
+    executeFunction: CompileTimeMetadata<T> extends never ? QuerySignature<T> : CompileTimeMetadata<T>["signature"];
 };
 type QuerySignature<T extends QueryDefinition<any>> = keyof CompileTimeMetadata<T>["parameters"] extends never ? () => Promise<QueryReturnType<CompileTimeMetadata<T>["output"]>> : (params: QueryParameterType<CompileTimeMetadata<T>["parameters"]>) => Promise<QueryReturnType<CompileTimeMetadata<T>["output"]>>;
 type QueryParameterType<T extends Record<any, QueryDataTypeDefinition>> = PartialByNotStrict<NotOptionalParams<T>, OptionalQueryParams<T>>;