@osdk/client 2.5.0-beta.1 → 2.5.0-beta.3

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

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkURDXPIRU_cjs = require('../chunk-URDXPIRU.cjs');
-var chunkBJYCRD5Y_cjs = require('../chunk-BJYCRD5Y.cjs');
+var chunkAOGMSVFN_cjs = require('../chunk-AOGMSVFN.cjs');
+var chunkBL56QBYG_cjs = require('../chunk-BL56QBYG.cjs');
 require('../chunk-Q7SFCCGT.cjs');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
@@ -18,16 +18,64 @@ var invariant2__default = /*#__PURE__*/_interopDefault(invariant2);
 var deepEqual2__default = /*#__PURE__*/_interopDefault(deepEqual2);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 
+// src/observable/internal/UnsubscribableWrapper.ts
+var UnsubscribableWrapper = class {
+  #subscription;
+  constructor(subscription) {
+    this.#subscription = subscription;
+  }
+  unsubscribe() {
+    this.#subscription?.unsubscribe();
+  }
+};
+
 // src/observable/internal/ObservableClientImpl.ts
 var ObservableClientImpl = class {
   constructor(store) {
     this.__experimentalStore = store;
-    this.observeObject = store.observeObject.bind(store);
-    this.observeList = store.observeList.bind(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(
+      {
+        ...options,
+        apiName,
+        pk
+      },
+      // cast to cross typed to untyped barrier
+      subFn
+    );
+  };
+  observeList = (options, subFn) => {
+    return this.__experimentalStore.lists.observe(
+      options,
+      // cast to cross typed to untyped barrier
+      subFn
+    );
+  };
+  observeLinks = (objects, linkName, options, subFn) => {
+    const objectsArray = Array.isArray(objects) ? objects : [objects];
+    const parentSub = new rxjs.Subscription();
+    for (const obj of objectsArray) {
+      const querySubscription = this.__experimentalStore.links.observe(
+        {
+          ...options,
+          srcType: {
+            type: "object",
+            apiName: obj.$apiName
+          },
+          linkName,
+          pk: obj.$primaryKey
+        },
+        // cast to cross typed to untyped barrier
+        subFn
+      );
+      parentSub.add(querySubscription);
+    }
+    return new UnsubscribableWrapper(parentSub);
+  };
 };
 
 // src/observable/DebugFlags.ts
@@ -64,16 +112,25 @@ var OptimisticJob = class {
         }, (batch) => {
           for (const obj of addedObjects) {
             if (obj.status === "fulfilled") {
-              store.getObjectQuery(obj.value.$objectType, obj.value.$primaryKey).writeToStore(obj.value, "loading", batch);
+              store.objects.getQuery({
+                apiName: obj.value.$objectType,
+                pk: obj.value.$primaryKey
+              }).writeToStore(obj.value, "loading", batch);
             } else {
               throw obj;
             }
           }
           for (const obj of updatedObjects) {
-            store.getObjectQuery(obj.$objectType, obj.$primaryKey).writeToStore(obj, "loading", batch);
+            store.objects.getQuery({
+              apiName: obj.$objectType,
+              pk: obj.$primaryKey
+            }).writeToStore(obj, "loading", batch);
           }
           for (const obj of deletedObjects) {
-            store.getObjectQuery(obj.$objectType, obj.$primaryKey).deleteFromStore("loading", batch);
+            store.objects.getQuery({
+              apiName: obj.$objectType,
+              pk: obj.$primaryKey
+            }).deleteFromStore("loading", batch);
           }
         });
         return batchResult.changes;
