@osdk/client 2.8.0-beta.1 → 2.8.0-beta.10

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

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk7543GRIE_cjs = require('../chunk-7543GRIE.cjs');
-var chunkVVKEXIIO_cjs = require('../chunk-VVKEXIIO.cjs');
+var chunk6VOFZIIJ_cjs = require('../chunk-6VOFZIIJ.cjs');
+var chunkYVZM2JPW_cjs = require('../chunk-YVZM2JPW.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", chunkVVKEXIIO_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkYVZM2JPW_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) => chunkVVKEXIIO_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkYVZM2JPW_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkVVKEXIIO_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkYVZM2JPW_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkVVKEXIIO_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkYVZM2JPW_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -228,43 +228,40 @@ var ObservableClientImpl = class {
       subFn
     );
   };
-  observeAggregation = (options, subFn) => {
+  observeAggregation(options, subFn) {
+    if (options.objectSet) {
+      return this.__experimentalStore.aggregations.observeAsync(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
-    }));
+    const instances = [];
+    const objectSetWires = [];
+    for (const item of options.dependsOnObjects ?? []) {
+      if (chunkYVZM2JPW_cjs.isObjectSet(item)) {
+        objectSetWires.push(chunkYVZM2JPW_cjs.getWireObjectSet(item));
+      } else {
+        instances.push({
+          $apiName: item.$objectType ?? item.$apiName,
+          $primaryKey: item.$primaryKey
+        });
+      }
+    }
+    const objectSetTypesPromise = objectSetWires.length > 0 ? Promise.all(objectSetWires.map((wire) => chunkYVZM2JPW_cjs.extractObjectOrInterfaceType(this.__experimentalStore.client[chunkYVZM2JPW_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) => {
     const objectsArray = Array.isArray(objects) ? objects : [objects];
-    const parentSub = new rxjs.Subscription();
-    for (const obj of objectsArray) {
-      const querySubscription = this.__experimentalStore.links.observe(
-        {
-          ...options,
-          srcType: {
-            type: "object",
-            apiName: obj.$objectType ?? obj.$apiName
-          },
-          linkName,
-          pk: obj.$primaryKey
-        },
-        // cast to cross typed to untyped barrier
-        subFn
-      );
-      parentSub.add(querySubscription);
-    }
-    return new UnsubscribableWrapper(parentSub);
+    const observer = subFn;
+    return objectsArray.length <= 1 ? observeSingleLink(this.__experimentalStore, objectsArray, linkName, options, observer) : observeMultiLinks(this.__experimentalStore, objectsArray, linkName, options, observer);
   };
   observeObjectSet(baseObjectSet, options, subFn) {
     return this.__experimentalStore.objectSets.observe(
@@ -295,6 +292,114 @@ var ObservableClientImpl = class {
     return this.__experimentalStore.whereCanonicalizer.canonicalize(where);
   }
 };
+function observeSingleLink(store, objectsArray, linkName, options, observer) {
+  if (objectsArray.length === 0) {
+    observer.next({
+      resolvedList: [],
+      isOptimistic: false,
+      lastUpdated: 0,
+      fetchMore: () => Promise.resolve(),
+      hasMore: false,
+      status: "loaded",
+      totalCount: "0"
+    });
+    return new UnsubscribableWrapper(new rxjs.Subscription());
+  }
+  const parentSub = new rxjs.Subscription();
+  for (const obj of objectsArray) {
+    const sourceType = obj.$apiName === obj.$objectType ? "object" : "interface";
+    parentSub.add(store.links.observe({
+      ...options,
+      srcType: {
+        type: sourceType,
+        apiName: obj.$apiName
+      },
+      sourceUnderlyingObjectType: obj.$objectType,
+      linkName,
+      pk: obj.$primaryKey
+    }, observer));
+  }
+  return new UnsubscribableWrapper(parentSub);
+}
+function observeMultiLinks(store, objectsArray, linkName, options, observer) {
+  const parentSub = new rxjs.Subscription();
+  const totalExpected = objectsArray.length;
+  const perObjectResults = /* @__PURE__ */ new Map();
+  let errored = false;
+  function mergeAndEmit() {
+    if (errored) {
+      return;
+    }
+    const seen = /* @__PURE__ */ new Map();
+    const fetchMores = [];
+    let latestUpdated = 0;
+    let hasMore = false;
+    let isOptimistic = false;
+    for (const payload of perObjectResults.values()) {
+      for (const obj of payload.resolvedList) {
+        seen.set(`${obj.$objectType}:${obj.$primaryKey}`, obj);
+      }
+      if (payload.lastUpdated > latestUpdated) {
+        latestUpdated = payload.lastUpdated;
+      }
+      if (payload.isOptimistic) {
+        isOptimistic = true;
+      }
+      if (payload.hasMore) {
+        hasMore = true;
+        fetchMores.push(payload.fetchMore);
+      }
+    }
+    const payloads = [...perObjectResults.values()];
+    const loading = perObjectResults.size < totalExpected || payloads.some((p) => p.status === "init" || p.status === "loading");
+    observer.next({
+      resolvedList: Array.from(seen.values()),
+      isOptimistic,
+      lastUpdated: latestUpdated,
+      fetchMore: hasMore ? () => Promise.all(fetchMores.map((fn) => fn())).then(() => {
+      }) : () => Promise.resolve(),
+      hasMore,
+      status: loading ? "loading" : payloads.some((p) => p.status === "error") ? "error" : "loaded",
+      ...!hasMore ? {
+        totalCount: String(seen.size)
+      } : {}
+    });
+  }
+  for (const obj of objectsArray) {
+    const objKey = `${obj.$objectType ?? obj.$apiName}:${obj.$primaryKey}`;
+    const sourceType = obj.$apiName === obj.$objectType ? "object" : "interface";
+    parentSub.add(store.links.observe({
+      ...options,
+      srcType: {
+        type: sourceType,
+        apiName: obj.$apiName
+      },
+      sourceUnderlyingObjectType: obj.$objectType,
+      linkName,
+      pk: obj.$primaryKey
+    }, {
+      next: (payload) => {
+        if (errored) {
+          return;
+        }
+        perObjectResults.set(objKey, payload);
+        mergeAndEmit();
+      },
+      error: (err) => {
+        if (errored) {
+          return;
+        }
+        errored = true;
+        parentSub.unsubscribe();
+        observer.error(err);
+      },
+      // store link queries are long-lived and do not complete
+      complete: () => {
+      }
+    }));
+  }
+  return new UnsubscribableWrapper(parentSub);
+}
 
 // src/observable/internal/Store.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
@@ -371,7 +476,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkVVKEXIIO_cjs.additionalContext].objectFactory2(store.client[chunkVVKEXIIO_cjs.additionalContext], [{
+        const create = store.client[chunkYVZM2JPW_cjs.additionalContext].objectFactory2(store.client[chunkYVZM2JPW_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -438,8 +543,7 @@ var ActionApplication = class {
         if (process.env.NODE_ENV !== "production") {
           if (ACTION_DELAY > 0) {
             logger?.debug("action done, pausing", actionResults);
-            const delay = (await import('../delay-W2TSML2P.cjs')).default;
-            await delay(ACTION_DELAY);
+            await new Promise((resolve) => setTimeout(resolve, ACTION_DELAY));
             logger?.debug("action done, pausing done");
           }
         }
@@ -477,18 +581,13 @@ var ActionApplication = class {
           objectType,
           primaryKey
         } of deletedObjects ?? []) {
-          const cacheKey = this.store.cacheKeys.get(
-            "object",
-            objectType,
-            primaryKey,
-            /* rdpConfig */
-            void 0
-          );
-          this.store.queries.peek(cacheKey)?.deleteFromStore(
-            "loaded",
-            // this is probably not the best value to use
-            batch
-          );
+          for (const cacheKey of this.store.objectCacheKeyRegistry.getVariants(objectType, primaryKey)) {
+            this.store.queries.peek(cacheKey)?.deleteFromStore(
+              "loaded",
+              // this is probably not the best value to use
+              batch
+            );
+          }
         }
       });
       await Promise.all(promisesToWait);
@@ -503,9 +602,11 @@ var ActionApplication = class {
 // src/observable/internal/aggregation/AggregationCacheKey.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 var API_NAME_IDX = 1;
-var WHERE_IDX = 2;
-var RDP_IDX = 3;
-var AGGREGATE_IDX = 4;
+var WIRE_OBJECT_SET_IDX = 2;
+var WHERE_IDX = 3;
+var RDP_IDX = 4;
+var INTERSECT_IDX = 5;
+var AGGREGATE_IDX = 6;
 
 // src/observable/internal/aggregation/AggregationsHelper.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
@@ -513,6 +614,83 @@ 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;
+  #hasAutoFetch;
+  #fetchMore;
+  #pendingFetchMore;
+  #lastPayload;
+  #observer;
+  constructor(query, pageSize, autoFetchMore) {
+    this.#query = query;
+    this.#pageSize = pageSize;
+    this.#viewId = `view_${++viewIdCounter}`;
+    this.#hasAutoFetch = autoFetchMore === true || typeof autoFetchMore === "number" && autoFetchMore > 0;
+    this.#viewLimit = this.#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));
+        if (!this.#hasAutoFetch && payload.status === "loaded" && payload.resolvedList.length < this.#viewLimit && this.#query.hasMorePages()) {
+          void this.#query.fetchMore();
+        }
+      },
+      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,
+      status: loadedCount >= this.#viewLimit && payload.status === "loading" ? "loaded" : payload.status
+    };
+  }
+  #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 +718,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;
@@ -550,7 +731,16 @@ var AbstractHelper = class {
     return this._subscribe(query, options, subFn);
   }
   _subscribe(query, options, subFn) {
-    this.store.cacheKeys.retain(query.cacheKey);
+    const pendingCleanupCount = this.store.pendingCleanup.get(query.cacheKey) ?? 0;
+    if (pendingCleanupCount > 0) {
+      if (pendingCleanupCount === 1) {
+        this.store.pendingCleanup.delete(query.cacheKey);
+      } else {
+        this.store.pendingCleanup.set(query.cacheKey, pendingCleanupCount - 1);
+      }
+    } else {
+      this.store.cacheKeys.retain(query.cacheKey);
+    }
     if (options.mode !== "offline") {
       query.revalidate(options.mode === "force").catch((e) => {
         subFn.error(e);
@@ -561,12 +751,25 @@ 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(() => {
       query.unregisterSubscriptionDedupeInterval(querySub.subscriptionId);
-      this.store.cacheKeys.release(query.cacheKey);
+      this.store.pendingCleanup.set(query.cacheKey, (this.store.pendingCleanup.get(query.cacheKey) ?? 0) + 1);
+      queueMicrotask(() => {
+        const currentPending = this.store.pendingCleanup.get(query.cacheKey) ?? 0;
+        if (currentPending > 0) {
+          if (currentPending === 1) {
+            this.store.pendingCleanup.delete(query.cacheKey);
+          } else {
+            this.store.pendingCleanup.set(query.cacheKey, currentPending - 1);
+          }
+          this.store.cacheKeys.release(query.cacheKey);
+        }
+      });
     });
     return querySub;
   }
@@ -578,6 +781,162 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 // src/observable/internal/aggregation/AggregationQuery.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.targetTypeApiName);
+          }
+          return await bumpInterface(v.targetTypeApiName);
+        }
+      }
+      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/Query.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 var Query = class {
@@ -593,7 +952,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger : store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger : store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -664,12 +1023,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");
@@ -750,14 +1111,39 @@ var Query = class {
 
 // src/observable/internal/aggregation/AggregationQuery.ts
 var AggregationQuery = class extends Query {
+  #invalidationTypes;
+  #invalidationTypesPromise;
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
     this.canonicalWhere = cacheKey.otherKeys[WHERE_IDX];
     this.rdpConfig = cacheKey.otherKeys[RDP_IDX];
     this.canonicalAggregate = cacheKey.otherKeys[AGGREGATE_IDX];
+    const serializedObjectSet = cacheKey.otherKeys[WIRE_OBJECT_SET_IDX];
+    this.#invalidationTypes = /* @__PURE__ */ new Set([this.apiName]);
+    if (serializedObjectSet) {
+      this.parsedWireObjectSet = JSON.parse(serializedObjectSet);
+      this.#invalidationTypesPromise = this.#computeInvalidationTypes(this.parsedWireObjectSet);
+    }
+  }
+  async #computeInvalidationTypes(wireObjectSet) {
+    try {
+      const {
+        invalidationSet
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkYVZM2JPW_cjs.additionalContext], wireObjectSet);
+      return /* @__PURE__ */ new Set([this.apiName, ...invalidationSet]);
+    } catch (error) {
+      this.store.logger?.error("Failed to compute invalidation types for aggregation, falling back to base type only", error);
+      return /* @__PURE__ */ new Set([this.apiName]);
+    }
+  }
+  async ensureInvalidationTypesReady() {
+    if (this.#invalidationTypesPromise) {
+      this.#invalidationTypes = await this.#invalidationTypesPromise;
+      this.#invalidationTypesPromise = void 0;
+    }
   }
   _createConnectable(subject) {
     return rxjs.connectable(subject.pipe(rxjs.map((x) => {
@@ -798,7 +1184,7 @@ var AggregationQuery = class extends Query {
     return batch.read(this.cacheKey);
   }
   invalidateObjectType = (objectType, changes) => {
-    if (this.apiName === objectType) {
+    if (this.#invalidationTypes.has(objectType)) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
     }
@@ -810,33 +1196,64 @@ var AggregationQuery = class extends Query {
 var ObjectAggregationQuery = class extends AggregationQuery {
   async _fetchAggregation() {
     const type = this.cacheKey.otherKeys[API_NAME_IDX];
-    let objectSet = this.store.client({
+    const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX];
+    const objectTypeDef = {
       type: "object",
       apiName: type
-    });
+    };
+    let objectSet;
+    if (this.parsedWireObjectSet) {
+      objectSet = chunkYVZM2JPW_cjs.createObjectSet(objectTypeDef, this.store.client[chunkYVZM2JPW_cjs.additionalContext], this.parsedWireObjectSet);
+    } else {
+      objectSet = this.store.client(objectTypeDef);
+    }
     if (this.rdpConfig) {
       objectSet = objectSet.withProperties(this.rdpConfig);
     }
     objectSet = objectSet.where(this.canonicalWhere);
+    if (intersectWith != null && intersectWith.length > 0) {
+      const intersectSets = intersectWith.map((whereClause) => {
+        let intersectSet = this.store.client(objectTypeDef);
+        if (this.rdpConfig) {
+          intersectSet = intersectSet.withProperties(this.rdpConfig);
+        }
+        return intersectSet.where(whereClause);
+      });
+      objectSet = objectSet.intersect(...intersectSets);
+    }
     return await objectSet.aggregate(this.canonicalAggregate);
   }
 };
 
 // src/observable/internal/aggregation/AggregationsHelper.ts
 var AggregationsHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, rdpCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer2, rdpCanonicalizer, intersectCanonicalizer) {
     super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer2;
     this.rdpCanonicalizer = rdpCanonicalizer;
+    this.intersectCanonicalizer = intersectCanonicalizer;
   }
   observe(options, subFn) {
     return super.observe(options, subFn);
   }
+  async observeAsync(options, subFn) {
+    const query = this.getQueryWithObjectSet(options);
+    await query.ensureInvalidationTypesReady();
+    return this._subscribe(query, options, subFn);
+  }
   getQuery(options) {
+    return this.getOrCreateQuery(options, void 0);
+  }
+  getQueryWithObjectSet(options) {
+    const serializedObjectSet = JSON.stringify(chunkYVZM2JPW_cjs.getWireObjectSet(options.objectSet));
+    return this.getOrCreateQuery(options, serializedObjectSet);
+  }
+  getOrCreateQuery(options, serializedObjectSet) {
     const {
       type,
       where,
       withProperties,
+      intersectWith,
       aggregate
     } = options;
     const {
@@ -845,8 +1262,9 @@ var AggregationsHelper = class extends AbstractHelper {
     const typeKind = "type" in type ? type.type : "interface";
     const canonWhere = this.whereCanonicalizer.canonicalize(where ?? {});
     const canonRdp = withProperties ? this.rdpCanonicalizer.canonicalize(withProperties) : void 0;
+    const canonIntersect = intersectWith && intersectWith.length > 0 ? this.intersectCanonicalizer.canonicalize(intersectWith) : void 0;
     const canonAggregate = this.canonicalizeAggregate(aggregate);
-    const aggregationCacheKey = this.cacheKeys.get("aggregation", typeKind, apiName, canonWhere, canonRdp, canonAggregate);
+    const aggregationCacheKey = this.cacheKeys.get("aggregation", typeKind, apiName, serializedObjectSet, canonWhere, canonRdp, canonIntersect, canonAggregate);
     return this.store.queries.get(aggregationCacheKey, () => {
       if (typeKind !== "object") {
         throw new Error("Only ObjectTypeDefinition is currently supported for aggregations");
@@ -960,16 +1378,26 @@ var CacheKeys = class {
     });
   }
   get(type, ...args) {
-    const normalizedArgs = [...args];
-    while (normalizedArgs.length > 0 && normalizedArgs[normalizedArgs.length - 1] === void 0) {
-      normalizedArgs.pop();
-    }
-    const cacheKeyArgs = [type, ...normalizedArgs];
+    const cacheKeyArgs = this.#normalizeArgs(type, args);
     if (process.env.NODE_ENV !== "production" && DEBUG_CACHE_KEYS) ;
     const cacheKey = this.#cacheKeys.lookupArray(cacheKeyArgs);
     this.#refCounts.register(cacheKey);
     return cacheKey;
   }
+  /**
+   * Look up an existing cache key without creating or registering it.
+   * Returns undefined if the key does not exist in the trie.
+   */
+  peek(type, ...args) {
+    return this.#cacheKeys.peekArray(this.#normalizeArgs(type, args));
+  }
+  #normalizeArgs(type, args) {
+    const normalizedArgs = [...args];
+    while (normalizedArgs.length > 0 && normalizedArgs[normalizedArgs.length - 1] === void 0) {
+      normalizedArgs.pop();
+    }
+    return [type, ...normalizedArgs];
+  }
   retain(cacheKey) {
     this.#refCounts.retain(cacheKey);
   }
@@ -1122,7 +1550,7 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunk7543GRIE_cjs.isObjectSpecifiersObject(value)) {
+    if (chunk6VOFZIIJ_cjs.isObjectSpecifiersObject(value)) {
       const objectType = value.$objectType ?? value.$apiName;
       path.push("$:osdk", objectType, value.$primaryKey);
       return {
@@ -1130,8 +1558,8 @@ var FunctionParamsCanonicalizer = class {
         $primaryKey: value.$primaryKey
       };
     }
-    if (chunkVVKEXIIO_cjs.isObjectSet(value)) {
-      const wire = chunkVVKEXIIO_cjs.getWireObjectSet(value);
+    if (chunkYVZM2JPW_cjs.isObjectSet(value)) {
+      const wire = chunkYVZM2JPW_cjs.getWireObjectSet(value);
       path.push("$:objectset", wire);
       return wire;
     }
@@ -1193,8 +1621,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[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+  constructor(store, subject, queryDef, params, cacheKey, opts, objectSetTypesPromise) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = queryDef.apiName;
@@ -1203,6 +1631,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 +1679,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunk7543GRIE_cjs.applyQuery(this.store.client[chunkVVKEXIIO_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunk6VOFZIIJ_cjs.applyQuery(this.store.client[chunkYVZM2JPW_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -1311,13 +1762,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;
@@ -1761,7 +2213,7 @@ var API_NAME_IDX2 = 1;
 var WHERE_IDX2 = 2;
 var ORDER_BY_IDX = 3;
 var RDP_IDX2 = 4;
-var INTERSECT_IDX = 5;
+var INTERSECT_IDX2 = 5;
 var PIVOT_IDX = 6;
 var RIDS_IDX = 7;
 
@@ -1873,6 +2325,7 @@ var BaseListQuery = class extends Query {
    * Promise tracking an in-progress page fetch
    * @protected
    */
+  #subscriberPageSizes = /* @__PURE__ */ new Map();
   //
   // Shared Implementations
   //
@@ -2027,11 +2480,9 @@ var BaseListQuery = class extends Query {
       return this.pendingPageFetch;
     }
     if (this.pendingFetch) {
-      this.pendingPageFetch = (async () => {
-        await this.pendingFetch;
-        await this.fetchMore();
-      })().finally(() => {
+      this.pendingPageFetch = this.pendingFetch.then(() => {
         this.pendingPageFetch = void 0;
+        return this.fetchMore();
       });
       return this.pendingPageFetch;
     }
@@ -2046,6 +2497,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
@@ -2315,8 +2816,9 @@ var BaseListQuery = class extends Query {
       }).debug("Removing object", object);
     }
     this.store.batch({}, (batch) => {
-      const objectCacheKey = this.store.cacheKeys.get("object", object.$objectType ?? object.$apiName, object.$primaryKey);
-      batch.delete(objectCacheKey, "loaded");
+      for (const objectCacheKey of this.store.objectCacheKeyRegistry.getVariants(object.$objectType ?? object.$apiName, object.$primaryKey)) {
+        batch.delete(objectCacheKey, "loaded");
+      }
     });
   }
 };
@@ -2324,6 +2826,8 @@ var BaseListQuery = class extends Query {
 // src/observable/internal/links/SpecificLinkQuery.ts
 var SpecificLinkQuery = class extends BaseListQuery {
   #sourceApiName;
+  #sourceTypeKind;
+  #sourceUnderlyingObjectType;
   #sourcePk;
   #linkName;
   #whereClause;
@@ -2335,39 +2839,68 @@ 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[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `SpecificLinkQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
-    [this.#sourceApiName, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
+    [this.#sourceApiName, this.#sourceTypeKind, this.#sourceUnderlyingObjectType, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
   }
-  // _fetchAndStore is now implemented in BaseCollectionQuery
   /**
    * Implements fetchPageData from the BaseCollectionQuery template method pattern
-   * Fetches a page of linked objects
    */
   async fetchPageData(signal) {
     const client = this.store.client;
-    const sourceObjectDef = {
-      type: "object",
-      apiName: this.#sourceApiName
-    };
-    const sourceMetadata = await client[chunkVVKEXIIO_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const ontologyProvider = client[chunkYVZM2JPW_cjs.additionalContext].ontologyProvider;
+    const isInterface = this.#sourceTypeKind === "interface";
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
-      const linkDef = sourceMetadata.links?.[this.#linkName];
-      if (!linkDef?.targetType) {
-        throw new Error(`Missing link definition or targetType for link '${this.#linkName}' on object type '${this.#sourceApiName}'`);
+      let targetTypeApiName;
+      if (isInterface) {
+        const interfaceMetadata = await ontologyProvider.getInterfaceDefinition(this.#sourceApiName);
+        const linkDef = interfaceMetadata.links?.[this.#linkName];
+        if (!linkDef) {
+          throw new Error(`Missing link definition for link '${this.#linkName}' on interface '${this.#sourceApiName}'`);
+        }
+        targetTypeApiName = linkDef.targetTypeApiName;
+      } else {
+        const objectMetadata = await ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const linkDef = objectMetadata.links?.[this.#linkName];
+        if (!linkDef?.targetType) {
+          throw new Error(`Missing link definition or targetType for link '${this.#linkName}' on object type '${this.#sourceApiName}'`);
+        }
+        targetTypeApiName = linkDef.targetType;
       }
-      this.sortingStrategy = new OrderBySortingStrategy(linkDef.targetType, this.#orderBy);
+      this.sortingStrategy = new OrderBySortingStrategy(targetTypeApiName, this.#orderBy);
+    }
+    let linkQuery;
+    if (isInterface) {
+      const objectMetadata = await ontologyProvider.getObjectDefinition(this.#sourceUnderlyingObjectType);
+      const interfaceSet = client({
+        type: "interface",
+        apiName: this.#sourceApiName
+      });
+      const objectFilteredByPk = client({
+        type: "object",
+        apiName: this.#sourceUnderlyingObjectType
+      }).where({
+        [objectMetadata.primaryKeyApiName]: this.#sourcePk
+      });
+      const filteredSource = interfaceSet.intersect(objectFilteredByPk);
+      linkQuery = filteredSource.pivotTo(this.#linkName);
+    } else {
+      const objectMetadata = await ontologyProvider.getObjectDefinition(this.#sourceApiName);
+      const sourceSet = client({
+        type: "object",
+        apiName: this.#sourceApiName
+      });
+      const sourceQuery = sourceSet.where({
+        [objectMetadata.primaryKeyApiName]: this.#sourcePk
+      });
+      linkQuery = sourceQuery.pivotTo(this.#linkName);
     }
-    const sourceQuery = client(sourceObjectDef).where({
-      [sourceMetadata.primaryKeyApiName]: this.#sourcePk
-    });
-    const linkQuery = sourceQuery.pivotTo(this.#linkName);
     if (signal?.aborted) {
       throw new Error("Aborted");
     }
     const queryParams = {
-      $pageSize: this.options.pageSize || 100,
+      $pageSize: this.getEffectiveFetchPageSize(),
       $nextPageToken: this.nextPageToken,
       $includeRid: true
     };
@@ -2418,19 +2951,53 @@ var SpecificLinkQuery = class extends BaseListQuery {
     return Promise.resolve();
   };
   invalidateObjectType = (objectType, changes) => {
-    if (this.#sourceApiName === objectType) {
+    if (this.#sourceTypeKind === "object" && this.#sourceApiName === objectType) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
-    } else {
-      return (async () => {
-        const sourceMetadata = await this.store.client[chunkVVKEXIIO_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
-        const linkDef = sourceMetadata.links?.[this.#linkName];
-        if (!linkDef || linkDef.targetType !== objectType) return;
-        const promise = this.revalidate(true);
+    }
+    return (async () => {
+      try {
+        const ontologyProvider = this.store.client[chunkYVZM2JPW_cjs.additionalContext].ontologyProvider;
+        if (this.#sourceTypeKind === "interface") {
+          const objectMetadata = await ontologyProvider.getObjectDefinition(objectType);
+          if (this.#sourceApiName in objectMetadata.interfaceMap) {
+            changes?.modified.add(this.cacheKey);
+            return void await this.revalidate(true);
+          }
+        }
+        let targetTypeApiName;
+        let targetTypeKind;
+        if (this.#sourceTypeKind === "interface") {
+          const interfaceMetadata = await ontologyProvider.getInterfaceDefinition(this.#sourceApiName);
+          const linkDef = interfaceMetadata.links?.[this.#linkName];
+          targetTypeApiName = linkDef?.targetTypeApiName;
+          targetTypeKind = linkDef?.targetType;
+        } else {
+          const objectMetadata = await ontologyProvider.getObjectDefinition(this.#sourceApiName);
+          const linkDef = objectMetadata.links?.[this.#linkName];
+          targetTypeApiName = linkDef?.targetType;
+          targetTypeKind = "object";
+        }
+        if (!targetTypeApiName) return;
+        if (targetTypeApiName === objectType) {
+          changes?.modified.add(this.cacheKey);
+          return void await this.revalidate(true);
+        }
+        if (targetTypeKind === "interface") {
+          const objectMetadata = await ontologyProvider.getObjectDefinition(objectType);
+          if (targetTypeApiName in objectMetadata.interfaceMap) {
+            changes?.modified.add(this.cacheKey);
+            return void await this.revalidate(true);
+          }
+        }
+      } catch (e) {
+        if (process.env.NODE_ENV !== "production") {
+          this.logger?.error("Failed to resolve metadata during invalidation", e);
+        }
         changes?.modified.add(this.cacheKey);
-        return promise;
-      })();
-    }
+        return void await this.revalidate(true);
+      }
+    })();
   };
 };
 
@@ -2443,11 +3010,12 @@ var LinksHelper = class extends AbstractHelper {
   }
   getQuery(options) {
     const {
-      apiName
+      apiName,
+      type: sourceTypeKind
     } = options.srcType;
     const canonWhere = this.whereCanonicalizer.canonicalize(options.where ?? {});
     const canonOrderBy = this.orderByCanonicalizer.canonicalize(options.orderBy ?? {});
-    const linkCacheKey = this.cacheKeys.get("specificLink", apiName, options.pk, options.linkName, canonWhere, canonOrderBy);
+    const linkCacheKey = this.cacheKeys.get("specificLink", apiName, sourceTypeKind, options.sourceUnderlyingObjectType, options.pk, options.linkName, canonWhere, canonOrderBy);
     return this.store.queries.get(linkCacheKey, () => {
       return new SpecificLinkQuery(this.store, this.store.subjects.get(linkCacheKey), linkCacheKey, options);
     });
@@ -2463,162 +3031,6 @@ 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();
 
@@ -2724,6 +3136,7 @@ var ListQuery = class extends BaseListQuery {
   #intersectWith;
   #pivotInfo;
   #objectSet;
+  #pivotIntersectApplied = false;
   /**
    * Register changes to the cache specific to ListQuery
    */
@@ -2731,13 +3144,13 @@ 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[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
     this.#whereClause = cacheKey.otherKeys[WHERE_IDX2];
     this.#orderBy = cacheKey.otherKeys[ORDER_BY_IDX];
-    this.#intersectWith = cacheKey.otherKeys[INTERSECT_IDX];
+    this.#intersectWith = cacheKey.otherKeys[INTERSECT_IDX2];
     this.#pivotInfo = cacheKey.otherKeys[PIVOT_IDX];
     this.#objectSet = this.createObjectSet(store);
     if (!this.#pivotInfo) {
@@ -2760,24 +3173,45 @@ var ListQuery = class extends BaseListQuery {
   get canonicalPivotInfo() {
     return this.#pivotInfo;
   }
-  /**
-   * Create the ObjectSet for this query.
-   */
   /**
    * Implements fetchPageData from BaseCollectionQuery template method
    * Fetches a page of data
    */
   async fetchPageData(signal) {
-    if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkVVKEXIIO_cjs.getWireObjectSet(this.#objectSet);
+    const needsResultType = Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy) || this.#pivotInfo != null && this.#intersectWith != null && this.#intersectWith.length > 0 && !this.#pivotIntersectApplied;
+    if (needsResultType) {
+      const wireObjectSet = chunkYVZM2JPW_cjs.getWireObjectSet(this.#objectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkVVKEXIIO_cjs.additionalContext], wireObjectSet);
-      this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkYVZM2JPW_cjs.additionalContext], wireObjectSet);
+      if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
+        this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
+      }
+      if (this.#pivotInfo != null && this.#intersectWith != null && this.#intersectWith.length > 0 && !this.#pivotIntersectApplied) {
+        const rdpConfig = this.cacheKey.otherKeys[RDP_IDX2];
+        const intersectSets = this.#intersectWith.map((whereClause) => {
+          if (resultType.type === "object") {
+            let objectSet = this.store.client({
+              type: "object",
+              apiName: resultType.apiName
+            });
+            if (rdpConfig != null) {
+              objectSet = objectSet.withProperties(rdpConfig);
+            }
+            return objectSet.where(whereClause);
+          }
+          return this.store.client({
+            type: "interface",
+            apiName: resultType.apiName
+          }).where(whereClause);
+        });
+        this.#objectSet = this.#objectSet.intersect(...intersectSets);
+        this.#pivotIntersectApplied = true;
+      }
     }
     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
@@ -3000,6 +3434,21 @@ var ListQuery = class extends BaseListQuery {
 var InterfaceListQuery = class extends ListQuery {
   createObjectSet(store) {
     const rdpConfig = this.cacheKey.otherKeys[RDP_IDX2];
+    const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
+    if (pivotInfo != null) {
+      const sourceSet = pivotInfo.sourceTypeKind === "interface" ? store.client({
+        type: "interface",
+        apiName: pivotInfo.sourceType
+      }) : store.client({
+        type: "object",
+        apiName: pivotInfo.sourceType
+      });
+      let objectSet = sourceSet.where(this.canonicalWhere).pivotTo(pivotInfo.linkName);
+      if (rdpConfig != null) {
+        objectSet = objectSet.withProperties(rdpConfig);
+      }
+      return objectSet;
+    }
     const type = "interface";
     const objectTypeDef = {
       type,
@@ -3038,7 +3487,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunk7543GRIE_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunk6VOFZIIJ_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));
@@ -3088,37 +3537,37 @@ chunkLDTMSHUZ_cjs.init_cjs_shims();
 var ObjectListQuery = class extends ListQuery {
   createObjectSet(store) {
     const rdpConfig = this.cacheKey.otherKeys[RDP_IDX2];
-    const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX];
+    const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX2];
     const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
     const rids = this.cacheKey.otherKeys[RIDS_IDX];
-    const clientCtx = store.client[chunkVVKEXIIO_cjs.additionalContext];
+    const clientCtx = store.client[chunkYVZM2JPW_cjs.additionalContext];
     const typeDefinition = {
       type: "object",
       apiName: this.apiName
     };
     if (pivotInfo != null) {
-      let sourceSet = store.client({
-        type: "object",
-        apiName: pivotInfo.sourceType
-      });
-      sourceSet = sourceSet.where(this.canonicalWhere);
-      let objectSet2 = sourceSet.pivotTo(pivotInfo.linkName);
+      let sourceSet;
+      if (rids != null) {
+        sourceSet = clientCtx.objectSetFactory({
+          type: "object",
+          apiName: pivotInfo.sourceType
+        }, clientCtx, {
+          type: "static",
+          objects: [...rids]
+        });
+      } else {
+        sourceSet = pivotInfo.sourceTypeKind === "interface" ? store.client({
+          type: "interface",
+          apiName: pivotInfo.sourceType
+        }) : store.client({
+          type: "object",
+          apiName: pivotInfo.sourceType
+        });
+      }
+      let objectSet2 = sourceSet.where(this.canonicalWhere).pivotTo(pivotInfo.linkName);
       if (rdpConfig != null) {
         objectSet2 = objectSet2.withProperties(rdpConfig);
       }
-      if (intersectWith != null && intersectWith.length > 0) {
-        const intersectSets = intersectWith.map((whereClause) => {
-          let intersectSet = store.client({
-            type: "object",
-            apiName: pivotInfo.targetType
-          });
-          if (rdpConfig != null) {
-            intersectSet = intersectSet.withProperties(rdpConfig);
-          }
-          return intersectSet.where(whereClause);
-        });
-        objectSet2 = objectSet2.intersect(...intersectSets);
-      }
       return objectSet2;
     }
     let objectSet;
@@ -3212,7 +3661,7 @@ var ListsHelper = class extends AbstractHelper {
     const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
     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 canonPivot = pivotTo ? this.pivotCanonicalizer.canonicalize(apiName, type, pivotTo) : void 0;
     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, () => {
@@ -3242,8 +3691,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunk7543GRIE_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunk7543GRIE_cjs.ObjectDefRef];
+  const underlying = value[chunk6VOFZIIJ_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunk6VOFZIIJ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3256,7 +3705,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunk7543GRIE_cjs.createOsdkObject(value[chunk7543GRIE_cjs.ClientRef], objectDef, newProps);
+  return chunk6VOFZIIJ_cjs.createOsdkObject(value[chunk6VOFZIIJ_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3267,8 +3716,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunk7543GRIE_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunk7543GRIE_cjs.ObjectDefRef];
+  const underlying = value[chunk6VOFZIIJ_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunk6VOFZIIJ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3284,7 +3733,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunk7543GRIE_cjs.createOsdkObject(value[chunk7543GRIE_cjs.ClientRef], objectDef, newProps);
+  return chunk6VOFZIIJ_cjs.createOsdkObject(value[chunk6VOFZIIJ_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3296,8 +3745,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunk7543GRIE_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunk7543GRIE_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunk6VOFZIIJ_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunk6VOFZIIJ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3311,14 +3760,16 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunk7543GRIE_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunk6VOFZIIJ_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
-      if (!sourceRdpFields.has(field) && field in targetUnderlying) {
-        newProps[field] = targetUnderlying[field];
+      if (field in targetUnderlying) {
+        if (!sourceRdpFields.has(field) || newProps[field] === void 0) {
+          newProps[field] = targetUnderlying[field];
+        }
       }
     }
   }
-  return chunk7543GRIE_cjs.createOsdkObject(sourceValue[chunk7543GRIE_cjs.ClientRef], objectDef, newProps);
+  return chunk6VOFZIIJ_cjs.createOsdkObject(sourceValue[chunk6VOFZIIJ_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3453,40 +3904,54 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkVVKEXIIO_cjs.additionalContext].logger;
+    this.#logger = client[chunkYVZM2JPW_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
-  async fetch(apiName, primaryKey) {
+  async fetch(apiName, primaryKey, defType = "object") {
     const deferred = pDefer();
     const entry = this.#m.get(apiName);
     entry.data.push({
       primaryKey,
       deferred
     });
+    if (entry.defType === void 0) {
+      entry.defType = defType;
+    } else if (entry.defType !== defType) {
+      deferred.reject(new shared_net_errors.PalantirApiError(`Conflicting defType for ${apiName}: existing=${entry.defType}, new=${defType}`));
+      return deferred.promise;
+    }
     if (!entry.timer) {
       entry.timer = setTimeout(() => {
-        this.#loadObjects(apiName, entry.data);
+        this.#loadObjects(apiName, entry.data, entry.defType ?? "object");
       }, this.#maxWait);
     }
     if (entry.data.length >= this.#maxEntries) {
       clearTimeout(entry.timer);
-      this.#loadObjects(apiName, entry.data);
+      this.#loadObjects(apiName, entry.data, entry.defType ?? "object");
     }
     return await deferred.promise;
   }
-  #loadObjects(apiName, arr) {
+  #loadObjects(apiName, arr, defType) {
     this.#m.delete(apiName);
-    this.#reallyLoadObjects(apiName, arr).catch((e) => {
+    const loadFn = defType === "interface" ? this.#loadInterfaceObjects(apiName, arr) : this.#loadObjectTypeObjects(apiName, arr);
+    loadFn.catch((e) => {
       this.#logger?.error("Unhandled exception", e);
+      for (const {
+        primaryKey,
+        deferred
+      } of arr) {
+        const errorMessage = e instanceof Error ? e.message : String(e);
+        deferred.reject(new shared_net_errors.PalantirApiError(`Failed to load ${apiName} with pk ${primaryKey}: ${errorMessage}`));
+      }
     });
   }
-  async #reallyLoadObjects(apiName, arr) {
-    const miniDef = {
+  async #loadObjectTypeObjects(apiName, arr) {
+    const objectDef = {
       type: "object",
       apiName
     };
-    const objMetadata = await this.#client.fetchMetadata(miniDef);
+    const objMetadata = await this.#client.fetchMetadata(objectDef);
     const pks = arr.map((x) => x.primaryKey);
     const whereClause = pks.length === 1 ? {
       [objMetadata.primaryKeyApiName]: {
@@ -3499,7 +3964,7 @@ var BulkObjectLoader = class {
     };
     const {
       data
-    } = await this.#client(miniDef).where(whereClause).fetchPage({
+    } = await this.#client(objectDef).where(whereClause).fetchPage({
       $pageSize: pks.length,
       $includeRid: true
     });
@@ -3515,18 +3980,70 @@ var BulkObjectLoader = class {
       }
     }
   }
+  async #loadInterfaceObjects(apiName, arr) {
+    const pks = arr.map((x) => x.primaryKey);
+    const interfaceDef = {
+      type: "interface",
+      apiName
+    };
+    const interfaceMetadata = await this.#client.fetchMetadata(interfaceDef);
+    const implementingTypes = interfaceMetadata.implementedBy ?? [];
+    const foundObjects = /* @__PURE__ */ new Map();
+    for (const objectTypeName of implementingTypes) {
+      const objectDef = {
+        type: "object",
+        apiName: objectTypeName
+      };
+      const objMetadata = await this.#client.fetchMetadata(objectDef);
+      const remainingPks = pks.filter((pk) => !foundObjects.has(pk));
+      if (remainingPks.length === 0) {
+        break;
+      }
+      const whereClause = remainingPks.length === 1 ? {
+        [objMetadata.primaryKeyApiName]: {
+          $eq: remainingPks[0]
+        }
+      } : {
+        [objMetadata.primaryKeyApiName]: {
+          $in: remainingPks
+        }
+      };
+      const {
+        data
+      } = await this.#client(objectDef).where(whereClause).fetchPage({
+        $pageSize: remainingPks.length
+      });
+      for (const obj of data) {
+        foundObjects.set(obj.$primaryKey, obj);
+      }
+    }
+    for (const {
+      primaryKey,
+      deferred
+    } of arr) {
+      const object = foundObjects.get(primaryKey);
+      if (object) {
+        deferred.resolve(object);
+      } else {
+        deferred.reject(new shared_net_errors.PalantirApiError(`Interface ${apiName} object not found: ${primaryKey}`));
+      }
+    }
+  }
 };
 
 // src/observable/internal/object/ObjectQuery.ts
 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[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+  #defType;
+  #implementingTypes;
+  constructor(store, subject, type, pk, cacheKey, opts, defType = "object") {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
     this.#pk = pk;
+    this.#defType = defType;
   }
   _createConnectable(subject) {
     return rxjs.connectable(subject.pipe(rxjs.map((x) => {
@@ -3555,7 +4072,7 @@ var ObjectQuery = class extends Query {
     let obj;
     if (rdpConfig) {
       const miniDef = {
-        type: "object",
+        type: this.#defType,
         apiName: this.#apiName
       };
       const fetched = await this.store.client(miniDef).withProperties(rdpConfig).fetchOne(this.#pk, {
@@ -3563,7 +4080,7 @@ var ObjectQuery = class extends Query {
       });
       obj = fetched;
     } else {
-      obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk);
+      obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk, this.#defType);
     }
     this.store.batch({}, (batch) => {
       this.writeToStore(obj, "loaded", batch);
@@ -3582,12 +4099,26 @@ var ObjectQuery = class extends Query {
     this.store.objects.propagateWrite(this.cacheKey, tombstone, status, batch);
     return batch.read(this.cacheKey);
   }
-  invalidateObjectType = (objectType, changes) => {
-    if (this.#apiName === objectType) {
+  invalidateObjectType = async (objectType, changes) => {
+    if (this.#defType === "object") {
+      if (this.#apiName === objectType) {
+        changes?.modified.add(this.cacheKey);
+        return this.revalidate(true);
+      }
+      return;
+    }
+    if (!this.#implementingTypes) {
+      const interfaceDef = {
+        type: "interface",
+        apiName: this.#apiName
+      };
+      const metadata = await this.store.client.fetchMetadata(interfaceDef);
+      this.#implementingTypes = new Set(metadata.implementedBy ?? []);
+    }
+    if (this.#implementingTypes.has(objectType)) {
       changes?.modified.add(this.cacheKey);
       return this.revalidate(true);
     }
-    return Promise.resolve();
   };
 };
 
@@ -3601,10 +4132,11 @@ var ObjectsHelper = class extends AbstractHelper {
     const {
       pk
     } = options;
+    const defType = chunk6VOFZIIJ_cjs.getDefType(options.apiName);
     const objectCacheKey = this.cacheKeys.get("object", apiName, pk, rdpConfig ?? void 0);
     return this.store.queries.get(objectCacheKey, () => new ObjectQuery(this.store, this.store.subjects.get(objectCacheKey), apiName, pk, objectCacheKey, {
       dedupeInterval: 0
-    }));
+    }, defType));
   }
   /**
    * Internal helper method for writing objects to the store and returning their
@@ -3650,11 +4182,18 @@ var ObjectsHelper = class extends AbstractHelper {
     }
   }
   /**
-   * Check if a cache key is actively observed
+   * Check if a cache key is actively observed or pending cleanup.
+   * During React unmount-remount cycles, a key may be momentarily
+   * unobserved while its cleanup is deferred to a microtask.
+   * We still propagate to such keys to prevent stale data when
+   * the subscription is re-established.
    */
   isKeyActive(key) {
     const subject = this.store.subjects.peek(key);
-    return subject?.observed === true;
+    if (subject?.observed === true) {
+      return true;
+    }
+    return (this.store.pendingCleanup.get(key) ?? 0) > 0;
   }
   /**
    * Type guard to check if a value is an ObjectHolder
@@ -3683,7 +4222,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[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -3698,6 +4237,9 @@ var ObjectSetQuery = class extends BaseListQuery {
       this.minResultsToLoad = opts.pageSize || 0;
     }
   }
+  get rdpConfig() {
+    return this.#operations.withProperties ?? null;
+  }
   #composeObjectSet(opts) {
     let result = opts.baseObjectSet;
     if (opts.withProperties) {
@@ -3728,7 +4270,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkVVKEXIIO_cjs.getWireObjectSet(os);
+        const wire = chunkYVZM2JPW_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3736,7 +4278,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkVVKEXIIO_cjs.getWireObjectSet(os);
+        const wire = chunkYVZM2JPW_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3744,7 +4286,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkVVKEXIIO_cjs.getWireObjectSet(os);
+        const wire = chunkYVZM2JPW_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3764,15 +4306,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 = chunkVVKEXIIO_cjs.getWireObjectSet(this.#composedObjectSet);
+      const wireObjectSet = chunkYVZM2JPW_cjs.getWireObjectSet(this.#composedObjectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkVVKEXIIO_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkYVZM2JPW_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 ? {
@@ -3820,10 +4362,11 @@ var ObjectSetQuery = class extends BaseListQuery {
 
 // src/observable/internal/objectset/ObjectSetHelper.ts
 var ObjectSetHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2) {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer) {
     super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer2;
     this.orderByCanonicalizer = orderByCanonicalizer2;
+    this.rdpCanonicalizer = rdpCanonicalizer;
   }
   observe(options, subFn) {
     const ret = super.observe(options, subFn);
@@ -3836,7 +4379,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkYVZM2JPW_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -3849,16 +4392,16 @@ var ObjectSetHelper = class extends AbstractHelper {
       operations.where = this.whereCanonicalizer.canonicalize(options.where);
     }
     if (options.withProperties) {
-      operations.withProperties = Object.keys(options.withProperties).sort();
+      operations.withProperties = this.rdpCanonicalizer.canonicalize(options.withProperties);
     }
     if (options.union && options.union.length > 0) {
-      operations.union = options.union.map((os) => JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkYVZM2JPW_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkYVZM2JPW_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkVVKEXIIO_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkYVZM2JPW_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -3877,14 +4420,14 @@ var ObjectSetHelper = class extends AbstractHelper {
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 var PivotCanonicalizer = class {
   #cache = /* @__PURE__ */ new Map();
-  canonicalize(sourceType, linkName) {
-    const key = `${sourceType}::${linkName}`;
+  canonicalize(sourceType, sourceTypeKind, linkName) {
+    const key = `${sourceTypeKind}:${sourceType}::${linkName}`;
     let canonical = this.#cache.get(key);
     if (!canonical) {
       canonical = {
         sourceType,
-        linkName,
-        targetType: "<targetType>"
+        sourceTypeKind,
+        linkName
       };
       this.#cache.set(key, canonical);
     }
@@ -3930,7 +4473,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkVVKEXIIO_cjs.createWithPropertiesObjectSet(
+      const builder = chunkYVZM2JPW_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -3990,6 +4533,17 @@ var Store = class {
   ridListCanonicalizer = new RidListCanonicalizer();
   /** @internal */
   queries = new Queries();
+  /**
+   * Tracks cache keys with deferred cleanup. During React unmount-remount
+   * cycles, a subscription may be cleaned up and immediately re-created.
+   * By deferring cleanup to a microtask, we prevent propagateWrite from
+   * skipping keys that are momentarily between subscriptions.
+   *
+   * The value is a count (not a boolean) so multiple unsubscribes within the
+   * same tick schedule the correct number of releases.
+   * @internal
+   */
+  pendingCleanup = /* @__PURE__ */ new Map();
   objectCacheKeyRegistry = new ObjectCacheKeyRegistry();
   layers = new Layers({
     logger: this.logger,
@@ -3998,19 +4552,19 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkVVKEXIIO_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkYVZM2JPW_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
     this.cacheKeys = new CacheKeys({
       onDestroy: this.#cleanupCacheKey
     });
-    this.aggregations = new AggregationsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.rdpCanonicalizer);
+    this.aggregations = new AggregationsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.rdpCanonicalizer, this.intersectCanonicalizer);
     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);
+    this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer);
   }
   /**
    * Called after a key is no longer retained and the timeout has elapsed
@@ -4172,6 +4726,11 @@ var Store = class {
         return cacheKey.otherKeys[RDP_IDX2];
       } else if (cacheKey.type === "aggregation") {
         return cacheKey.otherKeys[RDP_IDX];
+      } else if (cacheKey.type === "objectSet") {
+        const query = this.queries.peek(cacheKey);
+        if (query) {
+          return query.rdpConfig;
+        }
       }
     }
     return void 0;
@@ -4271,10 +4830,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunk7543GRIE_cjs.createClientFromContext({
-    ...client[chunkVVKEXIIO_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkVVKEXIIO_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk7543GRIE_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunk6VOFZIIJ_cjs.createClientFromContext({
+    ...client[chunkYVZM2JPW_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkYVZM2JPW_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk6VOFZIIJ_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -4318,11 +4877,19 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunk7543GRIE_cjs.createClientWithTransaction; }
+  get: function () { return chunk6VOFZIIJ_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkVVKEXIIO_cjs.augment; }
+  get: function () { return chunkYVZM2JPW_cjs.augment; }
+});
+Object.defineProperty(exports, "getWireObjectSet", {
+  enumerable: true,
+  get: function () { return chunkYVZM2JPW_cjs.getWireObjectSet; }
+});
+Object.defineProperty(exports, "isObjectSet", {
+  enumerable: true,
+  get: function () { return chunkYVZM2JPW_cjs.isObjectSet; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;