@osdk/client 2.0.0-beta.13 → 2.0.0-beta.15

package/build/esm/util/toDataValue.js

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as OntologiesV2 from "@osdk/internal.foundry.ontologiesv2";
+import { isAttachmentUpload } from "../object/AttachmentUpload.js";
+import { getWireObjectSet, isObjectSet } from "../objectSet/createObjectSet.js";
+import { isOntologyObjectV2 } from "./isOntologyObjectV2.js";
+import { isOsdkBaseObject } from "./isOsdkObject.js";
+import { isWireObjectSet } from "./WireObjectSet.js";
+/**
+ * Marshall user-facing data into the wire DataValue type
+ *
+ * @see DataValue for the expected payloads
+ * @internal
+ */
+export async function toDataValue(value, client) {
+  if (value == null) {
+    // typeof null is 'object' so do this first
+    return value;
+  }
+  // arrays and sets are both sent over the wire as arrays
+  if (Array.isArray(value) || value instanceof Set) {
+    const promiseArray = Array.from(value, async innerValue => await toDataValue(innerValue, client));
+    return Promise.all(promiseArray);
+  }
+  // For uploads, we need to upload ourselves first to get the RID of the attachment
+  if (isAttachmentUpload(value)) {
+    const attachment = await OntologiesV2.Attachments.uploadAttachmentV2(client, value, {
+      filename: value.name
+    });
+    return await toDataValue(attachment.rid, client);
+  }
+  // objects just send the JSON'd primaryKey
+  if (isOntologyObjectV2(value)) {
+    return await toDataValue(value.__primaryKey, client);
+  }
+  if (isOsdkBaseObject(value)) {
+    return await toDataValue(value.$primaryKey, client);
+  }
+  // object set (the rid as a string (passes through the last return), or the ObjectSet definition directly)
+  if (isWireObjectSet(value)) {
+    return value;
+  }
+  if (isObjectSet(value)) {
+    return getWireObjectSet(value);
+  }
+  // TODO (during queries implementation)
+  // two dimensional aggregation
+  // three dimensional aggregation
+  // struct
+  if (typeof value === "object") {
+    return Object.entries(value).reduce(async (promisedAcc, [key, structValue]) => {
+      const acc = await promisedAcc;
+      acc[key] = await toDataValue(structValue, client);
+      return acc;
+    }, Promise.resolve({}));
+  }
+  // expected to pass through - boolean, byte, date, decimal, float, double, integer, long, short, string, timestamp
+  return value;
+}
+//# sourceMappingURL=toDataValue.js.map

