@osdk/client 2.0.2-rc.3 → 2.1.0-beta.0

package/CHANGELOG.md

@@ -1,56 +1,27 @@
 # @osdk/client
 
-## 2.0.2-rc.3
+## 2.1.0-beta.0
 
-### Patch Changes
-
-- 4c5e0ae: Fix queries that have response types with nested values, like arrays.
-- ba1c42a: Fixing proxy handlers.
-- Updated dependencies [4c5e0ae]
-  - @osdk/api@2.0.2-rc.3
-  - @osdk/generator-converters@2.0.2-rc.3
-  - @osdk/client.unstable@2.0.2-rc.3
-
-## 2.0.2-beta.2
-
-### Patch Changes
-
-- 51354c5: Fixes where clauses when objects have an api namespace
-- 51354c5: Locks dependency version of 3 internal libraries
-- Updated dependencies [51354c5]
-  - @osdk/generator-converters@2.0.2-beta.2
-  - @osdk/client.unstable@2.0.2-beta.2
-  - @osdk/api@2.0.2-beta.2
-
-## 2.0.2-beta.1
-
-### Patch Changes
-
-- 135bddc: improves interface api name mapping with api namespaces
-  - @osdk/generator-converters@2.0.2-beta.1
-  - @osdk/client.unstable@2.0.2-beta.1
-  - @osdk/api@2.0.2-beta.1
-
-## 2.0.2-rc.0
-
-### Patch Changes
-
-- @osdk/generator-converters@2.0.2-rc.0
-- @osdk/client.unstable@2.0.2-rc.0
-- @osdk/api@2.0.2-rc.0
+### Minor Changes
 
-## 2.0.1
+- 0dc40b0: Switch to OSDK.Instance
+- d927a1d: Throws error in createClient when passed an invalid ontology RID
+- d464009: improves interface api name mapping with api namespaces
+- 8eb2378: Fixes where clauses when objects have an api namespace
+- e548b9b: Updates subscribe to return object updates
+- 5e78575: Fix queries that have response types with nested values, like arrays.
+- 9af346e: Fixing proxy handlers.
+- c682504: Locks dependency version of 3 internal libraries
 
 ### Patch Changes
 
-- Updated dependencies [a4343af]
-  - @osdk/shared.client@1.0.1
-  - @osdk/internal.foundry.core@0.2.1
-  - @osdk/internal.foundry.ontologiesv2@0.2.1
-  - @osdk/shared.client.impl@1.0.1
-  - @osdk/generator-converters@2.0.1
-  - @osdk/api@2.0.1
-  - @osdk/client.unstable@2.0.1
+- Updated dependencies [0dc40b0]
+- Updated dependencies [03e1941]
+- Updated dependencies [e548b9b]
+- Updated dependencies [c682504]
+  - @osdk/api@2.1.0-beta.0
+  - @osdk/generator-converters@2.1.0-beta.0
+  - @osdk/client.unstable@2.1.0-beta.0
 
 ## 2.0.0
 

package/build/browser/Client.d.ts

@@ -32,7 +32,7 @@ export interface Client extends SharedClient<MinimalClient> {
      */
     readonly [__EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks]: <T extends ObjectOrInterfaceDefinition>(objs: Osdk<T>[], links: string[]) => AsyncGenerator<BulkLinkResult, void, undefined>;
 }
-declare const MaxOsdkVersion = "2.0.2";
+declare const MaxOsdkVersion = "2.1.0";
 export type MaxOsdkVersion = typeof MaxOsdkVersion;
 declare const ErrorMessage: unique symbol;
 export {};

package/build/browser/Client.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.
-const MaxOsdkVersion = "2.0.2";
+const MaxOsdkVersion = "2.1.0";
 const ErrorMessage = Symbol("ErrorMessage");
 export {};
 //# sourceMappingURL=Client.js.map

