@osdk/client 2.7.0-beta.1 → 2.7.0-beta.11

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var chunkWQL7SQ7H_cjs = require('../chunk-WQL7SQ7H.cjs');
-var chunkVDAI3GGL_cjs = require('../chunk-VDAI3GGL.cjs');
-var chunk6SCDLAU2_cjs = require('../chunk-6SCDLAU2.cjs');
+var chunk666JN2DO_cjs = require('../chunk-666JN2DO.cjs');
+var chunkRDZ5NKAI_cjs = require('../chunk-RDZ5NKAI.cjs');
+var chunkLDTMSHUZ_cjs = require('../chunk-LDTMSHUZ.cjs');
 var trie = require('@wry/trie');
 var deepEqual = require('fast-deep-equal');
-var invariant4 = require('tiny-invariant');
+var invariant5 = require('tiny-invariant');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
 var mnemonist = require('mnemonist');
@@ -15,20 +15,20 @@ var shared_net_errors = require('@osdk/shared.net.errors');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var deepEqual__default = /*#__PURE__*/_interopDefault(deepEqual);
-var invariant4__default = /*#__PURE__*/_interopDefault(invariant4);
+var invariant5__default = /*#__PURE__*/_interopDefault(invariant5);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 
 // src/public/unstable-do-not-use.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/computeObjectSetCacheKey.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/OrderByCanonicalizer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/WeakRefTrie.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var defaultMakeData = () => /* @__PURE__ */ Object.create(null);
 var WeakRefTrie = class {
   #finalizer = new FinalizationRegistry((orderBy) => {
@@ -83,7 +83,7 @@ var OrderByCanonicalizer = class {
 };
 
 // src/observable/internal/WhereClauseCanonicalizer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var WhereClauseCanonicalizer = class {
   /**
    * This is a shortcut cache for any WhereClause's that we have
@@ -126,8 +126,8 @@ var WhereClauseCanonicalizer = class {
   #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;
+        !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 {};
@@ -153,7 +153,7 @@ var WhereClauseCanonicalizer = class {
 var whereCanonicalizer = new WhereClauseCanonicalizer();
 var orderByCanonicalizer = new OrderByCanonicalizer();
 function computeObjectSetCacheKey(objectSet, options) {
-  const keyParts = ["objectSet", chunkVDAI3GGL_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkRDZ5NKAI_cjs.getWireObjectSet(objectSet)];
   if (!options) {
     return JSON.stringify(keyParts);
   }
@@ -165,13 +165,13 @@ function computeObjectSetCacheKey(objectSet, options) {
     keyParts.push("props", propKeys);
   }
   if (options.union && options.union.length > 0) {
-    keyParts.push("union", options.union.map((os) => chunkVDAI3GGL_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkVDAI3GGL_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkVDAI3GGL_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -186,13 +186,13 @@ function computeObjectSetCacheKey(objectSet, options) {
 }
 
 // src/observable/ObservableClient.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/ObservableClientImpl.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/UnsubscribableWrapper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var UnsubscribableWrapper = class {
   #subscription;
   constructor(subscription) {
@@ -231,6 +231,20 @@ var ObservableClientImpl = class {
   observeAggregation = (options, subFn) => {
     return this.__experimentalStore.aggregations.observe(options, subFn);
   };
+  observeFunction = (queryDef, params, options, subFn) => {
+    const dependsOn = options.dependsOn?.map((dep) => typeof dep === "string" ? dep : dep.apiName);
+    const dependsOnObjects = options.dependsOnObjects?.map((obj) => ({
+      $apiName: obj.$apiName,
+      $primaryKey: obj.$primaryKey
+    }));
+    return this.__experimentalStore.functions.observe({
+      ...options,
+      queryDef,
+      params,
+      dependsOn,
+      dependsOnObjects
+    }, subFn);
+  };
   observeLinks = (objects, linkName, options, subFn) => {
     const objectsArray = Array.isArray(objects) ? objects : [objects];
     const parentSub = new rxjs.Subscription();
@@ -271,27 +285,33 @@ var ObservableClientImpl = class {
   invalidateObjectType(type) {
     return this.__experimentalStore.invalidateObjectType(type, void 0);
   }
+  invalidateFunction(apiName, params) {
+    return this.__experimentalStore.invalidateFunction(apiName, params);
+  }
+  invalidateFunctionsByObject(apiName, primaryKey) {
+    return this.__experimentalStore.invalidateFunctionsByObject(apiName, primaryKey);
+  }
   canonicalizeWhereClause(where) {
     return this.__experimentalStore.whereCanonicalizer.canonicalize(where);
   }
 };
 
 // src/observable/internal/Store.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/DebugFlags.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 process.env.NODE_ENV !== "production" && false;
 var DEBUG_CACHE_KEYS = process.env.NODE_ENV !== "production" && false;
 
 // src/observable/internal/actions/ActionApplication.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/actions/OptimisticJob.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/OptimisticId.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function createOptimisticId() {
   if (process.env.NODE_ENV !== "production") {
     if (createOptimisticId.counter === void 0) {
@@ -351,12 +371,12 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkVDAI3GGL_cjs.additionalContext].objectFactory2(store.client[chunkVDAI3GGL_cjs.additionalContext], [{
+        const create = store.client[chunkRDZ5NKAI_cjs.additionalContext].objectFactory2(store.client[chunkRDZ5NKAI_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
           ...properties
-        }], void 0, {}).then((objs) => {
+        }], void 0, {}, void 0).then((objs) => {
           return objs[0];
         });
         addedObjectPromises.push(create);
@@ -418,7 +438,7 @@ var ActionApplication = class {
         if (process.env.NODE_ENV !== "production") {
           if (ACTION_DELAY > 0) {
             logger?.debug("action done, pausing", actionResults);
-            const delay = (await import('../delay-KIUUJ5NJ.cjs')).default;
+            const delay = (await import('../delay-W2TSML2P.cjs')).default;
             await delay(ACTION_DELAY);
             logger?.debug("action done, pausing done");
           }
@@ -433,13 +453,17 @@ var ActionApplication = class {
       }
     })();
   };
-  #invalidateActionEditResponse = async ({
-    deletedObjects,
-    modifiedObjects,
-    addedObjects,
-    editedObjectTypes,
-    type
-  }) => {
+  #invalidateActionEditResponse = async (actionEditResponse) => {
+    if (actionEditResponse == null) {
+      return;
+    }
+    const {
+      deletedObjects,
+      modifiedObjects,
+      addedObjects,
+      editedObjectTypes,
+      type
+    } = actionEditResponse;
     let changes;
     if (type === "edits") {
       const promisesToWait = [];
@@ -477,20 +501,20 @@ var ActionApplication = class {
 };
 
 // src/observable/internal/aggregation/AggregationCacheKey.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var API_NAME_IDX = 1;
 var WHERE_IDX = 2;
 var RDP_IDX = 3;
 var AGGREGATE_IDX = 4;
 
 // src/observable/internal/aggregation/AggregationsHelper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/AbstractHelper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/QuerySubscription.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var subscriptionIdCounter = 0;
 var QuerySubscription = class extends UnsubscribableWrapper {
   /** @internal */
@@ -549,13 +573,13 @@ var AbstractHelper = class {
 };
 
 // src/observable/internal/aggregation/ObjectAggregationQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/aggregation/AggregationQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/Query.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var Query = class {
   retainCount = 0;
   #connectable;
@@ -569,7 +593,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkVDAI3GGL_cjs.additionalContext].logger : store.client[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger : store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -727,7 +751,7 @@ var Query = class {
 // src/observable/internal/aggregation/AggregationQuery.ts
 var AggregationQuery = class extends Query {
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -836,7 +860,7 @@ var AggregationsHelper = class extends AbstractHelper {
 };
 
 // src/observable/internal/CacheKey.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function DEBUG_ONLY__cacheKeyToString(x) {
   if (process.env.NODE_ENV !== "production") {
     return `${x.type}CacheKey<${x.otherKeys.map((xx) => JSON.stringify(xx)).join(", ")}>`.replaceAll('"', "'");
@@ -853,10 +877,10 @@ function DEBUG_ONLY__cacheKeysToString(x) {
 }
 
 // src/observable/internal/CacheKeys.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/RefCounts.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var RefCounts = class {
   refCounts = /* @__PURE__ */ new Map();
   // keeps our objects around for some extended duration after they are no longer
@@ -966,7 +990,7 @@ var CacheKeys = class {
 };
 
 // src/observable/internal/Changes.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var Changes = class {
   modifiedObjects = new mnemonist.MultiMap();
   addedObjects = new mnemonist.MultiMap();
@@ -992,6 +1016,9 @@ var Changes = class {
   registerObjectSet = (key) => {
     this.modified.add(key);
   };
+  registerFunction = (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;
   }
@@ -1020,11 +1047,329 @@ function multimapHelper(multimap) {
   }));
 }
 
+// src/observable/internal/function/FunctionsHelper.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+
+// src/observable/internal/function/FunctionCacheKey.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+var PARAMS_IDX = 2;
+
+// src/observable/internal/function/FunctionParamsCanonicalizer.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+function isPrimitiveValue(value) {
+  if (value == null) return true;
+  const t = typeof value;
+  return t === "string" || t === "number" || t === "boolean" || t === "bigint";
+}
+var FunctionParamsCanonicalizer = class {
+  #inputCache = /* @__PURE__ */ new WeakMap();
+  #trie = new trie.Trie(false);
+  #canonicalByMarker = /* @__PURE__ */ new WeakMap();
+  canonicalize(params) {
+    if (params == null) {
+      return void 0;
+    }
+    if (this.#inputCache.has(params)) {
+      return this.#inputCache.get(params);
+    }
+    const seen = /* @__PURE__ */ new WeakSet();
+    const path = [];
+    const canonicalValue = this.#encodeAndBuild(params, path, seen);
+    const marker = this.#trie.lookupArray(path);
+    let canonical = this.#canonicalByMarker.get(marker);
+    if (canonical === void 0) {
+      canonical = canonicalValue;
+      this.#canonicalByMarker.set(marker, canonical);
+    }
+    this.#inputCache.set(params, canonical);
+    return canonical;
+  }
+  #encodeAndBuild(value, path, seen) {
+    if (value == null) {
+      path.push(value);
+      return value;
+    }
+    if (isPrimitiveValue(value)) {
+      path.push(value);
+      return value;
+    }
+    if (seen.has(value)) {
+      throw new Error("Circular reference in function parameters");
+    }
+    seen.add(value);
+    if (value instanceof Date) {
+      const iso = value.toISOString();
+      path.push("$:date", iso);
+      return iso;
+    }
+    if (Array.isArray(value)) {
+      path.push("$:array");
+      const arr = value.map((item) => this.#encodeAndBuild(item, path, seen));
+      path.push("$:array_end");
+      return arr;
+    }
+    if (value instanceof Set) {
+      path.push("$:set");
+      const sorted = this.#sortSetValues(Array.from(value));
+      const arr = sorted.map((item) => this.#encodeAndBuild(item, path, seen));
+      path.push("$:set_end");
+      return arr;
+    }
+    if (value instanceof Map) {
+      path.push("$:map");
+      const sorted = this.#sortMapEntries(Array.from(value.entries()));
+      const arr = sorted.map(([k, v]) => [this.#encodeAndBuild(k, path, seen), this.#encodeAndBuild(v, path, seen)]);
+      path.push("$:map_end");
+      return arr;
+    }
+    if (chunk666JN2DO_cjs.isObjectSpecifiersObject(value)) {
+      path.push("$:osdk", value.$apiName, value.$primaryKey);
+      return {
+        $apiName: value.$apiName,
+        $primaryKey: value.$primaryKey
+      };
+    }
+    if (chunkRDZ5NKAI_cjs.isObjectSet(value)) {
+      const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(value);
+      path.push("$:objectset", wire);
+      return wire;
+    }
+    const obj = value;
+    path.push("$:object");
+    const canonical = {};
+    for (const key of Object.keys(obj).sort()) {
+      path.push(key);
+      canonical[key] = this.#encodeAndBuild(obj[key], path, seen);
+    }
+    path.push("$:object_end");
+    return canonical;
+  }
+  #comparePrimitives(a, b) {
+    const ta = typeof a;
+    const tb = typeof b;
+    if (ta !== tb) return ta.localeCompare(tb);
+    if (ta === "string") return a.localeCompare(b);
+    if (ta === "number") {
+      const an = a;
+      const bn = b;
+      if (Number.isNaN(an) && Number.isNaN(bn)) return 0;
+      if (Number.isNaN(an)) return 1;
+      if (Number.isNaN(bn)) return -1;
+      return an - bn;
+    }
+    if (ta === "boolean") return (a ? 1 : 0) - (b ? 1 : 0);
+    if (ta === "bigint") {
+      const ab = a;
+      const bb = b;
+      return ab < bb ? -1 : ab > bb ? 1 : 0;
+    }
+    return 0;
+  }
+  #sortSetValues(items) {
+    return items.slice().sort((a, b) => {
+      if (isPrimitiveValue(a) && isPrimitiveValue(b)) {
+        return this.#comparePrimitives(a, b);
+      }
+      return JSON.stringify(a).localeCompare(JSON.stringify(b));
+    });
+  }
+  #sortMapEntries(entries) {
+    return entries.slice().sort(([a], [b]) => {
+      if (isPrimitiveValue(a) && isPrimitiveValue(b)) {
+        return this.#comparePrimitives(a, b);
+      }
+      return JSON.stringify(a).localeCompare(JSON.stringify(b));
+    });
+  }
+};
+
+// src/observable/internal/function/FunctionQuery.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+var FunctionQuery = class extends Query {
+  #apiName;
+  #version;
+  #params;
+  #dependsOn;
+  #dependsOnObjects;
+  #queryDef;
+  constructor(store, subject, queryDef, params, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
+      msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
+    }) : void 0);
+    this.#apiName = queryDef.apiName;
+    this.#version = queryDef.isFixedVersion ? queryDef.version : void 0;
+    this.#params = params;
+    this.#dependsOn = opts.dependsOn;
+    this.#dependsOnObjects = opts.dependsOnObjects;
+    this.#queryDef = queryDef;
+  }
+  _createConnectable(subject) {
+    return rxjs.connectable(subject.pipe(rxjs.map((x) => {
+      const value = x.value;
+      return {
+        status: x.status,
+        result: value?.result,
+        lastUpdated: value?.executedAt ?? 0,
+        error: value?.error
+      };
+    })), {
+      connector: () => new rxjs.BehaviorSubject({
+        status: "init",
+        result: void 0,
+        lastUpdated: 0
+      })
+    });
+  }
+  async _fetchAndStore() {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "_fetchAndStore"
+      }).debug("calling _fetchAndStore");
+    }
+    try {
+      const result = await chunk666JN2DO_cjs.applyQuery(this.store.client[chunkRDZ5NKAI_cjs.additionalContext], this.#queryDef, this.#params);
+      const executedAt = Date.now();
+      this.store.batch({}, (batch) => {
+        this.writeToStore({
+          result,
+          executedAt
+        }, "loaded", batch);
+      });
+    } catch (e) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "_fetchAndStore"
+        }).error("Error executing function", e);
+      }
+      const error = e instanceof Error ? e : new Error(String(e));
+      this.store.batch({}, (batch) => {
+        this.writeToStore({
+          result: void 0,
+          executedAt: 0,
+          error
+        }, "error", batch);
+      });
+    }
+  }
+  writeToStore(data, status, batch) {
+    batch.write(this.cacheKey, data, status);
+    return batch.read(this.cacheKey);
+  }
+  invalidateObjectType = (objectType, changes) => {
+    if (this.#dependsOn?.includes(objectType)) {
+      changes?.registerFunction(this.cacheKey);
+      return this.revalidate(true);
+    }
+    return Promise.resolve();
+  };
+  dependsOnObject(apiName, primaryKey) {
+    if (!this.#dependsOnObjects) {
+      return false;
+    }
+    return this.#dependsOnObjects.some((obj) => obj.$apiName === apiName && obj.$primaryKey === primaryKey);
+  }
+  /**
+   * Called during batch operations when objects change.
+   * Checks if any objects in dependsOnObjects were modified/added
+   * and triggers revalidation if so.
+   */
+  maybeUpdateAndRevalidate = (changes, _optimisticId) => {
+    if (!this.#dependsOnObjects?.length) {
+      return void 0;
+    }
+    for (const dep of this.#dependsOnObjects) {
+      const modifiedObjects = changes.modifiedObjects.get(dep.$apiName);
+      if (modifiedObjects?.some((obj) => obj.$primaryKey === dep.$primaryKey)) {
+        return this.revalidate(true);
+      }
+      const addedObjects = changes.addedObjects.get(dep.$apiName);
+      if (addedObjects?.some((obj) => obj.$primaryKey === dep.$primaryKey)) {
+        return this.revalidate(true);
+      }
+    }
+    return void 0;
+  };
+  get apiName() {
+    return this.#apiName;
+  }
+  get version() {
+    return this.#version;
+  }
+};
+
+// src/observable/internal/function/FunctionsHelper.ts
+var FunctionsHelper = class extends AbstractHelper {
+  paramsCanonicalizer = new FunctionParamsCanonicalizer();
+  constructor(store, cacheKeys) {
+    super(store, cacheKeys);
+  }
+  observe(options, subFn) {
+    return super.observe(options, subFn);
+  }
+  getQuery(options) {
+    const {
+      queryDef,
+      params,
+      ...observeOpts
+    } = options;
+    const apiName = queryDef.apiName;
+    const version = queryDef.isFixedVersion ? queryDef.version : void 0;
+    const canonicalParams = this.paramsCanonicalizer.canonicalize(params);
+    const functionCacheKey = this.cacheKeys.get("function", apiName, version, canonicalParams);
+    return this.store.queries.get(functionCacheKey, () => new FunctionQuery(this.store, this.store.subjects.get(functionCacheKey), queryDef, params, functionCacheKey, observeOpts));
+  }
+  async invalidateFunction(apiName, params) {
+    const functionApiName = typeof apiName === "string" ? apiName : apiName.apiName;
+    let canonicalParams;
+    if (params !== void 0) {
+      canonicalParams = this.paramsCanonicalizer.canonicalize(params);
+    }
+    const promises = [];
+    for (const cacheKey of this.store.queries.keys()) {
+      if (cacheKey.type !== "function") {
+        continue;
+      }
+      const query = this.store.queries.peek(cacheKey);
+      if (!query) {
+        continue;
+      }
+      if (query.apiName !== functionApiName) {
+        continue;
+      }
+      if (canonicalParams !== void 0) {
+        const queryCacheKey = cacheKey;
+        const queryParams = queryCacheKey.otherKeys[PARAMS_IDX];
+        if (queryParams !== canonicalParams) {
+          continue;
+        }
+      }
+      promises.push(query.revalidate(true));
+    }
+    await Promise.allSettled(promises);
+  }
+  async invalidateFunctionsByObject(apiName, primaryKey) {
+    const promises = [];
+    for (const cacheKey of this.store.queries.keys()) {
+      if (cacheKey.type !== "function") {
+        continue;
+      }
+      const query = this.store.queries.peek(cacheKey);
+      if (!query) {
+        continue;
+      }
+      if (query.dependsOnObject(apiName, primaryKey)) {
+        promises.push(query.revalidate(true));
+      }
+    }
+    await Promise.allSettled(promises);
+  }
+};
+
 // src/observable/internal/IntersectCanonicalizer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/Canonicalizer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var CachingCanonicalizer = class {
   /**
    * Cache for input object identity.
@@ -1070,10 +1415,10 @@ var IntersectCanonicalizer = class extends CachingCanonicalizer {
 };
 
 // src/observable/internal/Layers.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/createInitEntry.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function createInitEntry(cacheKey) {
   return {
     cacheKey,
@@ -1084,10 +1429,10 @@ function createInitEntry(cacheKey) {
 }
 
 // src/observable/internal/Layer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/WeakMapWithEntries.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var WeakMapWithEntries = class {
   #map = /* @__PURE__ */ new WeakMap();
   #list = [];
