@osdk/client 2.8.0 → 2.8.1-main-20260406220320

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

@@ -1,185 +1,23 @@
 'use strict';
 
-var chunkHIX3UAPT_cjs = require('../chunk-HIX3UAPT.cjs');
-var chunkKVUKOKWX_cjs = require('../chunk-KVUKOKWX.cjs');
+var chunkVE53MA3W_cjs = require('../chunk-VE53MA3W.cjs');
+var chunkBMA3FGP2_cjs = require('../chunk-BMA3FGP2.cjs');
 require('../chunk-LCI6OHTV.cjs');
 require('../chunk-D26YLHTV.cjs');
 require('../chunk-YJG67XL4.cjs');
 require('../chunk-HEMBBCBS.cjs');
-var trie = require('@wry/trie');
-var deepEqual = require('fast-deep-equal');
-var invariant5 = require('tiny-invariant');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
+var invariant4 = require('tiny-invariant');
+var trie = require('@wry/trie');
+var deepEqual = require('fast-deep-equal');
 var shared_net_errors = require('@osdk/shared.net.errors');
 var unstable = require('@osdk/api/unstable');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+var invariant4__default = /*#__PURE__*/_interopDefault(invariant4);
 var deepEqual__default = /*#__PURE__*/_interopDefault(deepEqual);