package/build/esm/util/toDataValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toDataValue.js","names":["OntologiesV2","isAttachmentUpload","getWireObjectSet","isObjectSet","isOntologyObjectV2","isOsdkBaseObject","isWireObjectSet","toDataValue","value","client","Array","isArray","Set","promiseArray","from","innerValue","Promise","all","attachment","Attachments","uploadAttachmentV2","filename","name","rid","__primaryKey","$primaryKey","Object","entries","reduce","promisedAcc","key","structValue","acc","resolve"],"sources":["toDataValue.js"],"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 */\nimport * as OntologiesV2 from \"@osdk/internal.foundry.ontologiesv2\";\nimport { isAttachmentUpload } from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet, isObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { isOntologyObjectV2 } from \"./isOntologyObjectV2.js\";\nimport { isOsdkBaseObject } from \"./isOsdkObject.js\";\nimport { isWireObjectSet } from \"./WireObjectSet.js\";\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 toDataValue(value, client) {\n    if (value == null) {\n        // typeof null is 'object' so do this first\n        return value;\n    }\n    // arrays and sets are both sent over the wire as arrays\n    if (Array.isArray(value) || value instanceof Set) {\n        const promiseArray = Array.from(value, async (innerValue) => await toDataValue(innerValue, client));\n        return Promise.all(promiseArray);\n    }\n    // For uploads, we need to upload ourselves first to get the RID of the attachment\n    if (isAttachmentUpload(value)) {\n        const attachment = await OntologiesV2.Attachments.uploadAttachmentV2(client, value, {\n            filename: value.name,\n        });\n        return await toDataValue(attachment.rid, client);\n    }\n    // objects just send the JSON'd primaryKey\n    if (isOntologyObjectV2(value)) {\n        return await toDataValue(value.__primaryKey, client);\n    }\n    if (isOsdkBaseObject(value)) {\n        return await toDataValue(value.$primaryKey, client);\n    }\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    // TODO (during queries implementation)\n    // two dimensional aggregation\n    // three dimensional aggregation\n    // struct\n    if (typeof value === \"object\") {\n        return Object.entries(value).reduce(async (promisedAcc, [key, structValue]) => {\n            const acc = await promisedAcc;\n            acc[key] = await toDataValue(structValue, client);\n            return acc;\n        }, Promise.resolve({}));\n    }\n    // expected to pass through - boolean, byte, date, decimal, float, double, integer, long, short, string, timestamp\n    return value;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,KAAKA,YAAY,MAAM,qCAAqC;AACnE,SAASC,kBAAkB,QAAQ,+BAA+B;AAClE,SAASC,gBAAgB,EAAEC,WAAW,QAAQ,iCAAiC;AAC/E,SAASC,kBAAkB,QAAQ,yBAAyB;AAC5D,SAASC,gBAAgB,QAAQ,mBAAmB;AACpD,SAASC,eAAe,QAAQ,oBAAoB;AACpD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,WAAWA,CAACC,KAAK,EAAEC,MAAM,EAAE;EAC7C,IAAID,KAAK,IAAI,IAAI,EAAE;IACf;IACA,OAAOA,KAAK;EAChB;EACA;EACA,IAAIE,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,IAAIA,KAAK,YAAYI,GAAG,EAAE;IAC9C,MAAMC,YAAY,GAAGH,KAAK,CAACI,IAAI,CAACN,KAAK,EAAE,MAAOO,UAAU,IAAK,MAAMR,WAAW,CAACQ,UAAU,EAAEN,MAAM,CAAC,CAAC;IACnG,OAAOO,OAAO,CAACC,GAAG,CAACJ,YAAY,CAAC;EACpC;EACA;EACA,IAAIZ,kBAAkB,CAACO,KAAK,CAAC,EAAE;IAC3B,MAAMU,UAAU,GAAG,MAAMlB,YAAY,CAACmB,WAAW,CAACC,kBAAkB,CAACX,MAAM,EAAED,KAAK,EAAE;MAChFa,QAAQ,EAAEb,KAAK,CAACc;IACpB,CAAC,CAAC;IACF,OAAO,MAAMf,WAAW,CAACW,UAAU,CAACK,GAAG,EAAEd,MAAM,CAAC;EACpD;EACA;EACA,IAAIL,kBAAkB,CAACI,KAAK,CAAC,EAAE;IAC3B,OAAO,MAAMD,WAAW,CAACC,KAAK,CAACgB,YAAY,EAAEf,MAAM,CAAC;EACxD;EACA,IAAIJ,gBAAgB,CAACG,KAAK,CAAC,EAAE;IACzB,OAAO,MAAMD,WAAW,CAACC,KAAK,CAACiB,WAAW,EAAEhB,MAAM,CAAC;EACvD;EACA;EACA,IAAIH,eAAe,CAACE,KAAK,CAAC,EAAE;IACxB,OAAOA,KAAK;EAChB;EACA,IAAIL,WAAW,CAACK,KAAK,CAAC,EAAE;IACpB,OAAON,gBAAgB,CAACM,KAAK,CAAC;EAClC;EACA;EACA;EACA;EACA;EACA,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC3B,OAAOkB,MAAM,CAACC,OAAO,CAACnB,KAAK,CAAC,CAACoB,MAAM,CAAC,OAAOC,WAAW,EAAE,CAACC,GAAG,EAAEC,WAAW,CAAC,KAAK;MAC3E,MAAMC,GAAG,GAAG,MAAMH,WAAW;MAC7BG,GAAG,CAACF,GAAG,CAAC,GAAG,MAAMvB,WAAW,CAACwB,WAAW,EAAEtB,MAAM,CAAC;MACjD,OAAOuB,GAAG;IACd,CAAC,EAAEhB,OAAO,CAACiB,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;EAC3B;EACA;EACA,OAAOzB,KAAK;AAChB","ignoreList":[]}

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

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2023 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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 { createClient } from "../createClient.js";
+import { createMinimalClient } from "../createMinimalClient.js";
+import { createAttachmentUpload } from "../object/AttachmentUpload.js";
+import { getWireObjectSet } from "../objectSet/createObjectSet.js";
+import { toDataValue } from "./toDataValue.js";
+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();
+  });
+  it("converts passthrough values correctly", async () => {
+    // basic pass through types
+    const basic = {
+      null: undefined,
+      boolean: false,
+      date: "2024-01-01",
+      integer: 0,
+      string: "string",
+      timestamp: "2024-01-01T00:00:00Z"
+    };
+    const convertedBasic = await toDataValue(basic, clientCtx);
+    expect(convertedBasic).toEqual(basic);
+  });
+  it("recursively converts arrays and sets into array types", async () => {
+    const attachment = "rid";
+    const attachmentArray = [attachment];
+    const attachmentSet = new Set(attachmentArray);
+    const recursiveConversion = await toDataValue({
+      attachment,
+      attachmentArray,
+      attachmentSet
+    }, clientCtx);
+    expect(recursiveConversion).toEqual({
+      attachment: "rid",
+      attachmentArray: ["rid"],
+      attachmentSet: ["rid"]
+    });
+  });
+  it("recursively handles structs", async () => {
+    const recursiveConversion = await toDataValue({
+      inner: {
+        attachment: "rid"
+      }
+    }, clientCtx);
+    expect(recursiveConversion).toEqual({
+      inner: {
+        attachment: "rid"
+      }
+    });
+  });
+  it("maps an ontology object into just its primary key", async () => {
+    const employee = stubData.employee1;
+    const ontologyConversion = await toDataValue(employee, clientCtx);
+    expect(ontologyConversion).toEqual(stubData.employee1.__primaryKey);
+  });
+  it("maps an ontology object into just its primary key with osdk wrapper", async () => {
+    const task = await client(Employee).fetchOne(50030);
+    const ontologyConversion = await toDataValue(task, clientCtx);
+    expect(ontologyConversion).toEqual(task.$primaryKey);
+  });
+  it("passes through object set definitions", async () => {
+    const clientObjectSet = client(Task).where({
+      id: 0
+    });
+    const definition = getWireObjectSet(clientObjectSet);
+    const expected = `
+    {
+      "objectSet": {
+        "objectType": "Task",
+        "type": "base",
+      },
+      "type": "filter",
+      "where": {
+        "field": "id",
+        "type": "eq",
+        "value": 0,
+      },
+    }
+  `;
+    const objectSetConversion = await toDataValue(clientObjectSet, clientCtx);
+    expect(objectSetConversion).toMatchInlineSnapshot(expected);
+    const definitionConversion = await toDataValue(definition, clientCtx);
+    expect(definitionConversion).toMatchInlineSnapshot(expected);
+  });
+  it("converts attachment uploads correctly", async () => {
+    const blob = stubData.attachmentUploadRequestBody[stubData.localAttachment1.filename];
+    const attachmentUpload = createAttachmentUpload(blob, "file1.txt");
+    const converted = await toDataValue(attachmentUpload, clientCtx);
+    expect(converted).toEqual("ri.attachments.main.attachment.86016861-707f-4292-b258-6a7108915a75");
+  });
+});
+//# sourceMappingURL=toDataValue.test.js.map

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

