@osdk/client 2.5.2 → 2.6.0-beta.10

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var chunkSDFKR62Z_cjs = require('../chunk-SDFKR62Z.cjs');
-var chunkMEL46GIF_cjs = require('../chunk-MEL46GIF.cjs');
-require('../chunk-Q7SFCCGT.cjs');
+var chunkHJX4D4KL_cjs = require('../chunk-HJX4D4KL.cjs');
+var chunkRO7XAQOS_cjs = require('../chunk-RO7XAQOS.cjs');
+var chunk6SCDLAU2_cjs = require('../chunk-6SCDLAU2.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,10 +14,21 @@ 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);
 
+// src/public/unstable-do-not-use.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/computeObjectSetCacheKey.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/OrderByCanonicalizer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/WeakRefTrie.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
 var WeakRefTrie = class {
   #finalizer = new FinalizationRegistry((orderBy) => {
@@ -62,10 +73,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) => {
@@ -73,6 +81,9 @@ var OrderByCanonicalizer = class {
     return this.#trie.lookupArray(strings);
   };
 };
+
+// src/observable/internal/WhereClauseCanonicalizer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var WhereClauseCanonicalizer = class {
   /**
    * This is a shortcut cache for any WhereClause's that we have
@@ -105,7 +116,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 +126,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 +141,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 +153,7 @@ var WhereClauseCanonicalizer = class {
 var whereCanonicalizer = new WhereClauseCanonicalizer();
 var orderByCanonicalizer = new OrderByCanonicalizer();
 function computeObjectSetCacheKey(objectSet, options) {
-  const keyParts = ["objectSet", chunkMEL46GIF_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkRO7XAQOS_cjs.getWireObjectSet(objectSet)];
   if (!options) {
     return JSON.stringify(keyParts);
   }
@@ -154,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) => chunkMEL46GIF_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkRO7XAQOS_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkMEL46GIF_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkRO7XAQOS_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkMEL46GIF_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkRO7XAQOS_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -174,7 +185,14 @@ function computeObjectSetCacheKey(objectSet, options) {
   return JSON.stringify(keyParts);
 }
 
+// src/observable/ObservableClient.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/ObservableClientImpl.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/observable/internal/UnsubscribableWrapper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var UnsubscribableWrapper = class {
   #subscription;
   constructor(subscription) {
@@ -210,6 +228,9 @@ var ObservableClientImpl = class {
       subFn
     );
   };
+  observeAggregation = (options, subFn) => {
+    return this.__experimentalStore.aggregations.observe(options, subFn);
+  };
   observeLinks = (objects, linkName, options, subFn) => {
     const objectsArray = Array.isArray(objects) ? objects : [objects];
     const parentSub = new rxjs.Subscription();
@@ -255,11 +276,22 @@ var ObservableClientImpl = class {
   }
 };
 
+// src/observable/internal/Store.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/observable/DebugFlags.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 process.env.NODE_ENV !== "production" && false;
 var DEBUG_CACHE_KEYS = process.env.NODE_ENV !== "production" && false;
 
+// src/observable/internal/actions/ActionApplication.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/actions/OptimisticJob.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/observable/internal/OptimisticId.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function createOptimisticId() {
   if (process.env.NODE_ENV !== "production") {
     if (createOptimisticId.counter === void 0) {
@@ -292,7 +324,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 +333,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 +351,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkMEL46GIF_cjs.additionalContext].objectFactory2(store.client[chunkMEL46GIF_cjs.additionalContext], [{
+        const create = store.client[chunkRO7XAQOS_cjs.additionalContext].objectFactory2(store.client[chunkRO7XAQOS_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -386,7 +418,7 @@ var ActionApplication = class {
         if (process.env.NODE_ENV !== "production") {
           if (ACTION_DELAY > 0) {
             logger?.debug("action done, pausing", actionResults);
-            const delay = (await import('../delay-QK4T7RVX.cjs')).default;
+            const delay = (await import('../delay-KIUUJ5NJ.cjs')).default;
             await delay(ACTION_DELAY);
             logger?.debug("action done, pausing done");
           }
@@ -421,7 +453,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,727 +476,950 @@ var ActionApplication = class {
   };
 };
 
-// src/observable/internal/RefCounts.ts
-var RefCounts = class {
-  refCounts = /* @__PURE__ */ new Map();
-  // keeps our objects around for some extended duration after they are no longer
-  // needed which is good for quick clicks across tabs.
-  gcMap = /* @__PURE__ */ new Map();
-  constructor(keepAlive, cleanup) {
-    this.keepAlive = keepAlive;
-    this.cleanup = cleanup;
-  }
-  register(key) {
-    if (!this.refCounts.has(key)) {
-      this.gcMap.set(key, Date.now() + this.keepAlive);
-    }
-    return key;
-  }
-  retain(key) {
-    const count = this.refCounts.get(key) ?? 0;
-    this.refCounts.set(key, count + 1);
-    if (this.gcMap.has(key)) {
-      this.gcMap.delete(key);
-    }
+// src/observable/internal/aggregation/AggregationCacheKey.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var API_NAME_IDX = 1;
+var WHERE_IDX = 2;
+var RDP_IDX = 3;
+var AGGREGATE_IDX = 4;
+
+// src/observable/internal/aggregation/AggregationsHelper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/AbstractHelper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/QuerySubscription.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var subscriptionIdCounter = 0;
+var QuerySubscription = class extends UnsubscribableWrapper {
+  /** @internal */
+  /** @internal */
+  /** @internal */
+  constructor(query, subscription) {
+    super(subscription);
+    this.query = query;
+    this.subscription = subscription;
+    this.subscriptionId = `sub_${++subscriptionIdCounter}`;
+    Object.defineProperties(this, {
+      query: {
+        enumerable: false
+      },
+      subscription: {
+        enumerable: false
+      },
+      subscriptionId: {
+        enumerable: false
+      }
+    });
   }
-  release(key) {
-    const count = this.refCounts.get(key);
-    if (count === void 0) ; else if (count === 1) {
-      this.refCounts.delete(key);
-      this.gcMap.set(key, Date.now() + this.keepAlive);
-    } else {
-      this.refCounts.set(key, count - 1);
-    }
+};
+
+// src/observable/internal/AbstractHelper.ts
+var AbstractHelper = class {
+  constructor(store, cacheKeys) {
+    this.store = store;
+    this.cacheKeys = cacheKeys;
   }
-  has(key) {
-    return this.refCounts.has(key);
+  observe(options, subFn) {
+    const query = this.getQuery(options);
+    return this._subscribe(query, options, subFn);
   }
-  gc() {
-    const now = Date.now();
-    for (const [key, deathTime] of this.gcMap) {
-      if (deathTime < now) {
-        this.gcMap.delete(key);
-        this.cleanup(key);
-      }
+  _subscribe(query, options, subFn) {
+    this.store.cacheKeys.retain(query.cacheKey);
+    if (options.mode !== "offline") {
+      query.revalidate(options.mode === "force").catch((e) => {
+        subFn.error(e);
+        if (this.store.logger) {
+          this.store.logger.error("Unhandled error in observeObject", e);
+        } else {
+          throw e;
+        }
+      });
     }
+    const sub = query.subscribe(subFn);
+    const querySub = new QuerySubscription(query, sub);
+    query.registerSubscriptionDedupeInterval(querySub.subscriptionId, options.dedupeInterval);
+    sub.add(() => {
+      query.unregisterSubscriptionDedupeInterval(querySub.subscriptionId);
+      this.store.cacheKeys.release(query.cacheKey);
+    });
+    return querySub;
   }
 };
 
-// src/observable/internal/CacheKeys.ts
-var CacheKeys = class {
-  #cacheKeys = new trie.Trie(false, (keys) => {
-    const cacheKey = {
-      type: keys[0],
-      otherKeys: keys.slice(1)
-    };
-    this.#onCreate?.(cacheKey);
-    return cacheKey;
-  });
-  #refCounts = new RefCounts(6e4, (k) => this.#cleanupCacheKey(k));
-  // we are currently only using this for debug logging and should just remove it in the future if that
-  // continues to be true
-  #finalizationRegistry;
-  #onCreate;
-  #onDestroy;
-  constructor({
-    onCreate,
-    onDestroy
-  }) {
-    this.#onCreate = onCreate;
-    this.#onDestroy = onDestroy;
-    setInterval(() => {
-      this.#refCounts.gc();
-    }, 1e3);
-    this.#finalizationRegistry = new FinalizationRegistry((cleanupCallback) => {
-      try {
-        cleanupCallback();
-      } catch (e) {
-        console.error("Caught an error while running a finalization callback", e);
+// src/observable/internal/aggregation/ObjectAggregationQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/aggregation/AggregationQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/Query.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var Query = class {
+  retainCount = 0;
+  #connectable;
+  #subscription;
+  #subject;
+  #subscriptionDedupeIntervals = /* @__PURE__ */ new Map();
+  /** @internal */
+  constructor(store, observable, opts, cacheKey, logger) {
+    this.options = opts;
+    this.cacheKey = cacheKey;
+    this.store = store;
+    this.cacheKeys = store.cacheKeys;
+    this.#subject = observable;
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkRO7XAQOS_cjs.additionalContext].logger : store.client[chunkRO7XAQOS_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
+    }));
+  }
+  subscribe(observer) {
+    this.#connectable ??= this._createConnectable(this.#subject);
+    this.#subscription = this.#connectable.connect();
+    const sub = this.#connectable.subscribe({
+      next: (value) => {
+        if (observer.next) {
+          observer.next(value);
+        }
+      },
+      error: (err) => {
+        if (observer.error) {
+          observer.error(err);
+        }
+      },
+      complete: () => {
+        if (observer.complete) {
+          observer.complete();
+        }
       }
     });
+    return sub;
   }
-  get(type, ...args) {
-    const cacheKeyArgs = [type, ...args];
-    if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
-    const cacheKey = this.#cacheKeys.lookupArray(cacheKeyArgs);
-    this.#refCounts.register(cacheKey);
-    return cacheKey;
-  }
-  retain(cacheKey) {
-    this.#refCounts.retain(cacheKey);
-  }
-  release(cacheKey) {
-    this.#refCounts.release(cacheKey);
-  }
-  #remove(cacheKey) {
-    this.#cacheKeys.remove(cacheKey.type, ...cacheKey.otherKeys);
+  /**
+   * Register a subscription's dedupeInterval value
+   */
+  registerSubscriptionDedupeInterval(subscriptionId, dedupeInterval) {
+    if (dedupeInterval != null && dedupeInterval > 0) {
+      this.#subscriptionDedupeIntervals.set(subscriptionId, dedupeInterval);
+    }
   }
   /**
-   * Called after a key is no longer retained and the timeout has elapsed
-   * @param key
+   * Unregister a subscription's dedupeInterval value
    */
-  #cleanupCacheKey = (key) => {
-    this.#onDestroy?.(key);
-    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");
+  unregisterSubscriptionDedupeInterval(subscriptionId) {
+    this.#subscriptionDedupeIntervals.delete(subscriptionId);
   }
-}
-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();
-  added = /* @__PURE__ */ new Set();
-  modified = /* @__PURE__ */ new Set();
-  deleted = /* @__PURE__ */ new Set();
-  registerObject = (cacheKey, data, isNew) => {
-    this[isNew ? "addedObjects" : "modifiedObjects"].set(data.$apiName, data);
-    this[isNew ? "added" : "modified"].add(cacheKey);
-  };
-  deleteObject = (cacheKey) => {
-    this.deleted.add(cacheKey);
-  };
-  registerList = (key) => {
-    this.modified.add(key);
-  };
-  registerLink = (cacheKey) => {
-    this.modified.add(cacheKey);
-  };
-  deleteLink = (cacheKey) => {
-    this.deleted.add(cacheKey);
-  };
-  registerObjectSet = (key) => {
-    this.modified.add(key);
-  };
-  isEmpty() {
-    return this.modifiedObjects.size === 0 && this.addedObjects.size === 0 && this.added.size === 0 && this.modified.size === 0 && this.deleted.size === 0;
-  }
-};
-function createChangedObjects() {
-  return new Changes();
-}
-function DEBUG_ONLY__changesToString(changes) {
-  if (process.env.NODE_ENV !== "production") {
-    return JSON.stringify({
-      modifiedObjects: multimapHelper(changes.modifiedObjects),
-      addedObjects: multimapHelper(changes.addedObjects),
-      added: listHelper(changes.added),
-      modified: listHelper(changes.modified)
-    }, null, 2);
-  } else {
-    throw new Error("not implemented");
-  }
-}
-function listHelper(set) {
-  return Array.from(set).map(DEBUG_ONLY__cacheKeyToString);
-}
-function multimapHelper(multimap) {
-  return Object.fromEntries(Array.from(multimap.associations()).map(([type, objects]) => {
-    return [type, objects.map((o) => o.$primaryKey)];
-  }));
-}
-
-// src/observable/internal/createInitEntry.ts
-function createInitEntry(cacheKey) {
-  return {
-    cacheKey,
-    status: "init",
-    value: void 0,
-    lastUpdated: 0
-  };
-}
-
-// src/observable/internal/WeakMapWithEntries.ts
-var WeakMapWithEntries = class {
-  #map = /* @__PURE__ */ new WeakMap();
-  #list = [];
-  #toClean = [];
-  #needsCleaning = false;
-  #registry = new FinalizationRegistry(() => {
-    this.#toClean.push(new WeakRef({}));
-    this.#needsCleaning = true;
-  });
-  constructor() {
-    const weakThis = new WeakRef(this);
-    const intervalId = setInterval(() => {
-      const self = weakThis.deref();
-      if (self) {
-        if (this.#needsCleaning) {
-          this.#clean();
-        }
-      } else {
-        clearInterval(intervalId);
-      }
-    }, 1e3);
-  }
-  #clean() {
-    this.#list = this.#list.filter((ref) => ref.deref() !== void 0);
-  }
-  // functions for WeakMap
-  delete(key) {
-    const ret = this.#map.delete(key);
-    this.#toClean.push(new WeakRef(key));
-    this.#needsCleaning = true;
-    return ret;
-  }
-  get(key) {
-    return this.#map.get(key);
-  }
-  has(key) {
-    return this.#map.has(key);
+  /**
+   * Get the minimum dedupeInterval from all active subscriptions
+   */
+  getMinimumDedupeInterval() {
+    if (this.#subscriptionDedupeIntervals.size === 0) {
+      return this.options.dedupeInterval ?? 0;
+    }
+    return Math.min(...this.#subscriptionDedupeIntervals.values());
   }
   /**
-   * Adds a new element with a specified key and value.
-   * @param key Must be an object or symbol.
+   * Causes the query to revalidate. This will cause the query to fetch
+   * the latest data from the server and update the store if it is deemed
+   * "stale" or if `force` is true.
+   *
+   * @param force
+   * @returns
    */
-  set(key, value) {
-    if (!this.#map.has(key)) {
-      this.#list.push(new WeakRef(key));
+  async revalidate(force) {
+    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      methodName: "revalidate"
+    }) : this.logger;
+    if (force) {
+      this.abortController?.abort();
     }
-    this.#map.set(key, value);
-    return this;
+    if (this.pendingFetch) {
+      if (process.env.NODE_ENV !== "production") {
+        logger?.debug("Fetch is already pending, using it");
+      }
+      await this.pendingFetch;
+      return;
+    }
+    const minDedupeInterval = this.getMinimumDedupeInterval();
+    if (minDedupeInterval > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < minDedupeInterval) {
+      if (process.env.NODE_ENV !== "production") {
+        logger?.debug("Within dupeInterval, aborting revalidate");
+      }
+      return Promise.resolve();
+    }
+    if (process.env.NODE_ENV !== "production") {
+      logger?.debug("Starting actual revalidate");
+    }
+    this.store.batch({}, (batch) => {
+      this.setStatus("loading", batch);
+    });
+    this._preFetch();
+    this.lastFetchStarted = Date.now();
+    if (process.env.NODE_ENV !== "production") {
+      logger?.debug("calling _fetchAndStore()");
+    }
+    this.pendingFetch = this._fetchAndStore().finally(() => {
+      logger?.debug("promise's finally for _fetchAndStore()");
+      this.pendingFetch = void 0;
+    });
+    await this.pendingFetch;
+    return;
   }
-  [Symbol.toStringTag] = "WeakMap";
-  // functions for iterables
-  /** Returns an iterable of entries in the map. */
-  [Symbol.iterator]() {
-    return this.entries();
+  _preFetch() {
   }
   /**
-   * Returns an iterable of key, value pairs for every entry in the map.
+   * Sets the status of the query in the store (but does not store that in `changes`).
+   *
+   * @param status
+   * @param batch
+   * @returns
    */
-  entries() {
-    const self = this;
-    function* iter() {
-      for (const ref of self.#list) {
-        const key = ref.deref();
-        if (key !== void 0) {
-          yield [key, self.#map.get(key)];
-        }
+  setStatus(status, batch) {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "setStatus"
+      }).debug(`Attempting to set status to '${status}'`);
+    }
+    const existing = batch.read(this.cacheKey);
+    if (existing?.status === status) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "setStatus"
+        }).debug(`Status is already set to '${status}'; aborting`);
       }
+      return;
     }
-    return iter();
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "setStatus"
+      }).debug(`Writing status '${status}' to cache`);
+    }
+    batch.write(this.cacheKey, existing?.value, status);
   }