-var invariant5__default = /*#__PURE__*/_interopDefault(invariant5);
-
-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((result, _, index, array2) => {
-      if (index % 2 === 0 && array2[index] != null) {
-        result.push(array2.slice(index, index + 2));
-      }
-      return result;
-    }, []);
-    const data = Object.fromEntries(pairs);
-    return data;
-  });
-  canonicalize(orderBy) {
-    if (orderBy == null) {
-      return void 0;
-    }
-    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 (where == null) {
-      return void 0;
-    }
-    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) => deepEqual__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" ? invariant5__default.default(false, "expected $and to be an array") : invariant5__default.default(false) : void 0;
-        !(Object.keys(where).length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "expected only $and to be present") : invariant5__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" && v != null && "$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", chunkKVUKOKWX_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) => chunkKVUKOKWX_cjs.getWireObjectSet(os)));
-  }
-  if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkKVUKOKWX_cjs.getWireObjectSet(os)));
-  }
-  if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkKVUKOKWX_cjs.getWireObjectSet(os)));
-  }
-  if (options.pivotTo) {
-    keyParts.push("pivotTo", options.pivotTo);
-  }
-  if (options.orderBy) {
-    keyParts.push("orderBy", orderByCanonicalizer.canonicalize(options.orderBy));
-  }
-  if (options.select && options.select.length > 0) {
-    keyParts.push("select", [...options.select].sort());
-  }
-  if (options.pageSize) {
-    keyParts.push("pageSize", options.pageSize);
-  }
-  return JSON.stringify(keyParts);
-}
 
 // src/observable/internal/UnsubscribableWrapper.ts
 var UnsubscribableWrapper = class {
@@ -231,8 +69,8 @@ var ObservableClientImpl = class {
     const instances = [];
     const objectSetWires = [];
     for (const item of options.dependsOnObjects ?? []) {
-      if (chunkKVUKOKWX_cjs.isObjectSet(item)) {
-        objectSetWires.push(chunkKVUKOKWX_cjs.getWireObjectSet(item));
+      if (chunkBMA3FGP2_cjs.isObjectSet(item)) {
+        objectSetWires.push(chunkBMA3FGP2_cjs.getWireObjectSet(item));
       } else {
         instances.push({
           $apiName: item.$objectType ?? item.$apiName,
@@ -240,7 +78,7 @@ var ObservableClientImpl = class {
         });
       }
     }
-    const objectSetTypesPromise = objectSetWires.length > 0 ? Promise.all(objectSetWires.map((wire) => chunkKVUKOKWX_cjs.extractObjectOrInterfaceType(this.__experimentalStore.client[chunkKVUKOKWX_cjs.additionalContext], wire))).then((types) => types.filter((t) => t != null).map((t) => t.apiName)) : void 0;
+    const objectSetTypesPromise = objectSetWires.length > 0 ? Promise.all(objectSetWires.map((wire) => chunkBMA3FGP2_cjs.extractObjectOrInterfaceType(this.__experimentalStore.client[chunkBMA3FGP2_cjs.additionalContext], wire))).then((types) => types.filter((t) => t != null).map((t) => t.apiName)) : void 0;
     return this.__experimentalStore.functions.observe({
       ...options,
       queryDef,
@@ -303,7 +141,7 @@ var ObservableClientImpl = class {
     if (!arr || arr.length === 0) {
       return arr;
     }
-    const wireStrings = arr.map((os) => JSON.stringify(chunkKVUKOKWX_cjs.getWireObjectSet(os)));
+    const wireStrings = arr.map((os) => JSON.stringify(chunkBMA3FGP2_cjs.getWireObjectSet(os)));
     const canonKey = canonicalize(wireStrings);
     let cached = cache.get(canonKey);
     if (!cached) {
@@ -498,7 +336,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkKVUKOKWX_cjs.additionalContext].objectFactory2(store.client[chunkKVUKOKWX_cjs.additionalContext], [{
+        const create = store.client[chunkBMA3FGP2_cjs.additionalContext].objectFactory2(store.client[chunkBMA3FGP2_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -835,7 +673,7 @@ async function calcObjectSet(os, ctx) {
       return await bumpInterface(os.interfaceType);
     case "interfaceLinkSearchAround": {
       const srcDef = await calcObjectSet(os.objectSet, ctx);
-      !(srcDef.type === "interface") ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
+      !(srcDef.type === "interface") ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false) : invariant4__default.default(false) : void 0;
       for (const [k, v] of Object.entries(srcDef.links)) {
         if (k === os.interfaceLink) {
           if (v.targetType === "object") {
@@ -848,7 +686,7 @@ async function calcObjectSet(os, ctx) {
     }
     case "searchAround": {
       const contextDef = await calcObjectSet(os.objectSet, ctx);
-      !(contextDef.type === "object") ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
+      !(contextDef.type === "object") ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false) : invariant4__default.default(false) : void 0;
       for (const [k, v] of Object.entries(contextDef.links)) {
         if (k === os.link) {
           return await bumpObject(v.targetType);
@@ -902,7 +740,7 @@ async function calcObjectSet(os, ctx) {
       });
     // used by rdps
     case "methodInput":
-      !ctx.methodInput ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "methodInput must be provided") : invariant5__default.default(false) : void 0;
+      !ctx.methodInput ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "methodInput must be provided") : invariant4__default.default(false) : void 0;
       return await calcObjectSet(ctx.methodInput, {
         ...ctx,
         counts: {}
@@ -965,7 +803,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkKVUKOKWX_cjs.additionalContext].logger : store.client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger : store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -1127,7 +965,7 @@ var AggregationQuery = class extends Query {
   #invalidationTypes;
   #invalidationTypesPromise;
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -1145,7 +983,7 @@ var AggregationQuery = class extends Query {
     try {
       const {
         invalidationSet
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkKVUKOKWX_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkBMA3FGP2_cjs.additionalContext], wireObjectSet);
       return /* @__PURE__ */ new Set([this.apiName, ...invalidationSet]);
     } catch (error) {
       this.store.logger?.error("Failed to compute invalidation types for aggregation, falling back to base type only", error);
@@ -1216,7 +1054,7 @@ var ObjectAggregationQuery = class extends AggregationQuery {
     };
     let objectSet;
     if (this.parsedWireObjectSet) {
-      objectSet = chunkKVUKOKWX_cjs.createObjectSet(objectTypeDef, this.store.client[chunkKVUKOKWX_cjs.additionalContext], this.parsedWireObjectSet);
+      objectSet = chunkBMA3FGP2_cjs.createObjectSet(objectTypeDef, this.store.client[chunkBMA3FGP2_cjs.additionalContext], this.parsedWireObjectSet);
     } else {
       objectSet = this.store.client(objectTypeDef);
     }
@@ -1240,9 +1078,9 @@ var ObjectAggregationQuery = class extends AggregationQuery {
 
 // src/observable/internal/aggregation/AggregationsHelper.ts
 var AggregationsHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, rdpCanonicalizer, intersectCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer, rdpCanonicalizer, intersectCanonicalizer) {
     super(store, cacheKeys);
-    this.whereCanonicalizer = whereCanonicalizer2;
+    this.whereCanonicalizer = whereCanonicalizer;
     this.rdpCanonicalizer = rdpCanonicalizer;
     this.intersectCanonicalizer = intersectCanonicalizer;
   }
@@ -1258,7 +1096,7 @@ var AggregationsHelper = class extends AbstractHelper {
     return this.getOrCreateQuery(options, void 0);
   }
   getQueryWithObjectSet(options) {
-    const serializedObjectSet = JSON.stringify(chunkKVUKOKWX_cjs.getWireObjectSet(options.objectSet));
+    const serializedObjectSet = JSON.stringify(chunkBMA3FGP2_cjs.getWireObjectSet(options.objectSet));
     return this.getOrCreateQuery(options, serializedObjectSet);
   }
   getOrCreateQuery(options, serializedObjectSet) {
@@ -1581,7 +1419,7 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunkHIX3UAPT_cjs.isObjectSpecifiersObject(value)) {
+    if (chunkVE53MA3W_cjs.isObjectSpecifiersObject(value)) {
       const objectType = value.$objectType ?? value.$apiName;
       path.push("$:osdk", objectType, value.$primaryKey);
       return {
@@ -1589,8 +1427,8 @@ var FunctionParamsCanonicalizer = class {
         $primaryKey: value.$primaryKey
       };
     }
-    if (chunkKVUKOKWX_cjs.isObjectSet(value)) {
-      const wire = chunkKVUKOKWX_cjs.getWireObjectSet(value);
+    if (chunkBMA3FGP2_cjs.isObjectSet(value)) {
+      const wire = chunkBMA3FGP2_cjs.getWireObjectSet(value);
       path.push("$:objectset", wire);
       return wire;
     }
@@ -1650,7 +1488,7 @@ var FunctionQuery = class extends Query {
   #dependsOnObjects;
   #queryDef;
   constructor(store, subject, queryDef, params, cacheKey, opts, objectSetTypesPromise) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = queryDef.apiName;
@@ -1707,7 +1545,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunkHIX3UAPT_cjs.applyQuery(this.store.client[chunkKVUKOKWX_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunkVE53MA3W_cjs.applyQuery(this.store.client[chunkBMA3FGP2_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -1925,9 +1763,9 @@ var GenericCanonicalizer = class extends CachingCanonicalizer {
 // src/observable/internal/IntersectCanonicalizer.ts
 var IntersectCanonicalizer = class extends CachingCanonicalizer {
   structuralCache = /* @__PURE__ */ new Map();
-  constructor(whereCanonicalizer2) {
+  constructor(whereCanonicalizer) {
     super();
-    this.whereCanonicalizer = whereCanonicalizer2;
+    this.whereCanonicalizer = whereCanonicalizer;
   }
   lookupOrCreate(intersectWith) {
     const canonicalClauses = intersectWith.map((item) => this.whereCanonicalizer.canonicalize(item.where ?? {}));
@@ -2161,7 +1999,7 @@ var Layers = class {
     return this.#truthLayer;
   }
   remove(layerId) {
-    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant5__default.default(false) : void 0;
+    !(layerId != null) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "undefined is the reserved layerId for the truth layer") : invariant4__default.default(false) : void 0;
     let currentLayer = this.#topLayer;
     const cacheKeys = /* @__PURE__ */ new Map();
     while (currentLayer != null && currentLayer.parentLayer != null) {
@@ -2189,7 +2027,7 @@ var Layers = class {
     optimisticId,
     changes
   }, batchFn) {
-    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "optimistic must be undefined or not falsy") : invariant5__default.default(false) : void 0;
+    !(optimisticId === void 0 || !!optimisticId) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "optimistic must be undefined or not falsy") : invariant4__default.default(false) : void 0;
     const batchContext = this.#createBatchContext({
       optimisticId,
       changes
@@ -2921,7 +2759,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[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `SpecificLinkQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     [this.#sourceApiName, this.#sourceTypeKind, this.#sourceUnderlyingObjectType, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
@@ -2935,7 +2773,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     const client = this.store.client;
-    const ontologyProvider = client[chunkKVUKOKWX_cjs.additionalContext].ontologyProvider;
+    const ontologyProvider = client[chunkBMA3FGP2_cjs.additionalContext].ontologyProvider;
     const isInterface = this.#sourceTypeKind === "interface";
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       let targetTypeApiName;
@@ -3046,7 +2884,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
     }
     return (async () => {
       try {
-        const ontologyProvider = this.store.client[chunkKVUKOKWX_cjs.additionalContext].ontologyProvider;
+        const ontologyProvider = this.store.client[chunkBMA3FGP2_cjs.additionalContext].ontologyProvider;
         if (this.#sourceTypeKind === "interface") {
           const objectMetadata = await ontologyProvider.getObjectDefinition(objectType);
           if (this.#sourceApiName in objectMetadata.interfaceMap) {
@@ -3092,10 +2930,10 @@ var SpecificLinkQuery = class extends BaseListQuery {
 
 // src/observable/internal/links/LinksHelper.ts
 var LinksHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, selectCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer, selectCanonicalizer) {
     super(store, cacheKeys);
-    this.whereCanonicalizer = whereCanonicalizer2;
-    this.orderByCanonicalizer = orderByCanonicalizer2;
+    this.whereCanonicalizer = whereCanonicalizer;
+    this.orderByCanonicalizer = orderByCanonicalizer;
     this.selectCanonicalizer = selectCanonicalizer;
   }
   getQuery(options) {
@@ -3142,7 +2980,7 @@ function evaluateFilter(f, realValue, expected, strict) {
       return !strict;
     default:
       if (process.env.NODE_ENV !== "production") {
-        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Unknown where filter ${f}`) : invariant5__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Unknown where filter ${f}`) : invariant4__default.default(false) ;
       }
       return !strict;
   }
@@ -3152,8 +2990,8 @@ function evaluateFilter(f, realValue, expected, strict) {
 function is$and(whereClause) {
   if (process.env.NODE_ENV !== "production") {
     if ("$and" in whereClause) {
-      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "expected $and to be an array") : invariant5__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "expected only $and to be present") : invariant5__default.default(false) : void 0;
+      !Array.isArray(whereClause.$and) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected $and to be an array") : invariant4__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $and to be present") : invariant4__default.default(false) : void 0;
     }
   }
   return "$and" in whereClause;
@@ -3161,8 +2999,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" ? invariant5__default.default(false, "expected $or to be an array") : invariant5__default.default(false) : void 0;
-      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "expected only $or to be present") : invariant5__default.default(false) : void 0;
+      !Array.isArray(whereClause.$or) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected $or to be an array") : invariant4__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $or to be present") : invariant4__default.default(false) : void 0;
     }
   }
   return "$or" in whereClause;
@@ -3170,7 +3008,7 @@ 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" ? invariant5__default.default(false, "expected only $not to be present") : invariant5__default.default(false) : void 0;
+      !(Object.keys(whereClause).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $not to be present") : invariant4__default.default(false) : void 0;
     }
   }
   return "$not" in whereClause;
@@ -3221,7 +3059,7 @@ var ListQuery = class extends BaseListQuery {
     batch.changes.registerList(this.cacheKey);
   }
   constructor(store, subject, apiName, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -3263,10 +3101,10 @@ var ListQuery = class extends BaseListQuery {
   async fetchPageData(signal) {
     const needsResultType = Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy) || this.#pivotInfo != null && this.#intersectWith != null && this.#intersectWith.length > 0 && !this.#pivotIntersectApplied;
     if (needsResultType) {
-      const wireObjectSet = chunkKVUKOKWX_cjs.getWireObjectSet(this.#objectSet);
+      const wireObjectSet = chunkBMA3FGP2_cjs.getWireObjectSet(this.#objectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkKVUKOKWX_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkBMA3FGP2_cjs.additionalContext], wireObjectSet);
       if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
         this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
       }
@@ -3476,7 +3314,7 @@ var ListQuery = class extends BaseListQuery {
     }) : this.logger;
     this.store.batch({}, (batch) => {
       const existing = batch.read(this.cacheKey);
-      !existing ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant5__default.default(false) : void 0;
+      !existing ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant4__default.default(false) : void 0;
       if (existing.status === "loaded") {
         const objectCacheKey = this.getObjectCacheKey(objOrIface);
         const newObjects = existing.value?.data.filter((o) => o !== objectCacheKey);
@@ -3541,7 +3379,7 @@ var InterfaceListQuery = class extends ListQuery {
       type,
       apiName: this.apiName
     };
-    const clientCtx = store.client[chunkKVUKOKWX_cjs.additionalContext];
+    const clientCtx = store.client[chunkBMA3FGP2_cjs.additionalContext];
     let objectSet;
     if (rids != null) {
       objectSet = clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
@@ -3580,7 +3418,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkHIX3UAPT_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkVE53MA3W_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));
@@ -3599,7 +3437,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
 };
 function createSourceSetForPivot(store, pivotInfo, rids) {
-  const clientCtx = store.client[chunkKVUKOKWX_cjs.additionalContext];
+  const clientCtx = store.client[chunkBMA3FGP2_cjs.additionalContext];
   if (rids != null) {
     return clientCtx.objectSetFactory({
       type: "object",
@@ -3642,7 +3480,7 @@ async function reloadDataAsFullObjects(client, data) {
   })));
   return data.map((obj) => {
     const fullObject = objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
-    !fullObject ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant5__default.default(false) : void 0;
+    !fullObject ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant4__default.default(false) : void 0;
     return fullObject;
   });
 }
@@ -3654,7 +3492,7 @@ var ObjectListQuery = class extends ListQuery {
     const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX2];
     const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
     const rids = this.cacheKey.otherKeys[RIDS_IDX];
-    const clientCtx = store.client[chunkKVUKOKWX_cjs.additionalContext];
+    const clientCtx = store.client[chunkBMA3FGP2_cjs.additionalContext];
     const typeDefinition = {
       type: "object",
       apiName: this.apiName
@@ -3741,10 +3579,10 @@ var ObjectListQuery = class extends ListQuery {
 
 // src/observable/internal/list/ListsHelper.ts
 var ListsHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer, intersectCanonicalizer, pivotCanonicalizer, ridListCanonicalizer, selectCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer, rdpCanonicalizer, intersectCanonicalizer, pivotCanonicalizer, ridListCanonicalizer, selectCanonicalizer) {
     super(store, cacheKeys);
-    this.whereCanonicalizer = whereCanonicalizer2;
-    this.orderByCanonicalizer = orderByCanonicalizer2;
+    this.whereCanonicalizer = whereCanonicalizer;
+    this.orderByCanonicalizer = orderByCanonicalizer;
     this.rdpCanonicalizer = rdpCanonicalizer;
     this.intersectCanonicalizer = intersectCanonicalizer;
     this.pivotCanonicalizer = pivotCanonicalizer;
@@ -3800,8 +3638,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkHIX3UAPT_cjs.ObjectDefRef];
+  const underlying = value[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkVE53MA3W_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3814,7 +3652,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunkHIX3UAPT_cjs.createOsdkObject(value[chunkHIX3UAPT_cjs.ClientRef], objectDef, newProps);
+  return chunkVE53MA3W_cjs.createOsdkObject(value[chunkVE53MA3W_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3825,8 +3663,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkHIX3UAPT_cjs.ObjectDefRef];
+  const underlying = value[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkVE53MA3W_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3842,12 +3680,12 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunkHIX3UAPT_cjs.createOsdkObject(value[chunkHIX3UAPT_cjs.ClientRef], objectDef, newProps);
+  return chunkVE53MA3W_cjs.createOsdkObject(value[chunkVE53MA3W_cjs.ClientRef], objectDef, newProps);
 }
 function mergeSelectFields(sourceValue, selectFields, existingValue) {
-  const sourceUnderlying = sourceValue[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
-  const existingUnderlying = existingValue[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunkHIX3UAPT_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
+  const existingUnderlying = existingValue[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkVE53MA3W_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3865,7 +3703,7 @@ function mergeSelectFields(sourceValue, selectFields, existingValue) {
       newProps[key] = sourceUnderlying[key];
     }
   }
-  return chunkHIX3UAPT_cjs.createOsdkObject(sourceValue[chunkHIX3UAPT_cjs.ClientRef], objectDef, newProps);
+  return chunkVE53MA3W_cjs.createOsdkObject(sourceValue[chunkVE53MA3W_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3877,8 +3715,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunkHIX3UAPT_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkVE53MA3W_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3892,7 +3730,7 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
       if (field in targetUnderlying) {
         if (!sourceRdpFields.has(field) || newProps[field] === void 0) {
@@ -3901,7 +3739,7 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
       }
     }
   }
-  return chunkHIX3UAPT_cjs.createOsdkObject(sourceValue[chunkHIX3UAPT_cjs.ClientRef], objectDef, newProps);
+  return chunkVE53MA3W_cjs.createOsdkObject(sourceValue[chunkVE53MA3W_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -4056,7 +3894,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkKVUKOKWX_cjs.additionalContext].logger;
+    this.#logger = client[chunkBMA3FGP2_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -4206,7 +4044,7 @@ var ObjectQuery = class extends Query {
   #loadPropertySecurityMetadata;
   #implementingTypes;
   constructor(store, subject, type, pk, cacheKey, opts, defType = "object", select, loadPropertySecurityMetadata) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -4308,7 +4146,7 @@ var ObjectsHelper = class extends AbstractHelper {
       select,
       $loadPropertySecurityMetadata
     } = options;
-    const defType = chunkHIX3UAPT_cjs.getDefType(options.apiName);
+    const defType = chunkVE53MA3W_cjs.getDefType(options.apiName);
     const objectCacheKey = this.cacheKeys.get("object", apiName, pk, rdpConfig ?? void 0);
     return this.store.queries.get(objectCacheKey, () => new ObjectQuery(this.store, this.store.subjects.get(objectCacheKey), apiName, pk, objectCacheKey, {
       dedupeInterval: 0
@@ -4346,7 +4184,7 @@ var ObjectsHelper = class extends AbstractHelper {
     if (valueToWrite !== tombstone && existing?.value && this.isObjectHolder(existing.value)) {
       const expectedRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(sourceCacheKey);
       if (expectedRdpFields.size > 0) {
-        const underlying = valueToWrite[chunkHIX3UAPT_cjs.UnderlyingOsdkObject];
+        const underlying = valueToWrite[chunkVE53MA3W_cjs.UnderlyingOsdkObject];
         const actualRdpFields = /* @__PURE__ */ new Set();
         for (const field of expectedRdpFields) {
           if (underlying && field in underlying) {
@@ -4416,7 +4254,7 @@ var ObjectSetQuery = class _ObjectSetQuery extends BaseListQuery {
   #requiresServerEvaluation;
   #resultTypeApiName;
   constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -4484,7 +4322,7 @@ var ObjectSetQuery = class _ObjectSetQuery extends BaseListQuery {
       return;
     }
     for (const os of sets) {
-      const typeName = _ObjectSetQuery.#extractTypeFromWireObjectSet(chunkKVUKOKWX_cjs.getWireObjectSet(os));
+      const typeName = _ObjectSetQuery.#extractTypeFromWireObjectSet(chunkBMA3FGP2_cjs.getWireObjectSet(os));
       if (typeName) {
         types.add(typeName);
       }
@@ -4511,10 +4349,10 @@ var ObjectSetQuery = class _ObjectSetQuery extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkKVUKOKWX_cjs.getWireObjectSet(this.#composedObjectSet);
+      const wireObjectSet = chunkBMA3FGP2_cjs.getWireObjectSet(this.#composedObjectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkKVUKOKWX_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkBMA3FGP2_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#operations.orderBy);
     }
     const resp = await this.#composedObjectSet.fetchPage({
@@ -4716,10 +4554,10 @@ function reconcileListChanges(existingKeys, addedDefiniteMatches, modifiedObject
 
 // src/observable/internal/objectset/ObjectSetHelper.ts
 var ObjectSetHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer, selectCanonicalizer, objectSetArrayCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer, rdpCanonicalizer, selectCanonicalizer, objectSetArrayCanonicalizer) {
     super(store, cacheKeys);
-    this.whereCanonicalizer = whereCanonicalizer2;
-    this.orderByCanonicalizer = orderByCanonicalizer2;
+    this.whereCanonicalizer = whereCanonicalizer;
+    this.orderByCanonicalizer = orderByCanonicalizer;
     this.rdpCanonicalizer = rdpCanonicalizer;
     this.selectCanonicalizer = selectCanonicalizer;
     this.objectSetArrayCanonicalizer = objectSetArrayCanonicalizer;
@@ -4735,7 +4573,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkKVUKOKWX_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkBMA3FGP2_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -4751,13 +4589,13 @@ var ObjectSetHelper = class extends AbstractHelper {
       operations.withProperties = this.rdpCanonicalizer.canonicalize(options.withProperties);
     }
     if (options.union && options.union.length > 0) {
-      operations.union = this.objectSetArrayCanonicalizer.canonicalizeUnion(options.union.map((os) => JSON.stringify(chunkKVUKOKWX_cjs.getWireObjectSet(os))));
+      operations.union = this.objectSetArrayCanonicalizer.canonicalizeUnion(options.union.map((os) => JSON.stringify(chunkBMA3FGP2_cjs.getWireObjectSet(os))));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = this.objectSetArrayCanonicalizer.canonicalizeIntersect(options.intersect.map((os) => JSON.stringify(chunkKVUKOKWX_cjs.getWireObjectSet(os))));
+      operations.intersect = this.objectSetArrayCanonicalizer.canonicalizeIntersect(options.intersect.map((os) => JSON.stringify(chunkBMA3FGP2_cjs.getWireObjectSet(os))));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = this.objectSetArrayCanonicalizer.canonicalizeSubtract(options.subtract.map((os) => JSON.stringify(chunkKVUKOKWX_cjs.getWireObjectSet(os))));
+      operations.subtract = this.objectSetArrayCanonicalizer.canonicalizeSubtract(options.subtract.map((os) => JSON.stringify(chunkBMA3FGP2_cjs.getWireObjectSet(os))));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -4777,6 +4615,40 @@ var ObjectSetHelper = class extends AbstractHelper {
     return operations;
   }
 };
+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/ObjectSetArrayCanonicalizer.ts
 var ObjectSetArrayCanonicalizer = class {
@@ -4796,6 +4668,27 @@ var ObjectSetArrayCanonicalizer = class {
   }
 };
 
+// src/observable/internal/OrderByCanonicalizer.ts
+var OrderByCanonicalizer = class {
+  #trie = new WeakRefTrie((array) => {
+    const pairs = array.reduce((result, _, index, array2) => {
+      if (index % 2 === 0 && array2[index] != null) {
+        result.push(array2.slice(index, index + 2));
+      }
+      return result;
+    }, []);
+    const data = Object.fromEntries(pairs);
+    return data;
+  });
+  canonicalize(orderBy) {
+    if (orderBy == null) {
+      return void 0;
+    }
+    const strings = Object.entries(orderBy).flat();
+    return this.#trie.lookupArray(strings);
+  }
+};
+
 // src/observable/internal/PivotCanonicalizer.ts
 var PivotCanonicalizer = class {
   #cache = /* @__PURE__ */ new Map();
@@ -4850,7 +4743,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkKVUKOKWX_cjs.createWithPropertiesObjectSet(
+      const builder = chunkBMA3FGP2_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -4916,6 +4809,73 @@ var SelectCanonicalizer = class {
     return canonical;
   }
 };
+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 (where == null) {
+      return void 0;
+    }
+    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) => deepEqual__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" ? invariant4__default.default(false, "expected $and to be an array") : invariant4__default.default(false) : void 0;
+        !(Object.keys(where).length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "expected only $and to be present") : invariant4__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" && v != null && "$eq" in v) {
+        return [k, v.$eq];
+      }
+      return [k, v];
+    }));
+  };
+};
 
 // src/observable/internal/Store.ts
 var Store = class {
@@ -4949,7 +4909,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkKVUKOKWX_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkBMA3FGP2_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -4970,7 +4930,7 @@ var Store = class {
   #cleanupCacheKey = (key) => {
     const subject = this.subjects.peek(key);
     if (process.env.NODE_ENV !== "production") {
-      !subject ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
+      !subject ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false) : invariant4__default.default(false) : void 0;
     }
     this.subjects.delete(key);
     this.queries.delete(key);
@@ -5250,10 +5210,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkHIX3UAPT_cjs.createClientFromContext({
-    ...client[chunkKVUKOKWX_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkKVUKOKWX_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkHIX3UAPT_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkVE53MA3W_cjs.createClientFromContext({
+    ...client[chunkBMA3FGP2_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkBMA3FGP2_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkVE53MA3W_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -5417,7 +5377,7 @@ function getLinkQueryOptions(linkDef, sourceObject, pageSize) {
   return options;
 }
 async function buildObjectSetFromLinkDefByType(client, sourceType, sourcePrimaryKey, linkDef) {
-  const metadata = await client[chunkKVUKOKWX_cjs.additionalContext].ontologyProvider.getObjectDefinition(sourceType.apiName);
+  const metadata = await client[chunkBMA3FGP2_cjs.additionalContext].ontologyProvider.getObjectDefinition(sourceType.apiName);
   const pkFieldName = metadata.primaryKeyApiName;
   let objectSet = client(sourceType).where({
     [pkFieldName]: sourcePrimaryKey
@@ -5476,24 +5436,23 @@ function resolveSymbolBindings(value, sourcePrimaryKey) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkHIX3UAPT_cjs.createClientWithTransaction; }
+  get: function () { return chunkVE53MA3W_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkKVUKOKWX_cjs.augment; }
+  get: function () { return chunkBMA3FGP2_cjs.augment; }
 });
 Object.defineProperty(exports, "getWireObjectSet", {
   enumerable: true,
-  get: function () { return chunkKVUKOKWX_cjs.getWireObjectSet; }
+  get: function () { return chunkBMA3FGP2_cjs.getWireObjectSet; }
 });
 Object.defineProperty(exports, "isObjectSet", {
   enumerable: true,
-  get: function () { return chunkKVUKOKWX_cjs.isObjectSet; }
+  get: function () { return chunkBMA3FGP2_cjs.isObjectSet; }
 });
 exports.applyShapeTransformations = applyShapeTransformations;
 exports.applyShapeTransformationsToArray = applyShapeTransformationsToArray;
 exports.buildObjectSetFromLinkDefByType = buildObjectSetFromLinkDefByType;
-exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;
 exports.getLinkQueryOptions = getLinkQueryOptions;
 exports.getMetaTagContent = getMetaTagContent;