@osdk/client 2.8.0-beta.2 → 2.8.0-beta.4

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

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkII23HDVV_cjs = require('../chunk-II23HDVV.cjs');
-var chunkXUFF6M4V_cjs = require('../chunk-XUFF6M4V.cjs');
+var chunkRKC3366I_cjs = require('../chunk-RKC3366I.cjs');
+var chunkO22QYBFF_cjs = require('../chunk-O22QYBFF.cjs');
 var chunkLDTMSHUZ_cjs = require('../chunk-LDTMSHUZ.cjs');
 var trie = require('@wry/trie');
 var deepEqual = require('fast-deep-equal');
@@ -153,7 +153,7 @@ var WhereClauseCanonicalizer = class {
 var whereCanonicalizer = new WhereClauseCanonicalizer();
 var orderByCanonicalizer = new OrderByCanonicalizer();
 function computeObjectSetCacheKey(objectSet, options) {
-  const keyParts = ["objectSet", chunkXUFF6M4V_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkO22QYBFF_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) => chunkXUFF6M4V_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkO22QYBFF_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkXUFF6M4V_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkO22QYBFF_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkXUFF6M4V_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkO22QYBFF_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -233,16 +233,26 @@ var ObservableClientImpl = class {
   };
   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
-    }));
+    const instances = [];
+    const objectSetWires = [];
+    for (const item of options.dependsOnObjects ?? []) {
+      if (chunkO22QYBFF_cjs.isObjectSet(item)) {
+        objectSetWires.push(chunkO22QYBFF_cjs.getWireObjectSet(item));
+      } else {
+        instances.push({
+          $apiName: item.$objectType ?? item.$apiName,
+          $primaryKey: item.$primaryKey
+        });
+      }
+    }
+    const objectSetTypesPromise = objectSetWires.length > 0 ? Promise.all(objectSetWires.map((wire) => chunkO22QYBFF_cjs.extractObjectOrInterfaceType(this.__experimentalStore.client[chunkO22QYBFF_cjs.additionalContext], wire))).then((types) => types.filter((t) => t != null).map((t) => t.apiName)) : void 0;
     return this.__experimentalStore.functions.observe({
       ...options,
       queryDef,
       params,
       dependsOn,
-      dependsOnObjects
+      dependsOnObjects: instances,
+      objectSetTypesPromise
     }, subFn);
   };
   observeLinks = (objects, linkName, options, subFn) => {
@@ -371,7 +381,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkXUFF6M4V_cjs.additionalContext].objectFactory2(store.client[chunkXUFF6M4V_cjs.additionalContext], [{
+        const create = store.client[chunkO22QYBFF_cjs.additionalContext].objectFactory2(store.client[chunkO22QYBFF_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -513,6 +523,78 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 // src/observable/internal/AbstractHelper.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
+// src/observable/internal/ListQueryView.ts
+chunkLDTMSHUZ_cjs.init_cjs_shims();
+var viewIdCounter = 0;
+var ListQueryView = class {
+  #query;
+  #viewLimit;
+  #pageSize;
+  #viewId;
+  #fetchMore;
+  #pendingFetchMore;
+  #lastPayload;
+  #observer;
+  constructor(query, pageSize, autoFetchMore) {
+    this.#query = query;
+    this.#pageSize = pageSize;
+    this.#viewId = `view_${++viewIdCounter}`;
+    const hasAutoFetch = autoFetchMore === true || typeof autoFetchMore === "number" && autoFetchMore > 0;
+    this.#viewLimit = hasAutoFetch ? Number.MAX_SAFE_INTEGER : pageSize;
+    this.#fetchMore = this.#createFetchMore();
+    query.registerFetchPageSize(this.#viewId, pageSize);
+  }
+  subscribe(observer) {
+    this.#observer = observer;
+    const sub = this.#query.subscribe({
+      next: (payload) => {
+        this.#lastPayload = payload;
+        observer.next?.(this.#transformPayload(payload));
+      },
+      error: (err) => observer.error?.(err),
+      complete: () => observer.complete?.()
+    });
+    sub.add(() => {
+      this.#query.unregisterFetchPageSize(this.#viewId);
+      this.#observer = void 0;
+      this.#lastPayload = void 0;
+    });
+    return sub;
+  }
+  #reEmitWithNewViewLimit() {
+    if (this.#lastPayload && this.#observer) {
+      this.#observer.next?.(this.#transformPayload(this.#lastPayload));
+    }
+  }
+  #transformPayload(payload) {
+    const loadedCount = payload.resolvedList.length;
+    return {
+      ...payload,
+      resolvedList: payload.resolvedList.slice(0, this.#viewLimit),
+      hasMore: this.#viewLimit < loadedCount || payload.hasMore,
+      fetchMore: this.#fetchMore
+    };
+  }
+  #createFetchMore() {
+    return () => {
+      if (this.#pendingFetchMore) {
+        return this.#pendingFetchMore;
+      }
+      this.#viewLimit += this.#pageSize;
+      const loadedCount = this.#query.getLoadedCount();
+      const hasMoreOnServer = this.#query.hasMorePages();
+      if (this.#viewLimit > loadedCount && hasMoreOnServer) {
+        this.#pendingFetchMore = this.#query.fetchMore().finally(() => {
+          this.#pendingFetchMore = void 0;
+        });
+        return this.#pendingFetchMore;
+      }
+      this.#reEmitWithNewViewLimit();
+      return Promise.resolve();
+    };
+  }
+};
+
 // src/observable/internal/QuerySubscription.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 var subscriptionIdCounter = 0;
@@ -540,6 +622,9 @@ var QuerySubscription = class extends UnsubscribableWrapper {
 };
 
 // src/observable/internal/AbstractHelper.ts
+function supportsViews(query) {
+  return query != null && typeof query.registerFetchPageSize === "function" && typeof query.getLoadedCount === "function" && typeof query.hasMorePages === "function" && typeof query.notifySubscribers === "function" && typeof query.fetchMore === "function";
+}
 var AbstractHelper = class {
   constructor(store, cacheKeys) {
     this.store = store;
@@ -561,7 +646,9 @@ var AbstractHelper = class {
         }
       });
     }
