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

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

@@ -1,21 +1,21 @@
 'use strict';
 
-var chunk6CBVXAAV_cjs = require('../chunk-6CBVXAAV.cjs');
-var chunkQR7IBJPZ_cjs = require('../chunk-QR7IBJPZ.cjs');
+var chunk4GWXMQZE_cjs = require('../chunk-4GWXMQZE.cjs');
+var chunk5KDG5ZET_cjs = require('../chunk-5KDG5ZET.cjs');
 require('../chunk-Q7SFCCGT.cjs');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
 var invariant2 = require('tiny-invariant');
 var trie = require('@wry/trie');
 var mnemonist = require('mnemonist');
-var deepEqual2 = require('fast-deep-equal');
+var deepEqual4 = require('fast-deep-equal');
 var groupBy = require('object.groupby');
 var shared_net_errors = require('@osdk/shared.net.errors');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var invariant2__default = /*#__PURE__*/_interopDefault(invariant2);
-var deepEqual2__default = /*#__PURE__*/_interopDefault(deepEqual2);
+var deepEqual4__default = /*#__PURE__*/_interopDefault(deepEqual4);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 
 // src/observable/internal/UnsubscribableWrapper.ts
@@ -35,7 +35,6 @@ var ObservableClientImpl = class {
     this.__experimentalStore = store;
     this.applyAction = store.applyAction.bind(store);
     this.validateAction = store.validateAction.bind(store);
-    this.canonicalizeWhereClause = store.canonicalizeWhereClause.bind(store);
   }
   observeObject = (apiName, pk, options, subFn) => {
     return this.__experimentalStore.objects.observe(
@@ -76,6 +75,9 @@ var ObservableClientImpl = class {
     }
     return new UnsubscribableWrapper(parentSub);
   };
+  canonicalizeWhereClause(where) {
+    return this.__experimentalStore.whereCanonicalizer.canonicalize(where);
+  }
 };
 
 // src/observable/DebugFlags.ts
@@ -95,7 +97,7 @@ function createOptimisticId() {
   return /* @__PURE__ */ Object.create(null);
 }
 
-// src/observable/internal/OptimisticJob.ts
+// src/observable/internal/actions/OptimisticJob.ts
 var OptimisticJob = class {
   #result;
   constructor(store, optimisticId) {
@@ -142,7 +144,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkQR7IBJPZ_cjs.additionalContext].objectFactory2(store.client[chunkQR7IBJPZ_cjs.additionalContext], [{
+        const create = store.client[chunk5KDG5ZET_cjs.additionalContext].objectFactory2(store.client[chunk5KDG5ZET_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -173,12 +175,12 @@ function runOptimisticJob(store, optimisticUpdate) {
       // we don't want to leak the result
       () => void 0
     ).finally(() => {
-      store.removeLayer(optimisticId);
+      store.layers.remove(optimisticId);
     });
   };
 }
 
-// src/observable/internal/ActionApplication.ts
+// src/observable/internal/actions/ActionApplication.ts
 var ACTION_DELAY = process.env.NODE_ENV === "production" ? 0 : 1e3;
 var ActionApplication = class {
   constructor(store) {
@@ -244,8 +246,8 @@ var ActionApplication = class {
           objectType,
           primaryKey
         } of deletedObjects ?? []) {
-          const cacheKey = this.store.getCacheKey("object", objectType, primaryKey);
-          this.store.peekQuery(cacheKey)?.deleteFromStore(
+          const cacheKey = this.store.cacheKeys.get("object", objectType, primaryKey);
+          this.store.queries.peek(cacheKey)?.deleteFromStore(
             "loaded",
             // this is probably not the best value to use
             batch
@@ -260,45 +262,110 @@ 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);
+    }
+  }
+  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);
+    }
+  }
+  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);
+      }
+    }
+  }
+};
+
+// src/observable/internal/CacheKeys.ts
 var CacheKeys = class {
   #cacheKeys = new trie.Trie(false, (keys) => {
-    const ret = {
+    const cacheKey = {
       type: keys[0],
       otherKeys: keys.slice(1)
     };
-    this.#onCreate(ret);
-    return ret;
+    this.#onCreate?.(cacheKey);
+    return cacheKey;
   });
-  #cacheKeyFactories = /* @__PURE__ */ new Map();
+  #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;
-  constructor(whereCanonicalizer, orderByCanonicalizer, onCreate) {
+  #onDestroy;
+  constructor({
+    onCreate,
+    onDestroy
+  }) {
     this.#onCreate = onCreate;
-    this.#registerCacheKeyFactory("object", (apiName, pk) => {
-      if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
-      return this.#cacheKeys.lookupArray(["object", apiName, pk]);
-    });
-    this.#registerCacheKeyFactory("list", (type, apiName, where, orderBy) => {
-      const cacheKeyArgs = ["list", type, apiName, whereCanonicalizer.canonicalize(where), orderByCanonicalizer.canonicalize(orderBy)];
-      if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
-      return this.#cacheKeys.lookupArray(cacheKeyArgs);
-    });
-    this.#registerCacheKeyFactory("specificLink", (sourceObjectType, sourcePk, linkName, where, orderBy) => {
-      const cacheKeyArgs = ["specificLink", sourceObjectType, sourcePk, linkName, whereCanonicalizer.canonicalize(where), orderByCanonicalizer.canonicalize(orderBy)];
-      if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
-      return this.#cacheKeys.lookupArray(cacheKeyArgs);
+    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);
+      }
     });
   }
-  #registerCacheKeyFactory(type, factory) {
-    this.#cacheKeyFactories.set(type, factory);
-  }
   get(type, ...args) {
-    const factory = this.#cacheKeyFactories.get(type);
-    !factory ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `no cache key factory for type "${type}"`) : invariant2__default.default(false) : void 0;
-    return factory(...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) {
+  #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/CacheKey.ts
@@ -368,6 +435,16 @@ function multimapHelper(multimap) {
   }));
 }
 
+// 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();
@@ -515,12 +592,159 @@ var Layer = class _Layer {
     this.#cache.set(cacheKey, value);
   }
 };
-var Entry = class {
-  constructor(cacheKey, value, lastUpdated, status = "init") {
-    this.cacheKey = cacheKey;
-    this.value = value;
-    this.lastUpdated = lastUpdated;
-    this.status = status;
+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);
+    }
+    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/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;
+  }
+  get top() {
+    return this.#topLayer;
+  }
+  get truth() {
+    return this.#truthLayer;
+  }
+  remove(layerId) {
+    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant2__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;
+    }
+    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
+        });
+      }
+    }
+  }
+  batch({
+    optimisticId,
+    changes
+  }, batchFn) {
+    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "optimistic must be undefined or not falsy") : invariant2__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
+    };
+  }
+  #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;
   }
 };
 
