@osdk/client 2.7.1 → 2.7.2

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

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkOVZCGOMG_cjs = require('../chunk-OVZCGOMG.cjs');
-var chunkOZNDU7AU_cjs = require('../chunk-OZNDU7AU.cjs');
+var chunkYFQRCAZX_cjs = require('../chunk-YFQRCAZX.cjs');
+var chunkR6UWEIUJ_cjs = require('../chunk-R6UWEIUJ.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", chunkOZNDU7AU_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkR6UWEIUJ_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) => chunkOZNDU7AU_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkR6UWEIUJ_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkOZNDU7AU_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkR6UWEIUJ_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkOZNDU7AU_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkR6UWEIUJ_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -247,24 +247,8 @@ var ObservableClientImpl = class {
   };
   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 +279,110 @@ 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) {
+    parentSub.add(store.links.observe({
+      ...options,
+      srcType: {
+        type: "object",
+        apiName: obj.$objectType ?? obj.$apiName
+      },
+      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}`;
+    parentSub.add(store.links.observe({
+      ...options,
+      srcType: {
+        type: "object",
+        apiName: obj.$objectType ?? obj.$apiName
+      },
+      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 +459,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkOZNDU7AU_cjs.additionalContext].objectFactory2(store.client[chunkOZNDU7AU_cjs.additionalContext], [{
+        const create = store.client[chunkR6UWEIUJ_cjs.additionalContext].objectFactory2(store.client[chunkR6UWEIUJ_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -592,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[chunkOZNDU7AU_cjs.additionalContext].logger : store.client[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkR6UWEIUJ_cjs.additionalContext].logger : store.client[chunkR6UWEIUJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -750,7 +838,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[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR6UWEIUJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -1121,7 +1209,7 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunkOVZCGOMG_cjs.isObjectSpecifiersObject(value)) {
+    if (chunkYFQRCAZX_cjs.isObjectSpecifiersObject(value)) {
       const objectType = value.$objectType ?? value.$apiName;
       path.push("$:osdk", objectType, value.$primaryKey);
       return {
@@ -1129,8 +1217,8 @@ var FunctionParamsCanonicalizer = class {
         $primaryKey: value.$primaryKey
       };
     }
-    if (chunkOZNDU7AU_cjs.isObjectSet(value)) {
-      const wire = chunkOZNDU7AU_cjs.getWireObjectSet(value);
+    if (chunkR6UWEIUJ_cjs.isObjectSet(value)) {
+      const wire = chunkR6UWEIUJ_cjs.getWireObjectSet(value);
       path.push("$:objectset", wire);
       return wire;
     }
@@ -1193,7 +1281,7 @@ var FunctionQuery = class extends Query {
   #dependsOnObjects;
   #queryDef;
   constructor(store, subject, queryDef, params, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR6UWEIUJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = queryDef.apiName;
@@ -1227,7 +1315,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunkOVZCGOMG_cjs.applyQuery(this.store.client[chunkOZNDU7AU_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunkYFQRCAZX_cjs.applyQuery(this.store.client[chunkR6UWEIUJ_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -2334,7 +2422,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[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR6UWEIUJ_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;
@@ -2350,7 +2438,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunkOZNDU7AU_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkR6UWEIUJ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       const linkDef = sourceMetadata.links?.[this.#linkName];
       if (!linkDef?.targetType) {
@@ -2422,7 +2510,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunkOZNDU7AU_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkR6UWEIUJ_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -2730,7 +2818,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[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR6UWEIUJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -2768,10 +2856,10 @@ var ListQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkOZNDU7AU_cjs.getWireObjectSet(this.#objectSet);
+      const wireObjectSet = chunkR6UWEIUJ_cjs.getWireObjectSet(this.#objectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkOZNDU7AU_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkR6UWEIUJ_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
     }
     const resp = await this.#objectSet.fetchPage({
@@ -2999,15 +3087,35 @@ 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];
+    const rids = this.cacheKey.otherKeys[RIDS_IDX];
+    if (pivotInfo != null) {
+      const sourceSet = createSourceSetForPivot(store, pivotInfo, rids);
+      let objectSet2 = sourceSet.where(this.canonicalWhere).pivotTo(pivotInfo.linkName);
+      if (rdpConfig != null) {
+        objectSet2 = objectSet2.withProperties(rdpConfig);
+      }
+      return objectSet2;
+    }
     const type = "interface";
     const objectTypeDef = {
       type,
       apiName: this.apiName
     };
+    const clientCtx = store.client[chunkR6UWEIUJ_cjs.additionalContext];
+    let objectSet;
+    if (rids != null) {
+      objectSet = clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
+        type: "static",
+        objects: [...rids]
+      });
+    } else {
+      objectSet = store.client(objectTypeDef);
+    }
     if (rdpConfig != null) {
-      return store.client(objectTypeDef).withProperties(rdpConfig).where(this.canonicalWhere);
+      objectSet = objectSet.withProperties(rdpConfig);
     }
-    return store.client(objectTypeDef).where(this.canonicalWhere);
+    return objectSet.where(this.canonicalWhere);
   }
   async revalidateObjectType(apiName) {
     const objectMetadata = await this.store.client.fetchMetadata({
@@ -3037,7 +3145,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunkOVZCGOMG_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkYFQRCAZX_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));
@@ -3055,6 +3163,28 @@ var InterfaceListQuery = class extends ListQuery {
     };
   }
 };
+function createSourceSetForPivot(store, pivotInfo, rids) {
+  const clientCtx = store.client[chunkR6UWEIUJ_cjs.additionalContext];
+  if (rids != null) {
+    return clientCtx.objectSetFactory({
+      type: "object",
+      apiName: pivotInfo.sourceType
+    }, clientCtx, {
+      type: "static",
+      objects: [...rids]
+    });
+  }
+  if (pivotInfo.sourceTypeKind === "interface") {
+    return store.client({
+      type: "interface",
+      apiName: pivotInfo.sourceType
+    });
+  }
+  return store.client({
+    type: "object",
+    apiName: pivotInfo.sourceType
+  });
+}
 async function reloadDataAsFullObjects(client, data) {
   if (data.length === 0) {
     return data;
@@ -3090,34 +3220,34 @@ 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[chunkOZNDU7AU_cjs.additionalContext];
+    const clientCtx = store.client[chunkR6UWEIUJ_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;
@@ -3211,7 +3341,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, () => {
@@ -3241,8 +3371,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunkOVZCGOMG_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkOVZCGOMG_cjs.ObjectDefRef];
+  const underlying = value[chunkYFQRCAZX_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkYFQRCAZX_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3255,7 +3385,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunkOVZCGOMG_cjs.createOsdkObject(value[chunkOVZCGOMG_cjs.ClientRef], objectDef, newProps);
+  return chunkYFQRCAZX_cjs.createOsdkObject(value[chunkYFQRCAZX_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3266,8 +3396,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunkOVZCGOMG_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunkOVZCGOMG_cjs.ObjectDefRef];
+  const underlying = value[chunkYFQRCAZX_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkYFQRCAZX_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3283,7 +3413,7 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunkOVZCGOMG_cjs.createOsdkObject(value[chunkOVZCGOMG_cjs.ClientRef], objectDef, newProps);
+  return chunkYFQRCAZX_cjs.createOsdkObject(value[chunkYFQRCAZX_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3295,8 +3425,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunkOVZCGOMG_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunkOVZCGOMG_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkYFQRCAZX_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkYFQRCAZX_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3310,14 +3440,14 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunkOVZCGOMG_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkYFQRCAZX_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
       if (!sourceRdpFields.has(field) && field in targetUnderlying) {
         newProps[field] = targetUnderlying[field];
       }
     }
   }
-  return chunkOVZCGOMG_cjs.createOsdkObject(sourceValue[chunkOVZCGOMG_cjs.ClientRef], objectDef, newProps);
+  return chunkYFQRCAZX_cjs.createOsdkObject(sourceValue[chunkYFQRCAZX_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3452,40 +3582,54 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkOZNDU7AU_cjs.additionalContext].logger;
+    this.#logger = client[chunkR6UWEIUJ_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]: {
@@ -3498,7 +3642,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
     });
@@ -3514,18 +3658,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[chunkOZNDU7AU_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[chunkR6UWEIUJ_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) => {
@@ -3554,7 +3750,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, {
@@ -3562,7 +3758,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);
@@ -3581,12 +3777,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();
   };
 };
 
@@ -3600,10 +3810,11 @@ var ObjectsHelper = class extends AbstractHelper {
     const {
       pk
     } = options;
+    const defType = chunkYFQRCAZX_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
@@ -3682,7 +3893,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[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR6UWEIUJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
@@ -3727,7 +3938,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.union) {
       for (const os of opts.union) {
-        const wire = chunkOZNDU7AU_cjs.getWireObjectSet(os);
+        const wire = chunkR6UWEIUJ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3735,7 +3946,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.intersect) {
       for (const os of opts.intersect) {
-        const wire = chunkOZNDU7AU_cjs.getWireObjectSet(os);
+        const wire = chunkR6UWEIUJ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3743,7 +3954,7 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     if (opts.subtract) {
       for (const os of opts.subtract) {
-        const wire = chunkOZNDU7AU_cjs.getWireObjectSet(os);
+        const wire = chunkR6UWEIUJ_cjs.getWireObjectSet(os);
         if (wire.type) {
           types.add(wire.type);
         }
@@ -3763,10 +3974,10 @@ 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 = chunkOZNDU7AU_cjs.getWireObjectSet(this.#composedObjectSet);
+      const wireObjectSet = chunkR6UWEIUJ_cjs.getWireObjectSet(this.#composedObjectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkOZNDU7AU_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkR6UWEIUJ_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#operations.orderBy);
     }
     const resp = await this.#composedObjectSet.fetchPage({
@@ -3835,7 +4046,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkOZNDU7AU_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkR6UWEIUJ_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -3851,13 +4062,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(chunkOZNDU7AU_cjs.getWireObjectSet(os)));
+      operations.union = options.union.map((os) => JSON.stringify(chunkR6UWEIUJ_cjs.getWireObjectSet(os)));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkOZNDU7AU_cjs.getWireObjectSet(os)));
+      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkR6UWEIUJ_cjs.getWireObjectSet(os)));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkOZNDU7AU_cjs.getWireObjectSet(os)));
+      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkR6UWEIUJ_cjs.getWireObjectSet(os)));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -3876,14 +4087,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);
     }
@@ -3929,7 +4140,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkOZNDU7AU_cjs.createWithPropertiesObjectSet(
+      const builder = chunkR6UWEIUJ_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -3997,7 +4208,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkOZNDU7AU_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkR6UWEIUJ_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -4270,10 +4481,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkOVZCGOMG_cjs.createClientFromContext({
-    ...client[chunkOZNDU7AU_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkOZNDU7AU_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkOVZCGOMG_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkYFQRCAZX_cjs.createClientFromContext({
+    ...client[chunkR6UWEIUJ_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkR6UWEIUJ_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkYFQRCAZX_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -4317,11 +4528,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkOVZCGOMG_cjs.createClientWithTransaction; }
+  get: function () { return chunkYFQRCAZX_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkOZNDU7AU_cjs.augment; }
+  get: function () { return chunkR6UWEIUJ_cjs.augment; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;