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

package/build/browser/observable/internal/Subjects.js

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2025 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { BehaviorSubject } from "rxjs";
+import { createInitEntry } from "./createInitEntry.js";
+export class Subjects {
+  #layers;
+
+  // we can use a regular Map here because the refCounting will
+  // handle cleanup.
+  #cacheKeyToSubject = new WeakMap();
+  constructor({
+    logger,
+    layers
+  }) {
+    this.logger = logger;
+    this.#layers = layers;
+  }
+  peek = cacheKey => {
+    return this.#cacheKeyToSubject.get(cacheKey);
+  };
+  get = cacheKey => {
+    let subject = this.#cacheKeyToSubject.get(cacheKey);
+    if (!subject) {
+      const initialValue = this.#layers.top.get(cacheKey) ?? createInitEntry(cacheKey);
+      subject = new BehaviorSubject({
+        ...initialValue,
+        isOptimistic: initialValue.value !== this.#layers.truth.get(cacheKey)?.value
+      });
+      this.#cacheKeyToSubject.set(cacheKey, subject);
+    }
+    return subject;
+  };
+  delete = cacheKey => {
+    const subject = this.peek(cacheKey);
+    if (subject) {
+      subject.complete();
+      this.#cacheKeyToSubject.delete(cacheKey);
+    }
+  };
+}
+//# sourceMappingURL=Subjects.js.map

package/build/browser/observable/internal/Subjects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Subjects.js","names":["BehaviorSubject","createInitEntry","Subjects","layers","cacheKeyToSubject","WeakMap","constructor","logger","peek","cacheKey","get","subject","initialValue","top","isOptimistic","value","truth","set","delete","complete"],"sources":["Subjects.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { Logger } from \"@osdk/api\";\nimport { BehaviorSubject } from \"rxjs\";\nimport { createInitEntry } from \"./createInitEntry.js\";\nimport type { KnownCacheKey } from \"./KnownCacheKey.js\";\nimport type { Entry } from \"./Layer.js\";\nimport { type Layers } from \"./Layers.js\";\nimport type { SubjectPayload } from \"./SubjectPayload.js\";\n\nexport class Subjects {\n  #layers: Layers;\n\n  // we can use a regular Map here because the refCounting will\n  // handle cleanup.\n  #cacheKeyToSubject = new WeakMap<\n    KnownCacheKey,\n    BehaviorSubject<SubjectPayload<any>>\n  >();\n\n  logger?: Logger;\n\n  constructor({ logger, layers }: { logger?: Logger; layers: Layers }) {\n    this.logger = logger;\n    this.#layers = layers;\n  }\n\n  peek = <KEY extends KnownCacheKey>(\n    cacheKey: KEY,\n  ):\n    | BehaviorSubject<SubjectPayload<KEY>>\n    | undefined =>\n  {\n    return this.#cacheKeyToSubject.get(cacheKey);\n  };\n\n  get = <KEY extends KnownCacheKey>(\n    cacheKey: KEY,\n  ): BehaviorSubject<SubjectPayload<KEY>> => {\n    let subject = this.#cacheKeyToSubject.get(cacheKey);\n    if (!subject) {\n      const initialValue: Entry<KEY> = this.#layers.top.get(cacheKey)\n        ?? createInitEntry(cacheKey);\n\n      subject = new BehaviorSubject({\n        ...initialValue,\n        isOptimistic:\n          initialValue.value !== this.#layers.truth.get(cacheKey)?.value,\n      });\n      this.#cacheKeyToSubject.set(cacheKey, subject);\n    }\n\n    return subject;\n  };\n\n  delete = <KEY extends KnownCacheKey>(\n    cacheKey: KEY,\n  ): void => {\n    const subject = this.peek(cacheKey);\n    if (subject) {\n      subject.complete();\n      this.#cacheKeyToSubject.delete(cacheKey);\n    }\n  };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA,SAASA,eAAe,QAAQ,MAAM;AACtC,SAASC,eAAe,QAAQ,sBAAsB;AAMtD,OAAO,MAAMC,QAAQ,CAAC;EACpB,CAACC,MAAM;;EAEP;EACA;EACA,CAACC,iBAAiB,GAAG,IAAIC,OAAO,CAG9B,CAAC;EAIHC,WAAWA,CAAC;IAAEC,MAAM;IAAEJ;EAA4C,CAAC,EAAE;IACnE,IAAI,CAACI,MAAM,GAAGA,MAAM;IACpB,IAAI,CAAC,CAACJ,MAAM,GAAGA,MAAM;EACvB;EAEAK,IAAI,GACFC,QAAa,IAIf;IACE,OAAO,IAAI,CAAC,CAACL,iBAAiB,CAACM,GAAG,CAACD,QAAQ,CAAC;EAC9C,CAAC;EAEDC,GAAG,GACDD,QAAa,IAC4B;IACzC,IAAIE,OAAO,GAAG,IAAI,CAAC,CAACP,iBAAiB,CAACM,GAAG,CAACD,QAAQ,CAAC;IACnD,IAAI,CAACE,OAAO,EAAE;MACZ,MAAMC,YAAwB,GAAG,IAAI,CAAC,CAACT,MAAM,CAACU,GAAG,CAACH,GAAG,CAACD,QAAQ,CAAC,IAC1DR,eAAe,CAACQ,QAAQ,CAAC;MAE9BE,OAAO,GAAG,IAAIX,eAAe,CAAC;QAC5B,GAAGY,YAAY;QACfE,YAAY,EACVF,YAAY,CAACG,KAAK,KAAK,IAAI,CAAC,CAACZ,MAAM,CAACa,KAAK,CAACN,GAAG,CAACD,QAAQ,CAAC,EAAEM;MAC7D,CAAC,CAAC;MACF,IAAI,CAAC,CAACX,iBAAiB,CAACa,GAAG,CAACR,QAAQ,EAAEE,OAAO,CAAC;IAChD;IAEA,OAAOA,OAAO;EAChB,CAAC;EAEDO,MAAM,GACJT,QAAa,IACJ;IACT,MAAME,OAAO,GAAG,IAAI,CAACH,IAAI,CAACC,QAAQ,CAAC;IACnC,IAAIE,OAAO,EAAE;MACXA,OAAO,CAACQ,QAAQ,CAAC,CAAC;MAClB,IAAI,CAAC,CAACf,iBAAiB,CAACc,MAAM,CAACT,QAAQ,CAAC;IAC1C;EACF,CAAC;AACH","ignoreList":[]}

package/build/browser/observable/internal/actions/ActionApplication.js