-  /**
-   * Returns an iterable of keys in the map
-   */
-  keys() {
-    const self = this;
-    function* iter() {
-      for (const ref of self.#list) {
-        const key = ref.deref();
-        if (key !== void 0) {
-          yield key;
-        }
-      }
+  dispose() {
+    if (this.abortController) {
+      this.abortController.abort();
     }
-    return iter();
+    this.#subscription?.unsubscribe();
+    this._dispose();
   }
   /**
-   * Returns an iterable of values in the map
+   * Per query type dispose functionality
    */
-  values() {
-    const self = this;
-    function* iter() {
-      for (const ref of self.#list) {
-        const key = ref.deref();
-        if (key !== void 0) {
-          const value = self.#map.get(key);
-          if (value !== void 0) {
-            yield value;
-          }
-        }
-      }
-    }
-    return iter();
+  _dispose() {
   }
+  /**
+   * The purpose of this method is to provide a way for others to write
+   * directly into the store for this query.
+   *
+   * @param data
+   * @param status
+   * @param batch
+   */
+  /**
+   * @param changes
+   * @param optimisticId
+   * @returns If revalidation is needed, a promise that resolves after the
+   *          revalidation is complete. Otherwise, undefined.
+   */
 };
 
-// src/observable/internal/Layer.ts
-var Layer = class _Layer {
-  #parent;
-  #cache = new WeakMapWithEntries();
-  #layerId;
-  constructor(parent, layerId) {
-    this.#parent = parent;
-    this.#layerId = layerId;
-  }
-  get parentLayer() {
-    return this.#parent;
-  }
-  get layerId() {
-    return this.#layerId;
+// 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[chunkRO7XAQOS_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
+    }) : void 0);
+    this.apiName = cacheKey.otherKeys[API_NAME_IDX];
+    this.canonicalWhere = cacheKey.otherKeys[WHERE_IDX];
+    this.rdpConfig = cacheKey.otherKeys[RDP_IDX];
+    this.canonicalAggregate = cacheKey.otherKeys[AGGREGATE_IDX];
   }
