@osdk/client 2.5.0-beta.5 → 2.5.0-beta.7

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

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkKCMGIMVC_cjs = require('../chunk-KCMGIMVC.cjs');
-var chunkELAA4C2C_cjs = require('../chunk-ELAA4C2C.cjs');
+var chunkBY2PQEYA_cjs = require('../chunk-BY2PQEYA.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');
@@ -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
@@ -142,7 +144,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkELAA4C2C_cjs.additionalContext].objectFactory2(store.client[chunkELAA4C2C_cjs.additionalContext], [{
+        const create = store.client[chunk5KDG5ZET_cjs.additionalContext].objectFactory2(store.client[chunk5KDG5ZET_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -173,7 +175,7 @@ function runOptimisticJob(store, optimisticUpdate) {
       // we don't want to leak the result
       () => void 0
     ).finally(() => {
-      store.removeLayer(optimisticId);
+      store.layers.remove(optimisticId);
     });
   };
 }
@@ -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,29 +592,182 @@ 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;
   }
 };
 
 // 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
       }
     });
   }
@@ -545,15 +775,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);
@@ -565,10 +796,13 @@ var AbstractHelper = class {
       });
     }
     const sub = query.subscribe(subFn);
+    const querySub = new QuerySubscription(query, sub);
+    query.registerSubscriptionDedupeInterval(querySub.subscriptionId, options.dedupeInterval);
     sub.add(() => {
-      this.store.release(query.cacheKey);
+      query.unregisterSubscriptionDedupeInterval(querySub.subscriptionId);
+      this.store.cacheKeys.release(query.cacheKey);
     });
-    return new QuerySubscription(query, sub);
+    return querySub;
   }
 };
 
@@ -583,13 +817,15 @@ var Query = class {
   #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[chunkELAA4C2C_cjs.additionalContext].logger : store.client[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
+    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"
     }));
   }
@@ -598,6 +834,29 @@ var Query = class {
     this.#subscription = this.#connectable.connect();
     return this.#connectable.subscribe(observer);
   }
+  /**
+   * Register a subscription's dedupeInterval value
+   */
+  registerSubscriptionDedupeInterval(subscriptionId, dedupeInterval) {
+    if (dedupeInterval != null && dedupeInterval > 0) {
+      this.#subscriptionDedupeIntervals.set(subscriptionId, dedupeInterval);
+    }
+  }
+  /**
+   * Unregister a subscription's dedupeInterval value
+   */
+  unregisterSubscriptionDedupeInterval(subscriptionId) {
+    this.#subscriptionDedupeIntervals.delete(subscriptionId);
+  }
+  /**
+   * 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());
+  }
   /**
    * 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
@@ -620,7 +879,8 @@ var Query = class {
       await this.pendingFetch;
       return;
     }
-    if ((this.options.dedupeInterval ?? 0) > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < (this.options.dedupeInterval ?? 0)) {
+    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");
       }
@@ -749,9 +1009,9 @@ function createOrderBySortFns(orderBy) {
     };
   });
 }
-function createCollectionConnectable(subject, store, createPayload) {
+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) => store.getSubject(cacheKey).pipe(rxjs.map((objectEntry) => objectEntry?.value), rxjs.distinctUntilChanged())));
+    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),
@@ -813,10 +1073,9 @@ 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) {
@@ -884,11 +1143,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) {
@@ -897,12 +1156,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);
         }
       }
     });
@@ -933,7 +1191,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
@@ -1109,9 +1367,6 @@ var BaseListQuery = class extends Query {
   }
 };
 
-// src/observable/internal/tombstone.ts
-var tombstone = void 0;
-
 // src/observable/internal/links/SpecificLinkQuery.ts
 var SpecificLinkQuery = class extends BaseListQuery {
   #sourceApiName;
@@ -1126,7 +1381,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[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
+    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;
@@ -1143,7 +1398,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkELAA4C2C_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunk5KDG5ZET_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     const sourceQuery = client(sourceObjectDef).where({
       [sourceMetadata.primaryKeyApiName]: this.#sourcePk
     });
@@ -1207,7 +1462,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkELAA4C2C_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        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);
@@ -1220,8 +1475,8 @@ var SpecificLinkQuery = class extends BaseListQuery {
 
 // src/observable/internal/links/LinksHelper.ts
 var LinksHelper = class extends AbstractHelper {
-  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
-    super(store);
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
+    super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer;
     this.orderByCanonicalizer = orderByCanonicalizer;
   }
@@ -1231,9 +1486,9 @@ var LinksHelper = class extends AbstractHelper {
     } = 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);
+    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);
     });
   }
 };
@@ -1340,7 +1595,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[chunkELAA4C2C_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;
@@ -1389,7 +1644,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);
@@ -1468,7 +1723,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);
             }
@@ -1476,7 +1731,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;
@@ -1488,7 +1743,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,
@@ -1533,7 +1788,7 @@ var ListQuery = class extends BaseListQuery {
   }
   #extractRelevantObjectsForTypeInterface(changes) {
     const matchesApiName = ([, object]) => {
-      return this.#apiName in object[chunkKCMGIMVC_cjs.ObjectDefRef].interfaceMap;
+      return this.#apiName in object[chunkBY2PQEYA_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));
@@ -1635,7 +1890,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);
@@ -1664,7 +1919,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][chunkKCMGIMVC_cjs.UnderlyingOsdkObject][chunkKCMGIMVC_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkBY2PQEYA_cjs.UnderlyingOsdkObject][chunkBY2PQEYA_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -1682,8 +1937,8 @@ async function reloadDataAsFullObjects(client, data) {
 
 // src/observable/internal/list/ListsHelper.ts
 var ListsHelper = class extends AbstractHelper {
-  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
-    super(store);
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
+    super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer;
     this.orderByCanonicalizer = orderByCanonicalizer;
   }
@@ -1705,9 +1960,9 @@ var ListsHelper = class extends AbstractHelper {
     } = 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);
+    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);
     });
   }
 };
@@ -1738,7 +1993,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkELAA4C2C_cjs.additionalContext].logger;
+    this.#logger = client[chunk5KDG5ZET_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -1801,7 +2056,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[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
+    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;
@@ -1912,8 +2167,8 @@ 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
     }));
   }
@@ -1985,49 +2240,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 {
@@ -2096,69 +2330,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[chunkELAA4C2C_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);
@@ -2170,120 +2375,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;
@@ -2296,34 +2399,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));
       }
     }
   }
@@ -2348,30 +2448,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 = chunkKCMGIMVC_cjs.createClientFromContext({
-    ...client[chunkELAA4C2C_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkELAA4C2C_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkKCMGIMVC_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkBY2PQEYA_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"), chunkBY2PQEYA_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -2414,11 +2508,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkKCMGIMVC_cjs.createClientWithTransaction; }
+  get: function () { return chunkBY2PQEYA_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkELAA4C2C_cjs.augment; }
+  get: function () { return chunk5KDG5ZET_cjs.augment; }
 });
 exports.createObservableClient = createObservableClient;
 exports.getMetaTagContent = getMetaTagContent;