houdini-svelte 1.0.1 → 1.0.2

package/build/plugin-cjs/index.js

@@ -186275,21 +186275,56 @@ async function fragmentTypedefs(input) {
         document_input.typeAnnotation = AST15.tsTypeAnnotation(
           AST15.tsTypeReference(AST15.identifier(store))
         );
-        const return_value = AST15.tsTypeReference(
-          AST15.identifier("ReturnType"),
-          AST15.tsTypeParameterInstantiation([
-            AST15.tsIndexedAccessType(
-              AST15.tsTypeReference(AST15.identifier(store)),
-              AST15.tsLiteralType(AST15.stringLiteral("get"))
-            )
-          ])
-        );
+        let store_type = "FragmentStoreInstance";
+        if (doc.refetch?.paginated) {
+          if (doc.refetch.method === "cursor") {
+            store_type = "CursorFragmentStoreInstance";
+          } else {
+            store_type = "OffsetFragmentStoreInstance";
+          }
+        }
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "./types",
+          import: [store_type],
+          importKind: "type"
+        });
         ensureImports({
           config: input.config,
           body: contents.script.body,
           sourceModule: import_path,
           import: [store]
         });
+        const shapeID = `${doc.name}$data`;
+        const inputID = `${doc.name}$input`;
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "../../../artifacts/" + doc.name,
+          import: [inputID, shapeID]
+        });
+        const typeParams = [];
+        if (doc.refetch?.paginated) {
+          typeParams.push(AST15.tsTypeReference(AST15.identifier(inputID)));
+        }
+        const return_value = AST15.tsTypeReference(
+          AST15.identifier(store_type),
+          AST15.tsTypeParameterInstantiation([
+            AST15.tsTypeReference(AST15.identifier(shapeID)),
+            ...typeParams
+          ])
+        );
+        const null_return_value = AST15.tsTypeReference(
+          AST15.identifier(store_type),
+          AST15.tsTypeParameterInstantiation([
+            AST15.tsUnionType([
+              AST15.tsTypeReference(AST15.identifier(shapeID)),
+              AST15.tsNullKeyword()
+            ]),
+            ...typeParams
+          ])
+        );
         return [
           AST15.exportNamedDeclaration(
             AST15.tsDeclareFunction(
@@ -186302,9 +186337,7 @@ async function fragmentTypedefs(input) {
             AST15.tsDeclareFunction(
               AST15.identifier(which),
               [initial_value_or_null_input, document_input],
-              AST15.tsTypeAnnotation(
-                AST15.tsUnionType([return_value, AST15.tsNullKeyword()])
-              )
+              AST15.tsTypeAnnotation(null_return_value)
             )
           )
         ];

package/build/plugin-esm/index.js

@@ -186269,21 +186269,56 @@ async function fragmentTypedefs(input) {
         document_input.typeAnnotation = AST15.tsTypeAnnotation(
           AST15.tsTypeReference(AST15.identifier(store))
         );
-        const return_value = AST15.tsTypeReference(
-          AST15.identifier("ReturnType"),
-          AST15.tsTypeParameterInstantiation([
-            AST15.tsIndexedAccessType(
-              AST15.tsTypeReference(AST15.identifier(store)),
-              AST15.tsLiteralType(AST15.stringLiteral("get"))
-            )
-          ])
-        );
+        let store_type = "FragmentStoreInstance";
+        if (doc.refetch?.paginated) {
+          if (doc.refetch.method === "cursor") {
+            store_type = "CursorFragmentStoreInstance";
+          } else {
+            store_type = "OffsetFragmentStoreInstance";
+          }
+        }
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "./types",
+          import: [store_type],
+          importKind: "type"
+        });
         ensureImports({
           config: input.config,
           body: contents.script.body,
           sourceModule: import_path,
           import: [store]
         });
+        const shapeID = `${doc.name}$data`;
+        const inputID = `${doc.name}$input`;
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "../../../artifacts/" + doc.name,
+          import: [inputID, shapeID]
+        });
+        const typeParams = [];
+        if (doc.refetch?.paginated) {
+          typeParams.push(AST15.tsTypeReference(AST15.identifier(inputID)));
+        }
+        const return_value = AST15.tsTypeReference(
+          AST15.identifier(store_type),
+          AST15.tsTypeParameterInstantiation([
+            AST15.tsTypeReference(AST15.identifier(shapeID)),
+            ...typeParams
+          ])
+        );
+        const null_return_value = AST15.tsTypeReference(
+          AST15.identifier(store_type),
+          AST15.tsTypeParameterInstantiation([
+            AST15.tsUnionType([
+              AST15.tsTypeReference(AST15.identifier(shapeID)),
+              AST15.tsNullKeyword()
+            ]),
+            ...typeParams
+          ])
+        );
         return [
           AST15.exportNamedDeclaration(
             AST15.tsDeclareFunction(
@@ -186296,9 +186331,7 @@ async function fragmentTypedefs(input) {
             AST15.tsDeclareFunction(
               AST15.identifier(which),
               [initial_value_or_null_input, document_input],
-              AST15.tsTypeAnnotation(
-                AST15.tsUnionType([return_value, AST15.tsNullKeyword()])
-              )
+              AST15.tsTypeAnnotation(null_return_value)
             )
           )
         ];

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

@@ -1,4 +1,5 @@
 import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext } from '$houdini/runtime/lib/types';
+import type { FragmentStoreInstance } from '../types';
 export declare class FragmentStore<_Data extends GraphQLObject, _Input = {}> {
     artifact: FragmentArtifact;
     name: string;
@@ -8,9 +9,5 @@ export declare class FragmentStore<_Data extends GraphQLObject, _Input = {}> {
         artifact: FragmentArtifact;
         storeName: string;
     });
-    get(initialValue: _Data | null): {
-        kind: "HoudiniFragment";
-        subscribe: (run: import("svelte/store").Subscriber<_Data | null>, invalidate?: ((value?: _Data | null | undefined) => void) | undefined) => import("svelte/store").Unsubscriber;
-        update: (val: _Data | null) => void;
-    };
+    get(initialValue: _Data | null): FragmentStoreInstance<_Data | null>;
 }