@@ -545,15 +769,16 @@ var QuerySubscription = class extends UnsubscribableWrapper {
 
 // src/observable/internal/AbstractHelper.ts
 var AbstractHelper = class {
-  constructor(store) {
+  constructor(store, cacheKeys) {
     this.store = store;
+    this.cacheKeys = cacheKeys;
   }
   observe(options, subFn) {
     const query = this.getQuery(options);
     return this._subscribe(query, options, subFn);
   }
   _subscribe(query, options, subFn) {
-    this.store.retain(query.cacheKey);
+    this.store.cacheKeys.retain(query.cacheKey);
     if (options.mode !== "offline") {
       query.revalidate(options.mode === "force").catch((e) => {
         subFn.error(e);
@@ -566,225 +791,38 @@ var AbstractHelper = class {
     }
     const sub = query.subscribe(subFn);
     sub.add(() => {
-      this.store.release(query.cacheKey);
+      this.store.cacheKeys.release(query.cacheKey);
     });
     return new QuerySubscription(query, sub);
   }
 };
-function createCollectionConnectable(subject, store, 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) => store.getSubject(cacheKey).pipe(rxjs.map((objectEntry) => objectEntry?.value), rxjs.distinctUntilChanged())));
-    return rxjs.scheduled(rxjs.combineLatest({
-      resolvedData,
-      isOptimistic: rxjs.of(listEntry.isOptimistic),
-      status: rxjs.of(listEntry.status),
-      lastUpdated: rxjs.of(listEntry.lastUpdated)
-    }).pipe(rxjs.map((params) => createPayload({
-      resolvedData: Array.isArray(params.resolvedData) ? params.resolvedData : [],
-      isOptimistic: params.isOptimistic,
-      status: params.status,
-      lastUpdated: params.lastUpdated
-    }))), rxjs.asapScheduler);
-  })), {
-    resetOnDisconnect: false,
-    connector: () => new rxjs.ReplaySubject(1)
-  });
-}
 
 // src/observable/internal/isObjectInstance.ts
 function isObjectInstance(item) {
   return item != null && typeof item === "object" && "$primaryKey" in item;
 }
-function is$and(whereClause) {
-  if (process.env.NODE_ENV !== "production") {
-    if ("$and" in whereClause) {
-      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $and to be an array") : invariant2__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $and to be present") : invariant2__default.default(false) : void 0;
-    }
-  }
-  return "$and" in whereClause;
-}
-function is$or(whereClause) {
-  if (process.env.NODE_ENV !== "production") {
-    if ("$or" in whereClause) {
-      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $or to be an array") : invariant2__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $or to be present") : invariant2__default.default(false) : void 0;
-    }
-  }
-  return "$or" in 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" ? invariant2__default.default(false, "expected only $not to be present") : invariant2__default.default(false) : void 0;
-    }
+
+// src/observable/internal/Query.ts
+var Query = class {
+  retainCount = 0;
+  #connectable;
+  #subscription;
+  #subject;
+  /** @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[chunk5KDG5ZET_cjs.additionalContext].logger : store.client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
+    }));
   }
-  return "$not" in whereClause;
-}
-function objectSortaMatchesWhereClause(o, whereClause, strict) {
-  if (deepEqual2__default.default({}, whereClause)) {
-    return true;
-  }
-  if (is$and(whereClause)) {
-    return whereClause.$and.every((w) => objectSortaMatchesWhereClause(o, w, strict));
-  }
-  if (is$or(whereClause)) {
-    return whereClause.$or.some((w) => objectSortaMatchesWhereClause(o, w, strict));
-  }
-  if (is$not(whereClause)) {
-    return !objectSortaMatchesWhereClause(o, whereClause.$not, strict);
-  }
-  return Object.entries(whereClause).every(([key, filter]) => {
-    if (typeof filter === "object") {
-      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" ? invariant2__default.default(false, `Unknown where filter ${f}`) : invariant2__default.default(false) ;
-          }
-          return !strict;
-      }
-    }
-    if (key in o) {
-      if (o[key] === filter) {
-        return true;
-      }
-    }
-    return false;
-  });
-}
-
-// ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
-function pDefer() {
-  const deferred = {};
-  deferred.promise = new Promise((resolve, reject) => {
-    deferred.resolve = resolve;
-    deferred.reject = reject;
-  });
-  return deferred;
-}
-
-// src/observable/internal/BulkObjectLoader.ts
-var weakCache = new mnemonist.DefaultWeakMap((c) => new BulkObjectLoader(c));
-function getBulkObjectLoader(client) {
-  return weakCache.get(client);
-}
-var BulkObjectLoader = class {
-  #client;
-  #m = new mnemonist.DefaultMap(() => ({
-    data: [],
-    timer: void 0
-  }));
-  #logger;
-  #maxWait;
-  #maxEntries;
-  constructor(client, maxWait = 25, maxEntries = 100) {
-    this.#client = client;
-    this.#logger = client[chunkQR7IBJPZ_cjs.additionalContext].logger;
-    this.#maxWait = maxWait;
-    this.#maxEntries = maxEntries;
-  }
-  async fetch(apiName, primaryKey) {
-    const deferred = pDefer();
-    const entry = this.#m.get(apiName);
-    entry.data.push({
-      primaryKey,
-      deferred
-    });
-    if (!entry.timer) {
-      entry.timer = setTimeout(() => {
-        this.#loadObjects(apiName, entry.data);
-      }, this.#maxWait);
-    }
-    if (entry.data.length >= this.#maxEntries) {
-      clearTimeout(entry.timer);
-      this.#loadObjects(apiName, entry.data);
-    }
-    return await deferred.promise;
-  }
-  #loadObjects(apiName, arr) {
-    this.#m.delete(apiName);
-    this.#reallyLoadObjects(apiName, arr).catch((e) => {
-      this.#logger?.error("Unhandled exception", e);
-    });
-  }
-  async #reallyLoadObjects(apiName, arr) {
-    const miniDef = {
-      type: "object",
-      apiName
-    };
-    const objMetadata = await this.#client.fetchMetadata(miniDef);
-    const pks = arr.map((x) => x.primaryKey);
-    const {
-      data
-    } = await this.#client(miniDef).where({
-      [objMetadata.primaryKeyApiName]: {
-        $in: pks
-      }
-    }).fetchPage({
-      $pageSize: pks.length
-    });
-    for (const {
-      primaryKey,
-      deferred
-    } of arr) {
-      const object = data.find((x) => x.$primaryKey === primaryKey);
-      if (object) {
-        deferred.resolve(object);
-      } else {
-        deferred.reject(new shared_net_errors.PalantirApiError(`Object not found: ${primaryKey}`));
-      }
-    }
-  }
-};
-
-// src/observable/internal/Query.ts
-var Query = class {
-  retainCount = 0;
-  #connectable;
-  #subscription;
-  #subject;
-  /** @internal */
-  constructor(store, observable, opts, cacheKey, logger) {
-    this.options = opts;
-    this.cacheKey = cacheKey;
-    this.store = store;
-    this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkQR7IBJPZ_cjs.additionalContext].logger : store.client[chunkQR7IBJPZ_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();
-    return this.#connectable.subscribe(observer);
+  subscribe(observer) {
+    this.#connectable ??= this._createConnectable(this.#subject);
+    this.#subscription = this.#connectable.connect();
+    return this.#connectable.subscribe(observer);
   }
   /**
    * Causes the query to revalidate. This will cause the query to fetch
@@ -891,136 +929,6 @@ var Query = class {
    */
 };
 
-// src/observable/internal/tombstone.ts
-var tombstone = void 0;
-
-// src/observable/internal/ObjectQuery.ts
-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[chunkQR7IBJPZ_cjs.additionalContext].logger?.child({}, {
-      msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
-    }) : void 0);
-    this.#apiName = type;
-    this.#pk = pk;
-  }
-  _createConnectable(subject) {
-    return rxjs.connectable(subject.pipe(rxjs.map((x) => {
-      return {
-        status: x.status,
-        object: x.value,
-        lastUpdated: x.lastUpdated,
-        isOptimistic: x.isOptimistic
-      };
-    })), {
-      connector: () => new rxjs.BehaviorSubject({
-        status: "init",
-        object: void 0,
-        lastUpdated: 0,
-        isOptimistic: false
-      })
-    });
-  }
-  async _fetchAndStore() {
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "_fetchAndStore"
-      }).debug("calling _fetchAndStore");
-    }
-    const obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
-    this.store.batch({}, (batch) => {
-      this.writeToStore(obj, "loaded", batch);
-    });
-  }
-  writeToStore(data, status, batch) {
-    const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__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;
-  }
-  deleteFromStore(status, batch) {
-    const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__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;
-  }
-  invalidateObjectType = (objectType, changes) => {
-    if (this.#apiName === objectType) {
-      changes?.modified.add(this.cacheKey);
-      return this.revalidate(true);
-    }
-    return Promise.resolve();
-  };
-};
-function storeOsdkInstances(store, values, batch) {
-  return values.map((v) => {
-    return store.objects.getQuery({
-      apiName: v.$apiName,
-      pk: v.$primaryKey
-    }).writeToStore(v, "loaded", batch).cacheKey;
-  });
-}
-
-// src/observable/internal/removeDuplicates.ts
-function removeDuplicates(objectCacheKeys, batch) {
-  const visited = /* @__PURE__ */ new Set();
-  return objectCacheKeys.filter((key) => {
-    batch.read(key);
-    if (visited.has(key)) {
-      return false;
-    }
-    visited.add(key);
-    return true;
-  });
-}
-
 // src/observable/internal/sorting/SortingStrategy.ts
 var NoOpSortingStrategy = class {
   sortCacheKeys(objectCacheKeys, _batch) {
@@ -1067,9 +975,40 @@ function createOrderBySortFns(orderBy) {
     };
   });
 }
