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

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

@@ -1,21 +1,21 @@
 'use strict';
 
-var chunkAOGMSVFN_cjs = require('../chunk-AOGMSVFN.cjs');
-var chunkBL56QBYG_cjs = require('../chunk-BL56QBYG.cjs');
+var chunkKCMGIMVC_cjs = require('../chunk-KCMGIMVC.cjs');
+var chunkELAA4C2C_cjs = require('../chunk-ELAA4C2C.cjs');
 require('../chunk-Q7SFCCGT.cjs');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
 var invariant2 = require('tiny-invariant');
 var trie = require('@wry/trie');
 var mnemonist = require('mnemonist');
-var deepEqual2 = require('fast-deep-equal');
+var deepEqual4 = require('fast-deep-equal');
 var groupBy = require('object.groupby');
 var shared_net_errors = require('@osdk/shared.net.errors');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var invariant2__default = /*#__PURE__*/_interopDefault(invariant2);
-var deepEqual2__default = /*#__PURE__*/_interopDefault(deepEqual2);
+var deepEqual4__default = /*#__PURE__*/_interopDefault(deepEqual4);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 
 // src/observable/internal/UnsubscribableWrapper.ts
@@ -95,7 +95,7 @@ function createOptimisticId() {
   return /* @__PURE__ */ Object.create(null);
 }
 
