@osdk/client 2.7.0-beta.11 → 2.7.0-beta.13

package/build/cjs/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk666JN2DO_cjs = require('./chunk-666JN2DO.cjs');
-require('./chunk-RDZ5NKAI.cjs');
+var chunkZFL7RPT6_cjs = require('./chunk-ZFL7RPT6.cjs');
+require('./chunk-VVKEXIIO.cjs');
 var chunkLDTMSHUZ_cjs = require('./chunk-LDTMSHUZ.cjs');
 var api = require('@osdk/api');
 var shared_net_errors = require('@osdk/shared.net.errors');
@@ -18,7 +18,7 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 // src/createPlatformClient.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 function createPlatformClient(baseUrl, tokenProvider, options = void 0, fetchFn = fetch) {
-  return shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, chunk666JN2DO_cjs.USER_AGENT, fetchFn);
+  return shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, chunkZFL7RPT6_cjs.USER_AGENT, fetchFn);
 }
 
 // src/util/datetimeConverters.ts
@@ -45,23 +45,23 @@ var extractDateFromIsoString = (dateTime) => {
 
 Object.defineProperty(exports, "ActionValidationError", {
   enumerable: true,
-  get: function () { return chunk666JN2DO_cjs.ActionValidationError; }
+  get: function () { return chunkZFL7RPT6_cjs.ActionValidationError; }
 });
 Object.defineProperty(exports, "createAttachmentUpload", {
   enumerable: true,
-  get: function () { return chunk666JN2DO_cjs.createAttachmentUpload; }
+  get: function () { return chunkZFL7RPT6_cjs.createAttachmentUpload; }
 });
 Object.defineProperty(exports, "createClient", {
   enumerable: true,
-  get: function () { return chunk666JN2DO_cjs.createClient; }
+  get: function () { return chunkZFL7RPT6_cjs.createClient; }
 });
 Object.defineProperty(exports, "createObjectSpecifierFromPrimaryKey", {
   enumerable: true,
-  get: function () { return chunk666JN2DO_cjs.createObjectSpecifierFromPrimaryKey; }
+  get: function () { return chunkZFL7RPT6_cjs.createObjectSpecifierFromPrimaryKey; }
 });
 Object.defineProperty(exports, "extractPrimaryKeyFromObjectSpecifier", {
   enumerable: true,
-  get: function () { return chunk666JN2DO_cjs.extractPrimaryKeyFromObjectSpecifier; }
+  get: function () { return chunkZFL7RPT6_cjs.extractPrimaryKeyFromObjectSpecifier; }
 });
 Object.defineProperty(exports, "isOk", {
   enumerable: true,

package/build/cjs/public/internal.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkRDZ5NKAI_cjs = require('../chunk-RDZ5NKAI.cjs');
+var chunkVVKEXIIO_cjs = require('../chunk-VVKEXIIO.cjs');
 var chunkLDTMSHUZ_cjs = require('../chunk-LDTMSHUZ.cjs');
 
 // src/public/internal.ts
@@ -9,8 +9,8 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 // src/public-utils/createAndFetchTempObjectSetRid.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 async function createAndFetchTempObjectSetRid(client, objectSet) {
-  const response = await chunkRDZ5NKAI_cjs.OntologyObjectSet_exports.createTemporary(client, await client[chunkRDZ5NKAI_cjs.additionalContext].ontologyRid, {
-    objectSet: chunkRDZ5NKAI_cjs.getWireObjectSet(objectSet)
+  const response = await chunkVVKEXIIO_cjs.OntologyObjectSet_exports.createTemporary(client, await client[chunkVVKEXIIO_cjs.additionalContext].ontologyRid, {
+    objectSet: chunkVVKEXIIO_cjs.getWireObjectSet(objectSet)
   });
   return response.objectSetRid;
 }
@@ -18,7 +18,7 @@ async function createAndFetchTempObjectSetRid(client, objectSet) {
 // src/public-utils/hydrateObjectSetFromObjectRids.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 function hydrateObjectSetFromObjectRids(client, definition, rids) {
-  return chunkRDZ5NKAI_cjs.createObjectSet(definition, client[chunkRDZ5NKAI_cjs.additionalContext], {
+  return chunkVVKEXIIO_cjs.createObjectSet(definition, client[chunkVVKEXIIO_cjs.additionalContext], {
     type: "intersect",
     objectSets: [definition.type === "interface" ? {
       type: "interfaceBase",
@@ -39,7 +39,7 @@ function asMutableArray(array) {
 // src/public-utils/hydrateObjectSetFromRid.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 function hydrateObjectSetFromRid(client, definition, rid) {
-  return chunkRDZ5NKAI_cjs.createObjectSet(definition, client[chunkRDZ5NKAI_cjs.additionalContext], {
+  return chunkVVKEXIIO_cjs.createObjectSet(definition, client[chunkVVKEXIIO_cjs.additionalContext], {
     type: "intersect",
     objectSets: [definition.type === "interface" ? {
       type: "interfaceBase",
@@ -81,7 +81,7 @@ var levelStyles = {
     color: "orange"
   })
 };
-var BrowserLogger = class _BrowserLogger extends chunkRDZ5NKAI_cjs.BaseLogger {
+var BrowserLogger = class _BrowserLogger extends chunkVVKEXIIO_cjs.BaseLogger {
   constructor(bindings = {}, options = {}) {
     super(bindings, {
       ...options,
@@ -107,11 +107,11 @@ var BrowserLogger = class _BrowserLogger extends chunkRDZ5NKAI_cjs.BaseLogger {
 
 Object.defineProperty(exports, "MinimalLogger", {
   enumerable: true,
-  get: function () { return chunkRDZ5NKAI_cjs.MinimalLogger; }
+  get: function () { return chunkVVKEXIIO_cjs.MinimalLogger; }
 });
 Object.defineProperty(exports, "hydrateAttachmentFromRid", {
   enumerable: true,
-  get: function () { return chunkRDZ5NKAI_cjs.hydrateAttachmentFromRid; }
+  get: function () { return chunkVVKEXIIO_cjs.hydrateAttachmentFromRid; }
 });
 exports.BrowserLogger = BrowserLogger;
 exports.createAndFetchTempObjectSetRid = createAndFetchTempObjectSetRid;

package/build/cjs/public/unstable-do-not-use.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk666JN2DO_cjs = require('../chunk-666JN2DO.cjs');
-var chunkRDZ5NKAI_cjs = require('../chunk-RDZ5NKAI.cjs');
+var chunkZFL7RPT6_cjs = require('../chunk-ZFL7RPT6.cjs');
+var chunkVVKEXIIO_cjs = require('../chunk-VVKEXIIO.cjs');
 var chunkLDTMSHUZ_cjs = require('../chunk-LDTMSHUZ.cjs');
 var trie = require('@wry/trie');
 var deepEqual = require('fast-deep-equal');
@@ -153,7 +153,7 @@ var WhereClauseCanonicalizer = class {
 var whereCanonicalizer = new WhereClauseCanonicalizer();
 var orderByCanonicalizer = new OrderByCanonicalizer();
 function computeObjectSetCacheKey(objectSet, options) {
-  const keyParts = ["objectSet", chunkRDZ5NKAI_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkVVKEXIIO_cjs.getWireObjectSet(objectSet)];
   if (!options) {
     return JSON.stringify(keyParts);
   }
@@ -165,13 +165,13 @@ function computeObjectSetCacheKey(objectSet, options) {
     keyParts.push("props", propKeys);
   }
   if (options.union && options.union.length > 0) {
-    keyParts.push("union", options.union.map((os) => chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkVVKEXIIO_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkVVKEXIIO_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkVVKEXIIO_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -234,7 +234,7 @@ var ObservableClientImpl = class {
   observeFunction = (queryDef, params, options, subFn) => {
     const dependsOn = options.dependsOn?.map((dep) => typeof dep === "string" ? dep : dep.apiName);
     const dependsOnObjects = options.dependsOnObjects?.map((obj) => ({
-      $apiName: obj.$apiName,
+      $apiName: obj.$objectType ?? obj.$apiName,
       $primaryKey: obj.$primaryKey
     }));
     return this.__experimentalStore.functions.observe({
@@ -254,7 +254,7 @@ var ObservableClientImpl = class {
           ...options,
           srcType: {
             type: "object",
-            apiName: obj.$apiName
+            apiName: obj.$objectType ?? obj.$apiName
           },
           linkName,
           pk: obj.$primaryKey
@@ -371,7 +371,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkRDZ5NKAI_cjs.additionalContext].objectFactory2(store.client[chunkRDZ5NKAI_cjs.additionalContext], [{
+        const create = store.client[chunkVVKEXIIO_cjs.additionalContext].objectFactory2(store.client[chunkVVKEXIIO_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -593,7 +593,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger : store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger : store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -751,7 +751,7 @@ var Query = class {
 // src/observable/internal/aggregation/AggregationQuery.ts
 var AggregationQuery = class extends Query {
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -998,7 +998,7 @@ var Changes = class {
   modified = /* @__PURE__ */ new Set();
   deleted = /* @__PURE__ */ new Set();
   registerObject = (cacheKey, data, isNew) => {
-    this[isNew ? "addedObjects" : "modifiedObjects"].set(data.$apiName, data);
+    this[isNew ? "addedObjects" : "modifiedObjects"].set(data.$objectType ?? data.$apiName, data);
     this[isNew ? "added" : "modified"].add(cacheKey);
   };
   deleteObject = (cacheKey) => {
@@ -1122,15 +1122,16 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunk666JN2DO_cjs.isObjectSpecifiersObject(value)) {
-      path.push("$:osdk", value.$apiName, value.$primaryKey);
+    if (chunkZFL7RPT6_cjs.isObjectSpecifiersObject(value)) {
+      const objectType = value.$objectType ?? value.$apiName;
+      path.push("$:osdk", objectType, value.$primaryKey);
       return {
-        $apiName: value.$apiName,
+        $apiName: objectType,
         $primaryKey: value.$primaryKey
       };
     }
-    if (chunkRDZ5NKAI_cjs.isObjectSet(value)) {
-      const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(value);
+    if (chunkVVKEXIIO_cjs.isObjectSet(value)) {
+      const wire = chunkVVKEXIIO_cjs.getWireObjectSet(value);
       path.push("$:objectset", wire);
       return wire;
     }
@@ -1193,7 +1194,7 @@ var FunctionQuery = class extends Query {
   #dependsOnObjects;
   #queryDef;
   constructor(store, subject, queryDef, params, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = queryDef.apiName;
@@ -1227,7 +1228,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunk666JN2DO_cjs.applyQuery(this.store.client[chunkRDZ5NKAI_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunkZFL7RPT6_cjs.applyQuery(this.store.client[chunkVVKEXIIO_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -2303,7 +2304,7 @@ var BaseListQuery = class extends Query {
       }).debug("Removing object", object);
     }
     this.store.batch({}, (batch) => {
-      const objectCacheKey = this.store.cacheKeys.get("object", object.$apiName, object.$primaryKey);
+      const objectCacheKey = this.store.cacheKeys.get("object", object.$objectType ?? object.$apiName, object.$primaryKey);
       batch.delete(objectCacheKey, "loaded");
     });
   }
@@ -2323,7 +2324,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
     batch.changes.modified.add(this.cacheKey);
   }
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `SpecificLinkQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     [this.#sourceApiName, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
@@ -2339,7 +2340,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkRDZ5NKAI_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkVVKEXIIO_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       const linkDef = sourceMetadata.links?.[this.#linkName];
       if (!linkDef?.targetType) {
@@ -2410,7 +2411,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkRDZ5NKAI_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkVVKEXIIO_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -2718,7 +2719,7 @@ var ListQuery = class extends BaseListQuery {
     batch.changes.registerList(this.cacheKey);
   }
   constructor(store, subject, apiName, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -2756,10 +2757,10 @@ var ListQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkRDZ5NKAI_cjs.getWireObjectSet(this.#objectSet);
+      const wireObjectSet = chunkVVKEXIIO_cjs.getWireObjectSet(this.#objectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkRDZ5NKAI_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkVVKEXIIO_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
     }
     const resp = await this.#objectSet.fetchPage({
@@ -3005,9 +3006,20 @@ var InterfaceListQuery = class extends ListQuery {
   async postProcessFetchedData(data) {
     return reloadDataAsFullObjects(this.store.client, data);
   }
+  createPayload(params) {
+    const resolvedList = params.resolvedData.map((obj) => obj.$as(this.apiName));
+    return {
+      resolvedList,
+      isOptimistic: params.isOptimistic,
+      fetchMore: this.fetchMore,
+      hasMore: this.nextPageToken != null,
+      status: params.status,
+      lastUpdated: params.lastUpdated
+    };
+  }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunk666JN2DO_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkZFL7RPT6_cjs.ObjectDefRef].interfaceMap;
     };
     const added = Array.from(changes.addedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.apiName));
     const modified = Array.from(changes.modifiedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.apiName));
@@ -3026,9 +3038,15 @@ var InterfaceListQuery = class extends ListQuery {
   }
 };
 async function reloadDataAsFullObjects(client, data) {
+  if (data.length === 0) {
+    return data;
+  }
   const groups = groupBy__default.default(data, (x) => x.$objectType);
   const objectTypeToPrimaryKeyToObject = Object.fromEntries(await Promise.all(Object.entries(groups).map(async ([apiName, objects]) => {
-    const objectDef = objects[0][chunk666JN2DO_cjs.UnderlyingOsdkObject][chunk666JN2DO_cjs.ObjectDefRef];
+    const objectDef = await client.fetchMetadata({
+      type: "object",
+      apiName
+    });
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -3037,11 +3055,11 @@ async function reloadDataAsFullObjects(client, data) {
     const result = await client(objectDef).where(where).fetchPage();
     return [apiName, Object.fromEntries(result.data.map((x) => [x.$primaryKey, x]))];
   })));
-  data = data.map((obj) => {
-    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant5__default.default(false) : void 0;
-    return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
+  return data.map((obj) => {
+    const fullObject = objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
+    !fullObject ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant5__default.default(false) : void 0;
+    return fullObject;
   });
-  return data;
 }
 
 // src/observable/internal/list/ObjectListQuery.ts
@@ -3189,8 +3207,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunk666JN2DO_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunk666JN2DO_cjs.ObjectDefRef];
+  const underlying = value[chunkZFL7RPT6_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkZFL7RPT6_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3202,7 +3220,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunk666JN2DO_cjs.createOsdkObject(value[chunk666JN2DO_cjs.ClientRef], objectDef, newProps);
+  return chunkZFL7RPT6_cjs.createOsdkObject(value[chunkZFL7RPT6_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3213,8 +3231,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunk666JN2DO_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunk666JN2DO_cjs.ObjectDefRef];
+  const underlying = value[chunkZFL7RPT6_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkZFL7RPT6_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3229,7 +3247,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunk666JN2DO_cjs.createOsdkObject(value[chunk666JN2DO_cjs.ClientRef], objectDef, newProps);
+  return chunkZFL7RPT6_cjs.createOsdkObject(value[chunkZFL7RPT6_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3241,8 +3259,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunk666JN2DO_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunk666JN2DO_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkZFL7RPT6_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkZFL7RPT6_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3255,14 +3273,14 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunk666JN2DO_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkZFL7RPT6_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
       if (!sourceRdpFields.has(field) && field in targetUnderlying) {
         newProps[field] = targetUnderlying[field];
       }
     }
   }
-  return chunk666JN2DO_cjs.createOsdkObject(sourceValue[chunk666JN2DO_cjs.ClientRef], objectDef, newProps);
+  return chunkZFL7RPT6_cjs.createOsdkObject(sourceValue[chunkZFL7RPT6_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3397,7 +3415,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkRDZ5NKAI_cjs.additionalContext].logger;
+    this.#logger = client[chunkVVKEXIIO_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -3465,7 +3483,7 @@ var ObjectQuery = class extends Query {
   #apiName;
   #pk;
   constructor(store, subject, type, pk, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -3544,7 +3562,7 @@ var ObjectsHelper = class extends AbstractHelper {
    */
   storeOsdkInstances(values, batch, rdpConfig) {
     return values.map((v) => this.getQuery({
-      apiName: v.$apiName,
+      apiName: v.$objectType ?? v.$apiName,
       pk: v.$primaryKey
     }, rdpConfig).writeToStore(v, "loaded", batch).cacheKey);
   }
@@ -3613,7 +3631,7 @@ var ObjectSetQuery = class extends BaseListQuery {
   #composedObjectSet;
   #objectTypes;
   constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -3658,7 +3676,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(os);
+        const wire = chunkVVKEXIIO_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3666,7 +3684,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(os);
+        const wire = chunkVVKEXIIO_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3674,7 +3692,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(os);
+        const wire = chunkVVKEXIIO_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3694,10 +3712,10 @@ var ObjectSetQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkRDZ5NKAI_cjs.getWireObjectSet(this.#composedObjectSet);
+      const wireObjectSet = chunkVVKEXIIO_cjs.getWireObjectSet(this.#composedObjectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkRDZ5NKAI_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkVVKEXIIO_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#operations.orderBy);
     }
     const resp = await this.#composedObjectSet.fetchPage({
@@ -3762,7 +3780,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -3778,13 +3796,13 @@ var ObjectSetHelper = class extends AbstractHelper {
       operations.withProperties = Object.keys(options.withProperties).sort();
     }
     if (options.union && options.union.length > 0) {
-      operations.union = options.union.map((os) => JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -3856,7 +3874,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkRDZ5NKAI_cjs.createWithPropertiesObjectSet(
+      const builder = chunkVVKEXIIO_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -3907,7 +3925,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -4180,10 +4198,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunk666JN2DO_cjs.createClientFromContext({
-    ...client[chunkRDZ5NKAI_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkRDZ5NKAI_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk666JN2DO_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkZFL7RPT6_cjs.createClientFromContext({
+    ...client[chunkVVKEXIIO_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkVVKEXIIO_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkZFL7RPT6_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -4227,11 +4245,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunk666JN2DO_cjs.createClientWithTransaction; }
+  get: function () { return chunkZFL7RPT6_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkRDZ5NKAI_cjs.augment; }
+  get: function () { return chunkVVKEXIIO_cjs.augment; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;