@osdk/client 2.1.0-beta.3 → 2.1.0-beta.31

package/build/esm/object/AttachmentUpload.js

@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 export function isAttachmentUpload(o) {
-  return o instanceof Blob && "name" in o;
+  return typeof o === `object` && "name" in o && "data" in o && o.data instanceof Blob;
 }
 export function createAttachmentUpload(data, name) {
-  const attachmentUpload = Object.create(data, {
-    name: {
-      value: name
-    }
-  });
-  return attachmentUpload;
+  return {
+    data,
+    name
+  };
 }
 //# sourceMappingURL=AttachmentUpload.js.map

package/build/esm/object/AttachmentUpload.js.map

@@ -1 +1 @@
-{"version":3,"file":"AttachmentUpload.js","names":["isAttachmentUpload","o","Blob","createAttachmentUpload","data","name","attachmentUpload","Object","create","value"],"sources":["AttachmentUpload.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 */\nexport function isAttachmentUpload(o) {\n    return o instanceof Blob && \"name\" in o;\n}\nexport function createAttachmentUpload(data, name) {\n    const attachmentUpload = Object.create(data, { name: { value: name } });\n    return attachmentUpload;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,kBAAkBA,CAACC,CAAC,EAAE;EAClC,OAAOA,CAAC,YAAYC,IAAI,IAAI,MAAM,IAAID,CAAC;AAC3C;AACA,OAAO,SAASE,sBAAsBA,CAACC,IAAI,EAAEC,IAAI,EAAE;EAC/C,MAAMC,gBAAgB,GAAGC,MAAM,CAACC,MAAM,CAACJ,IAAI,EAAE;IAAEC,IAAI,EAAE;MAAEI,KAAK,EAAEJ;IAAK;EAAE,CAAC,CAAC;EACvE,OAAOC,gBAAgB;AAC3B","ignoreList":[]}
+{"version":3,"file":"AttachmentUpload.js","names":["isAttachmentUpload","o","data","Blob","createAttachmentUpload","name"],"sources":["AttachmentUpload.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 type { AttachmentUpload } from \"@osdk/api\";\n\nexport function isAttachmentUpload(o: any): o is AttachmentUpload {\n  return typeof o === `object` && \"name\" in o && \"data\" in o\n    && o.data instanceof Blob;\n}\n\nexport function createAttachmentUpload(\n  data: Blob,\n  name: string,\n): AttachmentUpload {\n  return { data, name };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,OAAO,SAASA,kBAAkBA,CAACC,CAAM,EAAyB;EAChE,OAAO,OAAOA,CAAC,KAAK,QAAQ,IAAI,MAAM,IAAIA,CAAC,IAAI,MAAM,IAAIA,CAAC,IACrDA,CAAC,CAACC,IAAI,YAAYC,IAAI;AAC7B;AAEA,OAAO,SAASC,sBAAsBA,CACpCF,IAAU,EACVG,IAAY,EACM;EAClB,OAAO;IAAEH,IAAI;IAAEG;EAAK,CAAC;AACvB","ignoreList":[]}

package/build/esm/object/Cache.js

@@ -13,6 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * A simple cache that can be used to store values for a given client.
+ */
+
+/**
+ * @internal
+ * A simple async cache that can be used to store values for a given client.
+ */
+
+/** @internal */
+
+/**
+ * @internal
+ * Create a new cache without a factory function.
+ */
+
+/**
+ * @internal
+ * Create a new cache with a factory function.
+ * @param fn A factory function that will be used to create the value if it does not exist in the cache.
+ */
+
 export function createClientCache(fn) {
   const cache = new WeakMap();
   function set(client, key, value) {
@@ -41,6 +64,9 @@ export function createClientCache(fn) {
     }
   };
 }
+
+/** @internal */
+
 /**
  * @internal
  * Create a new cache with an async factory function.
@@ -61,6 +87,7 @@ export function createAsyncClientCache(fn, createCacheLocal = createClientCache)
       // the `.set` happens first to prevent races.
       try {
         const r = await inProgress.set(client, k, v); // returns v
+
         cache.set(client, k, r);
         inProgress.remove(client, k);
         return r;

package/build/esm/object/Cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cache.js","names":["createClientCache","fn","cache","WeakMap","set","client","key","value","get","clientCacheKey","Map","r","undefined","remove","delete","createAsyncClientCache","createCacheLocal","inProgress","ret","getOrUndefined","k","v","e"],"sources":["Cache.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 */\nexport function createClientCache(fn) {\n    const cache = new WeakMap();\n    function get(client, key) {\n        if (cache.get(client.clientCacheKey) == null) {\n            cache.set(client.clientCacheKey, new Map());\n        }\n        let r = cache.get(client.clientCacheKey).get(key);\n        if (r === undefined && fn !== undefined) {\n            return set(client, key, fn(client, key));\n        }\n        else {\n            return r;\n        }\n    }\n    function set(client, key, value) {\n        if (cache.get(client.clientCacheKey) == null) {\n            cache.set(client.clientCacheKey, new Map());\n        }\n        cache.get(client.clientCacheKey).set(key, value);\n        return value;\n    }\n    function remove(client, key) {\n        if (cache.get(client.clientCacheKey) == null)\n            return false;\n        return cache.get(client.clientCacheKey).delete(key);\n    }\n    return { get, set, remove };\n}\n/**\n * @internal\n * Create a new cache with an async factory function.\n * @param fn A factory function that will be used to create the value if it does not exist in the cache.\n * @returns\n */\nexport function createAsyncClientCache(fn, createCacheLocal = createClientCache) {\n    const cache = createCacheLocal();\n    const inProgress = createCacheLocal();\n    const ret = {\n        getOrUndefined: function getOrUndefined(client, key) {\n            return cache.get(client, key);\n        },\n        get: async function get(client, key) {\n            return cache.get(client, key) ?? inProgress.get(client, key)\n                ?? ret.set(client, key, fn(client, key));\n        },\n        set: async function set(client, k, v) {\n            // the `.set` happens first to prevent races.\n            try {\n                const r = await inProgress.set(client, k, v); // returns v\n                cache.set(client, k, r);\n                inProgress.remove(client, k);\n                return r;\n            }\n            catch (e) {\n                // we don't want to cache failures\n                inProgress.remove(client, k);\n                throw e;\n            }\n        },\n    };\n    return ret;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Cache.js","names":["createClientCache","fn","cache","WeakMap","set","client","key","value","get","clientCacheKey","Map","r","undefined","remove","delete","createAsyncClientCache","createCacheLocal","inProgress","ret","getOrUndefined","k","v","e"],"sources":["Cache.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 { ClientCacheKey, MinimalClient } from \"../MinimalClientContext.js\";\n\n/**\n * A simple cache that can be used to store values for a given client.\n */\ninterface ClientCache<K, V> {\n  get: (client: MinimalClient, key: K) => V;\n  set: <X extends V>(client: MinimalClient, key: K, value: X) => X;\n  remove: (client: MinimalClient, key: K) => boolean;\n}\n\n/**\n * @internal\n * A simple async cache that can be used to store values for a given client.\n */\nexport interface AsyncClientCache<K, V> {\n  getOrUndefined: (client: MinimalClient, key: K) => V | undefined;\n\n  get: (client: MinimalClient, key: K) => Promise<V>;\n\n  /**\n   * @param client the client to key from\n   * @param key the sub-key to use\n   * @param value the value or a promise to the value\n   * @returns a new promise to the resolved value\n   */\n  set: (\n    client: MinimalClient,\n    key: K,\n    value: V | Promise<V>,\n  ) => Promise<V>;\n}\n\n/** @internal */\nexport type Factory<K, V> = (client: MinimalClient, key: K) => V;\n\n/**\n * @internal\n * Create a new cache without a factory function.\n */\nexport function createClientCache<K, V extends {}>(): ClientCache<\n  K,\n  V | undefined\n>;\n/**\n * @internal\n * Create a new cache with a factory function.\n * @param fn A factory function that will be used to create the value if it does not exist in the cache.\n */\nexport function createClientCache<K, V extends {}>(\n  fn: Factory<K, V>,\n): ClientCache<K, V>;\nexport function createClientCache<K, V extends {}>(\n  fn?: Factory<K, V>,\n): typeof fn extends undefined ? ClientCache<K, V | undefined>\n  : ClientCache<K, V>\n{\n  const cache = new WeakMap<\n    ClientCacheKey,\n    typeof fn extends undefined ? Map<K, V | undefined> : Map<K, V>\n  >();\n\n  function get(client: MinimalClient, key: K) {\n    if (cache.get(client.clientCacheKey) == null) {\n      cache.set(client.clientCacheKey, new Map());\n    }\n    let r = cache.get(client.clientCacheKey)!.get(key);\n    if (r === undefined && fn !== undefined) {\n      return set(client, key, fn(client, key));\n    } else {\n      return r;\n    }\n  }\n\n  function set(client: MinimalClient, key: K, value: V) {\n    if (cache.get(client.clientCacheKey) == null) {\n      cache.set(client.clientCacheKey, new Map());\n    }\n\n    cache.get(client.clientCacheKey)!.set(key, value);\n    return value;\n  }\n\n  function remove(client: MinimalClient, key: K) {\n    if (cache.get(client.clientCacheKey) == null) return false;\n    return cache.get(client.clientCacheKey)!.delete(key);\n  }\n\n  return { get, set, remove } as ClientCache<K, V>;\n}\n\n/** @internal */\nexport type AsyncFactory<K, V extends {}> = (\n  client: MinimalClient,\n  key: K,\n) => Promise<V>;\n\n/**\n * @internal\n * Create a new cache with an async factory function.\n * @param fn A factory function that will be used to create the value if it does not exist in the cache.\n * @returns\n */\nexport function createAsyncClientCache<K, V extends {}>(\n  fn: AsyncFactory<K, V>,\n  createCacheLocal: typeof createClientCache = createClientCache,\n): AsyncClientCache<K, V> {\n  const cache = createCacheLocal<K, V>();\n  const inProgress = createCacheLocal<K, Promise<V> | V>();\n\n  const ret = {\n    getOrUndefined: function getOrUndefined(client: MinimalClient, key: K) {\n      return cache.get(client, key);\n    },\n\n    get: async function get(client: MinimalClient, key: K) {\n      return cache.get(client, key) ?? inProgress.get(client, key)\n        ?? ret.set(client, key, fn(client, key));\n    },\n\n    set: async function set(client: MinimalClient, k: K, v: V | Promise<V>) {\n      // the `.set` happens first to prevent races.\n      try {\n        const r = await inProgress.set(client, k, v); // returns v\n\n        cache.set(client, k, r);\n        inProgress.remove(client, k);\n        return r;\n      } catch (e) {\n        // we don't want to cache failures\n        inProgress.remove(client, k);\n        throw e;\n      }\n    },\n  };\n\n  return ret;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/esm/object/Cache.test.js

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as matchers from "jest-extended";
+
 import pDefer from "p-defer";
 import { promiseStateAsync as pStateAsync } from "p-state";
 import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { createAsyncClientCache, createClientCache } from "./Cache.js";
-expect.extend(matchers);
 function createSpys(cache) {
   return {
     get: vi.spyOn(cache, "get"),
@@ -106,6 +105,7 @@ describe("AsyncCache", () => {
             expectedAsyncSets++;
           }
         }
+
         // check before and after make sense so that `expectSaneCalls` can work
         const before = await getStats();
         getPromises.push(asyncCache.get(fauxClient, key));
@@ -125,9 +125,11 @@ describe("AsyncCache", () => {
         expect(pendingFetches).toContain(key);
         expect(successfulFetches).not.toContain(key);
         // </preconditions>
+
         // Update expectations
         pendingFetches.delete(value);
         successfulFetches.add(value);
+
         // check before and after make sense so that `expectSaneCalls` can work
         const before = await getStats();
         factoryDefers[num].resolve(value);
@@ -144,11 +146,12 @@ describe("AsyncCache", () => {
         expect(pendingFetches).toContain(key);
         pendingFetches.delete(key);
         factoryDefers[num].reject(new Error(error));
+
         // we need to ensure the outstanding get promises are rejected
         for (let i = 0; i < asyncCacheSpies.get.mock.calls.length; i++) {
           if (asyncCacheSpies.get.mock.calls[i][1] === key) {
             if (asyncCacheSpies.get.mock.results[i].type === "return") {
-              expect(getPromises[i]).toReject();
+              await expect(getPromises[i]).rejects.toThrowError();
             }
           }
         }
@@ -164,14 +167,18 @@ describe("AsyncCache", () => {
     }
     async function expectSaneCalls() {
       const stats = await getStats();
+
       // both of these should be connected
       expect(factoryFn).toHaveBeenCalledTimes(expectedFactoryCalls);
       expect(inProgress.set).toHaveBeenCalledTimes(expectedFactoryCalls);
       expect(asyncSetSpy).toHaveBeenCalledTimes(expectedAsyncSets);
+
       // inProgress should be removed after a success or failure
       expect(inProgress.remove).toHaveBeenCalledTimes(stats.fulfilledFactoryCalls + stats.rejectedFactoryCalls);
+
       // the inner cache gets checked once per async get
       expect(cache.get).toHaveBeenCalledTimes(stats.asyncCacheGetCalls);
+
       // the inner cache only gets set after a successful factory call
       expect(cache.set).toHaveBeenCalledTimes(successfulFetches.size);
     }

package/build/esm/object/Cache.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cache.test.js","names":["matchers","pDefer","promiseStateAsync","pStateAsync","beforeAll","beforeEach","describe","expect","it","vi","createAsyncClientCache","createClientCache","extend","createSpys","cache","get","spyOn","remove","set","fauxClient","clientCacheKey","fauxClient2","client","key","Promise","resolve","toEqual","mock","fn","setTimeout","all","toHaveBeenCalledTimes","factoryFn","inProgress","asyncCache","asyncCacheSpies","asyncSetSpy","factoryDefers","getPromises","expectedAsyncSets","expectedFactoryCalls","successfulFetches","pendingFetches","expectedPending","mockImplementation","defer","push","promise","Set","createSyncCacheMock","mockReturnValueOnce","getOrUndefined","expectSaneCalls","initiateAsyncCacheGetFor","has","add","before","getStats","toStrictEqual","asyncCacheGetCalls","resolveFactoryCall","num","value","toBe","calls","toContain","not","delete","fulfilledFactoryCalls","rejectFactoryCall","error","reject","Error","i","length","results","type","toReject","map","d","filter","a","rejectedFactoryCalls","stats","size","itRejectsAllRequestsOf","settledResults","toMatchObject","itDoesNotRejectLastRequestRightAway","at","describeRejectsFactoryCall","describeResolvesFactoryCall","describeAsyncCacheGetFor","itFulfillsAsyncCacheGets","indexes","join","itLeavesAsyncGetPromisesInStates","states","p","itHasOnlyInvokedFactoryNTimes","n","itReturnsForAsyncGet","toHaveBeenCalled","undefined"],"sources":["Cache.test.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 matchers from \"jest-extended\";\nimport pDefer from \"p-defer\";\nimport { promiseStateAsync as pStateAsync } from \"p-state\";\nimport { beforeAll, beforeEach, describe, expect, it, vi } from \"vitest\";\nimport { createAsyncClientCache, createClientCache } from \"./Cache.js\";\nexpect.extend(matchers);\nfunction createSpys(cache) {\n    return {\n        get: vi.spyOn(cache, \"get\"),\n        remove: vi.spyOn(cache, \"remove\"),\n        set: vi.spyOn(cache, \"set\"),\n    };\n}\ndescribe(\"AsyncCache\", () => {\n    beforeAll(() => {\n    });\n    const fauxClient = { clientCacheKey: {} };\n    const fauxClient2 = { clientCacheKey: {} };\n    it(\"keeps clients separate\", async () => {\n        const cache = createAsyncClientCache((client, key) => Promise.resolve(key));\n        await cache.set(fauxClient, \"k\", \"v\");\n        expect(await cache.get(fauxClient2, \"k\")).toEqual(\"k\");\n    });\n    it(\"has a client and its copy access the same cache\", async () => {\n        const cache = createAsyncClientCache((client, key) => Promise.resolve(key));\n        await cache.set(fauxClient, \"k\", \"v\");\n        expect(await cache.get({ ...fauxClient }, \"k\")).toEqual(\"v\");\n    });\n    it(\"does not double factory\", async () => {\n        const resolveToKey = (client, key) => new Promise((resolve, reject) => {\n            setTimeout(() => resolve(key), 100);\n        });\n        const mock = vi.fn(resolveToKey);\n        const cache = createAsyncClientCache(mock);\n        await Promise.all([\n            cache.get(fauxClient, \"a\"),\n            cache.get(fauxClient, \"a\"),\n            cache.get(fauxClient, \"a\"),\n            cache.get(fauxClient, \"b\"),\n            cache.get(fauxClient, \"b\"),\n            cache.get(fauxClient, \"b\"),\n            cache.get(fauxClient, \"b\"),\n        ]);\n        expect(mock).toHaveBeenCalledTimes(2);\n    });\n    describe(\"race checks\", () => {\n        let factoryFn;\n        let cache;\n        let inProgress;\n        let asyncCache;\n        let asyncCacheSpies;\n        let asyncSetSpy;\n        let factoryDefers;\n        let getPromises;\n        let expectedAsyncSets;\n        let expectedFactoryCalls;\n        let successfulFetches;\n        let pendingFetches;\n        let expectedPending = {};\n        beforeEach(async () => {\n            factoryFn = vi.fn();\n            factoryFn.mockImplementation(() => {\n                const defer = pDefer();\n                factoryDefers.push(defer);\n                return defer.promise;\n            });\n            getPromises = [];\n            factoryDefers = [];\n            expectedAsyncSets = 0;\n            expectedFactoryCalls = 0;\n            successfulFetches = new Set();\n            pendingFetches = new Set();\n            expectedPending = {};\n            const createSyncCacheMock = vi.fn();\n            cache = createSpys(createClientCache());\n            inProgress = createSpys(createClientCache());\n            createSyncCacheMock.mockReturnValueOnce(cache);\n            createSyncCacheMock.mockReturnValueOnce(inProgress);\n            asyncCache = createAsyncClientCache(factoryFn, createSyncCacheMock);\n            asyncSetSpy = vi.spyOn(asyncCache, \"set\");\n            asyncCacheSpies = {\n                get: vi.spyOn(asyncCache, \"get\"),\n                set: vi.spyOn(asyncCache, \"set\"),\n                getOrUndefined: vi.spyOn(asyncCache, \"getOrUndefined\"),\n            };\n            await expectSaneCalls();\n        });\n        function initiateAsyncCacheGetFor(key) {\n            return async () => {\n                if (!successfulFetches.has(key)) {\n                    expectedPending[key] = (expectedPending[key] ?? 0) + 1;\n                    if (!pendingFetches.has(key)) {\n                        pendingFetches.add(key);\n                        expectedFactoryCalls++;\n                        expectedAsyncSets++;\n                    }\n                }\n                // check before and after make sense so that `expectSaneCalls` can work\n                const before = await getStats();\n                getPromises.push(asyncCache.get(fauxClient, key));\n                expect(await getStats()).toStrictEqual({\n                    ...before,\n                    asyncCacheGetCalls: before.asyncCacheGetCalls + 1,\n                    // may or may not bump the unique keys\n                });\n                await expectSaneCalls();\n            };\n        }\n        function resolveFactoryCall(num, key, value = `${key}Result`) {\n            return async () => {\n                // <preconditions>\n                expect(await pStateAsync(factoryDefers[num].promise)).toBe(\"pending\");\n                expect(factoryFn.mock.calls[num][1]).toBe(key);\n                expect(pendingFetches).toContain(key);\n                expect(successfulFetches).not.toContain(key);\n                // </preconditions>\n                // Update expectations\n                pendingFetches.delete(value);\n                successfulFetches.add(value);\n                // check before and after make sense so that `expectSaneCalls` can work\n                const before = await getStats();\n                factoryDefers[num].resolve(value);\n                expect(await getStats()).toStrictEqual({\n                    ...before,\n                    fulfilledFactoryCalls: before.fulfilledFactoryCalls + 1,\n                });\n                await expectSaneCalls();\n            };\n        }\n        function rejectFactoryCall(num, key, error = `${key}Error`) {\n            return async () => {\n                expect(factoryFn.mock.calls[num][1]).toBe(key);\n                expect(pendingFetches).toContain(key);\n                pendingFetches.delete(key);\n                factoryDefers[num].reject(new Error(error));\n                // we need to ensure the outstanding get promises are rejected\n                for (let i = 0; i < asyncCacheSpies.get.mock.calls.length; i++) {\n                    if (asyncCacheSpies.get.mock.calls[i][1] === key) {\n                        if (asyncCacheSpies.get.mock.results[i].type === \"return\") {\n                            expect(getPromises[i]).toReject();\n                        }\n                    }\n                }\n                await expectSaneCalls();\n            };\n        }\n        async function getStats() {\n            return {\n                fulfilledFactoryCalls: (await Promise.all(factoryDefers.map(d => pStateAsync(d.promise)))).filter(a => a === \"fulfilled\").length,\n                rejectedFactoryCalls: (await Promise.all(factoryDefers.map(d => pStateAsync(d.promise)))).filter(a => a === \"rejected\").length,\n                asyncCacheGetCalls: asyncCacheSpies.get.mock.calls.length,\n            };\n        }\n        async function expectSaneCalls() {\n            const stats = await getStats();\n            // both of these should be connected\n            expect(factoryFn).toHaveBeenCalledTimes(expectedFactoryCalls);\n            expect(inProgress.set).toHaveBeenCalledTimes(expectedFactoryCalls);\n            expect(asyncSetSpy).toHaveBeenCalledTimes(expectedAsyncSets);\n            // inProgress should be removed after a success or failure\n            expect(inProgress.remove).toHaveBeenCalledTimes(stats.fulfilledFactoryCalls + stats.rejectedFactoryCalls);\n            // the inner cache gets checked once per async get\n            expect(cache.get).toHaveBeenCalledTimes(stats.asyncCacheGetCalls);\n            // the inner cache only gets set after a successful factory call\n            expect(cache.set).toHaveBeenCalledTimes(successfulFetches.size);\n        }\n        function itRejectsAllRequestsOf(key) {\n            it(`rejects all ${key} requests`, () => {\n                for (let i = 0; i < asyncCacheSpies.get.mock.calls.length; i++) {\n                    if (asyncCacheSpies.get.mock.calls[i][1] === key) {\n                        expect(asyncCacheSpies.get.mock.settledResults[i].type).toBe(\"rejected\");\n                        expect(asyncCacheSpies.get.mock.settledResults[i].value)\n                            .toMatchObject(new Error(\"aError\"));\n                    }\n                }\n            });\n        }\n        function itDoesNotRejectLastRequestRightAway() {\n            it(\"does not reject right away\", () => {\n                expect(asyncCacheSpies.get.mock.results.at(-1)?.type).toBe(\"return\");\n            });\n        }\n        function describeRejectsFactoryCall(num, key, fn) {\n            return describe(`rejects factory request ${num} for ${key}`, () => {\n                beforeEach(rejectFactoryCall(num, key));\n                itRejectsAllRequestsOf(\"a\");\n                fn();\n            });\n        }\n        function describeResolvesFactoryCall(num, key, fn) {\n            return describe(`resolves factory request ${num} for ${key}`, () => {\n                beforeEach(resolveFactoryCall(num, key));\n                fn();\n            });\n        }\n        function describeAsyncCacheGetFor(key, fn) {\n            return describe(`gets a request for '${key}'`, () => {\n                beforeEach(initiateAsyncCacheGetFor(key));\n                itDoesNotRejectLastRequestRightAway();\n                fn();\n            });\n        }\n        function itFulfillsAsyncCacheGets(indexes, value) {\n            it(`fulfills the AsyncCache.get()'s ${indexes.join(\", \")} with '${value}'`, async () => {\n                for (const i of indexes) {\n                    expect(await pStateAsync(getPromises[i])).toBe(\"fulfilled\");\n                    expect(await getPromises[i]).toBe(value);\n                }\n            });\n        }\n        function itLeavesAsyncGetPromisesInStates(states) {\n            it(`leaves the AsyncCache.get()'s in states [${states.join(\", \")}]`, async () => {\n                expect(await Promise.all(getPromises.map(p => pStateAsync(p))))\n                    .toStrictEqual(states);\n                for (let i = 0; i < states.length; i++) {\n                    expect(await pStateAsync(getPromises[i])).toBe(states[i]);\n                }\n            });\n        }\n        function itHasOnlyInvokedFactoryNTimes(n) {\n            it(`has only invoked the factory ${n} times`, () => {\n                expect(factoryFn).toHaveBeenCalledTimes(n);\n            });\n        }\n        function itReturnsForAsyncGet(results) {\n            it(\"returns for async get\", () => {\n                expect(asyncCacheSpies.get.mock.settledResults.map(a => a.value))\n                    .toEqual(results);\n            });\n        }\n        it(\"has a minimal base state\", () => {\n            expect(cache.get).not.toHaveBeenCalled();\n            expect(inProgress.get).not.toHaveBeenCalled();\n            expect(factoryFn).not.toHaveBeenCalled();\n            expect(inProgress.set).not.toHaveBeenCalled();\n        });\n        describeAsyncCacheGetFor(\"a\", () => {\n            itLeavesAsyncGetPromisesInStates([\"pending\"]);\n            itHasOnlyInvokedFactoryNTimes(1);\n            describeAsyncCacheGetFor(\"a\", () => {\n                itLeavesAsyncGetPromisesInStates([\"pending\", \"pending\"]);\n                itHasOnlyInvokedFactoryNTimes(1);\n                describe(\"before the first resolves\", () => {\n                    itLeavesAsyncGetPromisesInStates([\"pending\", \"pending\"]);\n                    itHasOnlyInvokedFactoryNTimes(1);\n                    describeRejectsFactoryCall(0, \"a\", () => {\n                        itLeavesAsyncGetPromisesInStates([\"rejected\", \"rejected\"]);\n                        describeAsyncCacheGetFor(\"a\", () => {\n                            itDoesNotRejectLastRequestRightAway();\n                            itHasOnlyInvokedFactoryNTimes(2);\n                        });\n                    });\n                    describeAsyncCacheGetFor(\"b\", () => {\n                        itLeavesAsyncGetPromisesInStates([\"pending\", \"pending\", \"pending\"]);\n                        itHasOnlyInvokedFactoryNTimes(2);\n                        describeResolvesFactoryCall(1, \"b\", () => {\n                            itLeavesAsyncGetPromisesInStates([\n                                \"pending\",\n                                \"pending\",\n                                \"fulfilled\",\n                            ]);\n                            itReturnsForAsyncGet([\n                                undefined,\n                                undefined,\n                                \"bResult\",\n                            ]);\n                        });\n                    });\n                    describeResolvesFactoryCall(0, \"a\", () => {\n                        itFulfillsAsyncCacheGets([0, 1], \"aResult\");\n                        itLeavesAsyncGetPromisesInStates([\n                            \"fulfilled\",\n                            \"fulfilled\",\n                        ]);\n                        describeAsyncCacheGetFor(\"a\", () => {\n                            itHasOnlyInvokedFactoryNTimes(1);\n                            itLeavesAsyncGetPromisesInStates([\n                                \"fulfilled\",\n                                \"fulfilled\",\n                                \"fulfilled\",\n                            ]);\n                            itReturnsForAsyncGet([\n                                \"aResult\",\n                                \"aResult\",\n                                \"aResult\",\n                            ]);\n                        });\n                    });\n                });\n            });\n        });\n    });\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Cache.test.js","names":["pDefer","promiseStateAsync","pStateAsync","beforeAll","beforeEach","describe","expect","it","vi","createAsyncClientCache","createClientCache","createSpys","cache","get","spyOn","remove","set","fauxClient","clientCacheKey","fauxClient2","client","key","Promise","resolve","toEqual","mock","fn","setTimeout","all","toHaveBeenCalledTimes","factoryFn","inProgress","asyncCache","asyncCacheSpies","asyncSetSpy","factoryDefers","getPromises","expectedAsyncSets","expectedFactoryCalls","successfulFetches","pendingFetches","expectedPending","mockImplementation","defer","push","promise","Set","createSyncCacheMock","mockReturnValueOnce","getOrUndefined","expectSaneCalls","initiateAsyncCacheGetFor","has","add","before","getStats","toStrictEqual","asyncCacheGetCalls","resolveFactoryCall","num","value","toBe","calls","toContain","not","delete","fulfilledFactoryCalls","rejectFactoryCall","error","reject","Error","i","length","results","type","rejects","toThrowError","map","d","filter","a","rejectedFactoryCalls","stats","size","itRejectsAllRequestsOf","settledResults","toMatchObject","itDoesNotRejectLastRequestRightAway","at","describeRejectsFactoryCall","describeResolvesFactoryCall","describeAsyncCacheGetFor","itFulfillsAsyncCacheGets","indexes","join","itLeavesAsyncGetPromisesInStates","states","p","itHasOnlyInvokedFactoryNTimes","n","itReturnsForAsyncGet","toHaveBeenCalled","undefined"],"sources":["Cache.test.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 { DeferredPromise } from \"p-defer\";\nimport pDefer from \"p-defer\";\nimport type { PromiseState } from \"p-state\";\nimport { promiseStateAsync as pStateAsync } from \"p-state\";\nimport type { Mock, MockInstance } from \"vitest\";\nimport { beforeAll, beforeEach, describe, expect, it, vi } from \"vitest\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport type { AsyncClientCache, AsyncFactory } from \"./Cache.js\";\nimport { createAsyncClientCache, createClientCache } from \"./Cache.js\";\n\nfunction createSpys(cache: ReturnType<typeof createClientCache>) {\n  return {\n    get: vi.spyOn(cache, \"get\"),\n    remove: vi.spyOn(cache, \"remove\"),\n    set: vi.spyOn(cache, \"set\"),\n  };\n}\n\ndescribe(\"AsyncCache\", () => {\n  beforeAll(() => {\n  });\n  const fauxClient = { clientCacheKey: {} } as MinimalClient;\n  const fauxClient2 = { clientCacheKey: {} } as MinimalClient;\n\n  it(\"keeps clients separate\", async () => {\n    const cache = createAsyncClientCache((client: MinimalClient, key: string) =>\n      Promise.resolve(key)\n    );\n    await cache.set(fauxClient, \"k\", \"v\");\n    expect(await cache.get(fauxClient2, \"k\")).toEqual(\"k\");\n  });\n\n  it(\"has a client and its copy access the same cache\", async () => {\n    const cache = createAsyncClientCache((client: MinimalClient, key: string) =>\n      Promise.resolve(key)\n    );\n    await cache.set(fauxClient, \"k\", \"v\");\n    expect(await cache.get({ ...fauxClient }, \"k\")).toEqual(\"v\");\n  });\n\n  it(\"does not double factory\", async () => {\n    const resolveToKey = (client: MinimalClient, key: string) =>\n      new Promise<string>((resolve, reject) => {\n        setTimeout(() => resolve(key), 100);\n      });\n\n    const mock = vi.fn(resolveToKey);\n    const cache = createAsyncClientCache(mock);\n\n    await Promise.all([\n      cache.get(fauxClient, \"a\"),\n      cache.get(fauxClient, \"a\"),\n      cache.get(fauxClient, \"a\"),\n      cache.get(fauxClient, \"b\"),\n      cache.get(fauxClient, \"b\"),\n      cache.get(fauxClient, \"b\"),\n      cache.get(fauxClient, \"b\"),\n    ]);\n\n    expect(mock).toHaveBeenCalledTimes(2);\n  });\n\n  describe(\"race checks\", () => {\n    let factoryFn: Mock<AsyncFactory<any, any>>;\n    let cache: ReturnType<typeof createSpys>;\n    let inProgress: ReturnType<typeof createSpys>;\n    let asyncCache: AsyncClientCache<string, string>;\n    let asyncCacheSpies: {\n      [K in keyof typeof asyncCache]: MockInstance<typeof asyncCache[K]>;\n    };\n    let asyncSetSpy: MockInstance<typeof asyncCache.set>;\n    let factoryDefers: DeferredPromise<string>[];\n    let getPromises: Promise<string>[];\n\n    let expectedAsyncSets: number;\n    let expectedFactoryCalls: number;\n\n    let successfulFetches: Set<string>;\n    let pendingFetches: Set<string>;\n    let expectedPending: Record<string, number> = {};\n\n    beforeEach(async () => {\n      factoryFn = vi.fn();\n      factoryFn.mockImplementation(() => {\n        const defer = pDefer<string>();\n        factoryDefers.push(defer);\n        return defer.promise;\n      });\n\n      getPromises = [];\n      factoryDefers = [];\n\n      expectedAsyncSets = 0;\n      expectedFactoryCalls = 0;\n\n      successfulFetches = new Set();\n      pendingFetches = new Set();\n      expectedPending = {};\n\n      const createSyncCacheMock = vi.fn();\n\n      cache = createSpys(createClientCache() as any);\n      inProgress = createSpys(createClientCache() as any);\n      createSyncCacheMock.mockReturnValueOnce(cache);\n      createSyncCacheMock.mockReturnValueOnce(inProgress);\n\n      asyncCache = createAsyncClientCache<string, string>(\n        factoryFn,\n        createSyncCacheMock as any,\n      );\n\n      asyncSetSpy = vi.spyOn(asyncCache, \"set\");\n      asyncCacheSpies = {\n        get: vi.spyOn(asyncCache, \"get\"),\n        set: vi.spyOn(asyncCache, \"set\"),\n        getOrUndefined: vi.spyOn(asyncCache, \"getOrUndefined\"),\n      };\n\n      await expectSaneCalls();\n    });\n\n    function initiateAsyncCacheGetFor(key: string) {\n      return async () => {\n        if (!successfulFetches.has(key)) {\n          expectedPending[key] = (expectedPending[key] ?? 0) + 1;\n          if (!pendingFetches.has(key)) {\n            pendingFetches.add(key);\n            expectedFactoryCalls++;\n            expectedAsyncSets++;\n          }\n        }\n\n        // check before and after make sense so that `expectSaneCalls` can work\n        const before = await getStats();\n        getPromises.push(asyncCache.get(fauxClient, key));\n        expect(await getStats()).toStrictEqual({\n          ...before,\n          asyncCacheGetCalls: before.asyncCacheGetCalls + 1,\n          // may or may not bump the unique keys\n        });\n\n        await expectSaneCalls();\n      };\n    }\n\n    function resolveFactoryCall(\n      num: number,\n      key: string,\n      value = `${key}Result`,\n    ) {\n      return async () => {\n        // <preconditions>\n        expect(await pStateAsync(factoryDefers[num].promise)).toBe(\n          \"pending\",\n        );\n        expect(factoryFn.mock.calls[num][1]).toBe(key);\n        expect(pendingFetches).toContain(key);\n        expect(successfulFetches).not.toContain(key);\n        // </preconditions>\n\n        // Update expectations\n        pendingFetches.delete(value);\n        successfulFetches.add(value);\n\n        // check before and after make sense so that `expectSaneCalls` can work\n        const before = await getStats();\n        factoryDefers[num].resolve(value);\n        expect(await getStats()).toStrictEqual({\n          ...before,\n          fulfilledFactoryCalls: before.fulfilledFactoryCalls + 1,\n        });\n\n        await expectSaneCalls();\n      };\n    }\n\n    function rejectFactoryCall(\n      num: number,\n      key: string,\n      error = `${key}Error`,\n    ) {\n      return async () => {\n        expect(factoryFn.mock.calls[num][1]).toBe(key);\n        expect(pendingFetches).toContain(key);\n\n        pendingFetches.delete(key);\n        factoryDefers[num].reject(new Error(error));\n\n        // we need to ensure the outstanding get promises are rejected\n        for (let i = 0; i < asyncCacheSpies.get.mock.calls.length; i++) {\n          if (asyncCacheSpies.get.mock.calls[i][1] === key) {\n            if (asyncCacheSpies.get.mock.results[i].type === \"return\") {\n              await expect(getPromises[i]).rejects.toThrowError();\n            }\n          }\n        }\n\n        await expectSaneCalls();\n      };\n    }\n\n    async function getStats() {\n      return {\n        fulfilledFactoryCalls: (await Promise.all(\n          factoryDefers.map(d => pStateAsync(d.promise)),\n        )).filter(a => a === \"fulfilled\").length,\n        rejectedFactoryCalls: (await Promise.all(\n          factoryDefers.map(d => pStateAsync(d.promise)),\n        )).filter(a => a === \"rejected\").length,\n        asyncCacheGetCalls: asyncCacheSpies.get.mock.calls.length,\n      };\n    }\n\n    async function expectSaneCalls() {\n      const stats = await getStats();\n\n      // both of these should be connected\n      expect(factoryFn).toHaveBeenCalledTimes(expectedFactoryCalls);\n      expect(inProgress.set).toHaveBeenCalledTimes(expectedFactoryCalls);\n\n      expect(asyncSetSpy).toHaveBeenCalledTimes(expectedAsyncSets);\n\n      // inProgress should be removed after a success or failure\n      expect(inProgress.remove).toHaveBeenCalledTimes(\n        stats.fulfilledFactoryCalls + stats.rejectedFactoryCalls,\n      );\n\n      // the inner cache gets checked once per async get\n      expect(cache.get).toHaveBeenCalledTimes(stats.asyncCacheGetCalls);\n\n      // the inner cache only gets set after a successful factory call\n      expect(cache.set).toHaveBeenCalledTimes(successfulFetches.size);\n    }\n\n    function itRejectsAllRequestsOf(key: string) {\n      it(`rejects all ${key} requests`, () => {\n        for (\n          let i = 0;\n          i < asyncCacheSpies.get.mock.calls.length;\n          i++\n        ) {\n          if (asyncCacheSpies.get.mock.calls[i][1] === key) {\n            expect(asyncCacheSpies.get.mock.settledResults[i].type).toBe(\n              \"rejected\",\n            );\n            expect(asyncCacheSpies.get.mock.settledResults[i].value)\n              .toMatchObject(new Error(\"aError\"));\n          }\n        }\n      });\n    }\n\n    function itDoesNotRejectLastRequestRightAway() {\n      it(\"does not reject right away\", () => {\n        expect(asyncCacheSpies.get.mock.results.at(-1)?.type).toBe(\n          \"return\",\n        );\n      });\n    }\n\n    function describeRejectsFactoryCall(\n      num: number,\n      key: string,\n      fn: () => void,\n    ) {\n      return describe(`rejects factory request ${num} for ${key}`, () => {\n        beforeEach(rejectFactoryCall(num, key));\n        itRejectsAllRequestsOf(\"a\");\n\n        fn();\n      });\n    }\n\n    function describeResolvesFactoryCall(\n      num: number,\n      key: string,\n      fn: () => void,\n    ) {\n      return describe(`resolves factory request ${num} for ${key}`, () => {\n        beforeEach(resolveFactoryCall(num, key));\n        fn();\n      });\n    }\n\n    function describeAsyncCacheGetFor(key: string, fn: () => void) {\n      return describe(`gets a request for '${key}'`, () => {\n        beforeEach(initiateAsyncCacheGetFor(key));\n        itDoesNotRejectLastRequestRightAway();\n\n        fn();\n      });\n    }\n\n    function itFulfillsAsyncCacheGets(indexes: number[], value: string) {\n      it(`fulfills the AsyncCache.get()'s ${indexes.join(\", \")} with '${value}'`, async () => {\n        for (const i of indexes) {\n          expect(await pStateAsync(getPromises[i])).toBe(\"fulfilled\");\n          expect(await getPromises[i]).toBe(value);\n        }\n      });\n    }\n\n    function itLeavesAsyncGetPromisesInStates(states: PromiseState[]) {\n      it(`leaves the AsyncCache.get()'s in states [${states.join(\", \")}]`, async () => {\n        expect(await Promise.all(getPromises.map(p => pStateAsync(p))))\n          .toStrictEqual(states);\n        for (let i = 0; i < states.length; i++) {\n          expect(await pStateAsync(getPromises[i])).toBe(states[i]);\n        }\n      });\n    }\n\n    function itHasOnlyInvokedFactoryNTimes(n: number) {\n      it(`has only invoked the factory ${n} times`, () => {\n        expect(factoryFn).toHaveBeenCalledTimes(n);\n      });\n    }\n\n    function itReturnsForAsyncGet(results: any[]) {\n      it(\"returns for async get\", () => {\n        expect(asyncCacheSpies.get.mock.settledResults.map(a => a.value))\n          .toEqual(results);\n      });\n    }\n\n    it(\"has a minimal base state\", () => {\n      expect(cache.get).not.toHaveBeenCalled();\n      expect(inProgress.get).not.toHaveBeenCalled();\n      expect(factoryFn).not.toHaveBeenCalled();\n      expect(inProgress.set).not.toHaveBeenCalled();\n    });\n\n    describeAsyncCacheGetFor(\"a\", () => {\n      itLeavesAsyncGetPromisesInStates([\"pending\"]);\n      itHasOnlyInvokedFactoryNTimes(1);\n\n      describeAsyncCacheGetFor(\"a\", () => {\n        itLeavesAsyncGetPromisesInStates([\"pending\", \"pending\"]);\n        itHasOnlyInvokedFactoryNTimes(1);\n\n        describe(\"before the first resolves\", () => {\n          itLeavesAsyncGetPromisesInStates([\"pending\", \"pending\"]);\n          itHasOnlyInvokedFactoryNTimes(1);\n\n          describeRejectsFactoryCall(0, \"a\", () => {\n            itLeavesAsyncGetPromisesInStates([\"rejected\", \"rejected\"]);\n            describeAsyncCacheGetFor(\"a\", () => {\n              itDoesNotRejectLastRequestRightAway();\n              itHasOnlyInvokedFactoryNTimes(2);\n            });\n          });\n\n          describeAsyncCacheGetFor(\"b\", () => {\n            itLeavesAsyncGetPromisesInStates([\"pending\", \"pending\", \"pending\"]);\n            itHasOnlyInvokedFactoryNTimes(2);\n\n            describeResolvesFactoryCall(1, \"b\", () => {\n              itLeavesAsyncGetPromisesInStates([\n                \"pending\",\n                \"pending\",\n                \"fulfilled\",\n              ]);\n\n              itReturnsForAsyncGet([\n                undefined,\n                undefined,\n                \"bResult\",\n              ]);\n            });\n          });\n\n          describeResolvesFactoryCall(0, \"a\", () => {\n            itFulfillsAsyncCacheGets([0, 1], \"aResult\");\n            itLeavesAsyncGetPromisesInStates([\n              \"fulfilled\",\n              \"fulfilled\",\n            ]);\n\n            describeAsyncCacheGetFor(\"a\", () => {\n              itHasOnlyInvokedFactoryNTimes(1);\n              itLeavesAsyncGetPromisesInStates([\n                \"fulfilled\",\n                \"fulfilled\",\n                \"fulfilled\",\n              ]);\n              itReturnsForAsyncGet([\n                \"aResult\",\n                \"aResult\",\n                \"aResult\",\n              ]);\n            });\n          });\n        });\n      });\n    });\n  });\n});\n"],"mappings":"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","ignoreList":[]}

package/build/esm/object/SimpleCache.js

@@ -13,6 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * A simple cache that can be used to store values for a given client.
+ */
+
+/**
+ * Create a new cache with a factory function.
+ * @param fn A factory function that will be used to create the value if it does not exist in the cache.
+ */
+
+/**
+ * Create a new cache without a factory function.
+ */
+
 export function createSimpleCache(map = new Map(), fn) {
   function set(key, value) {
     map.set(key, value);
@@ -33,11 +47,16 @@ export function createSimpleCache(map = new Map(), fn) {
     }
   };
 }
+/**
+ * A simple async cache that can be used to store values for a given client.
+ */
+
 /**
  * Create a new cache with an async factory function.
  * @param fn A factory function that will be used to create the value if it does not exist in the cache.
  * @returns
  */
+
 export function createSimpleAsyncCache(type, fn, createCacheLocal = createSimpleCache) {
   const cache = createCacheLocal(type === "weak" ? new WeakMap() : new Map());
   const inProgress = createCacheLocal(type === "weak" ? new WeakMap() : new Map());
@@ -52,6 +71,7 @@ export function createSimpleAsyncCache(type, fn, createCacheLocal = createSimple
       // the `.set` happens first to prevent races.
       try {
         const r = await inProgress.set(k, v); // returns v
+
         cache.set(k, r);
         inProgress.remove(k);
         return r;

package/build/esm/object/SimpleCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleCache.js","names":["createSimpleCache","map","Map","fn","set","key","value","get","r","undefined","remove","delete","createSimpleAsyncCache","type","createCacheLocal","cache","WeakMap","inProgress","ret","getOrUndefined","k","v","e"],"sources":["SimpleCache.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 */\nexport function createSimpleCache(map = new Map(), fn) {\n    function get(key) {\n        let r = map.get(key);\n        if (r === undefined && fn !== undefined) {\n            return set(key, fn(key));\n        }\n        else {\n            return r;\n        }\n    }\n    function set(key, value) {\n        map.set(key, value);\n        return value;\n    }\n    function remove(key) {\n        return map.delete(key);\n    }\n    return { get, set, remove };\n}\n/**\n * Create a new cache with an async factory function.\n * @param fn A factory function that will be used to create the value if it does not exist in the cache.\n * @returns\n */\nexport function createSimpleAsyncCache(type, fn, createCacheLocal = createSimpleCache) {\n    const cache = createCacheLocal((type === \"weak\" ? new WeakMap() : new Map()));\n    const inProgress = createCacheLocal((type === \"weak\" ? new WeakMap() : new Map()));\n    const ret = {\n        getOrUndefined: function getOrUndefined(key) {\n            return cache.get(key);\n        },\n        get: async function get(key) {\n            return cache.get(key) ?? inProgress.get(key)\n                ?? ret.set(key, fn(key));\n        },\n        set: async function set(k, v) {\n            // the `.set` happens first to prevent races.\n            try {\n                const r = await inProgress.set(k, v); // returns v\n                cache.set(k, r);\n                inProgress.remove(k);\n                return r;\n            }\n            catch (e) {\n                // we don't want to cache failures\n                inProgress.remove(k);\n                throw e;\n            }\n        },\n    };\n    return ret;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,iBAAiBA,CAACC,GAAG,GAAG,IAAIC,GAAG,CAAC,CAAC,EAAEC,EAAE,EAAE;EAUnD,SAASC,GAAGA,CAACC,GAAG,EAAEC,KAAK,EAAE;IACrBL,GAAG,CAACG,GAAG,CAACC,GAAG,EAAEC,KAAK,CAAC;IACnB,OAAOA,KAAK;EAChB;EAIA,OAAO;IAAEC,GAAG,EAhBZ,SAAAA,CAAaF,GAAG,EAAE;MACd,IAAIG,CAAC,GAAGP,GAAG,CAACM,GAAG,CAACF,GAAG,CAAC;MACpB,IAAIG,CAAC,KAAKC,SAAS,IAAIN,EAAE,KAAKM,SAAS,EAAE;QACrC,OAAOL,GAAG,CAACC,GAAG,EAAEF,EAAE,CAACE,GAAG,CAAC,CAAC;MAC5B,CAAC,MACI;QACD,OAAOG,CAAC;MACZ;IACJ,CAQY;IAAEJ,GAAG;IAAEM,MAAM,EAHzB,SAAAA,CAAgBL,GAAG,EAAE;MACjB,OAAOJ,GAAG,CAACU,MAAM,CAACN,GAAG,CAAC;IAC1B;EAC0B,CAAC;AAC/B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASO,sBAAsBA,CAACC,IAAI,EAAEV,EAAE,EAAEW,gBAAgB,GAAGd,iBAAiB,EAAE;EACnF,MAAMe,KAAK,GAAGD,gBAAgB,CAAED,IAAI,KAAK,MAAM,GAAG,IAAIG,OAAO,CAAC,CAAC,GAAG,IAAId,GAAG,CAAC,CAAE,CAAC;EAC7E,MAAMe,UAAU,GAAGH,gBAAgB,CAAED,IAAI,KAAK,MAAM,GAAG,IAAIG,OAAO,CAAC,CAAC,GAAG,IAAId,GAAG,CAAC,CAAE,CAAC;EAClF,MAAMgB,GAAG,GAAG;IACRC,cAAc,EAAE,SAAAA,CAAwBd,GAAG,EAAE;MACzC,OAAOU,KAAK,CAACR,GAAG,CAACF,GAAG,CAAC;IACzB,CAAC;IACDE,GAAG,EAAE,eAAAA,CAAmBF,GAAG,EAAE;MACzB,OAAOU,KAAK,CAACR,GAAG,CAACF,GAAG,CAAC,IAAIY,UAAU,CAACV,GAAG,CAACF,GAAG,CAAC,IACrCa,GAAG,CAACd,GAAG,CAACC,GAAG,EAAEF,EAAE,CAACE,GAAG,CAAC,CAAC;IAChC,CAAC;IACDD,GAAG,EAAE,eAAAA,CAAmBgB,CAAC,EAAEC,CAAC,EAAE;MAC1B;MACA,IAAI;QACA,MAAMb,CAAC,GAAG,MAAMS,UAAU,CAACb,GAAG,CAACgB,CAAC,EAAEC,CAAC,CAAC,CAAC,CAAC;QACtCN,KAAK,CAACX,GAAG,CAACgB,CAAC,EAAEZ,CAAC,CAAC;QACfS,UAAU,CAACP,MAAM,CAACU,CAAC,CAAC;QACpB,OAAOZ,CAAC;MACZ,CAAC,CACD,OAAOc,CAAC,EAAE;QACN;QACAL,UAAU,CAACP,MAAM,CAACU,CAAC,CAAC;QACpB,MAAME,CAAC;MACX;IACJ;EACJ,CAAC;EACD,OAAOJ,GAAG;AACd","ignoreList":[]}
+{"version":3,"file":"SimpleCache.js","names":["createSimpleCache","map","Map","fn","set","key","value","get","r","undefined","remove","delete","createSimpleAsyncCache","type","createCacheLocal","cache","WeakMap","inProgress","ret","getOrUndefined","k","v","e"],"sources":["SimpleCache.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\n/**\n * A simple cache that can be used to store values for a given client.\n */\n\nexport interface SimpleCache<K, V> {\n  get: (key: K) => V;\n  set: <X extends V>(key: K, value: X) => X;\n  remove: (key: K) => boolean;\n}\n/**\n * Create a new cache with a factory function.\n * @param fn A factory function that will be used to create the value if it does not exist in the cache.\n */\n\nexport function createSimpleCache<K, V>(\n  map: Map<K, V> | (K extends object ? WeakMap<K, V> : never),\n  fn: (k: K) => V,\n): SimpleCache<K, V>;\n/**\n * Create a new cache without a factory function.\n */\nexport function createSimpleCache<K, V>(\n  map?: Map<K, V> | (K extends object ? WeakMap<K, V> : never),\n): SimpleCache<\n  K,\n  V | undefined\n>;\nexport function createSimpleCache<K, V>(\n  map: Map<K, V> | (K extends object ? WeakMap<K, V> : never) =\n    new Map() as any,\n  fn?: undefined | ((k: K) => V),\n): typeof fn extends undefined ? SimpleCache<K, V | undefined>\n  : SimpleCache<K, V>\n{\n  function get(key: K) {\n    let r = (map as Map<K, V>).get(key as any);\n    if (r === undefined && fn !== undefined) {\n      return set(key, fn(key));\n    } else {\n      return r;\n    }\n  }\n\n  function set(key: K, value: V) {\n    map.set(key as any, value);\n    return value;\n  }\n\n  function remove(key: K) {\n    return map.delete(key as any);\n  }\n\n  return { get, set, remove } as SimpleCache<K, V>;\n}\n/**\n * A simple async cache that can be used to store values for a given client.\n */\n\nexport interface WeakAsyncCache<K, V> {\n  getOrUndefined: (key: K) => V | undefined;\n\n  get: (key: K) => Promise<V>;\n\n  /**\n   * @param client the client to key from\n   * @param key the sub-key to use\n   * @param value the value or a promise to the value\n   * @returns a new promise to the resolved value\n   */\n  set: (\n    key: K,\n    value: V | Promise<V>,\n  ) => Promise<V>;\n}\n/**\n * Create a new cache with an async factory function.\n * @param fn A factory function that will be used to create the value if it does not exist in the cache.\n * @returns\n */\n\nexport function createSimpleAsyncCache<K, V>(\n  type: \"weak\" | \"strong\",\n  fn: (key: K) => Promise<V>,\n  createCacheLocal: typeof createSimpleCache = createSimpleCache,\n): WeakAsyncCache<K, V> {\n  const cache = createCacheLocal<K, V>(\n    (type === \"weak\" ? new WeakMap() : new Map()) as Map<K, V>,\n  );\n  const inProgress = createCacheLocal<K, Promise<V> | V>(\n    (type === \"weak\" ? new WeakMap() : new Map()) as Map<K, V>,\n  );\n\n  const ret = {\n    getOrUndefined: function getOrUndefined(key: K) {\n      return cache.get(key);\n    },\n\n    get: async function get(key: K) {\n      return cache.get(key) ?? inProgress.get(key)\n        ?? ret.set(key, fn(key));\n    },\n\n    set: async function set(k: K, v: V | Promise<V>) {\n      // the `.set` happens first to prevent races.\n      try {\n        const r = await inProgress.set(k, v); // returns v\n\n        cache.set(k, r);\n        inProgress.remove(k);\n        return r;\n      } catch (e) {\n        // we don't want to cache failures\n        inProgress.remove(k);\n        throw e;\n      }\n    },\n  };\n\n  return ret;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAOA;AACA;AACA;AACA;;AAMA;AACA;AACA;;AAOA,OAAO,SAASA,iBAAiBA,CAC/BC,GAA2D,GACzD,IAAIC,GAAG,CAAC,CAAQ,EAClBC,EAA8B,EAGhC;EAUE,SAASC,GAAGA,CAACC,GAAM,EAAEC,KAAQ,EAAE;IAC7BL,GAAG,CAACG,GAAG,CAACC,GAAG,EAASC,KAAK,CAAC;IAC1B,OAAOA,KAAK;EACd;EAMA,OAAO;IAAEC,GAAG,EAlBZ,SAAAA,CAAaF,GAAM,EAAE;MACnB,IAAIG,CAAC,GAAIP,GAAG,CAAeM,GAAG,CAACF,GAAU,CAAC;MAC1C,IAAIG,CAAC,KAAKC,SAAS,IAAIN,EAAE,KAAKM,SAAS,EAAE;QACvC,OAAOL,GAAG,CAACC,GAAG,EAAEF,EAAE,CAACE,GAAG,CAAC,CAAC;MAC1B,CAAC,MAAM;QACL,OAAOG,CAAC;MACV;IACF,CAWY;IAAEJ,GAAG;IAAEM,MAAM,EAJzB,SAAAA,CAAgBL,GAAM,EAAE;MACtB,OAAOJ,GAAG,CAACU,MAAM,CAACN,GAAU,CAAC;IAC/B;EAE0B,CAAC;AAC7B;AACA;AACA;AACA;;AAkBA;AACA;AACA;AACA;AACA;;AAEA,OAAO,SAASO,sBAAsBA,CACpCC,IAAuB,EACvBV,EAA0B,EAC1BW,gBAA0C,GAAGd,iBAAiB,EACxC;EACtB,MAAMe,KAAK,GAAGD,gBAAgB,CAC3BD,IAAI,KAAK,MAAM,GAAG,IAAIG,OAAO,CAAC,CAAC,GAAG,IAAId,GAAG,CAAC,CAC7C,CAAC;EACD,MAAMe,UAAU,GAAGH,gBAAgB,CAChCD,IAAI,KAAK,MAAM,GAAG,IAAIG,OAAO,CAAC,CAAC,GAAG,IAAId,GAAG,CAAC,CAC7C,CAAC;EAED,MAAMgB,GAAG,GAAG;IACVC,cAAc,EAAE,SAAAA,CAAwBd,GAAM,EAAE;MAC9C,OAAOU,KAAK,CAACR,GAAG,CAACF,GAAG,CAAC;IACvB,CAAC;IAEDE,GAAG,EAAE,eAAAA,CAAmBF,GAAM,EAAE;MAC9B,OAAOU,KAAK,CAACR,GAAG,CAACF,GAAG,CAAC,IAAIY,UAAU,CAACV,GAAG,CAACF,GAAG,CAAC,IACvCa,GAAG,CAACd,GAAG,CAACC,GAAG,EAAEF,EAAE,CAACE,GAAG,CAAC,CAAC;IAC5B,CAAC;IAEDD,GAAG,EAAE,eAAAA,CAAmBgB,CAAI,EAAEC,CAAiB,EAAE;MAC/C;MACA,IAAI;QACF,MAAMb,CAAC,GAAG,MAAMS,UAAU,CAACb,GAAG,CAACgB,CAAC,EAAEC,CAAC,CAAC,CAAC,CAAC;;QAEtCN,KAAK,CAACX,GAAG,CAACgB,CAAC,EAAEZ,CAAC,CAAC;QACfS,UAAU,CAACP,MAAM,CAACU,CAAC,CAAC;QACpB,OAAOZ,CAAC;MACV,CAAC,CAAC,OAAOc,CAAC,EAAE;QACV;QACAL,UAAU,CAACP,MAAM,CAACU,CAAC,CAAC;QACpB,MAAME,CAAC;MACT;IACF;EACF,CAAC;EAED,OAAOJ,GAAG;AACZ","ignoreList":[]}

package/build/esm/object/aggregate.js

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as OntologiesV2 from "@osdk/internal.foundry.ontologiesv2";
+
+import * as OntologiesV2 from "@osdk/foundry.ontologies";
 import invariant from "tiny-invariant";
 import { legacyToModernSingleAggregationResult } from "../internal/conversions/legacyToModernSingleAggregationResult.js";
 import { modernToLegacyAggregationClause } from "../internal/conversions/modernToLegacyAggregationClause.js";
 import { modernToLegacyGroupByClause } from "../internal/conversions/modernToLegacyGroupByClause.js";
-import { modernToLegacyWhereClause } from "../internal/conversions/modernToLegacyWhereClause.js";
 import { addUserAgentAndRequestContextHeaders } from "../util/addUserAgentAndRequestContextHeaders.js";
+import { resolveBaseObjectSetType } from "../util/objectSetUtils.js";
+
 /** @internal */
-export async function aggregate(clientCtx, objectType, objectSet = {
-  type: "base",
-  objectType: objectType["apiName"]
-}, req) {
+export async function aggregate(clientCtx, objectType, objectSet = resolveBaseObjectSetType(objectType), req) {
+  resolveBaseObjectSetType(objectType);
   const body = {
     aggregation: modernToLegacyAggregationClause(req.$select),
     groupBy: [],
@@ -33,16 +33,13 @@ export async function aggregate(clientCtx, objectType, objectSet = {
   if (req.$groupBy) {
     body.groupBy = modernToLegacyGroupByClause(req.$groupBy);
   }
-  if (req.$where) {
-    body.where = modernToLegacyWhereClause(req.$where, objectType);
-  }
   const result = await OntologiesV2.OntologyObjectSets.aggregate(addUserAgentAndRequestContextHeaders(clientCtx, objectType), await clientCtx.ontologyRid, {
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
   });
   if (!req.$groupBy) {
-    !(result.data.length === 1) ? invariant(false, "no group by clause should mean only one data result") : void 0;
+    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, "no group by clause should mean only one data result") : invariant(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
       ...legacyToModernSingleAggregationResult(result.data[0])
@@ -55,6 +52,7 @@ export async function aggregate(clientCtx, objectType, objectSet = {
       ...legacyToModernSingleAggregationResult(entry)
     };
   }); // fixme
+
   return ret; // FIXME
 }
 function aggregationToCountResult(entry) {

package/build/esm/object/aggregate.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate.js","names":["OntologiesV2","invariant","legacyToModernSingleAggregationResult","modernToLegacyAggregationClause","modernToLegacyGroupByClause","modernToLegacyWhereClause","addUserAgentAndRequestContextHeaders","aggregate","clientCtx","objectType","objectSet","type","req","body","aggregation","$select","groupBy","where","undefined","$groupBy","$where","result","OntologyObjectSets","ontologyRid","data","length","aggregationToCountResult","ret","map","entry","$group","group","aggregateResult","metrics","name","$count","value"],"sources":["aggregate.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 * as OntologiesV2 from \"@osdk/internal.foundry.ontologiesv2\";\nimport invariant from \"tiny-invariant\";\nimport { legacyToModernSingleAggregationResult } from \"../internal/conversions/legacyToModernSingleAggregationResult.js\";\nimport { modernToLegacyAggregationClause } from \"../internal/conversions/modernToLegacyAggregationClause.js\";\nimport { modernToLegacyGroupByClause } from \"../internal/conversions/modernToLegacyGroupByClause.js\";\nimport { modernToLegacyWhereClause } from \"../internal/conversions/modernToLegacyWhereClause.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\n/** @internal */\nexport async function aggregate(clientCtx, objectType, objectSet = {\n    type: \"base\",\n    objectType: objectType[\"apiName\"],\n}, req) {\n    const body = {\n        aggregation: modernToLegacyAggregationClause(req.$select),\n        groupBy: [],\n        where: undefined,\n    };\n    if (req.$groupBy) {\n        body.groupBy = modernToLegacyGroupByClause(req.$groupBy);\n    }\n    if (req.$where) {\n        body.where = modernToLegacyWhereClause(req.$where, objectType);\n    }\n    const result = await OntologiesV2.OntologyObjectSets.aggregate(addUserAgentAndRequestContextHeaders(clientCtx, objectType), await clientCtx.ontologyRid, {\n        objectSet,\n        groupBy: body.groupBy,\n        aggregation: body.aggregation,\n    });\n    if (!req.$groupBy) {\n        invariant(result.data.length === 1, \"no group by clause should mean only one data result\");\n        return {\n            ...aggregationToCountResult(result.data[0]),\n            ...legacyToModernSingleAggregationResult(result.data[0]),\n        };\n    }\n    const ret = result.data\n        .map((entry) => {\n        return {\n            $group: entry.group,\n            ...aggregationToCountResult(entry),\n            ...legacyToModernSingleAggregationResult(entry),\n        };\n    }); // fixme\n    return ret; // FIXME\n}\nfunction aggregationToCountResult(entry) {\n    for (const aggregateResult of entry.metrics) {\n        if (aggregateResult.name === \"count\") {\n            return { $count: aggregateResult.value };\n        }\n    }\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,OAAOC,SAAS,MAAM,gBAAgB;AACtC,SAASC,qCAAqC,QAAQ,kEAAkE;AACxH,SAASC,+BAA+B,QAAQ,4DAA4D;AAC5G,SAASC,2BAA2B,QAAQ,wDAAwD;AACpG,SAASC,yBAAyB,QAAQ,sDAAsD;AAChG,SAASC,oCAAoC,QAAQ,iDAAiD;AACtG;AACA,OAAO,eAAeC,SAASA,CAACC,SAAS,EAAEC,UAAU,EAAEC,SAAS,GAAG;EAC/DC,IAAI,EAAE,MAAM;EACZF,UAAU,EAAEA,UAAU,CAAC,SAAS;AACpC,CAAC,EAAEG,GAAG,EAAE;EACJ,MAAMC,IAAI,GAAG;IACTC,WAAW,EAAEX,+BAA+B,CAACS,GAAG,CAACG,OAAO,CAAC;IACzDC,OAAO,EAAE,EAAE;IACXC,KAAK,EAAEC;EACX,CAAC;EACD,IAAIN,GAAG,CAACO,QAAQ,EAAE;IACdN,IAAI,CAACG,OAAO,GAAGZ,2BAA2B,CAACQ,GAAG,CAACO,QAAQ,CAAC;EAC5D;EACA,IAAIP,GAAG,CAACQ,MAAM,EAAE;IACZP,IAAI,CAACI,KAAK,GAAGZ,yBAAyB,CAACO,GAAG,CAACQ,MAAM,EAAEX,UAAU,CAAC;EAClE;EACA,MAAMY,MAAM,GAAG,MAAMrB,YAAY,CAACsB,kBAAkB,CAACf,SAAS,CAACD,oCAAoC,CAACE,SAAS,EAAEC,UAAU,CAAC,EAAE,MAAMD,SAAS,CAACe,WAAW,EAAE;IACrJb,SAAS;IACTM,OAAO,EAAEH,IAAI,CAACG,OAAO;IACrBF,WAAW,EAAED,IAAI,CAACC;EACtB,CAAC,CAAC;EACF,IAAI,CAACF,GAAG,CAACO,QAAQ,EAAE;IACf,EAAUE,MAAM,CAACG,IAAI,CAACC,MAAM,KAAK,CAAC,IAAlCxB,SAAS,QAA2B,qDAAqD;IACzF,OAAO;MACH,GAAGyB,wBAAwB,CAACL,MAAM,CAACG,IAAI,CAAC,CAAC,CAAC,CAAC;MAC3C,GAAGtB,qCAAqC,CAACmB,MAAM,CAACG,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC;EACL;EACA,MAAMG,GAAG,GAAGN,MAAM,CAACG,IAAI,CAClBI,GAAG,CAAEC,KAAK,IAAK;IAChB,OAAO;MACHC,MAAM,EAAED,KAAK,CAACE,KAAK;MACnB,GAAGL,wBAAwB,CAACG,KAAK,CAAC;MAClC,GAAG3B,qCAAqC,CAAC2B,KAAK;IAClD,CAAC;EACL,CAAC,CAAC,CAAC,CAAC;EACJ,OAAOF,GAAG,CAAC,CAAC;AAChB;AACA,SAASD,wBAAwBA,CAACG,KAAK,EAAE;EACrC,KAAK,MAAMG,eAAe,IAAIH,KAAK,CAACI,OAAO,EAAE;IACzC,IAAID,eAAe,CAACE,IAAI,KAAK,OAAO,EAAE;MAClC,OAAO;QAAEC,MAAM,EAAEH,eAAe,CAACI;MAAM,CAAC;IAC5C;EACJ;AACJ","ignoreList":[]}
+{"version":3,"file":"aggregate.js","names":["OntologiesV2","invariant","legacyToModernSingleAggregationResult","modernToLegacyAggregationClause","modernToLegacyGroupByClause","addUserAgentAndRequestContextHeaders","resolveBaseObjectSetType","aggregate","clientCtx","objectType","objectSet","req","body","aggregation","$select","groupBy","where","undefined","$groupBy","result","OntologyObjectSets","ontologyRid","data","length","process","env","NODE_ENV","aggregationToCountResult","ret","map","entry","$group","group","aggregateResult","metrics","name","$count","value"],"sources":["aggregate.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 type {\n  AggregateOpts,\n  AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy,\n  AggregationResultsWithGroups,\n  AggregationsResults,\n  ObjectOrInterfaceDefinition,\n} from \"@osdk/api\";\nimport type {\n  AggregateObjectsRequestV2,\n  AggregateObjectsResponseV2,\n  ObjectSet,\n} from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport { legacyToModernSingleAggregationResult } from \"../internal/conversions/legacyToModernSingleAggregationResult.js\";\nimport { modernToLegacyAggregationClause } from \"../internal/conversions/modernToLegacyAggregationClause.js\";\nimport { modernToLegacyGroupByClause } from \"../internal/conversions/modernToLegacyGroupByClause.js\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport type { ArrayElement } from \"../util/ArrayElement.js\";\nimport { resolveBaseObjectSetType } from \"../util/objectSetUtils.js\";\n\n/** @internal */\nexport async function aggregate<\n  Q extends ObjectOrInterfaceDefinition,\n  AO extends AggregateOpts<Q>,\n>(\n  clientCtx: MinimalClient,\n  objectType: Q,\n  objectSet: ObjectSet = resolveBaseObjectSetType(objectType),\n  req: AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy<Q, AO>,\n): Promise<AggregationsResults<Q, AO>> {\n  const resolvedObjectSet = resolveBaseObjectSetType(objectType);\n  const body: AggregateObjectsRequestV2 = {\n    aggregation: modernToLegacyAggregationClause<AO[\"$select\"]>(\n      req.$select,\n    ),\n    groupBy: [],\n    where: undefined,\n  };\n\n  if (req.$groupBy) {\n    body.groupBy = modernToLegacyGroupByClause(req.$groupBy);\n  }\n\n  const result = await OntologiesV2.OntologyObjectSets.aggregate(\n    addUserAgentAndRequestContextHeaders(clientCtx, objectType),\n    await clientCtx.ontologyRid,\n    {\n      objectSet,\n      groupBy: body.groupBy,\n      aggregation: body.aggregation,\n    },\n  );\n\n  if (!req.$groupBy) {\n    invariant(\n      result.data.length === 1,\n      \"no group by clause should mean only one data result\",\n    );\n\n    return {\n      ...aggregationToCountResult(result.data[0]),\n      ...legacyToModernSingleAggregationResult(\n        result.data[0],\n      ),\n    } as any;\n  }\n\n  const ret: AggregationResultsWithGroups<Q, AO[\"$select\"], any> = result.data\n    .map((entry) => {\n      return {\n        $group: entry.group as any,\n        ...aggregationToCountResult(entry),\n        ...legacyToModernSingleAggregationResult(entry),\n      };\n    }) as any; // fixme\n\n  return ret as any; // FIXME\n}\n\nfunction aggregationToCountResult(\n  entry: ArrayElement<AggregateObjectsResponseV2[\"data\"]>,\n): { $count: number } | undefined {\n  for (const aggregateResult of entry.metrics) {\n    if (aggregateResult.name === \"count\") {\n      return { $count: aggregateResult.value };\n    }\n  }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA,OAAO,KAAKA,YAAY,MAAM,0BAA0B;AACxD,OAAOC,SAAS,MAAM,gBAAgB;AACtC,SAASC,qCAAqC,QAAQ,kEAAkE;AACxH,SAASC,+BAA+B,QAAQ,4DAA4D;AAC5G,SAASC,2BAA2B,QAAQ,wDAAwD;AAEpG,SAASC,oCAAoC,QAAQ,iDAAiD;AAEtG,SAASC,wBAAwB,QAAQ,2BAA2B;;AAEpE;AACA,OAAO,eAAeC,SAASA,CAI7BC,SAAwB,EACxBC,UAAa,EACbC,SAAoB,GAAGJ,wBAAwB,CAACG,UAAU,CAAC,EAC3DE,GAA0E,EACrC;EACXL,wBAAwB,CAACG,UAAU,CAAC;EAC9D,MAAMG,IAA+B,GAAG;IACtCC,WAAW,EAAEV,+BAA+B,CAC1CQ,GAAG,CAACG,OACN,CAAC;IACDC,OAAO,EAAE,EAAE;IACXC,KAAK,EAAEC;EACT,CAAC;EAED,IAAIN,GAAG,CAACO,QAAQ,EAAE;IAChBN,IAAI,CAACG,OAAO,GAAGX,2BAA2B,CAACO,GAAG,CAACO,QAAQ,CAAC;EAC1D;EAEA,MAAMC,MAAM,GAAG,MAAMnB,YAAY,CAACoB,kBAAkB,CAACb,SAAS,CAC5DF,oCAAoC,CAACG,SAAS,EAAEC,UAAU,CAAC,EAC3D,MAAMD,SAAS,CAACa,WAAW,EAC3B;IACEX,SAAS;IACTK,OAAO,EAAEH,IAAI,CAACG,OAAO;IACrBF,WAAW,EAAED,IAAI,CAACC;EACpB,CACF,CAAC;EAED,IAAI,CAACF,GAAG,CAACO,QAAQ,EAAE;IACjB,EACEC,MAAM,CAACG,IAAI,CAACC,MAAM,KAAK,CAAC,IAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAD1BzB,SAAS,QAEP,qDAAqD,IAFvDA,SAAS;IAKT,OAAO;MACL,GAAG0B,wBAAwB,CAACR,MAAM,CAACG,IAAI,CAAC,CAAC,CAAC,CAAC;MAC3C,GAAGpB,qCAAqC,CACtCiB,MAAM,CAACG,IAAI,CAAC,CAAC,CACf;IACF,CAAC;EACH;EAEA,MAAMM,GAAwD,GAAGT,MAAM,CAACG,IAAI,CACzEO,GAAG,CAAEC,KAAK,IAAK;IACd,OAAO;MACLC,MAAM,EAAED,KAAK,CAACE,KAAY;MAC1B,GAAGL,wBAAwB,CAACG,KAAK,CAAC;MAClC,GAAG5B,qCAAqC,CAAC4B,KAAK;IAChD,CAAC;EACH,CAAC,CAAQ,CAAC,CAAC;;EAEb,OAAOF,GAAG,CAAQ,CAAC;AACrB;AAEA,SAASD,wBAAwBA,CAC/BG,KAAuD,EACvB;EAChC,KAAK,MAAMG,eAAe,IAAIH,KAAK,CAACI,OAAO,EAAE;IAC3C,IAAID,eAAe,CAACE,IAAI,KAAK,OAAO,EAAE;MACpC,OAAO;QAAEC,MAAM,EAAEH,eAAe,CAACI;MAAM,CAAC;IAC1C;EACF;AACF","ignoreList":[]}

package/build/esm/object/aggregate.test.js

@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { objectTypeWithAllPropertyTypes, Todo } from "@osdk/client.test.ontology";
 import { expectType } from "ts-expect";
 import { beforeAll, describe, expect, expectTypeOf, it, vi } from "vitest";
+import { createClient } from "../createClient.js";
 import { createMinimalClient } from "../createMinimalClient.js";
 import { aggregate } from "./aggregate.js";
 const metadata = {
@@ -26,6 +28,7 @@ const metadata = {
 };
 let mockFetch;
 let clientCtx;
+let client;
 beforeAll(() => {
   mockFetch = vi.fn();
   mockFetch.mockResolvedValue({
@@ -33,7 +36,8 @@ beforeAll(() => {
     status: 200,
     json: () => new Promise(resolve => resolve(aggregationResponse))
   });
-  clientCtx = createMinimalClient(metadata, "https://host.com", async () => "", {}, mockFetch);
+  clientCtx = createMinimalClient(metadata, "https://host.com", async () => "myAccessToken", {}, mockFetch);
+  client = createClient("https://host.com", metadata.ontologyRid, async () => "", undefined, mockFetch);
 });
 const aggregationResponse = {
   accuracy: "APPROXIMATE",
@@ -108,10 +112,8 @@ describe("aggregate", () => {
     expectType(notGrouped.id.avg);
     expectType(notGrouped.$count);
     expectType(false); // subSelect should hide unused keys
-    const grouped = await aggregate(clientCtx, objectTypeWithAllPropertyTypes, {
-      type: "base",
-      objectType: "ToDo"
-    }, {
+
+    const grouped = await client(objectTypeWithAllPropertyTypes).aggregate({
       $select: {
         "id:approximateDistinct": "unordered",
         "id:exactDistinct": "unordered",
@@ -235,6 +237,7 @@ describe("aggregate", () => {
         $duration: [1, "years"]
       }
     });
+
     // Can't use value greater than 1 for years
     expectType({
       // @ts-expect-error
@@ -242,6 +245,7 @@ describe("aggregate", () => {
         $duration: [10, "years"]
       }
     });
+
     // Can't use arbitrary string for time unit
     expectType({
       // @ts-expect-error
@@ -249,6 +253,7 @@ describe("aggregate", () => {
         $duration: [1, "nonexistentTimeUnit"]
       }
     });
+
     // Can't use time unit smaller than days for date type
     expectType({
       // @ts-expect-error
@@ -373,10 +378,7 @@ describe("aggregate", () => {
     expectType(false); // subselect should hide unused keys
   });
   it("prohibits ordered select with multiple groupBy", async () => {
-    aggregate(clientCtx, Todo, {
-      type: "base",
-      objectType: "ToDo"
-    }, {
+    await client(Todo).aggregate({
       $select: {
         // @ts-expect-error
         "id:max": "desc",