-// src/observable/internal/OptimisticJob.ts
+// src/observable/internal/actions/OptimisticJob.ts
 var OptimisticJob = class {
   #result;
   constructor(store, optimisticId) {
@@ -142,7 +142,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkBL56QBYG_cjs.additionalContext].objectFactory2(store.client[chunkBL56QBYG_cjs.additionalContext], [{
+        const create = store.client[chunkELAA4C2C_cjs.additionalContext].objectFactory2(store.client[chunkELAA4C2C_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -178,7 +178,7 @@ function runOptimisticJob(store, optimisticUpdate) {
   };
 }
 
-// src/observable/internal/ActionApplication.ts
+// src/observable/internal/actions/ActionApplication.ts
 var ACTION_DELAY = process.env.NODE_ENV === "production" ? 0 : 1e3;
 var ActionApplication = class {
   constructor(store) {
@@ -571,199 +571,11 @@ var AbstractHelper = class {
     return new QuerySubscription(query, sub);
   }
 };
-function createCollectionConnectable(subject, store, createPayload) {
-  return rxjs.connectable(subject.pipe(rxjs.switchMap((listEntry) => {
-    const resolvedData = listEntry?.value?.data == null || listEntry.value.data.length === 0 ? rxjs.of([]) : rxjs.combineLatest(listEntry.value.data.map((cacheKey) => store.getSubject(cacheKey).pipe(rxjs.map((objectEntry) => objectEntry?.value), rxjs.distinctUntilChanged())));
-    return rxjs.scheduled(rxjs.combineLatest({
-      resolvedData,
-      isOptimistic: rxjs.of(listEntry.isOptimistic),
-      status: rxjs.of(listEntry.status),
-      lastUpdated: rxjs.of(listEntry.lastUpdated)
-    }).pipe(rxjs.map((params) => createPayload({
-      resolvedData: Array.isArray(params.resolvedData) ? params.resolvedData : [],
-      isOptimistic: params.isOptimistic,
-      status: params.status,
-      lastUpdated: params.lastUpdated
-    }))), rxjs.asapScheduler);
-  })), {
-    resetOnDisconnect: false,
-    connector: () => new rxjs.ReplaySubject(1)
-  });
-}
 
 // src/observable/internal/isObjectInstance.ts
 function isObjectInstance(item) {
   return item != null && typeof item === "object" && "$primaryKey" in item;
 }
-function is$and(whereClause) {
-  if (process.env.NODE_ENV !== "production") {
-    if ("$and" in whereClause) {
-      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $and to be an array") : invariant2__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $and to be present") : invariant2__default.default(false) : void 0;
-    }
-  }
-  return "$and" in whereClause;
-}
-function is$or(whereClause) {
-  if (process.env.NODE_ENV !== "production") {
-    if ("$or" in whereClause) {
-      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $or to be an array") : invariant2__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $or to be present") : invariant2__default.default(false) : void 0;
-    }
-  }
-  return "$or" in whereClause;
-}
-function is$not(whereClause) {
-  if (process.env.NODE_ENV !== "production") {
-    if ("$not" in whereClause) {
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $not to be present") : invariant2__default.default(false) : void 0;
-    }
-  }
-  return "$not" in whereClause;
-}
-function objectSortaMatchesWhereClause(o, whereClause, strict) {
-  if (deepEqual2__default.default({}, whereClause)) {
-    return true;
-  }
-  if (is$and(whereClause)) {
-    return whereClause.$and.every((w) => objectSortaMatchesWhereClause(o, w, strict));
-  }
-  if (is$or(whereClause)) {
-    return whereClause.$or.some((w) => objectSortaMatchesWhereClause(o, w, strict));
-  }
-  if (is$not(whereClause)) {
-    return !objectSortaMatchesWhereClause(o, whereClause.$not, strict);
-  }
-  return Object.entries(whereClause).every(([key, filter]) => {
-    if (typeof filter === "object") {
-      const realValue = o[key];
-      const [f] = Object.keys(filter);
-      const expected = filter[f];
-      switch (f) {
-        case "$eq":
-          return realValue === expected;
-        case "$gt":
-          return realValue > expected;
-        case "$lt":
-          return realValue < expected;
-        case "$gte":
-          return realValue >= expected;
-        case "$lte":
-          return realValue <= expected;
-        case "$ne":
-          return realValue !== expected;
-        case "$in":
-          return expected.$in.includes(realValue);
-        case "$isNull":
-          return realValue == null;
-        case "$startsWith":
-          return realValue.startsWith(expected);
-        case "$contains":
-        case "$containsAllTerms":
-        case "$containsAllTermsInOrder":
-        case "$containsAnyTerm":
-        case "$intersects":
-        case "$within":
-          return !strict;
-        default:
-          if (process.env.NODE_ENV !== "production") {
-            process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Unknown where filter ${f}`) : invariant2__default.default(false) ;
-          }
-          return !strict;
-      }
-    }
-    if (key in o) {
-      if (o[key] === filter) {
-        return true;
-      }
-    }
-    return false;
-  });
-}
-
-// ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
-function pDefer() {
-  const deferred = {};
-  deferred.promise = new Promise((resolve, reject) => {
-    deferred.resolve = resolve;
-    deferred.reject = reject;
-  });
-  return deferred;
-}
-
-// src/observable/internal/BulkObjectLoader.ts
-var weakCache = new mnemonist.DefaultWeakMap((c) => new BulkObjectLoader(c));
-function getBulkObjectLoader(client) {
-  return weakCache.get(client);
-}
-var BulkObjectLoader = class {
-  #client;
-  #m = new mnemonist.DefaultMap(() => ({
-    data: [],
-    timer: void 0
-  }));
-  #logger;
-  #maxWait;
-  #maxEntries;
-  constructor(client, maxWait = 25, maxEntries = 100) {
-    this.#client = client;
-    this.#logger = client[chunkBL56QBYG_cjs.additionalContext].logger;
-    this.#maxWait = maxWait;
-    this.#maxEntries = maxEntries;
-  }
-  async fetch(apiName, primaryKey) {
-    const deferred = pDefer();
-    const entry = this.#m.get(apiName);
-    entry.data.push({
-      primaryKey,
-      deferred
-    });
-    if (!entry.timer) {
-      entry.timer = setTimeout(() => {
-        this.#loadObjects(apiName, entry.data);
-      }, this.#maxWait);
-    }
-    if (entry.data.length >= this.#maxEntries) {
-      clearTimeout(entry.timer);
-      this.#loadObjects(apiName, entry.data);
-    }
-    return await deferred.promise;
-  }
-  #loadObjects(apiName, arr) {
-    this.#m.delete(apiName);
-    this.#reallyLoadObjects(apiName, arr).catch((e) => {
-      this.#logger?.error("Unhandled exception", e);
-    });
-  }
-  async #reallyLoadObjects(apiName, arr) {
-    const miniDef = {
-      type: "object",
-      apiName
-    };
-    const objMetadata = await this.#client.fetchMetadata(miniDef);
-    const pks = arr.map((x) => x.primaryKey);
-    const {
-      data
-    } = await this.#client(miniDef).where({
-      [objMetadata.primaryKeyApiName]: {
-        $in: pks
-      }
-    }).fetchPage({
-      $pageSize: pks.length
-    });
-    for (const {
-      primaryKey,
-      deferred
-    } of arr) {
-      const object = data.find((x) => x.$primaryKey === primaryKey);
-      if (object) {
-        deferred.resolve(object);
-      } else {
-        deferred.reject(new shared_net_errors.PalantirApiError(`Object not found: ${primaryKey}`));
-      }
-    }
-  }
-};
 
 // src/observable/internal/Query.ts
 var Query = class {
@@ -777,7 +589,7 @@ var Query = class {
     this.cacheKey = cacheKey;
     this.store = store;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkBL56QBYG_cjs.additionalContext].logger : store.client[chunkBL56QBYG_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkELAA4C2C_cjs.additionalContext].logger : store.client[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -891,157 +703,27 @@ var Query = class {
    */
 };
 
-// src/observable/internal/tombstone.ts
-var tombstone = void 0;
-
-// src/observable/internal/ObjectQuery.ts
-var ObjectQuery = class extends Query {
-  #apiName;
-  #pk;
-  constructor(store, subject, type, pk, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBL56QBYG_cjs.additionalContext].logger?.child({}, {
-      msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
-    }) : void 0);
-    this.#apiName = type;
-    this.#pk = pk;
+// src/observable/internal/sorting/SortingStrategy.ts
+var NoOpSortingStrategy = class {
+  sortCacheKeys(objectCacheKeys, _batch) {
+    return objectCacheKeys;
   }
-  _createConnectable(subject) {
-    return rxjs.connectable(subject.pipe(rxjs.map((x) => {
-      return {
-        status: x.status,
-        object: x.value,
-        lastUpdated: x.lastUpdated,
-        isOptimistic: x.isOptimistic
-      };
-    })), {
-      connector: () => new rxjs.BehaviorSubject({
-        status: "init",
-        object: void 0,
-        lastUpdated: 0,
-        isOptimistic: false
-      })
-    });
+};
+var OrderBySortingStrategy = class {
+  constructor(apiName, orderBy) {
+    this.apiName = apiName;
+    this.orderBy = orderBy;
+    this.sortFns = createOrderBySortFns(orderBy);
   }
-  async _fetchAndStore() {
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "_fetchAndStore"
-      }).debug("calling _fetchAndStore");
+  sortCacheKeys(objectCacheKeys, batch) {
+    if (Object.keys(this.orderBy).length === 0) {
+      return objectCacheKeys;
     }
-    const obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
-    this.store.batch({}, (batch) => {
-      this.writeToStore(obj, "loaded", batch);
-    });
-  }
-  writeToStore(data, status, batch) {
-    const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__default.default(data, entry.value)) {
-      if (entry.status === status) {
-        if (process.env.NODE_ENV !== "production") {
-          this.logger?.child({
-            methodName: "writeToStore"
-          }).debug(`Object was deep equal and status unchanged (${status}), skipping update`);
-        }
-        return entry;
-      }
-      if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "writeToStore"
-        }).debug(`Object was deep equal, just setting status (old status: ${entry.status}, new status: ${status})`);
-      }
-      return batch.write(this.cacheKey, entry.value, status);
-    }
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "writeToStore"
-      }).debug(JSON.stringify({
-        status
-      }), data);
-    }
-    const ret = batch.write(this.cacheKey, data, status);
-    batch.changes.registerObject(
-      this.cacheKey,
-      data,
-      /* isNew */
-      !entry
-    );
-    return ret;
-  }
-  deleteFromStore(status, batch) {
-    const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__default.default(tombstone, entry.value)) {
-      if (process.env.NODE_ENV !== "production") {
-        this.logger?.child({
-          methodName: "deleteFromStore"
-        }).debug(`Object was deep equal, just setting status`);
-      }
-      return batch.write(this.cacheKey, entry.value, status);
-    }
-    if (process.env.NODE_ENV !== "production") {
-      this.logger?.child({
-        methodName: "deleteFromStore"
-      }).debug(JSON.stringify({
-        status
-      }));
-    }
-    if (!entry || !entry.value) {
-      return;
-    }
-    const ret = batch.delete(this.cacheKey, status);
-    batch.changes.deleteObject(this.cacheKey);
-    return ret;
-  }
-  invalidateObjectType = (objectType, changes) => {
-    if (this.#apiName === objectType) {
-      changes?.modified.add(this.cacheKey);
-      return this.revalidate(true);
-    }
-    return Promise.resolve();
-  };
-};
-function storeOsdkInstances(store, values, batch) {
-  return values.map((v) => {
-    return store.objects.getQuery({
-      apiName: v.$apiName,
-      pk: v.$primaryKey
-    }).writeToStore(v, "loaded", batch).cacheKey;
-  });
-}
-
-// src/observable/internal/removeDuplicates.ts
-function removeDuplicates(objectCacheKeys, batch) {
-  const visited = /* @__PURE__ */ new Set();
-  return objectCacheKeys.filter((key) => {
-    batch.read(key);
-    if (visited.has(key)) {
-      return false;
-    }
-    visited.add(key);
-    return true;
-  });
-}
-
-// src/observable/internal/sorting/SortingStrategy.ts
-var NoOpSortingStrategy = class {
-  sortCacheKeys(objectCacheKeys, _batch) {
-    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 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;
@@ -1067,9 +749,40 @@ function createOrderBySortFns(orderBy) {
     };
   });
 }
+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/ListQuery.ts
-var API_NAME_IDX = 1;
+// src/observable/internal/base-list/removeDuplicates.ts
+function removeDuplicates(objectCacheKeys, batch) {
+  const visited = /* @__PURE__ */ new Set();
+  return objectCacheKeys.filter((key) => {
+    batch.read(key);
+    if (visited.has(key)) {
+      return false;
+    }
+    visited.add(key);
+    return true;
+  });
+}
+
+// src/observable/internal/base-list/BaseListQuery.ts
 var BaseListQuery = class extends Query {
   /**
    * The sorting strategy to use for this collection
@@ -1109,7 +822,7 @@ var BaseListQuery = class extends Query {
     if (items.length === 0) {
       objectCacheKeys = [];
     } else if (isObjectInstance(items[0])) {
-      objectCacheKeys = this.storeObjects(items, batch);
+      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch);
     } else {
       objectCacheKeys = items;
     }
@@ -1128,7 +841,7 @@ var BaseListQuery = class extends Query {
    */
   writeToStore(data, status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__default.default(data, entry.value)) {
+    if (entry && deepEqual4__default.default(data, entry.value)) {
       if (entry.status === status) {
         if (process.env.NODE_ENV !== "production") {
           this.logger?.child({
@@ -1157,17 +870,6 @@ var BaseListQuery = class extends Query {
    * Register changes to the cache based on the specific collection type
    * Implemented by subclasses to handle specific change registration
    */
-  /**
-   * Common method to store objects in the cache and return their cache keys
-   * Used by collection queries when storing object references
-   *
-   * @param objects Array of objects to store
-   * @param batch The batch context to use
-   * @returns Array of cache keys for the stored objects
-   */
-  storeObjects(objects, batch) {
-    return objects.length > 0 ? storeOsdkInstances(this.store, objects, batch) : [];
-  }
   /**
    * Common method for managing object reference counting and appending results
    * Used by collection queries when updating object references
@@ -1325,7 +1027,7 @@ var BaseListQuery = class extends Query {
       } = this.store.batch({}, (batch) => {
         const append = this.nextPageToken != null;
         const finalStatus = result.nextPageToken ? status : "loaded";
-        return this._updateList(this.storeObjects(result.data, batch), finalStatus, batch, append);
+        return this._updateList(this.store.objects.storeOsdkInstances(result.data, batch), finalStatus, batch, append);
       });
       return retVal;
     } catch (error) {
@@ -1394,7 +1096,7 @@ var BaseListQuery = class extends Query {
     if (items.length === 0) {
       objectCacheKeys = [];
     } else if (isObjectInstance(items[0])) {
-      objectCacheKeys = this.storeObjects(items, batch);
+      objectCacheKeys = this.store.objects.storeOsdkInstances(items, batch);
     } else {
       objectCacheKeys = items;
     }
@@ -1406,108 +1108,325 @@ var BaseListQuery = class extends Query {
     }, options.status, batch);
   }
 };
-var ListQuery = class extends BaseListQuery {
-  // pageSize?: number; // this is the internal page size. we need to track this properly
-  #type;
-  #apiName;
+
+// src/observable/internal/tombstone.ts
+var tombstone = void 0;
+
+// src/observable/internal/links/SpecificLinkQuery.ts
+var SpecificLinkQuery = class extends BaseListQuery {
+  #sourceApiName;
+  #sourcePk;
+  #linkName;
   #whereClause;
-  // Using base class minResultsToLoad instead of a private property
   #orderBy;
-  #objectSet;
   /**
-   * Register changes to the cache specific to ListQuery
+   * Register changes to the cache specific to SpecificLinkQuery
    */
   registerCacheChanges(batch) {
-    batch.changes.registerList(this.cacheKey);
+    batch.changes.modified.add(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(", ")}>`
+  constructor(store, subject, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `SpecificLinkQuery<${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;
+    [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 BaseCollectionQuery template method
-   * Fetches a page of data
+   * Implements fetchPageData from the BaseCollectionQuery template method pattern
+   * Fetches a page of linked objects
    */
   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
-      } : {}
+    const client = this.store.client;
+    const sourceObjectDef = {
+      type: "object",
+      apiName: this.#sourceApiName
+    };
+    const sourceMetadata = await client[chunkELAA4C2C_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");
     }
-    this.nextPageToken = resp.nextPageToken;
-    let fetchedData = resp.data;
-    if (this.#type === "interface") {
-      fetchedData = await reloadDataAsFullObjects(this.store.client, fetchedData);
-    }
-    return {
-      ...resp,
-      data: fetchedData
+    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;
   }
   /**
-   * 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.
-   *
-   * @param apiName to invalidate
-   * @returns
+   * Removes a link query from the store
    */
-  revalidateObjectType = async (apiName) => {
-    if (this.#type === "object") {
-      if (this.#apiName === apiName) {
-        await this.revalidate(
-          /* force */
-          true
-        );
-        return;
-      } else {
-        return;
+  deleteFromStore(status, batch) {
+    const entry = batch.read(this.cacheKey);
+    if (entry && deepEqual4__default.default(tombstone, entry.value)) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "deleteFromStore"
+        }).debug(`Links were already deleted, just setting status`);
       }
+      return batch.write(this.cacheKey, entry.value, status);
     }
-    const objectMetadata = await this.store.client.fetchMetadata({
-      type: "object",
-      apiName
-    });
-    if (this.#apiName in objectMetadata.interfaceMap) {
-      await this.revalidate(
-        /* force */
-        true
-      );
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "deleteFromStore"
+      }).debug(JSON.stringify({
+        status
+      }));
+    }
+    if (!entry || !entry.value) {
       return;
     }
-  };
-  invalidateObjectType = async (objectType, changes) => {
-    if (this.cacheKey.otherKeys[1] === objectType) {
+    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[chunkELAA4C2C_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);
+    });
+  }
+};
+function is$and(whereClause) {
+  if (process.env.NODE_ENV !== "production") {
+    if ("$and" in whereClause) {
+      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $and to be an array") : invariant2__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $and to be present") : invariant2__default.default(false) : void 0;
+    }
+  }
+  return "$and" in whereClause;
+}
+function is$or(whereClause) {
+  if (process.env.NODE_ENV !== "production") {
+    if ("$or" in whereClause) {
+      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $or to be an array") : invariant2__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $or to be present") : invariant2__default.default(false) : void 0;
+    }
+  }
+  return "$or" in whereClause;
+}
+function is$not(whereClause) {
+  if (process.env.NODE_ENV !== "production") {
+    if ("$not" in whereClause) {
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $not to be present") : invariant2__default.default(false) : void 0;
+    }
+  }
+  return "$not" in whereClause;
+}
+function objectSortaMatchesWhereClause(o, whereClause, strict) {
+  if (deepEqual4__default.default({}, whereClause)) {
+    return true;
+  }
+  if (is$and(whereClause)) {
+    return whereClause.$and.every((w) => objectSortaMatchesWhereClause(o, w, strict));
+  }
+  if (is$or(whereClause)) {
+    return whereClause.$or.some((w) => objectSortaMatchesWhereClause(o, w, strict));
+  }
+  if (is$not(whereClause)) {
+    return !objectSortaMatchesWhereClause(o, whereClause.$not, strict);
+  }
+  return Object.entries(whereClause).every(([key, filter]) => {
+    if (typeof filter === "object") {
+      const realValue = o[key];
+      const [f] = Object.keys(filter);
+      const expected = filter[f];
+      switch (f) {
+        case "$eq":
+          return realValue === expected;
+        case "$gt":
+          return realValue > expected;
+        case "$lt":
+          return realValue < expected;
+        case "$gte":
+          return realValue >= expected;
+        case "$lte":
+          return realValue <= expected;
+        case "$ne":
+          return realValue !== expected;
+        case "$in":
+          return expected.$in.includes(realValue);
+        case "$isNull":
+          return realValue == null;
+        case "$startsWith":
+          return realValue.startsWith(expected);
+        case "$contains":
+        case "$containsAllTerms":
+        case "$containsAllTermsInOrder":
+        case "$containsAnyTerm":
+        case "$intersects":
+        case "$within":
+          return !strict;
+        default:
+          if (process.env.NODE_ENV !== "production") {
+            process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Unknown where filter ${f}`) : invariant2__default.default(false) ;
+          }
+          return !strict;
+      }
+    }
+    if (key in o) {
+      if (o[key] === filter) {
+        return true;
+      }
+    }
+    return false;
+  });
+}
+
+// src/observable/internal/list/ListQuery.ts
+var API_NAME_IDX = 1;
+var ListQuery = class extends BaseListQuery {
+  // pageSize?: number; // this is the internal page size. we need to track this properly
+  #type;
+  #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[chunkELAA4C2C_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.
+   *
+   * @param apiName to invalidate
+   * @returns
+   */
+  revalidateObjectType = async (apiName) => {
+    if (this.#type === "object") {
+      if (this.#apiName === apiName) {
+        await this.revalidate(
+          /* force */
+          true
+        );
+        return;
+      } else {
+        return;
+      }
+    }
+    const objectMetadata = await this.store.client.fetchMetadata({
+      type: "object",
+      apiName
+    });
+    if (this.#apiName in objectMetadata.interfaceMap) {
+      await this.revalidate(
+        /* force */
+        true
+      );
+      return;
+    }
+  };
+  invalidateObjectType = async (objectType, changes) => {
+    if (this.cacheKey.otherKeys[1] === objectType) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
     }
@@ -1614,7 +1533,7 @@ var ListQuery = class extends BaseListQuery {
   }
   #extractRelevantObjectsForTypeInterface(changes) {
     const matchesApiName = ([, object]) => {
-      return this.#apiName in object[chunkAOGMSVFN_cjs.ObjectDefRef].interfaceMap;
+      return this.#apiName in object[chunkKCMGIMVC_cjs.ObjectDefRef].interfaceMap;
     };
     const added = Array.from(changes.addedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.#apiName));
     const modified = Array.from(changes.modifiedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.#apiName));
@@ -1705,7 +1624,7 @@ var ListQuery = class extends BaseListQuery {
     if (state === "ADDED_OR_UPDATED") {
       const object = objOrIface.$apiName !== objOrIface.$objectType ? objOrIface.$as(objOrIface.$objectType) : objOrIface;
       this.store.batch({}, (batch) => {
-        this.storeObjects([object], batch);
+        this.store.objects.storeOsdkInstances([object], batch);
       });
     } else if (state === "REMOVED") {
       this.#onOswRemoved(objOrIface, logger);
@@ -1745,7 +1664,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][chunkAOGMSVFN_cjs.UnderlyingOsdkObject][chunkAOGMSVFN_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkKCMGIMVC_cjs.UnderlyingOsdkObject][chunkKCMGIMVC_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -1761,69 +1680,202 @@ async function reloadDataAsFullObjects(client, data) {
   return data;
 }
 
-// src/observable/internal/links/SpecificLinkQuery.ts
-var SpecificLinkQuery = class extends BaseListQuery {
-  #sourceApiName;
-  #sourcePk;
-  #linkName;
-  #whereClause;
-  #orderBy;
-  /**
-   * Register changes to the cache specific to SpecificLinkQuery
-   */
-  registerCacheChanges(batch) {
-    batch.changes.modified.add(this.cacheKey);
+// src/observable/internal/list/ListsHelper.ts
+var ListsHelper = class extends AbstractHelper {
+  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
+    super(store);
+    this.whereCanonicalizer = whereCanonicalizer;
+    this.orderByCanonicalizer = orderByCanonicalizer;
   }
-  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);
+  observe(options, subFn) {
+    const ret = super.observe(options, subFn);
+    if (options.streamUpdates) {
+      ret.query.registerStreamUpdates(ret.subscription);
+    }
+    return ret;
   }
-  // _fetchAndStore is now implemented in BaseCollectionQuery
-  /**
-   * Implements fetchPageData from the BaseCollectionQuery template method pattern
-   * Fetches a page of linked objects
-   */
-  async fetchPageData(signal) {
-    const client = this.store.client;
-    const sourceObjectDef = {
+  getQuery(options) {
+    const {
+      type: {
+        apiName,
+        type
+      },
+      where,
+      orderBy
+    } = options;
+    const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
+    const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
+    const listCacheKey = this.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);
+    });
+  }
+};
+
+// ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
+function pDefer() {
+  const deferred = {};
+  deferred.promise = new Promise((resolve, reject) => {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
+  });
+  return deferred;
+}
+
+// src/observable/internal/BulkObjectLoader.ts
+var weakCache = new mnemonist.DefaultWeakMap((c) => new BulkObjectLoader(c));
+function getBulkObjectLoader(client) {
+  return weakCache.get(client);
+}
+var BulkObjectLoader = class {
+  #client;
+  #m = new mnemonist.DefaultMap(() => ({
+    data: [],
+    timer: void 0
+  }));
+  #logger;
+  #maxWait;
+  #maxEntries;
+  constructor(client, maxWait = 25, maxEntries = 100) {
+    this.#client = client;
+    this.#logger = client[chunkELAA4C2C_cjs.additionalContext].logger;
+    this.#maxWait = maxWait;
+    this.#maxEntries = maxEntries;
+  }
+  async fetch(apiName, primaryKey) {
+    const deferred = pDefer();
+    const entry = this.#m.get(apiName);
+    entry.data.push({
+      primaryKey,
+      deferred
+    });
+    if (!entry.timer) {
+      entry.timer = setTimeout(() => {
+        this.#loadObjects(apiName, entry.data);
+      }, this.#maxWait);
+    }
+    if (entry.data.length >= this.#maxEntries) {
+      clearTimeout(entry.timer);
+      this.#loadObjects(apiName, entry.data);
+    }
+    return await deferred.promise;
+  }
+  #loadObjects(apiName, arr) {
+    this.#m.delete(apiName);
+    this.#reallyLoadObjects(apiName, arr).catch((e) => {
+      this.#logger?.error("Unhandled exception", e);
+    });
+  }
+  async #reallyLoadObjects(apiName, arr) {
+    const miniDef = {
       type: "object",
-      apiName: this.#sourceApiName
+      apiName
     };
-    const sourceMetadata = await client[chunkBL56QBYG_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
-    const sourceQuery = client(sourceObjectDef).where({
-      [sourceMetadata.primaryKeyApiName]: this.#sourcePk
+    const objMetadata = await this.#client.fetchMetadata(miniDef);
+    const pks = arr.map((x) => x.primaryKey);
+    const {
+      data
+    } = await this.#client(miniDef).where({
+      [objMetadata.primaryKeyApiName]: {
+        $in: pks
+      }
+    }).fetchPage({
+      $pageSize: pks.length
     });
-    const linkQuery = sourceQuery.pivotTo(this.#linkName);
-    if (signal?.aborted) {
-      throw new Error("Aborted");
+    for (const {
+      primaryKey,
+      deferred
+    } of arr) {
+      const object = data.find((x) => x.$primaryKey === primaryKey);
+      if (object) {
+        deferred.resolve(object);
+      } else {
+        deferred.reject(new shared_net_errors.PalantirApiError(`Object not found: ${primaryKey}`));
+      }
     }
-    const queryParams = {
-      $pageSize: this.options.pageSize || 100,
-      $nextPageToken: this.nextPageToken
-    };
-    if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
-      queryParams.$orderBy = this.#orderBy;
+  }
+};
+
+// src/observable/internal/object/ObjectQuery.ts
+var ObjectQuery = class extends Query {
+  #apiName;
+  #pk;
+  constructor(store, subject, type, pk, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
+    }) : void 0);
+    this.#apiName = type;
+    this.#pk = pk;
+  }
+  _createConnectable(subject) {
+    return rxjs.connectable(subject.pipe(rxjs.map((x) => {
+      return {
+        status: x.status,
+        object: x.value,
+        lastUpdated: x.lastUpdated,
+        isOptimistic: x.isOptimistic
+      };
+    })), {
+      connector: () => new rxjs.BehaviorSubject({
+        status: "init",
+        object: void 0,
+        lastUpdated: 0,
+        isOptimistic: false
+      })
+    });
+  }
+  async _fetchAndStore() {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "_fetchAndStore"
+      }).debug("calling _fetchAndStore");
     }
-    if (this.#whereClause && Object.keys(this.#whereClause).length > 0) {
-      queryParams.$where = this.#whereClause;
+    const obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
+    this.store.batch({}, (batch) => {
+      this.writeToStore(obj, "loaded", batch);
+    });
+  }
+  writeToStore(data, status, batch) {
+    const entry = batch.read(this.cacheKey);
+    if (entry && deepEqual4__default.default(data, entry.value)) {
+      if (entry.status === status) {
+        if (process.env.NODE_ENV !== "production") {
+          this.logger?.child({
+            methodName: "writeToStore"
+          }).debug(`Object was deep equal and status unchanged (${status}), skipping update`);
+        }
+        return entry;
+      }
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "writeToStore"
+        }).debug(`Object was deep equal, just setting status (old status: ${entry.status}, new status: ${status})`);
+      }
+      return batch.write(this.cacheKey, entry.value, status);
     }