@@ -0,0 +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"],"sources":["toDataValue.test.js"],"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 */\nimport { $ontologyRid, Employee, Task } from \"@osdk/client.test.ontology\";\nimport { apiServer, MockOntology, stubData } from \"@osdk/shared.test\";\nimport { afterAll, beforeAll, describe, expect, it, vi } from \"vitest\";\nimport { createClient } from \"../createClient.js\";\nimport { createMinimalClient } from \"../createMinimalClient.js\";\nimport { createAttachmentUpload } from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { toDataValue } from \"./toDataValue.js\";\ndescribe(toDataValue, () => {\n    let client;\n    let clientCtx;\n    const mockFetch = vi.fn();\n    beforeAll(async () => {\n        apiServer.listen();\n        client = createClient(\"https://stack.palantir.com\", $ontologyRid, async () => \"myAccessToken\");\n        clientCtx = createMinimalClient(MockOntology.metadata, \"https://stack.palantir.com\", async () => \"myAccessToken\", {});\n    });\n    afterAll(() => {\n        apiServer.close();\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    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        const recursiveConversion = await toDataValue({\n            attachment,\n            attachmentArray,\n            attachmentSet,\n        }, clientCtx);\n        expect(recursiveConversion).toEqual({\n            attachment: \"rid\",\n            attachmentArray: [\"rid\"],\n            attachmentSet: [\"rid\"],\n        });\n    });\n    it(\"recursively handles structs\", async () => {\n        const struct = {\n            inner: {\n                attachment: \"rid\",\n            },\n        };\n        const recursiveConversion = await toDataValue(struct, clientCtx);\n        expect(recursiveConversion).toEqual({\n            inner: { attachment: \"rid\" },\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(stubData.employee1.__primaryKey);\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(task.$primaryKey);\n    });\n    it(\"passes through object set definitions\", async () => {\n        const clientObjectSet = client(Task).where({ id: 0 });\n        const definition = getWireObjectSet(clientObjectSet);\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(expected);\n        const definitionConversion = await toDataValue(definition, clientCtx);\n        expect(definitionConversion).toMatchInlineSnapshot(expected);\n    });\n    it(\"converts attachment uploads correctly\", async () => {\n        const blob = stubData.attachmentUploadRequestBody[stubData.localAttachment1.filename];\n        const attachmentUpload = createAttachmentUpload(blob, \"file1.txt\");\n        const converted = await toDataValue(attachmentUpload, clientCtx);\n        expect(converted).toEqual(\"ri.attachments.main.attachment.86016861-707f-4292-b258-6a7108915a75\");\n    });\n});\n"],"mappings":"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","ignoreList":[]}

