@osdk/client 2.7.0-beta.8 → 2.7.0-beta.9

package/build/cjs/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkFL7QZC57_cjs = require('./chunk-FL7QZC57.cjs');
+var chunkIQJTM3KW_cjs = require('./chunk-IQJTM3KW.cjs');
 require('./chunk-PARVKNVB.cjs');
 var chunkLDTMSHUZ_cjs = require('./chunk-LDTMSHUZ.cjs');
 var api = require('@osdk/api');
@@ -18,7 +18,7 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 // src/createPlatformClient.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 function createPlatformClient(baseUrl, tokenProvider, options = void 0, fetchFn = fetch) {
-  return shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, chunkFL7QZC57_cjs.USER_AGENT, fetchFn);
+  return shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, chunkIQJTM3KW_cjs.USER_AGENT, fetchFn);
 }
 
 // src/util/datetimeConverters.ts
@@ -45,23 +45,23 @@ var extractDateFromIsoString = (dateTime) => {
 
 Object.defineProperty(exports, "ActionValidationError", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.ActionValidationError; }
+  get: function () { return chunkIQJTM3KW_cjs.ActionValidationError; }
 });
 Object.defineProperty(exports, "createAttachmentUpload", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.createAttachmentUpload; }
+  get: function () { return chunkIQJTM3KW_cjs.createAttachmentUpload; }
 });
 Object.defineProperty(exports, "createClient", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.createClient; }
+  get: function () { return chunkIQJTM3KW_cjs.createClient; }
 });
 Object.defineProperty(exports, "createObjectSpecifierFromPrimaryKey", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.createObjectSpecifierFromPrimaryKey; }
+  get: function () { return chunkIQJTM3KW_cjs.createObjectSpecifierFromPrimaryKey; }
 });
 Object.defineProperty(exports, "extractPrimaryKeyFromObjectSpecifier", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.extractPrimaryKeyFromObjectSpecifier; }
+  get: function () { return chunkIQJTM3KW_cjs.extractPrimaryKeyFromObjectSpecifier; }
 });
 Object.defineProperty(exports, "NULL_VALUE", {
   enumerable: true,

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

@@ -1,11 +1,11 @@
 'use strict';
 
-var chunkFL7QZC57_cjs = require('../chunk-FL7QZC57.cjs');
+var chunkIQJTM3KW_cjs = require('../chunk-IQJTM3KW.cjs');
 var chunkPARVKNVB_cjs = require('../chunk-PARVKNVB.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 {};
@@ -1301,7 +1301,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 +1329,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
@@ -2105,6 +2105,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();
 
@@ -2139,7 +2295,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 +2305,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 +2314,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 +2323,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;
@@ -2226,7 +2382,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,6 +2410,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 = chunkPARVKNVB_cjs.getWireObjectSet(this.#objectSet);
+      const {
+        resultType
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkPARVKNVB_cjs.additionalContext], wireObjectSet);
+      this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
+    }
     const resp = await this.#objectSet.fetchPage({
       $nextPageToken: this.nextPageToken,
       $pageSize: this.options.pageSize,
@@ -2430,7 +2595,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);
@@ -2497,7 +2662,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkFL7QZC57_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkIQJTM3KW_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));
@@ -2518,7 +2683,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][chunkFL7QZC57_cjs.UnderlyingOsdkObject][chunkFL7QZC57_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkIQJTM3KW_cjs.UnderlyingOsdkObject][chunkIQJTM3KW_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -2528,7 +2693,7 @@ async function reloadDataAsFullObjects(client, data) {
     return [apiName, Object.fromEntries(result.data.map((x) => [x.$primaryKey, x]))];
   })));
   data = data.map((obj) => {
-    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? 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;
@@ -2679,8 +2844,8 @@ 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[chunkIQJTM3KW_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkIQJTM3KW_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -2692,7 +2857,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunkFL7QZC57_cjs.createOsdkObject(value[chunkFL7QZC57_cjs.ClientRef], objectDef, newProps);
+  return chunkIQJTM3KW_cjs.createOsdkObject(value[chunkIQJTM3KW_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -2703,8 +2868,8 @@ 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[chunkIQJTM3KW_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkIQJTM3KW_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -2719,7 +2884,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunkFL7QZC57_cjs.createOsdkObject(value[chunkFL7QZC57_cjs.ClientRef], objectDef, newProps);
+  return chunkIQJTM3KW_cjs.createOsdkObject(value[chunkIQJTM3KW_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -2731,8 +2896,8 @@ 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[chunkIQJTM3KW_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkIQJTM3KW_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -2745,14 +2910,14 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunkFL7QZC57_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkIQJTM3KW_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 chunkIQJTM3KW_cjs.createOsdkObject(sourceValue[chunkIQJTM3KW_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3110,10 +3275,6 @@ var ObjectSetQuery = class extends BaseListQuery {
     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") {
@@ -3187,6 +3348,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 = chunkPARVKNVB_cjs.getWireObjectSet(this.#composedObjectSet);
+      const {
+        resultType
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkPARVKNVB_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,
@@ -3414,7 +3582,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);
@@ -3660,10 +3828,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkFL7QZC57_cjs.createClientFromContext({
+  const tweakedClient = chunkIQJTM3KW_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(" "));
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkIQJTM3KW_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -3707,7 +3875,7 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkFL7QZC57_cjs.createClientWithTransaction; }
+  get: function () { return chunkIQJTM3KW_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,