-    const response = await linkQuery.fetchPage(queryParams);
-    this.nextPageToken = response.nextPageToken;
-    return response;
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "writeToStore"
+      }).debug(JSON.stringify({
+        status
+      }), data);
+    }
+    const ret = batch.write(this.cacheKey, data, status);
+    batch.changes.registerObject(
+      this.cacheKey,
+      data,
+      /* isNew */
+      !entry
+    );
+    return ret;
   }
-  /**
-   * Removes a link query from the store
-   */
   deleteFromStore(status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual2__default.default(tombstone, entry.value)) {
+    if (entry && deepEqual4__default.default(tombstone, entry.value)) {
       if (process.env.NODE_ENV !== "production") {
         this.logger?.child({
           methodName: "deleteFromStore"
-        }).debug(`Links were already deleted, just setting status`);
+        }).debug(`Object was deep equal, just setting status`);
       }
       return batch.write(this.cacheKey, entry.value, status);
     }
@@ -1838,87 +1890,18 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return;
     }
     const ret = batch.delete(this.cacheKey, status);
-    batch.changes.deleted.add(this.cacheKey);
+    batch.changes.deleteObject(this.cacheKey);
     return ret;
   }
-  /**
-   * Implements Query.maybeUpdateAndRevalidate to handle cache invalidation
-   */
-  maybeUpdateAndRevalidate = async (changes, _optimisticId) => {
-    if (changes.modified.has(this.cacheKey)) {
-      return this.revalidate(true);
-    }
-    return Promise.resolve();
-  };
   invalidateObjectType = (objectType, changes) => {
-    if (this.#sourceApiName === objectType) {
+    if (this.#apiName === objectType) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
-    } else {
-      return (async () => {
-        const sourceMetadata = await this.store.client[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;
-      })();
     }
+    return Promise.resolve();
   };
 };
 
-// src/observable/internal/links/LinksHelper.ts
-var LinksHelper = class extends AbstractHelper {
-  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
-    super(store);
-    this.whereCanonicalizer = whereCanonicalizer;
-    this.orderByCanonicalizer = orderByCanonicalizer;
-  }
-  getQuery(options) {
-    const {
-      apiName
-    } = options.srcType;
-    const canonWhere = this.whereCanonicalizer.canonicalize(options.where ?? {});
-    const canonOrderBy = this.orderByCanonicalizer.canonicalize(options.orderBy ?? {});
-    const linkCacheKey = this.store.getCacheKey("specificLink", apiName, options.pk, options.linkName, canonWhere, canonOrderBy);
-    return this.store.getQuery(linkCacheKey, () => {
-      return new SpecificLinkQuery(this.store, this.store.getSubject(linkCacheKey), linkCacheKey, options);
-    });
-  }
-};
-
-// src/observable/internal/list/ListsHelper.ts
-var ListsHelper = class extends AbstractHelper {
-  constructor(store, whereCanonicalizer, orderByCanonicalizer) {
-    super(store);
-    this.whereCanonicalizer = whereCanonicalizer;
-    this.orderByCanonicalizer = orderByCanonicalizer;
-  }
-  observe(options, subFn) {
-    const ret = super.observe(options, subFn);
-    if (options.streamUpdates) {
-      ret.query.registerStreamUpdates(ret.subscription);
-    }
-    return ret;
-  }
-  getQuery(options) {
-    const {
-      type: {
-        apiName,
-        type
-      },
-      where,
-      orderBy
-    } = options;
-    const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
-    const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
-    const listCacheKey = this.store.getCacheKey("list", type, apiName, canonWhere, canonOrderBy);
-    return this.store.getQuery(listCacheKey, () => {
-      return new ListQuery(this.store, this.store.getSubject(listCacheKey), type, apiName, canonWhere, canonOrderBy, listCacheKey, options);
-    });
-  }
-};
-
 // src/observable/internal/object/ObjectsHelper.ts
 var ObjectsHelper = class extends AbstractHelper {
   observe(options, subFn) {
@@ -1934,6 +1917,17 @@ var ObjectsHelper = class extends AbstractHelper {
       dedupeInterval: 0
     }));
   }