-  addLayer(layerId) {
-    return new _Layer(this, layerId);
+  _createConnectable(subject) {
+    return rxjs.connectable(subject.pipe(rxjs.map((x) => {
+      return {
+        status: x.status,
+        result: x.value,
+        lastUpdated: x.lastUpdated,
+        error: x.status === "error" ? new Error("Aggregation failed") : void 0
+      };
+    })), {
+      connector: () => new rxjs.BehaviorSubject({
+        status: "init",
+        result: void 0,
+        lastUpdated: 0
+      })
+    });
   }
-  removeLayer(layerId) {
-    if (layerId == null || this.#parent == null) {
-      return this;
-    }
-    if (this.#layerId !== layerId) {
-      this.#parent = this.#parent.removeLayer(layerId);
-      return this;
+  async _fetchAndStore() {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "_fetchAndStore"
+      }).debug("calling _fetchAndStore");
+    }
+    try {
+      const result = await this._fetchAggregation();
+      this.store.batch({}, (batch) => {
+        this.writeToStore(result, "loaded", batch);
+      });
+    } catch (err) {
+      this.store.batch({}, (batch) => {
+        this.writeToStore(void 0, "error", batch);
+      });
     }
-    return this.#parent.removeLayer(layerId);
   }
-  entries() {
-    return this.#cache.entries();
+  writeToStore(data, status, batch) {
+    batch.write(this.cacheKey, data, status);
+    batch.changes.modified.add(this.cacheKey);
+    return batch.read(this.cacheKey);
   }
-  keys() {
-    return this.#cache.keys();
+  invalidateObjectType = (objectType, changes) => {
+    if (this.apiName === objectType) {
+      changes?.modified.add(this.cacheKey);
+      return this.revalidate(true);
+    }
+    return Promise.resolve();
+  };
+};
+
+// src/observable/internal/aggregation/ObjectAggregationQuery.ts
+var ObjectAggregationQuery = class extends AggregationQuery {
+  async _fetchAggregation() {
+    const type = this.cacheKey.otherKeys[API_NAME_IDX];
+    let objectSet = this.store.client({
+      type: "object",
+      apiName: type
+    });
+    if (this.rdpConfig) {
+      objectSet = objectSet.withProperties(this.rdpConfig);
+    }
+    objectSet = objectSet.where(this.canonicalWhere);
+    return await objectSet.aggregate(this.canonicalAggregate);
   }
-  get(cacheKey) {
-    return this.#cache.get(cacheKey) ?? this.#parent?.get(cacheKey);
+};
+
+// src/observable/internal/aggregation/AggregationsHelper.ts
+var AggregationsHelper = class extends AbstractHelper {
+  constructor(store, cacheKeys, whereCanonicalizer2, rdpCanonicalizer) {
+    super(store, cacheKeys);
+    this.whereCanonicalizer = whereCanonicalizer2;
+    this.rdpCanonicalizer = rdpCanonicalizer;
   }
-  set(cacheKey, value) {
-    this.#cache.set(cacheKey, value);
+  observe(options, subFn) {
+    return super.observe(options, subFn);
   }
-};
-var Subjects = class {
-  #layers;
-  // we can use a regular Map here because the refCounting will
-  // handle cleanup.
-  #cacheKeyToSubject = /* @__PURE__ */ new WeakMap();
-  constructor({
-    logger,
-    layers
-  }) {
-    this.logger = logger;
-    this.#layers = layers;
+  getQuery(options) {
+    const {
+      type,
+      where,
+      withProperties,
+      aggregate
+    } = options;
+    const {
+      apiName
+    } = type;
+    const typeKind = "type" in type ? type.type : "interface";
+    const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
+    const canonRdp = withProperties ? this.rdpCanonicalizer.canonicalize(withProperties) : void 0;
+    const canonAggregate = this.canonicalizeAggregate(aggregate);
+    const aggregationCacheKey = this.cacheKeys.get("aggregation", typeKind, apiName, canonWhere, canonRdp, canonAggregate);
+    return this.store.queries.get(aggregationCacheKey, () => {
+      if (typeKind !== "object") {
+        throw new Error("Only ObjectTypeDefinition is currently supported for aggregations");
+      }
+      return new ObjectAggregationQuery(this.store, this.store.subjects.get(aggregationCacheKey), aggregationCacheKey, options);
+    });
+  }
+  canonicalizeAggregate(aggregate) {
+    return JSON.parse(JSON.stringify(aggregate));
   }
-  peek = (cacheKey) => {
-    return this.#cacheKeyToSubject.get(cacheKey);
-  };
-  get = (cacheKey) => {
-    let subject = this.#cacheKeyToSubject.get(cacheKey);
-    if (!subject) {
-      const initialValue = this.#layers.top.get(cacheKey) ?? createInitEntry(cacheKey);
-      subject = new rxjs.BehaviorSubject({
-        ...initialValue,
-        isOptimistic: initialValue.value !== this.#layers.truth.get(cacheKey)?.value
-      });
-      this.#cacheKeyToSubject.set(cacheKey, subject);
-    }
-    return subject;
-  };
-  delete = (cacheKey) => {
-    const subject = this.peek(cacheKey);
-    if (subject) {
-      subject.complete();
-      this.#cacheKeyToSubject.delete(cacheKey);
-    }
-  };
 };
 
-// src/observable/internal/tombstone.ts
-var tombstone = void 0;
+// src/observable/internal/CacheKey.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+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/Layers.ts
-var Layers = class {
-  #truthLayer = new Layer(void 0, void 0);
-  #topLayer;
-  #onRevalidate;
-  constructor({
-    logger,
-    onRevalidate
-  }) {
-    this.logger = logger;
-    this.#topLayer = this.#truthLayer;
-    this.subjects = new Subjects({
-      logger,
-      layers: this
-    });
-    this.#onRevalidate = onRevalidate;
+// src/observable/internal/CacheKeys.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/RefCounts.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var RefCounts = class {
+  refCounts = /* @__PURE__ */ new Map();
+  // keeps our objects around for some extended duration after they are no longer
+  // needed which is good for quick clicks across tabs.
+  gcMap = /* @__PURE__ */ new Map();
+  constructor(keepAlive, cleanup) {
+    this.keepAlive = keepAlive;
+    this.cleanup = cleanup;
   }
-  get top() {
-    return this.#topLayer;
+  register(key) {
+    if (!this.refCounts.has(key)) {
+      this.gcMap.set(key, Date.now() + this.keepAlive);
+    }
+    return key;
   }
-  get truth() {
-    return this.#truthLayer;
+  retain(key) {
+    const count = this.refCounts.get(key) ?? 0;
+    this.refCounts.set(key, count + 1);
+    if (this.gcMap.has(key)) {
+      this.gcMap.delete(key);
+    }
   }
-  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;
-    let currentLayer = this.#topLayer;
-    const cacheKeys = /* @__PURE__ */ new Map();
-    while (currentLayer != null && currentLayer.parentLayer != null) {
-      if (currentLayer.layerId === layerId) {
-        for (const [k, v] of currentLayer.entries()) {
-          if (cacheKeys.has(k)) continue;
-          cacheKeys.set(k, v);
-        }
-      }
-      currentLayer = currentLayer.parentLayer;
+  release(key) {
+    const count = this.refCounts.get(key);
+    if (count === void 0) ; else if (count === 1) {
+      this.refCounts.delete(key);
+      this.gcMap.set(key, Date.now() + this.keepAlive);
+    } else {
+      this.refCounts.set(key, count - 1);
     }
-    this.#topLayer = this.#topLayer.removeLayer(layerId);
-    for (const [k, oldEntry] of cacheKeys) {
-      const currentEntry = this.#topLayer.get(k);
-      if (oldEntry !== currentEntry) {
-        const newEntry = currentEntry ?? createInitEntry(k);
-        this.subjects.peek(k)?.next({
-          ...newEntry,
-          isOptimistic: currentEntry?.value !== this.#truthLayer.get(k)?.value
-        });
+  }
+  has(key) {
+    return this.refCounts.has(key);
+  }
+  gc() {
+    const now = Date.now();
+    for (const [key, deathTime] of this.gcMap) {
+      if (deathTime < now) {
+        this.gcMap.delete(key);
+        this.cleanup(key);
       }
     }
   }
-  batch({
-    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;
-    const batchContext = this.#createBatchContext({
-      optimisticId,
-      changes
-    });
-    const retVal = batchFn(batchContext);
-    this.#onRevalidate(changes, optimisticId).catch((e) => {
-      if (this.logger) {
-        this.logger.error("Unhandled error in batch", e);
-      } else {
-        console.error("Unhandled error in batch", e);
-        throw e;
-      }
-    });
-    return {
-      batchResult: batchContext,
-      retVal,
-      changes: batchContext.changes
+};
+
+// src/observable/internal/CacheKeys.ts
+var CacheKeys = class {
+  #cacheKeys = new trie.Trie(false, (keys) => {
+    const cacheKey = {
+      type: keys[0],
+      otherKeys: keys.slice(1)
     };
-  }
-  #createBatchContext({
-    optimisticId,
-    changes
+    this.#onCreate?.(cacheKey);
+    return cacheKey;
+  });
+  #refCounts = new RefCounts(6e4, (k) => this.#cleanupCacheKey(k));
+  // we are currently only using this for debug logging and should just remove it in the future if that
+  // continues to be true
+  #finalizationRegistry;
+  #onCreate;
+  #onDestroy;
+  constructor({
+    onCreate,
+    onDestroy
   }) {
-    let needsLayer = optimisticId !== void 0;
-    const batchContext = {
-      changes,
-      createLayerIfNeeded: () => {
-        if (needsLayer) {
-          this.#topLayer = this.#topLayer.addLayer(optimisticId);
-          needsLayer = false;
-        }
-      },
-      optimisticWrite: !!optimisticId,
-      write: (cacheKey, value, status) => {
-        const oldTopValue = this.#topLayer.get(cacheKey);
-        if (optimisticId) batchContext.createLayerIfNeeded();
-        const writeLayer = optimisticId ? this.#topLayer : this.#truthLayer;
-        const newValue = {
-          cacheKey,
-          value,
-          lastUpdated: Date.now(),
-          status
-        };
-        writeLayer.set(cacheKey, newValue);
-        const newTopValue = this.#topLayer.get(cacheKey);
-        if (oldTopValue !== newTopValue) {
-          this.subjects.get(cacheKey)?.next({
-            ...newValue,
-            isOptimistic: newTopValue?.value !== this.#truthLayer.get(cacheKey)?.value
-          });
-        }
-        return newValue;
-      },
-      delete: (cacheKey, status) => {
-        return batchContext.write(cacheKey, tombstone, status);
-      },
-      read: (cacheKey) => {
-        return optimisticId ? this.#topLayer.get(cacheKey) : this.#truthLayer.get(cacheKey);
+    this.#onCreate = onCreate;
+    this.#onDestroy = onDestroy;
+    setInterval(() => {
+      this.#refCounts.gc();
+    }, 1e3);
+    this.#finalizationRegistry = new FinalizationRegistry((cleanupCallback) => {
+      try {
+        cleanupCallback();
+      } catch (e) {
+        console.error("Caught an error while running a finalization callback", e);
       }
-    };
-    return batchContext;
+    });
+  }
+  get(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);
+    return cacheKey;
+  }
+  retain(cacheKey) {
+    this.#refCounts.retain(cacheKey);
+  }
+  release(cacheKey) {
+    this.#refCounts.release(cacheKey);
+  }
+  #remove(cacheKey) {
+    this.#cacheKeys.remove(cacheKey.type, ...cacheKey.otherKeys);
   }
+  /**
+   * Called after a key is no longer retained and the timeout has elapsed
+   * @param key
+   */
+  #cleanupCacheKey = (key) => {
+    this.#onDestroy?.(key);
+    this.#remove(key);
+  };
 };
 
-// src/observable/internal/QuerySubscription.ts
-var subscriptionIdCounter = 0;
-var QuerySubscription = class extends UnsubscribableWrapper {
-  /** @internal */
-  /** @internal */
-  /** @internal */
-  constructor(query, subscription) {
-    super(subscription);
-    this.query = query;
-    this.subscription = subscription;
-    this.subscriptionId = `sub_${++subscriptionIdCounter}`;
-    Object.defineProperties(this, {
-      query: {
-        enumerable: false
-      },
-      subscription: {
-        enumerable: false
-      },
-      subscriptionId: {
-        enumerable: false
-      }
-    });
+// src/observable/internal/Changes.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var Changes = class {
+  modifiedObjects = new mnemonist.MultiMap();
+  addedObjects = new mnemonist.MultiMap();
+  added = /* @__PURE__ */ new Set();
+  modified = /* @__PURE__ */ new Set();
+  deleted = /* @__PURE__ */ new Set();
+  registerObject = (cacheKey, data, isNew) => {
+    this[isNew ? "addedObjects" : "modifiedObjects"].set(data.$apiName, data);
+    this[isNew ? "added" : "modified"].add(cacheKey);
+  };
+  deleteObject = (cacheKey) => {
+    this.deleted.add(cacheKey);
+  };
+  registerList = (key) => {
+    this.modified.add(key);
+  };
+  registerLink = (cacheKey) => {
+    this.modified.add(cacheKey);
+  };
+  deleteLink = (cacheKey) => {
+    this.deleted.add(cacheKey);
+  };
+  registerObjectSet = (key) => {
+    this.modified.add(key);
+  };
+  isEmpty() {
+    return this.modifiedObjects.size === 0 && this.addedObjects.size === 0 && this.added.size === 0 && this.modified.size === 0 && this.deleted.size === 0;
   }
 };
+function createChangedObjects() {
+  return new Changes();
+}
+function DEBUG_ONLY__changesToString(changes) {
+  if (process.env.NODE_ENV !== "production") {
+    return JSON.stringify({
+      modifiedObjects: multimapHelper(changes.modifiedObjects),
+      addedObjects: multimapHelper(changes.addedObjects),
+      added: listHelper(changes.added),
+      modified: listHelper(changes.modified)
+    }, null, 2);
+  } else {
+    throw new Error("not implemented");
+  }
+}
+function listHelper(set) {
+  return Array.from(set).map(DEBUG_ONLY__cacheKeyToString);
+}
+function multimapHelper(multimap) {
+  return Object.fromEntries(Array.from(multimap.associations()).map(([type, objects]) => {
+    return [type, objects.map((o) => o.$primaryKey)];
+  }));
+}
 
-// src/observable/internal/AbstractHelper.ts
-var AbstractHelper = class {
-  constructor(store, cacheKeys) {
-    this.store = store;
-    this.cacheKeys = cacheKeys;
+// src/observable/internal/IntersectCanonicalizer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/Canonicalizer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+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;
   }
-  observe(options, subFn) {
-    const query = this.getQuery(options);
-    return this._subscribe(query, options, subFn);
+};
+
+// src/observable/internal/IntersectCanonicalizer.ts
+var IntersectCanonicalizer = class extends CachingCanonicalizer {
+  structuralCache = /* @__PURE__ */ new Map();
+  constructor(whereCanonicalizer2) {
+    super();
+    this.whereCanonicalizer = whereCanonicalizer2;
   }
-  _subscribe(query, options, subFn) {
-    this.store.cacheKeys.retain(query.cacheKey);
-    if (options.mode !== "offline") {
-      query.revalidate(options.mode === "force").catch((e) => {
-        subFn.error(e);
-        if (this.store.logger) {
-          this.store.logger.error("Unhandled error in observeObject", e);
-        } else {
-          throw e;
-        }
-      });
+  lookupOrCreate(intersectWith) {
+    const canonicalClauses = intersectWith.map((item) => this.whereCanonicalizer.canonicalize(item.where ?? {}));
+    const structuralKey = canonicalClauses.map((clause) => JSON.stringify(clause)).join("||");
+    let canonical = this.structuralCache.get(structuralKey);
+    if (!canonical) {
+      canonical = canonicalClauses;
+      this.structuralCache.set(structuralKey, canonical);
     }
-    const sub = query.subscribe(subFn);
-    const querySub = new QuerySubscription(query, sub);
-    query.registerSubscriptionDedupeInterval(querySub.subscriptionId, options.dedupeInterval);
-    sub.add(() => {
-      query.unregisterSubscriptionDedupeInterval(querySub.subscriptionId);
-      this.store.cacheKeys.release(query.cacheKey);
-    });
-    return querySub;
+    return canonical;
   }
 };
 
-// src/observable/internal/isObjectInstance.ts
-function isObjectInstance(item) {
-  return item != null && typeof item === "object" && "$primaryKey" in item;
+// src/observable/internal/Layers.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/createInitEntry.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+function createInitEntry(cacheKey) {
+  return {
+    cacheKey,
+    status: "init",
+    value: void 0,
+    lastUpdated: 0
+  };
 }
 
-// src/observable/internal/Query.ts
-var Query = class {
-  retainCount = 0;
-  #connectable;
-  #subscription;
-  #subject;
-  #subscriptionDedupeIntervals = /* @__PURE__ */ new Map();
-  /** @internal */
-  constructor(store, observable, opts, cacheKey, logger) {
-    this.options = opts;
-    this.cacheKey = cacheKey;
-    this.store = store;
-    this.cacheKeys = store.cacheKeys;
-    this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger : store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
-      msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
-    }));
-  }
-  subscribe(observer) {
-    this.#connectable ??= this._createConnectable(this.#subject);
-    this.#subscription = this.#connectable.connect();
-    const sub = this.#connectable.subscribe({
-      next: (value) => {
-        if (observer.next) {
-          observer.next(value);
-        }
-      },
-      error: (err) => {
-        if (observer.error) {
-          observer.error(err);
-        }
-      },
-      complete: () => {
-        if (observer.complete) {
-          observer.complete();
+// src/observable/internal/Layer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/WeakMapWithEntries.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var WeakMapWithEntries = class {
+  #map = /* @__PURE__ */ new WeakMap();
+  #list = [];
+  #toClean = [];
+  #needsCleaning = false;
+  #registry = new FinalizationRegistry(() => {
+    this.#toClean.push(new WeakRef({}));
+    this.#needsCleaning = true;
+  });
+  constructor() {
+    const weakThis = new WeakRef(this);
+    const intervalId = setInterval(() => {
+      const self = weakThis.deref();
+      if (self) {
+        if (this.#needsCleaning) {
+          this.#clean();
         }
+      } else {
+        clearInterval(intervalId);
       }
-    });
-    return sub;
+    }, 1e3);
+  }
+  #clean() {
+    this.#list = this.#list.filter((ref) => ref.deref() !== void 0);
+  }
+  // functions for WeakMap
+  delete(key) {
+    const ret = this.#map.delete(key);
+    this.#toClean.push(new WeakRef(key));
+    this.#needsCleaning = true;
+    return ret;
+  }
+  get(key) {
+    return this.#map.get(key);
+  }
+  has(key) {
+    return this.#map.has(key);
   }
   /**
-   * Register a subscription's dedupeInterval value
+   * Adds a new element with a specified key and value.
+   * @param key Must be an object or symbol.
    */
-  registerSubscriptionDedupeInterval(subscriptionId, dedupeInterval) {
-    if (dedupeInterval != null && dedupeInterval > 0) {
-      this.#subscriptionDedupeIntervals.set(subscriptionId, dedupeInterval);
+  set(key, value) {
+    if (!this.#map.has(key)) {
+      this.#list.push(new WeakRef(key));
     }
+    this.#map.set(key, value);
+    return this;
+  }
+  [Symbol.toStringTag] = "WeakMap";
+  // functions for iterables
+  /** Returns an iterable of entries in the map. */
+  [Symbol.iterator]() {
+    return this.entries();
   }
   /**
-   * Unregister a subscription's dedupeInterval value
+   * Returns an iterable of key, value pairs for every entry in the map.
    */
-  unregisterSubscriptionDedupeInterval(subscriptionId) {
-    this.#subscriptionDedupeIntervals.delete(subscriptionId);
+  entries() {
+    const self = this;
+    function* iter() {
+      for (const ref of self.#list) {
+        const key = ref.deref();
+        if (key !== void 0) {
+          yield [key, self.#map.get(key)];
+        }
+      }
+    }
+    return iter();
   }
   /**
-   * Get the minimum dedupeInterval from all active subscriptions
+   * Returns an iterable of keys in the map
    */
-  getMinimumDedupeInterval() {
-    if (this.#subscriptionDedupeIntervals.size === 0) {
-      return this.options.dedupeInterval ?? 0;
+  keys() {
+    const self = this;
+    function* iter() {
+      for (const ref of self.#list) {
+        const key = ref.deref();
+        if (key !== void 0) {
+          yield key;
+        }
+      }
     }
-    return Math.min(...this.#subscriptionDedupeIntervals.values());
+    return iter();
   }
   /**
-   * Causes the query to revalidate. This will cause the query to fetch
-   * the latest data from the server and update the store if it is deemed
-   * "stale" or if `force` is true.
-   *
-   * @param force
-   * @returns
+   * Returns an iterable of values in the map
    */
-  async revalidate(force) {
-    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
-      methodName: "revalidate"
-    }) : this.logger;
-    if (force) {
-      this.abortController?.abort();
-    }
-    if (this.pendingFetch) {
-      if (process.env.NODE_ENV !== "production") {
-        logger?.debug("Fetch is already pending, using it");
+  values() {
+    const self = this;
+    function* iter() {
+      for (const ref of self.#list) {
+        const key = ref.deref();
+        if (key !== void 0) {
+          const value = self.#map.get(key);
+          if (value !== void 0) {
+            yield value;
+          }
+        }
       }
-      await this.pendingFetch;
-      return;
     }
-    const minDedupeInterval = this.getMinimumDedupeInterval();
-    if (minDedupeInterval > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < minDedupeInterval) {
-      if (process.env.NODE_ENV !== "production") {
-        logger?.debug("Within dupeInterval, aborting revalidate");
-      }
-      return Promise.resolve();
+    return iter();
+  }
+};
+
+// src/observable/internal/Layer.ts
+var Layer = class _Layer {
+  #parent;
+  #cache = new WeakMapWithEntries();
+  #layerId;
+  constructor(parent, layerId) {
+    this.#parent = parent;
+    this.#layerId = layerId;
+  }
+  get parentLayer() {
+    return this.#parent;
+  }
+  get layerId() {
+    return this.#layerId;
+  }
+  addLayer(layerId) {
+    return new _Layer(this, layerId);
+  }
+  removeLayer(layerId) {
+    if (layerId == null || this.#parent == null) {
+      return this;
     }
-    if (process.env.NODE_ENV !== "production") {
-      logger?.debug("Starting actual revalidate");
+    if (this.#layerId !== layerId) {
+      this.#parent = this.#parent.removeLayer(layerId);
+      return this;
     }
-    this.store.batch({}, (batch) => {
-      this.setStatus("loading", batch);
-    });
-    this._preFetch();
-    this.lastFetchStarted = Date.now();
-    if (process.env.NODE_ENV !== "production") {
-      logger?.debug("calling _fetchAndStore()");
+    return this.#parent.removeLayer(layerId);
+  }
+  entries() {
+    return this.#cache.entries();
+  }
+  keys() {
+    return this.#cache.keys();
+  }
+  get(cacheKey) {
+    return this.#cache.get(cacheKey) ?? this.#parent?.get(cacheKey);
+  }
+  set(cacheKey, value) {
+    this.#cache.set(cacheKey, value);
+  }
+};
+
+// src/observable/internal/Subjects.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var Subjects = class {
+  #layers;
+  // we can use a regular Map here because the refCounting will
+  // handle cleanup.
+  #cacheKeyToSubject = /* @__PURE__ */ new WeakMap();
+  constructor({
+    logger,
+    layers
+  }) {
+    this.logger = logger;
+    this.#layers = layers;
+  }
+  peek = (cacheKey) => {
+    return this.#cacheKeyToSubject.get(cacheKey);
+  };
+  get = (cacheKey) => {
+    let subject = this.#cacheKeyToSubject.get(cacheKey);
+    if (!subject) {
+      const initialValue = this.#layers.top.get(cacheKey) ?? createInitEntry(cacheKey);
+      subject = new rxjs.BehaviorSubject({
+        ...initialValue,
+        isOptimistic: initialValue.value !== this.#layers.truth.get(cacheKey)?.value
+      });
+      this.#cacheKeyToSubject.set(cacheKey, subject);
     }
-    this.pendingFetch = this._fetchAndStore().finally(() => {
-      logger?.debug("promise's finally for _fetchAndStore()");
-      this.pendingFetch = void 0;
+    return subject;
+  };
+  delete = (cacheKey) => {
+    const subject = this.peek(cacheKey);
+    if (subject) {
+      subject.complete();
+      this.#cacheKeyToSubject.delete(cacheKey);
+    }
+  };
+};
+
+// src/observable/internal/tombstone.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var tombstone = void 0;
+
+// src/observable/internal/Layers.ts
+var Layers = class {
+  #truthLayer = new Layer(void 0, void 0);
+  #topLayer;
+  #onRevalidate;
+  constructor({
+    logger,
+    onRevalidate
+  }) {
+    this.logger = logger;
+    this.#topLayer = this.#truthLayer;
+    this.subjects = new Subjects({
+      logger,
+      layers: this
     });
-    await this.pendingFetch;
-    return;
+    this.#onRevalidate = onRevalidate;
   }
-  _preFetch() {
+  get top() {
+    return this.#topLayer;
   }
-  /**
-   * Sets the status of the query in the store (but does not store that in `changes`).
-   *
-   * @param status
-   * @param batch
-   * @returns
-   */
-  setStatus(status, batch) {
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "setStatus"
-      }).debug(`Attempting to set status to '${status}'`);
+  get truth() {
+    return this.#truthLayer;
+  }
+  remove(layerId) {
+    !(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) {
+      if (currentLayer.layerId === layerId) {
+        for (const [k, v] of currentLayer.entries()) {
+          if (cacheKeys.has(k)) continue;
+          cacheKeys.set(k, v);
+        }
+      }
+      currentLayer = currentLayer.parentLayer;
     }
-    const existing = batch.read(this.cacheKey);
-    if (existing?.status === status) {
-      if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "setStatus"
-        }).debug(`Status is already set to '${status}'; aborting`);
+    this.#topLayer = this.#topLayer.removeLayer(layerId);
+    for (const [k, oldEntry] of cacheKeys) {
+      const currentEntry = this.#topLayer.get(k);
+      if (oldEntry !== currentEntry) {
+        const newEntry = currentEntry ?? createInitEntry(k);
+        this.subjects.peek(k)?.next({
+          ...newEntry,
+          isOptimistic: currentEntry?.value !== this.#truthLayer.get(k)?.value
+        });
       }
-      return;
-    }
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "setStatus"
-      }).debug(`Writing status '${status}' to cache`);
     }
-    batch.write(this.cacheKey, existing?.value, status);
   }
-  dispose() {
-    if (this.abortController) {
-      this.abortController.abort();
-    }
-    this.#subscription?.unsubscribe();
-    this._dispose();
+  batch({
+    optimisticId,
+    changes
+  }, batchFn) {
+    !(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
+    });
+    const retVal = batchFn(batchContext);
+    this.#onRevalidate(changes, optimisticId).catch((e) => {
+      if (this.logger) {
+        this.logger.error("Unhandled error in batch", e);
+      } else {
+        console.error("Unhandled error in batch", e);
+        throw e;
+      }
+    });
+    return {
+      batchResult: batchContext,
+      retVal,
+      changes: batchContext.changes
+    };
   }
-  /**
-   * Per query type dispose functionality
-   */
-  _dispose() {
+  #createBatchContext({
+    optimisticId,
+    changes
+  }) {
+    let needsLayer = optimisticId !== void 0;
+    const batchContext = {
+      changes,
+      createLayerIfNeeded: () => {
+        if (needsLayer) {
+          this.#topLayer = this.#topLayer.addLayer(optimisticId);
+          needsLayer = false;
+        }
+      },
+      optimisticWrite: !!optimisticId,
+      write: (cacheKey, value, status) => {
+        const oldTopValue = this.#topLayer.get(cacheKey);
+        if (optimisticId) batchContext.createLayerIfNeeded();
+        const writeLayer = optimisticId ? this.#topLayer : this.#truthLayer;
+        const newValue = {
+          cacheKey,
+          value,
+          lastUpdated: Date.now(),
+          status
+        };
+        writeLayer.set(cacheKey, newValue);
+        const newTopValue = this.#topLayer.get(cacheKey);
+        if (oldTopValue !== newTopValue) {
+          this.subjects.get(cacheKey)?.next({
+            ...newValue,
+            isOptimistic: newTopValue?.value !== this.#truthLayer.get(cacheKey)?.value
+          });
+        }
+        return newValue;
+      },
+      delete: (cacheKey, status) => {
+        return batchContext.write(cacheKey, tombstone, status);
+      },
+      read: (cacheKey) => {
+        return optimisticId ? this.#topLayer.get(cacheKey) : this.#truthLayer.get(cacheKey);
+      }
+    };
+    return batchContext;
   }
-  /**
-   * The purpose of this method is to provide a way for others to write
-   * directly into the store for this query.
-   *
-   * @param data
-   * @param status
-   * @param batch
-   */
-  /**
-   * @param changes
-   * @param optimisticId
-   * @returns If revalidation is needed, a promise that resolves after the
-   *          revalidation is complete. Otherwise, undefined.
-   */
 };
 
+// src/observable/internal/links/LinksHelper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/links/SpecificLinkQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/base-list/BaseListQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/isObjectInstance.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+function isObjectInstance(item) {
+  return item != null && typeof item === "object" && "$primaryKey" in item;
+}
+
+// src/observable/internal/list/ListCacheKey.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var API_NAME_IDX2 = 1;
+var WHERE_IDX2 = 2;
+var ORDER_BY_IDX = 3;
+var RDP_IDX2 = 4;
+var INTERSECT_IDX = 5;
+var PIVOT_IDX = 6;
+
 // src/observable/internal/sorting/SortingStrategy.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var NoOpSortingStrategy = class {
   sortCacheKeys(objectCacheKeys, _batch) {
     return objectCacheKeys;
@@ -1204,6 +1465,9 @@ function createOrderBySortFns(orderBy) {
     };
   });
 }
+
+// src/observable/internal/base-list/createCollectionConnectable.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function createCollectionConnectable(subject, subjects, createPayload) {
   return rxjs.connectable(subject.pipe(rxjs.switchMap((listEntry) => {
     const resolvedData = listEntry?.value?.data == null || listEntry.value.data.length === 0 ? rxjs.of([]) : rxjs.combineLatest(listEntry.value.data.map((cacheKey) => subjects.get(cacheKey).pipe(rxjs.map((objectEntry) => objectEntry?.value), rxjs.distinctUntilChanged())));
@@ -1225,6 +1489,7 @@ function createCollectionConnectable(subject, subjects, createPayload) {
 }
 
 // src/observable/internal/base-list/removeDuplicates.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function removeDuplicates(objectCacheKeys, batch) {
   const visited = /* @__PURE__ */ new Set();
   return objectCacheKeys.filter((key) => {
@@ -1244,6 +1509,12 @@ var BaseListQuery = class extends Query {
    * @protected
    */
   sortingStrategy = new NoOpSortingStrategy();
+  /**
+   * Get RDP configuration from the cache key
+   */
+  get rdpConfig() {
+    return this.cacheKey.otherKeys[RDP_IDX2];
+  }
   // Collection-specific behavior is implemented by subclasses
   /**
    * Token for the next page of results
@@ -1276,7 +1547,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 +1566,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({
@@ -1404,9 +1675,11 @@ var BaseListQuery = class extends Query {
       return this.pendingPageFetch;
     }
     if (this.pendingFetch) {
-      this.pendingPageFetch = new Promise(async (res) => {
+      this.pendingPageFetch = (async () => {
         await this.pendingFetch;
-        res(this.fetchMore());
+        await this.fetchMore();
+      })().finally(() => {
+        this.pendingPageFetch = void 0;
       });
       return this.pendingPageFetch;
     }
@@ -1480,7 +1753,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 +1823,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;
     }
@@ -1560,6 +1834,132 @@ var BaseListQuery = class extends Query {
       data: objectCacheKeys
     }, options.status, batch);
   }
+  //
+  // Shared Websocket Subscription Methods
+  //
+  /**
+   * Create standard websocket subscription handlers for an ObjectSet.
+   * Subclasses can override individual handlers for custom behavior.
+   *
+   * @param objectSet The ObjectSet to subscribe to
+   * @param sub The parent subscription to add cleanup to
+   * @param methodName The method name for logging purposes
+   */
+  createWebsocketSubscription(objectSet, sub, methodName = "registerStreamUpdates") {
+    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      methodName
+    }) : this.logger;
+    if (process.env.NODE_ENV !== "production") {
+      logger?.child({
+        methodName
+      }).info("Subscribing from websocket");
+    }
+    try {
+      const websocketSubscription = objectSet.subscribe({
+        onChange: this.onOswChange.bind(this),
+        onError: this.onOswError.bind(this),
+        onOutOfDate: this.onOswOutOfDate.bind(this),
+        onSuccessfulSubscription: this.onOswSuccessfulSubscription.bind(this)
+      });
+      sub.add(() => {
+        if (process.env.NODE_ENV !== "production") {
+          logger?.child({
+            methodName
+          }).info("Unsubscribing from websocket");
+        }
+        websocketSubscription.unsubscribe();
+      });
+    } catch (error) {
+      if (this.logger) {
+        this.logger.child({
+          methodName
+        }).error("Failed to register stream updates", error);
+      }
+      this.onOswError({
+        subscriptionClosed: true,
+        error
+      });
+    }
+  }
+  /**
+   * Handler called when websocket subscription is successfully established.
+   */
+  onOswSuccessfulSubscription() {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "onSuccessfulSubscription"
+      }).debug("");
+    }
+  }
+  /**
+   * Handler called when subscribed data becomes out of date.
+   */
+  onOswOutOfDate() {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "onOutOfDate"
+      }).debug("");
+    }
+  }
+  /**
+   * Handler called when websocket subscription encounters an error.
+   */
+  onOswError(errors) {
+    if (this.logger) {
+      this.logger?.child({
+        methodName: "onError"
+      }).error("subscription errors", errors);
+    }
+  }
+  /**
+   * Handler called when an object in the subscribed set is added or updated.
+   * Default implementation stores the object with RDP config if available.
+   *
+   * @param update The object update notification
+   */
+  onOswChange({
+    object,
+    state
+  }) {
+    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      methodName: "registerStreamUpdates"
+    }) : this.logger;
+    if (process.env.NODE_ENV !== "production") {
+      logger?.child({
+        methodName: "onChange"
+      }).debug(`Got an update of type: ${state}`, object);
+    }
+    if (state === "ADDED_OR_UPDATED") {
+      this.store.batch({}, (batch) => {
+        this.store.objects.storeOsdkInstances(
+          [object],
+          batch,
+          this.rdpConfig
+          // Safe - null for queries without RDPs
+        );
+      });
+    } else if (state === "REMOVED") {
+      this.onOswRemoved(object);
+    }
+  }
+  /**
+   * Handler called when an object is removed from the subscribed set.
+   * Default implementation deletes the object from cache.
+   * ListQuery overrides this for list-specific removal logic.
+   *
+   * @param object The removed object
+   */
+  onOswRemoved(object) {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "onRemoved"
+      }).debug("Removing object", object);
+    }
+    this.store.batch({}, (batch) => {
+      const objectCacheKey = this.store.cacheKeys.get("object", object.$apiName, object.$primaryKey);
+      batch.delete(objectCacheKey, "loaded");
+    });
+  }
 };
 
 // src/observable/internal/links/SpecificLinkQuery.ts
