houdini-svelte 2.1.8 → 2.1.10

package/build/plugin-cjs/index.js

@@ -82652,10 +82652,10 @@ function plugin_config(config) {
       mutation: "../runtime/stores/mutation.MutationStore",
       fragment: "../runtime/stores/fragment.FragmentStore",
       subscription: "../runtime/stores/subscription.SubscriptionStore",
-      queryCursor: "../runtime/stores/pagination/query.QueryStoreCursor",
-      queryOffset: "../runtime/stores/pagination/query.QueryStoreOffset",
-      fragmentCursor: "../runtime/stores/pagination/fragment.FragmentStoreCursor",
-      fragmentOffset: "../runtime/stores/pagination/fragment.FragmentStoreOffset",
+      queryCursor: "../runtime/stores/query.QueryStoreCursor",
+      queryOffset: "../runtime/stores/query.QueryStoreOffset",
+      fragmentCursor: "../runtime/stores/fragment.FragmentStoreCursor",
+      fragmentOffset: "../runtime/stores/fragment.FragmentStoreOffset",
       ...cfg?.customStores
     }
   };
@@ -152853,7 +152853,6 @@ async function queryStore({ config, pluginRoot }, doc) {
   const { store_class, statement } = store_import2(config, which);
   const storeData = `${statement}
 import artifact from '$houdini/artifacts/${artifactName}'
-import { initClient } from '$houdini/plugins/houdini-svelte/runtime/client'
 
 export class ${storeName} extends ${store_class} {
 	constructor() {
@@ -152866,7 +152865,6 @@ export class ${storeName} extends ${store_class} {
 }
 
 export async function load_${artifactName}(params) {
-	await initClient()
 
 	const store = new ${storeName}()
 

package/build/plugin-esm/index.js

@@ -82648,10 +82648,10 @@ function plugin_config(config) {
       mutation: "../runtime/stores/mutation.MutationStore",
       fragment: "../runtime/stores/fragment.FragmentStore",
       subscription: "../runtime/stores/subscription.SubscriptionStore",
-      queryCursor: "../runtime/stores/pagination/query.QueryStoreCursor",
-      queryOffset: "../runtime/stores/pagination/query.QueryStoreOffset",
-      fragmentCursor: "../runtime/stores/pagination/fragment.FragmentStoreCursor",
-      fragmentOffset: "../runtime/stores/pagination/fragment.FragmentStoreOffset",
+      queryCursor: "../runtime/stores/query.QueryStoreCursor",
+      queryOffset: "../runtime/stores/query.QueryStoreOffset",
+      fragmentCursor: "../runtime/stores/fragment.FragmentStoreCursor",
+      fragmentOffset: "../runtime/stores/fragment.FragmentStoreOffset",
       ...cfg?.customStores
     }
   };
@@ -152848,7 +152848,6 @@ async function queryStore({ config, pluginRoot }, doc) {
   const { store_class, statement } = store_import2(config, which);
   const storeData = `${statement}
 import artifact from '$houdini/artifacts/${artifactName}'
-import { initClient } from '$houdini/plugins/houdini-svelte/runtime/client'
 
 export class ${storeName} extends ${store_class} {
 	constructor() {
@@ -152861,7 +152860,6 @@ export class ${storeName} extends ${store_class} {
 }
 
 export async function load_${artifactName}(params) {
-	await initClient()
 
 	const store = new ${storeName}()
 

package/build/preprocess-cjs/index.js

@@ -86584,10 +86584,10 @@ function plugin_config(config) {
       mutation: "../runtime/stores/mutation.MutationStore",
       fragment: "../runtime/stores/fragment.FragmentStore",
       subscription: "../runtime/stores/subscription.SubscriptionStore",
-      queryCursor: "../runtime/stores/pagination/query.QueryStoreCursor",
-      queryOffset: "../runtime/stores/pagination/query.QueryStoreOffset",
-      fragmentCursor: "../runtime/stores/pagination/fragment.FragmentStoreCursor",
-      fragmentOffset: "../runtime/stores/pagination/fragment.FragmentStoreOffset",
+      queryCursor: "../runtime/stores/query.QueryStoreCursor",
+      queryOffset: "../runtime/stores/query.QueryStoreOffset",
+      fragmentCursor: "../runtime/stores/fragment.FragmentStoreCursor",
+      fragmentOffset: "../runtime/stores/fragment.FragmentStoreOffset",
       ...cfg?.customStores
     }
   };

package/build/preprocess-esm/index.js

@@ -86581,10 +86581,10 @@ function plugin_config(config) {
       mutation: "../runtime/stores/mutation.MutationStore",
       fragment: "../runtime/stores/fragment.FragmentStore",
       subscription: "../runtime/stores/subscription.SubscriptionStore",
-      queryCursor: "../runtime/stores/pagination/query.QueryStoreCursor",
-      queryOffset: "../runtime/stores/pagination/query.QueryStoreOffset",
-      fragmentCursor: "../runtime/stores/pagination/fragment.FragmentStoreCursor",
-      fragmentOffset: "../runtime/stores/pagination/fragment.FragmentStoreOffset",
+      queryCursor: "../runtime/stores/query.QueryStoreCursor",
+      queryOffset: "../runtime/stores/query.QueryStoreOffset",
+      fragmentCursor: "../runtime/stores/fragment.FragmentStoreCursor",
+      fragmentOffset: "../runtime/stores/fragment.FragmentStoreOffset",
       ...cfg?.customStores
     }
   };

package/build/runtime/client.d.ts

@@ -1,3 +1,2 @@
 import type { HoudiniClient } from '$houdini/runtime/client';
-export declare function initClient(): Promise<HoudiniClient>;
 export declare function getClient(): HoudiniClient;

package/build/runtime/fragments.d.ts

@@ -2,7 +2,7 @@
 import type { Fragment, FragmentArtifact } from '$houdini/runtime/lib/types';
 import type { Readable } from 'svelte/store';
 import type { FragmentStore } from './stores';
-import type { FragmentStorePaginated } from './stores/pagination/fragment';
+import type { FragmentStorePaginated } from './stores/fragment';
 export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined>> & {
     data: Readable<_Fragment>;
     artifact: FragmentArtifact;

package/build/runtime/stores/fragment.d.ts

@@ -1,6 +1,10 @@
-import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext, GraphQLVariables } from '$houdini/runtime/lib/types';
+/// <reference types="svelte" />
+import type { DocumentStore } from '$houdini/runtime/client';
+import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext, GraphQLVariables, QueryArtifact, PageInfo, CursorHandlers } from '$houdini/runtime/lib/types';
 import { fragmentKey } from '$houdini/runtime/lib/types';
-import type { FragmentStoreInstance } from '../types';
+import type { Readable, Subscriber } from 'svelte/store';
+import type { FragmentStoreInstance, OffsetFragmentStoreInstance } from '../types';
+import type { StoreConfig } from './query';
 export declare class FragmentStore<_Data extends GraphQLObject, _ReferenceType extends {}, _Input extends GraphQLVariables = GraphQLVariables> {
     artifact: FragmentArtifact;
     name: string;
@@ -16,3 +20,55 @@ export declare class FragmentStore<_Data extends GraphQLObject, _ReferenceType e
         initialValue: _Data | null;
     };
 }
