@osdk/client 2.5.0-beta.7 → 2.5.0-beta.9

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

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkBY2PQEYA_cjs = require('../chunk-BY2PQEYA.cjs');
-var chunk5KDG5ZET_cjs = require('../chunk-5KDG5ZET.cjs');
+var chunkHCCGD2AP_cjs = require('../chunk-HCCGD2AP.cjs');
+var chunkMKL3HEQ5_cjs = require('../chunk-MKL3HEQ5.cjs');
 require('../chunk-Q7SFCCGT.cjs');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
 var rxjs = require('rxjs');
@@ -144,7 +144,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunk5KDG5ZET_cjs.additionalContext].objectFactory2(store.client[chunk5KDG5ZET_cjs.additionalContext], [{
+        const create = store.client[chunkMKL3HEQ5_cjs.additionalContext].objectFactory2(store.client[chunkMKL3HEQ5_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -825,7 +825,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunk5KDG5ZET_cjs.additionalContext].logger : store.client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkMKL3HEQ5_cjs.additionalContext].logger : store.client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -1381,7 +1381,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[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMKL3HEQ5_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;
@@ -1398,7 +1398,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       type: "object",
       apiName: this.#sourceApiName
     };
-    const sourceMetadata = await client[chunk5KDG5ZET_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+    const sourceMetadata = await client[chunkMKL3HEQ5_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
     const sourceQuery = client(sourceObjectDef).where({
       [sourceMetadata.primaryKeyApiName]: this.#sourcePk
     });
@@ -1462,7 +1462,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
       return this.revalidate(true);
     } else {
       return (async () => {
-        const sourceMetadata = await this.store.client[chunk5KDG5ZET_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
+        const sourceMetadata = await this.store.client[chunkMKL3HEQ5_cjs.additionalContext].ontologyProvider.getObjectDefinition(this.#sourceApiName);
         const linkDef = sourceMetadata.links?.[this.#linkName];
         if (!linkDef || linkDef.targetType !== objectType) return;
         const promise = this.revalidate(true);
@@ -1582,8 +1582,6 @@ function objectSortaMatchesWhereClause(o, whereClause, strict) {
 var API_NAME_IDX = 1;
 var ListQuery = class extends BaseListQuery {
   // pageSize?: number; // this is the internal page size. we need to track this properly
-  #type;
-  #apiName;
   #whereClause;
   // Using base class minResultsToLoad instead of a private property
   #orderBy;
@@ -1594,24 +1592,23 @@ var ListQuery = class extends BaseListQuery {
   registerCacheChanges(batch) {
     batch.changes.registerList(this.cacheKey);
   }
-  constructor(store, subject, apiType, apiName, whereClause, orderBy, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+  constructor(store, subject, apiName, whereClause, orderBy, cacheKey, opts) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
-    this.#type = apiType;
-    this.#apiName = apiName;
+    this.apiName = apiName;
     this.#whereClause = whereClause;
     this.#orderBy = orderBy;
-    this.#objectSet = store.client({
-      type: this.#type,
-      apiName: this.#apiName
-    }).where(this.#whereClause);
-    this.sortingStrategy = new OrderBySortingStrategy(this.#apiName, this.#orderBy);
+    this.#objectSet = this.createObjectSet(store);
+    this.sortingStrategy = new OrderBySortingStrategy(this.apiName, this.#orderBy);
     this.minResultsToLoad = 0;
   }
   get canonicalWhere() {
     return this.#whereClause;
   }
+  /**
+   * Create the ObjectSet for this query.
+   */
   /**
    * Implements fetchPageData from BaseCollectionQuery template method
    * Fetches a page of data
@@ -1630,10 +1627,7 @@ var ListQuery = class extends BaseListQuery {
       throw new Error("Aborted");
     }
     this.nextPageToken = resp.nextPageToken;
-    let fetchedData = resp.data;
-    if (this.#type === "interface") {
-      fetchedData = await reloadDataAsFullObjects(this.store.client, fetchedData);
-    }
+    const fetchedData = await this.postProcessFetchedData(resp.data);
     return {
       ...resp,
       data: fetchedData
@@ -1656,30 +1650,9 @@ var ListQuery = class extends BaseListQuery {
    * @param apiName to invalidate
    * @returns
    */
-  revalidateObjectType = async (apiName) => {
-    if (this.#type === "object") {
-      if (this.#apiName === apiName) {
-        await this.revalidate(
-          /* force */
-          true
-        );
-        return;
-      } else {
-        return;
-      }
-    }
-    const objectMetadata = await this.store.client.fetchMetadata({
-      type: "object",
-      apiName
-    });
-    if (this.#apiName in objectMetadata.interfaceMap) {
-      await this.revalidate(
-        /* force */
-        true
-      );
-      return;
-    }
-  };
+  /**
+   * Postprocess fetched data.
+   */
   invalidateObjectType = async (objectType, changes) => {
     if (this.cacheKey.otherKeys[1] === objectType) {
       changes?.modified.add(this.cacheKey);
@@ -1707,7 +1680,7 @@ var ListQuery = class extends BaseListQuery {
     if (changes.modified.has(this.cacheKey)) return;
     changes.modified.add(this.cacheKey);
     try {
-      const relevantObjects = this._extractRelevantObjects(changes);
+      const relevantObjects = this._extractAndCategorizeRelevantObjects(changes);
       const status = optimisticId || relevantObjects.added.sortaMatches.size > 0 || relevantObjects.modified.sortaMatches.size > 0 ? "loading" : "loaded";
       const newList = [];
       let needsRevalidation = false;
@@ -1774,8 +1747,8 @@ var ListQuery = class extends BaseListQuery {
     }
     return false;
   }
-  _extractRelevantObjects(changes) {
-    const relevantObjects = this.#type === "object" ? this.#extractRelevantObjectsForTypeObject(changes) : this.#extractRelevantObjectsForTypeInterface(changes);
+  _extractAndCategorizeRelevantObjects(changes) {
+    const relevantObjects = this.extractRelevantObjects(changes);
     for (const group of Object.values(relevantObjects)) {
       for (const obj of group.all ?? []) {
         const matchType = this.#matchType(obj);
@@ -1786,39 +1759,9 @@ var ListQuery = class extends BaseListQuery {
     }
     return relevantObjects;
   }
-  #extractRelevantObjectsForTypeInterface(changes) {
-    const matchesApiName = ([, object]) => {
-      return this.#apiName in object[chunkBY2PQEYA_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));
-    return {
-      added: {
-        all: added,
-        strictMatches: /* @__PURE__ */ new Set(),
-        sortaMatches: /* @__PURE__ */ new Set()
-      },
-      modified: {
-        all: modified,
-        strictMatches: /* @__PURE__ */ new Set(),
-        sortaMatches: /* @__PURE__ */ new Set()
-      }
-    };
-  }
-  #extractRelevantObjectsForTypeObject(changes) {
-    return {
-      added: {
-        all: changes.addedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX]) ?? [],
-        strictMatches: /* @__PURE__ */ new Set(),
-        sortaMatches: /* @__PURE__ */ new Set()
-      },
-      modified: {
-        all: changes.modifiedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX]) ?? [],
-        strictMatches: /* @__PURE__ */ new Set(),
-        sortaMatches: /* @__PURE__ */ new Set()
-      }
-    };
-  }
+  /**
+   * Extract relevant objects for this query type.
+   */
   registerStreamUpdates(sub) {
     const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
       methodName: "registerStreamUpdates"
@@ -1829,10 +1772,10 @@ var ListQuery = class extends BaseListQuery {
       }).info("Subscribing from websocket");
     }
     const websocketSubscription = this.#objectSet.subscribe({
-      onChange: this.#onOswChange.bind(this),
-      onError: this.#onOswError.bind(this),
-      onOutOfDate: this.#onOswOutOfDate.bind(this),
-      onSuccessfulSubscription: this.#onOswSuccessfulSubscription.bind(this)
+      onChange: this.onOswChange.bind(this),
+      onError: this.onOswError.bind(this),
+      onOutOfDate: this.onOswOutOfDate.bind(this),
+      onSuccessfulSubscription: this.onOswSuccessfulSubscription.bind(this)
     });
     sub.add(() => {
       if (process.env.NODE_ENV !== "production") {
@@ -1843,28 +1786,28 @@ var ListQuery = class extends BaseListQuery {
       websocketSubscription.unsubscribe();
     });
   }
-  #onOswSuccessfulSubscription() {
+  onOswSuccessfulSubscription() {
     if (process.env.NODE_ENV !== "production") {
       this.logger?.child({
         methodName: "onSuccessfulSubscription"
       }).debug("");
     }
   }
-  #onOswOutOfDate() {
+  onOswOutOfDate() {
     if (process.env.NODE_ENV !== "production") {
       this.logger?.child({
         methodName: "onOutOfDate"
       }).debug("");
     }
   }
-  #onOswError(errors) {
+  onOswError(errors) {
     if (this.logger) {
       this.logger?.child({
         methodName: "onError"
       }).error("subscription errors", errors);
     }
   }
-  #onOswChange({
+  onOswChange({
     object: objOrIface,
     state
   }) {
@@ -1882,10 +1825,10 @@ var ListQuery = class extends BaseListQuery {
         this.store.objects.storeOsdkInstances([object], batch);
       });
     } else if (state === "REMOVED") {
-      this.#onOswRemoved(objOrIface, logger);
+      this.onOswRemoved(objOrIface, logger);
     }
   }
-  #onOswRemoved(objOrIface, logger) {
+  onOswRemoved(objOrIface, logger) {
     this.store.batch({}, (batch) => {
       const existing = batch.read(this.cacheKey);
       !existing ? process.env.NODE_ENV !== "production" ? invariant2__default.default(false, "the truth value for our list should exist as we already subscribed") : invariant2__default.default(false) : void 0;
@@ -1916,10 +1859,54 @@ var ListQuery = class extends BaseListQuery {
     });
   }
 };
+
+// src/observable/internal/list/InterfaceListQuery.ts
+var InterfaceListQuery = class extends ListQuery {
+  createObjectSet(store) {
+    return store.client({
+      type: "interface",
+      apiName: this.apiName
+    }).where(this.canonicalWhere);
+  }
+  async revalidateObjectType(apiName) {
+    const objectMetadata = await this.store.client.fetchMetadata({
+      type: "object",
+      apiName
+    });
+    if (this.apiName in objectMetadata.interfaceMap) {
+      await this.revalidate(
+        /* force */
+        true
+      );
+    }
+  }
+  async postProcessFetchedData(data) {
+    return reloadDataAsFullObjects(this.store.client, data);
+  }
+  extractRelevantObjects(changes) {
+    const matchesApiName = ([, object]) => {
+      return this.apiName in object[chunkHCCGD2AP_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));
+    return {
+      added: {
+        all: added,
+        strictMatches: /* @__PURE__ */ new Set(),
+        sortaMatches: /* @__PURE__ */ new Set()
+      },
+      modified: {
+        all: modified,
+        strictMatches: /* @__PURE__ */ new Set(),
+        sortaMatches: /* @__PURE__ */ new Set()
+      }
+    };
+  }
+};
 async function reloadDataAsFullObjects(client, data) {
   const groups = groupBy__default.default(data, (x) => x.$objectType);
   const objectTypeToPrimaryKeyToObject = Object.fromEntries(await Promise.all(Object.entries(groups).map(async ([apiName, objects]) => {
-    const objectDef = objects[0][chunkBY2PQEYA_cjs.UnderlyingOsdkObject][chunkBY2PQEYA_cjs.ObjectDefRef];
+    const objectDef = objects[0][chunkHCCGD2AP_cjs.UnderlyingOsdkObject][chunkHCCGD2AP_cjs.ObjectDefRef];
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map((x) => x.$primaryKey)
@@ -1935,6 +1922,41 @@ async function reloadDataAsFullObjects(client, data) {
   return data;
 }
 
+// src/observable/internal/list/ObjectListQuery.ts
+var ObjectListQuery = class extends ListQuery {
+  createObjectSet(store) {
+    return store.client({
+      type: "object",
+      apiName: this.apiName
+    }).where(this.canonicalWhere);
+  }
+  async revalidateObjectType(apiName) {
+    if (this.apiName === apiName) {
+      await this.revalidate(
+        /* force */
+        true
+      );
+    }
+  }
+  postProcessFetchedData(data) {
+    return Promise.resolve(data);
+  }
+  extractRelevantObjects(changes) {
+    return {
+      added: {
+        all: changes.addedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX]) ?? [],
+        strictMatches: /* @__PURE__ */ new Set(),
+        sortaMatches: /* @__PURE__ */ new Set()
+      },
+      modified: {
+        all: changes.modifiedObjects.get(this.cacheKey.otherKeys[API_NAME_IDX]) ?? [],
+        strictMatches: /* @__PURE__ */ new Set(),
+        sortaMatches: /* @__PURE__ */ new Set()
+      }
+    };
+  }
+};
+
 // src/observable/internal/list/ListsHelper.ts
 var ListsHelper = class extends AbstractHelper {
   constructor(store, cacheKeys, whereCanonicalizer, orderByCanonicalizer) {
@@ -1962,7 +1984,8 @@ var ListsHelper = class extends AbstractHelper {
     const canonOrderBy = this.orderByCanonicalizer.canonicalize(orderBy ?? {});
     const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy);
     return this.store.queries.get(listCacheKey, () => {
-      return new ListQuery(this.store, this.store.subjects.get(listCacheKey), type, apiName, canonWhere, canonOrderBy, listCacheKey, options);
+      const QueryClass = type === "object" ? ObjectListQuery : InterfaceListQuery;
+      return new QueryClass(this.store, this.store.subjects.get(listCacheKey), apiName, canonWhere, canonOrderBy, listCacheKey, options);
     });
   }
 };
@@ -1993,7 +2016,7 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunk5KDG5ZET_cjs.additionalContext].logger;
+    this.#logger = client[chunkMKL3HEQ5_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
@@ -2056,7 +2079,7 @@ var ObjectQuery = class extends Query {
   #apiName;
   #pk;
   constructor(store, subject, type, pk, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
@@ -2342,7 +2365,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunk5KDG5ZET_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkMKL3HEQ5_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -2462,10 +2485,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunkBY2PQEYA_cjs.createClientFromContext({
-    ...client[chunk5KDG5ZET_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunk5KDG5ZET_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkBY2PQEYA_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkHCCGD2AP_cjs.createClientFromContext({
+    ...client[chunkMKL3HEQ5_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkMKL3HEQ5_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkHCCGD2AP_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -2508,11 +2531,11 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunkBY2PQEYA_cjs.createClientWithTransaction; }
+  get: function () { return chunkHCCGD2AP_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunk5KDG5ZET_cjs.augment; }
+  get: function () { return chunkMKL3HEQ5_cjs.augment; }
 });
 exports.createObservableClient = createObservableClient;
 exports.getMetaTagContent = getMetaTagContent;