@osdk/client 2.2.0-beta.3 → 2.2.0-beta.5

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

@@ -14,44 +14,43 @@
  * limitations under the License.
  */
 
-import { MultiMap } from "mnemonist";
 import { additionalContext } from "../../Client.js";
 import { createOptimisticId } from "./OptimisticId.js";
 export class OptimisticJob {
   #result;
   constructor(store, optimisticId) {
     const updatedObjects = [];
-    const addedObjects = [];
+
+    // due to potentially needing to fetch the object metadata,
+    // the creation of objects needs to be async. In practice, the
+    // metadata is cached.
+    const addedObjectPromises = [];
+
+    // TODO, this code needs to be refactored. its weird right now
+    // but the contract for `runOptimisticJob` is good.
 
     // todo memoize this
     this.getResult = () => {
       return this.#result ??= (async () => {
-        const changes = {
-          addedObjects: new MultiMap(),
-          modifiedObjects: new MultiMap()
-        };
-        const settled = await Promise.allSettled(addedObjects);
-        for (const added of settled) {
-          if (added.status === "fulfilled") {
-            changes.addedObjects.set(added.value.$objectType, added.value);
-          } else {
-            // TODO FIXME
-            throw added;
-          }
-        }
-        for (const modified of updatedObjects) {
-          changes.modifiedObjects.set(modified.$apiName, modified);
-        }
-        store.batch({
+        const addedObjects = await Promise.allSettled(addedObjectPromises);
+        const {
+          batchResult
+        } = store.batch({
           optimisticId
         }, batch => {
-          for (const a of ["addedObjects", "modifiedObjects"]) {
-            for (const b of changes[a].values()) {
-              store.getObjectQuery(b.$objectType, b.$primaryKey).writeToStore(b, "loading", batch);
+          for (const obj of addedObjects) {
+            if (obj.status === "fulfilled") {
+              store.getObjectQuery(obj.value.$objectType, obj.value.$primaryKey).writeToStore(obj.value, "loading", batch);
+            } else {
+              // TODO FIXME
+              throw obj;
             }
           }
+          for (const obj of updatedObjects) {
+            store.getObjectQuery(obj.$objectType, obj.$primaryKey).writeToStore(obj, "loading", batch);
+          }
         });
-        return changes;
+        return batchResult.changes;
       })();
     };
     this.context = {
@@ -65,8 +64,10 @@ export class OptimisticJob {
           $apiName: type.apiName,
           $objectType: type.apiName,
           ...properties
-        }], undefined).then(x => x[0]);
-        addedObjects.push(create);
+        }], undefined).then(objs => {
+          return objs[0];
+        });
+        addedObjectPromises.push(create);
         return this;
       }
     };