@@ -1576,7 +1976,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[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRO7XAQOS_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 +1993,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkMEL46GIF_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkRO7XAQOS_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     const sourceQuery = client(sourceObjectDef).where({
       [sourceMetadata.primaryKeyApiName]: this.#sourcePk
     });
@@ -1620,7 +2020,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 +2057,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkMEL46GIF_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkRO7XAQOS_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 +2087,62 @@ var LinksHelper = class extends AbstractHelper {
     });
   }
 };
+
+// src/observable/internal/list/ListsHelper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/list/InterfaceListQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/list/ListQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/objectMatchesWhereClause.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/evaluateFilter.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+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 +2150,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 +2159,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 +2178,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,12 +2194,13 @@ 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;
+  #intersectWith;
+  #pivotInfo;
   #objectSet;
   /**
    * Register changes to the cache specific to ListQuery
@@ -1787,13 +2208,15 @@ var ListQuery = class extends BaseListQuery {
   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[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
+  constructor(store, subject, apiName, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRO7XAQOS_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_IDX2];
+    this.#orderBy = cacheKey.otherKeys[ORDER_BY_IDX];
+    this.#intersectWith = cacheKey.otherKeys[INTERSECT_IDX];
+    this.#pivotInfo = cacheKey.otherKeys[PIVOT_IDX];
     this.#objectSet = this.createObjectSet(store);
     this.sortingStrategy = new OrderBySortingStrategy(this.apiName, this.#orderBy);
     this.minResultsToLoad = 0;
@@ -1801,6 +2224,12 @@ var ListQuery = class extends BaseListQuery {
   get canonicalWhere() {
     return this.#whereClause;
   }
+  get canonicalIntersectWith() {
+    return this.#intersectWith;
+  }
+  get canonicalPivotInfo() {
+    return this.#pivotInfo;
+  }
   /**
    * Create the ObjectSet for this query.
    */