@@ -85,7 +142,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkBJYCRD5Y_cjs.additionalContext].objectFactory2(store.client[chunkBJYCRD5Y_cjs.additionalContext], [{
+        const create = store.client[chunkBL56QBYG_cjs.additionalContext].objectFactory2(store.client[chunkBL56QBYG_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -221,8 +278,14 @@ var CacheKeys = class {
       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(["list", type, apiName, whereCanonicalizer.canonicalize(where), orderByCanonicalizer.canonicalize(orderBy)]);
+      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);
     });
   }
   #registerCacheKeyFactory(type, factory) {
@@ -271,6 +334,12 @@ var Changes = class {
   registerList = (key) => {
     this.modified.add(key);
   };
+  registerLink = (cacheKey) => {
+    this.modified.add(cacheKey);
+  };
+  deleteLink = (cacheKey) => {
+    this.deleted.add(cacheKey);
+  };
   isEmpty() {
     return this.modifiedObjects.size === 0 && this.addedObjects.size === 0 && this.added.size === 0 && this.modified.size === 0 && this.deleted.size === 0;
   }
@@ -454,6 +523,78 @@ var Entry = class {
     this.status = status;
   }
 };
+
+// src/observable/internal/QuerySubscription.ts
+var QuerySubscription = class extends UnsubscribableWrapper {
+  /** @internal */
+  /** @internal */
+  constructor(query, subscription) {
+    super(subscription);
+    this.query = query;
+    this.subscription = subscription;
+    Object.defineProperties(this, {
+      query: {
+        enumerable: false
+      },
+      subscription: {
+        enumerable: false
+      }
+    });
+  }
+};
+
+// src/observable/internal/AbstractHelper.ts
+var AbstractHelper = class {
+  constructor(store) {
+    this.store = store;
+  }
+  observe(options, subFn) {
+    const query = this.getQuery(options);
+    return this._subscribe(query, options, subFn);
+  }
+  _subscribe(query, options, subFn) {
+    this.store.retain(query.cacheKey);
+    if (options.mode !== "offline") {
+      query.revalidate(options.mode === "force").catch((e) => {
+        subFn.error(e);
+        if (this.store.logger) {
+          this.store.logger.error("Unhandled error in observeObject", e);
+        } else {
+          throw e;
+        }
+      });
+    }
+    const sub = query.subscribe(subFn);
+    sub.add(() => {
+      this.store.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) {
@@ -566,11 +707,11 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkBJYCRD5Y_cjs.additionalContext].logger;
+    this.#logger = client[chunkBL56QBYG_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
-  fetch(apiName, primaryKey) {
+  async fetch(apiName, primaryKey) {
     const deferred = pDefer();
     const entry = this.#m.get(apiName);
     entry.data.push({
@@ -586,7 +727,7 @@ var BulkObjectLoader = class {
       clearTimeout(entry.timer);
       this.#loadObjects(apiName, entry.data);
     }
-    return deferred.promise;
+    return await deferred.promise;
   }
   #loadObjects(apiName, arr) {
     this.#m.delete(apiName);
@@ -618,7 +759,7 @@ var BulkObjectLoader = class {
       if (object) {
         deferred.resolve(object);
       } else {
-        deferred.reject(new shared_net_errors.PalantirApiError("Object not found"));
+        deferred.reject(new shared_net_errors.PalantirApiError(`Object not found: ${primaryKey}`));
       }
     }
   }
@@ -636,7 +777,7 @@ var Query = class {
     this.cacheKey = cacheKey;
     this.store = store;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkBJYCRD5Y_cjs.additionalContext].logger : store.client[chunkBJYCRD5Y_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkBL56QBYG_cjs.additionalContext].logger : store.client[chunkBL56QBYG_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -685,7 +826,7 @@ var Query = class {
       logger?.debug("calling _fetchAndStore()");
     }
     this.pendingFetch = this._fetchAndStore().finally(() => {
-      logger?.debug("finally _fetchAndStore()");
+      logger?.debug("promise's finally for _fetchAndStore()");
       this.pendingFetch = void 0;
     });
     await this.pendingFetch;
@@ -704,10 +845,22 @@ var Query = class {
     if (process.env.NODE_ENV !== "production") {
       this.logger?.child({
         methodName: "setStatus"
-      }).debug(status);
+      }).debug(`Attempting to set status to '${status}'`);
     }
     const existing = batch.read(this.cacheKey);
-    if (existing?.status === status) return;
+    if (existing?.status === status) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "setStatus"
+        }).debug(`Status is already set to '${status}'; aborting`);
+      }
+      return;
+    }
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "setStatus"
+      }).debug(`Writing status '${status}' to cache`);
+    }
     batch.write(this.cacheKey, existing?.value, status);
   }
   dispose() {
@@ -746,7 +899,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[chunkBJYCRD5Y_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBL56QBYG_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -783,10 +936,18 @@ var ObjectQuery = class extends Query {
   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`);
+        }).debug(`Object was deep equal, just setting status (old status: ${entry.status}, new status: ${status})`);
       }
       return batch.write(this.cacheKey, entry.value, status);
     }
@@ -830,38 +991,127 @@ var ObjectQuery = class extends Query {
     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.getObjectQuery(v.$apiName, v.$primaryKey).writeToStore(v, "loaded", batch).cacheKey;
+    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) {
+    return objectCacheKeys;
+  }
+};
+var OrderBySortingStrategy = class {
+  constructor(apiName, orderBy) {
+    this.apiName = apiName;
+    this.orderBy = orderBy;
+    this.sortFns = createOrderBySortFns(orderBy);
+  }
+  sortCacheKeys(objectCacheKeys, batch) {
+    if (Object.keys(this.orderBy).length === 0) {
+      return objectCacheKeys;
+    }
+    return objectCacheKeys.sort((a, b) => {
+      for (const sortFn of this.sortFns) {
+        const ret = sortFn(batch.read(a)?.value?.$as(this.apiName), batch.read(b)?.value?.$as(this.apiName));
+        if (ret !== 0) {
+          return ret;
+        }
+      }
+      return 0;
+    });
+  }
+};
+function createOrderBySortFns(orderBy) {
+  return Object.entries(orderBy).map(([key, order]) => {
+    return (a, b) => {
+      const aValue = a?.[key];
+      const bValue = b?.[key];
+      if (aValue == null && bValue == null) {
+        return 0;
+      }
+      if (aValue == null) {
+        return 1;
+      }
+      if (bValue == null) {
+        return -1;
+      }
+      const m = order === "asc" ? -1 : 1;
+      return aValue < bValue ? m : aValue > bValue ? -m : 0;
+    };
   });
 }
 
 // src/observable/internal/ListQuery.ts
 var API_NAME_IDX = 1;
 var BaseListQuery = class extends Query {
-  //
-  // Per list type implementations
-  //
+  /**
+   * The sorting strategy to use for this collection
+   * @protected
+   */
+  sortingStrategy = new NoOpSortingStrategy();
+  // Collection-specific behavior is implemented by subclasses
+  /**
+   * Token for the next page of results
+   * @protected
+   */
+  /**
+   * Promise tracking an in-progress page fetch
+   * @protected
+   */
   //
   // Shared Implementations
   //
   /**
-   * Only intended to be "protected" and used by subclasses but exposed for
-   * testing.
+   * Standard method to update a list of objects
+   * Handles common list update patterns for both ListQuery and SpecificLinkQuery
    *
-   * @param objectCacheKeys
-   * @param append
-   * @param status
-   * @param batch
-   * @returns
+   * @param items Objects or cache keys to add to the list
+   * @param status Status to set for the list
+   * @param batch Batch context to use
+   * @param append Whether to append to the existing list or replace it
+   * @returns The updated entry
    */
-  _updateList(objectCacheKeys, append, status, batch) {
+  _updateList(items, status, batch, append = false) {
     if (process.env.NODE_ENV !== "production") {
       const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
         methodName: "updateList"
       }) : this.logger;
-      logger?.debug(`{status: ${status}}`, JSON.stringify(objectCacheKeys, null, 2));
+      logger?.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);
+    } else {
+      objectCacheKeys = items;
     }
     objectCacheKeys = this.#retainReleaseAppend(batch, append, objectCacheKeys);
     objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);
@@ -870,13 +1120,27 @@ var BaseListQuery = class extends Query {
       data: objectCacheKeys
     }, status, batch);
   }
+  /**
+   * Common implementation for writing to store for collection-based queries
+   * @param data The collection data to write to the store
+   * @param status The status to set
+   * @param batch The batch context
+   */
   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(`Collection data 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`);
+        }).debug(`Collection data was deep equal, just updating status from ${entry.status} to ${status}`);
       }
       return batch.write(this.cacheKey, entry.value, status);
     }
@@ -886,9 +1150,33 @@ var BaseListQuery = class extends Query {
       }).debug(`{status: ${status}},`, DEBUG_ONLY__cacheKeysToString(data.data));
     }
     const ret = batch.write(this.cacheKey, data, status);
-    batch.changes.registerList(this.cacheKey);
+    this.registerCacheChanges(batch);
     return ret;
   }
+  /**
+   * 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
+   *
+   * @param batch The batch context to use
+   * @param append Whether to append to existing objects or replace them
+   * @param objectCacheKeys Array of object cache keys to process
+   * @returns The final array of object cache keys after retain/release/append
+   */
   #retainReleaseAppend(batch, append, objectCacheKeys) {
     const existingList = batch.read(this.cacheKey);
     if (!batch.optimisticWrite) {
@@ -917,58 +1205,78 @@ var BaseListQuery = class extends Query {
       }
     });
   }
-};
-var ListQuery = class extends BaseListQuery {
-  // pageSize?: number; // this is the internal page size. we need to track this properly
-  #type;
-  #apiName;
-  #whereClause;
-  // this represents the minimum number of results we need to load if we revalidate
-  #minNumResults = 0;
-  #nextPageToken;
-  #pendingPageFetch;
-  #orderBy;
-  #objectSet;
-  #sortFns;
-  constructor(store, subject, apiType, apiName, whereClause, orderBy, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBJYCRD5Y_cjs.additionalContext].logger?.child({}, {
-      msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
-    }) : void 0);
-    this.#type = apiType;
-    this.#apiName = apiName;
-    this.#whereClause = whereClause;
-    this.#orderBy = orderBy;
-    this.#objectSet = store.client({
-      type: this.#type,
-      apiName: this.#apiName
-    }).where(this.#whereClause);
-    this.#sortFns = createOrderBySortFns(this.#orderBy);
-  }
-  get canonicalWhere() {
-    return this.#whereClause;
+  /**
+   * Creates a payload from collection parameters
+   * Default implementation that covers common fields for all collection types
+   * Subclasses may override to add type-specific fields if needed
+   *
+   * @param params Common collection parameters
+   * @returns A typed payload for the specific collection type
+   */
+  createPayload(params) {
+    return {
+      resolvedList: params.resolvedData,
+      isOptimistic: params.isOptimistic,
+      fetchMore: this.fetchMore,
+      hasMore: this.nextPageToken != null,
+      status: params.status,
+      lastUpdated: params.lastUpdated
+    };
   }
+  /**
+   * Creates a connectable observable for this collection
+   * Common implementation shared by all collection types
+   *
+   * @param subject The subject to connect to
+   * @returns A connectable observable of the collection's payload type
+   */
   _createConnectable(subject) {
-    return rxjs.connectable(subject.pipe(
-      rxjs.switchMap((listEntry) => {
-        return rxjs.combineLatest({
-          resolvedList: listEntry?.value?.data == null || listEntry.value.data.length === 0 ? rxjs.of([]) : rxjs.combineLatest(listEntry.value.data.map((cacheKey) => this.store.getSubject(cacheKey).pipe(rxjs.map((objectEntry) => objectEntry?.value)))),
-          isOptimistic: rxjs.of(listEntry.isOptimistic),
-          fetchMore: rxjs.of(this.fetchMore),
-          hasMore: rxjs.of(this.#nextPageToken != null),
-          status: rxjs.of(listEntry.status),
-          lastUpdated: rxjs.of(listEntry.lastUpdated)
-        });
-      }),
-      // like throttle but returns the tail
-      rxjs.auditTime(0)
-    ), {
-      resetOnDisconnect: false,
-      connector: () => new rxjs.ReplaySubject(1)
-    });
+    return createCollectionConnectable(subject, this.store, (params) => this.createPayload(params));
   }
+  /**
+   * @override Reset pagination state before a fetch
+   */
   _preFetch() {
-    this.#nextPageToken = void 0;
+    this.nextPageToken = void 0;
+    super._preFetch();
   }
+  /**
+   * Common fetchMore implementation for pagination
+   * Handles pending request management and loading states
+   */
+  fetchMore = () => {
+    if (this.pendingPageFetch) {
+      return this.pendingPageFetch;
+    }
+    if (this.pendingFetch) {
+      this.pendingPageFetch = new Promise(async (res) => {
+        await this.pendingFetch;
+        res(this.fetchMore());
+      });
+      return this.pendingPageFetch;
+    }
+    if (this.nextPageToken == null) {
+      return Promise.resolve(void 0);
+    }
+    this.store.batch({}, (batch) => {
+      this.setStatus("loading", batch);
+    });
+    this.pendingFetch = this.fetchPageAndUpdate("loaded", this.abortController?.signal).then(() => void 0).finally(() => {
+      this.pendingPageFetch = void 0;
+    });
+    return this.pendingFetch;
+  };
+  /**
+   * Minimum number of results to load initially
+   * May be overridden by subclasses for specific collection types
+   * @protected
+   */
+  minResultsToLoad = 0;
+  /**
+   * Common _fetchAndStore implementation for pagination
+   * Uses fetchPageAndUpdate to load the initial set of data
+   * Will load multiple pages if necessary to reach minResultsToLoad
+   */
   async _fetchAndStore() {
     if (process.env.NODE_ENV !== "production") {
       this.logger?.child({
@@ -976,13 +1284,12 @@ var ListQuery = class extends BaseListQuery {
       }).debug("fetching pages");
     }
     while (true) {
-      const entry = await this.#fetchPageAndUpdate(this.#objectSet, "loading", this.abortController?.signal);
+      const entry = await this.fetchPageAndUpdate("loading", this.abortController?.signal);
       if (!entry) {
         return;
       }
-      !entry.value?.data ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false) : invariant2__default.default(false) : void 0;
-      const count = entry.value.data.length;
-      if (count > this.#minNumResults || this.#nextPageToken == null) {
+      const count = entry.value?.data.length || 0;
+      if (count >= this.minResultsToLoad || this.nextPageToken == null) {
         break;
       }
     }
@@ -991,61 +1298,183 @@ var ListQuery = class extends BaseListQuery {
     });
     return Promise.resolve();
   }
-  fetchMore = () => {
-    if (this.#pendingPageFetch) {
-      return this.#pendingPageFetch;
-    }
-    if (this.pendingFetch) {
-      this.#pendingPageFetch = new Promise(async (res) => {
-        await this.pendingFetch;
-        res(this.fetchMore());
-      });
-      return this.#pendingPageFetch;
+  /**
+   * Template method for fetching a page of data and updating the store
+   * Provides common error handling and abort signal checking
+   *
+   * @param status The status to set for the entry
+   * @param signal Optional AbortSignal for cancellation
+   * @returns A promise that resolves to the updated entry or undefined if aborted
+   */
+  async fetchPageAndUpdate(status, signal) {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "fetchPageAndUpdate"
+      }).debug(`Fetching data with status: ${status}`);
     }
-    if (this.#nextPageToken == null) {
-      return Promise.resolve();
+    if (signal?.aborted) {
+      return void 0;
     }
-    this.store.batch({}, (batch) => {
-      this.setStatus("loading", batch);
-    });
-    this.pendingFetch = this.#fetchPageAndUpdate(this.#objectSet, "loaded", this.abortController?.signal).finally(() => {
-      this.#pendingPageFetch = void 0;
-    });
-    return this.pendingFetch;
-  };
-  async #fetchPageAndUpdate(objectSet, status, signal) {
-    const append = this.#nextPageToken != null;
     try {
-      let {
-        data,
-        nextPageToken
-      } = await objectSet.fetchPage({
-        $nextPageToken: this.#nextPageToken,
-        $pageSize: this.options.pageSize,
-        // For now this keeps the shared test code from falling apart
-        // but shouldn't be needed ideally
-        ...Object.keys(this.#orderBy).length > 0 ? {
-          $orderBy: this.#orderBy
-        } : {}
-      });
+      const result = await this.fetchPageData(signal);
       if (signal?.aborted) {
-        return;
-      }
-      this.#nextPageToken = nextPageToken;
-      if (this.#type === "interface") {
-        data = await reloadDataAsFullObjects(this.store.client, data);
+        return void 0;
       }
       const {
         retVal
       } = this.store.batch({}, (batch) => {
-        return this._updateList(storeOsdkInstances(this.store, data, batch), append, nextPageToken ? status : "loaded", batch);
+        const append = this.nextPageToken != null;
+        const finalStatus = result.nextPageToken ? status : "loaded";
+        return this._updateList(this.storeObjects(result.data, batch), finalStatus, batch, append);
       });
       return retVal;
-    } catch (e) {
-      this.logger?.error("error", e);
-      this.store.getSubject(this.cacheKey).error(e);
+    } catch (error) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "fetchPageAndUpdate"
+        }).error("Error fetching data", error);
+      }
+      if (!signal?.aborted) {
+        const {
+          retVal
+        } = this.store.batch({}, (batch) => {
+          return this.handleFetchError(error, status, batch);
+        });
+        return retVal;
+      }
+      return void 0;
     }
   }
+  /**
+   * Abstract method that subclasses implement for their specific data fetching logic
+   *
+   * @param signal Optional AbortSignal for cancellation
+   * @returns A promise that resolves to the fetched data
+   */
+  /**
+   * Handle fetch errors by setting appropriate error state
+   * Default implementation that subclasses can override
+   *
+   * @param error The error that occurred
+   * @param status The intended status if successful
+   * @param batch The batch context to use
+   * @returns The updated entry with error status
+   */
+  handleFetchError(_error, _status, batch) {
+    return this.writeToStore({
+      data: []
+    }, "error", batch);
+  }
+  /**
+   * Sort the collection items using the configured sorting strategy
+   * @param objectCacheKeys - The cache keys to sort
+   * @param batch - The batch context
+   * @returns Sorted array of cache keys
+   */
+  _sortCacheKeys(objectCacheKeys, batch) {
+    return this.sortingStrategy.sortCacheKeys(objectCacheKeys, batch);
+  }
+  /**
+   * Unified method for updating collection data in the store
+   * Handles storing, sorting, deduplication, and reference counting
+   *
+   * @param items - Either object cache keys or object instances to update
+   * @param options - Configuration options for the update
+   * @param batch - The batch context to use
+   * @returns The updated entry
+   */
+  updateCollection(items, options, batch) {
+    if (process.env.NODE_ENV !== "production") {
+      const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+        methodName: "updateCollection"
+      }) : 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;
+    }
+    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);
+  }
+};
+var ListQuery = class extends BaseListQuery {
+  // pageSize?: number; // this is the internal page size. we need to track this properly
+  #type;
+  #apiName;
+  #whereClause;
+  // Using base class minResultsToLoad instead of a private property
+  #orderBy;
+  #objectSet;
+  /**
+   * Register changes to the cache specific to ListQuery
+   */
+  registerCacheChanges(batch) {
+    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[chunkBL56QBYG_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
+    }) : void 0);
+    this.#type = apiType;
+    this.#apiName = apiName;
+    this.#whereClause = whereClause;
+    this.#orderBy = orderBy;
+    this.#objectSet = store.client({
+      type: this.#type,
+      apiName: this.#apiName
+    }).where(this.#whereClause);
+    this.sortingStrategy = new OrderBySortingStrategy(this.#apiName, this.#orderBy);
+    this.minResultsToLoad = 0;
+  }
+  get canonicalWhere() {
+    return this.#whereClause;
+  }
+  /**
+   * Implements fetchPageData from BaseCollectionQuery template method
+   * Fetches a page of data
+   */
+  async fetchPageData(signal) {
+    const resp = await this.#objectSet.fetchPage({
+      $nextPageToken: this.nextPageToken,
+      $pageSize: this.options.pageSize,
+      // For now this keeps the shared test code from falling apart
+      // but shouldn't be needed ideally
+      ...Object.keys(this.#orderBy).length > 0 ? {
+        $orderBy: this.#orderBy
+      } : {}
+    });
+    if (signal?.aborted) {
+      throw new Error("Aborted");
+    }
+    this.nextPageToken = resp.nextPageToken;
+    let fetchedData = resp.data;
+    if (this.#type === "interface") {
+      fetchedData = await reloadDataAsFullObjects(this.store.client, fetchedData);
+    }
+    return {
+      ...resp,
+      data: fetchedData
+    };
+  }
+  /**
+   * Handle fetch errors by setting appropriate error state and notifying subscribers
+   */
+  handleFetchError(error, _status, batch) {
+    this.logger?.error("error", error);
+    this.store.getSubject(this.cacheKey).error(error);
+    return this.writeToStore({
+      data: []
+    }, "error", batch);
+  }
   /**
    * Will revalidate the list if its query is affected by invalidating the
    * apiName of the object type passed in.
@@ -1077,6 +1506,12 @@ var ListQuery = class extends BaseListQuery {
       return;
     }
   };
+  invalidateObjectType = async (objectType, changes) => {
+    if (this.cacheKey.otherKeys[1] === objectType) {
+      changes?.modified.add(this.cacheKey);
+      return this.revalidate(true);
+    }
+  };
   /**
    * Note: This method is not async because I want it to return right after it
    *       finishes the synchronous updates. The promise that is returned
@@ -1091,6 +1526,9 @@ var ListQuery = class extends BaseListQuery {
       this.logger?.child({
         methodName: "maybeUpdateAndRevalidate"
       }).debug(DEBUG_ONLY__changesToString(changes));
+      this.logger?.child({
+        methodName: "maybeUpdateAndRevalidate"
+      }).debug(`Already in changes? ${changes.modified.has(this.cacheKey)}`);
     }
     if (changes.modified.has(this.cacheKey)) return;
     changes.modified.add(this.cacheKey);
@@ -1135,10 +1573,10 @@ var ListQuery = class extends BaseListQuery {
         }
         this._updateList(
           newList,
-          /* append */
-          false,
           status,
-          batch
+          batch,
+          /* append */
+          false
         );
       });
       if (needsRevalidation) {
@@ -1176,7 +1614,7 @@ var ListQuery = class extends BaseListQuery {
   }
   #extractRelevantObjectsForTypeInterface(changes) {
     const matchesApiName = ([, object]) => {
-      return this.#apiName in object[chunkURDXPIRU_cjs.ObjectDefRef].interfaceMap;
+      return this.#apiName in object[chunkAOGMSVFN_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));
@@ -1207,20 +1645,6 @@ var ListQuery = class extends BaseListQuery {
       }
     };
   }
-  _sortCacheKeys(objectCacheKeys, batch) {
-    if (Object.keys(this.#orderBy).length > 0) {
-      objectCacheKeys = objectCacheKeys.sort((a, b) => {
-        for (const sortFn of this.#sortFns) {
-          const ret = sortFn(batch.read(a)?.value?.$as(this.#apiName), batch.read(b)?.value?.$as(this.#apiName));
-          if (ret !== 0) {
-            return ret;
-          }
-        }
-        return 0;
-      });
-    }
-    return objectCacheKeys;
-  }
   registerStreamUpdates(sub) {
     const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
       methodName: "registerStreamUpdates"
@@ -1281,7 +1705,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) => {
-        storeOsdkInstances(this.store, [object], batch);
+        this.storeObjects([object], batch);
       });
     } else if (state === "REMOVED") {
       this.#onOswRemoved(objOrIface, logger);
@@ -1318,41 +1742,10 @@ var ListQuery = class extends BaseListQuery {
     });
   }
 };
-function removeDuplicates(objectCacheKeys, batch) {
-  const visited = /* @__PURE__ */ new Set();
-  objectCacheKeys = objectCacheKeys.filter((key) => {
-    batch.read(key);
-    if (visited.has(key)) {
-      return false;
-    }
-    visited.add(key);
-    return true;
-  });
-  return objectCacheKeys;
-}
-function createOrderBySortFns(orderBy) {
-  return Object.entries(orderBy).map(([key, order]) => {
-    return (a, b) => {
-      const aValue = a?.[key];
-      const bValue = b?.[key];
-      if (aValue == null && bValue == null) {
-        return 0;
-      }
-      if (aValue == null) {
-        return 1;
-      }
-      if (bValue == null) {
-        return -1;
-      }
-      const m = order === "asc" ? -1 : 1;
-      return aValue < bValue ? m : aValue > bValue ? -m : 0;
-    };
-  });
-}
 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][chunkURDXPIRU_cjs.UnderlyingOsdkObject][chunkURDXPIRU_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkAOGMSVFN_cjs.UnderlyingOsdkObject][chunkAOGMSVFN_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -1367,9 +1760,181 @@ async function reloadDataAsFullObjects(client, data) {
   });
   return data;
 }
-function isListCacheKey(cacheKey) {
-  return cacheKey.type === "list";
-}
+
+// 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[chunkBL56QBYG_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[chunkBL56QBYG_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 && deepEqual2__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[chunkBL56QBYG_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, 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) {
+    return super.observe(options, subFn);
+  }
+  getQuery(options) {
+    const apiName = typeof options.apiName === "string" ? options.apiName : options.apiName.apiName;
+    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, {
+      dedupeInterval: 0
+    }));
+  }
+};
 var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
 var WeakRefTrie = class {
   #finalizer = new FinalizationRegistry((orderBy) => {
@@ -1558,11 +2123,15 @@ var Store = class {
   // we are currently only using this for debug logging and should just remove it in the future if that
   // continues to be true
   #finalizationRegistry;
+  // these are hopefully temporary
   constructor(client) {
     this.client = client;
-    this.logger = client[chunkBJYCRD5Y_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkBL56QBYG_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);
@@ -1652,53 +2221,10 @@ var Store = class {
   canonicalizeWhereClause(where) {
     return this.whereCanonicalizer.canonicalize(where);
   }
-  observeObject(apiName, pk, options, subFn) {
-    if (typeof apiName !== "string") {
-      apiName = apiName.apiName;
-    }
-    const query = this.getObjectQuery(apiName, pk);
-    this.retain(query.cacheKey);
-    if (options.mode !== "offline") {
-      query.revalidate(options.mode === "force").catch((e) => {
-        subFn.error(e);
-        if (this.logger) {
-          this.logger.error("Unhandled error in observeObject", e);
-        } else {
-          throw e;
-        }
-      });
-    }
-    const sub = query.subscribe(subFn);
-    return {
-      unsubscribe: () => {
-        sub.unsubscribe();
-        this.release(query.cacheKey);
-      }
-    };
-  }
-  observeList(options, subFn) {
-    const query = this.getListQuery(options.type, options.where ?? {}, options.orderBy ?? {}, options);
-    this.retain(query.cacheKey);
-    if (options.mode !== "offline") {
-      query.revalidate(options.mode === "force").catch((x) => {
-        subFn.error(x);
-      });
-    }
-    const sub = query.subscribe(subFn);
-    if (options.streamUpdates) {
-      query.registerStreamUpdates(sub);
-    }
-    return {
-      unsubscribe: () => {
-        sub.unsubscribe();
-        this.release(query.cacheKey);
-      }
-    };
-  }
   peekQuery(cacheKey) {
     return this.#queries.get(cacheKey);
   }
-  #getQuery(cacheKey, createQuery) {
+  getQuery(cacheKey, createQuery) {
     let query = this.peekQuery(cacheKey);
     if (!query) {
       query = createQuery();
@@ -1706,27 +2232,6 @@ var Store = class {
     }
     return query;
   }
-  getListQuery(def, where, orderBy, opts) {
-    const {
-      apiName,
-      type
-    } = def;
-    const canonWhere = this.whereCanonicalizer.canonicalize(where);
-    const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy);
-    const listCacheKey = this.getCacheKey("list", type, apiName, canonWhere, canonOrderBy);
-    return this.#getQuery(listCacheKey, () => {
-      return new ListQuery(this, this.getSubject(listCacheKey), type, apiName, canonWhere, canonOrderBy, listCacheKey, opts);
-    });
-  }
-  getObjectQuery(apiName, pk) {
-    if (typeof apiName !== "string") {
-      apiName = apiName.apiName;
-    }
-    const objectCacheKey = this.getCacheKey("object", apiName, pk);
-    return this.#getQuery(objectCacheKey, () => new ObjectQuery(this, this.getSubject(objectCacheKey), apiName, pk, objectCacheKey, {
-      dedupeInterval: 0
-    }));
-  }
   getValue(cacheKey) {
     return this.#topLayer.get(cacheKey);
   }
@@ -1753,7 +2258,7 @@ var Store = class {
         writeLayer.set(cacheKey, newValue);
         const newTopValue = this.#topLayer.get(cacheKey);
         if (oldTopValue !== newTopValue) {
-          this.#cacheKeyToSubject.get(cacheKey)?.next({
+          this.getSubject(cacheKey)?.next({
             // eslint-disable-next-line @typescript-eslint/no-misused-spread
             ...newValue,
             isOptimistic: newTopValue?.value !== this.#truthLayer.get(cacheKey)?.value
@@ -1787,7 +2292,10 @@ var Store = class {
     if (typeof apiName !== "string") {
       apiName = apiName.apiName;
     }
-    return this.getObjectQuery(apiName, pk).revalidate(
+    return this.objects.getQuery({
+      apiName,
+      pk
+    }).revalidate(
       /* force */
       true
     );
@@ -1824,9 +2332,15 @@ var Store = class {
     }
   }
   /**
-   * @param apiName
-   * @param changes The changes we know about / to update
-   * @returns
+   * Invalidates all cache entries for a specific object type.
+   * This will revalidate:
+   * 1. All objects of the specified type
+   * 2. All lists of the specified type
+   * 3. All links where the source object is of the specified type
+   *
+   * @param apiName - The API name of the object type to invalidate
+   * @param changes - Optional changes object to track what has been modified
+   * @returns Promise that resolves when all invalidations are complete
    */
   invalidateObjectType(apiName, changes) {
     if (typeof apiName !== "string") {
@@ -1839,17 +2353,14 @@ var Store = class {
     }
     const promises = [];
     for (const cacheKey of this.#truthLayer.keys()) {
-      if (isListCacheKey(cacheKey)) {
-        if (!changes || !changes.modified.has(cacheKey)) {
-          const promise = this.peekQuery(cacheKey)?.revalidate(true);
-          if (promise) {
-            promises.push(promise);
-            changes?.modified.add(cacheKey);
-          }
-        }
+      if (changes && changes.modified.has(cacheKey)) {
+        continue;
       }
+      const query = this.peekQuery(cacheKey);
+      if (!query) continue;
+      promises.push(query.invalidateObjectType(apiName, changes));
     }
-    return Promise.all(promises).then(() => void 0);
+    return Promise.allSettled(promises).then(() => void 0);
   }
   retain(cacheKey) {
     this.#refCounts.retain(cacheKey);
@@ -1861,10 +2372,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkURDXPIRU_cjs.createClientFromContext({
-    ...client[chunkBJYCRD5Y_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkBJYCRD5Y_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkURDXPIRU_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkAOGMSVFN_cjs.createClientFromContext({
+    ...client[chunkBL56QBYG_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkBL56QBYG_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkAOGMSVFN_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -1907,11 +2418,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkURDXPIRU_cjs.createClientWithTransaction; }
+  get: function () { return chunkAOGMSVFN_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkBJYCRD5Y_cjs.augment; }
+  get: function () { return chunkBL56QBYG_cjs.augment; }
 });
 exports.createObservableClient = createObservableClient;
 exports.getMetaTagContent = getMetaTagContent;