package/build/runtime/stores/pagination/cursor.d.ts

@@ -1,10 +1,8 @@
 import type { DocumentStore } from '$houdini/runtime/client';
 import type { SendParams } from '$houdini/runtime/client/documentStore';
-import type { GraphQLObject, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
-import type { Writable } from 'svelte/store';
-import type { QueryStoreFetchParams } from '../query';
+import type { GraphQLObject, QueryArtifact } from '$houdini/runtime/lib/types';
+import type { CursorHandlers } from '../../types';
 import type { FetchFn } from './fetch';
-import type { PageInfo } from './pageInfo';
 export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends Record<string, any>>({ artifact, storeName, observer, fetchUpdate: parentFetchUpdate, fetch: parentFetch, }: {
     artifact: QueryArtifact;
     storeName: string;
@@ -12,19 +10,3 @@ export declare function cursorHandlers<_Data extends GraphQLObject, _Input exten
     fetch: FetchFn<_Data, _Input>;
     fetchUpdate: (arg: SendParams, updates: string[]) => ReturnType<FetchFn<_Data, _Input>>;
 }): CursorHandlers<_Data, _Input>;
-export type CursorHandlers<_Data extends GraphQLObject, _Input> = {
-    loadNextPage: (args?: {
-        first?: number;
-        after?: string;
-        fetch?: typeof globalThis.fetch;
-        metadata: {};
-    }) => Promise<void>;
-    loadPreviousPage: (args?: {
-        last?: number;
-        before?: string;
-        fetch?: typeof globalThis.fetch;
-        metadata?: {};
-    }) => Promise<void>;
-    pageInfo: Writable<PageInfo>;
-    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
-};

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

@@ -1,8 +1,8 @@
 import type { DocumentStore } from '$houdini/runtime/client';
 import type { FragmentArtifact, GraphQLObject, HoudiniFetchContext, QueryArtifact } from '$houdini/runtime/lib/types';
 import type { Readable, Subscriber } from 'svelte/store';
+import type { CursorHandlers, OffsetFragmentStoreInstance } from '../../types';
 import type { StoreConfig } from '../query';
-import type { CursorHandlers } from './cursor';
 import { type PageInfo } from './pageInfo';
 type FragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<_Data, _Input, FragmentArtifact> & {
     paginationArtifact: QueryArtifact;
@@ -43,19 +43,7 @@ export declare class FragmentStoreCursor<_Data extends GraphQLObject, _Input ext
     protected storeHandlers(observer: DocumentStore<_Data, _Input>): CursorHandlers<_Data, _Input>;
 }
 export declare class FragmentStoreOffset<_Data extends GraphQLObject, _Input extends Record<string, any>> extends BasePaginatedFragmentStore<_Data, _Input> {
-    get(initialValue: _Data | null): {
-        kind: "HoudiniFragment";
-        data: Readable<_Data | null>;
-        subscribe: (run: import("$houdini/runtime/lib").Subscriber<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>, invalidate?: (value?: import("$houdini/runtime/lib/types").QueryResult<_Data, _Input> | undefined) => void) => import("$houdini/runtime/lib").Unsubscriber;
-        fetch: (args?: import("../query").QueryStoreFetchParams<_Data, _Input> | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
-        loadNextPage: ({ limit, offset, fetch, metadata, }?: {
-            limit?: number | undefined;
-            offset?: number | undefined;
-            fetch?: typeof fetch | undefined;
-            metadata?: {} | undefined;
-        }) => Promise<void>;
-        fetching: Readable<boolean>;
-    };
+    get(initialValue: _Data | null): OffsetFragmentStoreInstance<_Data, _Input>;
 }
 export type FragmentStorePaginated<_Data extends GraphQLObject, _Input> = Readable<{
     data: _Data;

package/build/runtime/stores/pagination/offset.d.ts

@@ -18,12 +18,3 @@ export declare function offsetHandlers<_Data extends GraphQLObject, _Input exten
     }) => Promise<void>;
     fetch(args?: QueryStoreFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
 };
-export type OffsetHandlers<_Data extends GraphQLObject, _Input, _ReturnType> = {
-    loadNextPage: (args?: {
-        limit?: number;
-        offset?: number;
-        metadata?: {};
-        fetch?: typeof globalThis.fetch;
-    }) => Promise<void>;
-    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<_ReturnType>;
-};

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

@@ -1,9 +1,8 @@
 import type { GraphQLObject, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
 import type { Subscriber } from 'svelte/store';
+import type { CursorHandlers, OffsetHandlers } from '../../types';
 import type { ClientFetchParams, LoadEventFetchParams, QueryStoreFetchParams, RequestEventFetchParams, StoreConfig } from '../query';
 import { QueryStore } from '../query';
-import type { CursorHandlers } from './cursor';
-import type { OffsetHandlers } from './offset';
 import { type PageInfo } from './pageInfo';
 export type CursorStoreResult<_Data extends GraphQLObject, _Input extends {}> = QueryResult<_Data, _Input> & {
     pageInfo: PageInfo;
@@ -23,7 +22,7 @@ export declare class QueryStoreCursor<_Data extends GraphQLObject, _Input extend
 export declare class QueryStoreOffset<_Data extends GraphQLObject, _Input extends {}> extends QueryStore<_Data, _Input> {
     #private;
     paginated: boolean;
-    loadNextPage(args?: Parameters<OffsetHandlers<_Data, _Input, QueryResult<_Data, _Input>>['loadNextPage']>[0]): Promise<void>;
+    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>>;

package/build/runtime/types.d.ts

@@ -1,5 +1,8 @@
-import type { FetchQueryResult } from '$houdini/runtime/lib/types';
+import type { FetchQueryResult, CompiledFragmentKind, QueryResult, GraphQLObject } from '$houdini/runtime/lib/types';
 import type { LoadEvent } from '@sveltejs/kit';
+import type { Readable, Writable } from 'svelte/store';
+import type { QueryStoreFetchParams } from './stores';
+import type { PageInfo } from './stores/pagination/pageInfo';
 export type QueryInputs<_Data> = FetchQueryResult<_Data> & {
     variables: {
         [key: string]: any;
@@ -30,3 +33,50 @@ export type KitLoadResponse = {
     context?: Record<string, any>;
     maxage?: number;
 };
+export type FragmentStoreInstance<_Data> = Readable<_Data> & {
+    kind: typeof CompiledFragmentKind;
+    update: Writable<_Data>['set'];
+};
+type Reshape<_Data, _Input> = Omit<QueryResult<_Data, _Input>, 'data'> & {
+    data: _Data;
+};
+export type CursorFragmentStoreInstance<_Data extends GraphQLObject, _Input> = {
+    kind: typeof CompiledFragmentKind;
+    data: Readable<_Data>;
+    subscribe: Readable<Reshape<_Data, _Input> & {
+        pageInfo: PageInfo;
+    }>['subscribe'];
+    fetching: Readable<boolean>;
+} & CursorHandlers<_Data, _Input>;
+export type OffsetFragmentStoreInstance<_Data extends GraphQLObject, _Input> = {
+    kind: typeof CompiledFragmentKind;
+    data: Readable<_Data>;
+    subscribe: Readable<Reshape<_Data, _Input>>['subscribe'];
+    fetching: Readable<boolean>;
+} & OffsetHandlers<_Data, _Input>;
+export type CursorHandlers<_Data extends GraphQLObject, _Input> = {
+    loadNextPage: (args?: {
+        first?: number;
+        after?: string;
+        fetch?: typeof globalThis.fetch;
+        metadata: {};
+    }) => Promise<void>;
+    loadPreviousPage: (args?: {
+        last?: number;
+        before?: string;
+        fetch?: typeof globalThis.fetch;
+        metadata?: {};
+    }) => Promise<void>;
+    pageInfo: Writable<PageInfo>;
+    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
+};
+export type OffsetHandlers<_Data extends GraphQLObject, _Input> = {
+    loadNextPage: (args?: {
+        limit?: number;
+        offset?: number;
+        metadata?: {};
+        fetch?: typeof globalThis.fetch;
+    }) => Promise<void>;
+    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
+};
+export {};

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

@@ -1,4 +1,5 @@
 import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext } from '$houdini/runtime/lib/types';
+import type { FragmentStoreInstance } from '../types';
 export declare class FragmentStore<_Data extends GraphQLObject, _Input = {}> {
     artifact: FragmentArtifact;
     name: string;
@@ -8,9 +9,5 @@ export declare class FragmentStore<_Data extends GraphQLObject, _Input = {}> {
         artifact: FragmentArtifact;
         storeName: string;
     });
-    get(initialValue: _Data | null): {
-        kind: "HoudiniFragment";
-        subscribe: (run: import("svelte/store").Subscriber<_Data | null>, invalidate?: ((value?: _Data | null | undefined) => void) | undefined) => import("svelte/store").Unsubscriber;
-        update: (val: _Data | null) => void;
-    };
+    get(initialValue: _Data | null): FragmentStoreInstance<_Data | null>;
 }

package/build/runtime-cjs/stores/pagination/cursor.d.ts

@@ -1,10 +1,8 @@
 import type { DocumentStore } from '$houdini/runtime/client';
 import type { SendParams } from '$houdini/runtime/client/documentStore';
-import type { GraphQLObject, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
-import type { Writable } from 'svelte/store';
-import type { QueryStoreFetchParams } from '../query';
+import type { GraphQLObject, QueryArtifact } from '$houdini/runtime/lib/types';
+import type { CursorHandlers } from '../../types';
 import type { FetchFn } from './fetch';
-import type { PageInfo } from './pageInfo';
 export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends Record<string, any>>({ artifact, storeName, observer, fetchUpdate: parentFetchUpdate, fetch: parentFetch, }: {
     artifact: QueryArtifact;
     storeName: string;
@@ -12,19 +10,3 @@ export declare function cursorHandlers<_Data extends GraphQLObject, _Input exten
     fetch: FetchFn<_Data, _Input>;
     fetchUpdate: (arg: SendParams, updates: string[]) => ReturnType<FetchFn<_Data, _Input>>;
 }): CursorHandlers<_Data, _Input>;
-export type CursorHandlers<_Data extends GraphQLObject, _Input> = {
-    loadNextPage: (args?: {
-        first?: number;
-        after?: string;
-        fetch?: typeof globalThis.fetch;
-        metadata: {};
-    }) => Promise<void>;
-    loadPreviousPage: (args?: {
-        last?: number;
-        before?: string;
-        fetch?: typeof globalThis.fetch;
-        metadata?: {};
-    }) => Promise<void>;
-    pageInfo: Writable<PageInfo>;
-    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
-};

package/build/runtime-cjs/stores/pagination/cursor.js

@@ -154,7 +154,7 @@ If you think this is an error, please open an issue on GitHub`);
       if (count && count > artifact.refetch.pageSize) {
         if (currentPageInfo.hasPreviousPage && currentPageInfo.hasNextPage && !(variables?.["first"] && variables?.["after"] || variables?.["last"] && variables?.["before"])) {
           console.warn(`\u26A0\uFE0F Encountered a fetch() in the middle of the connection.
-Make sure to pass a cursor value by hand that includes the current set (ie the entry before startCursor)					
+Make sure to pass a cursor value by hand that includes the current set (ie the entry before startCursor)
 `);
           return observer.state;
         }

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

@@ -1,8 +1,8 @@
 import type { DocumentStore } from '$houdini/runtime/client';
 import type { FragmentArtifact, GraphQLObject, HoudiniFetchContext, QueryArtifact } from '$houdini/runtime/lib/types';
 import type { Readable, Subscriber } from 'svelte/store';
+import type { CursorHandlers, OffsetFragmentStoreInstance } from '../../types';
 import type { StoreConfig } from '../query';
-import type { CursorHandlers } from './cursor';
 import { type PageInfo } from './pageInfo';
 type FragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<_Data, _Input, FragmentArtifact> & {
     paginationArtifact: QueryArtifact;
@@ -43,19 +43,7 @@ export declare class FragmentStoreCursor<_Data extends GraphQLObject, _Input ext
     protected storeHandlers(observer: DocumentStore<_Data, _Input>): CursorHandlers<_Data, _Input>;
 }
 export declare class FragmentStoreOffset<_Data extends GraphQLObject, _Input extends Record<string, any>> extends BasePaginatedFragmentStore<_Data, _Input> {
-    get(initialValue: _Data | null): {
-        kind: "HoudiniFragment";
-        data: Readable<_Data | null>;
-        subscribe: (run: import("$houdini/runtime/lib").Subscriber<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>, invalidate?: (value?: import("$houdini/runtime/lib/types").QueryResult<_Data, _Input> | undefined) => void) => import("$houdini/runtime/lib").Unsubscriber;
-        fetch: (args?: import("../query").QueryStoreFetchParams<_Data, _Input> | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
-        loadNextPage: ({ limit, offset, fetch, metadata, }?: {
-            limit?: number | undefined;
-            offset?: number | undefined;
-            fetch?: typeof fetch | undefined;
-            metadata?: {} | undefined;
-        }) => Promise<void>;
-        fetching: Readable<boolean>;
-    };
+    get(initialValue: _Data | null): OffsetFragmentStoreInstance<_Data, _Input>;
 }
 export type FragmentStorePaginated<_Data extends GraphQLObject, _Input> = Readable<{
     data: _Data;

package/build/runtime-cjs/stores/pagination/offset.d.ts

@@ -18,12 +18,3 @@ export declare function offsetHandlers<_Data extends GraphQLObject, _Input exten
     }) => Promise<void>;
     fetch(args?: QueryStoreFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
 };
-export type OffsetHandlers<_Data extends GraphQLObject, _Input, _ReturnType> = {
-    loadNextPage: (args?: {
-        limit?: number;
-        offset?: number;
-        metadata?: {};
-        fetch?: typeof globalThis.fetch;
-    }) => Promise<void>;
-    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<_ReturnType>;
-};

package/build/runtime-cjs/stores/pagination/query.d.ts

@@ -1,9 +1,8 @@
 import type { GraphQLObject, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
 import type { Subscriber } from 'svelte/store';
+import type { CursorHandlers, OffsetHandlers } from '../../types';
 import type { ClientFetchParams, LoadEventFetchParams, QueryStoreFetchParams, RequestEventFetchParams, StoreConfig } from '../query';
 import { QueryStore } from '../query';
-import type { CursorHandlers } from './cursor';
-import type { OffsetHandlers } from './offset';
 import { type PageInfo } from './pageInfo';
 export type CursorStoreResult<_Data extends GraphQLObject, _Input extends {}> = QueryResult<_Data, _Input> & {
     pageInfo: PageInfo;
@@ -23,7 +22,7 @@ export declare class QueryStoreCursor<_Data extends GraphQLObject, _Input extend
 export declare class QueryStoreOffset<_Data extends GraphQLObject, _Input extends {}> extends QueryStore<_Data, _Input> {
     #private;
     paginated: boolean;
-    loadNextPage(args?: Parameters<OffsetHandlers<_Data, _Input, QueryResult<_Data, _Input>>['loadNextPage']>[0]): Promise<void>;
+    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>>;

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

@@ -1,5 +1,8 @@
-import type { FetchQueryResult } from '$houdini/runtime/lib/types';
+import type { FetchQueryResult, CompiledFragmentKind, QueryResult, GraphQLObject } from '$houdini/runtime/lib/types';
 import type { LoadEvent } from '@sveltejs/kit';
+import type { Readable, Writable } from 'svelte/store';
+import type { QueryStoreFetchParams } from './stores';
+import type { PageInfo } from './stores/pagination/pageInfo';
 export type QueryInputs<_Data> = FetchQueryResult<_Data> & {
     variables: {
         [key: string]: any;
@@ -30,3 +33,50 @@ export type KitLoadResponse = {
     context?: Record<string, any>;
     maxage?: number;
 };
+export type FragmentStoreInstance<_Data> = Readable<_Data> & {
+    kind: typeof CompiledFragmentKind;
+    update: Writable<_Data>['set'];
+};
+type Reshape<_Data, _Input> = Omit<QueryResult<_Data, _Input>, 'data'> & {
+    data: _Data;
+};
+export type CursorFragmentStoreInstance<_Data extends GraphQLObject, _Input> = {
+    kind: typeof CompiledFragmentKind;
+    data: Readable<_Data>;
+    subscribe: Readable<Reshape<_Data, _Input> & {
+        pageInfo: PageInfo;
+    }>['subscribe'];
+    fetching: Readable<boolean>;
+} & CursorHandlers<_Data, _Input>;
+export type OffsetFragmentStoreInstance<_Data extends GraphQLObject, _Input> = {
+    kind: typeof CompiledFragmentKind;
+    data: Readable<_Data>;
+    subscribe: Readable<Reshape<_Data, _Input>>['subscribe'];
+    fetching: Readable<boolean>;
+} & OffsetHandlers<_Data, _Input>;
+export type CursorHandlers<_Data extends GraphQLObject, _Input> = {
+    loadNextPage: (args?: {
+        first?: number;
+        after?: string;
+        fetch?: typeof globalThis.fetch;
+        metadata: {};
+    }) => Promise<void>;
+    loadPreviousPage: (args?: {
+        last?: number;
+        before?: string;
+        fetch?: typeof globalThis.fetch;
+        metadata?: {};
+    }) => Promise<void>;
+    pageInfo: Writable<PageInfo>;
+    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
+};
+export type OffsetHandlers<_Data extends GraphQLObject, _Input> = {
+    loadNextPage: (args?: {
+        limit?: number;
+        offset?: number;
+        metadata?: {};
+        fetch?: typeof globalThis.fetch;
+    }) => Promise<void>;
+    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
+};
+export {};

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

@@ -1,4 +1,5 @@
 import type { GraphQLObject, FragmentArtifact, HoudiniFetchContext } from '$houdini/runtime/lib/types';
+import type { FragmentStoreInstance } from '../types';
 export declare class FragmentStore<_Data extends GraphQLObject, _Input = {}> {
     artifact: FragmentArtifact;
     name: string;
@@ -8,9 +9,5 @@ export declare class FragmentStore<_Data extends GraphQLObject, _Input = {}> {
         artifact: FragmentArtifact;
         storeName: string;
     });
-    get(initialValue: _Data | null): {
-        kind: "HoudiniFragment";
-        subscribe: (run: import("svelte/store").Subscriber<_Data | null>, invalidate?: ((value?: _Data | null | undefined) => void) | undefined) => import("svelte/store").Unsubscriber;
-        update: (val: _Data | null) => void;
-    };
+    get(initialValue: _Data | null): FragmentStoreInstance<_Data | null>;
 }

package/build/runtime-esm/stores/pagination/cursor.d.ts

@@ -1,10 +1,8 @@
 import type { DocumentStore } from '$houdini/runtime/client';
 import type { SendParams } from '$houdini/runtime/client/documentStore';
-import type { GraphQLObject, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
-import type { Writable } from 'svelte/store';
-import type { QueryStoreFetchParams } from '../query';
+import type { GraphQLObject, QueryArtifact } from '$houdini/runtime/lib/types';
+import type { CursorHandlers } from '../../types';
 import type { FetchFn } from './fetch';
-import type { PageInfo } from './pageInfo';
 export declare function cursorHandlers<_Data extends GraphQLObject, _Input extends Record<string, any>>({ artifact, storeName, observer, fetchUpdate: parentFetchUpdate, fetch: parentFetch, }: {
     artifact: QueryArtifact;
     storeName: string;
@@ -12,19 +10,3 @@ export declare function cursorHandlers<_Data extends GraphQLObject, _Input exten
     fetch: FetchFn<_Data, _Input>;
     fetchUpdate: (arg: SendParams, updates: string[]) => ReturnType<FetchFn<_Data, _Input>>;
 }): CursorHandlers<_Data, _Input>;
-export type CursorHandlers<_Data extends GraphQLObject, _Input> = {
-    loadNextPage: (args?: {
-        first?: number;
-        after?: string;
-        fetch?: typeof globalThis.fetch;
-        metadata: {};
-    }) => Promise<void>;
-    loadPreviousPage: (args?: {
-        last?: number;
-        before?: string;
-        fetch?: typeof globalThis.fetch;
-        metadata?: {};
-    }) => Promise<void>;
-    pageInfo: Writable<PageInfo>;
-    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
-};

package/build/runtime-esm/stores/pagination/cursor.js

@@ -131,7 +131,7 @@ If you think this is an error, please open an issue on GitHub`);
       if (count && count > artifact.refetch.pageSize) {
         if (currentPageInfo.hasPreviousPage && currentPageInfo.hasNextPage && !(variables?.["first"] && variables?.["after"] || variables?.["last"] && variables?.["before"])) {
           console.warn(`\u26A0\uFE0F Encountered a fetch() in the middle of the connection.
-Make sure to pass a cursor value by hand that includes the current set (ie the entry before startCursor)					
+Make sure to pass a cursor value by hand that includes the current set (ie the entry before startCursor)
 `);
           return observer.state;
         }

package/build/runtime-esm/stores/pagination/fragment.d.ts

@@ -1,8 +1,8 @@
 import type { DocumentStore } from '$houdini/runtime/client';
 import type { FragmentArtifact, GraphQLObject, HoudiniFetchContext, QueryArtifact } from '$houdini/runtime/lib/types';
 import type { Readable, Subscriber } from 'svelte/store';
+import type { CursorHandlers, OffsetFragmentStoreInstance } from '../../types';
 import type { StoreConfig } from '../query';
-import type { CursorHandlers } from './cursor';
 import { type PageInfo } from './pageInfo';
 type FragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<_Data, _Input, FragmentArtifact> & {
     paginationArtifact: QueryArtifact;
@@ -43,19 +43,7 @@ export declare class FragmentStoreCursor<_Data extends GraphQLObject, _Input ext
     protected storeHandlers(observer: DocumentStore<_Data, _Input>): CursorHandlers<_Data, _Input>;
 }
 export declare class FragmentStoreOffset<_Data extends GraphQLObject, _Input extends Record<string, any>> extends BasePaginatedFragmentStore<_Data, _Input> {
-    get(initialValue: _Data | null): {
-        kind: "HoudiniFragment";
-        data: Readable<_Data | null>;
-        subscribe: (run: import("$houdini/runtime/lib").Subscriber<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>, invalidate?: (value?: import("$houdini/runtime/lib/types").QueryResult<_Data, _Input> | undefined) => void) => import("$houdini/runtime/lib").Unsubscriber;
-        fetch: (args?: import("../query").QueryStoreFetchParams<_Data, _Input> | undefined) => Promise<import("$houdini/runtime/lib/types").QueryResult<_Data, _Input>>;
-        loadNextPage: ({ limit, offset, fetch, metadata, }?: {
-            limit?: number | undefined;
-            offset?: number | undefined;
-            fetch?: typeof fetch | undefined;
-            metadata?: {} | undefined;
-        }) => Promise<void>;
-        fetching: Readable<boolean>;
-    };
+    get(initialValue: _Data | null): OffsetFragmentStoreInstance<_Data, _Input>;
 }
 export type FragmentStorePaginated<_Data extends GraphQLObject, _Input> = Readable<{
     data: _Data;

package/build/runtime-esm/stores/pagination/offset.d.ts

@@ -18,12 +18,3 @@ export declare function offsetHandlers<_Data extends GraphQLObject, _Input exten
     }) => Promise<void>;
     fetch(args?: QueryStoreFetchParams<_Data, _Input>): Promise<QueryResult<_Data, _Input>>;
 };
-export type OffsetHandlers<_Data extends GraphQLObject, _Input, _ReturnType> = {
-    loadNextPage: (args?: {
-        limit?: number;
-        offset?: number;
-        metadata?: {};
-        fetch?: typeof globalThis.fetch;
-    }) => Promise<void>;
-    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<_ReturnType>;
-};

package/build/runtime-esm/stores/pagination/query.d.ts

@@ -1,9 +1,8 @@
 import type { GraphQLObject, QueryArtifact, QueryResult } from '$houdini/runtime/lib/types';
 import type { Subscriber } from 'svelte/store';
+import type { CursorHandlers, OffsetHandlers } from '../../types';
 import type { ClientFetchParams, LoadEventFetchParams, QueryStoreFetchParams, RequestEventFetchParams, StoreConfig } from '../query';
 import { QueryStore } from '../query';
-import type { CursorHandlers } from './cursor';
-import type { OffsetHandlers } from './offset';
 import { type PageInfo } from './pageInfo';
 export type CursorStoreResult<_Data extends GraphQLObject, _Input extends {}> = QueryResult<_Data, _Input> & {
     pageInfo: PageInfo;
@@ -23,7 +22,7 @@ export declare class QueryStoreCursor<_Data extends GraphQLObject, _Input extend
 export declare class QueryStoreOffset<_Data extends GraphQLObject, _Input extends {}> extends QueryStore<_Data, _Input> {
     #private;
     paginated: boolean;
-    loadNextPage(args?: Parameters<OffsetHandlers<_Data, _Input, QueryResult<_Data, _Input>>['loadNextPage']>[0]): Promise<void>;
+    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>>;

package/build/runtime-esm/types.d.ts

@@ -1,5 +1,8 @@
-import type { FetchQueryResult } from '$houdini/runtime/lib/types';
+import type { FetchQueryResult, CompiledFragmentKind, QueryResult, GraphQLObject } from '$houdini/runtime/lib/types';
 import type { LoadEvent } from '@sveltejs/kit';
+import type { Readable, Writable } from 'svelte/store';
+import type { QueryStoreFetchParams } from './stores';
+import type { PageInfo } from './stores/pagination/pageInfo';
 export type QueryInputs<_Data> = FetchQueryResult<_Data> & {
     variables: {
         [key: string]: any;
@@ -30,3 +33,50 @@ export type KitLoadResponse = {
     context?: Record<string, any>;
     maxage?: number;
 };
+export type FragmentStoreInstance<_Data> = Readable<_Data> & {
+    kind: typeof CompiledFragmentKind;
+    update: Writable<_Data>['set'];
+};
+type Reshape<_Data, _Input> = Omit<QueryResult<_Data, _Input>, 'data'> & {
+    data: _Data;
+};
+export type CursorFragmentStoreInstance<_Data extends GraphQLObject, _Input> = {
+    kind: typeof CompiledFragmentKind;
+    data: Readable<_Data>;
+    subscribe: Readable<Reshape<_Data, _Input> & {
+        pageInfo: PageInfo;
+    }>['subscribe'];
+    fetching: Readable<boolean>;
+} & CursorHandlers<_Data, _Input>;
+export type OffsetFragmentStoreInstance<_Data extends GraphQLObject, _Input> = {
+    kind: typeof CompiledFragmentKind;
+    data: Readable<_Data>;
+    subscribe: Readable<Reshape<_Data, _Input>>['subscribe'];
+    fetching: Readable<boolean>;
+} & OffsetHandlers<_Data, _Input>;
+export type CursorHandlers<_Data extends GraphQLObject, _Input> = {
+    loadNextPage: (args?: {
+        first?: number;
+        after?: string;
+        fetch?: typeof globalThis.fetch;
+        metadata: {};
+    }) => Promise<void>;
+    loadPreviousPage: (args?: {
+        last?: number;
+        before?: string;
+        fetch?: typeof globalThis.fetch;
+        metadata?: {};
+    }) => Promise<void>;
+    pageInfo: Writable<PageInfo>;
+    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
+};
+export type OffsetHandlers<_Data extends GraphQLObject, _Input> = {
+    loadNextPage: (args?: {
+        limit?: number;
+        offset?: number;
+        metadata?: {};
+        fetch?: typeof globalThis.fetch;
+    }) => Promise<void>;
+    fetch(args?: QueryStoreFetchParams<_Data, _Input> | undefined): Promise<QueryResult<_Data, _Input>>;
+};
+export {};

package/build/test-cjs/index.js

@@ -210595,7 +210595,7 @@ function testConfig(config22 = {}) {
     ...testConfigFile(config22)
   });
 }
-function mockCollectedDoc(query22) {
+function mockCollectedDoc(query22, data2) {
   const parsed = graphql252.parse(query22);
   const name = parsed.definitions[0].name.value;
   const operations = parsed.definitions;
@@ -210618,7 +210618,8 @@ function mockCollectedDoc(query22) {
     generateArtifact: true,
     generateStore: true,
     originalString: query22,
-    artifact: null
+    artifact: null,
+    ...data2
   };
 }
 
@@ -304257,21 +304258,56 @@ async function fragmentTypedefs(input) {
         document_input.typeAnnotation = AST16.tsTypeAnnotation(
           AST16.tsTypeReference(AST16.identifier(store))
         );
-        const return_value = AST16.tsTypeReference(
-          AST16.identifier("ReturnType"),
-          AST16.tsTypeParameterInstantiation([
-            AST16.tsIndexedAccessType(
-              AST16.tsTypeReference(AST16.identifier(store)),
-              AST16.tsLiteralType(AST16.stringLiteral("get"))
-            )
-          ])
-        );
+        let store_type = "FragmentStoreInstance";
+        if (doc.refetch?.paginated) {
+          if (doc.refetch.method === "cursor") {
+            store_type = "CursorFragmentStoreInstance";
+          } else {
+            store_type = "OffsetFragmentStoreInstance";
+          }
+        }
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "./types",
+          import: [store_type],
+          importKind: "type"
+        });
         ensureImports({
           config: input.config,
           body: contents.script.body,
           sourceModule: import_path,
           import: [store]
         });
+        const shapeID = `${doc.name}$data`;
+        const inputID = `${doc.name}$input`;
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "../../../artifacts/" + doc.name,
+          import: [inputID, shapeID]
+        });
+        const typeParams = [];
+        if (doc.refetch?.paginated) {
+          typeParams.push(AST16.tsTypeReference(AST16.identifier(inputID)));
+        }
+        const return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsTypeReference(AST16.identifier(shapeID)),
+            ...typeParams
+          ])
+        );
+        const null_return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsUnionType([
+              AST16.tsTypeReference(AST16.identifier(shapeID)),
+              AST16.tsNullKeyword()
+            ]),
+            ...typeParams
+          ])
+        );
         return [
           AST16.exportNamedDeclaration(
             AST16.tsDeclareFunction(
@@ -304284,9 +304320,7 @@ async function fragmentTypedefs(input) {
             AST16.tsDeclareFunction(
               AST16.identifier(which),
               [initial_value_or_null_input, document_input],
-              AST16.tsTypeAnnotation(
-                AST16.tsUnionType([return_value, AST16.tsNullKeyword()])
-              )
+              AST16.tsTypeAnnotation(null_return_value)
             )
           )
         ];
@@ -306117,7 +306151,7 @@ async function test_config(extraConfig = {}) {
 }
 async function pipeline_test(documents, extra_config) {
   const config5 = await test_config(extra_config);
-  const docs = documents.map(mockCollectedDoc);
+  const docs = documents.map((doc) => mockCollectedDoc(doc));
   await runPipeline22(config5, docs);
   return {
     pluginRoot: config5.pluginDirectory("houdini-svelte"),

package/build/test-esm/index.js

@@ -210585,7 +210585,7 @@ function testConfig(config22 = {}) {
     ...testConfigFile(config22)
   });
 }
-function mockCollectedDoc(query22) {
+function mockCollectedDoc(query22, data2) {
   const parsed = graphql252.parse(query22);
   const name = parsed.definitions[0].name.value;
   const operations = parsed.definitions;
@@ -210608,7 +210608,8 @@ function mockCollectedDoc(query22) {
     generateArtifact: true,
     generateStore: true,
     originalString: query22,
-    artifact: null
+    artifact: null,
+    ...data2
   };
 }
 
@@ -304246,21 +304247,56 @@ async function fragmentTypedefs(input) {
         document_input.typeAnnotation = AST16.tsTypeAnnotation(
           AST16.tsTypeReference(AST16.identifier(store))
         );
-        const return_value = AST16.tsTypeReference(
-          AST16.identifier("ReturnType"),
-          AST16.tsTypeParameterInstantiation([
-            AST16.tsIndexedAccessType(
-              AST16.tsTypeReference(AST16.identifier(store)),
-              AST16.tsLiteralType(AST16.stringLiteral("get"))
-            )
-          ])
-        );
+        let store_type = "FragmentStoreInstance";
+        if (doc.refetch?.paginated) {
+          if (doc.refetch.method === "cursor") {
+            store_type = "CursorFragmentStoreInstance";
+          } else {
+            store_type = "OffsetFragmentStoreInstance";
+          }
+        }
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "./types",
+          import: [store_type],
+          importKind: "type"
+        });
         ensureImports({
           config: input.config,
           body: contents.script.body,
           sourceModule: import_path,
           import: [store]
         });
+        const shapeID = `${doc.name}$data`;
+        const inputID = `${doc.name}$input`;
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "../../../artifacts/" + doc.name,
+          import: [inputID, shapeID]
+        });
+        const typeParams = [];
+        if (doc.refetch?.paginated) {
+          typeParams.push(AST16.tsTypeReference(AST16.identifier(inputID)));
+        }
+        const return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsTypeReference(AST16.identifier(shapeID)),
+            ...typeParams
+          ])
+        );
+        const null_return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsUnionType([
+              AST16.tsTypeReference(AST16.identifier(shapeID)),
+              AST16.tsNullKeyword()
+            ]),
+            ...typeParams
+          ])
+        );
         return [
           AST16.exportNamedDeclaration(
             AST16.tsDeclareFunction(
@@ -304273,9 +304309,7 @@ async function fragmentTypedefs(input) {
             AST16.tsDeclareFunction(
               AST16.identifier(which),
               [initial_value_or_null_input, document_input],
-              AST16.tsTypeAnnotation(
-                AST16.tsUnionType([return_value, AST16.tsNullKeyword()])
-              )
+              AST16.tsTypeAnnotation(null_return_value)
             )
           )
         ];
@@ -306106,7 +306140,7 @@ async function test_config(extraConfig = {}) {
 }
 async function pipeline_test(documents, extra_config) {
   const config5 = await test_config(extra_config);
-  const docs = documents.map(mockCollectedDoc);
+  const docs = documents.map((doc) => mockCollectedDoc(doc));
   await runPipeline22(config5, docs);
   return {
     pluginRoot: config5.pluginDirectory("houdini-svelte"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The svelte plugin for houdini",
   "keywords": [
     "typescript",
@@ -32,7 +32,7 @@
     "rollup": "^3.7.4",
     "svelte": "^3.55.1",
     "vite": "^4.1.1",
-    "houdini": "^1.0.1"
+    "houdini": "^1.0.2"
   },
   "files": [
     "build"