-    const sub = query.subscribe(subFn);
+    const listOptions = options;
+    const useView = supportsViews(query) && (listOptions.pageSize !== void 0 || listOptions.autoFetchMore !== void 0);
+    const sub = useView ? new ListQueryView(query, listOptions.pageSize ?? 100, listOptions.autoFetchMore).subscribe(subFn) : query.subscribe(subFn);
     const querySub = new QuerySubscription(query, sub);
     query.registerSubscriptionDedupeInterval(querySub.subscriptionId, options.dedupeInterval);
     sub.add(() => {
@@ -593,7 +680,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkXUFF6M4V_cjs.additionalContext].logger : store.client[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkO22QYBFF_cjs.additionalContext].logger : store.client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -664,12 +751,14 @@ var Query = class {
       await this.pendingFetch;
       return;
     }
-    const minDedupeInterval = this.getMinimumDedupeInterval();
-    if (minDedupeInterval > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < minDedupeInterval) {
-      if (process.env.NODE_ENV !== "production") {
-        logger?.debug("Within dupeInterval, aborting revalidate");
+    if (!force) {
+      const minDedupeInterval = this.getMinimumDedupeInterval();
+      if (minDedupeInterval > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < minDedupeInterval) {
+        if (process.env.NODE_ENV !== "production") {
+          logger?.debug("Within dupeInterval, aborting revalidate");
+        }
+        return Promise.resolve();
       }
-      return Promise.resolve();
     }
     if (process.env.NODE_ENV !== "production") {
       logger?.debug("Starting actual revalidate");
@@ -751,7 +840,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[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -1122,7 +1211,7 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunkII23HDVV_cjs.isObjectSpecifiersObject(value)) {
+    if (chunkRKC3366I_cjs.isObjectSpecifiersObject(value)) {
       const objectType = value.$objectType ?? value.$apiName;
       path.push("$:osdk", objectType, value.$primaryKey);
       return {
@@ -1130,8 +1219,8 @@ var FunctionParamsCanonicalizer = class {
         $primaryKey: value.$primaryKey
       };
     }
-    if (chunkXUFF6M4V_cjs.isObjectSet(value)) {
-      const wire = chunkXUFF6M4V_cjs.getWireObjectSet(value);
+    if (chunkO22QYBFF_cjs.isObjectSet(value)) {
+      const wire = chunkO22QYBFF_cjs.getWireObjectSet(value);
       path.push("$:objectset", wire);
       return wire;
     }
@@ -1193,8 +1282,8 @@ var FunctionQuery = class extends Query {
   #dependsOn;
   #dependsOnObjects;
   #queryDef;
-  constructor(store, subject, queryDef, params, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+  constructor(store, subject, queryDef, params, cacheKey, opts, objectSetTypesPromise) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = queryDef.apiName;
@@ -1203,6 +1292,29 @@ var FunctionQuery = class extends Query {
     this.#dependsOn = opts.dependsOn;
     this.#dependsOnObjects = opts.dependsOnObjects;
     this.#queryDef = queryDef;
+    if (objectSetTypesPromise) {
+      objectSetTypesPromise.then((types) => {
+        if (this.abortController?.signal.aborted) return;
+        let addedNewTypes = false;
+        for (const type of types) {
+          if (!this.#dependsOn) {
+            this.#dependsOn = [];
+          }
+          if (!this.#dependsOn.includes(type)) {
+            this.#dependsOn.push(type);
+            addedNewTypes = true;
+          }
+        }
+        if (addedNewTypes) {
+          void this.revalidate(true);
+        }
+      }).catch((error) => {
+        if (this.abortController?.signal.aborted) return;
+        if (process.env.NODE_ENV !== "production") {
+          this.logger?.error("Failed to extract ObjectSet types", error);
+        }
+      });
+    }
   }
   _createConnectable(subject) {
     return rxjs.connectable(subject.pipe(rxjs.map((x) => {
@@ -1228,7 +1340,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunkII23HDVV_cjs.applyQuery(this.store.client[chunkXUFF6M4V_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunkRKC3366I_cjs.applyQuery(this.store.client[chunkO22QYBFF_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -1311,13 +1423,14 @@ var FunctionsHelper = class extends AbstractHelper {
     const {
       queryDef,
       params,
+      objectSetTypesPromise,
       ...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));
+    return this.store.queries.get(functionCacheKey, () => new FunctionQuery(this.store, this.store.subjects.get(functionCacheKey), queryDef, params, functionCacheKey, observeOpts, objectSetTypesPromise));
   }
   async invalidateFunction(apiName, params) {
     const functionApiName = typeof apiName === "string" ? apiName : apiName.apiName;
@@ -1873,6 +1986,11 @@ var BaseListQuery = class extends Query {
    * Promise tracking an in-progress page fetch
    * @protected
    */
+  /**
+   * Per-subscriber page sizes for fetch optimization.
+   * Tracks each view's pageSize so we can recalculate max when views unsubscribe.
+   */
+  #subscriberPageSizes = /* @__PURE__ */ new Map();
   //
   // Shared Implementations
   //
@@ -2046,6 +2164,56 @@ var BaseListQuery = class extends Query {
     });
     return this.pendingFetch;
   };
+  /**
+   * Register a subscriber's pageSize for fetch optimization.
+   * The query will fetch with the max pageSize across all subscribers.
+   */
+  registerFetchPageSize(viewId, pageSize) {
+    this.#subscriberPageSizes.set(viewId, pageSize);
+  }
+  /**
+   * Unregister a subscriber's pageSize when they unsubscribe.
+   * Allows the effective pageSize to decrease when high-pageSize subscribers leave.
+   */
+  unregisterFetchPageSize(viewId) {
+    this.#subscriberPageSizes.delete(viewId);
+  }
+  /**
+   * Get the effective fetch pageSize (max across all subscribers).
+   * Falls back to options.pageSize or 100 if no subscribers have registered.
+   */
+  getEffectiveFetchPageSize() {
+    if (this.#subscriberPageSizes.size > 0) {
+      return Math.max(...this.#subscriberPageSizes.values());
+    }
+    return this.options.pageSize ?? 100;
+  }
+  /**
+   * Get the current number of loaded items in the cache.
+   */
+  getLoadedCount() {
+    const {
+      retVal
+    } = this.store.batch({}, (batch) => {
+      return batch.read(this.cacheKey)?.value?.data.length ?? 0;
+    });
+    return retVal;
+  }
+  /**
+   * Check if there are more pages available on the server.
+   */
+  hasMorePages() {
+    return this.nextPageToken != null;
+  }
+  /**
+   * Notify all subscribers of a change (used when view limits change
+   * but no new data needs to be fetched).
+   */
+  notifySubscribers() {
+    this.store.batch({}, (batch) => {
+      this.registerCacheChanges(batch);
+    });
+  }
   /**
    * Minimum number of results to load initially
    * May be overridden by subclasses for specific collection types
@@ -2335,7 +2503,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[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkO22QYBFF_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;
@@ -2351,7 +2519,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkXUFF6M4V_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkO22QYBFF_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       const linkDef = sourceMetadata.links?.[this.#linkName];
       if (!linkDef?.targetType) {
@@ -2367,7 +2535,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       throw new Error("Aborted");
     }
     const queryParams = {
-      $pageSize: this.options.pageSize || 100,
+      $pageSize: this.getEffectiveFetchPageSize(),
       $nextPageToken: this.nextPageToken,
       $includeRid: true
     };
@@ -2423,7 +2591,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkXUFF6M4V_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkO22QYBFF_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -2731,7 +2899,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[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -2769,15 +2937,15 @@ var ListQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkXUFF6M4V_cjs.getWireObjectSet(this.#objectSet);
+      const wireObjectSet = chunkO22QYBFF_cjs.getWireObjectSet(this.#objectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkXUFF6M4V_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkO22QYBFF_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
     }
     const resp = await this.#objectSet.fetchPage({
       $nextPageToken: this.nextPageToken,
-      $pageSize: this.options.pageSize,
+      $pageSize: this.getEffectiveFetchPageSize(),
       $includeRid: true,
       // For now this keeps the shared test code from falling apart
       // but shouldn't be needed ideally
@@ -3038,7 +3206,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkII23HDVV_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkRKC3366I_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));
@@ -3091,7 +3259,7 @@ var ObjectListQuery = class extends ListQuery {
     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[chunkXUFF6M4V_cjs.additionalContext];
+    const clientCtx = store.client[chunkO22QYBFF_cjs.additionalContext];
     const typeDefinition = {
       type: "object",
       apiName: this.apiName
@@ -3242,8 +3410,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunkII23HDVV_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkII23HDVV_cjs.ObjectDefRef];
+  const underlying = value[chunkRKC3366I_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkRKC3366I_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3256,7 +3424,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunkII23HDVV_cjs.createOsdkObject(value[chunkII23HDVV_cjs.ClientRef], objectDef, newProps);
+  return chunkRKC3366I_cjs.createOsdkObject(value[chunkRKC3366I_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3267,8 +3435,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunkII23HDVV_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkII23HDVV_cjs.ObjectDefRef];
+  const underlying = value[chunkRKC3366I_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkRKC3366I_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3284,7 +3452,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunkII23HDVV_cjs.createOsdkObject(value[chunkII23HDVV_cjs.ClientRef], objectDef, newProps);
+  return chunkRKC3366I_cjs.createOsdkObject(value[chunkRKC3366I_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3296,8 +3464,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunkII23HDVV_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunkII23HDVV_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkRKC3366I_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkRKC3366I_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3311,14 +3479,14 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunkII23HDVV_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkRKC3366I_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
       if (!sourceRdpFields.has(field) && field in targetUnderlying) {
         newProps[field] = targetUnderlying[field];
       }
     }
   }
-  return chunkII23HDVV_cjs.createOsdkObject(sourceValue[chunkII23HDVV_cjs.ClientRef], objectDef, newProps);
+  return chunkRKC3366I_cjs.createOsdkObject(sourceValue[chunkRKC3366I_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3453,7 +3621,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkXUFF6M4V_cjs.additionalContext].logger;
+    this.#logger = client[chunkO22QYBFF_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -3522,7 +3690,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[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -3683,7 +3851,7 @@ 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[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -3728,7 +3896,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkXUFF6M4V_cjs.getWireObjectSet(os);
+        const wire = chunkO22QYBFF_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3736,7 +3904,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkXUFF6M4V_cjs.getWireObjectSet(os);
+        const wire = chunkO22QYBFF_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3744,7 +3912,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkXUFF6M4V_cjs.getWireObjectSet(os);
+        const wire = chunkO22QYBFF_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3764,15 +3932,15 @@ var ObjectSetQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkXUFF6M4V_cjs.getWireObjectSet(this.#composedObjectSet);
+      const wireObjectSet = chunkO22QYBFF_cjs.getWireObjectSet(this.#composedObjectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkXUFF6M4V_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkO22QYBFF_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,
+      $pageSize: this.getEffectiveFetchPageSize(),
       $includeRid: true,
       // OrderBy is already applied in the composed ObjectSet
       ...this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 ? {
@@ -3836,7 +4004,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkXUFF6M4V_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkO22QYBFF_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -3852,13 +4020,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(chunkXUFF6M4V_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkO22QYBFF_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkXUFF6M4V_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkO22QYBFF_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkXUFF6M4V_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkO22QYBFF_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -3930,7 +4098,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkXUFF6M4V_cjs.createWithPropertiesObjectSet(
+      const builder = chunkO22QYBFF_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -3998,7 +4166,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkXUFF6M4V_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkO22QYBFF_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -4271,10 +4439,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkII23HDVV_cjs.createClientFromContext({
-    ...client[chunkXUFF6M4V_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkXUFF6M4V_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkII23HDVV_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkRKC3366I_cjs.createClientFromContext({
+    ...client[chunkO22QYBFF_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkO22QYBFF_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkRKC3366I_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -4318,11 +4486,19 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkII23HDVV_cjs.createClientWithTransaction; }
+  get: function () { return chunkRKC3366I_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkXUFF6M4V_cjs.augment; }
+  get: function () { return chunkO22QYBFF_cjs.augment; }
+});
+Object.defineProperty(exports, "getWireObjectSet", {
+  enumerable: true,
+  get: function () { return chunkO22QYBFF_cjs.getWireObjectSet; }
+});
+Object.defineProperty(exports, "isObjectSet", {
+  enumerable: true,
+  get: function () { return chunkO22QYBFF_cjs.isObjectSet; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;