@osdk/client 2.6.0-beta.3 → 2.6.0-beta.5

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var chunkBRYZR53E_cjs = require('../chunk-BRYZR53E.cjs');
-var chunk6L3MX4LH_cjs = require('../chunk-6L3MX4LH.cjs');
+var chunkOSI7NG7T_cjs = require('../chunk-OSI7NG7T.cjs');
+var chunkVNLY3YOJ_cjs = require('../chunk-VNLY3YOJ.cjs');
 require('../chunk-Q7SFCCGT.cjs');
 var trie = require('@wry/trie');
-var deepEqual5 = require('fast-deep-equal');
-var invariant3 = require('tiny-invariant');
+var deepEqual = require('fast-deep-equal');
+var invariant4 = require('tiny-invariant');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
 var mnemonist = require('mnemonist');
@@ -14,8 +14,8 @@ var shared_net_errors = require('@osdk/shared.net.errors');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var deepEqual5__default = /*#__PURE__*/_interopDefault(deepEqual5);
-var invariant3__default = /*#__PURE__*/_interopDefault(invariant3);
+var deepEqual__default = /*#__PURE__*/_interopDefault(deepEqual);
+var invariant4__default = /*#__PURE__*/_interopDefault(invariant4);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 
 var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
@@ -62,10 +62,7 @@ var OrderByCanonicalizer = class {
       }
       return result;
     }, []);