package/build/browser/Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"Client.js","names":["MaxOsdkVersion","ErrorMessage","Symbol"],"sources":["Client.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 */\n// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.\nconst MaxOsdkVersion = \"2.0.2\";\nconst ErrorMessage = Symbol(\"ErrorMessage\");\nexport {};\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAG,OAAO;AAC9B,MAAMC,YAAY,GAAGC,MAAM,CAAC,cAAc,CAAC;AAC3C","ignoreList":[]}
+{"version":3,"file":"Client.js","names":["MaxOsdkVersion","ErrorMessage","Symbol"],"sources":["Client.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 */\n// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.\nconst MaxOsdkVersion = \"2.1.0\";\nconst ErrorMessage = Symbol(\"ErrorMessage\");\nexport {};\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAG,OAAO;AAC9B,MAAMC,YAAY,GAAGC,MAAM,CAAC,cAAc,CAAC;AAC3C","ignoreList":[]}

package/build/browser/__unstable/createBulkLinksAsyncIterFactory.d.ts

@@ -1,10 +1,10 @@
-import type { OsdkObject } from "@osdk/api";
+import type { OsdkBase } from "@osdk/api";
 import type { MinimalClient } from "../MinimalClientContext.js";
 export interface BulkLinkResult {
-    object: OsdkObject<any>;
+    object: OsdkBase<any>;
     linkApiName: string;
     otherObjectApiName: string | undefined;
     otherObjectPk: unknown;
 }
-export declare function createBulkLinksAsyncIterFactory(ctx: MinimalClient): (objs: Array<OsdkObject<any>>, linkTypes: string[]) => AsyncGenerator<BulkLinkResult, void, unknown>;
+export declare function createBulkLinksAsyncIterFactory(ctx: MinimalClient): (objs: Array<OsdkBase<any>>, linkTypes: string[]) => AsyncGenerator<BulkLinkResult, void, unknown>;
 //# sourceMappingURL=createBulkLinksAsyncIterFactory.d.ts.map

package/build/browser/__unstable/createBulkLinksAsyncIterFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBulkLinksAsyncIterFactory.d.ts","sourceRoot":"","sources":["../../../src/__unstable/createBulkLinksAsyncIterFactory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAS5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAUhE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,aAAa,UAExD,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,aACjB,MAAM,EAAE,KAClB,cAAc,CAAC,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,CA8GjD"}
+{"version":3,"file":"createBulkLinksAsyncIterFactory.d.ts","sourceRoot":"","sources":["../../../src/__unstable/createBulkLinksAsyncIterFactory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAS1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAUhE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,aAAa,UAExD,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,aACf,MAAM,EAAE,KAClB,cAAc,CAAC,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,CA8GjD"}

package/build/browser/createClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createClient.d.ts","sourceRoot":"","sources":["../../src/createClient.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAyI1C,eAAO,MAAM,YAAY,gFA7FF,OAAO,CAAC,MAAM,CAAC;aAChB,MAAM;4DA+F3B,CAAC"}
+{"version":3,"file":"createClient.d.ts","sourceRoot":"","sources":["../../src/createClient.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAqJ1C,eAAO,MAAM,YAAY,gFAzGF,OAAO,CAAC,MAAM,CAAC;aAChB,MAAM;4DA2G3B,CAAC"}

package/build/browser/createClient.js

@@ -43,6 +43,17 @@ class QueryInvoker {
 export function createClientInternal(objectSetFactory,
 // first so i can bind
 baseUrl, ontologyRid, tokenProvider, options = undefined, fetchFn = fetch) {
+  if (typeof ontologyRid === "string") {
+    if (!ontologyRid.startsWith("ri.")) {
+      throw new Error("Invalid ontology RID");
+    }
+  } else {
+    ontologyRid.then(ontologyRid => {
+      if (!ontologyRid.startsWith("ri.")) {
+        throw new Error("Invalid ontology RID");
+      }
+    });
+  }
   const clientCtx = createMinimalClient({
     ontologyRid
   }, baseUrl, tokenProvider, options, fetchFn, objectSetFactory);

package/build/browser/createClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createClient.js","names":["__EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks","__EXPERIMENTAL__NOT_SUPPORTED_YET__preexistingObjectSet","symbolClientContext","createBulkLinksAsyncIterFactory","applyAction","createMinimalClient","fetchMetadataInternal","createObjectSet","applyQuery","ActionInvoker","constructor","clientCtx","actionDef","bind","undefined","batchApplyAction","QueryInvoker","queryDef","executeFunction","createClientInternal","objectSetFactory","baseUrl","ontologyRid","tokenProvider","options","fetchFn","fetch","fetchMetadata","client","Object","defineProperties","o","type","Error","value","get","definition","rid","objectSets","objectType","apiName","reference","createClient"],"sources":["createClient.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 { __EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks, __EXPERIMENTAL__NOT_SUPPORTED_YET__preexistingObjectSet, } from \"@osdk/api/unstable\";\nimport { symbolClientContext } from \"@osdk/shared.client\";\nimport { createBulkLinksAsyncIterFactory } from \"./__unstable/createBulkLinksAsyncIterFactory.js\";\nimport { applyAction } from \"./actions/applyAction.js\";\nimport { createMinimalClient } from \"./createMinimalClient.js\";\nimport { fetchMetadataInternal } from \"./fetchMetadata.js\";\nimport { createObjectSet } from \"./objectSet/createObjectSet.js\";\nimport { applyQuery } from \"./queries/applyQuery.js\";\nclass ActionInvoker {\n    constructor(clientCtx, actionDef) {\n        // We type the property as a generic function as binding `applyAction`\n        // doesn't return a type thats all that useful anyway\n        // The implements covers us for the most part here as this exact type doesn't\n        // escape this file\n        this.applyAction = applyAction.bind(undefined, clientCtx, actionDef);\n        this.batchApplyAction = applyAction.bind(undefined, clientCtx, actionDef);\n    }\n    applyAction;\n    batchApplyAction;\n}\nclass QueryInvoker {\n    constructor(clientCtx, queryDef) {\n        this.executeFunction = applyQuery.bind(undefined, clientCtx, queryDef);\n    }\n    executeFunction;\n}\n/** @internal */\nexport function createClientInternal(objectSetFactory, // first so i can bind\nbaseUrl, ontologyRid, tokenProvider, options = undefined, fetchFn = fetch) {\n    const clientCtx = createMinimalClient({ ontologyRid }, baseUrl, tokenProvider, options, fetchFn, objectSetFactory);\n    function clientFn(o) {\n        if (o.type === \"object\" || o.type === \"interface\") {\n            return objectSetFactory(o, clientCtx);\n        }\n        else if (o.type === \"action\") {\n            return new ActionInvoker(clientCtx, o); // then as any for dealing with the conditional return value\n        }\n        else if (o.type === \"query\") {\n            return new QueryInvoker(clientCtx, o);\n        }\n        else {\n            throw new Error(\"not implemented\");\n        }\n    }\n    const fetchMetadata = fetchMetadataInternal.bind(undefined, clientCtx);\n    const client = Object.defineProperties(clientFn, {\n        [symbolClientContext]: {\n            value: clientCtx,\n        },\n        [__EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks]: {\n            get: () => createBulkLinksAsyncIterFactory(clientCtx),\n        },\n        [__EXPERIMENTAL__NOT_SUPPORTED_YET__preexistingObjectSet]: {\n            get: () => (definition, rid) => {\n                return createObjectSet(definition, client[symbolClientContext], {\n                    type: \"intersect\",\n                    objectSets: [\n                        {\n                            type: \"base\",\n                            objectType: definition.apiName,\n                        },\n                        {\n                            type: \"reference\",\n                            reference: rid,\n                        },\n                    ],\n                });\n            },\n        },\n        fetchMetadata: {\n            value: fetchMetadata,\n        },\n    });\n    return client;\n}\nexport const createClient = createClientInternal.bind(undefined, createObjectSet);\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createClient.js","names":["__EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks","__EXPERIMENTAL__NOT_SUPPORTED_YET__preexistingObjectSet","symbolClientContext","createBulkLinksAsyncIterFactory","applyAction","createMinimalClient","fetchMetadataInternal","createObjectSet","applyQuery","ActionInvoker","constructor","clientCtx","actionDef","bind","undefined","batchApplyAction","QueryInvoker","queryDef","executeFunction","createClientInternal","objectSetFactory","baseUrl","ontologyRid","tokenProvider","options","fetchFn","fetch","startsWith","Error","then","fetchMetadata","client","Object","defineProperties","o","type","value","get","definition","rid","objectSets","objectType","apiName","reference","createClient"],"sources":["createClient.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 { __EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks, __EXPERIMENTAL__NOT_SUPPORTED_YET__preexistingObjectSet, } from \"@osdk/api/unstable\";\nimport { symbolClientContext } from \"@osdk/shared.client\";\nimport { createBulkLinksAsyncIterFactory } from \"./__unstable/createBulkLinksAsyncIterFactory.js\";\nimport { applyAction } from \"./actions/applyAction.js\";\nimport { createMinimalClient } from \"./createMinimalClient.js\";\nimport { fetchMetadataInternal } from \"./fetchMetadata.js\";\nimport { createObjectSet } from \"./objectSet/createObjectSet.js\";\nimport { applyQuery } from \"./queries/applyQuery.js\";\nclass ActionInvoker {\n    constructor(clientCtx, actionDef) {\n        // We type the property as a generic function as binding `applyAction`\n        // doesn't return a type thats all that useful anyway\n        // The implements covers us for the most part here as this exact type doesn't\n        // escape this file\n        this.applyAction = applyAction.bind(undefined, clientCtx, actionDef);\n        this.batchApplyAction = applyAction.bind(undefined, clientCtx, actionDef);\n    }\n    applyAction;\n    batchApplyAction;\n}\nclass QueryInvoker {\n    constructor(clientCtx, queryDef) {\n        this.executeFunction = applyQuery.bind(undefined, clientCtx, queryDef);\n    }\n    executeFunction;\n}\n/** @internal */\nexport function createClientInternal(objectSetFactory, // first so i can bind\nbaseUrl, ontologyRid, tokenProvider, options = undefined, fetchFn = fetch) {\n    if (typeof ontologyRid === \"string\") {\n        if (!ontologyRid.startsWith(\"ri.\")) {\n            throw new Error(\"Invalid ontology RID\");\n        }\n    }\n    else {\n        ontologyRid.then((ontologyRid) => {\n            if (!ontologyRid.startsWith(\"ri.\")) {\n                throw new Error(\"Invalid ontology RID\");\n            }\n        });\n    }\n    const clientCtx = createMinimalClient({ ontologyRid }, baseUrl, tokenProvider, options, fetchFn, objectSetFactory);\n    function clientFn(o) {\n        if (o.type === \"object\" || o.type === \"interface\") {\n            return objectSetFactory(o, clientCtx);\n        }\n        else if (o.type === \"action\") {\n            return new ActionInvoker(clientCtx, o); // then as any for dealing with the conditional return value\n        }\n        else if (o.type === \"query\") {\n            return new QueryInvoker(clientCtx, o);\n        }\n        else {\n            throw new Error(\"not implemented\");\n        }\n    }\n    const fetchMetadata = fetchMetadataInternal.bind(undefined, clientCtx);\n    const client = Object.defineProperties(clientFn, {\n        [symbolClientContext]: {\n            value: clientCtx,\n        },\n        [__EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks]: {\n            get: () => createBulkLinksAsyncIterFactory(clientCtx),\n        },\n        [__EXPERIMENTAL__NOT_SUPPORTED_YET__preexistingObjectSet]: {\n            get: () => (definition, rid) => {\n                return createObjectSet(definition, client[symbolClientContext], {\n                    type: \"intersect\",\n                    objectSets: [\n                        {\n                            type: \"base\",\n                            objectType: definition.apiName,\n                        },\n                        {\n                            type: \"reference\",\n                            reference: rid,\n                        },\n                    ],\n                });\n            },\n        },\n        fetchMetadata: {\n            value: fetchMetadata,\n        },\n    });\n    return client;\n}\nexport const createClient = createClientInternal.bind(undefined, createObjectSet);\n"],"mappings":"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","ignoreList":[]}

package/build/browser/object/convertWireToOsdkObjects/InternalSymbols.d.ts

@@ -1,4 +1,4 @@
-import type { ObjectOrInterfaceDefinition, OsdkObject } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition, OsdkBase } from "@osdk/api";
 export declare const UnderlyingOsdkObject: unique symbol;
 export declare const ObjectDefRef: unique symbol;
 export declare const InterfaceDefRef: unique symbol;
@@ -6,7 +6,7 @@ export declare const InterfaceDefRef: unique symbol;
 export declare const RawObject: unique symbol;
 export declare const ClientRef: unique symbol;
 export interface HolderBase<T extends ObjectOrInterfaceDefinition> {
-    [UnderlyingOsdkObject]: OsdkObject<any>;
+    [UnderlyingOsdkObject]: OsdkBase<any>;
     [ObjectDefRef]?: T;
     [InterfaceDefRef]?: T;
 }

package/build/browser/object/convertWireToOsdkObjects/InternalSymbols.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalSymbols.d.ts","sourceRoot":"","sources":["../../../../src/object/convertWireToOsdkObjects/InternalSymbols.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEzE,eAAO,MAAM,oBAAoB,eAEhC,CAAC;AAEF,eAAO,MAAM,YAAY,eAExB,CAAC;AAEF,eAAO,MAAM,eAAe,eAE3B,CAAC;AAEF,gGAAgG;AAChG,eAAO,MAAM,SAAS,eAErB,CAAC;AAEF,eAAO,MAAM,SAAS,eAErB,CAAC;AAEF,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,2BAA2B;IAC/D,CAAC,oBAAoB,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;CACvB"}
+{"version":3,"file":"InternalSymbols.d.ts","sourceRoot":"","sources":["../../../../src/object/convertWireToOsdkObjects/InternalSymbols.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAEvE,eAAO,MAAM,oBAAoB,eAEhC,CAAC;AAEF,eAAO,MAAM,YAAY,eAExB,CAAC;AAEF,eAAO,MAAM,eAAe,eAE3B,CAAC;AAEF,gGAAgG;AAChG,eAAO,MAAM,SAAS,eAErB,CAAC;AAEF,eAAO,MAAM,SAAS,eAErB,CAAC;AAEF,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,2BAA2B;IAC/D,CAAC,oBAAoB,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;CACvB"}

package/build/browser/object/fetchSingle.js

@@ -19,7 +19,7 @@ import { fetchPage } from "./fetchPage.js";
 export async function fetchSingle(client, objectType, args, objectSet) {
   const result = await fetchPage(client, objectType, {
     ...args,
-    pageSize: 1
+    $pageSize: 1
   }, objectSet);
   if (result.data.length !== 1 || result.nextPageToken != null) {
     throw new PalantirApiError(`Expected a single result but got ${result.data.length} instead${result.nextPageToken != null ? " with nextPageToken set" : ""}`);

package/build/browser/object/fetchSingle.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchSingle.js","names":["PalantirApiError","fetchPage","fetchSingle","client","objectType","args","objectSet","result","pageSize","data","length","nextPageToken","fetchSingleWithErrors","value","e","Error","error"],"sources":["fetchSingle.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 { PalantirApiError } from \"@osdk/shared.net.errors\";\nimport { fetchPage } from \"./fetchPage.js\";\n/** @internal */\nexport async function fetchSingle(client, objectType, args, objectSet) {\n    const result = await fetchPage(client, objectType, { ...args, pageSize: 1 }, objectSet);\n    if (result.data.length !== 1 || result.nextPageToken != null) {\n        throw new PalantirApiError(`Expected a single result but got ${result.data.length} instead${result.nextPageToken != null ? \" with nextPageToken set\" : \"\"}`);\n    }\n    return result.data[0];\n}\n/** @internal */\nexport async function fetchSingleWithErrors(client, objectType, args, objectSet) {\n    try {\n        const result = await fetchSingle(client, objectType, args, objectSet);\n        return { value: result };\n    }\n    catch (e) {\n        if (e instanceof Error) {\n            return { error: e };\n        }\n        return { error: e };\n    }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,gBAAgB,QAAQ,yBAAyB;AAC1D,SAASC,SAAS,QAAQ,gBAAgB;AAC1C;AACA,OAAO,eAAeC,WAAWA,CAACC,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,EAAE;EACnE,MAAMC,MAAM,GAAG,MAAMN,SAAS,CAACE,MAAM,EAAEC,UAAU,EAAE;IAAE,GAAGC,IAAI;IAAEG,QAAQ,EAAE;EAAE,CAAC,EAAEF,SAAS,CAAC;EACvF,IAAIC,MAAM,CAACE,IAAI,CAACC,MAAM,KAAK,CAAC,IAAIH,MAAM,CAACI,aAAa,IAAI,IAAI,EAAE;IAC1D,MAAM,IAAIX,gBAAgB,CAAC,oCAAoCO,MAAM,CAACE,IAAI,CAACC,MAAM,WAAWH,MAAM,CAACI,aAAa,IAAI,IAAI,GAAG,yBAAyB,GAAG,EAAE,EAAE,CAAC;EAChK;EACA,OAAOJ,MAAM,CAACE,IAAI,CAAC,CAAC,CAAC;AACzB;AACA;AACA,OAAO,eAAeG,qBAAqBA,CAACT,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,EAAE;EAC7E,IAAI;IACA,MAAMC,MAAM,GAAG,MAAML,WAAW,CAACC,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,CAAC;IACrE,OAAO;MAAEO,KAAK,EAAEN;IAAO,CAAC;EAC5B,CAAC,CACD,OAAOO,CAAC,EAAE;IACN,IAAIA,CAAC,YAAYC,KAAK,EAAE;MACpB,OAAO;QAAEC,KAAK,EAAEF;MAAE,CAAC;IACvB;IACA,OAAO;MAAEE,KAAK,EAAEF;IAAE,CAAC;EACvB;AACJ","ignoreList":[]}
+{"version":3,"file":"fetchSingle.js","names":["PalantirApiError","fetchPage","fetchSingle","client","objectType","args","objectSet","result","$pageSize","data","length","nextPageToken","fetchSingleWithErrors","value","e","Error","error"],"sources":["fetchSingle.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 { PalantirApiError } from \"@osdk/shared.net.errors\";\nimport { fetchPage } from \"./fetchPage.js\";\n/** @internal */\nexport async function fetchSingle(client, objectType, args, objectSet) {\n    const result = await fetchPage(client, objectType, { ...args, $pageSize: 1 }, objectSet);\n    if (result.data.length !== 1 || result.nextPageToken != null) {\n        throw new PalantirApiError(`Expected a single result but got ${result.data.length} instead${result.nextPageToken != null ? \" with nextPageToken set\" : \"\"}`);\n    }\n    return result.data[0];\n}\n/** @internal */\nexport async function fetchSingleWithErrors(client, objectType, args, objectSet) {\n    try {\n        const result = await fetchSingle(client, objectType, args, objectSet);\n        return { value: result };\n    }\n    catch (e) {\n        if (e instanceof Error) {\n            return { error: e };\n        }\n        return { error: e };\n    }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,gBAAgB,QAAQ,yBAAyB;AAC1D,SAASC,SAAS,QAAQ,gBAAgB;AAC1C;AACA,OAAO,eAAeC,WAAWA,CAACC,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,EAAE;EACnE,MAAMC,MAAM,GAAG,MAAMN,SAAS,CAACE,MAAM,EAAEC,UAAU,EAAE;IAAE,GAAGC,IAAI;IAAEG,SAAS,EAAE;EAAE,CAAC,EAAEF,SAAS,CAAC;EACxF,IAAIC,MAAM,CAACE,IAAI,CAACC,MAAM,KAAK,CAAC,IAAIH,MAAM,CAACI,aAAa,IAAI,IAAI,EAAE;IAC1D,MAAM,IAAIX,gBAAgB,CAAC,oCAAoCO,MAAM,CAACE,IAAI,CAACC,MAAM,WAAWH,MAAM,CAACI,aAAa,IAAI,IAAI,GAAG,yBAAyB,GAAG,EAAE,EAAE,CAAC;EAChK;EACA,OAAOJ,MAAM,CAACE,IAAI,CAAC,CAAC,CAAC;AACzB;AACA;AACA,OAAO,eAAeG,qBAAqBA,CAACT,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,EAAE;EAC7E,IAAI;IACA,MAAMC,MAAM,GAAG,MAAML,WAAW,CAACC,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,SAAS,CAAC;IACrE,OAAO;MAAEO,KAAK,EAAEN;IAAO,CAAC;EAC5B,CAAC,CACD,OAAOO,CAAC,EAAE;IACN,IAAIA,CAAC,YAAYC,KAAK,EAAE;MACpB,OAAO;QAAEC,KAAK,EAAEF;MAAE,CAAC;IACvB;IACA,OAAO;MAAEE,KAAK,EAAEF;IAAE,CAAC;EACvB;AACJ","ignoreList":[]}

package/build/browser/objectSet/ObjectSetListenerWebsocket.d.ts

@@ -1,7 +1,2 @@
-export type ObjectPropertyMapping = {
-    apiName: string;
-    id: string;
-    propertyIdToApiNameMapping: Record<string, string>;
-    propertyApiNameToIdMapping: Record<string, string>;
-};
+export {};
 //# sourceMappingURL=ObjectSetListenerWebsocket.d.ts.map

package/build/browser/objectSet/ObjectSetListenerWebsocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectSetListenerWebsocket.d.ts","sourceRoot":"","sources":["../../../src/objectSet/ObjectSetListenerWebsocket.ts"],"names":[],"mappings":"AAuqBA,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,0BAA0B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,0BAA0B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpD,CAAC"}
+{"version":3,"file":"ObjectSetListenerWebsocket.d.ts","sourceRoot":"","sources":["../../../src/objectSet/ObjectSetListenerWebsocket.ts"],"names":[],"mappings":""}

package/build/browser/objectSet/ObjectSetListenerWebsocket.js

@@ -13,14 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { bulkLoadOntologyEntities, createTemporaryObjectSet, loadAllOntologies } from "@osdk/client.unstable";
-import { batchEnableWatcher } from "@osdk/client.unstable.osw";
-import * as OntologiesV2 from "@osdk/internal.foundry.ontologiesv2";
 import WebSocket from "isomorphic-ws";
 import invariant from "tiny-invariant";
-import { metadataCacheClient } from "../__unstable/ConjureSupport.js";
 import { convertWireToOsdkObjects } from "../object/convertWireToOsdkObjects.js";
-import { getObjectSetBaseType, toConjureObjectSet } from "./toConjureObjectSet.js";
 const ONE_DAY_MS = 24 * 60 * 60 * 1000;
 const MINIMUM_RECONNECT_DELAY_MS = 5 * 1000;
 /** Noop function to reduce conditional checks */
@@ -40,7 +35,7 @@ function fillOutListener({
   };
 }
 function isReady(sub) {
-  return sub.temporaryObjectSetId != null;
+  return sub.isReady != null;
 }
 function subscriptionIsDone(sub) {
   return sub.status === "done" || sub.status === "error";
@@ -72,9 +67,6 @@ export class ObjectSetListenerWebsocket {
    * temporary and not the actual subscriptionId from the server.
    */
   #subscriptions = new Map();
-  #oswContext;
-  #metadataContext;
-  #ossContext;
   #maybeDisconnectTimeout;
   // DO NOT CONSTRUCT DIRECTLY. ONLY EXPOSED AS A TESTING SEAM
   constructor(client, {
@@ -88,25 +80,12 @@ export class ObjectSetListenerWebsocket {
       msgPrefix: "<OSW> "
     });
     !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? invariant(false, "Stack must be a URL") : void 0;
-    this.#oswContext = {
-      baseUrl: client.baseUrl,
-      servicePath: "/object-set-watcher/api",
-      fetchFn: client.fetch,
-      tokenProvider: async () => await client.tokenProvider()
-    };
-    this.#ossContext = {
-      ...this.#oswContext,
-      servicePath: "/object-set-service/api"
-    };
-    this.#metadataContext = {
-      ...this.#oswContext,
-      servicePath: "/ontology-metadata/api"
-    };
   }
-  async subscribe(objectSet, listener) {
+  async subscribe(objectSet, listener, properties) {
     const sub = {
       listener: fillOutListener(listener),
       objectSet,
+      requestedProperties: properties,
       status: "preparing",
       // Since we don't have a real subscription id yet but we need to keep
       // track of this reference, we can just use a random uuid.
@@ -139,28 +118,22 @@ export class ObjectSetListenerWebsocket {
     // expiry is tied to the temporary object set, which is set to `timeToLive: "ONE_DAY"`
     // in `#createTemporaryObjectSet`. They should be in sync
     sub.expiry = setTimeout(() => this.#expire(sub), this.OBJECT_SET_EXPIRY_MS);
-    const ontologyRid = await this.#client.ontologyRid;
+    await this.#client.ontologyRid;
     try {
-      const [temporaryObjectSet] = await Promise.all([
-      // create a time-bounded object set representation for watching
-      this.#createTemporaryObjectSet(sub.objectSet), this.#ensureWebsocket(),
-      // look up the object type's rid and ensure that we have enabled object set watcher for that rid
-      // TODO ???
-      getObjectSetBaseType(sub.objectSet).then(baseType => OntologiesV2.ObjectTypesV2.get(this.#client, ontologyRid, baseType)).then(objectType => this.#enableObjectSetsWatcher([objectType.rid]))]);
+      await this.#ensureWebsocket();
       // the consumer may have already unsubscribed before we are ready to request a subscription
       // so we have to acquire the pendingSubscription after the await.
       if (subscriptionIsDone(sub)) {
         return;
       }
-      // Use new temporary object set id
-      sub.temporaryObjectSetId = temporaryObjectSet.objectSetRid;
+      sub.isReady = true;
       // if we aren't open, then this happens after we #onConnect
       if (this.#ws?.readyState === WebSocket.OPEN) {
         this.#sendSubscribeMessage();
       }
     } catch (error) {
       this.#logger?.error(error, "Error in #initiateSubscribe");
-      sub.listener.onError(error);
+      sub.listener.onError([error]);
     }
   }
   #sendSubscribeMessage() {
@@ -186,15 +159,12 @@ export class ObjectSetListenerWebsocket {
     const subscribe = {
       id,
       requests: readySubs.map(({
-        temporaryObjectSetId
+        objectSet,
+        requestedProperties
       }) => ({
-        objectSet: temporaryObjectSetId,
-        objectSetContext: {
-          objectSetFilterContext: {
-            parameterOverrides: {}
-          }
-        },
-        watchAllLinks: false
+        objectSet: objectSet,
+        propertySet: requestedProperties,
+        referenceSet: []
       }))
     };
     if (process?.env?.NODE_ENV !== "production") {
@@ -258,8 +228,7 @@ export class ObjectSetListenerWebsocket {
         tokenProvider
       } = this.#client;
       const base = new URL(baseUrl);
-      // TODO: This should be a different endpoint
-      const url = `wss://${base.host}/object-set-watcher/ws/subscriptions`;
+      const url = `wss://${base.host}/api/v2/ontologySubscriptions/ontologies/${this.#client.ontologyRid}/streamSubscriptions`;
       const token = await tokenProvider();
       // tokenProvider is async, there could potentially be a race to create the websocket.
       // Only the first call to reach here will find a null this.#ws, the rest will bail out
@@ -322,15 +291,14 @@ export class ObjectSetListenerWebsocket {
     }
     switch (data.type) {
       case "objectSetChanged":
-        return this.#handleMessage_objectSetChanged(data.objectSetChanged);
+        return this.#handleMessage_objectSetChanged(data);
       case "refreshObjectSet":
-        return this.#handleMessage_refreshObjectSet(data.refreshObjectSet);
+        return this.#handleMessage_refreshObjectSet(data);
       case "subscribeResponses":
-        return this.#handleMessage_subscribeResponses(data.subscribeResponses);
+        return this.#handleMessage_subscribeResponses(data);
       case "subscriptionClosed":
         {
-          const payload = data.subscriptionClosed;
-          return this.#handleMessage_subscriptionClosed(payload);
+          return this.#handleMessage_subscriptionClosed(data);
         }
       default:
         invariant(false, "Unexpected message type");
@@ -339,15 +307,21 @@ export class ObjectSetListenerWebsocket {
   #handleMessage_objectSetChanged = async payload => {
     const sub = this.#subscriptions.get(payload.id);
     !sub ? invariant(false, `Expected subscription id ${payload.id}`) : void 0;
-    if ("confidenceValue" in payload) {
-      sub.listener.onOutOfDate();
-      return;
+    const objectUpdates = payload.updates.filter(update => update.type === "object");
+    payload.updates.filter(update => update.type === "reference");
+    const osdkObjects = await Promise.all(objectUpdates.map(async o => {
+      const osdkObjectArray = await convertWireToOsdkObjects(this.#client, [o.object], undefined);
+      const singleOsdkObject = osdkObjectArray[0] ?? undefined;
+      return singleOsdkObject != null ? {
+        object: singleOsdkObject,
+        state: o.state
+      } : undefined;
+    }));
+    for (const osdkObject of osdkObjects) {
+      if (osdkObject != null) {
+        return sub.listener.onChange?.(osdkObject);
+      }
     }
-    const objects = payload.updates.filter(function (a) {
-      return a.type === "object";
-    }).map(a => a.object);
-    !(objects.length === payload.updates.length) ? invariant(false, "currently only support full updates not reference updates") : void 0;
-    sub.listener.onChange(await convertFoundryToOsdkObjects(this.#client, this.#metadataContext, objects));
   };
   #handleMessage_refreshObjectSet = payload => {
     const sub = this.#subscriptions.get(payload.id);
@@ -367,7 +341,7 @@ export class ObjectSetListenerWebsocket {
       const response = responses[i];
       switch (response.type) {
         case "error":
-          sub.listener.onError(response.error);
+          sub.listener.onError(response.errors);
           this.#unsubscribe(sub, "error");
           break;
         case "qos":
@@ -383,10 +357,10 @@ export class ObjectSetListenerWebsocket {
             }, "success");
           }
           sub.status = "subscribed";
-          if (sub.subscriptionId !== response.success.id) {
+          if (sub.subscriptionId !== response.id) {
             // might be the temporary one
             this.#subscriptions.delete(sub.subscriptionId);
-            sub.subscriptionId = response.success.id;
+            sub.subscriptionId = response.id;
             this.#subscriptions.set(sub.subscriptionId, sub); // future messages come by this subId
           }
           if (shouldFireOutOfDate) sub.listener.onOutOfDate();
@@ -399,7 +373,7 @@ export class ObjectSetListenerWebsocket {
   #handleMessage_subscriptionClosed(payload) {
     const sub = this.#subscriptions.get(payload.id);
     !sub ? invariant(false, `Expected subscription id ${payload.id}`) : void 0;
-    sub.listener.onError(payload.error);
+    sub.listener.onError([payload.cause]);
     this.#unsubscribe(sub, "error");
   }
   #onClose = event => {
@@ -411,28 +385,8 @@ export class ObjectSetListenerWebsocket {
     // TODO we should probably throttle this so we don't abuse the backend
     this.#cycleWebsocket();
   };
-  async #enableObjectSetsWatcher(objectTypeRids) {
-    return batchEnableWatcher(this.#oswContext, {
-      requests: objectTypeRids
-    });
-  }
-  async #createTemporaryObjectSet(objectSet) {
-    const objectSetBaseType = await getObjectSetBaseType(objectSet);
-    const mcc = await metadataCacheClient(this.#client);
-    const objectInfo = await mcc.forObjectByApiName(objectSetBaseType);
-    const propMapping = await objectInfo.getPropertyMapping();
-    const temporaryObjectSet = await createTemporaryObjectSet(this.#ossContext, {
-      objectSet: toConjureObjectSet(objectSet, propMapping),
-      timeToLive: "ONE_DAY",
-      // MUST keep in sync with the value for expiry in `#initiateSubscribe`.
-      objectSetFilterContext: {
-        parameterOverrides: {}
-      }
-    });
-    return {
-      objectSetRid: temporaryObjectSet.objectSetRid
-    };
-  }
+  // TODO: Validate if this is needed
+  async #enableObjectSetsWatcher() {}
   #cycleWebsocket = () => {
     if (this.#ws) {
       this.#ws.removeEventListener("open", this.#onOpen);
@@ -457,77 +411,4 @@ export class ObjectSetListenerWebsocket {
     }
   };
 }
-async function convertFoundryToOsdkObjects(client, ctx, objects) {
-  const osdkObjects = await Promise.all(objects.map(async object => {
-    const propertyMapping = await (await (await metadataCacheClient(client)).forObjectByRid(object.type)).getPropertyMapping();
-    const convertedObject = Object.fromEntries([...Object.entries(object.properties).map(([key, value]) => {
-      return [propertyMapping?.propertyIdToApiNameMapping[key], value];
-    }), [propertyMapping?.propertyIdToApiNameMapping[Object.entries(object.key)[0][0]], Object.entries(object.key)[0][1]], ["__apiName", propertyMapping?.apiName], ["$apiName", propertyMapping?.apiName]]);
-    return convertedObject;
-  }));
-  // doesn't care about interfaces
-  return await convertWireToOsdkObjects(client, osdkObjects, undefined);
-}
-// Mapping of ObjectRid to Properties
-const objectTypeMapping = new WeakMap();
-const objectApiNameToRid = new Map();
-async function getOntologyPropertyMappingForApiName(client, ctx, objectApiName) {
-  if (objectApiNameToRid.has(objectApiName)) {
-    return objectTypeMapping.get(ctx)?.get(objectApiNameToRid.get(objectApiName));
-  }
-  const ontologyRid = await client.ontologyRid;
-  const wireObjectType = await OntologiesV2.ObjectTypesV2.get(client, ontologyRid, objectApiName);
-  return getOntologyPropertyMappingForRid(ctx, ontologyRid, wireObjectType.rid);
-}
-let cachedAllOntologies;
-async function getOntologyVersionForRid(ctx, ontologyRid) {
-  cachedAllOntologies ??= await loadAllOntologies(ctx, {});
-  !cachedAllOntologies.ontologies[ontologyRid] ? invariant(false, "ontology should be loaded") : void 0;
-  return cachedAllOntologies.ontologies[ontologyRid].currentOntologyVersion;
-}
-async function getOntologyPropertyMappingForRid(ctx, ontologyRid, objectRid) {
-  if (!objectTypeMapping.has(ctx)) {
-    objectTypeMapping.set(ctx, new Map());
-  }
-  if (!objectTypeMapping.get(ctx).has(objectRid)) {
-    const ontologyVersion = await getOntologyVersionForRid(ctx, ontologyRid);
-    const body = {
-      datasourceTypes: [],
-      objectTypes: [{
-        identifier: {
-          type: "objectTypeRid",
-          objectTypeRid: objectRid
-        },
-        versionReference: {
-          type: "ontologyVersion",
-          ontologyVersion: ontologyVersion
-        }
-      }],
-      linkTypes: [],
-      sharedPropertyTypes: [],
-      interfaceTypes: [],
-      typeGroups: [],
-      loadRedacted: false,
-      includeObjectTypeCount: undefined,
-      includeObjectTypesWithoutSearchableDatasources: true,
-      includeEntityMetadata: undefined
-    };
-    const entities = await bulkLoadOntologyEntities(ctx, undefined, body);
-    !entities.objectTypes[0]?.objectType ? invariant(false, "object type should be loaded") : void 0;
-    const propertyIdToApiNameMapping = Object.fromEntries(Object.values(entities.objectTypes[0].objectType.propertyTypes).map(property => {
-      return [property.id, property.apiName];
-    }));
-    const propertyApiNameToIdMapping = Object.fromEntries(Object.values(entities.objectTypes[0].objectType.propertyTypes).map(property => {
-      return [property.apiName, property.id];
-    }));
-    objectTypeMapping.get(ctx)?.set(objectRid, {
-      apiName: entities.objectTypes[0].objectType.apiName,
-      id: entities.objectTypes[0].objectType.id,
-      propertyIdToApiNameMapping,
-      propertyApiNameToIdMapping
-    });
-    objectApiNameToRid.set(entities.objectTypes[0].objectType.apiName, objectRid);
-  }
-  return objectTypeMapping.get(ctx)?.get(objectRid);
-}
 //# sourceMappingURL=ObjectSetListenerWebsocket.js.map