+type FragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<_Data, _Input, FragmentArtifact> & {
+    paginationArtifact: QueryArtifact;
+};
+declare class BasePaginatedFragmentStore<_Data extends GraphQLObject, _Input> {
+    paginated: boolean;
+    protected paginationArtifact: QueryArtifact;
+    name: string;
+    kind: "HoudiniFragment";
+    artifact: FragmentArtifact;
+    constructor(config: FragmentStoreConfig<_Data, _Input>);
+    protected queryVariables(getState: () => _Data | null): _Input;
+}
+export declare class FragmentStoreCursor<_Data extends GraphQLObject, _Input extends GraphQLVariables> extends BasePaginatedFragmentStore<_Data, _Input> {
+    get(initialValue: _Data | null): {
+        kind: "HoudiniFragment";
+        subscribe: (run: Subscriber<FragmentPaginatedResult<_Data, {
+            pageInfo: PageInfo;
+        }>>, invalidate?: ((value?: FragmentPaginatedResult<_Data, {
+            pageInfo: PageInfo;
+        }> | undefined) => void) | undefined) => (() => void);
+        fetch: (args?: import("$houdini/runtime/lib/types").FetchParams<_Input> | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
+        loadNextPage: (args?: {
+            first?: number | undefined;
+            after?: string | undefined;
+            fetch?: typeof fetch | undefined;
+            metadata?: {} | undefined;
+        } | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
+        loadPreviousPage: (args?: {
+            last?: number | undefined;
+            before?: string | undefined;
+            fetch?: typeof fetch | undefined;
+            metadata?: {} | undefined;
+        } | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
+    };
+    protected storeHandlers(observer: DocumentStore<_Data, _Input>, initialValue: _Data | null, getState: () => _Data | null, getVariables: () => NonNullable<_Input>): CursorHandlers<_Data, _Input>;
+}
+export declare class FragmentStoreOffset<_Data extends GraphQLObject, _Input extends GraphQLVariables> extends BasePaginatedFragmentStore<_Data, _Input> {
+    get(initialValue: _Data | null): OffsetFragmentStoreInstance<_Data, _Input>;
+}
+export type FragmentStorePaginated<_Data extends GraphQLObject, _Input> = Readable<{
+    data: _Data;
+    fetching: boolean;
+    pageInfo: PageInfo;
+}> & {
+    loadNextPage(pageCount?: number, after?: string | number, houdiniContext?: HoudiniFetchContext): Promise<void>;
+    loadPreviousPage(pageCount?: number, before?: string, houdiniContext?: HoudiniFetchContext): Promise<void>;
+};
+export type FragmentPaginatedResult<_Data, _ExtraFields = {}> = {
+    data: _Data | null;
+    fetching: boolean;
+} & _ExtraFields;
+export {};

package/build/runtime/stores/index.d.ts

@@ -1,5 +1,4 @@
-export * from './pagination';
-export { FragmentStore } from './fragment';
+export { FragmentStore, FragmentStoreCursor, FragmentStoreOffset } from './fragment';
 export { SubscriptionStore } from './subscription';
 export { MutationStore, type MutationConfig } from './mutation';
-export { QueryStore } from './query';
+export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';

package/build/runtime/stores/query.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="svelte" />
 import type { FetchContext } from '$houdini/runtime/client/plugins/fetch';
-import type { CachePolicies, GraphQLVariables, GraphQLObject, MutationArtifact, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
+import type { CachePolicies, GraphQLVariables, GraphQLObject, MutationArtifact, QueryArtifact, QueryResult, CursorHandlers, OffsetHandlers, PageInfo } from '$houdini/runtime/lib/types';
+import type { Subscriber } from 'svelte/store';
 import type { PluginArtifactData } from '../../plugin/artifactData';
 import type { ClientFetchParams, LoadEventFetchParams, QueryStoreFetchParams, RequestEventFetchParams } from '../types';
 import { BaseStore } from './base';
@@ -31,3 +33,27 @@ export declare function fetchParams<_Data extends GraphQLObject, _Input>(artifac
     policy: CachePolicies | undefined;
     params: QueryStoreFetchParams<_Data, _Input>;
 }>;
+export type CursorStoreResult<_Data extends GraphQLObject, _Input extends GraphQLVariables> = QueryResult<_Data, _Input> & {
+    pageInfo: PageInfo;
+};
+export declare class QueryStoreCursor<_Data extends GraphQLObject, _Input extends GraphQLVariables> extends QueryStore<_Data, _Input> {
+    #private;
+    paginated: boolean;
+    constructor(config: StoreConfig<_Data, _Input, QueryArtifact>);
+    fetch(params?: RequestEventFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    fetch(params?: LoadEventFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    fetch(params?: ClientFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    fetch(params?: QueryStoreFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    loadPreviousPage(args?: Parameters<Required<CursorHandlers<_Data, _Input>>['loadPreviousPage']>[0]): Promise<QueryResult<_Data, _Input>>;
+    loadNextPage(args?: Parameters<CursorHandlers<_Data, _Input>['loadNextPage']>[0]): Promise<QueryResult<_Data, _Input>>;
+    subscribe(run: Subscriber<CursorStoreResult<_Data, _Input>>, invalidate?: ((value?: CursorStoreResult<_Data, _Input> | undefined) => void) | undefined): () => void;
+}
+export declare class QueryStoreOffset<_Data extends GraphQLObject, _Input extends GraphQLVariables> extends QueryStore<_Data, _Input> {
+    #private;
+    paginated: boolean;
+    loadNextPage(args?: Parameters<OffsetHandlers<_Data, _Input>['loadNextPage']>[0]): Promise<void>;
+    fetch(params?: RequestEventFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    fetch(params?: LoadEventFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    fetch(params?: ClientFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+    fetch(params?: QueryStoreFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
+}

package/build/runtime-cjs/client.d.ts

@@ -1,3 +1,2 @@
 import type { HoudiniClient } from '$houdini/runtime/client';
-export declare function initClient(): Promise<HoudiniClient>;
 export declare function getClient(): HoudiniClient;

package/build/runtime-cjs/client.js

@@ -24,26 +24,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var client_exports = {};
 __export(client_exports, {
-  getClient: () => getClient,
-  initClient: () => initClient
+  getClient: () => getClient
 });
 module.exports = __toCommonJS(client_exports);
-let client = null;
-async function initClient() {
-  if (client) {
-    return client;
-  }
-  client = (await import("HOUDINI_CLIENT_PATH")).default;
-  return client;
-}
+var import_HOUDINI_CLIENT_PATH = __toESM(require("HOUDINI_CLIENT_PATH"), 1);
 function getClient() {
-  if (!client) {
+  if (!import_HOUDINI_CLIENT_PATH.default) {
     throw new Error("client hasn't been initialized");
   }
-  return client;
+  return import_HOUDINI_CLIENT_PATH.default;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getClient,
-  initClient
+  getClient
 });

package/build/runtime-cjs/fragments.d.ts

@@ -2,7 +2,7 @@
 import type { Fragment, FragmentArtifact } from '$houdini/runtime/lib/types';
 import type { Readable } from 'svelte/store';
 import type { FragmentStore } from './stores';
-import type { FragmentStorePaginated } from './stores/pagination/fragment';
+import type { FragmentStorePaginated } from './stores/fragment';
 export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined>> & {
     data: Readable<_Fragment>;
     artifact: FragmentArtifact;

package/build/runtime-cjs/stores/base.js

@@ -73,11 +73,6 @@ class BaseStore {
   #subscriberCount = 0;
   setup(init = true) {
     let initPromise = Promise.resolve();
-    try {
-      (0, import_client2.getClient)();
-    } catch {
-      initPromise = (0, import_client2.initClient)();
-    }
     initPromise.then(() => {
       if (this.#unsubscribe) {
         return;

package/build/runtime-cjs/stores/fragment.d.ts

@@ -1,6 +1,10 @@
-import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext, GraphQLVariables } from '$houdini/runtime/lib/types';
+/// <reference types="svelte" />
+import type { DocumentStore } from '$houdini/runtime/client';
+import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext, GraphQLVariables, QueryArtifact, PageInfo, CursorHandlers } from '$houdini/runtime/lib/types';
 import { fragmentKey } from '$houdini/runtime/lib/types';
-import type { FragmentStoreInstance } from '../types';
+import type { Readable, Subscriber } from 'svelte/store';
+import type { FragmentStoreInstance, OffsetFragmentStoreInstance } from '../types';
+import type { StoreConfig } from './query';
 export declare class FragmentStore<_Data extends GraphQLObject, _ReferenceType extends {}, _Input extends GraphQLVariables = GraphQLVariables> {
     artifact: FragmentArtifact;
     name: string;
@@ -16,3 +20,55 @@ export declare class FragmentStore<_Data extends GraphQLObject, _ReferenceType e
         initialValue: _Data | null;
     };
 }
+type FragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<_Data, _Input, FragmentArtifact> & {
+    paginationArtifact: QueryArtifact;
+};
+declare class BasePaginatedFragmentStore<_Data extends GraphQLObject, _Input> {
+    paginated: boolean;
+    protected paginationArtifact: QueryArtifact;
+    name: string;
+    kind: "HoudiniFragment";
+    artifact: FragmentArtifact;
+    constructor(config: FragmentStoreConfig<_Data, _Input>);
+    protected queryVariables(getState: () => _Data | null): _Input;
+}
+export declare class FragmentStoreCursor<_Data extends GraphQLObject, _Input extends GraphQLVariables> extends BasePaginatedFragmentStore<_Data, _Input> {
+    get(initialValue: _Data | null): {
+        kind: "HoudiniFragment";
+        subscribe: (run: Subscriber<FragmentPaginatedResult<_Data, {
+            pageInfo: PageInfo;
+        }>>, invalidate?: ((value?: FragmentPaginatedResult<_Data, {
+            pageInfo: PageInfo;
+        }> | undefined) => void) | undefined) => (() => void);
+        fetch: (args?: import("$houdini/runtime/lib/types").FetchParams<_Input> | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
+        loadNextPage: (args?: {
+            first?: number | undefined;
+            after?: string | undefined;
+            fetch?: typeof fetch | undefined;
+            metadata?: {} | undefined;
+        } | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
+        loadPreviousPage: (args?: {
+            last?: number | undefined;
+            before?: string | undefined;
+            fetch?: typeof fetch | undefined;
+            metadata?: {} | undefined;
+        } | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
+    };
+    protected storeHandlers(observer: DocumentStore<_Data, _Input>, initialValue: _Data | null, getState: () => _Data | null, getVariables: () => NonNullable<_Input>): CursorHandlers<_Data, _Input>;
+}
+export declare class FragmentStoreOffset<_Data extends GraphQLObject, _Input extends GraphQLVariables> extends BasePaginatedFragmentStore<_Data, _Input> {
+    get(initialValue: _Data | null): OffsetFragmentStoreInstance<_Data, _Input>;
+}
+export type FragmentStorePaginated<_Data extends GraphQLObject, _Input> = Readable<{
+    data: _Data;
+    fetching: boolean;
+    pageInfo: PageInfo;
+}> & {
+    loadNextPage(pageCount?: number, after?: string | number, houdiniContext?: HoudiniFetchContext): Promise<void>;
+    loadPreviousPage(pageCount?: number, before?: string, houdiniContext?: HoudiniFetchContext): Promise<void>;
+};
+export type FragmentPaginatedResult<_Data, _ExtraFields = {}> = {
+    data: _Data | null;
+    fetching: boolean;
+} & _ExtraFields;
+export {};

package/build/runtime-cjs/stores/fragment.js

@@ -24,15 +24,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var fragment_exports = {};
 __export(fragment_exports, {
-  FragmentStore: () => FragmentStore
+  FragmentStore: () => FragmentStore,
+  FragmentStoreCursor: () => FragmentStoreCursor,
+  FragmentStoreOffset: () => FragmentStoreOffset
 });
 module.exports = __toCommonJS(fragment_exports);
 var import_cache = __toESM(require("$houdini/runtime/cache"), 1);
 var import_config = require("$houdini/runtime/lib/config");
+var import_constants = require("$houdini/runtime/lib/constants");
+var import_pageInfo = require("$houdini/runtime/lib/pageInfo");
+var import_pagination = require("$houdini/runtime/lib/pagination");
 var import_scalars = require("$houdini/runtime/lib/scalars");
 var import_types = require("$houdini/runtime/lib/types");
 var import_store = require("svelte/store");
 var import_adapter = require("../adapter");
+var import_client = require("../client");
+var import_session = require("../session");
 var import_base = require("./base");
 class FragmentStore {
   artifact;
@@ -81,7 +88,178 @@ Please ensure that you have passed a record that has ${this.artifact.name} mixed
     };
   }
 }
+class BasePaginatedFragmentStore {
+  paginated = true;
+  paginationArtifact;
+  name;
+  kind = import_types.CompiledFragmentKind;
+  artifact;
+  constructor(config) {
+    this.paginationArtifact = config.paginationArtifact;
+    this.name = config.storeName;
+    this.artifact = config.artifact;
+  }
+  queryVariables(getState) {
+    const config = (0, import_config.getCurrentConfig)();
+    const { targetType } = this.paginationArtifact.refetch || {};
+    const typeConfig = config.types?.[targetType || ""];
+    if (!typeConfig) {
+      throw new Error(
+        `Missing type refetch configuration for ${targetType}. For more information, see ${import_constants.siteURL}/guides/pagination#paginated-fragments`
+      );
+    }
+    let idVariables = {};
+    const value = getState();
+    if (typeConfig.resolve?.arguments) {
+      idVariables = typeConfig.resolve.arguments?.(value) || {};
+    } else {
+      const keys = (0, import_config.keyFieldsForType)(config, targetType || "");
+      idVariables = Object.fromEntries(keys.map((key) => [key, value[key]]));
+    }
+    return {
+      ...idVariables
+    };
+  }
+}
+class FragmentStoreCursor extends BasePaginatedFragmentStore {
+  get(initialValue) {
+    const base = new FragmentStore({
+      artifact: this.artifact,
+      storeName: this.name
+    });
+    const store = base.get(initialValue);
+    const paginationStore = (0, import_client.getClient)().observe({
+      artifact: this.paginationArtifact,
+      initialValue: store.initialValue
+    });
+    const handlers = this.storeHandlers(
+      paginationStore,
+      initialValue,
+      () => (0, import_store.get)(store),
+      () => store.variables
+    );
+    const subscribe = (run, invalidate) => {
+      const combined = (0, import_store.derived)([store, paginationStore], ([$parent, $pagination]) => {
+        return {
+          ...$pagination,
+          data: $parent,
+          pageInfo: (0, import_pageInfo.extractPageInfo)($parent, this.paginationArtifact.refetch.path)
+        };
+      });
+      return combined.subscribe(run, invalidate);
+    };
+    return {
+      kind: import_types.CompiledFragmentKind,
+      subscribe,
+      fetch: handlers.fetch,
+      loadNextPage: handlers.loadNextPage,
+      loadPreviousPage: handlers.loadPreviousPage
+    };
+  }
+  storeHandlers(observer, initialValue, getState, getVariables) {
+    return (0, import_pagination.cursorHandlers)({
+      getState,
+      getVariables,
+      artifact: this.paginationArtifact,
+      fetchUpdate: async (args, updates) => {
+        return observer.send({
+          session: await (0, import_session.getSession)(),
+          ...args,
+          variables: {
+            ...args?.variables,
+            ...this.queryVariables(getState)
+          },
+          cacheParams: {
+            applyUpdates: updates,
+            disableSubscriptions: true
+          }
+        });
+      },
+      fetch: async (args) => {
+        return await observer.send({
+          session: await (0, import_session.getSession)(),
+          ...args,
+          variables: {
+            ...args?.variables,
+            ...this.queryVariables(getState)
+          },
+          cacheParams: {
+            disableSubscriptions: true
+          }
+        });
+      },
+      getSession: import_session.getSession
+    });
+  }
+}
+class FragmentStoreOffset extends BasePaginatedFragmentStore {
+  get(initialValue) {
+    const base = new FragmentStore({
+      artifact: this.artifact,
+      storeName: this.name
+    });
+    const store = base.get(initialValue);
+    const paginationStore = (0, import_client.getClient)().observe({
+      artifact: this.paginationArtifact,
+      initialValue: store.initialValue
+    });
+    const getState = () => (0, import_store.get)(store);
+    const handlers = (0, import_pagination.offsetHandlers)({
+      getState,
+      getVariables: () => store.variables,
+      artifact: this.paginationArtifact,
+      fetch: async (args) => {
+        return paginationStore.send({
+          ...args,
+          session: await (0, import_session.getSession)(),
+          variables: {
+            ...this.queryVariables(getState),
+            ...args?.variables
+          },
+          cacheParams: {
+            disableSubscriptions: true
+          }
+        });
+      },
+      fetchUpdate: async (args) => {
+        return paginationStore.send({
+          session: await (0, import_session.getSession)(),
+          ...args,
+          variables: {
+            ...this.queryVariables(getState),
+            ...args?.variables
+          },
+          cacheParams: {
+            disableSubscriptions: true,
+            applyUpdates: ["append"]
+          }
+        });
+      },
+      getSession: import_session.getSession,
+      storeName: this.name
+    });
+    const subscribe = (run, invalidate) => {
+      const combined = (0, import_store.derived)([store, paginationStore], ([$parent, $pagination]) => {
+        return {
+          ...$pagination,
+          data: $parent
+        };
+      });
+      return combined.subscribe(run, invalidate);
+    };
+    return {
+      kind: import_types.CompiledFragmentKind,
+      data: (0, import_store.derived)(paginationStore, ($value) => $value.data),
+      subscribe,
+      fetch: handlers.fetch,
+      loadNextPage: handlers.loadNextPage,
+      fetching: (0, import_store.derived)(paginationStore, ($store) => $store.fetching)
+    };
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  FragmentStore
+  FragmentStore,
+  FragmentStoreCursor,
+  FragmentStoreOffset
 });

package/build/runtime-cjs/stores/index.d.ts

@@ -1,5 +1,4 @@
-export * from './pagination';
-export { FragmentStore } from './fragment';
+export { FragmentStore, FragmentStoreCursor, FragmentStoreOffset } from './fragment';
 export { SubscriptionStore } from './subscription';
 export { MutationStore, type MutationConfig } from './mutation';
-export { QueryStore } from './query';
+export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';

package/build/runtime-cjs/stores/index.js

@@ -15,17 +15,19 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var stores_exports = {};
 __export(stores_exports, {
   FragmentStore: () => import_fragment.FragmentStore,
+  FragmentStoreCursor: () => import_fragment.FragmentStoreCursor,
+  FragmentStoreOffset: () => import_fragment.FragmentStoreOffset,
   MutationStore: () => import_mutation.MutationStore,
   QueryStore: () => import_query.QueryStore,
+  QueryStoreCursor: () => import_query.QueryStoreCursor,
+  QueryStoreOffset: () => import_query.QueryStoreOffset,
   SubscriptionStore: () => import_subscription.SubscriptionStore
 });
 module.exports = __toCommonJS(stores_exports);
-__reExport(stores_exports, require("./pagination"), module.exports);
 var import_fragment = require("./fragment");
 var import_subscription = require("./subscription");
 var import_mutation = require("./mutation");
@@ -33,7 +35,11 @@ var import_query = require("./query");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FragmentStore,
+  FragmentStoreCursor,
+  FragmentStoreOffset,
   MutationStore,
   QueryStore,
+  QueryStoreCursor,
+  QueryStoreOffset,
   SubscriptionStore
 });

package/build/runtime-cjs/stores/mutation.js

@@ -21,7 +21,6 @@ __export(mutation_exports, {
   MutationStore: () => MutationStore
 });
 module.exports = __toCommonJS(mutation_exports);
-var import_client = require("../client");
 var import_base = require("./base");
 var import_query = require("./query");
 class MutationStore extends import_base.BaseStore {
@@ -33,7 +32,6 @@ class MutationStore extends import_base.BaseStore {
     abortController,
     ...mutationConfig
   } = {}) {
-    await (0, import_client.initClient)();
     const { context } = await (0, import_query.fetchParams)(this.artifact, this.artifact.name, {
       fetch,
       metadata,