@osdk/client 2.5.0-beta.1 → 2.5.0-beta.11

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

@@ -20,6 +20,7 @@ export class Query {
   #connectable;
   #subscription;
   #subject;
+  #subscriptionDedupeIntervals = new Map();
 
   /** @internal */
 
@@ -27,6 +28,7 @@ export class Query {
     this.options = opts;
     this.cacheKey = cacheKey;
     this.store = store;
+    this.cacheKeys = store.cacheKeys;
     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"
@@ -35,7 +37,50 @@ export class Query {
   subscribe(observer) {
     this.#connectable ??= this._createConnectable(this.#subject);
     this.#subscription = this.#connectable.connect();
-    return this.#connectable.subscribe(observer);
+    const sub = this.#connectable.subscribe({
+      next: value => {
+        if (observer.next) {
+          observer.next(value);
+        }
+      },
+      error: err => {
+        if (observer.error) {
+          observer.error(err);
+        }
+      },
+      complete: () => {
+        if (observer.complete) {
+          observer.complete();
+        }
+      }
+    });
+    return sub;
+  }
+
+  /**
+   * Register a subscription's dedupeInterval value
+   */
+  registerSubscriptionDedupeInterval(subscriptionId, dedupeInterval) {
+    if (dedupeInterval != null && dedupeInterval > 0) {
+      this.#subscriptionDedupeIntervals.set(subscriptionId, dedupeInterval);
+    }
+  }
+
+  /**
+   * Unregister a subscription's dedupeInterval value
+   */
+  unregisterSubscriptionDedupeInterval(subscriptionId) {
+    this.#subscriptionDedupeIntervals.delete(subscriptionId);
+  }
+
+  /**
+   * Get the minimum dedupeInterval from all active subscriptions
+   */
+  getMinimumDedupeInterval() {
+    if (this.#subscriptionDedupeIntervals.size === 0) {
+      return this.options.dedupeInterval ?? 0;
+    }
+    return Math.min(...this.#subscriptionDedupeIntervals.values());
   }
 
   /**
@@ -66,7 +111,8 @@ export class Query {
       await this.pendingFetch;
       return;
     }
-    if ((this.options.dedupeInterval ?? 0) > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < (this.options.dedupeInterval ?? 0)) {
+    const minDedupeInterval = this.getMinimumDedupeInterval();
+    if (minDedupeInterval > 0 && this.lastFetchStarted != null && Date.now() - this.lastFetchStarted < minDedupeInterval) {
       if (process.env.NODE_ENV !== "production") {
         logger?.debug("Within dupeInterval, aborting revalidate");
       }
@@ -88,7 +134,7 @@ export class Query {
       logger?.debug("calling _fetchAndStore()");
     }
     this.pendingFetch = this._fetchAndStore().finally(() => {
-      logger?.debug("finally _fetchAndStore()");
+      logger?.debug("promise's finally for _fetchAndStore()");
       this.pendingFetch = undefined;
     });
     await this.pendingFetch;
@@ -105,10 +151,22 @@ export class Query {
     if (process.env.NODE_ENV !== "production") {
       this.logger?.child({
         methodName: "setStatus"
-      }).debug(status);
+      }).debug(`Attempting to set status to '${status}'`);
     }
     const existing = batch.read(this.cacheKey);
-    if (existing?.status === status) return;
+    if (existing?.status === status) {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "setStatus"
+        }).debug(`Status is already set to '${status}'; aborting`);
+      }
+      return;
+    }
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "setStatus"
+      }).debug(`Writing status '${status}' to cache`);
+    }
     batch.write(this.cacheKey, existing?.value, status);
   }
   dispose() {

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

@@ -1 +1 @@
-{"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","methodName","abortController","abort","pendingFetch","debug","dedupeInterval","lastFetchStarted","Date","now","Promise","resolve","batch","setStatus","_preFetch","_fetchAndStore","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 { Logger } from \"@osdk/api\";\nimport type {\n  Connectable,\n  Observable,\n  Observer,\n  Subscribable,\n  Subscription,\n} from \"rxjs\";\nimport { additionalContext } from \"../../Client.js\";\nimport type { CommonObserveOptions, Status } from \"../ObservableClient.js\";\nimport type { CacheKey } from \"./CacheKey.js\";\nimport type { Changes } from \"./Changes.js\";\nimport type { Entry } from \"./Layer.js\";\nimport type { OptimisticId } from \"./OptimisticId.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: 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  /**\n   * Causes the query to revalidate. This will cause the query to fetch\n   * the latest data from the server and update the store if it is deemed\n   * \"stale\" or if `force` is true.\n   *\n   * @param force\n   * @returns\n   */\n  async revalidate(force?: boolean): Promise<void> {\n    const logger = process.env.NODE_ENV !== \"production\"\n      ? this.logger?.child({ methodName: \"revalidate\" })\n      : this.logger;\n\n    if (force) {\n      this.abortController?.abort();\n    }\n\n    // n.b. I think this isn't quite right since we may require multiple\n    // pages to properly \"revalidate\" for someone. This only really works if you\n    // have a single page/object. It needs to be redone. FIXME\n\n    // if we are pending the first page/object we can just ignore this\n    if (this.pendingFetch) {\n      if (process.env.NODE_ENV !== \"production\") {\n        logger?.debug(\"Fetch is already pending, using it\");\n      }\n      await this.pendingFetch;\n      return;\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        logger?.debug(\"Within dupeInterval, aborting revalidate\");\n      }\n\n      return Promise.resolve();\n    }\n\n    if (process.env.NODE_ENV !== \"production\") {\n      logger?.debug(\"Starting actual revalidate\");\n    }\n\n    this.store.batch({}, (batch) => {\n      // make sure the truth layer knows we are loading\n\n      // this will not trigger an update to `changes` so it cannot trigger an\n      // update of a list either. This may not be the behavior we want.\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      logger?.debug(\"calling _fetchAndStore()\");\n    }\n    this.pendingFetch = this._fetchAndStore()\n      .finally(() => {\n        logger?.debug(\"finally _fetchAndStore()\");\n        this.pendingFetch = undefined;\n      });\n\n    await this.pendingFetch;\n    return;\n  }\n\n  protected _preFetch(): void {}\n\n  protected abstract _fetchAndStore(): Promise<unknown>;\n\n  /**\n   * Sets the status of the query in the store (but does not store that in `changes`).\n   *\n   * @param status\n   * @param batch\n   * @returns\n   */\n  setStatus(\n    status: Status,\n    batch: BatchContext,\n  ): void {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"setStatus\" }).debug(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  /**\n   * Per query type dispose functionality\n   */\n  protected _dispose(): void {}\n\n  /**\n   * The purpose of this method is to provide a way for others to write\n   * directly into the store for this query.\n   *\n   * @param data\n   * @param status\n   * @param batch\n   */\n  abstract writeToStore(\n    data: KEY[\"__cacheKey\"][\"value\"],\n    status: Status,\n    batch: BatchContext,\n  ): Entry<KEY>;\n\n  /**\n   * @param changes\n   * @param optimisticId\n   * @returns If revalidation is needed, a promise that resolves after the\n   *          revalidation is complete. Otherwise, undefined.\n   */\n  maybeUpdateAndRevalidate?: (\n    changes: Changes,\n    optimisticId: OptimisticId | undefined,\n  ) => Promise<void> | undefined;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Query.js","names":["additionalContext","Query","retainCount","connectable","subscription","subject","subscriptionDedupeIntervals","Map","constructor","store","observable","opts","cacheKey","logger","options","cacheKeys","process","env","NODE_ENV","client","child","msgPrefix","type","otherKeys","map","x","JSON","stringify","join","subscribe","observer","_createConnectable","connect","sub","next","value","error","err","complete","registerSubscriptionDedupeInterval","subscriptionId","dedupeInterval","set","unregisterSubscriptionDedupeInterval","delete","getMinimumDedupeInterval","size","Math","min","values","revalidate","force","methodName","abortController","abort","pendingFetch","debug","minDedupeInterval","lastFetchStarted","Date","now","Promise","resolve","batch","setStatus","_preFetch","_fetchAndStore","finally","undefined","status","existing","read","write","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 { Logger } from \"@osdk/api\";\nimport type {\n  Connectable,\n  Observable,\n  Observer,\n  Subscribable,\n  Subscription,\n} from \"rxjs\";\nimport { additionalContext } from \"../../Client.js\";\nimport type {\n  CommonObserveOptions,\n  Status,\n} from \"../ObservableClient/common.js\";\nimport type { BatchContext } from \"./BatchContext.js\";\nimport type { CacheKeys } from \"./CacheKeys.js\";\nimport type { Changes } from \"./Changes.js\";\nimport type { KnownCacheKey } from \"./KnownCacheKey.js\";\nimport type { Entry } from \"./Layer.js\";\nimport type { OptimisticId } from \"./OptimisticId.js\";\nimport type { Store } from \"./Store.js\";\nimport type { SubjectPayload } from \"./SubjectPayload.js\";\n\nexport abstract class Query<\n  KEY extends KnownCacheKey,\n  PAYLOAD,\n  O extends CommonObserveOptions,\n> implements Subscribable<PAYLOAD> {\n  lastFetchStarted?: number;\n  pendingFetch?: Promise<void>;\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  #subscriptionDedupeIntervals: Map<string, number> = new Map();\n\n  /** @internal */\n  protected logger: Logger | undefined;\n\n  protected readonly cacheKeys: CacheKeys<KnownCacheKey>;\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.cacheKeys = store.cacheKeys;\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: Observer<PAYLOAD>,\n  ): Subscription {\n    this.#connectable ??= this._createConnectable(this.#subject);\n    this.#subscription = this.#connectable.connect();\n    const sub = this.#connectable.subscribe({\n      next: (value) => {\n        if (observer.next) {\n          observer.next(value);\n        }\n      },\n      error: (err) => {\n        if (observer.error) {\n          observer.error(err);\n        }\n      },\n      complete: () => {\n        if (observer.complete) {\n          observer.complete();\n        }\n      },\n    });\n    return sub;\n  }\n\n  /**\n   * Register a subscription's dedupeInterval value\n   */\n  registerSubscriptionDedupeInterval(\n    subscriptionId: string,\n    dedupeInterval: number | undefined,\n  ): void {\n    if (dedupeInterval != null && dedupeInterval > 0) {\n      this.#subscriptionDedupeIntervals.set(subscriptionId, dedupeInterval);\n    }\n  }\n\n  /**\n   * Unregister a subscription's dedupeInterval value\n   */\n  unregisterSubscriptionDedupeInterval(subscriptionId: string): void {\n    this.#subscriptionDedupeIntervals.delete(subscriptionId);\n  }\n\n  /**\n   * Get the minimum dedupeInterval from all active subscriptions\n   */\n  private getMinimumDedupeInterval(): number {\n    if (this.#subscriptionDedupeIntervals.size === 0) {\n      return this.options.dedupeInterval ?? 0;\n    }\n\n    return Math.min(...this.#subscriptionDedupeIntervals.values());\n  }\n\n  /**\n   * Causes the query to revalidate. This will cause the query to fetch\n   * the latest data from the server and update the store if it is deemed\n   * \"stale\" or if `force` is true.\n   *\n   * @param force\n   * @returns\n   */\n  async revalidate(force?: boolean): Promise<void> {\n    const logger = process.env.NODE_ENV !== \"production\"\n      ? this.logger?.child({ methodName: \"revalidate\" })\n      : this.logger;\n\n    if (force) {\n      this.abortController?.abort();\n    }\n\n    // n.b. I think this isn't quite right since we may require multiple\n    // pages to properly \"revalidate\" for someone. This only really works if you\n    // have a single page/object. It needs to be redone. FIXME\n\n    // if we are pending the first page/object we can just ignore this\n    if (this.pendingFetch) {\n      if (process.env.NODE_ENV !== \"production\") {\n        logger?.debug(\"Fetch is already pending, using it\");\n      }\n      await this.pendingFetch;\n      return;\n    }\n\n    const minDedupeInterval = this.getMinimumDedupeInterval();\n    if (\n      minDedupeInterval > 0 && (\n        this.lastFetchStarted != null\n        && Date.now() - this.lastFetchStarted < minDedupeInterval\n      )\n    ) {\n      if (process.env.NODE_ENV !== \"production\") {\n        logger?.debug(\"Within dupeInterval, aborting revalidate\");\n      }\n\n      return Promise.resolve();\n    }\n\n    if (process.env.NODE_ENV !== \"production\") {\n      logger?.debug(\"Starting actual revalidate\");\n    }\n\n    this.store.batch({}, (batch) => {\n      // make sure the truth layer knows we are loading\n\n      // this will not trigger an update to `changes` so it cannot trigger an\n      // update of a list either. This may not be the behavior we want.\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      logger?.debug(\"calling _fetchAndStore()\");\n    }\n    this.pendingFetch = this._fetchAndStore()\n      .finally(() => {\n        logger?.debug(\"promise's finally for _fetchAndStore()\");\n        this.pendingFetch = undefined;\n      });\n\n    await this.pendingFetch;\n    return;\n  }\n\n  protected _preFetch(): void {}\n\n  protected abstract _fetchAndStore(): Promise<void>;\n\n  /**\n   * Sets the status of the query in the store (but does not store that in `changes`).\n   *\n   * @param status\n   * @param batch\n   * @returns\n   */\n  setStatus(\n    status: Status,\n    batch: BatchContext,\n  ): void {\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"setStatus\" }).debug(\n        `Attempting to set status to '${status}'`,\n      );\n    }\n    const existing = batch.read(this.cacheKey);\n    if (existing?.status === status) {\n      if (process.env.NODE_ENV !== \"production\") {\n        this.logger?.child({ methodName: \"setStatus\" }).debug(\n          `Status is already set to '${status}'; aborting`,\n        );\n      }\n      return;\n    }\n\n    if (process.env.NODE_ENV !== \"production\") {\n      this.logger?.child({ methodName: \"setStatus\" }).debug(\n        `Writing status '${status}' to cache`,\n      );\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  /**\n   * Per query type dispose functionality\n   */\n  protected _dispose(): void {}\n\n  /**\n   * The purpose of this method is to provide a way for others to write\n   * directly into the store for this query.\n   *\n   * @param data\n   * @param status\n   * @param batch\n   */\n  abstract writeToStore(\n    data: KEY[\"__cacheKey\"][\"value\"],\n    status: Status,\n    batch: BatchContext,\n  ): Entry<KEY>;\n\n  /**\n   * @param changes\n   * @param optimisticId\n   * @returns If revalidation is needed, a promise that resolves after the\n   *          revalidation is complete. Otherwise, undefined.\n   */\n  maybeUpdateAndRevalidate?: (\n    changes: Changes,\n    optimisticId: OptimisticId | undefined,\n  ) => Promise<void> | undefined;\n\n  abstract invalidateObjectType(\n    objectType: string,\n    changes: Changes | undefined,\n  ): Promise<void>;\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,48 @@
+/*
+ * 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 { UnsubscribableWrapper } from "./UnsubscribableWrapper.js";
+let subscriptionIdCounter = 0;
+
+/** @internal */
+export class QuerySubscription extends UnsubscribableWrapper {
+  /** @internal */
+
+  /** @internal */
+
+  /** @internal */
+
+  constructor(query, subscription) {
+    super(subscription);
+    this.query = query;
+    this.subscription = subscription;
+    this.subscriptionId = `sub_${++subscriptionIdCounter}`;
+
+    // hide these from introspection
+    Object.defineProperties(this, {
+      query: {
+        enumerable: false
+      },
+      subscription: {
+        enumerable: false
+      },
+      subscriptionId: {
+        enumerable: false
+      }
+    });
+  }
+}
+//# sourceMappingURL=QuerySubscription.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QuerySubscription.js","names":["UnsubscribableWrapper","subscriptionIdCounter","QuerySubscription","constructor","query","subscription","subscriptionId","Object","defineProperties","enumerable"],"sources":["QuerySubscription.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 { Subscription } from \"rxjs\";\nimport type {\n  CommonObserveOptions,\n  ObserveOptions,\n} from \"../ObservableClient/common.js\";\nimport type { KnownCacheKey } from \"./KnownCacheKey.js\";\nimport type { Query } from \"./Query.js\";\nimport { UnsubscribableWrapper } from \"./UnsubscribableWrapper.js\";\n\nlet subscriptionIdCounter = 0;\n\n/** @internal */\nexport class QuerySubscription<\n  TQuery extends Query<\n    KnownCacheKey,\n    unknown,\n    CommonObserveOptions & ObserveOptions\n  >,\n> extends UnsubscribableWrapper {\n  /** @internal */\n  query: TQuery;\n\n  /** @internal */\n  subscription: Subscription;\n\n  /** @internal */\n  subscriptionId: string;\n\n  constructor(query: TQuery, subscription: Subscription) {\n    super(subscription);\n    this.query = query;\n    this.subscription = subscription;\n    this.subscriptionId = `sub_${++subscriptionIdCounter}`;\n\n    // hide these from introspection\n    Object.defineProperties(this, {\n      query: { enumerable: false },\n      subscription: { enumerable: false },\n      subscriptionId: { enumerable: false },\n    });\n  }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA,SAASA,qBAAqB,QAAQ,4BAA4B;AAElE,IAAIC,qBAAqB,GAAG,CAAC;;AAE7B;AACA,OAAO,MAAMC,iBAAiB,SAMpBF,qBAAqB,CAAC;EAC9B;;EAGA;;EAGA;;EAGAG,WAAWA,CAACC,KAAa,EAAEC,YAA0B,EAAE;IACrD,KAAK,CAACA,YAAY,CAAC;IACnB,IAAI,CAACD,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,YAAY,GAAGA,YAAY;IAChC,IAAI,CAACC,cAAc,GAAG,OAAO,EAAEL,qBAAqB,EAAE;;IAEtD;IACAM,MAAM,CAACC,gBAAgB,CAAC,IAAI,EAAE;MAC5BJ,KAAK,EAAE;QAAEK,UAAU,EAAE;MAAM,CAAC;MAC5BJ,YAAY,EAAE;QAAEI,UAAU,EAAE;MAAM,CAAC;MACnCH,cAAc,EAAE;QAAEG,UAAU,EAAE;MAAM;IACtC,CAAC,CAAC;EACJ;AACF","ignoreList":[]}