@@ -79,11 +80,11 @@ export function runOptimisticJob(store, optimisticUpdate) {
   const optimisticId = createOptimisticId();
   const job = new OptimisticJob(store, optimisticId);
   optimisticUpdate(job.context);
-  const optimisticApplicationDone = job.getResult().then(result => {
-    store.maybeUpdateLists(result, optimisticId);
-  });
+  const optimisticApplicationDone = job.getResult();
   return () => {
-    return optimisticApplicationDone.finally(() => {
+    return optimisticApplicationDone.then(
+    // we don't want to leak the result
+    () => undefined).finally(() => {
       store.removeLayer(optimisticId);
     });
   };

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

@@ -1 +1 @@
-{"version":3,"file":"OptimisticJob.js","names":["MultiMap","additionalContext","createOptimisticId","OptimisticJob","result","constructor","store","optimisticId","updatedObjects","addedObjects","getResult","changes","modifiedObjects","settled","Promise","allSettled","added","status","set","value","$objectType","modified","$apiName","batch","a","b","values","getObjectQuery","$primaryKey","writeToStore","context","updateObject","push","createObject","type","pk","properties","create","client","objectFactory2","apiName","undefined","then","x","runOptimisticJob","optimisticUpdate","resolve","job","optimisticApplicationDone","maybeUpdateLists","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 type { ObjectTypeDefinition, Osdk } from \"@osdk/api\";\nimport { MultiMap } from \"mnemonist\";\nimport { additionalContext } from \"../../Client.js\";\nimport type { OptimisticBuilder } from \"../OptimisticBuilder.js\";\nimport type { ChangedObjects } from \"./ChangedObjects.js\";\nimport { createOptimisticId, type OptimisticId } from \"./OptimisticId.js\";\nimport type { Store } from \"./Store.js\";\n\nexport class OptimisticJob {\n  context: OptimisticBuilder;\n  getResult: () => Promise<ChangedObjects>;\n  #result!: Promise<ChangedObjects>;\n\n  constructor(store: Store, optimisticId: OptimisticId) {\n    const updatedObjects: Array<\n      Osdk.Instance<ObjectTypeDefinition>\n    > = [];\n\n    const addedObjects: Array<\n      Promise<Osdk.Instance<ObjectTypeDefinition>>\n    > = [];\n\n    // todo memoize this\n    this.getResult = () => {\n      return this.#result ??= (async () => {\n        const changes: ChangedObjects = {\n          addedObjects: new MultiMap(),\n          modifiedObjects: new MultiMap(),\n        };\n\n        const settled = await Promise.allSettled(addedObjects);\n        for (const added of settled) {\n          if (added.status === \"fulfilled\") {\n            changes.addedObjects.set(added.value.$objectType, added.value);\n          } else {\n            // TODO FIXME\n            throw added;\n          }\n        }\n\n        for (const modified of updatedObjects) {\n          changes.modifiedObjects.set(modified.$apiName, modified);\n        }\n        store.batch({ optimisticId }, (batch) => {\n          for (const a of [\"addedObjects\", \"modifiedObjects\"] as const) {\n            for (const b of changes[a].values()) {\n              store.getObjectQuery(b.$objectType, b.$primaryKey).writeToStore(\n                b,\n                \"loading\",\n                batch,\n              );\n            }\n          }\n        });\n\n        return changes;\n      })();\n    };\n\n    this.context = {\n      updateObject(value: Osdk.Instance<ObjectTypeDefinition>) {\n        updatedObjects.push(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        ).then(x => x[0]);\n\n        addedObjects.push(create);\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().then((result) => {\n    store.maybeUpdateLists(result, optimisticId);\n  });\n\n  return () => {\n    return optimisticApplicationDone.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","getResult","addedObjects","Promise","allSettled","batchResult","batch","obj","status","getObjectQuery","value","$objectType","$primaryKey","writeToStore","changes","context","updateObject","push","createObject","type","pk","properties","create","client","objectFactory2","$apiName","apiName","undefined","then","objs","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 type { ObjectTypeDefinition, Osdk } from \"@osdk/api\";\nimport { additionalContext } from \"../../Client.js\";\nimport type { OptimisticBuilder } from \"../OptimisticBuilder.js\";\nimport { type Changes } from \"./ChangedObjects.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      Osdk.Instance<ObjectTypeDefinition>\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<Osdk.Instance<ObjectTypeDefinition>>\n    > = [];\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.getObjectQuery(obj.value.$objectType, 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.getObjectQuery(obj.$objectType, obj.$primaryKey)\n              .writeToStore(obj, \"loading\", batch);\n          }\n        });\n\n        return batchResult.changes;\n      })();\n    };\n\n    this.context = {\n      updateObject(value: Osdk.Instance<ObjectTypeDefinition>) {\n        updatedObjects.push(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        ).then(objs => {\n          return objs[0];\n        });\n\n        addedObjectPromises.push(create);\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":[]}

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

@@ -14,16 +14,23 @@
  * limitations under the License.
  */
 
+import { additionalContext } from "../../Client.js";
 export class Query {
   retainCount = 0;
   #connectable;
   #subscription;
   #subject;
-  constructor(store, observable, opts, cacheKey) {
+
+  /** @internal */
+
+  constructor(store, observable, opts, cacheKey, logger) {
     this.options = opts;
     this.cacheKey = cacheKey;
     this.store = store;
     this.#subject = observable;
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[additionalContext].logger : store.client[additionalContext].logger?.child({}, {
+      msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map(x => JSON.stringify(x)).join(", ")}>` : "Query"
+    }));
   }
   subscribe(observer) {
     this.#connectable ??= this._createConnectable(this.#subject);
@@ -31,6 +38,11 @@ export class Query {
     return this.#connectable.subscribe(observer);
   }
   revalidate(force) {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.info({
+        methodName: "revalidate"
+      });
+    }
     if (force) {
       this.abortController?.abort();
     }
@@ -40,6 +52,11 @@ export class Query {
       return this.pendingFetch;
     }
     if ((this.options.dedupeInterval ?? 0) > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < (this.options.dedupeInterval ?? 0)) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.trace({
+          methodName: "revalidate"
+        }, "DEDUPE");
+      }
       return Promise.resolve();
     }
     this.store.batch({}, batch => {
@@ -47,13 +64,36 @@ export class Query {
     });
     this._preFetch();
     this.lastFetchStarted = Date.now();
-    this.pendingFetch = this._fetch().finally(() => {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.trace({
+        methodName: "revalidate"
+      }, "calling _fetch()");
+    }
+    this.pendingFetch = this._fetch().catch(e => {
+      this.logger?.error({
+        methodName: "revalidate"
+      }, "_fetch() FAILED", e);
+      throw e;
+    }).finally(() => {
+      this.logger?.info({
+        methodName: "revalidate"
+      }, "finally _fetch()");
       this.pendingFetch = undefined;
     });
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.info({
+        methodName: "revalidate"
+      }, "Returning");
+    }
     return this.pendingFetch;
   }
   _preFetch() {}
   setStatus(status, batch) {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.trace({
+        methodName: "setStatus"
+      }, status);
+    }
     const existing = batch.read(this.cacheKey);
     if (existing?.status === status) return;
     batch.write(this.cacheKey, existing?.value, status);

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

@@ -1 +1 @@
-{"version":3,"file":"Query.js","names":["Query","retainCount","connectable","subscription","subject","constructor","store","observable","opts","cacheKey","options","subscribe","observer","_createConnectable","connect","revalidate","force","abortController","abort","pendingFetch","dedupeInterval","lastFetchStarted","Date","now","Promise","resolve","batch","setStatus","_preFetch","_fetch","finally","undefined","status","existing","read","write","value","dispose","unsubscribe","_dispose"],"sources":["Query.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  Connectable,\n  Observable,\n  Observer,\n  Subscribable,\n  Subscription,\n} from \"rxjs\";\nimport type {\n  QueryOptions,\n  Status,\n  Unsubscribable,\n} from \"../ObservableClient.js\";\nimport type { CacheKey } from \"./CacheKey.js\";\nimport type { Entry } from \"./Layer.js\";\nimport type { BatchContext, Store, SubjectPayload } from \"./Store.js\";\n\nexport abstract class Query<\n  KEY extends CacheKey,\n  PAYLOAD,\n  O extends QueryOptions,\n> implements Subscribable<PAYLOAD> {\n  lastFetchStarted?: number;\n  pendingFetch?: Promise<unknown>;\n  retainCount: number = 0;\n  options: O;\n  cacheKey: KEY;\n  store: Store;\n  abortController?: AbortController;\n  #connectable?: Connectable<PAYLOAD>;\n  #subscription?: Subscription;\n  #subject: Observable<SubjectPayload<KEY>>;\n\n  constructor(\n    store: Store,\n    observable: Observable<SubjectPayload<KEY>>,\n    opts: O,\n    cacheKey: KEY,\n  ) {\n    this.options = opts;\n    this.cacheKey = cacheKey;\n    this.store = store;\n    this.#subject = observable;\n  }\n\n  protected abstract _createConnectable(\n    subject: Observable<SubjectPayload<KEY>>,\n  ): Connectable<PAYLOAD>;\n\n  public subscribe(\n    observer: Partial<Observer<PAYLOAD>>,\n  ): Unsubscribable {\n    this.#connectable ??= this._createConnectable(this.#subject);\n    this.#subscription = this.#connectable.connect();\n    return this.#connectable.subscribe(observer);\n  }\n\n  revalidate(force?: boolean): Promise<unknown> {\n    if (force) {\n      this.abortController?.abort();\n    }\n\n    // if we are pending the first page we can just ignore this\n    if (this.pendingFetch) {\n      return this.pendingFetch;\n    }\n\n    if (\n      (this.options.dedupeInterval ?? 0) > 0 && (\n        this.lastFetchStarted != null\n        && Date.now() - this.lastFetchStarted < (this.options.dedupeInterval\n            ?? 0)\n      )\n    ) {\n      return Promise.resolve();\n    }\n\n    this.store.batch({}, (batch) => {\n      this.setStatus(\"loading\", batch);\n    });\n\n    this._preFetch();\n\n    this.lastFetchStarted = Date.now();\n    this.pendingFetch = this._fetch().finally(() => {\n      this.pendingFetch = undefined;\n    });\n\n    return this.pendingFetch;\n  }\n\n  _preFetch(): void {}\n  abstract _fetch(): Promise<unknown>;\n\n  setStatus(\n    status: Status,\n    batch: BatchContext,\n  ): void {\n    const existing = batch.read(this.cacheKey);\n    if (existing?.status === status) return;\n\n    batch.write(this.cacheKey, existing?.value, status);\n  }\n\n  dispose(): void {\n    if (this.abortController) {\n      this.abortController.abort();\n    }\n    this.#subscription?.unsubscribe();\n    this._dispose();\n  }\n\n  _dispose(): void {}\n\n  abstract writeToStore(\n    data: KEY[\"__cacheKey\"][\"value\"],\n    status: Status,\n    batch: BatchContext,\n  ): Entry<KEY>;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAkBA,OAAO,MAAeA,KAAK,CAIQ;EAGjCC,WAAW,GAAW,CAAC;EAKvB,CAACC,WAAW;EACZ,CAACC,YAAY;EACb,CAACC,OAAO;EAERC,WAAWA,CACTC,KAAY,EACZC,UAA2C,EAC3CC,IAAO,EACPC,QAAa,EACb;IACA,IAAI,CAACC,OAAO,GAAGF,IAAI;IACnB,IAAI,CAACC,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACH,KAAK,GAAGA,KAAK;IAClB,IAAI,CAAC,CAACF,OAAO,GAAGG,UAAU;EAC5B;EAMOI,SAASA,CACdC,QAAoC,EACpB;IAChB,IAAI,CAAC,CAACV,WAAW,KAAK,IAAI,CAACW,kBAAkB,CAAC,IAAI,CAAC,CAACT,OAAO,CAAC;IAC5D,IAAI,CAAC,CAACD,YAAY,GAAG,IAAI,CAAC,CAACD,WAAW,CAACY,OAAO,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC,CAACZ,WAAW,CAACS,SAAS,CAACC,QAAQ,CAAC;EAC9C;EAEAG,UAAUA,CAACC,KAAe,EAAoB;IAC5C,IAAIA,KAAK,EAAE;MACT,IAAI,CAACC,eAAe,EAAEC,KAAK,CAAC,CAAC;IAC/B;;IAEA;IACA,IAAI,IAAI,CAACC,YAAY,EAAE;MACrB,OAAO,IAAI,CAACA,YAAY;IAC1B;IAEA,IACE,CAAC,IAAI,CAACT,OAAO,CAACU,cAAc,IAAI,CAAC,IAAI,CAAC,IACpC,IAAI,CAACC,gBAAgB,IAAI,IAAI,IAC1BC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG,IAAI,CAACF,gBAAgB,IAAI,IAAI,CAACX,OAAO,CAACU,cAAc,IAC7D,CAAC,CACT,EACD;MACA,OAAOI,OAAO,CAACC,OAAO,CAAC,CAAC;IAC1B;IAEA,IAAI,CAACnB,KAAK,CAACoB,KAAK,CAAC,CAAC,CAAC,EAAGA,KAAK,IAAK;MAC9B,IAAI,CAACC,SAAS,CAAC,SAAS,EAAED,KAAK,CAAC;IAClC,CAAC,CAAC;IAEF,IAAI,CAACE,SAAS,CAAC,CAAC;IAEhB,IAAI,CAACP,gBAAgB,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAClC,IAAI,CAACJ,YAAY,GAAG,IAAI,CAACU,MAAM,CAAC,CAAC,CAACC,OAAO,CAAC,MAAM;MAC9C,IAAI,CAACX,YAAY,GAAGY,SAAS;IAC/B,CAAC,CAAC;IAEF,OAAO,IAAI,CAACZ,YAAY;EAC1B;EAEAS,SAASA,CAAA,EAAS,CAAC;EAGnBD,SAASA,CACPK,MAAc,EACdN,KAAmB,EACb;IACN,MAAMO,QAAQ,GAAGP,KAAK,CAACQ,IAAI,CAAC,IAAI,CAACzB,QAAQ,CAAC;IAC1C,IAAIwB,QAAQ,EAAED,MAAM,KAAKA,MAAM,EAAE;IAEjCN,KAAK,CAACS,KAAK,CAAC,IAAI,CAAC1B,QAAQ,EAAEwB,QAAQ,EAAEG,KAAK,EAAEJ,MAAM,CAAC;EACrD;EAEAK,OAAOA,CAAA,EAAS;IACd,IAAI,IAAI,CAACpB,eAAe,EAAE;MACxB,IAAI,CAACA,eAAe,CAACC,KAAK,CAAC,CAAC;IAC9B;IACA,IAAI,CAAC,CAACf,YAAY,EAAEmC,WAAW,CAAC,CAAC;IACjC,IAAI,CAACC,QAAQ,CAAC,CAAC;EACjB;EAEAA,QAAQA,CAAA,EAAS,CAAC;AAOpB","ignoreList":[]}
+{"version":3,"file":"Query.js","names":["additionalContext","Query","retainCount","connectable","subscription","subject","constructor","store","observable","opts","cacheKey","logger","options","process","env","NODE_ENV","client","child","msgPrefix","type","otherKeys","map","x","JSON","stringify","join","subscribe","observer","_createConnectable","connect","revalidate","force","info","methodName","abortController","abort","pendingFetch","dedupeInterval","lastFetchStarted","Date","now","trace","Promise","resolve","batch","setStatus","_preFetch","_fetch","catch","e","error","finally","undefined","status","existing","read","write","value","dispose","unsubscribe","_dispose"],"sources":["Query.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  Connectable,\n  Observable,\n  Observer,\n  Subscribable,\n  Subscription,\n} from \"rxjs\";\nimport { additionalContext } from \"../../Client.js\";\nimport type { Logger } from \"../../Logger.js\";\nimport type { CommonObserveOptions, Status } from \"../ObservableClient.js\";\nimport type { CacheKey } from \"./CacheKey.js\";\nimport type { Entry } from \"./Layer.js\";\nimport type { BatchContext, Store, SubjectPayload } from \"./Store.js\";\n\nexport abstract class Query<\n  KEY extends CacheKey,\n  PAYLOAD,\n  O extends CommonObserveOptions,\n> implements Subscribable<PAYLOAD> {\n  lastFetchStarted?: number;\n  pendingFetch?: Promise<unknown>;\n  retainCount: number = 0;\n  options: O;\n  cacheKey: KEY;\n  store: Store;\n  abortController?: AbortController;\n  #connectable?: Connectable<PAYLOAD>;\n  #subscription?: Subscription;\n  #subject: Observable<SubjectPayload<KEY>>;\n\n  /** @internal */\n  protected logger: Logger | undefined;\n\n  constructor(\n    store: Store,\n    observable: Observable<SubjectPayload<KEY>>,\n    opts: O,\n    cacheKey: KEY,\n    logger?: Logger,\n  ) {\n    this.options = opts;\n    this.cacheKey = cacheKey;\n    this.store = store;\n    this.#subject = observable;\n\n    this.logger = logger ?? (\n      process.env.NODE_ENV === \"production\"\n        ? store.client[additionalContext].logger\n        : store.client[additionalContext].logger?.child({}, {\n          msgPrefix: process.env.NODE_ENV !== \"production\"\n            ? (`Query<${cacheKey.type}, ${\n              cacheKey.otherKeys.map(x => JSON.stringify(x)).join(\", \")\n            }>`)\n            : \"Query\",\n        })\n    );\n  }\n\n  protected abstract _createConnectable(\n    subject: Observable<SubjectPayload<KEY>>,\n  ): Connectable<PAYLOAD>;\n\n  public subscribe(\n    observer: Partial<Observer<PAYLOAD>>,\n  ): Subscription {\n    this.#connectable ??= this._createConnectable(this.#subject);\n    this.#subscription = this.#connectable.connect();\n    return this.#connectable.subscribe(observer);\n  }\n\n  revalidate(force?: boolean): Promise<unknown> {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.info({ methodName: \"revalidate\" });\n    }\n\n    if (force) {\n      this.abortController?.abort();\n    }\n\n    // if we are pending the first page we can just ignore this\n    if (this.pendingFetch) {\n      return this.pendingFetch;\n    }\n\n    if (\n      (this.options.dedupeInterval ?? 0) > 0 && (\n        this.lastFetchStarted != null\n        && Date.now() - this.lastFetchStarted < (this.options.dedupeInterval\n            ?? 0)\n      )\n    ) {\n      if (process.env.NODE_ENV !== \"production\") {\n        this.logger?.trace({ methodName: \"revalidate\" }, \"DEDUPE\");\n      }\n\n      return Promise.resolve();\n    }\n\n    this.store.batch({}, (batch) => {\n      this.setStatus(\"loading\", batch);\n    });\n\n    this._preFetch();\n\n    this.lastFetchStarted = Date.now();\n\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.trace({ methodName: \"revalidate\" }, \"calling _fetch()\");\n    }\n    this.pendingFetch = this._fetch()\n      .catch((e) => {\n        this.logger?.error({ methodName: \"revalidate\" }, \"_fetch() FAILED\", e);\n        throw e;\n      })\n      .finally(() => {\n        this.logger?.info({ methodName: \"revalidate\" }, \"finally _fetch()\");\n        this.pendingFetch = undefined;\n      });\n\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.info({ methodName: \"revalidate\" }, \"Returning\");\n    }\n\n    return this.pendingFetch;\n  }\n\n  _preFetch(): void {}\n  abstract _fetch(): Promise<unknown>;\n\n  setStatus(\n    status: Status,\n    batch: BatchContext,\n  ): void {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.trace({ methodName: \"setStatus\" }, status);\n    }\n    const existing = batch.read(this.cacheKey);\n    if (existing?.status === status) return;\n\n    batch.write(this.cacheKey, existing?.value, status);\n  }\n\n  dispose(): void {\n    if (this.abortController) {\n      this.abortController.abort();\n    }\n    this.#subscription?.unsubscribe();\n    this._dispose();\n  }\n\n  _dispose(): void {}\n\n  abstract writeToStore(\n    data: KEY[\"__cacheKey\"][\"value\"],\n    status: Status,\n    batch: BatchContext,\n  ): Entry<KEY>;\n}\n"],"mappings":"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","ignoreList":[]}