@@ -86,8 +86,8 @@ export class ActionApplication {
           objectType,
           primaryKey
         } of deletedObjects ?? []) {
-          const cacheKey = this.store.getCacheKey("object", objectType, primaryKey);
-          this.store.peekQuery(cacheKey)?.deleteFromStore("loaded",
+          const cacheKey = this.store.cacheKeys.get("object", objectType, primaryKey);
+          this.store.queries.peek(cacheKey)?.deleteFromStore("loaded",
           // this is probably not the best value to use
           batch);
         }

package/build/browser/observable/internal/actions/ActionApplication.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionApplication.js","names":["runOptimisticJob","ACTION_DELAY","process","env","NODE_ENV","ActionApplication","constructor","store","applyAction","action","args","optimisticUpdate","logger","child","methodName","removeOptimisticResult","Array","isArray","debug","results","client","batchApplyAction","$returnEdits","invalidateActionEditResponse","actionResults","delay","default","#invalidateActionEditResponse","deletedObjects","modifiedObjects","addedObjects","editedObjectTypes","type","changes","promisesToWait","list","obj","push","invalidateObject","objectType","primaryKey","batch","cacheKey","getCacheKey","peekQuery","deleteFromStore","Promise","all","apiName","invalidateObjectType"],"sources":["ActionApplication.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  ActionDefinition,\n  ActionEditResponse,\n  ActionReturnTypeForOptions,\n} from \"@osdk/api\";\nimport type { ActionSignatureFromDef } from \"../../../actions/applyAction.js\";\nimport { type Changes } from \"../Changes.js\";\nimport type { ObjectCacheKey } from \"../object/ObjectCacheKey.js\";\nimport type { Store } from \"../Store.js\";\nimport { runOptimisticJob } from \"./OptimisticJob.js\";\n\nconst ACTION_DELAY = process.env.NODE_ENV === \"production\" ? 0 : 1000;\n\nexport class ActionApplication {\n  constructor(private store: Store) {}\n\n  applyAction: <Q extends ActionDefinition<any>>(\n    action: Q,\n    args:\n      | Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]\n      | Array<Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]>,\n    opts?: Store.ApplyActionOptions,\n  ) => Promise<ActionEditResponse> = async (\n    action,\n    args,\n    { optimisticUpdate } = {},\n  ) => {\n    const logger = process.env.NODE_ENV !== \"production\"\n      ? this.store.logger?.child({ methodName: \"applyAction\" })\n      : this.store.logger;\n    const removeOptimisticResult = runOptimisticJob(\n      this.store,\n      optimisticUpdate,\n    );\n\n    return await (async () => {\n      try {\n        if (Array.isArray(args)) {\n          if (process.env.NODE_ENV !== \"production\") {\n            logger?.debug(\"applying action to multiple args\", args);\n          }\n\n          const results: ActionReturnTypeForOptions<{ $returnEdits: true }> =\n            await this.store\n              .client(action).batchApplyAction(\n                args,\n                { $returnEdits: true },\n              );\n\n          await this.#invalidateActionEditResponse(results);\n\n          return results;\n        }\n\n        // The types for client get confused when we dynamically applyAction so we\n        // have to deal with the `any` here and force cast it to what it should be.\n        // TODO: Update the types so this doesn't happen!\n\n        const actionResults: ActionEditResponse = await this.store.client(\n          action,\n        ).applyAction(args as any, { $returnEdits: true });\n\n        if (process.env.NODE_ENV !== \"production\") {\n          if (ACTION_DELAY > 0) {\n            logger?.debug(\"action done, pausing\", actionResults);\n            const delay = (await import(\"delay\")).default;\n            await delay(ACTION_DELAY);\n            logger?.debug(\"action done, pausing done\");\n          }\n        }\n        await this.#invalidateActionEditResponse(actionResults);\n        return actionResults;\n      } finally {\n        if (process.env.NODE_ENV !== \"production\") {\n          logger?.debug(\n            \"optimistic action complete; remove the results\",\n          );\n        }\n        // make sure this happens even if the action fails\n        await removeOptimisticResult();\n      }\n    })();\n  };\n\n  #invalidateActionEditResponse = async (\n    { deletedObjects, modifiedObjects, addedObjects, editedObjectTypes, type }:\n      ActionEditResponse,\n  ): Promise<void> => {\n    let changes: Changes | undefined;\n    if (type === \"edits\") {\n      const promisesToWait: Promise<any>[] = [];\n\n      for (const list of [deletedObjects, modifiedObjects, addedObjects]) {\n        for (const obj of list ?? []) {\n          promisesToWait.push(\n            this.store.invalidateObject(obj.objectType, obj.primaryKey),\n          );\n        }\n      }\n\n      this.store.batch({}, (batch) => {\n        for (const { objectType, primaryKey } of deletedObjects ?? []) {\n          const cacheKey = this.store.getCacheKey<ObjectCacheKey>(\n            \"object\",\n            objectType,\n            primaryKey,\n          );\n          this.store.peekQuery(cacheKey)?.deleteFromStore(\n            \"loaded\", // this is probably not the best value to use\n            batch,\n          );\n        }\n      });\n      await Promise.all(promisesToWait);\n    } else {\n      for (const apiName of editedObjectTypes) {\n        await this.store.invalidateObjectType(apiName as string, changes);\n      }\n    }\n  };\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ActionApplication.js","names":["runOptimisticJob","ACTION_DELAY","process","env","NODE_ENV","ActionApplication","constructor","store","applyAction","action","args","optimisticUpdate","logger","child","methodName","removeOptimisticResult","Array","isArray","debug","results","client","batchApplyAction","$returnEdits","invalidateActionEditResponse","actionResults","delay","default","#invalidateActionEditResponse","deletedObjects","modifiedObjects","addedObjects","editedObjectTypes","type","changes","promisesToWait","list","obj","push","invalidateObject","objectType","primaryKey","batch","cacheKey","cacheKeys","get","queries","peek","deleteFromStore","Promise","all","apiName","invalidateObjectType"],"sources":["ActionApplication.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  ActionDefinition,\n  ActionEditResponse,\n  ActionReturnTypeForOptions,\n} from \"@osdk/api\";\nimport type { ActionSignatureFromDef } from \"../../../actions/applyAction.js\";\nimport { type Changes } from \"../Changes.js\";\nimport type { ObjectCacheKey } from \"../object/ObjectCacheKey.js\";\nimport type { Store } from \"../Store.js\";\nimport { runOptimisticJob } from \"./OptimisticJob.js\";\n\nconst ACTION_DELAY = process.env.NODE_ENV === \"production\" ? 0 : 1000;\n\nexport class ActionApplication {\n  constructor(private store: Store) {}\n\n  applyAction: <Q extends ActionDefinition<any>>(\n    action: Q,\n    args:\n      | Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]\n      | Array<Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]>,\n    opts?: Store.ApplyActionOptions,\n  ) => Promise<ActionEditResponse> = async (\n    action,\n    args,\n    { optimisticUpdate } = {},\n  ) => {\n    const logger = process.env.NODE_ENV !== \"production\"\n      ? this.store.logger?.child({ methodName: \"applyAction\" })\n      : this.store.logger;\n    const removeOptimisticResult = runOptimisticJob(\n      this.store,\n      optimisticUpdate,\n    );\n\n    return await (async () => {\n      try {\n        if (Array.isArray(args)) {\n          if (process.env.NODE_ENV !== \"production\") {\n            logger?.debug(\"applying action to multiple args\", args);\n          }\n\n          const results: ActionReturnTypeForOptions<{ $returnEdits: true }> =\n            await this.store\n              .client(action).batchApplyAction(\n                args,\n                { $returnEdits: true },\n              );\n\n          await this.#invalidateActionEditResponse(results);\n\n          return results;\n        }\n\n        // The types for client get confused when we dynamically applyAction so we\n        // have to deal with the `any` here and force cast it to what it should be.\n        // TODO: Update the types so this doesn't happen!\n\n        const actionResults: ActionEditResponse = await this.store.client(\n          action,\n        ).applyAction(args as any, { $returnEdits: true });\n\n        if (process.env.NODE_ENV !== \"production\") {\n          if (ACTION_DELAY > 0) {\n            logger?.debug(\"action done, pausing\", actionResults);\n            const delay = (await import(\"delay\")).default;\n            await delay(ACTION_DELAY);\n            logger?.debug(\"action done, pausing done\");\n          }\n        }\n        await this.#invalidateActionEditResponse(actionResults);\n        return actionResults;\n      } finally {\n        if (process.env.NODE_ENV !== \"production\") {\n          logger?.debug(\n            \"optimistic action complete; remove the results\",\n          );\n        }\n        // make sure this happens even if the action fails\n        await removeOptimisticResult();\n      }\n    })();\n  };\n\n  #invalidateActionEditResponse = async (\n    { deletedObjects, modifiedObjects, addedObjects, editedObjectTypes, type }:\n      ActionEditResponse,\n  ): Promise<void> => {\n    let changes: Changes | undefined;\n    if (type === \"edits\") {\n      const promisesToWait: Promise<any>[] = [];\n\n      for (const list of [deletedObjects, modifiedObjects, addedObjects]) {\n        for (const obj of list ?? []) {\n          promisesToWait.push(\n            this.store.invalidateObject(obj.objectType, obj.primaryKey),\n          );\n        }\n      }\n\n      this.store.batch({}, (batch) => {\n        for (const { objectType, primaryKey } of deletedObjects ?? []) {\n          const cacheKey = this.store.cacheKeys.get<ObjectCacheKey>(\n            \"object\",\n            objectType,\n            primaryKey,\n          );\n          this.store.queries.peek(cacheKey)?.deleteFromStore(\n            \"loaded\", // this is probably not the best value to use\n            batch,\n          );\n        }\n      });\n      await Promise.all(promisesToWait);\n    } else {\n      for (const apiName of editedObjectTypes) {\n        await this.store.invalidateObjectType(apiName as string, changes);\n      }\n    }\n  };\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/observable/internal/actions/OptimisticJob.js

@@ -102,7 +102,7 @@ export function runOptimisticJob(store, optimisticUpdate) {
     return optimisticApplicationDone.then(
     // we don't want to leak the result
     () => undefined).finally(() => {
-      store.removeLayer(optimisticId);
+      store.layers.remove(optimisticId);
     });
   };
 }

