@osdk/client 2.8.0-beta.4 → 2.8.0-beta.6

package/build/cjs/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkRKC3366I_cjs = require('./chunk-RKC3366I.cjs');
+var chunkHCG4XO6Z_cjs = require('./chunk-HCG4XO6Z.cjs');
 require('./chunk-O22QYBFF.cjs');
 var chunkLDTMSHUZ_cjs = require('./chunk-LDTMSHUZ.cjs');
 var api = require('@osdk/api');
@@ -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, chunkRKC3366I_cjs.USER_AGENT, fetchFn);
+  return shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, chunkHCG4XO6Z_cjs.USER_AGENT, fetchFn);
 }
 
 // src/util/datetimeConverters.ts
@@ -45,23 +45,23 @@ var extractDateFromIsoString = (dateTime) => {
 
 Object.defineProperty(exports, "ActionValidationError", {
   enumerable: true,
-  get: function () { return chunkRKC3366I_cjs.ActionValidationError; }
+  get: function () { return chunkHCG4XO6Z_cjs.ActionValidationError; }
 });
 Object.defineProperty(exports, "createAttachmentUpload", {
   enumerable: true,
-  get: function () { return chunkRKC3366I_cjs.createAttachmentUpload; }
+  get: function () { return chunkHCG4XO6Z_cjs.createAttachmentUpload; }
 });
 Object.defineProperty(exports, "createClient", {
   enumerable: true,
-  get: function () { return chunkRKC3366I_cjs.createClient; }
+  get: function () { return chunkHCG4XO6Z_cjs.createClient; }
 });
 Object.defineProperty(exports, "createObjectSpecifierFromPrimaryKey", {
   enumerable: true,
-  get: function () { return chunkRKC3366I_cjs.createObjectSpecifierFromPrimaryKey; }
+  get: function () { return chunkHCG4XO6Z_cjs.createObjectSpecifierFromPrimaryKey; }
 });
 Object.defineProperty(exports, "extractPrimaryKeyFromObjectSpecifier", {
   enumerable: true,
-  get: function () { return chunkRKC3366I_cjs.extractPrimaryKeyFromObjectSpecifier; }
+  get: function () { return chunkHCG4XO6Z_cjs.extractPrimaryKeyFromObjectSpecifier; }
 });
 Object.defineProperty(exports, "isOk", {
   enumerable: true,

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkRKC3366I_cjs = require('../chunk-RKC3366I.cjs');
+var chunkHCG4XO6Z_cjs = require('../chunk-HCG4XO6Z.cjs');
 var chunkO22QYBFF_cjs = require('../chunk-O22QYBFF.cjs');
 var chunkLDTMSHUZ_cjs = require('../chunk-LDTMSHUZ.cjs');
 var trie = require('@wry/trie');
@@ -257,24 +257,8 @@ var ObservableClientImpl = class {
   };
   observeLinks = (objects, linkName, options, subFn) => {
     const objectsArray = Array.isArray(objects) ? objects : [objects];
-    const parentSub = new rxjs.Subscription();
-    for (const obj of objectsArray) {
-      const querySubscription = this.__experimentalStore.links.observe(
-        {
-          ...options,
-          srcType: {
-            type: "object",
-            apiName: obj.$objectType ?? obj.$apiName
-          },
-          linkName,
-          pk: obj.$primaryKey
-        },
-        // cast to cross typed to untyped barrier
-        subFn
-      );
-      parentSub.add(querySubscription);
-    }
-    return new UnsubscribableWrapper(parentSub);
+    const observer = subFn;
+    return objectsArray.length <= 1 ? observeSingleLink(this.__experimentalStore, objectsArray, linkName, options, observer) : observeMultiLinks(this.__experimentalStore, objectsArray, linkName, options, observer);
   };
   observeObjectSet(baseObjectSet, options, subFn) {
     return this.__experimentalStore.objectSets.observe(
@@ -305,6 +289,110 @@ var ObservableClientImpl = class {
     return this.__experimentalStore.whereCanonicalizer.canonicalize(where);
   }
 };
+function observeSingleLink(store, objectsArray, linkName, options, observer) {
+  if (objectsArray.length === 0) {
+    observer.next({
+      resolvedList: [],
+      isOptimistic: false,
+      lastUpdated: 0,
+      fetchMore: () => Promise.resolve(),
+      hasMore: false,
+      status: "loaded",
+      totalCount: "0"
+    });
+    return new UnsubscribableWrapper(new rxjs.Subscription());
+  }
+  const parentSub = new rxjs.Subscription();
+  for (const obj of objectsArray) {
+    parentSub.add(store.links.observe({
+      ...options,
+      srcType: {
+        type: "object",
+        apiName: obj.$objectType ?? obj.$apiName
+      },
+      linkName,
+      pk: obj.$primaryKey
+    }, observer));
+  }
+  return new UnsubscribableWrapper(parentSub);
+}
+function observeMultiLinks(store, objectsArray, linkName, options, observer) {
+  const parentSub = new rxjs.Subscription();
+  const totalExpected = objectsArray.length;
+  const perObjectResults = /* @__PURE__ */ new Map();
+  let errored = false;
+  function mergeAndEmit() {
+    if (errored) {
+      return;
+    }
+    const seen = /* @__PURE__ */ new Map();
+    const fetchMores = [];
+    let latestUpdated = 0;
+    let hasMore = false;
+    let isOptimistic = false;
+    for (const payload of perObjectResults.values()) {
+      for (const obj of payload.resolvedList) {
+        seen.set(`${obj.$objectType}:${obj.$primaryKey}`, obj);
+      }
+      if (payload.lastUpdated > latestUpdated) {
+        latestUpdated = payload.lastUpdated;
+      }
+      if (payload.isOptimistic) {
+        isOptimistic = true;
+      }
+      if (payload.hasMore) {
+        hasMore = true;
+        fetchMores.push(payload.fetchMore);
+      }
+    }
+    const payloads = [...perObjectResults.values()];
+    const loading = perObjectResults.size < totalExpected || payloads.some((p) => p.status === "init" || p.status === "loading");
+    observer.next({
+      resolvedList: Array.from(seen.values()),
+      isOptimistic,
+      lastUpdated: latestUpdated,
+      fetchMore: hasMore ? () => Promise.all(fetchMores.map((fn) => fn())).then(() => {
+      }) : () => Promise.resolve(),
+      hasMore,
+      status: loading ? "loading" : payloads.some((p) => p.status === "error") ? "error" : "loaded",
+      ...!hasMore ? {
+        totalCount: String(seen.size)
+      } : {}
+    });
+  }
+  for (const obj of objectsArray) {
+    const objKey = `${obj.$objectType ?? obj.$apiName}:${obj.$primaryKey}`;
+    parentSub.add(store.links.observe({
+      ...options,
+      srcType: {
+        type: "object",
+        apiName: obj.$objectType ?? obj.$apiName
+      },
+      linkName,
+      pk: obj.$primaryKey
+    }, {
+      next: (payload) => {
+        if (errored) {
+          return;
+        }
+        perObjectResults.set(objKey, payload);
+        mergeAndEmit();
+      },
+      error: (err) => {
+        if (errored) {
+          return;
+        }
+        errored = true;
+        parentSub.unsubscribe();
+        observer.error(err);
+      },
+      // store link queries are long-lived and do not complete
+      complete: () => {
+      }
+    }));
+  }
+  return new UnsubscribableWrapper(parentSub);
+}
 
 // src/observable/internal/Store.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
@@ -487,18 +575,13 @@ var ActionApplication = class {
           objectType,
           primaryKey
         } of deletedObjects ?? []) {
-          const cacheKey = this.store.cacheKeys.get(
-            "object",
-            objectType,
-            primaryKey,
-            /* rdpConfig */
-            void 0
-          );
-          this.store.queries.peek(cacheKey)?.deleteFromStore(
-            "loaded",
-            // this is probably not the best value to use
-            batch
-          );
+          for (const cacheKey of this.store.objectCacheKeyRegistry.getVariants(objectType, primaryKey)) {
+            this.store.queries.peek(cacheKey)?.deleteFromStore(
+              "loaded",
+              // this is probably not the best value to use
+              batch
+            );
+          }
         }
       });
       await Promise.all(promisesToWait);
@@ -531,6 +614,7 @@ var ListQueryView = class {
   #viewLimit;
   #pageSize;
   #viewId;
+  #hasAutoFetch;
   #fetchMore;
   #pendingFetchMore;
   #lastPayload;
@@ -539,8 +623,8 @@ var ListQueryView = class {
     this.#query = query;
     this.#pageSize = pageSize;
     this.#viewId = `view_${++viewIdCounter}`;
-    const hasAutoFetch = autoFetchMore === true || typeof autoFetchMore === "number" && autoFetchMore > 0;
-    this.#viewLimit = hasAutoFetch ? Number.MAX_SAFE_INTEGER : pageSize;
+    this.#hasAutoFetch = autoFetchMore === true || typeof autoFetchMore === "number" && autoFetchMore > 0;
+    this.#viewLimit = this.#hasAutoFetch ? Number.MAX_SAFE_INTEGER : pageSize;
     this.#fetchMore = this.#createFetchMore();
     query.registerFetchPageSize(this.#viewId, pageSize);
   }
@@ -550,6 +634,9 @@ var ListQueryView = class {
       next: (payload) => {
         this.#lastPayload = payload;
         observer.next?.(this.#transformPayload(payload));
+        if (!this.#hasAutoFetch && payload.status === "loaded" && payload.resolvedList.length < this.#viewLimit && this.#query.hasMorePages()) {
+          void this.#query.fetchMore();
+        }
       },
       error: (err) => observer.error?.(err),
       complete: () => observer.complete?.()
@@ -572,7 +659,8 @@ var ListQueryView = class {
       ...payload,
       resolvedList: payload.resolvedList.slice(0, this.#viewLimit),
       hasMore: this.#viewLimit < loadedCount || payload.hasMore,
-      fetchMore: this.#fetchMore
+      fetchMore: this.#fetchMore,
+      status: loadedCount >= this.#viewLimit && payload.status === "loading" ? "loaded" : payload.status
     };
   }
   #createFetchMore() {
@@ -635,7 +723,16 @@ var AbstractHelper = class {
     return this._subscribe(query, options, subFn);
   }
   _subscribe(query, options, subFn) {
-    this.store.cacheKeys.retain(query.cacheKey);
+    const pendingCleanupCount = this.store.pendingCleanup.get(query.cacheKey) ?? 0;
+    if (pendingCleanupCount > 0) {
+      if (pendingCleanupCount === 1) {
+        this.store.pendingCleanup.delete(query.cacheKey);
+      } else {
+        this.store.pendingCleanup.set(query.cacheKey, pendingCleanupCount - 1);
+      }
+    } else {
+      this.store.cacheKeys.retain(query.cacheKey);
+    }
     if (options.mode !== "offline") {
       query.revalidate(options.mode === "force").catch((e) => {
         subFn.error(e);
@@ -653,7 +750,18 @@ var AbstractHelper = class {
     query.registerSubscriptionDedupeInterval(querySub.subscriptionId, options.dedupeInterval);
     sub.add(() => {
       query.unregisterSubscriptionDedupeInterval(querySub.subscriptionId);
-      this.store.cacheKeys.release(query.cacheKey);
+      this.store.pendingCleanup.set(query.cacheKey, (this.store.pendingCleanup.get(query.cacheKey) ?? 0) + 1);
+      queueMicrotask(() => {
+        const currentPending = this.store.pendingCleanup.get(query.cacheKey) ?? 0;
+        if (currentPending > 0) {
+          if (currentPending === 1) {
+            this.store.pendingCleanup.delete(query.cacheKey);
+          } else {
+            this.store.pendingCleanup.set(query.cacheKey, currentPending - 1);
+          }
+          this.store.cacheKeys.release(query.cacheKey);
+        }
+      });
     });
     return querySub;
   }
@@ -1049,16 +1157,26 @@ var CacheKeys = class {
     });
   }
   get(type, ...args) {
-    const normalizedArgs = [...args];
-    while (normalizedArgs.length > 0 && normalizedArgs[normalizedArgs.length - 1] === void 0) {
-      normalizedArgs.pop();
-    }
-    const cacheKeyArgs = [type, ...normalizedArgs];
+    const cacheKeyArgs = this.#normalizeArgs(type, args);
     if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
     const cacheKey = this.#cacheKeys.lookupArray(cacheKeyArgs);
     this.#refCounts.register(cacheKey);
     return cacheKey;
   }
+  /**
+   * Look up an existing cache key without creating or registering it.
+   * Returns undefined if the key does not exist in the trie.
+   */
+  peek(type, ...args) {
+    return this.#cacheKeys.peekArray(this.#normalizeArgs(type, args));
+  }
+  #normalizeArgs(type, args) {
+    const normalizedArgs = [...args];
+    while (normalizedArgs.length > 0 && normalizedArgs[normalizedArgs.length - 1] === void 0) {
+      normalizedArgs.pop();
+    }
+    return [type, ...normalizedArgs];
+  }
   retain(cacheKey) {
     this.#refCounts.retain(cacheKey);
   }
@@ -1211,7 +1329,7 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunkRKC3366I_cjs.isObjectSpecifiersObject(value)) {
+    if (chunkHCG4XO6Z_cjs.isObjectSpecifiersObject(value)) {
       const objectType = value.$objectType ?? value.$apiName;
       path.push("$:osdk", objectType, value.$primaryKey);
       return {
@@ -1340,7 +1458,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunkRKC3366I_cjs.applyQuery(this.store.client[chunkO22QYBFF_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunkHCG4XO6Z_cjs.applyQuery(this.store.client[chunkO22QYBFF_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -2145,11 +2263,9 @@ var BaseListQuery = class extends Query {
       return this.pendingPageFetch;
     }
     if (this.pendingFetch) {
-      this.pendingPageFetch = (async () => {
-        await this.pendingFetch;
-        await this.fetchMore();
-      })().finally(() => {
+      this.pendingPageFetch = this.pendingFetch.then(() => {
         this.pendingPageFetch = void 0;
+        return this.fetchMore();
       });
       return this.pendingPageFetch;
     }
@@ -2483,8 +2599,9 @@ var BaseListQuery = class extends Query {
       }).debug("Removing object", object);
     }
     this.store.batch({}, (batch) => {
-      const objectCacheKey = this.store.cacheKeys.get("object", object.$objectType ?? object.$apiName, object.$primaryKey);
-      batch.delete(objectCacheKey, "loaded");
+      for (const objectCacheKey of this.store.objectCacheKeyRegistry.getVariants(object.$objectType ?? object.$apiName, object.$primaryKey)) {
+        batch.delete(objectCacheKey, "loaded");
+      }
     });
   }
 };
@@ -3206,7 +3323,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkRKC3366I_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkHCG4XO6Z_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));
@@ -3265,10 +3382,21 @@ var ObjectListQuery = class extends ListQuery {
       apiName: this.apiName
     };
     if (pivotInfo != null) {
-      let sourceSet = store.client({
-        type: "object",
-        apiName: pivotInfo.sourceType
-      });
+      let sourceSet;
+      if (rids != null) {
+        sourceSet = clientCtx.objectSetFactory({
+          type: "object",
+          apiName: pivotInfo.sourceType
+        }, clientCtx, {
+          type: "static",
+          objects: [...rids]
+        });
+      } else {
+        sourceSet = store.client({
+          type: "object",
+          apiName: pivotInfo.sourceType
+        });
+      }
       sourceSet = sourceSet.where(this.canonicalWhere);
       let objectSet2 = sourceSet.pivotTo(pivotInfo.linkName);
       if (rdpConfig != null) {
@@ -3410,8 +3538,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunkRKC3366I_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkRKC3366I_cjs.ObjectDefRef];
+  const underlying = value[chunkHCG4XO6Z_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkHCG4XO6Z_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3424,7 +3552,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunkRKC3366I_cjs.createOsdkObject(value[chunkRKC3366I_cjs.ClientRef], objectDef, newProps);
+  return chunkHCG4XO6Z_cjs.createOsdkObject(value[chunkHCG4XO6Z_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3435,8 +3563,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunkRKC3366I_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkRKC3366I_cjs.ObjectDefRef];
+  const underlying = value[chunkHCG4XO6Z_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkHCG4XO6Z_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3452,7 +3580,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunkRKC3366I_cjs.createOsdkObject(value[chunkRKC3366I_cjs.ClientRef], objectDef, newProps);
+  return chunkHCG4XO6Z_cjs.createOsdkObject(value[chunkHCG4XO6Z_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3464,8 +3592,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunkRKC3366I_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunkRKC3366I_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkHCG4XO6Z_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkHCG4XO6Z_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3479,14 +3607,16 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunkRKC3366I_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkHCG4XO6Z_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
-      if (!sourceRdpFields.has(field) && field in targetUnderlying) {
-        newProps[field] = targetUnderlying[field];
+      if (field in targetUnderlying) {
+        if (!sourceRdpFields.has(field) || newProps[field] === void 0) {
+          newProps[field] = targetUnderlying[field];
+        }
       }
     }
   }
-  return chunkRKC3366I_cjs.createOsdkObject(sourceValue[chunkRKC3366I_cjs.ClientRef], objectDef, newProps);
+  return chunkHCG4XO6Z_cjs.createOsdkObject(sourceValue[chunkHCG4XO6Z_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3818,11 +3948,18 @@ var ObjectsHelper = class extends AbstractHelper {
     }
   }
   /**
-   * Check if a cache key is actively observed
+   * Check if a cache key is actively observed or pending cleanup.
+   * During React unmount-remount cycles, a key may be momentarily
+   * unobserved while its cleanup is deferred to a microtask.
+   * We still propagate to such keys to prevent stale data when
+   * the subscription is re-established.
    */
   isKeyActive(key) {
     const subject = this.store.subjects.peek(key);
-    return subject?.observed === true;
+    if (subject?.observed === true) {
+      return true;
+    }
+    return (this.store.pendingCleanup.get(key) ?? 0) > 0;
   }
   /**
    * Type guard to check if a value is an ObjectHolder
@@ -3866,6 +4003,9 @@ var ObjectSetQuery = class extends BaseListQuery {
       this.minResultsToLoad = opts.pageSize || 0;
     }
   }
+  get rdpConfig() {
+    return this.#operations.withProperties ?? null;
+  }
   #composeObjectSet(opts) {
     let result = opts.baseObjectSet;
     if (opts.withProperties) {
@@ -3988,10 +4128,11 @@ var ObjectSetQuery = class extends BaseListQuery {
 
 // src/observable/internal/objectset/ObjectSetHelper.ts
 var ObjectSetHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2) {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer) {
     super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer2;
     this.orderByCanonicalizer = orderByCanonicalizer2;
+    this.rdpCanonicalizer = rdpCanonicalizer;
   }
   observe(options, subFn) {
     const ret = super.observe(options, subFn);
@@ -4017,7 +4158,7 @@ var ObjectSetHelper = class extends AbstractHelper {
       operations.where = this.whereCanonicalizer.canonicalize(options.where);
     }
     if (options.withProperties) {
-      operations.withProperties = Object.keys(options.withProperties).sort();
+      operations.withProperties = this.rdpCanonicalizer.canonicalize(options.withProperties);
     }
     if (options.union && options.union.length > 0) {
       operations.union = options.union.map((os) => JSON.stringify(chunkO22QYBFF_cjs.getWireObjectSet(os)));
@@ -4158,6 +4299,17 @@ var Store = class {
   ridListCanonicalizer = new RidListCanonicalizer();
   /** @internal */
   queries = new Queries();
+  /**
+   * Tracks cache keys with deferred cleanup. During React unmount-remount
+   * cycles, a subscription may be cleaned up and immediately re-created.
+   * By deferring cleanup to a microtask, we prevent propagateWrite from
+   * skipping keys that are momentarily between subscriptions.
+   *
+   * The value is a count (not a boolean) so multiple unsubscribes within the
+   * same tick schedule the correct number of releases.
+   * @internal
+   */
+  pendingCleanup = /* @__PURE__ */ new Map();
   objectCacheKeyRegistry = new ObjectCacheKeyRegistry();
   layers = new Layers({
     logger: this.logger,
@@ -4178,7 +4330,7 @@ var Store = class {
     this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.intersectCanonicalizer, this.pivotCanonicalizer, this.ridListCanonicalizer);
     this.objects = new ObjectsHelper(this, this.cacheKeys);
     this.links = new LinksHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
-    this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
+    this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer);
   }
   /**
    * Called after a key is no longer retained and the timeout has elapsed
@@ -4340,6 +4492,11 @@ var Store = class {
         return cacheKey.otherKeys[RDP_IDX2];
       } else if (cacheKey.type === "aggregation") {
         return cacheKey.otherKeys[RDP_IDX];
+      } else if (cacheKey.type === "objectSet") {
+        const query = this.queries.peek(cacheKey);
+        if (query) {
+          return query.rdpConfig;
+        }
       }
     }
     return void 0;
@@ -4439,10 +4596,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkRKC3366I_cjs.createClientFromContext({
+  const tweakedClient = chunkHCG4XO6Z_cjs.createClientFromContext({
     ...client[chunkO22QYBFF_cjs.additionalContext],
     fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkO22QYBFF_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkRKC3366I_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkHCG4XO6Z_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -4486,7 +4643,7 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkRKC3366I_cjs.createClientWithTransaction; }
+  get: function () { return chunkHCG4XO6Z_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,