+  /**
+   * Internal helper method for writing objects to the store and returning their
+   * object keys
+   * @internal
+   */
+  storeOsdkInstances(values, batch) {
+    return values.map((v) => this.getQuery({
+      apiName: v.$apiName,
+      pk: v.$primaryKey
+    }).writeToStore(v, "loaded", batch).cacheKey);
+  }
 };
 var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
 var WeakRefTrie = class {
@@ -1969,6 +1963,8 @@ var WeakRefTrie = class {
     return this.#trie.removeArray(array)?.deref();
   }
 };
+
+// src/observable/internal/OrderByCanonicalizer.ts
 var OrderByCanonicalizer = class {
   #trie = new WeakRefTrie((array) => {
     const pairs = array.reduce(function(result, _, index, array2) {
@@ -2066,7 +2062,7 @@ var WhereClauseCanonicalizer = class {
       options: []
     };
     this.#existingOptions.set(cacheKey, lookupEntry);
-    const canon = lookupEntry.options.find((ref) => deepEqual2__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
+    const canon = lookupEntry.options.find((ref) => deepEqual4__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
     if (canon === calculatedCanon) {
       lookupEntry.options.push(new WeakRef(canon));
     }
@@ -2126,7 +2122,7 @@ var Store = class {
   // these are hopefully temporary
   constructor(client) {
     this.client = client;
-    this.logger = client[chunkBL56QBYG_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkELAA4C2C_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.lists = new ListsHelper(this, this.whereCanonicalizer, this.orderByCanonicalizer);
@@ -2372,10 +2368,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  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(" "));
+  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(" "));
       return headers;
     })
   });
@@ -2418,11 +2414,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkAOGMSVFN_cjs.createClientWithTransaction; }
+  get: function () { return chunkKCMGIMVC_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkBL56QBYG_cjs.augment; }
+  get: function () { return chunkELAA4C2C_cjs.augment; }
 });
 exports.createObservableClient = createObservableClient;
 exports.getMetaTagContent = getMetaTagContent;