@osdk/client 2.5.0-beta.9 → 2.5.0

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

@@ -1,23 +1,179 @@
 'use strict';
 
-var chunkHCCGD2AP_cjs = require('../chunk-HCCGD2AP.cjs');
-var chunkMKL3HEQ5_cjs = require('../chunk-MKL3HEQ5.cjs');
+var chunkUMET26AF_cjs = require('../chunk-UMET26AF.cjs');
+var chunkKODTFRP3_cjs = require('../chunk-KODTFRP3.cjs');
 require('../chunk-Q7SFCCGT.cjs');
+var trie = require('@wry/trie');
+var deepEqual5 = require('fast-deep-equal');
+var invariant3 = require('tiny-invariant');
 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 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 deepEqual4__default = /*#__PURE__*/_interopDefault(deepEqual4);
+var deepEqual5__default = /*#__PURE__*/_interopDefault(deepEqual5);
+var invariant3__default = /*#__PURE__*/_interopDefault(invariant3);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 
+var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
+var WeakRefTrie = class {
+  #finalizer = new FinalizationRegistry((orderBy) => {
+    this.#trie.removeArray(Object.entries(orderBy).flat());
+  });
+  #trie;
+  constructor(makeData = defaultMakeData) {
+    this.#trie = new trie.Trie(false, (array) => {
+      const data = makeData(array);
+      this.#finalizer.register(data, array);
+      return new WeakRef(data);
+    });
+  }
+  lookupArray(array) {
+    const maybe = this.#trie.lookupArray(array);
+    let ret = maybe.deref();
+    if (maybe && !ret) {
+      this.#trie.removeArray(array);
+      ret = this.#trie.lookupArray(array).deref();
+    }
+    return ret;
+  }
+  peekArray(array) {
+    const maybe = this.#trie.peekArray(array);
+    const ret = maybe?.deref();
+    if (maybe && !ret) {
+      this.#trie.removeArray(array);
+    }
+    return ret;
+  }
+  removeArray(array) {
+    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) {
+      if (index % 2 === 0 && array2[index] != null) {
+        result.push(array2.slice(index, index + 2));
+      }
+      return result;
+    }, []);
+    let data = Object.fromEntries(pairs);
+    if (process.env.NODE_ENV !== "production") {
+      data = Object.freeze(data);
+    }
+    return data;
+  });
+  canonicalize = (orderBy) => {
+    const strings = Object.entries(orderBy).flat();
+    return this.#trie.lookupArray(strings);
+  };
+};
+var WhereClauseCanonicalizer = class {
+  /**
+   * This is a shortcut cache for any WhereClause's that we have
+   * seen and already canonicalized. The theory behind this
+   * is that well behaving React applications will either `useMemo`
+   * their where clause, or store it in state or pass it through as
+   * props such that we are likely to get the same WhereClause
+   * object multiple times and we can skip unnecessary work.
+   */
+  #cache = /* @__PURE__ */ new WeakMap();
+  /**
+   * This is a trie that stores the sorted collapsed keys of a where clause to
+   * the cache key for canonicalized options. In theory this keeps the number of
+   * deepEqual comparisons down to a minimum but its probably overkill.
+   */
+  #trie = new trie.Trie();
+  /**
+   * This is a cache from the cacheKey provided by `this.#trie` to the potential
+   * canonicalized options.
+   */
+  #existingOptions = /* @__PURE__ */ new Map();
+  canonicalize(where) {
+    if (this.#cache.has(where)) {
+      return this.#cache.get(where);
+    }
+    const keysSet = /* @__PURE__ */ new Set();
+    const calculatedCanon = this.#toCanon(where, keysSet);
+    const cacheKey = this.#trie.lookupArray(Array.from(keysSet).sort());
+    const lookupEntry = this.#existingOptions.get(cacheKey) ?? {
+      options: []
+    };
+    this.#existingOptions.set(cacheKey, lookupEntry);
+    const canon = lookupEntry.options.find((ref) => deepEqual5__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
+    if (canon === calculatedCanon) {
+      lookupEntry.options.push(new WeakRef(canon));
+    }
+    this.#cache.set(where, canon);
+    return canon;
+  }
+  #toCanon = (where, set = /* @__PURE__ */ new Set()) => {
+    if ("$and" in where) {
+      if (process.env.NODE_ENV !== "production") {
+        !Array.isArray(where.$and) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected $and to be an array") : invariant3__default.default(false) : void 0;
+        !(Object.keys(where).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $and to be present") : invariant3__default.default(false) : void 0;
+      }
+      if (where.$and.length === 0) {
+        return {};
+      }
+      if (where.$and.length === 1) {
+        return this.#toCanon(where.$and[0], set);
+      }
+    }
+    return Object.fromEntries(Object.entries(where).sort(([a], [b]) => a.localeCompare(b)).map(([k, v]) => {
+      set.add(k);
+      if (k === "$and" || k === "$or") {
+        return [k, v.map((x) => this.#toCanon(x, set))];
+      }
+      if (k !== "$not" && typeof v === "object" && "$eq" in v) {
+        return [k, v["$eq"]];
+      }
+      return [k, v];
+    }));
+  };
+};
+
+// src/observable/computeObjectSetCacheKey.ts
+var whereCanonicalizer = new WhereClauseCanonicalizer();
+var orderByCanonicalizer = new OrderByCanonicalizer();
+function computeObjectSetCacheKey(objectSet, options) {
+  const keyParts = ["objectSet", chunkKODTFRP3_cjs.getWireObjectSet(objectSet)];
+  if (!options) {
+    return JSON.stringify(keyParts);
+  }
+  if (options.where) {
+    keyParts.push("where", whereCanonicalizer.canonicalize(options.where));
+  }
+  if (options.withProperties) {
+    const propKeys = Object.keys(options.withProperties).sort();
+    keyParts.push("props", propKeys);
+  }
+  if (options.union && options.union.length > 0) {
+    keyParts.push("union", options.union.map((os) => chunkKODTFRP3_cjs.getWireObjectSet(os)));
+  }
+  if (options.intersect && options.intersect.length > 0) {
+    keyParts.push("intersect", options.intersect.map((os) => chunkKODTFRP3_cjs.getWireObjectSet(os)));
+  }
+  if (options.subtract && options.subtract.length > 0) {
+    keyParts.push("subtract", options.subtract.map((os) => chunkKODTFRP3_cjs.getWireObjectSet(os)));
+  }
+  if (options.pivotTo) {
+    keyParts.push("pivotTo", options.pivotTo);
+  }
+  if (options.orderBy) {
+    keyParts.push("orderBy", orderByCanonicalizer.canonicalize(options.orderBy));
+  }
+  if (options.pageSize) {
+    keyParts.push("pageSize", options.pageSize);
+  }
+  return JSON.stringify(keyParts);
+}
+
 // src/observable/internal/UnsubscribableWrapper.ts
 var UnsubscribableWrapper = class {
   #subscription;
@@ -75,6 +231,25 @@ var ObservableClientImpl = class {
     }
     return new UnsubscribableWrapper(parentSub);
   };
+  observeObjectSet(baseObjectSet, options, subFn) {
+    return this.__experimentalStore.objectSets.observe(
+      {
+        baseObjectSet,
+        ...options
+      },
+      // cast to cross typed to untyped barrier
+      subFn
+    );
+  }
+  invalidateAll() {
+    return this.__experimentalStore.invalidateAll();
+  }
+  invalidateObjects(objects) {
+    return this.__experimentalStore.invalidateObjects(objects);
+  }
+  invalidateObjectType(type) {
+    return this.__experimentalStore.invalidateObjectType(type, void 0);
+  }
   canonicalizeWhereClause(where) {
     return this.__experimentalStore.whereCanonicalizer.canonicalize(where);
   }
@@ -144,7 +319,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkMKL3HEQ5_cjs.additionalContext].objectFactory2(store.client[chunkMKL3HEQ5_cjs.additionalContext], [{
+        const create = store.client[chunkKODTFRP3_cjs.additionalContext].objectFactory2(store.client[chunkKODTFRP3_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -407,6 +582,9 @@ var Changes = class {
   deleteLink = (cacheKey) => {
     this.deleted.add(cacheKey);
   };
+  registerObjectSet = (key) => {
+    this.modified.add(key);
+  };
   isEmpty() {
     return this.modifiedObjects.size === 0 && this.addedObjects.size === 0 && this.added.size === 0 && this.modified.size === 0 && this.deleted.size === 0;
   }
@@ -655,7 +833,7 @@ var Layers = class {
     return this.#truthLayer;
   }
   remove(layerId) {
-    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant2__default.default(false) : void 0;
+    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant3__default.default(false) : void 0;
     let currentLayer = this.#topLayer;
     const cacheKeys = /* @__PURE__ */ new Map();
     while (currentLayer != null && currentLayer.parentLayer != null) {
@@ -683,7 +861,7 @@ var Layers = class {
     optimisticId,
     changes
   }, batchFn) {
-    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "optimistic must be undefined or not falsy") : invariant2__default.default(false) : void 0;
+    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "optimistic must be undefined or not falsy") : invariant3__default.default(false) : void 0;
     const batchContext = this.#createBatchContext({
       optimisticId,
       changes
@@ -825,14 +1003,31 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkMKL3HEQ5_cjs.additionalContext].logger : store.client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkKODTFRP3_cjs.additionalContext].logger : store.client[chunkKODTFRP3_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
   subscribe(observer) {
     this.#connectable ??= this._createConnectable(this.#subject);
     this.#subscription = this.#connectable.connect();
-    return this.#connectable.subscribe(observer);
+    const sub = this.#connectable.subscribe({
+      next: (value) => {
+        if (observer.next) {
+          observer.next(value);
+        }
+      },
+      error: (err) => {
+        if (observer.error) {
+          observer.error(err);
+        }
+      },
+      complete: () => {
+        if (observer.complete) {
+          observer.complete();
+        }
+      }
+    });
+    return sub;
   }
   /**
    * Register a subscription's dedupeInterval value
@@ -1100,7 +1295,7 @@ var BaseListQuery = class extends Query {
    */
   writeToStore(data, status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual4__default.default(data, entry.value)) {
+    if (entry && deepEqual5__default.default(data, entry.value)) {
       if (entry.status === status) {
         if (process.env.NODE_ENV !== "production") {
           this.logger?.child({
@@ -1381,7 +1576,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
     batch.changes.modified.add(this.cacheKey);
   }
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKODTFRP3_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;
@@ -1398,7 +1593,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkMKL3HEQ5_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkKODTFRP3_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     const sourceQuery = client(sourceObjectDef).where({
       [sourceMetadata.primaryKeyApiName]: this.#sourcePk
     });
@@ -1425,7 +1620,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
    */
   deleteFromStore(status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual4__default.default(tombstone, entry.value)) {
+    if (entry && deepEqual5__default.default(tombstone, entry.value)) {
       if (process.env.NODE_ENV !== "production") {
         this.logger?.child({
           methodName: "deleteFromStore"
@@ -1462,7 +1657,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkMKL3HEQ5_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkKODTFRP3_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -1475,10 +1670,10 @@ var SpecificLinkQuery = class extends BaseListQuery {
 
 // src/observable/internal/links/LinksHelper.ts
 var LinksHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2) {
     super(store, cacheKeys);
-    this.whereCanonicalizer = whereCanonicalizer;
-    this.orderByCanonicalizer = orderByCanonicalizer;
+    this.whereCanonicalizer = whereCanonicalizer2;
+    this.orderByCanonicalizer = orderByCanonicalizer2;
   }
   getQuery(options) {
     const {
@@ -1495,8 +1690,8 @@ var LinksHelper = class extends AbstractHelper {
 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;
+      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected $and to be an array") : invariant3__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $and to be present") : invariant3__default.default(false) : void 0;
     }
   }
   return "$and" in whereClause;
@@ -1504,8 +1699,8 @@ function is$and(whereClause) {
 function is$or(whereClause) {
   if (process.env.NODE_ENV !== "production") {
     if ("$or" in whereClause) {
-      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? 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;
+      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected $or to be an array") : invariant3__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $or to be present") : invariant3__default.default(false) : void 0;
     }
   }
   return "$or" in whereClause;
@@ -1513,13 +1708,13 @@ function is$or(whereClause) {
 function is$not(whereClause) {
   if (process.env.NODE_ENV !== "production") {
     if ("$not" in whereClause) {
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $not to be present") : invariant2__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "expected only $not to be present") : invariant3__default.default(false) : void 0;
     }
   }
   return "$not" in whereClause;
 }
 function objectSortaMatchesWhereClause(o, whereClause, strict) {
-  if (deepEqual4__default.default({}, whereClause)) {
+  if (deepEqual5__default.default({}, whereClause)) {
     return true;
   }
   if (is$and(whereClause)) {
@@ -1564,7 +1759,7 @@ function objectSortaMatchesWhereClause(o, whereClause, strict) {
           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) ;
+            process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Unknown where filter ${f}`) : invariant3__default.default(false) ;
           }
           return !strict;
       }
@@ -1593,7 +1788,7 @@ var ListQuery = class extends BaseListQuery {
     batch.changes.registerList(this.cacheKey);
   }
   constructor(store, subject, apiName, whereClause, orderBy, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKODTFRP3_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -1831,7 +2026,7 @@ var ListQuery = class extends BaseListQuery {
   onOswRemoved(objOrIface, logger) {
     this.store.batch({}, (batch) => {
       const existing = batch.read(this.cacheKey);
-      !existing ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant2__default.default(false) : void 0;
+      !existing ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant3__default.default(false) : void 0;
       if (existing.status === "loaded") {
         const objectCacheKey = this.cacheKeys.get("object", objOrIface.$objectType, objOrIface.$primaryKey);
         const newObjects = existing.value?.data.filter((o) => o !== objectCacheKey);
@@ -1885,7 +2080,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkHCCGD2AP_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkUMET26AF_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));
@@ -1906,7 +2101,7 @@ var InterfaceListQuery = class extends ListQuery {
 async function reloadDataAsFullObjects(client, data) {
   const groups = groupBy__default.default(data, (x) => x.$objectType);
   const objectTypeToPrimaryKeyToObject = Object.fromEntries(await Promise.all(Object.entries(groups).map(async ([apiName, objects]) => {
-    const objectDef = objects[0][chunkHCCGD2AP_cjs.UnderlyingOsdkObject][chunkHCCGD2AP_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkUMET26AF_cjs.UnderlyingOsdkObject][chunkUMET26AF_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -1916,7 +2111,7 @@ async function reloadDataAsFullObjects(client, data) {
     return [apiName, Object.fromEntries(result.data.map((x) => [x.$primaryKey, x]))];
   })));
   data = data.map((obj) => {
-    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant2__default.default(false) : void 0;
+    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant3__default.default(false) : void 0;
     return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
   });
   return data;
@@ -1959,10 +2154,10 @@ var ObjectListQuery = class extends ListQuery {
 
 // src/observable/internal/list/ListsHelper.ts
 var ListsHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2) {
     super(store, cacheKeys);
-    this.whereCanonicalizer = whereCanonicalizer;
-    this.orderByCanonicalizer = orderByCanonicalizer;
+    this.whereCanonicalizer = whereCanonicalizer2;
+    this.orderByCanonicalizer = orderByCanonicalizer2;
   }
   observe(options, subFn) {
     const ret = super.observe(options, subFn);
@@ -2016,7 +2211,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkMKL3HEQ5_cjs.additionalContext].logger;
+    this.#logger = client[chunkKODTFRP3_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -2079,7 +2274,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[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKODTFRP3_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -2115,7 +2310,7 @@ var ObjectQuery = class extends Query {
   }
   writeToStore(data, status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual4__default.default(data, entry.value)) {
+    if (entry && deepEqual5__default.default(data, entry.value)) {
       if (entry.status === status) {
         if (process.env.NODE_ENV !== "production") {
           this.logger?.child({
@@ -2149,7 +2344,7 @@ var ObjectQuery = class extends Query {
   }
   deleteFromStore(status, batch) {
     const entry = batch.read(this.cacheKey);
-    if (entry && deepEqual4__default.default(tombstone, entry.value)) {
+    if (entry && deepEqual5__default.default(tombstone, entry.value)) {
       if (process.env.NODE_ENV !== "production") {
         this.logger?.child({
           methodName: "deleteFromStore"
@@ -2207,60 +2402,182 @@ var ObjectsHelper = class extends AbstractHelper {
     }).writeToStore(v, "loaded", batch).cacheKey);
   }
 };
-var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
-var WeakRefTrie = class {
-  #finalizer = new FinalizationRegistry((orderBy) => {
-    this.#trie.removeArray(Object.entries(orderBy).flat());
-  });
-  #trie;
-  constructor(makeData = defaultMakeData) {
-    this.#trie = new trie.Trie(false, (array) => {
-      const data = makeData(array);
-      this.#finalizer.register(data, array);
-      return new WeakRef(data);
-    });
+
+// src/observable/internal/objectset/ObjectSetQuery.ts
+var ObjectSetQuery = class extends BaseListQuery {
+  #baseObjectSetWire;
+  #operations;
+  #composedObjectSet;
+  #objectTypes;
+  constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKODTFRP3_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
+    }) : void 0);
+    this.#baseObjectSetWire = baseObjectSetWire;
+    this.#operations = operations;
+    this.#composedObjectSet = this.#composeObjectSet(opts);
+    this.#objectTypes = this.#extractObjectTypes(opts);
+    if (operations.orderBy && Object.keys(operations.orderBy).length > 0) {
+      const firstType = Array.from(this.#objectTypes)[0];
+      this.sortingStrategy = new OrderBySortingStrategy(firstType, operations.orderBy);
+    }
+    this.minResultsToLoad = opts.pageSize || 0;
   }
-  lookupArray(array) {
-    const maybe = this.#trie.lookupArray(array);
-    let ret = maybe.deref();
-    if (maybe && !ret) {
-      this.#trie.removeArray(array);
-      ret = this.#trie.lookupArray(array).deref();
+  #composeObjectSet(opts) {
+    let result = opts.baseObjectSet;
+    if (opts.withProperties) {
+      result = result.withProperties(opts.withProperties);
     }
-    return ret;
+    if (opts.where) {
+      result = result.where(opts.where);
+    }
+    if (opts.union && opts.union.length > 0) {
+      result = result.union(...opts.union);
+    }
+    if (opts.intersect && opts.intersect.length > 0) {
+      result = result.intersect(...opts.intersect);
+    }
+    if (opts.subtract && opts.subtract.length > 0) {
+      result = result.subtract(...opts.subtract);
+    }
+    if (opts.pivotTo) {
+      result = result.pivotTo(opts.pivotTo);
+    }
+    return result;
   }
-  peekArray(array) {
-    const maybe = this.#trie.peekArray(array);
-    const ret = maybe?.deref();
-    if (maybe && !ret) {
-      this.#trie.removeArray(array);
+  #extractObjectTypes(opts) {
+    const types = /* @__PURE__ */ new Set();
+    const baseWire = JSON.parse(this.#baseObjectSetWire);
+    if (baseWire.type) {
+      types.add(baseWire.type);
+    }
+    if (opts.union) {
+      for (const os of opts.union) {
+        const wire = chunkKODTFRP3_cjs.getWireObjectSet(os);
+        if (wire.type) {
+          types.add(wire.type);
+        }
+      }
     }
-    return ret;
+    if (opts.intersect) {
+      for (const os of opts.intersect) {
+        const wire = chunkKODTFRP3_cjs.getWireObjectSet(os);
+        if (wire.type) {
+          types.add(wire.type);
+        }
+      }
+    }
+    if (opts.subtract) {
+      for (const os of opts.subtract) {
+        const wire = chunkKODTFRP3_cjs.getWireObjectSet(os);
+        if (wire.type) {
+          types.add(wire.type);
+        }
+      }
+    }
+    return types;
   }
-  removeArray(array) {
-    return this.#trie.removeArray(array)?.deref();
+  /**
+   * Register changes to the cache specific to ObjectSetQuery
+   */
+  registerCacheChanges(batch) {
+    batch.changes.registerObjectSet(this.cacheKey);
+  }
+  /**
+   * Implements fetchPageData from BaseListQuery template method
+   * Fetches a page of data from the composed ObjectSet
+   */
+  async fetchPageData(signal) {
+    const resp = await this.#composedObjectSet.fetchPage({
+      $nextPageToken: this.nextPageToken,
+      $pageSize: this.options.pageSize,
+      // OrderBy is already applied in the composed ObjectSet
+      ...this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 ? {
+        $orderBy: this.#operations.orderBy
+      } : {}
+    });
+    if (signal?.aborted) {
+      throw new Error("Aborted");
+    }
+    this.nextPageToken = resp.nextPageToken;
+    return resp;
+  }
+  handleFetchError(error, _status, batch) {
+    this.logger?.error("error", error);
+    this.store.subjects.get(this.cacheKey).error(error);
+    return this.writeToStore({
+      data: []
+    }, "error", batch);
+  }
+  invalidateObjectType = async (objectType, changes) => {
+    if (this.#objectTypes.has(objectType)) {
+      changes?.modified.add(this.cacheKey);
+      return this.revalidate(true);
+    }
+    return Promise.resolve();
+  };
+  createPayload(params) {
+    return {
+      resolvedList: params.resolvedData,
+      isOptimistic: params.isOptimistic,
+      fetchMore: this.fetchMore,
+      hasMore: this.nextPageToken != null,
+      status: params.status,
+      lastUpdated: params.lastUpdated,
+      objectSet: this.#composedObjectSet
+    };
   }
 };
 
-// src/observable/internal/OrderByCanonicalizer.ts
-var OrderByCanonicalizer = class {
-  #trie = new WeakRefTrie((array) => {
-    const pairs = array.reduce(function(result, _, index, array2) {
-      if (index % 2 === 0 && array2[index] != null) {
-        result.push(array2.slice(index, index + 2));
-      }
-      return result;
-    }, []);
-    let data = Object.fromEntries(pairs);
-    if (process.env.NODE_ENV !== "production") {
-      data = Object.freeze(data);
+// src/observable/internal/objectset/ObjectSetHelper.ts
+var ObjectSetHelper = class extends AbstractHelper {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2) {
+    super(store, cacheKeys);
+    this.whereCanonicalizer = whereCanonicalizer2;
+    this.orderByCanonicalizer = orderByCanonicalizer2;
+  }
+  observe(options, subFn) {
+    return super.observe(options, subFn);
+  }
+  getQuery(options) {
+    const {
+      baseObjectSet
+    } = options;
+    const baseObjectSetWire = JSON.stringify(chunkKODTFRP3_cjs.getWireObjectSet(baseObjectSet));
+    const operations = this.buildCanonicalizedOperations(options);
+    const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
+    return this.store.queries.get(objectSetCacheKey, () => {
+      return new ObjectSetQuery(this.store, this.store.subjects.get(objectSetCacheKey), baseObjectSetWire, operations, objectSetCacheKey, options);
+    });
+  }
+  buildCanonicalizedOperations(options) {
+    const operations = {};
+    if (options.where) {
+      operations.where = this.whereCanonicalizer.canonicalize(options.where);
     }
-    return data;
-  });
-  canonicalize = (orderBy) => {
-    const strings = Object.entries(orderBy).flat();
-    return this.#trie.lookupArray(strings);
-  };
+    if (options.withProperties) {
+      operations.withProperties = Object.keys(options.withProperties).sort();
+    }
+    if (options.union && options.union.length > 0) {
+      operations.union = options.union.map((os) => JSON.stringify(chunkKODTFRP3_cjs.getWireObjectSet(os)));
+    }
+    if (options.intersect && options.intersect.length > 0) {
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkKODTFRP3_cjs.getWireObjectSet(os)));
+    }
+    if (options.subtract && options.subtract.length > 0) {
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkKODTFRP3_cjs.getWireObjectSet(os)));
+    }
+    if (options.pivotTo) {
+      operations.pivotTo = options.pivotTo;
+    }
+    if (options.orderBy) {
+      operations.orderBy = this.orderByCanonicalizer.canonicalize(options.orderBy);
+    }
+    if (options.pageSize) {
+      operations.pageSize = options.pageSize;
+    }
+    return operations;
+  }
 };
 
 // src/observable/internal/Queries.ts
@@ -2287,70 +2604,6 @@ var Queries = class {
     this.map.delete(cacheKey);
   }
 };
-var WhereClauseCanonicalizer = class {
-  /**
-   * This is a shortcut cache for any WhereClause's that we have
-   * seen and already canonicalized. The theory behind this
-   * is that well behaving React applications will either `useMemo`
-   * their where clause, or store it in state or pass it through as
-   * props such that we are likely to get the same WhereClause
-   * object multiple times and we can skip unnecessary work.
-   */
-  #cache = /* @__PURE__ */ new WeakMap();
-  /**
-   * This is a trie that stores the sorted collapsed keys of a where clause to
-   * the cache key for canonicalized options. In theory this keeps the number of
-   * deepEqual comparisons down to a minimum but its probably overkill.
-   */
-  #trie = new trie.Trie();
-  /**
-   * This is a cache from the cacheKey provided by `this.#trie` to the potential
-   * canonicalized options.
-   */
-  #existingOptions = /* @__PURE__ */ new Map();
-  canonicalize(where) {
-    if (this.#cache.has(where)) {
-      return this.#cache.get(where);
-    }
-    const keysSet = /* @__PURE__ */ new Set();
-    const calculatedCanon = this.#toCanon(where, keysSet);
-    const cacheKey = this.#trie.lookupArray(Array.from(keysSet).sort());
-    const lookupEntry = this.#existingOptions.get(cacheKey) ?? {
-      options: []
-    };
-    this.#existingOptions.set(cacheKey, lookupEntry);
-    const canon = lookupEntry.options.find((ref) => deepEqual4__default.default(ref.deref(), calculatedCanon))?.deref() ?? calculatedCanon;
-    if (canon === calculatedCanon) {
-      lookupEntry.options.push(new WeakRef(canon));
-    }
-    this.#cache.set(where, canon);
-    return canon;
-  }
-  #toCanon = (where, set = /* @__PURE__ */ new Set()) => {
-    if ("$and" in where) {
-      if (process.env.NODE_ENV !== "production") {
-        !Array.isArray(where.$and) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected $and to be an array") : invariant2__default.default(false) : void 0;
-        !(Object.keys(where).length === 1) ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "expected only $and to be present") : invariant2__default.default(false) : void 0;
-      }
-      if (where.$and.length === 0) {
-        return {};
-      }
-      if (where.$and.length === 1) {
-        return this.#toCanon(where.$and[0], set);
-      }
-    }
-    return Object.fromEntries(Object.entries(where).sort(([a], [b]) => a.localeCompare(b)).map(([k, v]) => {
-      set.add(k);
-      if (k === "$and" || k === "$or") {
-        return [k, v.map((x) => this.#toCanon(x, set))];
-      }
-      if (k !== "$not" && typeof v === "object" && "$eq" in v) {
-        return [k, v["$eq"]];
-      }
-      return [k, v];
-    }));
-  };
-};
 
 // src/observable/internal/Store.ts
 var Store = class {
@@ -2365,7 +2618,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkKODTFRP3_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -2375,6 +2628,7 @@ var Store = class {
     this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
     this.objects = new ObjectsHelper(this, this.cacheKeys);
     this.links = new LinksHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
+    this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
   }
   /**
    * Called after a key is no longer retained and the timeout has elapsed
@@ -2383,7 +2637,7 @@ var Store = class {
   #cleanupCacheKey = (key) => {
     const subject = this.subjects.peek(key);
     if (process.env.NODE_ENV !== "production") {
-      !subject ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false) : invariant2__default.default(false) : void 0;
+      !subject ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false) : invariant3__default.default(false) : void 0;
     }
     this.subjects.delete(key);
     this.queries.delete(key);
@@ -2481,14 +2735,32 @@ var Store = class {
     }
     return Promise.allSettled(promises).then(() => void 0);
   }
+  async invalidateAll() {
+    const promises = [];
+    for (const cacheKey of this.queries.keys()) {
+      const query = this.queries.peek(cacheKey);
+      if (query) {
+        promises.push(query.revalidate(true));
+      }
+    }
+    return Promise.allSettled(promises).then(() => void 0);
+  }
+  async invalidateObjects(objects) {
+    const objectsArray = Array.isArray(objects) ? objects : [objects];
+    const promises = [];
+    for (const obj of objectsArray) {
+      promises.push(this.invalidateObject(obj.$objectType, obj.$primaryKey));
+    }
+    return Promise.allSettled(promises).then(() => void 0);
+  }
 };
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkHCCGD2AP_cjs.createClientFromContext({
-    ...client[chunkMKL3HEQ5_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkMKL3HEQ5_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkHCCGD2AP_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkUMET26AF_cjs.createClientFromContext({
+    ...client[chunkKODTFRP3_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkKODTFRP3_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkUMET26AF_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -2531,12 +2803,13 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkHCCGD2AP_cjs.createClientWithTransaction; }
+  get: function () { return chunkUMET26AF_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkMKL3HEQ5_cjs.augment; }
+  get: function () { return chunkKODTFRP3_cjs.augment; }
 });
+exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;
 exports.getMetaTagContent = getMetaTagContent;
 exports.getOsdkConfig = getOsdkConfig;