@@ -1236,7 +1581,7 @@ var Layer = class _Layer {
 };
 
 // src/observable/internal/Subjects.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var Subjects = class {
   #layers;
   // we can use a regular Map here because the refCounting will
@@ -1274,7 +1619,7 @@ var Subjects = class {
 };
 
 // src/observable/internal/tombstone.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var tombstone = void 0;
 
 // src/observable/internal/Layers.ts
@@ -1301,7 +1646,7 @@ var Layers = class {
     return this.#truthLayer;
   }
   remove(layerId) {
-    !(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;
+    !(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;
     let currentLayer = this.#topLayer;
     const cacheKeys = /* @__PURE__ */ new Map();
     while (currentLayer != null && currentLayer.parentLayer != null) {
@@ -1329,7 +1674,7 @@ var Layers = class {
     optimisticId,
     changes
   }, batchFn) {
-    !(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;
+    !(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;
     const batchContext = this.#createBatchContext({
       optimisticId,
       changes
@@ -1395,22 +1740,22 @@ var Layers = class {
 };
 
 // src/observable/internal/links/LinksHelper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/links/SpecificLinkQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/base-list/BaseListQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/isObjectInstance.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function isObjectInstance(item) {
   return item != null && typeof item === "object" && "$primaryKey" in item;
 }
 
 // src/observable/internal/list/ListCacheKey.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var API_NAME_IDX2 = 1;
 var WHERE_IDX2 = 2;
 var ORDER_BY_IDX = 3;
@@ -1419,7 +1764,7 @@ var INTERSECT_IDX = 5;
 var PIVOT_IDX = 6;
 
 // src/observable/internal/sorting/SortingStrategy.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var NoOpSortingStrategy = class {
   sortCacheKeys(objectCacheKeys, _batch) {
     return objectCacheKeys;
@@ -1467,7 +1812,7 @@ function createOrderBySortFns(orderBy) {
 }
 
 // src/observable/internal/base-list/createCollectionConnectable.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function createCollectionConnectable(subject, subjects, createPayload) {
   return rxjs.connectable(subject.pipe(rxjs.switchMap((listEntry) => {
     const resolvedData = listEntry?.value?.data == null || listEntry.value.data.length === 0 ? rxjs.of([]) : rxjs.combineLatest(listEntry.value.data.map((cacheKey) => subjects.get(cacheKey).pipe(rxjs.map((objectEntry) => objectEntry?.value), rxjs.distinctUntilChanged())));
@@ -1489,7 +1834,7 @@ function createCollectionConnectable(subject, subjects, createPayload) {
 }
 
 // src/observable/internal/base-list/removeDuplicates.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function removeDuplicates(objectCacheKeys, batch) {
   const visited = /* @__PURE__ */ new Set();
   return objectCacheKeys.filter((key) => {
@@ -1690,7 +2035,7 @@ var BaseListQuery = class extends Query {
       this.setStatus("loading", batch);
     });
     this.pendingFetch = this.fetchPageAndUpdate("loaded", this.abortController?.signal).then(() => void 0).finally(() => {
-      this.pendingPageFetch = void 0;
+      this.pendingFetch = void 0;
     });
     return this.pendingFetch;
   };
@@ -1978,11 +2323,10 @@ 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[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `SpecificLinkQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     [this.#sourceApiName, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
-    this.sortingStrategy = new OrderBySortingStrategy(this.#linkName, this.#orderBy);
   }
   // _fetchAndStore is now implemented in BaseCollectionQuery
   /**
@@ -1995,7 +2339,14 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkVDAI3GGL_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkRDZ5NKAI_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
+      const linkDef = sourceMetadata.links?.[this.#linkName];
+      if (!linkDef?.targetType) {
+        throw new Error(`Missing link definition or targetType for link '${this.#linkName}' on object type '${this.#sourceApiName}'`);
+      }
+      this.sortingStrategy = new OrderBySortingStrategy(linkDef.targetType, this.#orderBy);
+    }
     const sourceQuery = client(sourceObjectDef).where({
       [sourceMetadata.primaryKeyApiName]: this.#sourcePk
     });
@@ -2059,7 +2410,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkVDAI3GGL_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkRDZ5NKAI_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -2091,19 +2442,175 @@ var LinksHelper = class extends AbstractHelper {
 };
 
 // src/observable/internal/list/ListsHelper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/list/InterfaceListQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/list/ListQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+
+// src/observable/internal/getObjectTypesThatInvalidate.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+async function getObjectTypesThatInvalidate(mc, objectSet) {
+  const counts = {};
+  const resultType = await calcObjectSet(objectSet, {
+    counts,
+    methodInput: void 0,
+    ontologyProvider: mc.ontologyProvider
+  });
+  const tweaked = {
+    ...counts,
+    [resultType.apiName]: counts[resultType.apiName] - 1
+  };
+  return {
+    resultType,
+    counts,
+    invalidationSet: new Set(Object.entries(tweaked).filter(([, v]) => v > 0).map(([k]) => k))
+  };
+}
+async function calcObjectSet(os, ctx) {
+  const op = ctx.ontologyProvider;
+  async function bumpObject(apiName) {
+    const objectType = await op.getObjectDefinition(apiName);
+    ctx.counts[apiName] = (ctx.counts[apiName] ?? 0) + 1;
+    return objectType;
+  }
+  async function bumpInterface(apiName) {
+    const interfaceDef = await op.getInterfaceDefinition(apiName);
+    for (const s of interfaceDef.implementedBy ?? []) {
+      ctx.counts[s] = (ctx.counts[s] ?? 0) + 1;
+    }
+    return interfaceDef;
+  }
+  switch (os.type) {
+    case "base":
+      return await bumpObject(os.objectType);
+    case "interfaceBase":
+      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;
+      for (const [k, v] of Object.entries(srcDef.links)) {
+        if (k === os.interfaceLink) {
+          if (v.targetType === "object") {
+            return await bumpObject(v.targetType);
+          }
+          return await bumpInterface(v.targetType);
+        }
+      }
+      throw new Error(`Could not find link ${os.interfaceLink} in object set ${JSON.stringify(os.objectSet)}`);
+    }
+    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;
+      for (const [k, v] of Object.entries(contextDef.links)) {
+        if (k === os.link) {
+          return await bumpObject(v.targetType);
+        }
+      }
+      throw new Error(`Could not find link ${os.link} in object set ${JSON.stringify(os.objectSet)}`);
+    }
+    case "filter":
+      return calcObjectSet(os.objectSet, ctx);
+    case "union":
+    case "subtract":
+    case "intersect":
+      const returnTypes = await Promise.all(os.objectSets.map(async (os2) => {
+        const counts = {};
+        const r = await calcObjectSet(os2, {
+          ...ctx,
+          counts
+        });
+        return {
+          r,
+          counts
+        };
+      }));
+      for (const {
+        counts
+      } of returnTypes) {
+        for (const [k, v] of Object.entries(counts)) {
+          ctx.counts[k] = Math.max(ctx.counts[k] ?? 0, v);
+        }
+      }
+      if (returnTypes.length === 0) {
+        throw new Error(`Could not find any context types for set operation`);
+      }
+      const allMatch = returnTypes.every(({
+        r
+      }) => r.apiName === returnTypes[0].r.apiName);
+      if (!allMatch) {
+        throw new Error(`Incompatible context types found for set operation`);
+      }
+      return returnTypes[0].r;
+    case "withProperties":
+      for (const [, v] of Object.entries(os.derivedProperties)) {
+        await calcRdp(v, {
+          ...ctx,
+          methodInput: os.objectSet
+        });
+      }
+      return calcObjectSet(os.objectSet, {
+        ...ctx,
+        methodInput: os.objectSet
+      });
+    // 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;
+      return await calcObjectSet(ctx.methodInput, {
+        ...ctx,
+        counts: {}
+      });
+    case "asType":
+    // we don't currently support this anywhere.
+    case "asBaseObjectTypes":
+    // We don't currently support this because it could return multiple object types conceptually
+    // internally, we actually use it this way but we shouldn't be finding that object sets.
+    case "reference":
+    // reference is particularly problematic because we cannot answer the question about
+    // which types without loading the object set definition (and it can change).
+    case "static":
+      throw new Error(`Unsupported ObjectSet type ${os.type}`);
+    case "nearestNeighbors":
+      return calcObjectSet(os.objectSet, ctx);
+    default:
+      throw new Error(`Unhandled ObjectSet type ${os.type}`);
+  }
+}
+async function calcRdp(dpd, ctx) {
+  switch (dpd.type) {
+    // Operates on object sets
+    case "selection":
+      return await calcObjectSet(dpd.objectSet, ctx);
+    // Operates on single property
+    case "negate":
+    case "extract":
+    case "absoluteValue":
+      return await calcRdp(dpd.property, ctx);
+    // Operates on many (unordered) properties
+    case "least":
+    case "greatest":
+    case "add":
+    case "multiply":
+      return await Promise.all(dpd.properties.map((innerDpd) => calcRdp(innerDpd, ctx)));
+    // Operates on 2 ordered properties
+    case "subtract":
+    case "divide":
+      return await Promise.all([calcRdp(dpd.left, ctx), calcRdp(dpd.right, ctx)]);
+    // Operates on a single property name
+    case "property":
+      return;
+    default:
+      throw new Error(`Unhandled DerivedPropertyDefinition type ${dpd.type}`);
+  }
+}
 
 // src/observable/internal/objectMatchesWhereClause.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/evaluateFilter.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function evaluateFilter(f, realValue, expected, strict) {
   switch (f) {
     case "$eq":
@@ -2133,7 +2640,7 @@ function evaluateFilter(f, realValue, expected, strict) {
       return !strict;
     default:
       if (process.env.NODE_ENV !== "production") {
-        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Unknown where filter ${f}`) : invariant4__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Unknown where filter ${f}`) : invariant5__default.default(false) ;
       }
       return !strict;
   }
@@ -2143,8 +2650,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" ? 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;
+      !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;
     }
   }
   return "$and" in whereClause;
@@ -2152,8 +2659,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" ? 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;
+      !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;
     }
   }
   return "$or" in whereClause;
@@ -2161,7 +2668,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" ? invariant4__default.default(false, "expected only $not to be present") : invariant4__default.default(false) : void 0;
+      !(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;
     }
   }
   return "$not" in whereClause;
@@ -2211,7 +2718,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[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -2220,7 +2727,9 @@ var ListQuery = class extends BaseListQuery {
     this.#intersectWith = cacheKey.otherKeys[INTERSECT_IDX];
     this.#pivotInfo = cacheKey.otherKeys[PIVOT_IDX];
     this.#objectSet = this.createObjectSet(store);
-    this.sortingStrategy = new OrderBySortingStrategy(this.apiName, this.#orderBy);
+    if (!this.#pivotInfo) {
+      this.sortingStrategy = new OrderBySortingStrategy(this.apiName, this.#orderBy);
+    }
     if (opts.autoFetchMore === true) {
       this.minResultsToLoad = Number.MAX_SAFE_INTEGER;
     } else if (typeof opts.autoFetchMore === "number") {
@@ -2246,6 +2755,13 @@ var ListQuery = class extends BaseListQuery {
    * Fetches a page of data
    */
   async fetchPageData(signal) {
+    if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
+      const wireObjectSet = chunkRDZ5NKAI_cjs.getWireObjectSet(this.#objectSet);
+      const {
+        resultType
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkRDZ5NKAI_cjs.additionalContext], wireObjectSet);
+      this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
+    }
     const resp = await this.#objectSet.fetchPage({
       $nextPageToken: this.nextPageToken,
       $pageSize: this.options.pageSize,
@@ -2424,7 +2940,7 @@ var ListQuery = class extends BaseListQuery {
     }) : this.logger;
     this.store.batch({}, (batch) => {
       const existing = batch.read(this.cacheKey);
-      !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;
+      !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;
       if (existing.status === "loaded") {
         const objectCacheKey = this.getObjectCacheKey(objOrIface);
         const newObjects = existing.value?.data.filter((o) => o !== objectCacheKey);
@@ -2491,7 +3007,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkWQL7SQ7H_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunk666JN2DO_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));
@@ -2512,7 +3028,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][chunkWQL7SQ7H_cjs.UnderlyingOsdkObject][chunkWQL7SQ7H_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunk666JN2DO_cjs.UnderlyingOsdkObject][chunk666JN2DO_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -2522,14 +3038,14 @@ 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" ? invariant4__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant4__default.default(false) : void 0;
+    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant5__default.default(false) : void 0;
     return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
   });
   return data;
 }
 
 // src/observable/internal/list/ObjectListQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var ObjectListQuery = class extends ListQuery {
   createObjectSet(store) {
     const rdpConfig = this.cacheKey.otherKeys[RDP_IDX2];
@@ -2654,40 +3170,39 @@ var ListsHelper = class extends AbstractHelper {
 };
 
 // src/observable/internal/object/ObjectCacheKey.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var API_NAME_IDX3 = 0;
 var RDP_CONFIG_IDX = 2;
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/utils/rdpFieldOperations.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function extractRdpFieldNames(rdpConfig) {
   if (!rdpConfig) {
     return /* @__PURE__ */ new Set();
   }
   return new Set(Object.keys(rdpConfig));
 }
-function deleteField(obj, field) {
-  const mutableObj = obj;
-  delete mutableObj[field];
-}
-function setField(obj, field, value) {
-  const mutableObj = obj;
-  mutableObj[field] = value;
-}
 function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const result = {
-    ...value
+  const underlying = value[chunk666JN2DO_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunk666JN2DO_cjs.ObjectDefRef];
+  const newProps = {
+    $apiName: underlying.$apiName,
+    $objectType: underlying.$objectType,
+    $primaryKey: underlying.$primaryKey,
+    $title: underlying.$title
   };
-  for (const field of rdpFields) {
-    deleteField(result, field);
+  for (const key of Object.keys(underlying)) {
+    if (key in objectDef.properties && !rdpFields.has(key)) {
+      newProps[key] = underlying[key];
+    }
   }
-  return result;
+  return chunk666JN2DO_cjs.createOsdkObject(value[chunk666JN2DO_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -2697,17 +3212,24 @@ function isSuperset(superset, subset) {
   }
   return true;
 }
-function filterToFields(value, allowedFields) {
-  const result = {
-    ...value
+function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
+  const underlying = value[chunk666JN2DO_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunk666JN2DO_cjs.ObjectDefRef];
+  const newProps = {
+    $apiName: underlying.$apiName,
+    $objectType: underlying.$objectType,
+    $primaryKey: underlying.$primaryKey,
+    $title: underlying.$title
   };
-  const allFields = Object.keys(result);
-  for (const field of allFields) {
-    if (!allowedFields.has(field)) {
-      deleteField(result, field);
+  for (const key of Object.keys(underlying)) {
+    if (key in objectDef.properties) {
+      const isRdpField = sourceRdpFields.has(key);
+      if (!isRdpField || rdpFieldsToKeep.has(key)) {
+        newProps[key] = underlying[key];
+      }
     }
   }
-  return result;
+  return chunk666JN2DO_cjs.createOsdkObject(value[chunk666JN2DO_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -2717,20 +3239,30 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     if (sourceRdpFields.size === targetRdpFields.size) {
       return sourceValue;
     }
-    return filterToFields(sourceValue, targetRdpFields);
+    return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const merged = {
-    ...sourceValue
+  const sourceUnderlying = sourceValue[chunk666JN2DO_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunk666JN2DO_cjs.ObjectDefRef];
+  const newProps = {
+    $apiName: sourceUnderlying.$apiName,
+    $objectType: sourceUnderlying.$objectType,
+    $primaryKey: sourceUnderlying.$primaryKey,
+    $title: sourceUnderlying.$title
   };
+  for (const key of Object.keys(sourceUnderlying)) {
+    if (key in objectDef.properties && (!sourceRdpFields.has(key) || targetRdpFields.has(key))) {
+      newProps[key] = sourceUnderlying[key];
+    }
+  }
   if (targetCurrentValue) {
-    const targetAsRecord = targetCurrentValue;
+    const targetUnderlying = targetCurrentValue[chunk666JN2DO_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
-      if (!sourceRdpFields.has(field) && field in targetCurrentValue) {
-        setField(merged, field, targetAsRecord[field]);
+      if (!sourceRdpFields.has(field) && field in targetUnderlying) {
+        newProps[field] = targetUnderlying[field];
       }
     }
   }
-  return merged;
+  return chunk666JN2DO_cjs.createOsdkObject(sourceValue[chunk666JN2DO_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -2830,16 +3362,16 @@ var ObjectCacheKeyRegistry = class {
 };
 
 // src/observable/internal/object/ObjectsHelper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/object/ObjectQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/BulkObjectLoader.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // ../../node_modules/.pnpm/p-defer@4.0.1/node_modules/p-defer/index.js
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function pDefer() {
   const deferred = {};
   deferred.promise = new Promise((resolve, reject) => {
@@ -2865,7 +3397,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkVDAI3GGL_cjs.additionalContext].logger;
+    this.#logger = client[chunkRDZ5NKAI_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -2933,7 +3465,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[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -3071,27 +3603,23 @@ var ObjectsHelper = class extends AbstractHelper {
 };
 
 // src/observable/internal/objectset/ObjectSetHelper.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // src/observable/internal/objectset/ObjectSetQuery.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 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[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkRDZ5NKAI_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);
-    }
     if (opts.autoFetchMore === true) {
       this.minResultsToLoad = Number.MAX_SAFE_INTEGER;
     } else if (typeof opts.autoFetchMore === "number") {
@@ -3130,7 +3658,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkVDAI3GGL_cjs.getWireObjectSet(os);
+        const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3138,7 +3666,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkVDAI3GGL_cjs.getWireObjectSet(os);
+        const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3146,7 +3674,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkVDAI3GGL_cjs.getWireObjectSet(os);
+        const wire = chunkRDZ5NKAI_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3165,6 +3693,13 @@ var ObjectSetQuery = class extends BaseListQuery {
    * Fetches a page of data from the composed ObjectSet
    */
   async fetchPageData(signal) {
+    if (this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
+      const wireObjectSet = chunkRDZ5NKAI_cjs.getWireObjectSet(this.#composedObjectSet);
+      const {
+        resultType
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkRDZ5NKAI_cjs.additionalContext], wireObjectSet);
+      this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#operations.orderBy);
+    }
     const resp = await this.#composedObjectSet.fetchPage({
       $nextPageToken: this.nextPageToken,
       $pageSize: this.options.pageSize,
@@ -3227,7 +3762,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkVDAI3GGL_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -3243,13 +3778,13 @@ var ObjectSetHelper = class extends AbstractHelper {
       operations.withProperties = Object.keys(options.withProperties).sort();
     }
     if (options.union && options.union.length > 0) {
-      operations.union = options.union.map((os) => JSON.stringify(chunkVDAI3GGL_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkVDAI3GGL_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkVDAI3GGL_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkRDZ5NKAI_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -3265,7 +3800,7 @@ var ObjectSetHelper = class extends AbstractHelper {
 };
 
 // src/observable/internal/PivotCanonicalizer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var PivotCanonicalizer = class {
   #cache = /* @__PURE__ */ new Map();
   canonicalize(sourceType, linkName) {
@@ -3284,7 +3819,7 @@ var PivotCanonicalizer = class {
 };
 
 // src/observable/internal/Queries.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var Queries = class {
   // we can use a regular Map here because the refCounting will
   // handle cleanup.
@@ -3310,7 +3845,7 @@ var Queries = class {
 };
 
 // src/observable/internal/RdpCanonicalizer.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 var RdpCanonicalizer = class extends CachingCanonicalizer {
   structuralCache = /* @__PURE__ */ new Map();
   lookupOrCreate(rdp) {
@@ -3321,7 +3856,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkVDAI3GGL_cjs.createWithPropertiesObjectSet(
+      const builder = chunkRDZ5NKAI_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -3372,7 +3907,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkVDAI3GGL_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkRDZ5NKAI_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -3380,6 +3915,7 @@ var Store = class {
       onDestroy: this.#cleanupCacheKey
     });
     this.aggregations = new AggregationsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.rdpCanonicalizer);
+    this.functions = new FunctionsHelper(this, this.cacheKeys);
     this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.intersectCanonicalizer, this.pivotCanonicalizer);
     this.objects = new ObjectsHelper(this, this.cacheKeys);
     this.links = new LinksHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
@@ -3392,7 +3928,7 @@ var Store = class {
   #cleanupCacheKey = (key) => {
     const subject = this.subjects.peek(key);
     if (process.env.NODE_ENV !== "production") {
-      !subject ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false) : invariant4__default.default(false) : void 0;
+      !subject ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
     }
     this.subjects.delete(key);
     this.queries.delete(key);
@@ -3634,14 +4170,20 @@ var Store = class {
     }
     return Promise.allSettled(promises).then(() => void 0);
   }
+  async invalidateFunction(apiName, params) {
+    return this.functions.invalidateFunction(apiName, params);
+  }
+  async invalidateFunctionsByObject(apiName, primaryKey) {
+    return this.functions.invalidateFunctionsByObject(apiName, primaryKey);
+  }
 };
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkWQL7SQ7H_cjs.createClientFromContext({
-    ...client[chunkVDAI3GGL_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkVDAI3GGL_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkWQL7SQ7H_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunk666JN2DO_cjs.createClientFromContext({
+    ...client[chunkRDZ5NKAI_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkRDZ5NKAI_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk666JN2DO_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -3649,7 +4191,7 @@ function createObservableClient(client) {
 }
 
 // src/public-utils/osdkConfig.ts
-chunk6SCDLAU2_cjs.init_cjs_shims();
+chunkLDTMSHUZ_cjs.init_cjs_shims();
 function getMetaTagContent(name) {
   const element = document.querySelector(`meta[name="${name}"]`);
   const val = element ? element.getAttribute("content") : null;
@@ -3685,11 +4227,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkWQL7SQ7H_cjs.createClientWithTransaction; }
+  get: function () { return chunk666JN2DO_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkVDAI3GGL_cjs.augment; }
+  get: function () { return chunkRDZ5NKAI_cjs.augment; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;