package/build/browser/observable/internal/actions/OptimisticJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"OptimisticJob.js","names":["additionalContext","createOptimisticId","OptimisticJob","result","constructor","store","optimisticId","updatedObjects","addedObjectPromises","deletedObjects","getResult","addedObjects","Promise","allSettled","batchResult","batch","obj","status","objects","getQuery","apiName","value","$objectType","pk","$primaryKey","writeToStore","deleteFromStore","changes","context","updateObject","push","createObject","type","properties","create","client","objectFactory2","$apiName","undefined","then","objs","deleteObject","runOptimisticJob","optimisticUpdate","resolve","job","optimisticApplicationDone","finally","removeLayer"],"sources":["OptimisticJob.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { additionalContext } from \"../../../Client.js\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.js\";\nimport type { OptimisticBuilder } from \"../../OptimisticBuilder.js\";\nimport { type Changes } from \"../Changes.js\";\nimport { createOptimisticId, type OptimisticId } from \"../OptimisticId.js\";\nimport type { Store } from \"../Store.js\";\n\nexport class OptimisticJob {\n  context: OptimisticBuilder;\n  getResult: () => Promise<Changes>;\n  #result!: Promise<Changes>;\n\n  constructor(store: Store, optimisticId: OptimisticId) {\n    const updatedObjects: Array<\n      ObjectHolder\n    > = [];\n\n    // due to potentially needing to fetch the object metadata,\n    // the creation of objects needs to be async. In practice, the\n    // metadata is cached.\n    const addedObjectPromises: Array<\n      Promise<ObjectHolder>\n    > = [];\n\n    const deletedObjects: Array<ObjectHolder> = [];\n\n    // TODO, this code needs to be refactored. its weird right now\n    // but the contract for `runOptimisticJob` is good.\n\n    // todo memoize this\n    this.getResult = () => {\n      return this.#result ??= (async () => {\n        const addedObjects = await Promise.allSettled(\n          addedObjectPromises,\n        );\n\n        const { batchResult } = store.batch({ optimisticId }, (batch) => {\n          for (const obj of addedObjects) {\n            if (obj.status === \"fulfilled\") {\n              store.objects.getQuery({\n                apiName: obj.value.$objectType,\n                pk: obj.value.$primaryKey,\n              }).writeToStore(obj.value, \"loading\", batch);\n            } else {\n              // TODO FIXME\n              throw obj;\n            }\n          }\n\n          for (const obj of updatedObjects) {\n            store.objects.getQuery({\n              apiName: obj.$objectType,\n              pk: obj.$primaryKey,\n            }).writeToStore(obj, \"loading\", batch);\n          }\n\n          for (const obj of deletedObjects) {\n            store.objects.getQuery({\n              apiName: obj.$objectType,\n              pk: obj.$primaryKey,\n            }).deleteFromStore(\"loading\", batch);\n          }\n        });\n\n        return batchResult.changes;\n      })();\n    };\n\n    this.context = {\n      updateObject(value) {\n        updatedObjects.push(value as unknown as ObjectHolder<typeof value>);\n        return this;\n      },\n      createObject(type, pk, properties) {\n        const create = store.client[additionalContext].objectFactory2(\n          store.client[additionalContext],\n          [{\n            $primaryKey: pk,\n            $apiName: type.apiName,\n            $objectType: type.apiName,\n            ...properties,\n          }],\n          undefined,\n          {},\n        ).then(objs => {\n          return objs[0];\n        });\n\n        addedObjectPromises.push(create);\n        return this;\n      },\n      deleteObject(value) {\n        deletedObjects.push(value as unknown as ObjectHolder<typeof value>);\n        return this;\n      },\n    };\n  }\n}\n\nexport function runOptimisticJob(\n  store: Store,\n  optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void),\n): () => Promise<void> {\n  if (!optimisticUpdate) {\n    return () => Promise.resolve();\n  }\n\n  const optimisticId = createOptimisticId();\n  const job = new OptimisticJob(store, optimisticId);\n  optimisticUpdate(job.context);\n  const optimisticApplicationDone = job.getResult();\n\n  return () => {\n    return optimisticApplicationDone.then(\n      // we don't want to leak the result\n      () => undefined,\n    ).finally(() => {\n      store.removeLayer(optimisticId);\n    });\n  };\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"OptimisticJob.js","names":["additionalContext","createOptimisticId","OptimisticJob","result","constructor","store","optimisticId","updatedObjects","addedObjectPromises","deletedObjects","getResult","addedObjects","Promise","allSettled","batchResult","batch","obj","status","objects","getQuery","apiName","value","$objectType","pk","$primaryKey","writeToStore","deleteFromStore","changes","context","updateObject","push","createObject","type","properties","create","client","objectFactory2","$apiName","undefined","then","objs","deleteObject","runOptimisticJob","optimisticUpdate","resolve","job","optimisticApplicationDone","finally","layers","remove"],"sources":["OptimisticJob.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { additionalContext } from \"../../../Client.js\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.js\";\nimport type { OptimisticBuilder } from \"../../OptimisticBuilder.js\";\nimport { type Changes } from \"../Changes.js\";\nimport { createOptimisticId, type OptimisticId } from \"../OptimisticId.js\";\nimport type { Store } from \"../Store.js\";\n\nexport class OptimisticJob {\n  context: OptimisticBuilder;\n  getResult: () => Promise<Changes>;\n  #result!: Promise<Changes>;\n\n  constructor(store: Store, optimisticId: OptimisticId) {\n    const updatedObjects: Array<\n      ObjectHolder\n    > = [];\n\n    // due to potentially needing to fetch the object metadata,\n    // the creation of objects needs to be async. In practice, the\n    // metadata is cached.\n    const addedObjectPromises: Array<\n      Promise<ObjectHolder>\n    > = [];\n\n    const deletedObjects: Array<ObjectHolder> = [];\n\n    // TODO, this code needs to be refactored. its weird right now\n    // but the contract for `runOptimisticJob` is good.\n\n    // todo memoize this\n    this.getResult = () => {\n      return this.#result ??= (async () => {\n        const addedObjects = await Promise.allSettled(\n          addedObjectPromises,\n        );\n\n        const { batchResult } = store.batch({ optimisticId }, (batch) => {\n          for (const obj of addedObjects) {\n            if (obj.status === \"fulfilled\") {\n              store.objects.getQuery({\n                apiName: obj.value.$objectType,\n                pk: obj.value.$primaryKey,\n              }).writeToStore(obj.value, \"loading\", batch);\n            } else {\n              // TODO FIXME\n              throw obj;\n            }\n          }\n\n          for (const obj of updatedObjects) {\n            store.objects.getQuery({\n              apiName: obj.$objectType,\n              pk: obj.$primaryKey,\n            }).writeToStore(obj, \"loading\", batch);\n          }\n\n          for (const obj of deletedObjects) {\n            store.objects.getQuery({\n              apiName: obj.$objectType,\n              pk: obj.$primaryKey,\n            }).deleteFromStore(\"loading\", batch);\n          }\n        });\n\n        return batchResult.changes;\n      })();\n    };\n\n    this.context = {\n      updateObject(value) {\n        updatedObjects.push(value as unknown as ObjectHolder<typeof value>);\n        return this;\n      },\n      createObject(type, pk, properties) {\n        const create = store.client[additionalContext].objectFactory2(\n          store.client[additionalContext],\n          [{\n            $primaryKey: pk,\n            $apiName: type.apiName,\n            $objectType: type.apiName,\n            ...properties,\n          }],\n          undefined,\n          {},\n        ).then(objs => {\n          return objs[0];\n        });\n\n        addedObjectPromises.push(create);\n        return this;\n      },\n      deleteObject(value) {\n        deletedObjects.push(value as unknown as ObjectHolder<typeof value>);\n        return this;\n      },\n    };\n  }\n}\n\nexport function runOptimisticJob(\n  store: Store,\n  optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void),\n): () => Promise<void> {\n  if (!optimisticUpdate) {\n    return () => Promise.resolve();\n  }\n\n  const optimisticId = createOptimisticId();\n  const job = new OptimisticJob(store, optimisticId);\n  optimisticUpdate(job.context);\n  const optimisticApplicationDone = job.getResult();\n\n  return () => {\n    return optimisticApplicationDone.then(\n      // we don't want to leak the result\n      () => undefined,\n    ).finally(() => {\n      store.layers.remove(optimisticId);\n    });\n  };\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/observable/internal/base-list/BaseListQuery.js

@@ -60,10 +60,9 @@ export class BaseListQuery extends Query {
    */
   _updateList(items, status, batch, append = false) {
     if (process.env.NODE_ENV !== "production") {
-      const logger = process.env.NODE_ENV !== "production" ? this.logger?.child({
+      this.logger?.child({
         methodName: "updateList"
-      }) : this.logger;
-      logger?.debug(`{status: ${status}, append: ${append}}`, JSON.stringify(items, null, 2));
+      }).debug(`{status: ${status}, append: ${append}}`, JSON.stringify(items, null, 2));
     }
     let objectCacheKeys;
     if (items.length === 0) {
@@ -144,11 +143,11 @@ export class BaseListQuery extends Query {
         // N.B. the store keeps the cache keys around for a bit so we don't
         // need to worry about them being GC'd before we re-retain them
         for (const objectCacheKey of existingList?.value?.data ?? []) {
-          this.store.release(objectCacheKey);
+          this.store.cacheKeys.release(objectCacheKey);
         }
       }
       for (const objectCacheKey of objectCacheKeys) {
-        this.store.retain(objectCacheKey);
+        this.store.cacheKeys.retain(objectCacheKey);
       }
     }
     if (append) {
@@ -157,13 +156,11 @@ export class BaseListQuery extends Query {
     return objectCacheKeys;
   }
   _dispose() {
-    // eslint-disable-next-line no-console
-    console.log("DISPOSE LIST QUERY");
     this.store.batch({}, batch => {
       const entry = batch.read(this.cacheKey);
       if (entry) {
         for (const objectCacheKey of entry.value?.data ?? []) {
-          this.store.release(objectCacheKey);
+          this.store.cacheKeys.release(objectCacheKey);
         }
       }
     });
@@ -196,7 +193,7 @@ export class BaseListQuery extends Query {
    * @returns A connectable observable of the collection's payload type
    */
   _createConnectable(subject) {
-    return createCollectionConnectable(subject, this.store, params => this.createPayload(params));
+    return createCollectionConnectable(subject, this.store.subjects, params => this.createPayload(params));
   }
 
   /**

package/build/browser/observable/internal/base-list/BaseListQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseListQuery.js","names":["deepEqual","DEBUG_ONLY__cacheKeysToString","isObjectInstance","Query","NoOpSortingStrategy","createCollectionConnectable","removeDuplicates","BaseListQuery","sortingStrategy","_updateList","items","status","batch","append","process","env","NODE_ENV","logger","child","methodName","debug","JSON","stringify","objectCacheKeys","length","store","objects","storeOsdkInstances","retainReleaseAppend","_sortCacheKeys","writeToStore","data","entry","read","cacheKey","value","write","ret","registerCacheChanges","#retainReleaseAppend","existingList","optimisticWrite","objectCacheKey","release","retain","_dispose","console","log","createPayload","params","resolvedList","resolvedData","isOptimistic","fetchMore","hasMore","nextPageToken","lastUpdated","_createConnectable","subject","_preFetch","undefined","pendingPageFetch","pendingFetch","Promise","res","resolve","setStatus","fetchPageAndUpdate","abortController","signal","then","finally","minResultsToLoad","_fetchAndStore","count","aborted","result","fetchPageData","retVal","finalStatus","error","handleFetchError","_error","_status","sortCacheKeys","updateCollection","options"],"sources":["BaseListQuery.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { Osdk, PageResult } from \"@osdk/api\";\nimport deepEqual from \"fast-deep-equal\";\nimport type { Connectable, Observable } from \"rxjs\";\nimport type {\n  CommonObserveOptions,\n  Status,\n} from \"../../ObservableClient/common.js\";\nimport { type CacheKey, DEBUG_ONLY__cacheKeysToString } from \"../CacheKey.js\";\nimport { isObjectInstance } from \"../isObjectInstance.js\";\nimport type { Entry } from \"../Layer.js\";\nimport { type ObjectCacheKey } from \"../object/ObjectCacheKey.js\";\nimport { Query } from \"../Query.js\";\nimport type { SortingStrategy } from \"../sorting/SortingStrategy.js\";\nimport { NoOpSortingStrategy } from \"../sorting/SortingStrategy.js\";\nimport type { BatchContext, SubjectPayload } from \"../Store.js\";\nimport type {\n  CollectionConnectableParams,\n  CollectionStorageData,\n} from \"./BaseCollectionQuery.js\";\nimport { createCollectionConnectable } from \"./createCollectionConnectable.js\";\nimport { removeDuplicates } from \"./removeDuplicates.js\";\n\n/**\n * Base class for collection-based queries (lists and links)\n * Provides common functionality for working with collections of objects\n */\nexport abstract class BaseListQuery<\n  KEY extends CacheKey<any, CollectionStorageData, any, any>,\n  PAYLOAD,\n  O extends CommonObserveOptions,\n> extends Query<KEY, PAYLOAD, O> {\n  /**\n   * The sorting strategy to use for this collection\n   * @protected\n   */\n  protected sortingStrategy: SortingStrategy = new NoOpSortingStrategy();\n\n  // Collection-specific behavior is implemented by subclasses\n  /**\n   * Token for the next page of results\n   * @protected\n   */\n  protected nextPageToken?: string;\n\n  /**\n   * Promise tracking an in-progress page fetch\n   * @protected\n   */\n  protected pendingPageFetch?: Promise<void>;\n\n  //\n  // Shared Implementations\n  //\n\n  /**\n   * Standard method to update a list of objects\n   * Handles common list update patterns for both ListQuery and SpecificLinkQuery\n   *\n   * @param items Objects or cache keys to add to the list\n   * @param status Status to set for the list\n   * @param batch Batch context to use\n   * @param append Whether to append to the existing list or replace it\n   * @returns The updated entry\n   */\n  public _updateList<T extends ObjectCacheKey | Osdk.Instance<any>>(\n    items: T[],\n    status: Status,\n    batch: BatchContext,\n    append: boolean = false,\n  ): Entry<KEY> {\n    if (process.env.NODE_ENV !== \"production\") {\n      const logger = process.env.NODE_ENV !== \"production\"\n        ? this.logger?.child({ methodName: \"updateList\" })\n        : this.logger;\n\n      logger?.debug(\n        `{status: ${status}, append: ${append}}`,\n        JSON.stringify(items, null, 2),\n      );\n    }\n\n    let objectCacheKeys: ObjectCacheKey[];\n\n    if (items.length === 0) {\n      objectCacheKeys = [];\n    } else if (isObjectInstance(items[0])) {\n      // Items are object instances, need to store them first\n      objectCacheKeys = this.store.objects.storeOsdkInstances(\n        items as Array<Osdk.Instance<any>>,\n        batch,\n      );\n    } else {\n      // Items are already cache keys\n      objectCacheKeys = items as ObjectCacheKey[];\n    }\n\n    objectCacheKeys = this.#retainReleaseAppend(batch, append, objectCacheKeys);\n    objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);\n    objectCacheKeys = removeDuplicates(objectCacheKeys, batch);\n\n    return this.writeToStore({ data: objectCacheKeys }, status, batch);\n  }\n\n  /**\n   * Common implementation for writing to store for collection-based queries\n   * @param data The collection data to write to the store\n   * @param status The status to set\n   * @param batch The batch context\n   */\n  writeToStore(\n    data: CollectionStorageData,\n    status: Status,\n    batch: BatchContext,\n  ): Entry<KEY> {\n    const entry = batch.read(this.cacheKey);\n\n    if (entry && deepEqual(data, entry.value)) {\n      // Check if both data AND status are the same\n      if (entry.status === status) {\n        if (process.env.NODE_ENV !== \"production\") {\n          this.logger?.child({ methodName: \"writeToStore\" }).debug(\n            `Collection data was deep equal and status unchanged (${status}), skipping update`,\n          );\n        }\n        // Return the existing entry without writing to avoid unnecessary notifications\n        return entry;\n      }\n\n      if (process.env.NODE_ENV !== \"production\") {\n        this.logger?.child({ methodName: \"writeToStore\" }).debug(\n          `Collection data was deep equal, just updating status from ${entry.status} to ${status}`,\n        );\n      }\n      // Keep the same value but update status and lastUpdated\n      return batch.write(this.cacheKey, entry.value, status);\n    }\n\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"writeToStore\" }).debug(\n        `{status: ${status}},`,\n        DEBUG_ONLY__cacheKeysToString(data.data),\n      );\n    }\n\n    const ret = batch.write(this.cacheKey, data, status);\n    this.registerCacheChanges(batch);\n    return ret;\n  }\n\n  /**\n   * Register changes to the cache based on the specific collection type\n   * Implemented by subclasses to handle specific change registration\n   */\n  protected abstract registerCacheChanges(batch: BatchContext): void;\n\n  /**\n   * Common method for managing object reference counting and appending results\n   * Used by collection queries when updating object references\n   *\n   * @param batch The batch context to use\n   * @param append Whether to append to existing objects or replace them\n   * @param objectCacheKeys Array of object cache keys to process\n   * @returns The final array of object cache keys after retain/release/append\n   */\n  #retainReleaseAppend(\n    batch: BatchContext,\n    append: boolean,\n    objectCacheKeys: ObjectCacheKey[],\n  ): ObjectCacheKey[] {\n    const existingList = batch.read(this.cacheKey);\n\n    // whether its append or update we need to retain all the new objects\n    if (!batch.optimisticWrite) {\n      if (!append) {\n        // we need to release all the old objects\n        // N.B. the store keeps the cache keys around for a bit so we don't\n        // need to worry about them being GC'd before we re-retain them\n        for (const objectCacheKey of existingList?.value?.data ?? []) {\n          this.store.release(objectCacheKey);\n        }\n      }\n\n      for (const objectCacheKey of objectCacheKeys) {\n        this.store.retain(objectCacheKey);\n      }\n    }\n\n    if (append) {\n      objectCacheKeys = [\n        ...existingList?.value?.data ?? [],\n        ...objectCacheKeys,\n      ];\n    }\n    return objectCacheKeys;\n  }\n\n  _dispose(): void {\n    // eslint-disable-next-line no-console\n    console.log(\"DISPOSE LIST QUERY\");\n    this.store.batch({}, (batch) => {\n      const entry = batch.read(this.cacheKey);\n      if (entry) {\n        for (const objectCacheKey of entry.value?.data ?? []) {\n          this.store.release(objectCacheKey);\n        }\n      }\n    });\n  }\n\n  /**\n   * Creates a payload from collection parameters\n   * Default implementation that covers common fields for all collection types\n   * Subclasses may override to add type-specific fields if needed\n   *\n   * @param params Common collection parameters\n   * @returns A typed payload for the specific collection type\n   */\n  protected createPayload(\n    params: CollectionConnectableParams,\n  ): PAYLOAD {\n    return {\n      resolvedList: params.resolvedData,\n      isOptimistic: params.isOptimistic,\n      fetchMore: this.fetchMore,\n      hasMore: this.nextPageToken != null,\n      status: params.status,\n      lastUpdated: params.lastUpdated,\n    } as unknown as PAYLOAD; // Type assertion needed since we don't know exact subtype\n  }\n\n  /**\n   * Creates a connectable observable for this collection\n   * Common implementation shared by all collection types\n   *\n   * @param subject The subject to connect to\n   * @returns A connectable observable of the collection's payload type\n   */\n  protected _createConnectable(\n    subject: Observable<SubjectPayload<KEY>>,\n  ): Connectable<PAYLOAD> {\n    return createCollectionConnectable<KEY, PAYLOAD>(\n      subject,\n      this.store,\n      (params) => this.createPayload(params),\n    );\n  }\n\n  /**\n   * @override Reset pagination state before a fetch\n   */\n  protected _preFetch(): void {\n    this.nextPageToken = undefined;\n    super._preFetch();\n  }\n\n  /**\n   * Common fetchMore implementation for pagination\n   * Handles pending request management and loading states\n   */\n  fetchMore = (): Promise<void> => {\n    if (this.pendingPageFetch) {\n      return this.pendingPageFetch;\n    }\n\n    if (this.pendingFetch) {\n      this.pendingPageFetch = new Promise(async (res) => {\n        await this.pendingFetch;\n        res(this.fetchMore());\n      });\n      return this.pendingPageFetch;\n    }\n\n    if (this.nextPageToken == null) {\n      return Promise.resolve(undefined);\n    }\n\n    this.store.batch({}, (batch) => {\n      this.setStatus(\"loading\", batch);\n    });\n\n    this.pendingFetch = this.fetchPageAndUpdate(\n      \"loaded\",\n      this.abortController?.signal,\n    ).then(() => void 0).finally(() => {\n      this.pendingPageFetch = undefined;\n    });\n    return this.pendingFetch;\n  };\n\n  /**\n   * Minimum number of results to load initially\n   * May be overridden by subclasses for specific collection types\n   * @protected\n   */\n  protected minResultsToLoad: number = 0;\n\n  /**\n   * Common _fetchAndStore implementation for pagination\n   * Uses fetchPageAndUpdate to load the initial set of data\n   * Will load multiple pages if necessary to reach minResultsToLoad\n   */\n  protected async _fetchAndStore(): Promise<void> {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"_fetchAndStore\" }).debug(\n        \"fetching pages\",\n      );\n    }\n\n    // Keep fetching pages until we have the minimum number of results or no more pages\n    while (true) {\n      const entry = await this.fetchPageAndUpdate(\n        \"loading\",\n        this.abortController?.signal,\n      );\n\n      if (!entry) {\n        // we were aborted\n        return;\n      }\n\n      // Check if we have enough results or no more pages\n      const count = entry.value?.data.length || 0;\n      if (count >= this.minResultsToLoad || this.nextPageToken == null) {\n        break;\n      }\n    }\n\n    this.store.batch({}, (batch) => {\n      this.setStatus(\"loaded\", batch);\n    });\n\n    return Promise.resolve();\n  }\n\n  /**\n   * Template method for fetching a page of data and updating the store\n   * Provides common error handling and abort signal checking\n   *\n   * @param status The status to set for the entry\n   * @param signal Optional AbortSignal for cancellation\n   * @returns A promise that resolves to the updated entry or undefined if aborted\n   */\n  protected async fetchPageAndUpdate(\n    status: Status,\n    signal: AbortSignal | undefined,\n  ): Promise<Entry<KEY> | undefined> {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"fetchPageAndUpdate\" }).debug(\n        `Fetching data with status: ${status}`,\n      );\n    }\n\n    // Early abort check\n    if (signal?.aborted) {\n      return undefined;\n    }\n\n    try {\n      // Call the subclass-specific implementation to fetch data\n      const result = await this.fetchPageData(signal);\n\n      // Check for abort again after fetch\n      if (signal?.aborted) {\n        return undefined;\n      }\n\n      // Store the fetched data using batch operations\n      const { retVal } = this.store.batch({}, (batch) => {\n        const append = this.nextPageToken != null;\n        const finalStatus = result.nextPageToken ? status : \"loaded\";\n\n        return this._updateList(\n          this.store.objects.storeOsdkInstances(result.data, batch),\n          finalStatus,\n          batch,\n          append,\n        );\n      });\n\n      return retVal;\n    } catch (error: unknown) {\n      // Log any errors that occur\n      if (process.env.NODE_ENV !== \"production\") {\n        this.logger?.child({ methodName: \"fetchPageAndUpdate\" }).error(\n          \"Error fetching data\",\n          error,\n        );\n      }\n\n      // For unexpected errors, write error status if not aborted\n      if (!signal?.aborted) {\n        const { retVal } = this.store.batch({}, (batch) => {\n          return this.handleFetchError(error, status, batch);\n        });\n        return retVal;\n      }\n\n      // If aborted, just return undefined\n      return undefined;\n    }\n  }\n\n  /**\n   * Abstract method that subclasses implement for their specific data fetching logic\n   *\n   * @param signal Optional AbortSignal for cancellation\n   * @returns A promise that resolves to the fetched data\n   */\n  protected abstract fetchPageData(\n    signal: AbortSignal | undefined,\n  ): Promise<PageResult<Osdk.Instance<any>>>;\n\n  /**\n   * Handle fetch errors by setting appropriate error state\n   * Default implementation that subclasses can override\n   *\n   * @param error The error that occurred\n   * @param status The intended status if successful\n   * @param batch The batch context to use\n   * @returns The updated entry with error status\n   */\n  protected handleFetchError(\n    _error: unknown,\n    _status: Status,\n    batch: BatchContext,\n  ): Entry<KEY> {\n    // Default implementation writes an empty list with error status\n    // Most subclasses should be able to use this\n    return this.writeToStore({ data: [] }, \"error\", batch);\n  }\n\n  /**\n   * Sort the collection items using the configured sorting strategy\n   * @param objectCacheKeys - The cache keys to sort\n   * @param batch - The batch context\n   * @returns Sorted array of cache keys\n   */\n  protected _sortCacheKeys(\n    objectCacheKeys: ObjectCacheKey[],\n    batch: BatchContext,\n  ): ObjectCacheKey[] {\n    return this.sortingStrategy.sortCacheKeys(objectCacheKeys, batch);\n  }\n\n  /**\n   * Unified method for updating collection data in the store\n   * Handles storing, sorting, deduplication, and reference counting\n   *\n   * @param items - Either object cache keys or object instances to update\n   * @param options - Configuration options for the update\n   * @param batch - The batch context to use\n   * @returns The updated entry\n   */\n  protected updateCollection<T extends ObjectCacheKey | Osdk.Instance<any>>(\n    items: T[],\n    options: {\n      append?: boolean;\n      status: Status;\n    },\n    batch: BatchContext,\n  ): Entry<KEY> {\n    if (process.env.NODE_ENV !== \"production\") {\n      const logger = process.env.NODE_ENV !== \"production\"\n        ? this.logger?.child({ methodName: \"updateCollection\" })\n        : this.logger;\n\n      logger?.debug(\n        `{status: ${options.status}, append: ${options.append}}`,\n        JSON.stringify(items, null, 2),\n      );\n    }\n\n    // Step 1: Convert items to object cache keys if needed\n    let objectCacheKeys: ObjectCacheKey[];\n\n    if (items.length === 0) {\n      objectCacheKeys = [];\n    } else if (isObjectInstance(items[0])) {\n      // Items are object instances, need to store them first\n      objectCacheKeys = this.store.objects.storeOsdkInstances(\n        items as Array<Osdk.Instance<any>>,\n        batch,\n      );\n    } else {\n      // Items are already cache keys\n      objectCacheKeys = items as ObjectCacheKey[];\n    }\n\n    // Step 2: Handle retain/release/append logic\n    objectCacheKeys = this.#retainReleaseAppend(\n      batch,\n      options.append ?? false,\n      objectCacheKeys,\n    );\n\n    // Step 3: Sort using the configured sorting strategy\n    objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);\n\n    // Step 4: Remove duplicates\n    objectCacheKeys = removeDuplicates(objectCacheKeys, batch);\n\n    // Step 5: Write to store\n    return this.writeToStore({ data: objectCacheKeys }, options.status, batch);\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"BaseListQuery.js","names":["deepEqual","DEBUG_ONLY__cacheKeysToString","isObjectInstance","Query","NoOpSortingStrategy","createCollectionConnectable","removeDuplicates","BaseListQuery","sortingStrategy","_updateList","items","status","batch","append","process","env","NODE_ENV","logger","child","methodName","debug","JSON","stringify","objectCacheKeys","length","store","objects","storeOsdkInstances","retainReleaseAppend","_sortCacheKeys","writeToStore","data","entry","read","cacheKey","value","write","ret","registerCacheChanges","#retainReleaseAppend","existingList","optimisticWrite","objectCacheKey","cacheKeys","release","retain","_dispose","createPayload","params","resolvedList","resolvedData","isOptimistic","fetchMore","hasMore","nextPageToken","lastUpdated","_createConnectable","subject","subjects","_preFetch","undefined","pendingPageFetch","pendingFetch","Promise","res","resolve","setStatus","fetchPageAndUpdate","abortController","signal","then","finally","minResultsToLoad","_fetchAndStore","count","aborted","result","fetchPageData","retVal","finalStatus","error","handleFetchError","_error","_status","sortCacheKeys","updateCollection","options"],"sources":["BaseListQuery.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { Osdk, PageResult } from \"@osdk/api\";\nimport deepEqual from \"fast-deep-equal\";\nimport type { Connectable, Observable } from \"rxjs\";\nimport type {\n  CommonObserveOptions,\n  Status,\n} from \"../../ObservableClient/common.js\";\nimport type { BatchContext } from \"../BatchContext.js\";\nimport { type CacheKey, DEBUG_ONLY__cacheKeysToString } from \"../CacheKey.js\";\nimport { isObjectInstance } from \"../isObjectInstance.js\";\nimport type { Entry } from \"../Layer.js\";\nimport { type ObjectCacheKey } from \"../object/ObjectCacheKey.js\";\nimport { Query } from \"../Query.js\";\nimport type { SortingStrategy } from \"../sorting/SortingStrategy.js\";\nimport { NoOpSortingStrategy } from \"../sorting/SortingStrategy.js\";\nimport type { SubjectPayload } from \"../SubjectPayload.js\";\nimport type {\n  CollectionConnectableParams,\n  CollectionStorageData,\n} from \"./BaseCollectionQuery.js\";\nimport { createCollectionConnectable } from \"./createCollectionConnectable.js\";\nimport { removeDuplicates } from \"./removeDuplicates.js\";\n\n/**\n * Base class for collection-based queries (lists and links)\n * Provides common functionality for working with collections of objects\n */\nexport abstract class BaseListQuery<\n  KEY extends CacheKey<any, CollectionStorageData, any, any>,\n  PAYLOAD,\n  O extends CommonObserveOptions,\n> extends Query<KEY, PAYLOAD, O> {\n  /**\n   * The sorting strategy to use for this collection\n   * @protected\n   */\n  protected sortingStrategy: SortingStrategy = new NoOpSortingStrategy();\n\n  // Collection-specific behavior is implemented by subclasses\n  /**\n   * Token for the next page of results\n   * @protected\n   */\n  protected nextPageToken?: string;\n\n  /**\n   * Promise tracking an in-progress page fetch\n   * @protected\n   */\n  protected pendingPageFetch?: Promise<void>;\n\n  //\n  // Shared Implementations\n  //\n\n  /**\n   * Standard method to update a list of objects\n   * Handles common list update patterns for both ListQuery and SpecificLinkQuery\n   *\n   * @param items Objects or cache keys to add to the list\n   * @param status Status to set for the list\n   * @param batch Batch context to use\n   * @param append Whether to append to the existing list or replace it\n   * @returns The updated entry\n   */\n  public _updateList<T extends ObjectCacheKey | Osdk.Instance<any>>(\n    items: T[],\n    status: Status,\n    batch: BatchContext,\n    append: boolean = false,\n  ): Entry<KEY> {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger\n        ?.child({ methodName: \"updateList\" })\n        .debug(\n          `{status: ${status}, append: ${append}}`,\n          JSON.stringify(items, null, 2),\n        );\n    }\n\n    let objectCacheKeys: ObjectCacheKey[];\n\n    if (items.length === 0) {\n      objectCacheKeys = [];\n    } else if (isObjectInstance(items[0])) {\n      // Items are object instances, need to store them first\n      objectCacheKeys = this.store.objects.storeOsdkInstances(\n        items as Array<Osdk.Instance<any>>,\n        batch,\n      );\n    } else {\n      // Items are already cache keys\n      objectCacheKeys = items as ObjectCacheKey[];\n    }\n\n    objectCacheKeys = this.#retainReleaseAppend(batch, append, objectCacheKeys);\n    objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);\n    objectCacheKeys = removeDuplicates(objectCacheKeys, batch);\n\n    return this.writeToStore({ data: objectCacheKeys }, status, batch);\n  }\n\n  /**\n   * Common implementation for writing to store for collection-based queries\n   * @param data The collection data to write to the store\n   * @param status The status to set\n   * @param batch The batch context\n   */\n  writeToStore(\n    data: CollectionStorageData,\n    status: Status,\n    batch: BatchContext,\n  ): Entry<KEY> {\n    const entry = batch.read(this.cacheKey);\n\n    if (entry && deepEqual(data, entry.value)) {\n      // Check if both data AND status are the same\n      if (entry.status === status) {\n        if (process.env.NODE_ENV !== \"production\") {\n          this.logger?.child({ methodName: \"writeToStore\" }).debug(\n            `Collection data was deep equal and status unchanged (${status}), skipping update`,\n          );\n        }\n        // Return the existing entry without writing to avoid unnecessary notifications\n        return entry;\n      }\n\n      if (process.env.NODE_ENV !== \"production\") {\n        this.logger?.child({ methodName: \"writeToStore\" }).debug(\n          `Collection data was deep equal, just updating status from ${entry.status} to ${status}`,\n        );\n      }\n      // Keep the same value but update status and lastUpdated\n      return batch.write(this.cacheKey, entry.value, status);\n    }\n\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"writeToStore\" }).debug(\n        `{status: ${status}},`,\n        DEBUG_ONLY__cacheKeysToString(data.data),\n      );\n    }\n\n    const ret = batch.write(this.cacheKey, data, status);\n    this.registerCacheChanges(batch);\n    return ret;\n  }\n\n  /**\n   * Register changes to the cache based on the specific collection type\n   * Implemented by subclasses to handle specific change registration\n   */\n  protected abstract registerCacheChanges(batch: BatchContext): void;\n\n  /**\n   * Common method for managing object reference counting and appending results\n   * Used by collection queries when updating object references\n   *\n   * @param batch The batch context to use\n   * @param append Whether to append to existing objects or replace them\n   * @param objectCacheKeys Array of object cache keys to process\n   * @returns The final array of object cache keys after retain/release/append\n   */\n  #retainReleaseAppend(\n    batch: BatchContext,\n    append: boolean,\n    objectCacheKeys: ObjectCacheKey[],\n  ): ObjectCacheKey[] {\n    const existingList = batch.read(this.cacheKey);\n\n    // whether its append or update we need to retain all the new objects\n    if (!batch.optimisticWrite) {\n      if (!append) {\n        // we need to release all the old objects\n        // N.B. the store keeps the cache keys around for a bit so we don't\n        // need to worry about them being GC'd before we re-retain them\n        for (const objectCacheKey of existingList?.value?.data ?? []) {\n          this.store.cacheKeys.release(objectCacheKey);\n        }\n      }\n\n      for (const objectCacheKey of objectCacheKeys) {\n        this.store.cacheKeys.retain(objectCacheKey);\n      }\n    }\n\n    if (append) {\n      objectCacheKeys = [\n        ...existingList?.value?.data ?? [],\n        ...objectCacheKeys,\n      ];\n    }\n    return objectCacheKeys;\n  }\n\n  _dispose(): void {\n    this.store.batch({}, (batch) => {\n      const entry = batch.read(this.cacheKey);\n      if (entry) {\n        for (const objectCacheKey of entry.value?.data ?? []) {\n          this.store.cacheKeys.release(objectCacheKey);\n        }\n      }\n    });\n  }\n\n  /**\n   * Creates a payload from collection parameters\n   * Default implementation that covers common fields for all collection types\n   * Subclasses may override to add type-specific fields if needed\n   *\n   * @param params Common collection parameters\n   * @returns A typed payload for the specific collection type\n   */\n  protected createPayload(\n    params: CollectionConnectableParams,\n  ): PAYLOAD {\n    return {\n      resolvedList: params.resolvedData,\n      isOptimistic: params.isOptimistic,\n      fetchMore: this.fetchMore,\n      hasMore: this.nextPageToken != null,\n      status: params.status,\n      lastUpdated: params.lastUpdated,\n    } as unknown as PAYLOAD; // Type assertion needed since we don't know exact subtype\n  }\n\n  /**\n   * Creates a connectable observable for this collection\n   * Common implementation shared by all collection types\n   *\n   * @param subject The subject to connect to\n   * @returns A connectable observable of the collection's payload type\n   */\n  protected _createConnectable(\n    subject: Observable<SubjectPayload<KEY>>,\n  ): Connectable<PAYLOAD> {\n    return createCollectionConnectable<KEY, PAYLOAD>(\n      subject,\n      this.store.subjects,\n      (params) => this.createPayload(params),\n    );\n  }\n\n  /**\n   * @override Reset pagination state before a fetch\n   */\n  protected _preFetch(): void {\n    this.nextPageToken = undefined;\n    super._preFetch();\n  }\n\n  /**\n   * Common fetchMore implementation for pagination\n   * Handles pending request management and loading states\n   */\n  fetchMore = (): Promise<void> => {\n    if (this.pendingPageFetch) {\n      return this.pendingPageFetch;\n    }\n\n    if (this.pendingFetch) {\n      this.pendingPageFetch = new Promise(async (res) => {\n        await this.pendingFetch;\n        res(this.fetchMore());\n      });\n      return this.pendingPageFetch;\n    }\n\n    if (this.nextPageToken == null) {\n      return Promise.resolve(undefined);\n    }\n\n    this.store.batch({}, (batch) => {\n      this.setStatus(\"loading\", batch);\n    });\n\n    this.pendingFetch = this.fetchPageAndUpdate(\n      \"loaded\",\n      this.abortController?.signal,\n    ).then(() => void 0).finally(() => {\n      this.pendingPageFetch = undefined;\n    });\n    return this.pendingFetch;\n  };\n\n  /**\n   * Minimum number of results to load initially\n   * May be overridden by subclasses for specific collection types\n   * @protected\n   */\n  protected minResultsToLoad: number = 0;\n\n  /**\n   * Common _fetchAndStore implementation for pagination\n   * Uses fetchPageAndUpdate to load the initial set of data\n   * Will load multiple pages if necessary to reach minResultsToLoad\n   */\n  protected async _fetchAndStore(): Promise<void> {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"_fetchAndStore\" }).debug(\n        \"fetching pages\",\n      );\n    }\n\n    // Keep fetching pages until we have the minimum number of results or no more pages\n    while (true) {\n      const entry = await this.fetchPageAndUpdate(\n        \"loading\",\n        this.abortController?.signal,\n      );\n\n      if (!entry) {\n        // we were aborted\n        return;\n      }\n\n      // Check if we have enough results or no more pages\n      const count = entry.value?.data.length || 0;\n      if (count >= this.minResultsToLoad || this.nextPageToken == null) {\n        break;\n      }\n    }\n\n    this.store.batch({}, (batch) => {\n      this.setStatus(\"loaded\", batch);\n    });\n\n    return Promise.resolve();\n  }\n\n  /**\n   * Template method for fetching a page of data and updating the store\n   * Provides common error handling and abort signal checking\n   *\n   * @param status The status to set for the entry\n   * @param signal Optional AbortSignal for cancellation\n   * @returns A promise that resolves to the updated entry or undefined if aborted\n   */\n  protected async fetchPageAndUpdate(\n    status: Status,\n    signal: AbortSignal | undefined,\n  ): Promise<Entry<KEY> | undefined> {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"fetchPageAndUpdate\" }).debug(\n        `Fetching data with status: ${status}`,\n      );\n    }\n\n    // Early abort check\n    if (signal?.aborted) {\n      return undefined;\n    }\n\n    try {\n      // Call the subclass-specific implementation to fetch data\n      const result = await this.fetchPageData(signal);\n\n      // Check for abort again after fetch\n      if (signal?.aborted) {\n        return undefined;\n      }\n\n      // Store the fetched data using batch operations\n      const { retVal } = this.store.batch({}, (batch) => {\n        const append = this.nextPageToken != null;\n        const finalStatus = result.nextPageToken ? status : \"loaded\";\n\n        return this._updateList(\n          this.store.objects.storeOsdkInstances(result.data, batch),\n          finalStatus,\n          batch,\n          append,\n        );\n      });\n\n      return retVal;\n    } catch (error: unknown) {\n      // Log any errors that occur\n      if (process.env.NODE_ENV !== \"production\") {\n        this.logger?.child({ methodName: \"fetchPageAndUpdate\" }).error(\n          \"Error fetching data\",\n          error,\n        );\n      }\n\n      // For unexpected errors, write error status if not aborted\n      if (!signal?.aborted) {\n        const { retVal } = this.store.batch({}, (batch) => {\n          return this.handleFetchError(error, status, batch);\n        });\n        return retVal;\n      }\n\n      // If aborted, just return undefined\n      return undefined;\n    }\n  }\n\n  /**\n   * Abstract method that subclasses implement for their specific data fetching logic\n   *\n   * @param signal Optional AbortSignal for cancellation\n   * @returns A promise that resolves to the fetched data\n   */\n  protected abstract fetchPageData(\n    signal: AbortSignal | undefined,\n  ): Promise<PageResult<Osdk.Instance<any>>>;\n\n  /**\n   * Handle fetch errors by setting appropriate error state\n   * Default implementation that subclasses can override\n   *\n   * @param error The error that occurred\n   * @param status The intended status if successful\n   * @param batch The batch context to use\n   * @returns The updated entry with error status\n   */\n  protected handleFetchError(\n    _error: unknown,\n    _status: Status,\n    batch: BatchContext,\n  ): Entry<KEY> {\n    // Default implementation writes an empty list with error status\n    // Most subclasses should be able to use this\n    return this.writeToStore({ data: [] }, \"error\", batch);\n  }\n\n  /**\n   * Sort the collection items using the configured sorting strategy\n   * @param objectCacheKeys - The cache keys to sort\n   * @param batch - The batch context\n   * @returns Sorted array of cache keys\n   */\n  protected _sortCacheKeys(\n    objectCacheKeys: ObjectCacheKey[],\n    batch: BatchContext,\n  ): ObjectCacheKey[] {\n    return this.sortingStrategy.sortCacheKeys(objectCacheKeys, batch);\n  }\n\n  /**\n   * Unified method for updating collection data in the store\n   * Handles storing, sorting, deduplication, and reference counting\n   *\n   * @param items - Either object cache keys or object instances to update\n   * @param options - Configuration options for the update\n   * @param batch - The batch context to use\n   * @returns The updated entry\n   */\n  protected updateCollection<T extends ObjectCacheKey | Osdk.Instance<any>>(\n    items: T[],\n    options: {\n      append?: boolean;\n      status: Status;\n    },\n    batch: BatchContext,\n  ): Entry<KEY> {\n    if (process.env.NODE_ENV !== \"production\") {\n      const logger = process.env.NODE_ENV !== \"production\"\n        ? this.logger?.child({ methodName: \"updateCollection\" })\n        : this.logger;\n\n      logger?.debug(\n        `{status: ${options.status}, append: ${options.append}}`,\n        JSON.stringify(items, null, 2),\n      );\n    }\n\n    // Step 1: Convert items to object cache keys if needed\n    let objectCacheKeys: ObjectCacheKey[];\n\n    if (items.length === 0) {\n      objectCacheKeys = [];\n    } else if (isObjectInstance(items[0])) {\n      // Items are object instances, need to store them first\n      objectCacheKeys = this.store.objects.storeOsdkInstances(\n        items as Array<Osdk.Instance<any>>,\n        batch,\n      );\n    } else {\n      // Items are already cache keys\n      objectCacheKeys = items as ObjectCacheKey[];\n    }\n\n    // Step 2: Handle retain/release/append logic\n    objectCacheKeys = this.#retainReleaseAppend(\n      batch,\n      options.append ?? false,\n      objectCacheKeys,\n    );\n\n    // Step 3: Sort using the configured sorting strategy\n    objectCacheKeys = this._sortCacheKeys(objectCacheKeys, batch);\n\n    // Step 4: Remove duplicates\n    objectCacheKeys = removeDuplicates(objectCacheKeys, batch);\n\n    // Step 5: Write to store\n    return this.writeToStore({ data: objectCacheKeys }, options.status, batch);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/observable/internal/base-list/createCollectionConnectable.js

@@ -28,9 +28,9 @@ import { asapScheduler, combineLatest, connectable, distinctUntilChanged, map, o
  * @param createPayload A function that creates the payload from common parameters
  * @returns A connectable observable of the payload type
  */
-export function createCollectionConnectable(subject, store, createPayload) {
+export function createCollectionConnectable(subject, subjects, createPayload) {
   return connectable(subject.pipe(switchMap(listEntry => {
-    const resolvedData = listEntry?.value?.data == null || listEntry.value.data.length === 0 ? of([]) : combineLatest(listEntry.value.data.map(cacheKey => store.getSubject(cacheKey).pipe(map(objectEntry => objectEntry?.value), distinctUntilChanged())));
+    const resolvedData = listEntry?.value?.data == null || listEntry.value.data.length === 0 ? of([]) : combineLatest(listEntry.value.data.map(cacheKey => subjects.get(cacheKey).pipe(map(objectEntry => objectEntry?.value), distinctUntilChanged())));
     return scheduled(combineLatest({
       resolvedData,
       isOptimistic: of(listEntry.isOptimistic),

package/build/browser/observable/internal/base-list/createCollectionConnectable.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCollectionConnectable.js","names":["asapScheduler","combineLatest","connectable","distinctUntilChanged","map","of","ReplaySubject","scheduled","switchMap","createCollectionConnectable","subject","store","createPayload","pipe","listEntry","resolvedData","value","data","length","cacheKey","getSubject","objectEntry","isOptimistic","status","lastUpdated","params","Array","isArray","resetOnDisconnect","connector"],"sources":["createCollectionConnectable.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  asapScheduler,\n  combineLatest,\n  type Connectable,\n  connectable,\n  distinctUntilChanged,\n  map,\n  type Observable,\n  of,\n  ReplaySubject,\n  scheduled,\n  switchMap,\n} from \"rxjs\";\nimport type { Status } from \"../../ObservableClient/common.js\";\nimport type { CacheKey } from \"../CacheKey.js\";\nimport type { ObjectCacheKey } from \"../object/ObjectCacheKey.js\";\nimport type { Store, SubjectPayload } from \"../Store.js\";\n\n/**\n * Common parameters available for constructing a collection payload\n */\ninterface CollectionConnectableParams {\n  /**\n   * Array of resolved objects\n   */\n  resolvedData: any[];\n\n  /**\n   * Whether the data is from an optimistic update\n   */\n  isOptimistic: boolean;\n\n  /**\n   * Current loading status\n   */\n  status: Status;\n\n  /**\n   * Timestamp of the last update\n   */\n  lastUpdated: number;\n}\n\n/**\n * Creates a connectable observable for a collection of objects\n *\n * @param subject The subject to connect to\n * @param store The store to use for resolving objects\n * @param createPayload A function that creates the payload from common parameters\n * @returns A connectable observable of the payload type\n */\nexport function createCollectionConnectable<\n  K extends CacheKey<any, any, any, any>,\n  P,\n>(\n  subject: Observable<SubjectPayload<K>>,\n  store: Store,\n  createPayload: (params: CollectionConnectableParams) => P,\n): Connectable<P> {\n  return connectable<P>(\n    subject.pipe(\n      switchMap(listEntry => {\n        const resolvedData = listEntry?.value?.data == null\n            || listEntry.value.data.length === 0\n          ? of([])\n          : combineLatest(\n            listEntry.value.data.map((cacheKey: ObjectCacheKey) =>\n              store.getSubject(cacheKey).pipe(\n                map(objectEntry => objectEntry?.value!),\n                distinctUntilChanged(),\n              )\n            ),\n          );\n\n        return scheduled(\n          combineLatest({\n            resolvedData,\n            isOptimistic: of(listEntry.isOptimistic),\n            status: of(listEntry.status),\n            lastUpdated: of(listEntry.lastUpdated),\n          }).pipe(\n            map(params =>\n              createPayload({\n                resolvedData: Array.isArray(params.resolvedData)\n                  ? params.resolvedData\n                  : [],\n                isOptimistic: params.isOptimistic,\n                status: params.status,\n                lastUpdated: params.lastUpdated,\n              })\n            ),\n          ),\n          asapScheduler,\n        );\n      }),\n    ),\n    {\n      resetOnDisconnect: false,\n      connector: () => new ReplaySubject(1),\n    },\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SACEA,aAAa,EACbC,aAAa,EAEbC,WAAW,EACXC,oBAAoB,EACpBC,GAAG,EAEHC,EAAE,EACFC,aAAa,EACbC,SAAS,EACTC,SAAS,QACJ,MAAM;;AAMb;AACA;AACA;;AAuBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,2BAA2BA,CAIzCC,OAAsC,EACtCC,KAAY,EACZC,aAAyD,EACzC;EAChB,OAAOV,WAAW,CAChBQ,OAAO,CAACG,IAAI,CACVL,SAAS,CAACM,SAAS,IAAI;IACrB,MAAMC,YAAY,GAAGD,SAAS,EAAEE,KAAK,EAAEC,IAAI,IAAI,IAAI,IAC5CH,SAAS,CAACE,KAAK,CAACC,IAAI,CAACC,MAAM,KAAK,CAAC,GACpCb,EAAE,CAAC,EAAE,CAAC,GACNJ,aAAa,CACba,SAAS,CAACE,KAAK,CAACC,IAAI,CAACb,GAAG,CAAEe,QAAwB,IAChDR,KAAK,CAACS,UAAU,CAACD,QAAQ,CAAC,CAACN,IAAI,CAC7BT,GAAG,CAACiB,WAAW,IAAIA,WAAW,EAAEL,KAAM,CAAC,EACvCb,oBAAoB,CAAC,CACvB,CACF,CACF,CAAC;IAEH,OAAOI,SAAS,CACdN,aAAa,CAAC;MACZc,YAAY;MACZO,YAAY,EAAEjB,EAAE,CAACS,SAAS,CAACQ,YAAY,CAAC;MACxCC,MAAM,EAAElB,EAAE,CAACS,SAAS,CAACS,MAAM,CAAC;MAC5BC,WAAW,EAAEnB,EAAE,CAACS,SAAS,CAACU,WAAW;IACvC,CAAC,CAAC,CAACX,IAAI,CACLT,GAAG,CAACqB,MAAM,IACRb,aAAa,CAAC;MACZG,YAAY,EAAEW,KAAK,CAACC,OAAO,CAACF,MAAM,CAACV,YAAY,CAAC,GAC5CU,MAAM,CAACV,YAAY,GACnB,EAAE;MACNO,YAAY,EAAEG,MAAM,CAACH,YAAY;MACjCC,MAAM,EAAEE,MAAM,CAACF,MAAM;MACrBC,WAAW,EAAEC,MAAM,CAACD;IACtB,CAAC,CACH,CACF,CAAC,EACDxB,aACF,CAAC;EACH,CAAC,CACH,CAAC,EACD;IACE4B,iBAAiB,EAAE,KAAK;IACxBC,SAAS,EAAEA,CAAA,KAAM,IAAIvB,aAAa,CAAC,CAAC;EACtC,CACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"createCollectionConnectable.js","names":["asapScheduler","combineLatest","connectable","distinctUntilChanged","map","of","ReplaySubject","scheduled","switchMap","createCollectionConnectable","subject","subjects","createPayload","pipe","listEntry","resolvedData","value","data","length","cacheKey","get","objectEntry","isOptimistic","status","lastUpdated","params","Array","isArray","resetOnDisconnect","connector"],"sources":["createCollectionConnectable.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  asapScheduler,\n  combineLatest,\n  type Connectable,\n  connectable,\n  distinctUntilChanged,\n  map,\n  type Observable,\n  of,\n  ReplaySubject,\n  scheduled,\n  switchMap,\n} from \"rxjs\";\nimport type { Status } from \"../../ObservableClient/common.js\";\nimport type { CacheKey } from \"../CacheKey.js\";\nimport type { ObjectCacheKey } from \"../object/ObjectCacheKey.js\";\nimport type { SubjectPayload } from \"../SubjectPayload.js\";\nimport type { Subjects } from \"../Subjects.js\";\n\n/**\n * Common parameters available for constructing a collection payload\n */\ninterface CollectionConnectableParams {\n  /**\n   * Array of resolved objects\n   */\n  resolvedData: any[];\n\n  /**\n   * Whether the data is from an optimistic update\n   */\n  isOptimistic: boolean;\n\n  /**\n   * Current loading status\n   */\n  status: Status;\n\n  /**\n   * Timestamp of the last update\n   */\n  lastUpdated: number;\n}\n\n/**\n * Creates a connectable observable for a collection of objects\n *\n * @param subject The subject to connect to\n * @param store The store to use for resolving objects\n * @param createPayload A function that creates the payload from common parameters\n * @returns A connectable observable of the payload type\n */\nexport function createCollectionConnectable<\n  K extends CacheKey<any, any, any, any>,\n  P,\n>(\n  subject: Observable<SubjectPayload<K>>,\n  subjects: Subjects,\n  createPayload: (params: CollectionConnectableParams) => P,\n): Connectable<P> {\n  return connectable<P>(\n    subject.pipe(\n      switchMap(listEntry => {\n        const resolvedData = listEntry?.value?.data == null\n            || listEntry.value.data.length === 0\n          ? of([])\n          : combineLatest(\n            listEntry.value.data.map((cacheKey: ObjectCacheKey) =>\n              subjects.get(cacheKey).pipe(\n                map(objectEntry => objectEntry?.value!),\n                distinctUntilChanged(),\n              )\n            ),\n          );\n\n        return scheduled(\n          combineLatest({\n            resolvedData,\n            isOptimistic: of(listEntry.isOptimistic),\n            status: of(listEntry.status),\n            lastUpdated: of(listEntry.lastUpdated),\n          }).pipe(\n            map(params =>\n              createPayload({\n                resolvedData: Array.isArray(params.resolvedData)\n                  ? params.resolvedData\n                  : [],\n                isOptimistic: params.isOptimistic,\n                status: params.status,\n                lastUpdated: params.lastUpdated,\n              })\n            ),\n          ),\n          asapScheduler,\n        );\n      }),\n    ),\n    {\n      resetOnDisconnect: false,\n      connector: () => new ReplaySubject(1),\n    },\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SACEA,aAAa,EACbC,aAAa,EAEbC,WAAW,EACXC,oBAAoB,EACpBC,GAAG,EAEHC,EAAE,EACFC,aAAa,EACbC,SAAS,EACTC,SAAS,QACJ,MAAM;;AAOb;AACA;AACA;;AAuBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,2BAA2BA,CAIzCC,OAAsC,EACtCC,QAAkB,EAClBC,aAAyD,EACzC;EAChB,OAAOV,WAAW,CAChBQ,OAAO,CAACG,IAAI,CACVL,SAAS,CAACM,SAAS,IAAI;IACrB,MAAMC,YAAY,GAAGD,SAAS,EAAEE,KAAK,EAAEC,IAAI,IAAI,IAAI,IAC5CH,SAAS,CAACE,KAAK,CAACC,IAAI,CAACC,MAAM,KAAK,CAAC,GACpCb,EAAE,CAAC,EAAE,CAAC,GACNJ,aAAa,CACba,SAAS,CAACE,KAAK,CAACC,IAAI,CAACb,GAAG,CAAEe,QAAwB,IAChDR,QAAQ,CAACS,GAAG,CAACD,QAAQ,CAAC,CAACN,IAAI,CACzBT,GAAG,CAACiB,WAAW,IAAIA,WAAW,EAAEL,KAAM,CAAC,EACvCb,oBAAoB,CAAC,CACvB,CACF,CACF,CAAC;IAEH,OAAOI,SAAS,CACdN,aAAa,CAAC;MACZc,YAAY;MACZO,YAAY,EAAEjB,EAAE,CAACS,SAAS,CAACQ,YAAY,CAAC;MACxCC,MAAM,EAAElB,EAAE,CAACS,SAAS,CAACS,MAAM,CAAC;MAC5BC,WAAW,EAAEnB,EAAE,CAACS,SAAS,CAACU,WAAW;IACvC,CAAC,CAAC,CAACX,IAAI,CACLT,GAAG,CAACqB,MAAM,IACRb,aAAa,CAAC;MACZG,YAAY,EAAEW,KAAK,CAACC,OAAO,CAACF,MAAM,CAACV,YAAY,CAAC,GAC5CU,MAAM,CAACV,YAAY,GACnB,EAAE;MACNO,YAAY,EAAEG,MAAM,CAACH,YAAY;MACjCC,MAAM,EAAEE,MAAM,CAACF,MAAM;MACrBC,WAAW,EAAEC,MAAM,CAACD;IACtB,CAAC,CACH,CACF,CAAC,EACDxB,aACF,CAAC;EACH,CAAC,CACH,CAAC,EACD;IACE4B,iBAAiB,EAAE,KAAK;IACxBC,SAAS,EAAEA,CAAA,KAAM,IAAIvB,aAAa,CAAC,CAAC;EACtC,CACF,CAAC;AACH","ignoreList":[]}

package/build/browser/observable/internal/base-list/createCollectionConnectable.test.js

@@ -47,17 +47,15 @@ const mockEmployee3 = {
   fullName: "Bob Johnson"
 };
 describe("createCollectionConnectable", () => {
-  let mockStore;
+  let mockSubjects;
   let createPayload;
   let mockListCacheKey;
   beforeEach(() => {
     const {
       client
     } = createClientMockHelper();
-
-    // Mock the store with minimal required methods
-    mockStore = {
-      getSubject: vi.fn()
+    mockSubjects = {
+      get: vi.fn()
     };
 
     // Mock cache key for list
@@ -100,7 +98,7 @@ describe("createCollectionConnectable", () => {
       const subject = new BehaviorSubject(subjectPayload);
 
       // Mock store.getSubject to return object observables
-      vi.mocked(mockStore.getSubject).mockImplementation(cacheKey => {
+      vi.mocked(mockSubjects.get).mockImplementation(cacheKey => {
         if (cacheKey === objectKey1) {
           return new BehaviorSubject({
             cacheKey: objectKey1,
@@ -121,7 +119,7 @@ describe("createCollectionConnectable", () => {
         }
         return new BehaviorSubject(undefined);
       });
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
 
       // Connect and subscribe
       const subscription = connectable.connect();
@@ -151,7 +149,7 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(subjectPayload);
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -175,7 +173,7 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(subjectPayload);
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -205,14 +203,14 @@ describe("createCollectionConnectable", () => {
         isOptimistic: true // This is an optimistic update
       };
       const subject = new BehaviorSubject(subjectPayload);
-      vi.mocked(mockStore.getSubject).mockReturnValue(new BehaviorSubject({
+      vi.mocked(mockSubjects.get).mockReturnValue(new BehaviorSubject({
         cacheKey: objectKey1,
         value: mockEmployee1,
         status: "loaded",
         lastUpdated: Date.now(),
         isOptimistic: false
       }));
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -243,14 +241,14 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(basePayload);
-      vi.mocked(mockStore.getSubject).mockReturnValue(new BehaviorSubject({
+      vi.mocked(mockSubjects.get).mockReturnValue(new BehaviorSubject({
         cacheKey: objectKey1,
         value: mockEmployee1,
         status: "loaded",
         lastUpdated: Date.now(),
         isOptimistic: false
       }));
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -307,7 +305,7 @@ describe("createCollectionConnectable", () => {
       const subject = new BehaviorSubject(subjectPayload);
 
       // Mock store.getSubject for all three objects
-      vi.mocked(mockStore.getSubject).mockImplementation(cacheKey => {
+      vi.mocked(mockSubjects.get).mockImplementation(cacheKey => {
         if (cacheKey === objectKey1) {
           return new BehaviorSubject({
             cacheKey: objectKey1,
@@ -337,7 +335,7 @@ describe("createCollectionConnectable", () => {
         }
         return new BehaviorSubject(undefined);
       });
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -371,7 +369,7 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(initialPayload);
-      vi.mocked(mockStore.getSubject).mockImplementation(cacheKey => {
+      vi.mocked(mockSubjects.get).mockImplementation(cacheKey => {
         if (cacheKey === objectKey1) {
           return new BehaviorSubject({
             cacheKey: objectKey1,
@@ -392,7 +390,7 @@ describe("createCollectionConnectable", () => {
         }
         return new BehaviorSubject(undefined);
       });
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -439,14 +437,14 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(subjectPayload);
-      vi.mocked(mockStore.getSubject).mockReturnValue(new BehaviorSubject({
+      vi.mocked(mockSubjects.get).mockReturnValue(new BehaviorSubject({
         cacheKey: objectKey1,
         value: mockEmployee1,
         status: "loaded",
         lastUpdated: Date.now(),
         isOptimistic: false
       }));
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer1 = mockObserver();
       const observer2 = mockObserver();
@@ -481,14 +479,14 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(subjectPayload);
-      vi.mocked(mockStore.getSubject).mockReturnValue(new BehaviorSubject({
+      vi.mocked(mockSubjects.get).mockReturnValue(new BehaviorSubject({
         cacheKey: objectKey1,
         value: mockEmployee1,
         status: "loaded",
         lastUpdated: Date.now(),
         isOptimistic: false
       }));
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer1 = mockObserver();
 
@@ -532,7 +530,7 @@ describe("createCollectionConnectable", () => {
       const subject = new BehaviorSubject(subjectPayload);
 
       // Mock store.getSubject to return undefined entry - this creates an object with undefined value
-      vi.mocked(mockStore.getSubject).mockReturnValue(new BehaviorSubject({
+      vi.mocked(mockSubjects.get).mockReturnValue(new BehaviorSubject({
         cacheKey: objectKey1,
         value: undefined,
         // This is the key - undefined value
@@ -540,7 +538,7 @@ describe("createCollectionConnectable", () => {
         lastUpdated: Date.now(),
         isOptimistic: false
       }));
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, createPayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, createPayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);
@@ -570,7 +568,7 @@ describe("createCollectionConnectable", () => {
         isOptimistic: false
       };
       const subject = new BehaviorSubject(subjectPayload);
-      vi.mocked(mockStore.getSubject).mockReturnValue(new BehaviorSubject({
+      vi.mocked(mockSubjects.get).mockReturnValue(new BehaviorSubject({
         cacheKey: objectKey1,
         value: mockEmployee1,
         status: "loaded",
@@ -582,7 +580,7 @@ describe("createCollectionConnectable", () => {
       const errorThrowingCreatePayload = vi.fn(() => {
         throw new Error("Test error in createPayload");
       });
-      const connectable = actualCreateCollectionConnectable(subject, mockStore, errorThrowingCreatePayload);
+      const connectable = actualCreateCollectionConnectable(subject, mockSubjects, errorThrowingCreatePayload);
       const subscription = connectable.connect();
       const observer = mockObserver();
       connectable.subscribe(observer);