@osdk/client 2.7.0-beta.8 → 2.7.0-rc.15

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var chunkFL7QZC57_cjs = require('../chunk-FL7QZC57.cjs');
-var chunkPARVKNVB_cjs = require('../chunk-PARVKNVB.cjs');
+var chunkCDUYWOVQ_cjs = require('../chunk-CDUYWOVQ.cjs');
+var chunkY362HOIZ_cjs = require('../chunk-Y362HOIZ.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,7 +15,7 @@ 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
@@ -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", chunkPARVKNVB_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkY362HOIZ_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) => chunkPARVKNVB_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkY362HOIZ_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkPARVKNVB_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkY362HOIZ_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkPARVKNVB_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkY362HOIZ_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -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.$objectType ?? 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();
@@ -240,7 +254,7 @@ var ObservableClientImpl = class {
           ...options,
           srcType: {
             type: "object",
-            apiName: obj.$apiName
+            apiName: obj.$objectType ?? obj.$apiName
           },
           linkName,
           pk: obj.$primaryKey
@@ -271,6 +285,12 @@ 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);
   }
@@ -351,7 +371,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkPARVKNVB_cjs.additionalContext].objectFactory2(store.client[chunkPARVKNVB_cjs.additionalContext], [{
+        const create = store.client[chunkY362HOIZ_cjs.additionalContext].objectFactory2(store.client[chunkY362HOIZ_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -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 = [];
@@ -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[chunkPARVKNVB_cjs.additionalContext].logger : store.client[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkY362HOIZ_cjs.additionalContext].logger : store.client[chunkY362HOIZ_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[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkY362HOIZ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -974,7 +998,7 @@ var Changes = class {
   modified = /* @__PURE__ */ new Set();
   deleted = /* @__PURE__ */ new Set();
   registerObject = (cacheKey, data, isNew) => {
-    this[isNew ? "addedObjects" : "modifiedObjects"].set(data.$apiName, data);
+    this[isNew ? "addedObjects" : "modifiedObjects"].set(data.$objectType ?? data.$apiName, data);
     this[isNew ? "added" : "modified"].add(cacheKey);
   };
   deleteObject = (cacheKey) => {
@@ -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,6 +1047,325 @@ 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 (chunkCDUYWOVQ_cjs.isObjectSpecifiersObject(value)) {
+      const objectType = value.$objectType ?? value.$apiName;
+      path.push("$:osdk", objectType, value.$primaryKey);
+      return {
+        $apiName: objectType,
+        $primaryKey: value.$primaryKey
+      };
+    }
+    if (chunkY362HOIZ_cjs.isObjectSet(value)) {
+      const wire = chunkY362HOIZ_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[chunkY362HOIZ_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 chunkCDUYWOVQ_cjs.applyQuery(this.store.client[chunkY362HOIZ_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
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
@@ -1301,7 +1647,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 +1675,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
@@ -1417,6 +1763,7 @@ var ORDER_BY_IDX = 3;
 var RDP_IDX2 = 4;
 var INTERSECT_IDX = 5;
 var PIVOT_IDX = 6;
+var RIDS_IDX = 7;
 
 // src/observable/internal/sorting/SortingStrategy.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
@@ -1475,12 +1822,14 @@ function createCollectionConnectable(subject, subjects, createPayload) {
       resolvedData,
       isOptimistic: rxjs.of(listEntry.isOptimistic),
       status: rxjs.of(listEntry.status),
-      lastUpdated: rxjs.of(listEntry.lastUpdated)
+      lastUpdated: rxjs.of(listEntry.lastUpdated),
+      totalCount: rxjs.of(listEntry?.value?.totalCount)
     }).pipe(rxjs.map((params) => createPayload({
       resolvedData: Array.isArray(params.resolvedData) ? params.resolvedData : [],
       isOptimistic: params.isOptimistic,
       status: params.status,
-      lastUpdated: params.lastUpdated
+      lastUpdated: params.lastUpdated,
+      totalCount: params.totalCount
     }))), rxjs.asapScheduler);
   })), {
     resetOnDisconnect: false,
@@ -1535,9 +1884,10 @@ var BaseListQuery = class extends Query {
    * @param status Status to set for the list
    * @param batch Batch context to use
    * @param append Whether to append to the existing list or replace it
+   * @param totalCount Optional total count from API response
    * @returns The updated entry
    */
-  _updateList(items, status, batch, append = false) {
+  _updateList(items, status, batch, append = false, totalCount) {
     if (process.env.NODE_ENV !== "production") {
       this.logger?.child({
         methodName: "updateList"
@@ -1555,7 +1905,8 @@ var BaseListQuery = class extends Query {
     objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);
     objectCacheKeys = removeDuplicates(objectCacheKeys, batch);
     return this.writeToStore({
-      data: objectCacheKeys
+      data: objectCacheKeys,
+      totalCount
     }, status, batch);
   }
   /**
@@ -1646,7 +1997,8 @@ var BaseListQuery = class extends Query {
       fetchMore: this.fetchMore,
       hasMore: this.nextPageToken != null,
       status: params.status,
-      lastUpdated: params.lastUpdated
+      lastUpdated: params.lastUpdated,
+      totalCount: params.totalCount
     };
   }
   /**
@@ -1747,6 +2099,7 @@ var BaseListQuery = class extends Query {
     try {
       const hadPreviousPage = this.nextPageToken != null;
       const result = await this.fetchPageData(signal);
+      this.currentTotalCount = result.totalCount;
       if (signal?.aborted) {
         return void 0;
       }
@@ -1756,7 +2109,7 @@ var BaseListQuery = class extends Query {
         const append = hadPreviousPage;
         const finalStatus = result.nextPageToken ? status : "loaded";
         const objectKeys = this.store.objects.storeOsdkInstances(result.data, batch, this.rdpConfig);
-        return this._updateList(objectKeys, finalStatus, batch, append);
+        return this._updateList(objectKeys, finalStatus, batch, append, this.currentTotalCount);
       });
       return retVal;
     } catch (error) {
@@ -1792,8 +2145,10 @@ var BaseListQuery = class extends Query {
    * @returns The updated entry with error status
    */
   handleFetchError(_error, _status, batch) {
+    const existingTotalCount = batch.read(this.cacheKey)?.value?.totalCount;
     return this.writeToStore({
-      data: []
+      data: [],
+      totalCount: existingTotalCount
     }, "error", batch);
   }
   /**
@@ -1832,8 +2187,10 @@ var BaseListQuery = class extends Query {
     objectCacheKeys = this.#retainReleaseAppend(batch, options.append ?? false, objectCacheKeys);
     objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);
     objectCacheKeys = removeDuplicates(objectCacheKeys, batch);
+    const existingTotalCount = batch.read(this.cacheKey)?.value?.totalCount;
     return this.writeToStore({
-      data: objectCacheKeys
+      data: objectCacheKeys,
+      totalCount: existingTotalCount
     }, options.status, batch);
   }
   //
@@ -1958,7 +2315,7 @@ var BaseListQuery = class extends Query {
       }).debug("Removing object", object);
     }
     this.store.batch({}, (batch) => {
-      const objectCacheKey = this.store.cacheKeys.get("object", object.$apiName, object.$primaryKey);
+      const objectCacheKey = this.store.cacheKeys.get("object", object.$objectType ?? object.$apiName, object.$primaryKey);
       batch.delete(objectCacheKey, "loaded");
     });
   }
@@ -1978,7 +2335,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[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkY362HOIZ_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;
@@ -1994,7 +2351,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkPARVKNVB_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkY362HOIZ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       const linkDef = sourceMetadata.links?.[this.#linkName];
       if (!linkDef?.targetType) {
@@ -2011,7 +2368,8 @@ var SpecificLinkQuery = class extends BaseListQuery {
     }
     const queryParams = {
       $pageSize: this.options.pageSize || 100,
-      $nextPageToken: this.nextPageToken
+      $nextPageToken: this.nextPageToken,
+      $includeRid: true
     };
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       queryParams.$orderBy = this.#orderBy;
@@ -2065,7 +2423,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkPARVKNVB_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkY362HOIZ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -2105,6 +2463,162 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 // src/observable/internal/list/ListQuery.ts
 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
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
@@ -2125,7 +2639,7 @@ function evaluateFilter(f, realValue, expected, strict) {
     case "$ne":
       return realValue !== expected;
     case "$in":
-      return expected.$in.includes(realValue);
+      return Array.isArray(expected) && expected.includes(realValue);
     case "$isNull":
       return realValue == null;
     case "$startsWith":
@@ -2139,7 +2653,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;
   }
@@ -2149,8 +2663,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;
@@ -2158,8 +2672,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;
@@ -2167,7 +2681,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;
@@ -2217,7 +2731,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[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkY362HOIZ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -2226,7 +2740,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") {
@@ -2252,9 +2768,17 @@ 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 = chunkY362HOIZ_cjs.getWireObjectSet(this.#objectSet);
+      const {
+        resultType
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkY362HOIZ_cjs.additionalContext], wireObjectSet);
+      this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
+    }
     const resp = await this.#objectSet.fetchPage({
       $nextPageToken: this.nextPageToken,
       $pageSize: this.options.pageSize,
+      $includeRid: true,
       // For now this keeps the shared test code from falling apart
       // but shouldn't be needed ideally
       ...Object.keys(this.#orderBy).length > 0 ? {
@@ -2277,8 +2801,10 @@ var ListQuery = class extends BaseListQuery {
   handleFetchError(error, _status, batch) {
     this.logger?.error("error", error);
     this.store.subjects.get(this.cacheKey).error(error);
+    const existingTotalCount = batch.read(this.cacheKey)?.value?.totalCount;
     return this.writeToStore({
-      data: []
+      data: [],
+      totalCount: existingTotalCount
     }, "error", batch);
   }
   /**
@@ -2356,12 +2882,14 @@ var ListQuery = class extends BaseListQuery {
         for (const obj of toAdd) {
           newList.push(this.getObjectCacheKey(obj));
         }
+        const existingTotalCount = batch.read(this.cacheKey)?.value?.totalCount;
         this._updateList(
           newList,
           status,
           batch,
           /* append */
-          false
+          false,
+          existingTotalCount
         );
       });
       if (needsRevalidation) {
@@ -2430,14 +2958,16 @@ 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);
         if (newObjects?.length !== existing.value?.data.length) {
           batch.changes.registerList(this.cacheKey);
+          const existingTotalCount = existing.value?.totalCount;
           batch.write(this.cacheKey, {
-            data: newObjects ?? []
+            data: newObjects ?? [],
+            totalCount: existingTotalCount
           }, "loaded");
         }
         return;
@@ -2495,9 +3025,20 @@ var InterfaceListQuery = class extends ListQuery {
   async postProcessFetchedData(data) {
     return reloadDataAsFullObjects(this.store.client, data);
   }
+  createPayload(params) {
+    const resolvedList = params.resolvedData.map((obj) => obj.$as(this.apiName));
+    return {
+      resolvedList,
+      isOptimistic: params.isOptimistic,
+      fetchMore: this.fetchMore,
+      hasMore: this.nextPageToken != null,
+      status: params.status,
+      lastUpdated: params.lastUpdated
+    };
+  }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkFL7QZC57_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkCDUYWOVQ_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));
@@ -2516,22 +3057,30 @@ var InterfaceListQuery = class extends ListQuery {
   }
 };
 async function reloadDataAsFullObjects(client, data) {
+  if (data.length === 0) {
+    return 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][chunkFL7QZC57_cjs.UnderlyingOsdkObject][chunkFL7QZC57_cjs.ObjectDefRef];
+    const objectDef = await client.fetchMetadata({
+      type: "object",
+      apiName
+    });
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
       }
     };
-    const result = await client(objectDef).where(where).fetchPage();
+    const result = await client(objectDef).where(where).fetchPage({
+      $includeRid: true
+    });
     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;
-    return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
+  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;
+    return fullObject;
   });
-  return data;
 }
 
 // src/observable/internal/list/ObjectListQuery.ts
@@ -2541,16 +3090,22 @@ var ObjectListQuery = class extends ListQuery {
     const rdpConfig = this.cacheKey.otherKeys[RDP_IDX2];
     const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX];
     const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
+    const rids = this.cacheKey.otherKeys[RIDS_IDX];
+    const clientCtx = store.client[chunkY362HOIZ_cjs.additionalContext];
+    const typeDefinition = {
+      type: "object",
+      apiName: this.apiName
+    };
     if (pivotInfo != null) {
-      const sourceSet = store.client({
+      let sourceSet = store.client({
         type: "object",
         apiName: pivotInfo.sourceType
       });
+      sourceSet = sourceSet.where(this.canonicalWhere);
       let objectSet2 = sourceSet.pivotTo(pivotInfo.linkName);
       if (rdpConfig != null) {
         objectSet2 = objectSet2.withProperties(rdpConfig);
       }
-      objectSet2 = objectSet2.where(this.canonicalWhere);
       if (intersectWith != null && intersectWith.length > 0) {
         const intersectSets = intersectWith.map((whereClause) => {
           let intersectSet = store.client({
@@ -2566,10 +3121,15 @@ var ObjectListQuery = class extends ListQuery {
       }
       return objectSet2;
     }
-    let objectSet = store.client({
-      type: "object",
-      apiName: this.apiName
-    });
+    let objectSet;
+    if (rids != null) {
+      objectSet = clientCtx.objectSetFactory(typeDefinition, clientCtx, {
+        type: "static",
+        objects: [...rids]
+      });
+    } else {
+      objectSet = store.client(typeDefinition);
+    }
     if (rdpConfig != null) {
       objectSet = objectSet.withProperties(rdpConfig);
     }
@@ -2618,13 +3178,14 @@ var ObjectListQuery = class extends ListQuery {
 
 // src/observable/internal/list/ListsHelper.ts
 var ListsHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer, intersectCanonicalizer, pivotCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer, intersectCanonicalizer, pivotCanonicalizer, ridListCanonicalizer) {
     super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer2;
     this.orderByCanonicalizer = orderByCanonicalizer2;
     this.rdpCanonicalizer = rdpCanonicalizer;
     this.intersectCanonicalizer = intersectCanonicalizer;
     this.pivotCanonicalizer = pivotCanonicalizer;
+    this.ridListCanonicalizer = ridListCanonicalizer;
   }
   observe(options, subFn) {
     const ret = super.observe(options, subFn);
@@ -2640,7 +3201,8 @@ var ListsHelper = class extends AbstractHelper {
       orderBy,
       withProperties,
       intersectWith,
-      pivotTo
+      pivotTo,
+      rids
     } = options;
     const {
       apiName,
@@ -2651,7 +3213,8 @@ var ListsHelper = class extends AbstractHelper {
     const canonRdp = withProperties ? this.rdpCanonicalizer.canonicalize(withProperties) : void 0;
     const canonIntersect = intersectWith && intersectWith.length > 0 ? this.intersectCanonicalizer.canonicalize(intersectWith) : void 0;
     const canonPivot = pivotTo ? this.pivotCanonicalizer.canonicalize(apiName, pivotTo) : void 0;
-    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy, canonRdp, canonIntersect, canonPivot);
+    const canonRids = rids != null ? this.ridListCanonicalizer.canonicalize(rids) : void 0;
+    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy, canonRdp, canonIntersect, canonPivot, canonRids);
     return this.store.queries.get(listCacheKey, () => {
       const QueryClass = type === "object" ? ObjectListQuery : InterfaceListQuery;
       return new QueryClass(this.store, this.store.subjects.get(listCacheKey), apiName, listCacheKey, options);
@@ -2679,20 +3242,21 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunkFL7QZC57_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkFL7QZC57_cjs.ObjectDefRef];
+  const underlying = value[chunkCDUYWOVQ_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkCDUYWOVQ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
     $primaryKey: underlying.$primaryKey,
-    $title: underlying.$title
+    $title: underlying.$title,
+    $rid: underlying.$rid
   };
   for (const key of Object.keys(underlying)) {
     if (key in objectDef.properties && !rdpFields.has(key)) {
       newProps[key] = underlying[key];
     }
   }
-  return chunkFL7QZC57_cjs.createOsdkObject(value[chunkFL7QZC57_cjs.ClientRef], objectDef, newProps);
+  return chunkCDUYWOVQ_cjs.createOsdkObject(value[chunkCDUYWOVQ_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -2703,13 +3267,14 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunkFL7QZC57_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkFL7QZC57_cjs.ObjectDefRef];
+  const underlying = value[chunkCDUYWOVQ_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkCDUYWOVQ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
     $primaryKey: underlying.$primaryKey,
-    $title: underlying.$title
+    $title: underlying.$title,
+    $rid: underlying.$rid
   };
   for (const key of Object.keys(underlying)) {
     if (key in objectDef.properties) {
@@ -2719,7 +3284,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunkFL7QZC57_cjs.createOsdkObject(value[chunkFL7QZC57_cjs.ClientRef], objectDef, newProps);
+  return chunkCDUYWOVQ_cjs.createOsdkObject(value[chunkCDUYWOVQ_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -2731,13 +3296,14 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunkFL7QZC57_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunkFL7QZC57_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkCDUYWOVQ_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkCDUYWOVQ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
     $primaryKey: sourceUnderlying.$primaryKey,
-    $title: sourceUnderlying.$title
+    $title: sourceUnderlying.$title,
+    $rid: sourceUnderlying.$rid
   };
   for (const key of Object.keys(sourceUnderlying)) {
     if (key in objectDef.properties && (!sourceRdpFields.has(key) || targetRdpFields.has(key))) {
@@ -2745,14 +3311,14 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunkFL7QZC57_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkCDUYWOVQ_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
       if (!sourceRdpFields.has(field) && field in targetUnderlying) {
         newProps[field] = targetUnderlying[field];
       }
     }
   }
-  return chunkFL7QZC57_cjs.createOsdkObject(sourceValue[chunkFL7QZC57_cjs.ClientRef], objectDef, newProps);
+  return chunkCDUYWOVQ_cjs.createOsdkObject(sourceValue[chunkCDUYWOVQ_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -2887,7 +3453,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkPARVKNVB_cjs.additionalContext].logger;
+    this.#logger = client[chunkY362HOIZ_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -2934,7 +3500,8 @@ var BulkObjectLoader = class {
     const {
       data
     } = await this.#client(miniDef).where(whereClause).fetchPage({
-      $pageSize: pks.length
+      $pageSize: pks.length,
+      $includeRid: true
     });
     for (const {
       primaryKey,
@@ -2955,7 +3522,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[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkY362HOIZ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -2984,7 +3551,20 @@ var ObjectQuery = class extends Query {
         methodName: "_fetchAndStore"
       }).debug("calling _fetchAndStore");
     }
-    const obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
+    const rdpConfig = this.cacheKey.otherKeys[RDP_CONFIG_IDX];
+    let obj;
+    if (rdpConfig) {
+      const miniDef = {
+        type: "object",
+        apiName: this.#apiName
+      };
+      const fetched = await this.store.client(miniDef).withProperties(rdpConfig).fetchOne(this.#pk, {
+        $includeRid: true
+      });
+      obj = fetched;
+    } else {
+      obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
+    }
     this.store.batch({}, (batch) => {
       this.writeToStore(obj, "loaded", batch);
     });
@@ -3034,7 +3614,7 @@ var ObjectsHelper = class extends AbstractHelper {
    */
   storeOsdkInstances(values, batch, rdpConfig) {
     return values.map((v) => this.getQuery({
-      apiName: v.$apiName,
+      apiName: v.$objectType ?? v.$apiName,
       pk: v.$primaryKey
     }, rdpConfig).writeToStore(v, "loaded", batch).cacheKey);
   }
@@ -3103,17 +3683,13 @@ var ObjectSetQuery = class extends BaseListQuery {
   #composedObjectSet;
   #objectTypes;
   constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkY362HOIZ_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") {
@@ -3152,7 +3728,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkPARVKNVB_cjs.getWireObjectSet(os);
+        const wire = chunkY362HOIZ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3160,7 +3736,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkPARVKNVB_cjs.getWireObjectSet(os);
+        const wire = chunkY362HOIZ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3168,7 +3744,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkPARVKNVB_cjs.getWireObjectSet(os);
+        const wire = chunkY362HOIZ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3187,9 +3763,17 @@ 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 = chunkY362HOIZ_cjs.getWireObjectSet(this.#composedObjectSet);
+      const {
+        resultType
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkY362HOIZ_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,
+      $includeRid: true,
       // OrderBy is already applied in the composed ObjectSet
       ...this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 ? {
         $orderBy: this.#operations.orderBy
@@ -3204,8 +3788,10 @@ var ObjectSetQuery = class extends BaseListQuery {
   handleFetchError(error, _status, batch) {
     this.logger?.error("error", error);
     this.store.subjects.get(this.cacheKey).error(error);
+    const existingTotalCount = batch.read(this.cacheKey)?.value?.totalCount;
     return this.writeToStore({
-      data: []
+      data: [],
+      totalCount: existingTotalCount
     }, "error", batch);
   }
   registerStreamUpdates(sub) {
@@ -3226,7 +3812,8 @@ var ObjectSetQuery = class extends BaseListQuery {
       hasMore: this.nextPageToken != null,
       status: params.status,
       lastUpdated: params.lastUpdated,
-      objectSet: this.#composedObjectSet
+      objectSet: this.#composedObjectSet,
+      totalCount: params.totalCount
     };
   }
 };
@@ -3249,7 +3836,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkPARVKNVB_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkY362HOIZ_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -3265,13 +3852,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(chunkPARVKNVB_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkY362HOIZ_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkPARVKNVB_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkY362HOIZ_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkPARVKNVB_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkY362HOIZ_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -3343,7 +3930,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkPARVKNVB_cjs.createWithPropertiesObjectSet(
+      const builder = chunkY362HOIZ_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -3377,6 +3964,22 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
   }
 };
 
+// src/observable/internal/RidListCanonicalizer.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+var RidListCanonicalizer = class {
+  cache = /* @__PURE__ */ new Map();
+  canonicalize(rids) {
+    const sorted = [...new Set(rids)].sort();
+    const key = sorted.join("\0");
+    let canonical = this.cache.get(key);
+    if (!canonical) {
+      canonical = sorted;
+      this.cache.set(key, canonical);
+    }
+    return canonical;
+  }
+};
+
 // src/observable/internal/Store.ts
 var Store = class {
   whereCanonicalizer = new WhereClauseCanonicalizer();
@@ -3384,6 +3987,7 @@ var Store = class {
   rdpCanonicalizer = new RdpCanonicalizer();
   intersectCanonicalizer = new IntersectCanonicalizer(this.whereCanonicalizer);
   pivotCanonicalizer = new PivotCanonicalizer();
+  ridListCanonicalizer = new RidListCanonicalizer();
   /** @internal */
   queries = new Queries();
   objectCacheKeyRegistry = new ObjectCacheKeyRegistry();
@@ -3394,7 +3998,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkPARVKNVB_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkY362HOIZ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -3402,7 +4006,8 @@ var Store = class {
       onDestroy: this.#cleanupCacheKey
     });
     this.aggregations = new AggregationsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.rdpCanonicalizer);
-    this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.intersectCanonicalizer, this.pivotCanonicalizer);
+    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.ridListCanonicalizer);
     this.objects = new ObjectsHelper(this, this.cacheKeys);
     this.links = new LinksHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
     this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer);
@@ -3414,7 +4019,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);
@@ -3656,14 +4261,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 = chunkFL7QZC57_cjs.createClientFromContext({
-    ...client[chunkPARVKNVB_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkPARVKNVB_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkFL7QZC57_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkCDUYWOVQ_cjs.createClientFromContext({
+    ...client[chunkY362HOIZ_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkY362HOIZ_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkCDUYWOVQ_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -3707,11 +4318,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.createClientWithTransaction; }
+  get: function () { return chunkCDUYWOVQ_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkPARVKNVB_cjs.augment; }
+  get: function () { return chunkY362HOIZ_cjs.augment; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;