@@ -1849,7 +2278,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 +2320,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 +2328,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 +2340,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,
@@ -1949,58 +2378,16 @@ var ListQuery = class extends BaseListQuery {
         const matchType = this.#matchType(obj);
         if (matchType) {
           group[`${matchType}Matches`].add(obj);
-        }
-      }
-    }
-    return relevantObjects;
-  }
-  /**
-   * Extract relevant objects for this query type.
-   */
-  registerStreamUpdates(sub) {
-    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
-      methodName: "registerStreamUpdates"
-    }) : this.logger;
-    if (process.env.NODE_ENV !== "production") {
-      logger?.child({
-        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)
-    });
-    sub.add(() => {
-      if (process.env.NODE_ENV !== "production") {
-        logger?.child({
-          methodName: "observeList"
-        }).info("Unsubscribing from websocket");
-      }
-      websocketSubscription.unsubscribe();
-    });
-  }
-  onOswSuccessfulSubscription() {
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "onSuccessfulSubscription"
-      }).debug("");
-    }
-  }
-  onOswOutOfDate() {
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "onOutOfDate"
-      }).debug("");
-    }
-  }
-  onOswError(errors) {
-    if (this.logger) {
-      this.logger?.child({
-        methodName: "onError"
-      }).error("subscription errors", errors);
+        }
+      }
     }