package/build/esm/util/toDataValueQueries.js

@@ -0,0 +1,107 @@
+/*
+ * Copyright 2024 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as OntologiesV2 from "@osdk/internal.foundry.ontologiesv2";
+import { isAttachmentUpload } from "../object/AttachmentUpload.js";
+import { getWireObjectSet, isObjectSet } from "../objectSet/createObjectSet.js";
+import { isOsdkBaseObject } from "./isOsdkBaseObject.js";
+import { isWireObjectSet } from "./WireObjectSet.js";
+/**
+ * Marshall user-facing data into the wire DataValue type
+ *
+ * @see DataValue for the expected payloads
+ * @internal
+ */
+export async function toDataValueQueries(value, client, desiredType) {
+  if (value == null) {
+    return value;
+  }
+  if (Array.isArray(value) && desiredType.multiplicity) {
+    const promiseArray = Array.from(value, async innerValue => await toDataValueQueries(innerValue, client, desiredType));
+    return Promise.all(promiseArray);
+  }
+  switch (desiredType.type) {
+    case "attachment":
+      {
+        if (isAttachmentUpload(value)) {
+          const attachment = await OntologiesV2.Attachments.uploadAttachmentV2(client, value, {
+            filename: value.name
+          });
+          return attachment.rid;
+        }
+        // If it's not an upload, it's just an attachment rid string which we can pass through
+        return value;
+      }
+    case "twoDimensionalAggregation":
+      {
+        return {
+          groups: value
+        };
+      }
+    case "threeDimensionalAggregation":
+      {
+        return {
+          groups: value
+        };
+      }
+    case "set":
+      {
+        if (value instanceof Set) {
+          const promiseArray = Array.from(value, async innerValue => await toDataValueQueries(innerValue, client, desiredType["set"]));
+          return Promise.all(promiseArray);
+        }
+        break;
+      }
+    case "object":
+      {
+        if (isOsdkBaseObject(value)) {
+          return value.$primaryKey;
+        }
+        break;
+      }
+    case "objectSet":
+      {
+        // object set (the rid as a string (passes through the last return), or the ObjectSet definition directly)
+        if (isWireObjectSet(value)) {
+          return value;
+        }
+        if (isObjectSet(value)) {
+          return getWireObjectSet(value);
+        }
+        break;
+      }
+    case "struct":
+      {
+        if (typeof value === "object") {
+          const structMap = {};
+          for (const [key, structValue] of Object.entries(value)) {
+            structMap[key] = await toDataValueQueries(structValue, client, desiredType["struct"][key]);
+          }
+          return structMap;
+        }
+      }
+    case "boolean":
+    case "date":
+    case "double":
+    case "float":
+    case "integer":
+    case "long":
+    case "string":
+    case "timestamp":
+      return value;
+  }
+  return value;
+}
+//# sourceMappingURL=toDataValueQueries.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"toDataValueQueries.js","names":["OntologiesV2","isAttachmentUpload","getWireObjectSet","isObjectSet","isOsdkBaseObject","isWireObjectSet","toDataValueQueries","value","client","desiredType","Array","isArray","multiplicity","promiseArray","from","innerValue","Promise","all","type","attachment","Attachments","uploadAttachmentV2","filename","name","rid","groups","Set","$primaryKey","structMap","key","structValue","Object","entries"],"sources":["toDataValueQueries.js"],"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 */\nimport * as OntologiesV2 from \"@osdk/internal.foundry.ontologiesv2\";\nimport { isAttachmentUpload } from \"../object/AttachmentUpload.js\";\nimport { getWireObjectSet, isObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { isOsdkBaseObject } from \"./isOsdkBaseObject.js\";\nimport { isWireObjectSet } from \"./WireObjectSet.js\";\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(value, client, desiredType) {\n    if (value == null) {\n        return value;\n    }\n    if (Array.isArray(value) && desiredType.multiplicity) {\n        const promiseArray = Array.from(value, async (innerValue) => await toDataValueQueries(innerValue, client, desiredType));\n        return Promise.all(promiseArray);\n    }\n    switch (desiredType.type) {\n        case \"attachment\": {\n            if (isAttachmentUpload(value)) {\n                const attachment = await OntologiesV2.Attachments.uploadAttachmentV2(client, value, {\n                    filename: value.name,\n                });\n                return attachment.rid;\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        case \"set\": {\n            if (value instanceof Set) {\n                const promiseArray = Array.from(value, async (innerValue) => await toDataValueQueries(innerValue, client, desiredType[\"set\"]));\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        case \"struct\": {\n            if (typeof value === \"object\") {\n                const structMap = {};\n                for (const [key, structValue] of Object.entries(value)) {\n                    structMap[key] = await toDataValueQueries(structValue, client, desiredType[\"struct\"][key]);\n                }\n                return structMap;\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/client",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "description": "",
   "access": "public",
   "license": "Apache-2.0",