+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())));
+    return rxjs.scheduled(rxjs.combineLatest({
+      resolvedData,
+      isOptimistic: rxjs.of(listEntry.isOptimistic),
+      status: rxjs.of(listEntry.status),
+      lastUpdated: rxjs.of(listEntry.lastUpdated)
+    }).pipe(rxjs.map((params) => createPayload({
+      resolvedData: Array.isArray(params.resolvedData) ? params.resolvedData : [],
+      isOptimistic: params.isOptimistic,
+      status: params.status,
+      lastUpdated: params.lastUpdated
+    }))), rxjs.asapScheduler);
+  })), {
+    resetOnDisconnect: false,
+    connector: () => new rxjs.ReplaySubject(1)
+  });
+}
 
-// src/observable/internal/ListQuery.ts
-var API_NAME_IDX = 1;
+// src/observable/internal/base-list/removeDuplicates.ts
+function removeDuplicates(objectCacheKeys, batch) {
+  const visited = /* @__PURE__ */ new Set();
+  return objectCacheKeys.filter((key) => {
+    batch.read(key);
+    if (visited.has(key)) {
+      return false;
+    }
+    visited.add(key);
+    return true;
+  });
+}
+
+// src/observable/internal/base-list/BaseListQuery.ts
 var BaseListQuery = class extends Query {
   /**
    * The sorting strategy to use for this collection
@@ -1100,16 +1039,15 @@ var BaseListQuery = class extends Query {
    */
   _updateList(items, status, batch, append = false) {
     if (process.env.NODE_ENV !== "production") {
-      const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      this.logger?.child({
         methodName: "updateList"
-      }) : this.logger;
-      logger?.debug(`{status: ${status}, append: ${append}}`, JSON.stringify(items, null, 2));
+      }).debug(`{status: ${status}, append: ${append}}`, JSON.stringify(items, null, 2));
     }
     let objectCacheKeys;
     if (items.length === 0) {
       objectCacheKeys = [];
     } else if (isObjectInstance(items[0])) {
-      objectCacheKeys = this.storeObjects(items, batch);
+      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch);
     } else {
       objectCacheKeys = items;
     }