+    return relevantObjects;
+  }
+  /**
+   * Extract relevant objects for this query type.
+   */
+  registerStreamUpdates(sub) {
+    this.createWebsocketSubscription(this.#objectSet, sub, "observeList");
   }
   onOswChange({
     object: objOrIface,
@@ -2017,18 +2404,21 @@ 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);
+      this.onOswRemoved(objOrIface);
     }
   }
-  onOswRemoved(objOrIface, logger) {
+  onOswRemoved(objOrIface) {
+    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      methodName: "onOswRemoved"
+    }) : this.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 +2443,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_IDX2];
+    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 +2483,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkSDFKR62Z_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkHJX4D4KL_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 +2504,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][chunkSDFKR62Z_cjs.UnderlyingOsdkObject][chunkSDFKR62Z_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkHJX4D4KL_cjs.UnderlyingOsdkObject][chunkHJX4D4KL_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -2111,19 +2514,66 @@ 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;
 }
 
 // src/observable/internal/list/ObjectListQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var ObjectListQuery = class extends ListQuery {
   createObjectSet(store) {
-    return store.client({
+    const rdpConfig = this.cacheKey.otherKeys[RDP_IDX2];
+    const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX];
+    const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
+    if (pivotInfo != null) {
+      const sourceSet = store.client({
+        type: "object",
+        apiName: pivotInfo.sourceType
+      });
+      let objectSet2 = sourceSet.pivotTo(pivotInfo.linkName);
+      if (rdpConfig != null) {
+        objectSet2 = objectSet2.withProperties(rdpConfig);
+      }
+      objectSet2 = objectSet2.where(this.canonicalWhere);
+      if (intersectWith != null && intersectWith.length > 0) {
+        const intersectSets = intersectWith.map((whereClause) => {
+          let intersectSet = store.client({
+            type: "object",
+            apiName: pivotInfo.targetType
+          });
+          if (rdpConfig != null) {
+            intersectSet = intersectSet.withProperties(rdpConfig);
+          }
+          return intersectSet.where(whereClause);
+        });
+        objectSet2 = objectSet2.intersect(...intersectSets);
+      }
+      return objectSet2;
+    }
+    let objectSet = store.client({
       type: "object",
       apiName: this.apiName
-    }).where(this.canonicalWhere);
+    });
+    if (rdpConfig != null) {
+      objectSet = objectSet.withProperties(rdpConfig);
+    }
+    objectSet = objectSet.where(this.canonicalWhere);
+    if (intersectWith != null && intersectWith.length > 0) {
+      const intersectSets = intersectWith.map((whereClause) => {
+        let intersectSet = store.client({
+          type: "object",
+          apiName: this.apiName
+        });
+        if (rdpConfig != null) {
+          intersectSet = intersectSet.withProperties(rdpConfig);
+        }
+        return intersectSet.where(whereClause);
+      });
+      objectSet = objectSet.intersect(...intersectSets);
+    }
+    return objectSet;
   }
   async revalidateObjectType(apiName) {
     if (this.apiName === apiName) {
@@ -2139,12 +2589,12 @@ var ObjectListQuery = class extends ListQuery {
   extractRelevantObjects(changes) {
     return {
       added: {
-        all: changes.addedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX]) ?? [],
+        all: changes.addedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX2]) ?? [],
         strictMatches: /* @__PURE__ */ new Set(),
         sortaMatches: /* @__PURE__ */ new Set()
       },
       modified: {
-        all: changes.modifiedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX]) ?? [],
+        all: changes.modifiedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX2]) ?? [],
         strictMatches: /* @__PURE__ */ new Set(),
         sortaMatches: /* @__PURE__ */ new Set()
       }