-    let data = Object.fromEntries(pairs);
-    if (process.env.NODE_ENV !== "production") {
-      data = Object.freeze(data);
-    }
+    const data = Object.fromEntries(pairs);
     return data;
   });
   canonicalize = (orderBy) => {
@@ -105,7 +102,7 @@ var WhereClauseCanonicalizer = class {
       options: []
     };
     this.#existingOptions.set(cacheKey, lookupEntry);
-    const canon = lookupEntry.options.find((ref) => deepEqual5__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
+    const canon = lookupEntry.options.find((ref) => deepEqual__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
     if (canon === calculatedCanon) {
       lookupEntry.options.push(new WeakRef(canon));
     }
@@ -115,8 +112,8 @@ var WhereClauseCanonicalizer = class {
   #toCanon = (where, set = /* @__PURE__ */ new Set()) => {
     if ("$and" in where) {
       if (process.env.NODE_ENV !== "production") {
-        !Array.isArray(where.$and) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected $and to be an array") : invariant3__default.default(false) : void 0;
-        !(Object.keys(where).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $and to be present") : invariant3__default.default(false) : void 0;
+        !Array.isArray(where.$and) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected $and to be an array") : invariant4__default.default(false) : void 0;
+        !(Object.keys(where).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $and to be present") : invariant4__default.default(false) : void 0;
       }
       if (where.$and.length === 0) {
         return {};
@@ -130,7 +127,7 @@ var WhereClauseCanonicalizer = class {
       if (k === "$and" || k === "$or") {
         return [k, v.map((x) => this.#toCanon(x, set))];
       }
-      if (k !== "$not" && typeof v === "object" && "$eq" in v) {
+      if (k !== "$not" && typeof v === "object" && v != null && "$eq" in v) {
         return [k, v["$eq"]];
       }
       return [k, v];
@@ -142,7 +139,7 @@ var WhereClauseCanonicalizer = class {
 var whereCanonicalizer = new WhereClauseCanonicalizer();
 var orderByCanonicalizer = new OrderByCanonicalizer();
 function computeObjectSetCacheKey(objectSet, options) {
-  const keyParts = ["objectSet", chunk6L3MX4LH_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkVNLY3YOJ_cjs.getWireObjectSet(objectSet)];
   if (!options) {
     return JSON.stringify(keyParts);
   }
@@ -154,13 +151,13 @@ function computeObjectSetCacheKey(objectSet, options) {
     keyParts.push("props", propKeys);
   }
   if (options.union && options.union.length > 0) {
-    keyParts.push("union", options.union.map((os) => chunk6L3MX4LH_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkVNLY3YOJ_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunk6L3MX4LH_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkVNLY3YOJ_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunk6L3MX4LH_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkVNLY3YOJ_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -292,7 +289,7 @@ var OptimisticJob = class {
               store.objects.getQuery({
                 apiName: obj.value.$objectType,
                 pk: obj.value.$primaryKey
-              }).writeToStore(obj.value, "loading", batch);
+              }, void 0).writeToStore(obj.value, "loading", batch);
             } else {
               throw obj;
             }
@@ -301,13 +298,13 @@ var OptimisticJob = class {
             store.objects.getQuery({
               apiName: obj.$objectType,
               pk: obj.$primaryKey
-            }).writeToStore(obj, "loading", batch);
+            }, void 0).writeToStore(obj, "loading", batch);
           }
           for (const obj of deletedObjects) {
             store.objects.getQuery({
               apiName: obj.$objectType,
               pk: obj.$primaryKey
-            }).deleteFromStore("loading", batch);
+            }, void 0).deleteFromStore("loading", batch);
           }
         });
         return batchResult.changes;
@@ -319,7 +316,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunk6L3MX4LH_cjs.additionalContext].objectFactory2(store.client[chunk6L3MX4LH_cjs.additionalContext], [{
+        const create = store.client[chunkVNLY3YOJ_cjs.additionalContext].objectFactory2(store.client[chunkVNLY3YOJ_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -421,7 +418,13 @@ var ActionApplication = class {
           objectType,
           primaryKey
         } of deletedObjects ?? []) {
-          const cacheKey = this.store.cacheKeys.get("object", objectType, primaryKey);
+          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
@@ -438,6 +441,22 @@ var ActionApplication = class {
   };
 };
 
+// src/observable/internal/CacheKey.ts
+function DEBUG_ONLY__cacheKeyToString(x) {
+  if (process.env.NODE_ENV !== "production") {
+    return `${x.type}CacheKey<${x.otherKeys.map((xx) => JSON.stringify(xx)).join(", ")}>`.replaceAll('"', "'");
+  } else {
+    throw new Error("not implemented");
+  }
+}
+function DEBUG_ONLY__cacheKeysToString(x) {
+  if (process.env.NODE_ENV !== "production") {
+    return "\n  - " + x.map(DEBUG_ONLY__cacheKeyToString).join("\n  - ");
+  } else {
+    throw new Error("not implemented");
+  }
+}
+
 // src/observable/internal/RefCounts.ts
 var RefCounts = class {
   refCounts = /* @__PURE__ */ new Map();
@@ -518,7 +537,11 @@ var CacheKeys = class {
     });
   }
   get(type, ...args) {
-    const cacheKeyArgs = [type, ...args];
+    const normalizedArgs = [...args];
+    while (normalizedArgs.length > 0 && normalizedArgs[normalizedArgs.length - 1] === void 0) {
+      normalizedArgs.pop();
+    }
+    const cacheKeyArgs = [type, ...normalizedArgs];
     if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
     const cacheKey = this.#cacheKeys.lookupArray(cacheKeyArgs);
     this.#refCounts.register(cacheKey);
@@ -542,24 +565,6 @@ var CacheKeys = class {
     this.#remove(key);
   };
 };
-
-// src/observable/internal/CacheKey.ts
-function DEBUG_ONLY__cacheKeyToString(x) {
-  if (process.env.NODE_ENV !== "production") {
-    return `${x.type}CacheKey<${x.otherKeys.map((xx) => JSON.stringify(xx)).join(", ")}>`.replaceAll('"', "'");
-  } else {
-    throw new Error("not implemented");
-  }
-}
-function DEBUG_ONLY__cacheKeysToString(x) {
-  if (process.env.NODE_ENV !== "production") {
-    return "\n  - " + x.map(DEBUG_ONLY__cacheKeyToString).join("\n  - ");
-  } else {
-    throw new Error("not implemented");
-  }
-}
-
-// src/observable/internal/Changes.ts
 var Changes = class {
   modifiedObjects = new mnemonist.MultiMap();
   addedObjects = new mnemonist.MultiMap();
@@ -833,7 +838,7 @@ var Layers = class {
     return this.#truthLayer;
   }
   remove(layerId) {
-    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant3__default.default(false) : void 0;
+    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant4__default.default(false) : void 0;
     let currentLayer = this.#topLayer;
     const cacheKeys = /* @__PURE__ */ new Map();
     while (currentLayer != null && currentLayer.parentLayer != null) {
@@ -861,7 +866,7 @@ var Layers = class {
     optimisticId,
     changes
   }, batchFn) {
-    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "optimistic must be undefined or not falsy") : invariant3__default.default(false) : void 0;
+    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "optimistic must be undefined or not falsy") : invariant4__default.default(false) : void 0;
     const batchContext = this.#createBatchContext({
       optimisticId,
       changes
@@ -989,6 +994,12 @@ function isObjectInstance(item) {
   return item != null && typeof item === "object" && "$primaryKey" in item;
 }
 
+// src/observable/internal/list/ListCacheKey.ts
+var API_NAME_IDX = 1;
+var WHERE_IDX = 2;
+var ORDER_BY_IDX = 3;
+var RDP_IDX = 4;
+
 // src/observable/internal/Query.ts
 var Query = class {
   retainCount = 0;
@@ -1003,7 +1014,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunk6L3MX4LH_cjs.additionalContext].logger : store.client[chunk6L3MX4LH_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkVNLY3YOJ_cjs.additionalContext].logger : store.client[chunkVNLY3YOJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -1244,6 +1255,12 @@ var BaseListQuery = class extends Query {
    * @protected
    */
   sortingStrategy = new NoOpSortingStrategy();
+  /**
+   * Get RDP configuration from the cache key
+   */
+  get rdpConfig() {
+    return this.cacheKey.otherKeys[RDP_IDX];
+  }
   // Collection-specific behavior is implemented by subclasses
   /**
    * Token for the next page of results
@@ -1276,7 +1293,7 @@ var BaseListQuery = class extends Query {
     if (items.length === 0) {
       objectCacheKeys = [];
     } else if (isObjectInstance(items[0])) {
-      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch);
+      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch, this.rdpConfig);
     } else {
       objectCacheKeys = items;
     }
@@ -1295,7 +1312,7 @@ var BaseListQuery = class extends Query {
    */
   writeToStore(data, status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual5__default.default(data, entry.value)) {
+    if (entry && deepEqual__default.default(data, entry.value)) {
       if (entry.status === status) {
         if (process.env.NODE_ENV !== "production") {
           this.logger?.child({
@@ -1480,7 +1497,8 @@ var BaseListQuery = class extends Query {
       } = this.store.batch({}, (batch) => {
         const append = this.nextPageToken != null;
         const finalStatus = result.nextPageToken ? status : "loaded";
-        return this._updateList(this.store.objects.storeOsdkInstances(result.data, batch), finalStatus, batch, append);
+        const objectKeys = this.store.objects.storeOsdkInstances(result.data, batch, this.rdpConfig);
+        return this._updateList(objectKeys, finalStatus, batch, append);
       });
       return retVal;
     } catch (error) {
@@ -1549,7 +1567,7 @@ var BaseListQuery = class extends Query {
     if (items.length === 0) {
       objectCacheKeys = [];
     } else if (isObjectInstance(items[0])) {
-      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch);
+      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch, this.rdpConfig);
     } else {
       objectCacheKeys = items;
     }
@@ -1576,7 +1594,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[chunk6L3MX4LH_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVNLY3YOJ_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;
@@ -1593,7 +1611,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunk6L3MX4LH_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkVNLY3YOJ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     const sourceQuery = client(sourceObjectDef).where({
       [sourceMetadata.primaryKeyApiName]: this.#sourcePk
     });
@@ -1620,7 +1638,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
    */
   deleteFromStore(status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual5__default.default(tombstone, entry.value)) {
+    if (entry && deepEqual__default.default(tombstone, entry.value)) {
       if (process.env.NODE_ENV !== "production") {
         this.logger?.child({
           methodName: "deleteFromStore"
@@ -1657,7 +1675,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunk6L3MX4LH_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkVNLY3YOJ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -1687,11 +1705,47 @@ var LinksHelper = class extends AbstractHelper {
     });
   }
 };
+function evaluateFilter(f, realValue, expected, strict) {
+  switch (f) {
+    case "$eq":
+      return realValue === expected;
+    case "$gt":
+      return realValue > expected;
+    case "$lt":
+      return realValue < expected;
+    case "$gte":
+      return realValue >= expected;
+    case "$lte":
+      return realValue <= expected;
+    case "$ne":
+      return realValue !== expected;
+    case "$in":
+      return expected.$in.includes(realValue);
+    case "$isNull":
+      return realValue == null;
+    case "$startsWith":
+      return realValue.startsWith(expected);
+    case "$contains":
+    case "$containsAllTerms":
+    case "$containsAllTermsInOrder":
+    case "$containsAnyTerm":
+    case "$intersects":
+    case "$within":
+      return !strict;
+    default:
+      if (process.env.NODE_ENV !== "production") {
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Unknown where filter ${f}`) : invariant4__default.default(false) ;
+      }
+      return !strict;
+  }
+}
+
+// src/observable/internal/objectMatchesWhereClause.ts
 function is$and(whereClause) {
   if (process.env.NODE_ENV !== "production") {
     if ("$and" in whereClause) {
-      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected $and to be an array") : invariant3__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $and to be present") : invariant3__default.default(false) : void 0;
+      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected $and to be an array") : invariant4__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $and to be present") : invariant4__default.default(false) : void 0;
     }
   }
   return "$and" in whereClause;
@@ -1699,8 +1753,8 @@ function is$and(whereClause) {
 function is$or(whereClause) {
   if (process.env.NODE_ENV !== "production") {
     if ("$or" in whereClause) {
-      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected $or to be an array") : invariant3__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $or to be present") : invariant3__default.default(false) : void 0;
+      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected $or to be an array") : invariant4__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $or to be present") : invariant4__default.default(false) : void 0;
     }
   }
   return "$or" in whereClause;
@@ -1708,13 +1762,13 @@ function is$or(whereClause) {
 function is$not(whereClause) {
   if (process.env.NODE_ENV !== "production") {
     if ("$not" in whereClause) {
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $not to be present") : invariant3__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $not to be present") : invariant4__default.default(false) : void 0;
     }
   }
   return "$not" in whereClause;
 }
 function objectSortaMatchesWhereClause(o, whereClause, strict) {
-  if (deepEqual5__default.default({}, whereClause)) {
+  if (deepEqual__default.default({}, whereClause)) {
     return true;
   }
   if (is$and(whereClause)) {
@@ -1727,42 +1781,11 @@ function objectSortaMatchesWhereClause(o, whereClause, strict) {
     return !objectSortaMatchesWhereClause(o, whereClause.$not, strict);
   }
   return Object.entries(whereClause).every(([key, filter]) => {
-    if (typeof filter === "object") {
+    if (typeof filter === "object" && filter != null) {
       const realValue = o[key];
       const [f] = Object.keys(filter);
       const expected = filter[f];
-      switch (f) {
-        case "$eq":
-          return realValue === expected;
-        case "$gt":
-          return realValue > expected;
-        case "$lt":
-          return realValue < expected;
-        case "$gte":
-          return realValue >= expected;
-        case "$lte":
-          return realValue <= expected;
-        case "$ne":
-          return realValue !== expected;
-        case "$in":
-          return expected.$in.includes(realValue);
-        case "$isNull":
-          return realValue == null;
-        case "$startsWith":
-          return realValue.startsWith(expected);
-        case "$contains":
-        case "$containsAllTerms":
-        case "$containsAllTermsInOrder":
-        case "$containsAnyTerm":
-        case "$intersects":
-        case "$within":
-          return !strict;
-        default:
-          if (process.env.NODE_ENV !== "production") {
-            process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Unknown where filter ${f}`) : invariant3__default.default(false) ;
-          }
-          return !strict;
-      }
+      return evaluateFilter(f, realValue, expected, strict);
     }
     if (key in o) {
       if (o[key] === filter) {
@@ -1774,26 +1797,32 @@ function objectSortaMatchesWhereClause(o, whereClause, strict) {
 }
 
 // src/observable/internal/list/ListQuery.ts
-var API_NAME_IDX = 1;
 var ListQuery = class extends BaseListQuery {
   // pageSize?: number; // this is the internal page size. we need to track this properly
   #whereClause;
   // Using base class minResultsToLoad instead of a private property
   #orderBy;
   #objectSet;
+  #websocketSubscription = null;
+  #subscriptionRefCounts = new RefCounts(process.env.NODE_ENV !== "production" ? 2e3 : 5e3, () => {
+    if (this.#websocketSubscription) {
+      this.#websocketSubscription.unsubscribe();
+      this.#websocketSubscription = null;
+    }
+  });
   /**
    * Register changes to the cache specific to ListQuery
    */
   registerCacheChanges(batch) {
     batch.changes.registerList(this.cacheKey);
   }
-  constructor(store, subject, apiName, whereClause, orderBy, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunk6L3MX4LH_cjs.additionalContext].logger?.child({}, {
+  constructor(store, subject, apiName, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVNLY3YOJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
-    this.#whereClause = whereClause;
-    this.#orderBy = orderBy;
+    this.#whereClause = cacheKey.otherKeys[WHERE_IDX];
+    this.#orderBy = cacheKey.otherKeys[ORDER_BY_IDX];
     this.#objectSet = this.createObjectSet(store);
     this.sortingStrategy = new OrderBySortingStrategy(this.apiName, this.#orderBy);
     this.minResultsToLoad = 0;
@@ -1849,7 +1878,7 @@ var ListQuery = class extends BaseListQuery {
    * Postprocess fetched data.
    */
   invalidateObjectType = async (objectType, changes) => {
-    if (this.cacheKey.otherKeys[1] === objectType) {
+    if (this.apiName === objectType) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
     }
@@ -1891,7 +1920,7 @@ var ListQuery = class extends BaseListQuery {
         const toRemove = new Set(changes.deleted);
         for (const obj of relevantObjects.modified.all) {
           if (relevantObjects.modified.strictMatches.has(obj)) {
-            const objectCacheKey = this.cacheKeys.get("object", obj.$objectType, obj.$primaryKey);
+            const objectCacheKey = this.getObjectCacheKey(obj);
             if (!existingList.has(objectCacheKey)) {
               toAdd.add(obj);
             }
@@ -1899,7 +1928,7 @@ var ListQuery = class extends BaseListQuery {
           } else if (batch.optimisticWrite) {
             continue;
           } else {
-            const existingObjectCacheKey = this.cacheKeys.get("object", obj.$objectType, obj.$primaryKey);
+            const existingObjectCacheKey = this.getObjectCacheKey(obj);
             toRemove.add(existingObjectCacheKey);
             if (relevantObjects.modified.sortaMatches.has(obj)) {
               needsRevalidation = true;
@@ -1911,7 +1940,7 @@ var ListQuery = class extends BaseListQuery {
           newList.push(key);
         }
         for (const obj of toAdd) {
-          newList.push(this.cacheKeys.get("object", obj.$objectType, obj.$primaryKey));
+          newList.push(this.getObjectCacheKey(obj));
         }
         this._updateList(
           newList,
@@ -1966,19 +1995,24 @@ var ListQuery = class extends BaseListQuery {
         methodName: "observeList"
       }).info("Subscribing from websocket");
     }
-    const websocketSubscription = this.#objectSet.subscribe({
-      onChange: this.onOswChange.bind(this),
-      onError: this.onOswError.bind(this),
-      onOutOfDate: this.onOswOutOfDate.bind(this),
-      onSuccessfulSubscription: this.onOswSuccessfulSubscription.bind(this)
-    });
+    if (!this.#websocketSubscription) {
+      this.#websocketSubscription = this.#objectSet.subscribe({
+        onChange: this.onOswChange.bind(this),
+        onError: this.onOswError.bind(this),
+        onOutOfDate: this.onOswOutOfDate.bind(this),
+        onSuccessfulSubscription: this.onOswSuccessfulSubscription.bind(this)
+      });
+      this.#subscriptionRefCounts.register("websocket");
+    }
+    this.#subscriptionRefCounts.retain("websocket");
     sub.add(() => {
       if (process.env.NODE_ENV !== "production") {
         logger?.child({
           methodName: "observeList"
         }).info("Unsubscribing from websocket");
       }
-      websocketSubscription.unsubscribe();
+      this.#subscriptionRefCounts.release("websocket");
+      this.#subscriptionRefCounts.gc();
     });
   }
   onOswSuccessfulSubscription() {
@@ -2017,7 +2051,7 @@ var ListQuery = class extends BaseListQuery {
     if (state === "ADDED_OR_UPDATED") {
       const object = objOrIface.$apiName !== objOrIface.$objectType ? objOrIface.$as(objOrIface.$objectType) : objOrIface;
       this.store.batch({}, (batch) => {
-        this.store.objects.storeOsdkInstances([object], batch);
+        this.store.objects.storeOsdkInstances([object], batch, this.rdpConfig);
       });
     } else if (state === "REMOVED") {
       this.onOswRemoved(objOrIface, logger);
@@ -2026,9 +2060,9 @@ var ListQuery = class extends BaseListQuery {
   onOswRemoved(objOrIface, logger) {
     this.store.batch({}, (batch) => {
       const existing = batch.read(this.cacheKey);
-      !existing ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant3__default.default(false) : void 0;
+      !existing ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant4__default.default(false) : void 0;
       if (existing.status === "loaded") {
-        const objectCacheKey = this.cacheKeys.get("object", objOrIface.$objectType, objOrIface.$primaryKey);
+        const objectCacheKey = this.getObjectCacheKey(objOrIface);
         const newObjects = existing.value?.data.filter((o) => o !== objectCacheKey);
         if (newObjects?.length !== existing.value?.data.length) {
           batch.changes.registerList(this.cacheKey);
@@ -2053,15 +2087,28 @@ var ListQuery = class extends BaseListQuery {
       });
     });
   }
+  /**
+   * Get cache key for object.
+   */
+  getObjectCacheKey(obj) {
+    const pk = obj.$primaryKey;
+    return this.cacheKeys.get("object", obj.$objectType, pk, this.rdpConfig ?? void 0);
+  }
 };
 
 // src/observable/internal/list/InterfaceListQuery.ts
 var InterfaceListQuery = class extends ListQuery {
   createObjectSet(store) {
-    return store.client({
-      type: "interface",
+    const rdpConfig = this.cacheKey.otherKeys[RDP_IDX];
+    const type = "interface";
+    const objectTypeDef = {
+      type,
       apiName: this.apiName
-    }).where(this.canonicalWhere);
+    };
+    if (rdpConfig != null) {
+      return store.client(objectTypeDef).withProperties(rdpConfig).where(this.canonicalWhere);
+    }
+    return store.client(objectTypeDef).where(this.canonicalWhere);
   }
   async revalidateObjectType(apiName) {
     const objectMetadata = await this.store.client.fetchMetadata({
@@ -2080,7 +2127,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkBRYZR53E_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkOSI7NG7T_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));
@@ -2101,7 +2148,7 @@ var InterfaceListQuery = class extends ListQuery {
 async function reloadDataAsFullObjects(client, 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][chunkBRYZR53E_cjs.UnderlyingOsdkObject][chunkBRYZR53E_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkOSI7NG7T_cjs.UnderlyingOsdkObject][chunkOSI7NG7T_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -2111,7 +2158,7 @@ async function reloadDataAsFullObjects(client, data) {
     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" ? invariant3__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant3__default.default(false) : void 0;
+    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant4__default.default(false) : void 0;
     return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
   });
   return data;
@@ -2120,6 +2167,13 @@ async function reloadDataAsFullObjects(client, data) {
 // src/observable/internal/list/ObjectListQuery.ts
 var ObjectListQuery = class extends ListQuery {
   createObjectSet(store) {
+    const rdpConfig = this.cacheKey.otherKeys[RDP_IDX];
+    if (rdpConfig != null) {
+      return store.client({
+        type: "object",
+        apiName: this.apiName
+      }).withProperties(rdpConfig).where(this.canonicalWhere);
+    }
     return store.client({
       type: "object",
       apiName: this.apiName
@@ -2154,10 +2208,11 @@ var ObjectListQuery = class extends ListQuery {
 
 // src/observable/internal/list/ListsHelper.ts
 var ListsHelper = 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);
@@ -2168,23 +2223,197 @@ var ListsHelper = class extends AbstractHelper {
   }
   getQuery(options) {
     const {
-      type: {
-        apiName,
-        type
-      },
+      type: typeDefinition,
       where,
-      orderBy
+      orderBy,
+      withProperties
     } = options;
+    const {
+      apiName,
+      type
+    } = typeDefinition;
     const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
     const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
-    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy);
+    const canonRdp = withProperties ? this.rdpCanonicalizer.canonicalize(withProperties) : void 0;
+    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy, canonRdp);
     return this.store.queries.get(listCacheKey, () => {
       const QueryClass = type === "object" ? ObjectListQuery : InterfaceListQuery;
-      return new QueryClass(this.store, this.store.subjects.get(listCacheKey), apiName, canonWhere, canonOrderBy, listCacheKey, options);
+      return new QueryClass(this.store, this.store.subjects.get(listCacheKey), apiName, listCacheKey, options);
     });
   }
 };
 
+// src/observable/internal/object/ObjectCacheKey.ts
+var API_NAME_IDX2 = 0;
+var RDP_CONFIG_IDX = 2;
+
+// src/observable/internal/utils/rdpFieldOperations.ts
+function extractRdpFieldNames(rdpConfig) {
+  if (!rdpConfig) {
+    return /* @__PURE__ */ new Set();
+  }
+  return new Set(Object.keys(rdpConfig));
+}
+function deleteField(obj, field) {
+  const mutableObj = obj;
+  delete mutableObj[field];
+}
+function setField(obj, field, value) {
+  const mutableObj = obj;
+  mutableObj[field] = value;
+}
+function stripRdpFields(value, rdpFields) {
+  if (rdpFields.size === 0) {
+    return value;
+  }
+  const result = {
+    ...value
+  };
+  for (const field of rdpFields) {
+    deleteField(result, field);
+  }
+  return result;
+}
+function isSuperset(superset, subset) {
+  for (const field of subset) {
+    if (!superset.has(field)) {
+      return false;
+    }
+  }
+  return true;
+}
+function filterToFields(value, allowedFields) {
+  const result = {
+    ...value
+  };
+  const allFields = Object.keys(result);
+  for (const field of allFields) {
+    if (!allowedFields.has(field)) {
+      deleteField(result, field);
+    }
+  }
+  return result;
+}
+function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
+  if (targetRdpFields.size === 0) {
+    return stripRdpFields(sourceValue, sourceRdpFields);
+  }
+  if (isSuperset(sourceRdpFields, targetRdpFields)) {
+    if (sourceRdpFields.size === targetRdpFields.size) {
+      return sourceValue;
+    }
+    return filterToFields(sourceValue, targetRdpFields);
+  }
+  const merged = {
+    ...sourceValue
+  };
+  if (targetCurrentValue) {
+    const targetAsRecord = targetCurrentValue;
+    for (const field of targetRdpFields) {
+      if (!sourceRdpFields.has(field) && field in targetCurrentValue) {
+        setField(merged, field, targetAsRecord[field]);
+      }
+    }
+  }
+  return merged;
+}
+
+// src/observable/internal/object/ObjectCacheKeyRegistry.ts
+var ObjectCacheKeyRegistry = class {
+  /**
+   * Map from base key (apiName:primaryKey) to all related cache key variants and metadata
+   */
+  baseToVariants = /* @__PURE__ */ new Map();
+  /**
+   * Metadata for each cache key (apiName, primaryKey, rdpConfig)
+   */
+  keyMetadata = /* @__PURE__ */ new WeakMap();
+  /**
+   * Register a cache key variant for an object
+   */
+  register(cacheKey, apiName, primaryKey, rdpConfig) {
+    const baseKey = this.makeBaseKey(apiName, primaryKey);
+    const primaryKeyStr = String(primaryKey);
+    this.keyMetadata.set(cacheKey, {
+      apiName,
+      primaryKey: primaryKeyStr,
+      rdpConfig,
+      rdpFieldSet: rdpConfig ? extractRdpFieldNames(rdpConfig) : void 0
+    });
+    let entry = this.baseToVariants.get(baseKey);
+    if (!entry) {
+      entry = {
+        variants: /* @__PURE__ */ new Set(),
+        apiName,
+        primaryKey: primaryKeyStr
+      };
+      this.baseToVariants.set(baseKey, entry);
+    }
+    entry.variants.add(cacheKey);
+  }
+  /**
+   * Get all variant cache keys for a specific object
+   */
+  getVariants(apiName, primaryKey) {
+    const baseKey = this.makeBaseKey(apiName, primaryKey);
+    const entry = this.baseToVariants.get(baseKey);
+    return new Set(entry?.variants ?? []);
+  }
+  /**
+   * Unregister a cache key when it's being cleaned up
+   */
+  unregister(cacheKey) {
+    const metadata = this.keyMetadata.get(cacheKey);
+    if (!metadata) return;
+    const baseKey = this.makeBaseKey(metadata.apiName, metadata.primaryKey);
+    const entry = this.baseToVariants.get(baseKey);
+    if (entry) {
+      entry.variants.delete(cacheKey);
+      if (entry.variants.size === 0) {
+        this.baseToVariants.delete(baseKey);
+      }
+    }
+    this.keyMetadata.delete(cacheKey);
+  }
+  /**
+   * Get metadata for a cache key
+   */
+  getMetadata(cacheKey) {
+    return this.keyMetadata.get(cacheKey);
+  }
+  /**
+   * Get the count of variants for a specific object
+   */
+  getVariantCount(apiName, primaryKey) {
+    const baseKey = this.makeBaseKey(apiName, primaryKey);
+    return this.baseToVariants.get(baseKey)?.variants.size ?? 0;
+  }
+  /**
+   * Generate a base key from apiName and primaryKey
+   */
+  makeBaseKey(apiName, primaryKey) {
+    return `${apiName}:${primaryKey}`;
+  }
+  /**
+   * Check if a cache key has RDP configuration
+   */
+  hasRdpConfig(cacheKey) {
+    return this.keyMetadata.get(cacheKey)?.rdpConfig != null;
+  }
+  /**
+   * Get the RDP configuration for a cache key
+   */
+  getRdpConfig(cacheKey) {
+    return this.keyMetadata.get(cacheKey)?.rdpConfig;
+  }
+  /**
+   * Get the cached RDP field set for a cache key
+   */
+  getRdpFieldSet(cacheKey) {
+    return this.keyMetadata.get(cacheKey)?.rdpFieldSet ?? /* @__PURE__ */ new Set();
+  }
+};
+
 // ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
 function pDefer() {
   const deferred = {};
@@ -2211,7 +2440,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunk6L3MX4LH_cjs.additionalContext].logger;
+    this.#logger = client[chunkVNLY3YOJ_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -2246,13 +2475,18 @@ var BulkObjectLoader = class {
     };
     const objMetadata = await this.#client.fetchMetadata(miniDef);
     const pks = arr.map((x) => x.primaryKey);
-    const {
-      data
-    } = await this.#client(miniDef).where({
+    const whereClause = pks.length === 1 ? {
+      [objMetadata.primaryKeyApiName]: {
+        $eq: pks[0]
+      }
+    } : {
       [objMetadata.primaryKeyApiName]: {
         $in: pks
       }
-    }).fetchPage({
+    };
+    const {
+      data
+    } = await this.#client(miniDef).where(whereClause).fetchPage({
       $pageSize: pks.length
     });
     for (const {
@@ -2274,7 +2508,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[chunk6L3MX4LH_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVNLY3YOJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -2309,62 +2543,17 @@ var ObjectQuery = class extends Query {
     });
   }
   writeToStore(data, status, batch) {
-    const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual5__default.default(data, entry.value)) {
-      if (entry.status === status) {
-        if (process.env.NODE_ENV !== "production") {
-          this.logger?.child({
-            methodName: "writeToStore"
-          }).debug(`Object was deep equal and status unchanged (${status}), skipping update`);
-        }
-        return entry;
-      }
-      if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "writeToStore"
-        }).debug(`Object was deep equal, just setting status (old status: ${entry.status}, new status: ${status})`);
-      }
-      return batch.write(this.cacheKey, entry.value, status);
-    }
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "writeToStore"
-      }).debug(JSON.stringify({
-        status
-      }), data);
-    }
-    const ret = batch.write(this.cacheKey, data, status);
-    batch.changes.registerObject(
-      this.cacheKey,
-      data,
-      /* isNew */
-      !entry
-    );
-    return ret;
+    batch.read(this.cacheKey);
+    const rdpConfig = this.cacheKey.otherKeys[RDP_CONFIG_IDX];
+    this.store.objectCacheKeyRegistry.register(this.cacheKey, this.#apiName, this.#pk, rdpConfig);
+    this.store.objects.propagateWrite(this.cacheKey, data, status, batch);
+    return batch.read(this.cacheKey);
   }
   deleteFromStore(status, batch) {
-    const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual5__default.default(tombstone, entry.value)) {
-      if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "deleteFromStore"
-        }).debug(`Object was deep equal, just setting status`);
-      }
-      return batch.write(this.cacheKey, entry.value, status);
-    }
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "deleteFromStore"
-      }).debug(JSON.stringify({
-        status
-      }));
-    }
-    if (!entry || !entry.value) {
-      return;
-    }
-    const ret = batch.delete(this.cacheKey, status);
-    batch.changes.deleteObject(this.cacheKey);
-    return ret;
+    const rdpConfig = this.cacheKey.otherKeys[RDP_CONFIG_IDX];
+    this.store.objectCacheKeyRegistry.register(this.cacheKey, this.#apiName, this.#pk, rdpConfig);
+    this.store.objects.propagateWrite(this.cacheKey, tombstone, status, batch);
+    return batch.read(this.cacheKey);
   }
   invalidateObjectType = (objectType, changes) => {
     if (this.#apiName === objectType) {
@@ -2380,26 +2569,79 @@ var ObjectsHelper = class extends AbstractHelper {
   observe(options, subFn) {
     return super.observe(options, subFn);
   }
-  getQuery(options) {
+  getQuery(options, rdpConfig) {
     const apiName = typeof options.apiName === "string" ? options.apiName : options.apiName.apiName;
     const {
       pk
     } = options;
-    const objectCacheKey = this.cacheKeys.get("object", apiName, pk);
+    const objectCacheKey = this.cacheKeys.get("object", apiName, pk, rdpConfig ?? void 0);
     return this.store.queries.get(objectCacheKey, () => new ObjectQuery(this.store, this.store.subjects.get(objectCacheKey), apiName, pk, objectCacheKey, {
       dedupeInterval: 0
     }));
   }
   /**
    * Internal helper method for writing objects to the store and returning their
-   * object keys
+   * object keys. For list queries with RDPs, the rdpConfig is included in the
+   * cache key to ensure proper data isolation.
    * @internal
    */
-  storeOsdkInstances(values, batch) {
+  storeOsdkInstances(values, batch, rdpConfig) {
     return values.map((v) => this.getQuery({
       apiName: v.$apiName,
       pk: v.$primaryKey
-    }).writeToStore(v, "loaded", batch).cacheKey);
+    }, rdpConfig).writeToStore(v, "loaded", batch).cacheKey);
+  }
+  /**
+   * Write an object to cache and propagate to all related cache keys
+   * @internal
+   */
+  propagateWrite(sourceCacheKey, value, status, batch) {
+    const existing = batch.read(sourceCacheKey);
+    const dataChanged = !existing || existing.value === void 0 || value === tombstone || !deepEqual__default.default(existing.value, value);
+    const statusChanged = !existing || existing.status !== status;
+    if (!dataChanged && !statusChanged) {
+      return;
+    }
+    const valueToWrite = !dataChanged && existing ? existing.value : value;
+    batch.write(sourceCacheKey, valueToWrite, status);
+    if (value !== tombstone) {
+      batch.changes.registerObject(sourceCacheKey, value, !existing);
+    }
+    const metadata = this.store.objectCacheKeyRegistry.getMetadata(sourceCacheKey);
+    const relatedKeys = metadata ? this.store.objectCacheKeyRegistry.getVariants(metadata.apiName, metadata.primaryKey) : /* @__PURE__ */ new Set([sourceCacheKey]);
+    for (const targetKey of relatedKeys) {
+      if (targetKey === sourceCacheKey || !this.isKeyActive(targetKey)) {
+        continue;
+      }
+      if (value === tombstone) {
+        batch.write(targetKey, tombstone, status);
+        continue;
+      }
+      const targetCurrentValue = batch.read(targetKey)?.value;
+      const merged = this.mergeForTarget(value, targetCurrentValue && this.isObjectHolder(targetCurrentValue) ? targetCurrentValue : void 0, sourceCacheKey, targetKey);
+      batch.write(targetKey, merged, status);
+    }
+  }
+  /**
+   * Check if a cache key is actively observed
+   */
+  isKeyActive(key) {
+    const subject = this.store.subjects.peek(key);
+    return subject?.observed === true;
+  }
+  /**
+   * Type guard to check if a value is an ObjectHolder
+   */
+  isObjectHolder(value) {
+    return value != null && typeof value === "object" && "$apiName" in value && "$primaryKey" in value;
+  }
+  /**
+   * Merge object data for a specific target cache key, preserving RDP fields
+   */
+  mergeForTarget(sourceValue, targetCurrentValue, sourceCacheKey, targetCacheKey) {
+    const sourceRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(sourceCacheKey);
+    const targetRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(targetCacheKey);
+    return mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue);
   }
 };
 
@@ -2410,7 +2652,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[chunk6L3MX4LH_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVNLY3YOJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -2453,7 +2695,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunk6L3MX4LH_cjs.getWireObjectSet(os);
+        const wire = chunkVNLY3YOJ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -2461,7 +2703,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunk6L3MX4LH_cjs.getWireObjectSet(os);
+        const wire = chunkVNLY3YOJ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -2469,7 +2711,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunk6L3MX4LH_cjs.getWireObjectSet(os);
+        const wire = chunkVNLY3YOJ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -2543,7 +2785,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunk6L3MX4LH_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkVNLY3YOJ_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -2559,13 +2801,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(chunk6L3MX4LH_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkVNLY3YOJ_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunk6L3MX4LH_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkVNLY3YOJ_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunk6L3MX4LH_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkVNLY3YOJ_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -2605,12 +2847,85 @@ var Queries = class {
   }
 };
 
+// src/observable/internal/Canonicalizer.ts
+var CachingCanonicalizer = class {
+  /**
+   * Cache for input object identity.
+   */
+  inputCache = /* @__PURE__ */ new WeakMap();
+  /**
+   * Look up or create a canonical form for the given input.
+   * This method handles the structural deduplication logic.
+   *
+   * @param input The input to canonicalize
+   * @returns The canonical form
+   */
+  canonicalize(input) {
+    if (!input) {
+      return void 0;
+    }
+    if (this.inputCache.has(input)) {
+      return this.inputCache.get(input);
+    }
+    const canonical = this.lookupOrCreate(input);
+    this.inputCache.set(input, canonical);
+    return canonical;
+  }
+};
+
+// src/observable/internal/RdpCanonicalizer.ts
+var RdpCanonicalizer = class extends CachingCanonicalizer {
+  structuralCache = /* @__PURE__ */ new Map();
+  lookupOrCreate(rdp) {
+    const definitionMap = /* @__PURE__ */ new Map();
+    const computedProperties = {};
+    const objectTypeHolder = {
+      type: "object",
+      apiName: "__rdp_canonicalizer_holder__"
+    };
+    for (const [key, rdpFunction] of Object.entries(rdp)) {
+      const builder = chunkVNLY3YOJ_cjs.createWithPropertiesObjectSet(
+        objectTypeHolder,
+        {
+          type: "methodInput"
+        },
+        definitionMap,
+        /* fromBaseObjectSet */
+        true
+      );
+      const result = rdpFunction(builder);
+      const definition = definitionMap.get(result);
+      if (definition) {
+        computedProperties[key] = definition;
+      }
+    }
+    const sortedKeys = Object.keys(computedProperties).sort();
+    const sortedDefinitions = {};
+    for (const key of sortedKeys) {
+      sortedDefinitions[key] = computedProperties[key];
+    }
+    const definitionsKey = JSON.stringify(sortedDefinitions);
+    let canonical = this.structuralCache.get(definitionsKey);
+    if (!canonical) {
+      const sortedRdp = {};
+      for (const key of Object.keys(rdp).sort()) {
+        sortedRdp[key] = rdp[key];
+      }
+      canonical = sortedRdp;
+      this.structuralCache.set(definitionsKey, canonical);
+    }
+    return canonical;
+  }
+};
+
 // src/observable/internal/Store.ts
 var Store = class {
   whereCanonicalizer = new WhereClauseCanonicalizer();
   orderByCanonicalizer = new OrderByCanonicalizer();
+  rdpCanonicalizer = new RdpCanonicalizer();
   /** @internal */
   queries = new Queries();
+  objectCacheKeyRegistry = new ObjectCacheKeyRegistry();
   layers = new Layers({
     logger: this.logger,
     onRevalidate: this.#maybeRevalidateQueries.bind(this)
@@ -2618,14 +2933,14 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunk6L3MX4LH_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkVNLY3YOJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
     this.cacheKeys = new CacheKeys({
       onDestroy: this.#cleanupCacheKey
     });
-    this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
+    this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer);
     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);
@@ -2637,7 +2952,7 @@ var Store = class {
   #cleanupCacheKey = (key) => {
     const subject = this.subjects.peek(key);
     if (process.env.NODE_ENV !== "production") {
-      !subject ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false) : invariant3__default.default(false) : void 0;
+      !subject ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false) : invariant4__default.default(false) : void 0;
     }
     this.subjects.delete(key);
     this.queries.delete(key);
@@ -2668,13 +2983,28 @@ var Store = class {
     if (typeof apiName !== "string") {
       apiName = apiName.apiName;
     }
-    return this.objects.getQuery({
-      apiName,
-      pk
-    }).revalidate(
-      /* force */
-      true
-    );
+    const variants = this.objectCacheKeyRegistry.getVariants(apiName, pk);
+    const promises = [];
+    if (variants.size === 0) {
+      promises.push(this.objects.getQuery({
+        apiName,
+        pk
+      }, void 0).revalidate(
+        /* force */
+        true
+      ));
+    } else {
+      for (const key of variants) {
+        const query = this.queries.peek(key);
+        if (query) {
+          promises.push(query.revalidate(
+            /* force */
+            true
+          ));
+        }
+      }
+    }
+    return Promise.allSettled(promises);
   }
   async #maybeRevalidateQueries(changes, optimisticId) {
     const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
@@ -2694,7 +3024,17 @@ var Store = class {
     try {
       const promises = [];
       for (const cacheKey of this.queries.keys()) {
-        const promise = this.queries.peek(cacheKey)?.maybeUpdateAndRevalidate?.(changes, optimisticId);
+        const query = this.queries.peek(cacheKey);
+        if (!query?.maybeUpdateAndRevalidate) {
+          continue;
+        }
+        if (!this.#shouldPropagateToQuery({
+          cacheKey,
+          maybeUpdateAndRevalidate: query.maybeUpdateAndRevalidate
+        }, changes, optimisticId)) {
+          continue;
+        }
+        const promise = query.maybeUpdateAndRevalidate(changes, optimisticId);
         if (promise) promises.push(promise);
       }
       await Promise.all(promises);
@@ -2704,6 +3044,103 @@ var Store = class {
       }
     }
   }
+  /**
+   * Determines whether changes should propagate to a specific query.
+   * Prevents unnecessary observable pipeline execution for cross-propagation.
+   *
+   * @param query - The query to check
+   * @param changes - The changes that occurred
+   * @param optimisticId - Optional optimistic update ID
+   * @returns true if the query should be notified of these changes
+   */
+  #shouldPropagateToQuery(query, changes, optimisticId) {
+    if (optimisticId) {
+      return true;
+    }
+    if (changes.modified.has(query.cacheKey)) {
+      return true;
+    }
+    if (this.#shouldPropagateForObjectTypeChanges(query.cacheKey, changes)) {
+      return true;
+    }
+    const queryRdpConfig = this.#getQueryRdpConfig(query.cacheKey);
+    return queryRdpConfig != null;
+  }
+  /**
+   * Checks if changes to an object type should propagate to a query.
+   * This ensures queries receive updates when objects of their type are added/modified.
+   *
+   * @param cacheKey - The cache key of the query
+   * @param changes - The changes that occurred
+   * @returns true if the query should be notified based on object type changes
+   */
+  #shouldPropagateForObjectTypeChanges(cacheKey, changes) {
+    const queryObjectType = this.#getQueryObjectType(cacheKey);
+    if (!queryObjectType) {
+      return false;
+    }
+    const affected = this.#changesAffectObjectType(changes, queryObjectType);
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "shouldPropagateToQuery"
+      }).debug(`Query type: ${queryObjectType}, affected: ${affected}`, {
+        queryKey: DEBUG_ONLY__cacheKeyToString(cacheKey),
+        addedCount: changes.addedObjects.get(queryObjectType)?.length ?? 0,
+        modifiedCount: changes.modifiedObjects.get(queryObjectType)?.length ?? 0
+      });
+    }
+    return affected;
+  }
+  /**
+   * Extracts RDP configuration from a cache key if present.
+   *
+   * @param cacheKey - The cache key to check
+   * @returns The RDP configuration, or undefined if not present
+   */
+  #getQueryRdpConfig(cacheKey) {
+    if ("otherKeys" in cacheKey && Array.isArray(cacheKey.otherKeys)) {
+      if (cacheKey.type === "object") {
+        return cacheKey.otherKeys[RDP_CONFIG_IDX];
+      } else if (cacheKey.type === "list") {
+        return cacheKey.otherKeys[RDP_IDX];
+      }
+    }
+    return void 0;
+  }
+  /**
+   * Extracts the object type (apiName) from a cache key.
+   *
+   * @param cacheKey - The cache key to check
+   * @returns The object type/apiName, or undefined if not applicable
+   */
+  #getQueryObjectType(cacheKey) {
+    if ("otherKeys" in cacheKey && Array.isArray(cacheKey.otherKeys)) {
+      if (cacheKey.type === "object") {
+        return cacheKey.otherKeys[API_NAME_IDX2];
+      } else if (cacheKey.type === "list") {
+        return cacheKey.otherKeys[API_NAME_IDX];
+      }
+    }
+    return void 0;
+  }
+  /**
+   * Checks if changes affect a specific object type.
+   *
+   * @param changes - The changes to check
+   * @param objectType - The object type to check for
+   * @returns true if the changes include added or modified objects of this type
+   */
+  #changesAffectObjectType(changes, objectType) {
+    const addedForType = changes.addedObjects.get(objectType);
+    if (addedForType && addedForType.length > 0) {
+      return true;
+    }
+    const modifiedForType = changes.modifiedObjects.get(objectType);
+    if (modifiedForType && modifiedForType.length > 0) {
+      return true;
+    }
+    return false;
+  }
   /**
    * Invalidates all cache entries for a specific object type.
    * This will revalidate:
@@ -2757,10 +3194,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkBRYZR53E_cjs.createClientFromContext({
-    ...client[chunk6L3MX4LH_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunk6L3MX4LH_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkBRYZR53E_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkOSI7NG7T_cjs.createClientFromContext({
+    ...client[chunkVNLY3YOJ_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkVNLY3YOJ_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkOSI7NG7T_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -2803,11 +3240,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkBRYZR53E_cjs.createClientWithTransaction; }
+  get: function () { return chunkOSI7NG7T_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunk6L3MX4LH_cjs.augment; }
+  get: function () { return chunkVNLY3YOJ_cjs.augment; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;