@@ -28,15 +28,16 @@
     "tiny-invariant": "^1.3.1",
     "type-fest": "^4.18.2",
     "ws": "^8.18.0",
-    "@osdk/client.api": "2.0.0-beta.13",
-    "@osdk/api": "~2.0.0-beta.13",
-    "@osdk/client.unstable.osw": "0.2.0-beta.0",
-    "@osdk/client.unstable": "2.0.0-beta.13",
-    "@osdk/shared.client": "~1.0.0-beta.1",
-    "@osdk/shared.client.impl": "~1.0.0-beta.1",
-    "@osdk/shared.net.errors": "~2.0.0-beta.0",
-    "@osdk/generator-converters": "~2.0.0-beta.13",
-    "@osdk/shared.net.fetch": "~1.0.0-beta.0"
+    "@osdk/client.unstable": "2.0.0-beta.15",
+    "@osdk/api": "~2.0.0-beta.15",
+    "@osdk/client.unstable.osw": "0.2.0-beta.1",
+    "@osdk/generator-converters": "~2.0.0-beta.15",
+    "@osdk/internal.foundry.ontologiesv2": "~0.2.0-beta.9",
+    "@osdk/shared.client": "^1.0.0-beta.2",
+    "@osdk/shared.client.impl": "~1.0.0-beta.2",
+    "@osdk/internal.foundry.core": "~0.2.0-beta.9",
+    "@osdk/shared.net.errors": "~2.0.0-beta.1",
+    "@osdk/shared.net.fetch": "~1.0.0-beta.1"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "^7.25.3",
@@ -47,7 +48,6 @@
     "jest-extended": "^4.0.2",
     "msw": "^2.3.4",
     "p-defer": "^4.0.1",
-    "p-event": "^6.0.1",
     "p-locate": "^6.0.0",
     "p-map": "^7.0.2",
     "p-state": "^2.0.1",
@@ -56,13 +56,11 @@
     "ts-expect": "^1.3.0",
     "typescript": "^5.5.4",
     "zod": "^3.23.8",
-    "@osdk/client.test.ontology": "~2.0.0-beta.13",
-    "@osdk/internal.foundry": "~0.5.0-beta.8",
-    "@osdk/internal.foundry.core": "~0.2.0-beta.8",
+    "@osdk/client.test.ontology": "~2.0.0-beta.15",
     "@osdk/monorepo.api-extractor": "~0.0.0",
     "@osdk/monorepo.tsconfig": "~0.0.0",
     "@osdk/monorepo.tsup": "~0.0.0",
-    "@osdk/shared.test": "~2.0.0-beta.9"
+    "@osdk/shared.test": "~2.0.0-beta.11"
   },
   "publishConfig": {
     "access": "public"
@@ -98,8 +96,6 @@
     "lint": "eslint . && dprint check  --config $(find-up dprint.json)",
     "test": "vitest run --pool=forks",
     "test:watch": "vitest",
-    "transpile": "monorepo.tool.transpile",
-    "transpileWatch": "tsup --watch",
-    "typecheck": "monorepo.tool.typecheck esm"
+    "transpile": "monorepo.tool.transpile"
   }
 }