@@ -2154,10 +2604,13 @@ 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, intersectCanonicalizer, pivotCanonicalizer) {
     super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer2;
     this.orderByCanonicalizer = orderByCanonicalizer2;
+    this.rdpCanonicalizer = rdpCanonicalizer;
+    this.intersectCanonicalizer = intersectCanonicalizer;
+    this.pivotCanonicalizer = pivotCanonicalizer;
   }
   observe(options, subFn) {
     const ret = super.observe(options, subFn);
@@ -2168,24 +2621,217 @@ var ListsHelper = class extends AbstractHelper {
   }
   getQuery(options) {
     const {
-      type: {
-        apiName,
-        type
-      },
+      type: typeDefinition,
       where,
-      orderBy
+      orderBy,
+      withProperties,
+      intersectWith,
+      pivotTo
     } = 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 canonIntersect = intersectWith && intersectWith.length > 0 ? this.intersectCanonicalizer.canonicalize(intersectWith) : void 0;
+    const canonPivot = pivotTo ? this.pivotCanonicalizer.canonicalize(apiName, pivotTo) : void 0;
+    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy, canonRdp, canonIntersect, canonPivot);
     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
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var API_NAME_IDX3 = 0;
+var RDP_CONFIG_IDX = 2;
+
+// src/observable/internal/object/ObjectCacheKeyRegistry.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/utils/rdpFieldOperations.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+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();
   }
 };
 