@@ -1128,7 +1066,7 @@ var BaseListQuery = class extends Query {
    */
   writeToStore(data, status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__default.default(data, entry.value)) {
+    if (entry && deepEqual4__default.default(data, entry.value)) {
       if (entry.status === status) {
         if (process.env.NODE_ENV !== "production") {
           this.logger?.child({
@@ -1157,17 +1095,6 @@ var BaseListQuery = class extends Query {
    * Register changes to the cache based on the specific collection type
    * Implemented by subclasses to handle specific change registration
    */
-  /**
-   * Common method to store objects in the cache and return their cache keys
-   * Used by collection queries when storing object references
-   *
-   * @param objects Array of objects to store
-   * @param batch The batch context to use
-   * @returns Array of cache keys for the stored objects
-   */
-  storeObjects(objects, batch) {
-    return objects.length > 0 ? storeOsdkInstances(this.store, objects, batch) : [];
-  }
   /**
    * Common method for managing object reference counting and appending results
    * Used by collection queries when updating object references
@@ -1182,11 +1109,11 @@ var BaseListQuery = class extends Query {
     if (!batch.optimisticWrite) {
       if (!append) {
         for (const objectCacheKey of existingList?.value?.data ?? []) {
-          this.store.release(objectCacheKey);
+          this.store.cacheKeys.release(objectCacheKey);
         }
       }
       for (const objectCacheKey of objectCacheKeys) {
-        this.store.retain(objectCacheKey);
+        this.store.cacheKeys.retain(objectCacheKey);
       }
     }
     if (append) {
@@ -1195,12 +1122,11 @@ var BaseListQuery = class extends Query {
     return objectCacheKeys;
   }
   _dispose() {
-    console.log("DISPOSE LIST QUERY");
     this.store.batch({}, (batch) => {
       const entry = batch.read(this.cacheKey);
       if (entry) {
         for (const objectCacheKey of entry.value?.data ?? []) {
-          this.store.release(objectCacheKey);
+          this.store.cacheKeys.release(objectCacheKey);
         }
       }
     });
@@ -1231,7 +1157,7 @@ var BaseListQuery = class extends Query {
    * @returns A connectable observable of the collection's payload type
    */
   _createConnectable(subject) {
-    return createCollectionConnectable(subject, this.store, (params) => this.createPayload(params));
+    return createCollectionConnectable(subject, this.store.subjects, (params) => this.createPayload(params));
   }
   /**
    * @override Reset pagination state before a fetch
@@ -1325,7 +1251,7 @@ var BaseListQuery = class extends Query {
       } = this.store.batch({}, (batch) => {
         const append = this.nextPageToken != null;
         const finalStatus = result.nextPageToken ? status : "loaded";
-        return this._updateList(this.storeObjects(result.data, batch), finalStatus, batch, append);
+        return this._updateList(this.store.objects.storeOsdkInstances(result.data, batch), finalStatus, batch, append);
       });
       return retVal;
     } catch (error) {
@@ -1390,22 +1316,236 @@ var BaseListQuery = class extends Query {
       }) : this.logger;
       logger?.debug(`{status: ${options.status}, append: ${options.append}}`, JSON.stringify(items, null, 2));
     }
-    let objectCacheKeys;
-    if (items.length === 0) {
-      objectCacheKeys = [];
-    } else if (isObjectInstance(items[0])) {
-      objectCacheKeys = this.storeObjects(items, batch);
-    } else {
-      objectCacheKeys = items;
+    let objectCacheKeys;
+    if (items.length === 0) {
+      objectCacheKeys = [];
+    } else if (isObjectInstance(items[0])) {
+      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch);
+    } else {
+      objectCacheKeys = items;
+    }
+    objectCacheKeys = this.#retainReleaseAppend(batch, options.append ?? false, objectCacheKeys);
+    objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);
+    objectCacheKeys = removeDuplicates(objectCacheKeys, batch);
+    return this.writeToStore({
+      data: objectCacheKeys
+    }, options.status, batch);
+  }
+};
+
+// src/observable/internal/links/SpecificLinkQuery.ts
+var SpecificLinkQuery = class extends BaseListQuery {
+  #sourceApiName;
+  #sourcePk;
+  #linkName;
+  #whereClause;
+  #orderBy;
+  /**
+   * Register changes to the cache specific to SpecificLinkQuery
+   */
+  registerCacheChanges(batch) {
+    batch.changes.modified.add(this.cacheKey);
+  }
+  constructor(store, subject, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunk5KDG5ZET_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;
+    this.sortingStrategy = new OrderBySortingStrategy(this.#linkName, this.#orderBy);
+  }
+  // _fetchAndStore is now implemented in BaseCollectionQuery
+  /**
+   * Implements fetchPageData from the BaseCollectionQuery template method pattern
+   * Fetches a page of linked objects
+   */
+  async fetchPageData(signal) {
+    const client = this.store.client;
+    const sourceObjectDef = {
+      type: "object",
+      apiName: this.#sourceApiName
+    };
+    const sourceMetadata = await client[chunk5KDG5ZET_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceQuery = client(sourceObjectDef).where({
+      [sourceMetadata.primaryKeyApiName]: this.#sourcePk
+    });
+    const linkQuery = sourceQuery.pivotTo(this.#linkName);
+    if (signal?.aborted) {
+      throw new Error("Aborted");
+    }
+    const queryParams = {
+      $pageSize: this.options.pageSize || 100,
+      $nextPageToken: this.nextPageToken
+    };
+    if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
+      queryParams.$orderBy = this.#orderBy;
+    }
+    if (this.#whereClause && Object.keys(this.#whereClause).length > 0) {
+      queryParams.$where = this.#whereClause;
+    }
+    const response = await linkQuery.fetchPage(queryParams);
+    this.nextPageToken = response.nextPageToken;
+    return response;
+  }
+  /**
+   * Removes a link query from the store
+   */
+  deleteFromStore(status, batch) {
+    const entry = batch.read(this.cacheKey);
+    if (entry && deepEqual4__default.default(tombstone, entry.value)) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "deleteFromStore"
+        }).debug(`Links were already deleted, 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.deleted.add(this.cacheKey);
+    return ret;
+  }
+  /**
+   * Implements Query.maybeUpdateAndRevalidate to handle cache invalidation
+   */
+  maybeUpdateAndRevalidate = async (changes, _optimisticId) => {
+    if (changes.modified.has(this.cacheKey)) {
+      return this.revalidate(true);
+    }
+    return Promise.resolve();
+  };
+  invalidateObjectType = (objectType, changes) => {
+    if (this.#sourceApiName === objectType) {
+      changes?.modified.add(this.cacheKey);
+      return this.revalidate(true);
+    } else {
+      return (async () => {
+        const sourceMetadata = await this.store.client[chunk5KDG5ZET_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const linkDef = sourceMetadata.links?.[this.#linkName];
+        if (!linkDef || linkDef.targetType !== objectType) return;
+        const promise = this.revalidate(true);
+        changes?.modified.add(this.cacheKey);
+        return promise;
+      })();
+    }
+  };
+};
+
+// src/observable/internal/links/LinksHelper.ts
+var LinksHelper = class extends AbstractHelper {
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
+    super(store, cacheKeys);
+    this.whereCanonicalizer = whereCanonicalizer;
+    this.orderByCanonicalizer = orderByCanonicalizer;
+  }
+  getQuery(options) {
+    const {
+      apiName
+    } = options.srcType;
+    const canonWhere = this.whereCanonicalizer.canonicalize(options.where ?? {});
+    const canonOrderBy = this.orderByCanonicalizer.canonicalize(options.orderBy ?? {});
+    const linkCacheKey = this.cacheKeys.get("specificLink", apiName, options.pk, options.linkName, canonWhere, canonOrderBy);
+    return this.store.queries.get(linkCacheKey, () => {
+      return new SpecificLinkQuery(this.store, this.store.subjects.get(linkCacheKey), linkCacheKey, options);
+    });
+  }
+};
+function is$and(whereClause) {
+  if (process.env.NODE_ENV !== "production") {
+    if ("$and" in whereClause) {
+      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $and to be an array") : invariant2__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $and to be present") : invariant2__default.default(false) : void 0;
+    }
+  }
+  return "$and" in whereClause;
+}
+function is$or(whereClause) {
+  if (process.env.NODE_ENV !== "production") {
+    if ("$or" in whereClause) {
+      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $or to be an array") : invariant2__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $or to be present") : invariant2__default.default(false) : void 0;
+    }
+  }
+  return "$or" in 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" ? invariant2__default.default(false, "expected only $not to be present") : invariant2__default.default(false) : void 0;
+    }
+  }
+  return "$not" in whereClause;
+}
+function objectSortaMatchesWhereClause(o, whereClause, strict) {
+  if (deepEqual4__default.default({}, whereClause)) {
+    return true;
+  }
+  if (is$and(whereClause)) {
+    return whereClause.$and.every((w) => objectSortaMatchesWhereClause(o, w, strict));
+  }
+  if (is$or(whereClause)) {
+    return whereClause.$or.some((w) => objectSortaMatchesWhereClause(o, w, strict));
+  }
+  if (is$not(whereClause)) {
+    return !objectSortaMatchesWhereClause(o, whereClause.$not, strict);
+  }
+  return Object.entries(whereClause).every(([key, filter]) => {
+    if (typeof filter === "object") {
+      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" ? invariant2__default.default(false, `Unknown where filter ${f}`) : invariant2__default.default(false) ;
+          }
+          return !strict;
+      }
+    }
+    if (key in o) {
+      if (o[key] === filter) {
+        return true;
+      }
     }
-    objectCacheKeys = this.#retainReleaseAppend(batch, options.append ?? false, objectCacheKeys);
-    objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);
-    objectCacheKeys = removeDuplicates(objectCacheKeys, batch);
-    return this.writeToStore({
-      data: objectCacheKeys
-    }, options.status, batch);
-  }
-};
+    return false;
+  });
+}
+
+// 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
   #type;
@@ -1421,7 +1561,7 @@ var ListQuery = class extends BaseListQuery {
     batch.changes.registerList(this.cacheKey);
   }
   constructor(store, subject, apiType, apiName, whereClause, orderBy, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkQR7IBJPZ_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#type = apiType;
@@ -1470,7 +1610,7 @@ var ListQuery = class extends BaseListQuery {
    */
   handleFetchError(error, _status, batch) {
     this.logger?.error("error", error);
-    this.store.getSubject(this.cacheKey).error(error);
+    this.store.subjects.get(this.cacheKey).error(error);
     return this.writeToStore({
       data: []
     }, "error", batch);
@@ -1549,7 +1689,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.store.getCacheKey("object", obj.$objectType, obj.$primaryKey);
+            const objectCacheKey = this.cacheKeys.get("object", obj.$objectType, obj.$primaryKey);
             if (!existingList.has(objectCacheKey)) {
               toAdd.add(obj);
             }
@@ -1557,7 +1697,7 @@ var ListQuery = class extends BaseListQuery {
           } else if (batch.optimisticWrite) {
             continue;
           } else {
-            const existingObjectCacheKey = this.store.getCacheKey("object", obj.$objectType, obj.$primaryKey);
+            const existingObjectCacheKey = this.cacheKeys.get("object", obj.$objectType, obj.$primaryKey);
             toRemove.add(existingObjectCacheKey);
             if (relevantObjects.modified.sortaMatches.has(obj)) {
               needsRevalidation = true;
@@ -1569,7 +1709,7 @@ var ListQuery = class extends BaseListQuery {
           newList.push(key);
         }
         for (const obj of toAdd) {
-          newList.push(this.store.getCacheKey("object", obj.$objectType, obj.$primaryKey));
+          newList.push(this.cacheKeys.get("object", obj.$objectType, obj.$primaryKey));
         }
         this._updateList(
           newList,
@@ -1614,7 +1754,7 @@ var ListQuery = class extends BaseListQuery {
   }
   #extractRelevantObjectsForTypeInterface(changes) {
     const matchesApiName = ([, object]) => {
-      return this.#apiName in object[chunk6CBVXAAV_cjs.ObjectDefRef].interfaceMap;
+      return this.#apiName in object[chunk4GWXMQZE_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));
@@ -1705,7 +1845,7 @@ var ListQuery = class extends BaseListQuery {
     if (state === "ADDED_OR_UPDATED") {
       const object = objOrIface.$apiName !== objOrIface.$objectType ? objOrIface.$as(objOrIface.$objectType) : objOrIface;
       this.store.batch({}, (batch) => {
-        this.storeObjects([object], batch);
+        this.store.objects.storeOsdkInstances([object], batch);
       });
     } else if (state === "REMOVED") {
       this.#onOswRemoved(objOrIface, logger);
@@ -1716,7 +1856,7 @@ var ListQuery = class extends BaseListQuery {
       const existing = batch.read(this.cacheKey);
       !existing ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant2__default.default(false) : void 0;
       if (existing.status === "loaded") {
-        const objectCacheKey = this.store.getCacheKey("object", objOrIface.$objectType, objOrIface.$primaryKey);
+        const objectCacheKey = this.cacheKeys.get("object", objOrIface.$objectType, objOrIface.$primaryKey);
         const newObjects = existing.value?.data.filter((o) => o !== objectCacheKey);
         if (newObjects?.length !== existing.value?.data.length) {
           batch.changes.registerList(this.cacheKey);
@@ -1745,7 +1885,7 @@ var ListQuery = class extends BaseListQuery {
 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][chunk6CBVXAAV_cjs.UnderlyingOsdkObject][chunk6CBVXAAV_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunk4GWXMQZE_cjs.UnderlyingOsdkObject][chunk4GWXMQZE_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -1761,69 +1901,202 @@ async function reloadDataAsFullObjects(client, data) {
   return data;
 }
 
-// src/observable/internal/links/SpecificLinkQuery.ts
-var SpecificLinkQuery = class extends BaseListQuery {
-  #sourceApiName;
-  #sourcePk;
-  #linkName;
-  #whereClause;
-  #orderBy;
-  /**
-   * Register changes to the cache specific to SpecificLinkQuery
-   */
-  registerCacheChanges(batch) {
-    batch.changes.modified.add(this.cacheKey);
+// src/observable/internal/list/ListsHelper.ts
+var ListsHelper = class extends AbstractHelper {
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
+    super(store, cacheKeys);
+    this.whereCanonicalizer = whereCanonicalizer;
+    this.orderByCanonicalizer = orderByCanonicalizer;
   }
-  constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkQR7IBJPZ_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;
-    this.sortingStrategy = new OrderBySortingStrategy(this.#linkName, this.#orderBy);
+  observe(options, subFn) {
+    const ret = super.observe(options, subFn);
+    if (options.streamUpdates) {
+      ret.query.registerStreamUpdates(ret.subscription);
+    }
+    return ret;
   }
-  // _fetchAndStore is now implemented in BaseCollectionQuery
-  /**
-   * Implements fetchPageData from the BaseCollectionQuery template method pattern
-   * Fetches a page of linked objects
-   */
-  async fetchPageData(signal) {
-    const client = this.store.client;
-    const sourceObjectDef = {
+  getQuery(options) {
+    const {
+      type: {
+        apiName,
+        type
+      },
+      where,
+      orderBy
+    } = options;
+    const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
+    const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
+    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy);
+    return this.store.queries.get(listCacheKey, () => {
+      return new ListQuery(this.store, this.store.subjects.get(listCacheKey), type, apiName, canonWhere, canonOrderBy, listCacheKey, options);
+    });
+  }
+};
+
+// ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
+function pDefer() {
+  const deferred = {};
+  deferred.promise = new Promise((resolve, reject) => {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
+  });
+  return deferred;
+}
+
+// src/observable/internal/BulkObjectLoader.ts
+var weakCache = new mnemonist.DefaultWeakMap((c) => new BulkObjectLoader(c));
+function getBulkObjectLoader(client) {
+  return weakCache.get(client);
+}
+var BulkObjectLoader = class {
+  #client;
+  #m = new mnemonist.DefaultMap(() => ({
+    data: [],
+    timer: void 0
+  }));
+  #logger;
+  #maxWait;
+  #maxEntries;
+  constructor(client, maxWait = 25, maxEntries = 100) {
+    this.#client = client;
+    this.#logger = client[chunk5KDG5ZET_cjs.additionalContext].logger;
+    this.#maxWait = maxWait;
+    this.#maxEntries = maxEntries;
+  }
+  async fetch(apiName, primaryKey) {
+    const deferred = pDefer();
+    const entry = this.#m.get(apiName);
+    entry.data.push({
+      primaryKey,
+      deferred
+    });
+    if (!entry.timer) {
+      entry.timer = setTimeout(() => {
+        this.#loadObjects(apiName, entry.data);
+      }, this.#maxWait);
+    }
+    if (entry.data.length >= this.#maxEntries) {
+      clearTimeout(entry.timer);
+      this.#loadObjects(apiName, entry.data);
+    }
+    return await deferred.promise;
+  }
+  #loadObjects(apiName, arr) {
+    this.#m.delete(apiName);
+    this.#reallyLoadObjects(apiName, arr).catch((e) => {
+      this.#logger?.error("Unhandled exception", e);
+    });
+  }
+  async #reallyLoadObjects(apiName, arr) {
+    const miniDef = {
       type: "object",
-      apiName: this.#sourceApiName
+      apiName
     };
-    const sourceMetadata = await client[chunkQR7IBJPZ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
-    const sourceQuery = client(sourceObjectDef).where({
-      [sourceMetadata.primaryKeyApiName]: this.#sourcePk
+    const objMetadata = await this.#client.fetchMetadata(miniDef);
+    const pks = arr.map((x) => x.primaryKey);
+    const {
+      data
+    } = await this.#client(miniDef).where({
+      [objMetadata.primaryKeyApiName]: {
+        $in: pks
+      }
+    }).fetchPage({
+      $pageSize: pks.length
     });
-    const linkQuery = sourceQuery.pivotTo(this.#linkName);
-    if (signal?.aborted) {
-      throw new Error("Aborted");
+    for (const {
+      primaryKey,
+      deferred
+    } of arr) {
+      const object = data.find((x) => x.$primaryKey === primaryKey);
+      if (object) {
+        deferred.resolve(object);
+      } else {
+        deferred.reject(new shared_net_errors.PalantirApiError(`Object not found: ${primaryKey}`));
+      }
     }
-    const queryParams = {
-      $pageSize: this.options.pageSize || 100,
-      $nextPageToken: this.nextPageToken
-    };
-    if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
-      queryParams.$orderBy = this.#orderBy;
+  }
+};
+
+// src/observable/internal/object/ObjectQuery.ts
+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[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
+    }) : void 0);
+    this.#apiName = type;
+    this.#pk = pk;
+  }
+  _createConnectable(subject) {
+    return rxjs.connectable(subject.pipe(rxjs.map((x) => {
+      return {
+        status: x.status,
+        object: x.value,
+        lastUpdated: x.lastUpdated,
+        isOptimistic: x.isOptimistic
+      };
+    })), {
+      connector: () => new rxjs.BehaviorSubject({
+        status: "init",
+        object: void 0,
+        lastUpdated: 0,
+        isOptimistic: false
+      })
+    });
+  }
+  async _fetchAndStore() {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "_fetchAndStore"
+      }).debug("calling _fetchAndStore");
     }
-    if (this.#whereClause && Object.keys(this.#whereClause).length > 0) {
-      queryParams.$where = this.#whereClause;
+    const obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
+    this.store.batch({}, (batch) => {
+      this.writeToStore(obj, "loaded", batch);
+    });
+  }
+  writeToStore(data, status, batch) {
+    const entry = batch.read(this.cacheKey);
+    if (entry && deepEqual4__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);
     }
-    const response = await linkQuery.fetchPage(queryParams);
-    this.nextPageToken = response.nextPageToken;
-    return response;
+    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;
   }
-  /**
-   * Removes a link query from the store
-   */
   deleteFromStore(status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__default.default(tombstone, entry.value)) {
+    if (entry && deepEqual4__default.default(tombstone, entry.value)) {
       if (process.env.NODE_ENV !== "production") {
         this.logger?.child({
           methodName: "deleteFromStore"
-        }).debug(`Links were already deleted, just setting status`);
+        }).debug(`Object was deep equal, just setting status`);
       }
       return batch.write(this.cacheKey, entry.value, status);
     }
@@ -1838,87 +2111,18 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return;
     }
     const ret = batch.delete(this.cacheKey, status);
-    batch.changes.deleted.add(this.cacheKey);
+    batch.changes.deleteObject(this.cacheKey);
     return ret;
   }
-  /**
-   * Implements Query.maybeUpdateAndRevalidate to handle cache invalidation
-   */
-  maybeUpdateAndRevalidate = async (changes, _optimisticId) => {
-    if (changes.modified.has(this.cacheKey)) {
-      return this.revalidate(true);
-    }
-    return Promise.resolve();
-  };
   invalidateObjectType = (objectType, changes) => {
-    if (this.#sourceApiName === objectType) {
+    if (this.#apiName === objectType) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
-    } else {
-      return (async () => {
-        const sourceMetadata = await this.store.client[chunkQR7IBJPZ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
-        const linkDef = sourceMetadata.links?.[this.#linkName];
-        if (!linkDef || linkDef.targetType !== objectType) return;
-        const promise = this.revalidate(true);
-        changes?.modified.add(this.cacheKey);
-        return promise;
-      })();
     }
+    return Promise.resolve();
   };
 };
 
-// src/observable/internal/links/LinksHelper.ts
-var LinksHelper = class extends AbstractHelper {
-  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
-    super(store);
-    this.whereCanonicalizer = whereCanonicalizer;
-    this.orderByCanonicalizer = orderByCanonicalizer;
-  }
-  getQuery(options) {
-    const {
-      apiName
-    } = options.srcType;
-    const canonWhere = this.whereCanonicalizer.canonicalize(options.where ?? {});
-    const canonOrderBy = this.orderByCanonicalizer.canonicalize(options.orderBy ?? {});
-    const linkCacheKey = this.store.getCacheKey("specificLink", apiName, options.pk, options.linkName, canonWhere, canonOrderBy);
-    return this.store.getQuery(linkCacheKey, () => {
-      return new SpecificLinkQuery(this.store, this.store.getSubject(linkCacheKey), linkCacheKey, options);
-    });
-  }
-};
-
-// src/observable/internal/list/ListsHelper.ts
-var ListsHelper = class extends AbstractHelper {
-  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
-    super(store);
-    this.whereCanonicalizer = whereCanonicalizer;
-    this.orderByCanonicalizer = orderByCanonicalizer;
-  }
-  observe(options, subFn) {
-    const ret = super.observe(options, subFn);
-    if (options.streamUpdates) {
-      ret.query.registerStreamUpdates(ret.subscription);
-    }
-    return ret;
-  }
-  getQuery(options) {
-    const {
-      type: {
-        apiName,
-        type
-      },
-      where,
-      orderBy
-    } = options;
-    const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
-    const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
-    const listCacheKey = this.store.getCacheKey("list", type, apiName, canonWhere, canonOrderBy);
-    return this.store.getQuery(listCacheKey, () => {
-      return new ListQuery(this.store, this.store.getSubject(listCacheKey), type, apiName, canonWhere, canonOrderBy, listCacheKey, options);
-    });
-  }
-};
-
 // src/observable/internal/object/ObjectsHelper.ts
 var ObjectsHelper = class extends AbstractHelper {
   observe(options, subFn) {
@@ -1929,11 +2133,22 @@ var ObjectsHelper = class extends AbstractHelper {
     const {
       pk
     } = options;
-    const objectCacheKey = this.store.getCacheKey("object", apiName, pk);
-    return this.store.getQuery(objectCacheKey, () => new ObjectQuery(this.store, this.store.getSubject(objectCacheKey), apiName, pk, objectCacheKey, {
+    const objectCacheKey = this.cacheKeys.get("object", apiName, pk);
+    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
+   * @internal
+   */
+  storeOsdkInstances(values, batch) {
+    return values.map((v) => this.getQuery({
+      apiName: v.$apiName,
+      pk: v.$primaryKey
+    }).writeToStore(v, "loaded", batch).cacheKey);
+  }
 };
 var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
 var WeakRefTrie = class {
@@ -1969,6 +2184,8 @@ var WeakRefTrie = class {
     return this.#trie.removeArray(array)?.deref();
   }
 };
+
+// src/observable/internal/OrderByCanonicalizer.ts
 var OrderByCanonicalizer = class {
   #trie = new WeakRefTrie((array) => {
     const pairs = array.reduce(function(result, _, index, array2) {
@@ -1989,49 +2206,28 @@ var OrderByCanonicalizer = 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/Queries.ts
+var Queries = class {
+  // we can use a regular Map here because the refCounting will
+  // handle cleanup.
+  map = /* @__PURE__ */ new Map();
+  peek(cacheKey) {
+    return this.map.get(cacheKey);
   }
-  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);
+  get(cacheKey, createQuery) {
+    let query = this.peek(cacheKey);
+    if (!query) {
+      query = createQuery();
+      this.map.set(cacheKey, query);
     }
+    return query;
   }
-  has(key) {
-    return this.refCounts.has(key);
+  keys() {
+    return this.map.keys();
   }
-  gc() {
-    const now = Date.now();
-    for (const [key, deathTime] of this.gcMap) {
-      if (deathTime < now) {
-        this.gcMap.delete(key);
-        this.cleanup(key);
-      }
-    }
+  delete(cacheKey) {
+    this.map.get(cacheKey)?.dispose();
+    this.map.delete(cacheKey);
   }
 };
 var WhereClauseCanonicalizer = class {
@@ -2066,7 +2262,7 @@ var WhereClauseCanonicalizer = class {
       options: []
     };
     this.#existingOptions.set(cacheKey, lookupEntry);
-    const canon = lookupEntry.options.find((ref) => deepEqual2__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
+    const canon = lookupEntry.options.find((ref) => deepEqual4__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
     if (canon === calculatedCanon) {
       lookupEntry.options.push(new WeakRef(canon));
     }
@@ -2100,69 +2296,40 @@ var WhereClauseCanonicalizer = class {
 };
 
 // src/observable/internal/Store.ts
-function createInitEntry(cacheKey) {
-  return {
-    cacheKey,
-    status: "init",
-    value: void 0,
-    lastUpdated: 0
-  };
-}
 var Store = class {
   whereCanonicalizer = new WhereClauseCanonicalizer();
   orderByCanonicalizer = new OrderByCanonicalizer();
-  #truthLayer = new Layer(void 0, void 0);
-  #topLayer;
   /** @internal */
-  // we can use a regular Map here because the refCounting will
-  // handle cleanup.
-  #queries = /* @__PURE__ */ new Map();
-  #cacheKeyToSubject = /* @__PURE__ */ new WeakMap();
-  #cacheKeys;
-  #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;
+  queries = new Queries();
+  layers = new Layers({
+    logger: this.logger,
+    onRevalidate: this.#maybeRevalidateQueries.bind(this)
+  });
+  subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.client = client;
-    this.logger = client[chunkQR7IBJPZ_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
-    this.lists = new ListsHelper(this, this.whereCanonicalizer, this.orderByCanonicalizer);
-    this.objects = new ObjectsHelper(this);
-    this.links = new LinksHelper(this, this.whereCanonicalizer, this.orderByCanonicalizer);
-    this.#topLayer = this.#truthLayer;
-    this.#cacheKeys = new CacheKeys(this.whereCanonicalizer, this.orderByCanonicalizer, (k) => {
-      this.#refCounts.register(k);
-    });
-    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);
-      }
+    this.client = client;
+    this.cacheKeys = new CacheKeys({
+      onDestroy: this.#cleanupCacheKey
     });
+    this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
+    this.objects = new ObjectsHelper(this, this.cacheKeys);
+    this.links = new LinksHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
   }
   /**
    * Called after a key is no longer retained and the timeout has elapsed
    * @param key
    */
   #cleanupCacheKey = (key) => {
-    const subject = this.peekSubject(key);
-    this.#cacheKeys.remove(key);
+    const subject = this.subjects.peek(key);
     if (process.env.NODE_ENV !== "production") {
       !subject ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false) : invariant2__default.default(false) : void 0;
     }
-    if (subject) {
-      subject.complete();
-      this.#cacheKeyToSubject.delete(key);
-    }
-    this.#queries.get(key)?.dispose();
-    this.#queries.delete(key);
+    this.subjects.delete(key);
+    this.queries.delete(key);
   };
   applyAction = async (action, args, opts) => {
     return await new ActionApplication(this).applyAction(action, args, opts);
@@ -2174,120 +2341,18 @@ var Store = class {
     });
     return result;
   };
-  removeLayer(layerId) {
-    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant2__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;
-    }
-    this.#topLayer = this.#topLayer.removeLayer(layerId);
-    for (const [k, oldEntry] of cacheKeys) {
-      const currentEntry = this.#topLayer.get(k);
-      if (oldEntry !== currentEntry) {
-        this.peekSubject(k)?.next({
-          // eslint-disable-next-line @typescript-eslint/no-misused-spread
-          ...currentEntry ?? createInitEntry(k),
-          isOptimistic: currentEntry?.value !== this.#truthLayer.get(k)?.value
-        });
-      }
-    }
-  }
-  getCacheKey(type, ...args) {
-    return this.#refCounts.register(this.#cacheKeys.get(type, ...args));
-  }
-  peekSubject = (cacheKey) => {
-    return this.#cacheKeyToSubject.get(cacheKey);
-  };
-  getSubject = (cacheKey) => {
-    let subject = this.#cacheKeyToSubject.get(cacheKey);
-    if (!subject) {
-      const initialValue = this.#topLayer.get(cacheKey) ?? createInitEntry(cacheKey);
-      subject = new rxjs.BehaviorSubject({
-        // eslint-disable-next-line @typescript-eslint/no-misused-spread
-        ...initialValue,
-        isOptimistic: initialValue.value !== this.#truthLayer.get(cacheKey)?.value
-      });
-      this.#cacheKeyToSubject.set(cacheKey, subject);
-    }
-    return subject;
-  };
-  canonicalizeWhereClause(where) {
-    return this.whereCanonicalizer.canonicalize(where);
-  }
-  peekQuery(cacheKey) {
-    return this.#queries.get(cacheKey);
-  }
-  getQuery(cacheKey, createQuery) {
-    let query = this.peekQuery(cacheKey);
-    if (!query) {
-      query = createQuery();
-      this.#queries.set(cacheKey, query);
-    }
-    return query;
-  }
   getValue(cacheKey) {
-    return this.#topLayer.get(cacheKey);
+    return this.layers.top.get(cacheKey);
   }
-  batch = ({
+  batch({
     optimisticId,
     changes = createChangedObjects()
-  }, batchFn) => {
-    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "optimistic must be undefined or not falsy") : invariant2__default.default(false) : void 0;
-    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 = new Entry(cacheKey, value, Date.now(), status);
-        writeLayer.set(cacheKey, newValue);
-        const newTopValue = this.#topLayer.get(cacheKey);
-        if (oldTopValue !== newTopValue) {
-          this.getSubject(cacheKey)?.next({
-            // eslint-disable-next-line @typescript-eslint/no-misused-spread
-            ...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);
-      }
-    };
-    const retVal = batchFn(batchContext);
-    this.maybeRevalidateQueries(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
-    };
-  };
+  }, batchFn) {
+    return this.layers.batch({
+      optimisticId,
+      changes
+    }, batchFn);
+  }
   invalidateObject(apiName, pk) {
     if (typeof apiName !== "string") {
       apiName = apiName.apiName;
@@ -2300,34 +2365,31 @@ var Store = class {
       true
     );
   }
-  async maybeRevalidateQueries(changes, optimisticId) {
+  async #maybeRevalidateQueries(changes, optimisticId) {
+    const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      methodName: "maybeRevalidateQueries"
+    }) : void 0;
     if (changes.isEmpty()) {
       if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "maybeRevalidateQueries"
-        }).debug("No changes, aborting");
+        logger?.debug("No changes, aborting");
       }
       return;
     }
     if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "maybeRevalidateQueries"
-      }).debug(DEBUG_ONLY__changesToString(changes), {
+      logger?.debug(DEBUG_ONLY__changesToString(changes), {
         optimisticId
       });
     }
     try {
       const promises = [];
-      for (const cacheKey of this.#queries.keys()) {
-        const promise = this.peekQuery(cacheKey)?.maybeUpdateAndRevalidate?.(changes, optimisticId);
+      for (const cacheKey of this.queries.keys()) {
+        const promise = this.queries.peek(cacheKey)?.maybeUpdateAndRevalidate?.(changes, optimisticId);
         if (promise) promises.push(promise);
       }
       await Promise.all(promises);
     } finally {
       if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "maybeRevalidateQueries"
-        }).debug("in finally", DEBUG_ONLY__changesToString(changes));
+        logger?.debug("in finally", DEBUG_ONLY__changesToString(changes));
       }
     }
   }
@@ -2352,30 +2414,24 @@ var Store = class {
       }).info(changes ? DEBUG_ONLY__changesToString(changes) : void 0);
     }
     const promises = [];
-    for (const cacheKey of this.#truthLayer.keys()) {
+    for (const cacheKey of this.layers.truth.keys()) {
       if (changes && changes.modified.has(cacheKey)) {
         continue;
       }
-      const query = this.peekQuery(cacheKey);
+      const query = this.queries.peek(cacheKey);
       if (!query) continue;
       promises.push(query.invalidateObjectType(apiName, changes));
     }
     return Promise.allSettled(promises).then(() => void 0);
   }
-  retain(cacheKey) {
-    this.#refCounts.retain(cacheKey);
-  }
-  release(cacheKey) {
-    this.#refCounts.release(cacheKey);
-  }
 };
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunk6CBVXAAV_cjs.createClientFromContext({
-    ...client[chunkQR7IBJPZ_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkQR7IBJPZ_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk6CBVXAAV_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunk4GWXMQZE_cjs.createClientFromContext({
+    ...client[chunk5KDG5ZET_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunk5KDG5ZET_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk4GWXMQZE_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -2418,11 +2474,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunk6CBVXAAV_cjs.createClientWithTransaction; }
+  get: function () { return chunk4GWXMQZE_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkQR7IBJPZ_cjs.augment; }
+  get: function () { return chunk5KDG5ZET_cjs.augment; }
 });
 exports.createObservableClient = createObservableClient;
 exports.getMetaTagContent = getMetaTagContent;