+// src/observable/internal/object/ObjectsHelper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/object/ObjectQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/observable/internal/BulkObjectLoader.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function pDefer() {
   const deferred = {};
   deferred.promise = new Promise((resolve, reject) => {
@@ -2211,7 +2857,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkMEL46GIF_cjs.additionalContext].logger;
+    this.#logger = client[chunkRO7XAQOS_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -2246,13 +2892,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 +2925,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[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRO7XAQOS_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -2309,62 +2960,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,37 +2986,94 @@ 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);
   }
 };
 
+// src/observable/internal/objectset/ObjectSetHelper.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/observable/internal/objectset/ObjectSetQuery.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var ObjectSetQuery = class extends BaseListQuery {
   #baseObjectSetWire;
   #operations;
   #composedObjectSet;
   #objectTypes;
   constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRO7XAQOS_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -2453,7 +3116,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkMEL46GIF_cjs.getWireObjectSet(os);
+        const wire = chunkRO7XAQOS_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -2461,7 +3124,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkMEL46GIF_cjs.getWireObjectSet(os);
+        const wire = chunkRO7XAQOS_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -2469,7 +3132,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkMEL46GIF_cjs.getWireObjectSet(os);
+        const wire = chunkRO7XAQOS_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -2509,6 +3172,9 @@ var ObjectSetQuery = class extends BaseListQuery {
       data: []
     }, "error", batch);
   }
+  registerStreamUpdates(sub) {
+    this.createWebsocketSubscription(this.#composedObjectSet, sub, "observeObjectSet");
+  }
   invalidateObjectType = async (objectType, changes) => {
     if (this.#objectTypes.has(objectType)) {
       changes?.modified.add(this.cacheKey);
@@ -2537,13 +3203,17 @@ var ObjectSetHelper = class extends AbstractHelper {
     this.orderByCanonicalizer = orderByCanonicalizer2;
   }
   observe(options, subFn) {
-    return super.observe(options, subFn);
+    const ret = super.observe(options, subFn);
+    if (options.streamUpdates) {
+      ret.query.registerStreamUpdates(ret.subscription);
+    }
+    return ret;
   }
   getQuery(options) {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkRO7XAQOS_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -2559,13 +3229,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(chunkMEL46GIF_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkRO7XAQOS_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkRO7XAQOS_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkMEL46GIF_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkRO7XAQOS_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -2580,7 +3250,27 @@ var ObjectSetHelper = class extends AbstractHelper {
   }
 };
 
+// src/observable/internal/PivotCanonicalizer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+var PivotCanonicalizer = class {
+  #cache = /* @__PURE__ */ new Map();
+  canonicalize(sourceType, linkName) {
+    const key = `${sourceType}::${linkName}`;
+    let canonical = this.#cache.get(key);
+    if (!canonical) {
+      canonical = {
+        sourceType,
+        linkName,
+        targetType: "<targetType>"
+      };
+      this.#cache.set(key, canonical);
+    }
+    return canonical;
+  }
+};
+
 // src/observable/internal/Queries.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var Queries = class {
   // we can use a regular Map here because the refCounting will
   // handle cleanup.
@@ -2605,12 +3295,62 @@ var Queries = class {
   }
 };
 
+// src/observable/internal/RdpCanonicalizer.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+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 = chunkRO7XAQOS_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();
+  intersectCanonicalizer = new IntersectCanonicalizer(this.whereCanonicalizer);
+  pivotCanonicalizer = new PivotCanonicalizer();
   /** @internal */
   queries = new Queries();
+  objectCacheKeyRegistry = new ObjectCacheKeyRegistry();
   layers = new Layers({
     logger: this.logger,
     onRevalidate: this.#maybeRevalidateQueries.bind(this)
@@ -2618,14 +3358,15 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkMEL46GIF_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkRO7XAQOS_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.aggregations = new AggregationsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.rdpCanonicalizer);
+    this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.intersectCanonicalizer, this.pivotCanonicalizer);
     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 +3378,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 +3409,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 +3450,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 +3470,107 @@ 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, null, or undefined
+   */
+  #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_IDX2];
+      } else if (cacheKey.type === "aggregation") {
+        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_IDX3];
+      } else if (cacheKey.type === "list") {
+        return cacheKey.otherKeys[API_NAME_IDX2];
+      } else if (cacheKey.type === "aggregation") {
+        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 +3624,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkSDFKR62Z_cjs.createClientFromContext({
-    ...client[chunkMEL46GIF_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkMEL46GIF_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkSDFKR62Z_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkHJX4D4KL_cjs.createClientFromContext({
+    ...client[chunkRO7XAQOS_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkRO7XAQOS_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkHJX4D4KL_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -2768,6 +3635,7 @@ function createObservableClient(client) {
 }
 
 // src/public-utils/osdkConfig.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function getMetaTagContent(name) {
   const element = document.querySelector(`meta[name="${name}"]`);
   const val = element ? element.getAttribute("content") : null;
@@ -2803,11 +3671,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkSDFKR62Z_cjs.createClientWithTransaction; }
+  get: function () { return chunkHJX4D4KL_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkMEL46GIF_cjs.augment; }
+  get: function () { return chunkRO7XAQOS_cjs.augment; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;