houdini-svelte 1.2.0 → 1.2.1

package/build/plugin-cjs/index.js

@@ -92670,7 +92670,7 @@ function deepMerge2(filepath, ...targets) {
 }
 async function parseJS(str, config4) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config4 ? deepMerge2("", defaultConfig, config4) : defaultConfig).program;
@@ -92934,7 +92934,7 @@ function artifactData({
   config: config4,
   document: document2
 }) {
-  let isManualLoad = true;
+  let isManualLoad = document2.filename.endsWith(".svelte");
   let set_blocking = void 0;
   graphql5.visit(document2.document, {
     Directive(node2, _, __, ___) {
@@ -186452,11 +186452,26 @@ async function fragmentTypedefs(input) {
             )
           )
         ]);
+        const non_exhaustive = AST17.tsTypeLiteral([
+          AST17.tsPropertySignature(
+            AST17.literal("__typename"),
+            AST17.tsTypeAnnotation(
+              AST17.tsLiteralType(AST17.stringLiteral("non-exhaustive; don't match this"))
+            )
+          )
+        ]);
         const initial_value_input = AST17.identifier("initialValue");
-        initial_value_input.typeAnnotation = AST17.tsTypeAnnotation(fragment_map);
+        initial_value_input.typeAnnotation = AST17.tsTypeAnnotation(
+          AST17.tsUnionType([fragment_map, non_exhaustive])
+        );
         const initial_value_or_null_input = AST17.identifier("initialValue");
         initial_value_or_null_input.typeAnnotation = AST17.tsTypeAnnotation(
-          AST17.tsUnionType([fragment_map, AST17.tsNullKeyword(), AST17.tsUndefinedKeyword()])
+          AST17.tsUnionType([
+            fragment_map,
+            AST17.tsNullKeyword(),
+            AST17.tsUndefinedKeyword(),
+            non_exhaustive
+          ])
         );
         const document_input = AST17.identifier("document");
         document_input.typeAnnotation = AST17.tsTypeAnnotation(

package/build/plugin-esm/index.js

@@ -92661,7 +92661,7 @@ function deepMerge2(filepath, ...targets) {
 }
 async function parseJS(str, config4) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config4 ? deepMerge2("", defaultConfig, config4) : defaultConfig).program;
@@ -92925,7 +92925,7 @@ function artifactData({
   config: config4,
   document: document2
 }) {
-  let isManualLoad = true;
+  let isManualLoad = document2.filename.endsWith(".svelte");
   let set_blocking = void 0;
   graphql5.visit(document2.document, {
     Directive(node2, _, __, ___) {
@@ -186442,11 +186442,26 @@ async function fragmentTypedefs(input) {
             )
           )
         ]);
+        const non_exhaustive = AST17.tsTypeLiteral([
+          AST17.tsPropertySignature(
+            AST17.literal("__typename"),
+            AST17.tsTypeAnnotation(
+              AST17.tsLiteralType(AST17.stringLiteral("non-exhaustive; don't match this"))
+            )
+          )
+        ]);
         const initial_value_input = AST17.identifier("initialValue");
-        initial_value_input.typeAnnotation = AST17.tsTypeAnnotation(fragment_map);
+        initial_value_input.typeAnnotation = AST17.tsTypeAnnotation(
+          AST17.tsUnionType([fragment_map, non_exhaustive])
+        );
         const initial_value_or_null_input = AST17.identifier("initialValue");
         initial_value_or_null_input.typeAnnotation = AST17.tsTypeAnnotation(
-          AST17.tsUnionType([fragment_map, AST17.tsNullKeyword(), AST17.tsUndefinedKeyword()])
+          AST17.tsUnionType([
+            fragment_map,
+            AST17.tsNullKeyword(),
+            AST17.tsUndefinedKeyword(),
+            non_exhaustive
+          ])
         );
         const document_input = AST17.identifier("document");
         document_input.typeAnnotation = AST17.tsTypeAnnotation(

package/build/preprocess-cjs/index.js

@@ -96751,7 +96751,7 @@ function deepMerge2(filepath, ...targets) {
 }
 async function parseJS(str, config4) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config4 ? deepMerge2("", defaultConfig, config4) : defaultConfig).program;

package/build/preprocess-esm/index.js

@@ -96744,7 +96744,7 @@ function deepMerge2(filepath, ...targets) {
 }
 async function parseJS(str, config4) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config4 ? deepMerge2("", defaultConfig, config4) : defaultConfig).program;

package/build/runtime/fragments.d.ts

@@ -6,9 +6,9 @@ export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment
     data: Readable<_Fragment>;
     artifact: FragmentArtifact;
 };
-export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment | null, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined> | null> & {
+export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment | null | undefined, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined> | null> & {
     data: Readable<_Fragment | null>;
     artifact: FragmentArtifact;
 };
-export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment | null, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;
+export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment | null | undefined, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;
 export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;

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

@@ -5,7 +5,9 @@ export declare class BaseStore<_Data extends GraphQLObject, _Input extends Graph
     #private;
     get artifact(): _Artifact;
     get name(): string;
-    constructor(params: ObserveParams<_Data, _Artifact>);
+    constructor(params: ObserveParams<_Data, _Artifact> & {
+        initialize?: boolean;
+    });
     get observer(): DocumentStore<_Data, _Input>;
     subscribe(...args: Parameters<Readable<QueryResult<_Data, _Input>>['subscribe']>): () => void;
     setup(init?: boolean): void;

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

@@ -6,9 +6,9 @@ export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment
     data: Readable<_Fragment>;
     artifact: FragmentArtifact;
 };
-export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment | null, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined> | null> & {
+export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment | null | undefined, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined> | null> & {
     data: Readable<_Fragment | null>;
     artifact: FragmentArtifact;
 };
-export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment | null, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;
+export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment | null | undefined, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;
 export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;

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

@@ -5,7 +5,9 @@ export declare class BaseStore<_Data extends GraphQLObject, _Input extends Graph
     #private;
     get artifact(): _Artifact;
     get name(): string;
-    constructor(params: ObserveParams<_Data, _Artifact>);
+    constructor(params: ObserveParams<_Data, _Artifact> & {
+        initialize?: boolean;
+    });
     get observer(): DocumentStore<_Data, _Input>;
     subscribe(...args: Parameters<Readable<QueryResult<_Data, _Input>>['subscribe']>): () => void;
     setup(init?: boolean): void;

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

@@ -36,6 +36,9 @@ class BaseStore {
   #store;
   #unsubscribe = null;
   constructor(params) {
+    if (typeof params.initialize === "undefined") {
+      params.initialize = true;
+    }
     this.#store = new import_client.DocumentStore({
       artifact: params.artifact,
       client: null,
@@ -82,7 +85,7 @@ class BaseStore {
       this.#unsubscribe = this.observer.subscribe((value) => {
         this.#store.set(value);
       });
-      if (init) {
+      if (init && this.#params.initialize) {
         return this.observer.send({
           setup: true,
           variables: (0, import_store.get)(this.observer).variables

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

@@ -43,7 +43,11 @@ class QueryStore extends import_base.BaseStore {
   storeName;
   constructor({ artifact, storeName, variables }) {
     const fetching = artifact.pluginData["houdini-svelte"]?.isManualLoad !== true;
-    super({ artifact, fetching });
+    super({
+      artifact,
+      fetching,
+      initialize: !artifact.pluginData["houdini-svelte"].isManualLoad
+    });
     this.storeName = storeName;
     this.variables = variables;
   }

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

@@ -6,9 +6,9 @@ export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment
     data: Readable<_Fragment>;
     artifact: FragmentArtifact;
 };
-export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment | null, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined> | null> & {
+export declare function fragment<_Fragment extends Fragment<any>>(ref: _Fragment | null | undefined, fragment: FragmentStore<_Fragment['shape'], {}>): Readable<Exclude<_Fragment['shape'], undefined> | null> & {
     data: Readable<_Fragment | null>;
     artifact: FragmentArtifact;
 };
-export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment | null, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;
+export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment | null | undefined, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;
 export declare function paginatedFragment<_Fragment extends Fragment<any>>(initialValue: _Fragment, document: FragmentStore<_Fragment['shape'], {}>): FragmentStorePaginated<_Fragment['shape'], {}>;

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

@@ -5,7 +5,9 @@ export declare class BaseStore<_Data extends GraphQLObject, _Input extends Graph
     #private;
     get artifact(): _Artifact;
     get name(): string;
-    constructor(params: ObserveParams<_Data, _Artifact>);
+    constructor(params: ObserveParams<_Data, _Artifact> & {
+        initialize?: boolean;
+    });
     get observer(): DocumentStore<_Data, _Input>;
     subscribe(...args: Parameters<Readable<QueryResult<_Data, _Input>>['subscribe']>): () => void;
     setup(init?: boolean): void;

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

@@ -13,6 +13,9 @@ class BaseStore {
   #store;
   #unsubscribe = null;
   constructor(params) {
+    if (typeof params.initialize === "undefined") {
+      params.initialize = true;
+    }
     this.#store = new DocumentStore({
       artifact: params.artifact,
       client: null,
@@ -59,7 +62,7 @@ class BaseStore {
       this.#unsubscribe = this.observer.subscribe((value) => {
         this.#store.set(value);
       });
-      if (init) {
+      if (init && this.#params.initialize) {
         return this.observer.send({
           setup: true,
           variables: get(this.observer).variables

package/build/runtime-esm/stores/query.js

@@ -13,7 +13,11 @@ class QueryStore extends BaseStore {
   storeName;
   constructor({ artifact, storeName, variables }) {
     const fetching = artifact.pluginData["houdini-svelte"]?.isManualLoad !== true;
-    super({ artifact, fetching });
+    super({
+      artifact,
+      fetching,
+      initialize: !artifact.pluginData["houdini-svelte"].isManualLoad
+    });
     this.storeName = storeName;
     this.variables = variables;
   }

package/build/test-cjs/index.js

@@ -92673,7 +92673,7 @@ function deepMerge2(filepath, ...targets) {
 }
 async function parseJS(str, config5) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config5 ? deepMerge2("", defaultConfig, config5) : defaultConfig).program;
@@ -149361,7 +149361,7 @@ function deepMerge22(filepath, ...targets) {
 }
 async function parseJS2(str, config22) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser2.parse)(str || "", config22 ? deepMerge22("", defaultConfig, config22) : defaultConfig).program;
@@ -149451,7 +149451,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config22,
@@ -149459,7 +149460,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -149472,6 +149474,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -149480,15 +149483,32 @@ var FieldCollection = class {
     this.fields = {};
     this.inlineFragments = {};
     this.fragmentSpreads = {};
+    this.hoistFragments = !!args.hoistFragments;
     this.filepath = args.filepath;
     for (const selection of args.selections) {
-      this.add(selection);
+      this.add({ selection });
     }
   }
   get size() {
     return Object.keys(this.fields).length + Object.keys(this.inlineFragments).length + Object.keys(this.fragmentSpreads).length;
   }
-  add(selection) {
+  add({ selection, external }) {
+    let includeFragments = this.config.defaultFragmentMasking === "disable";
+    const maskEnableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskEnableDirective
+    );
+    if (maskEnableDirective) {
+      includeFragments = false;
+    }
+    const maskDisableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskDisableDirective
+    );
+    if (maskDisableDirective) {
+      includeFragments = true;
+    }
+    if (this.ignoreMaskDisable) {
+      includeFragments = true;
+    }
     if (selection.kind === "Field") {
       const key = selection.alias?.value || selection.name.value;
       if (!this.fields[key]) {
@@ -149498,41 +149518,30 @@ var FieldCollection = class {
         };
       }
       for (const subselect of selection.selectionSet?.selections || []) {
-        this.fields[key].selection.add(subselect);
+        this.fields[key].selection.add({
+          selection: subselect,
+          external
+        });
+      }
+      if (!external && includeFragments) {
+        this.fields[key].selection.fragmentSpreads = {
+          ...this.collectFragmentSpreads(selection.selectionSet?.selections ?? []),
+          ...this.fields[key].selection.fragmentSpreads
+        };
       }
-      this.fields[key].selection.fragmentSpreads = {
-        ...this.collectFragmentSpreads(selection.selectionSet?.selections ?? []),
-        ...this.fields[key].selection.fragmentSpreads
-      };
       return;
     }
     if (selection.kind === "InlineFragment" && !selection.typeCondition) {
       for (const subselect of selection.selectionSet.selections) {
-        this.add(subselect);
+        this.add({ selection: subselect, external });
       }
     }
     if (selection.kind === "InlineFragment" && selection.typeCondition) {
-      this.walkInlineFragment(selection);
+      this.walkInlineFragment({ selection, external, hoistFragments: this.hoistFragments });
       return;
     }
     if (selection.kind === "FragmentSpread") {
-      let includeFragments = this.config.defaultFragmentMasking === "disable";
-      const maskEnableDirective = selection.directives?.find(
-        ({ name }) => name.value === this.config.maskEnableDirective
-      );
-      if (maskEnableDirective) {
-        includeFragments = false;
-      }
-      const maskDisableDirective = selection.directives?.find(
-        ({ name }) => name.value === this.config.maskDisableDirective
-      );
-      if (maskDisableDirective) {
-        includeFragments = true;
-      }
-      if (this.ignoreMaskDisable) {
-        includeFragments = true;
-      }
-      if (this.keepFragmentSpreadNodes) {
+      if (this.keepFragmentSpreadNodes && !external) {
         this.fragmentSpreads[selection.name.value] = selection;
       }
       if (!includeFragments) {
@@ -149546,18 +149555,21 @@ var FieldCollection = class {
         });
       }
       this.add({
-        kind: "InlineFragment",
-        typeCondition: {
-          kind: "NamedType",
-          name: {
-            kind: "Name",
-            value: definition.typeCondition.name.value
+        selection: {
+          kind: "InlineFragment",
+          typeCondition: {
+            kind: "NamedType",
+            name: {
+              kind: "Name",
+              value: definition.typeCondition.name.value
+            }
+          },
+          selectionSet: {
+            kind: "SelectionSet",
+            selections: [...definition.selectionSet.selections]
           }
         },
-        selectionSet: {
-          kind: "SelectionSet",
-          selections: [...definition.selectionSet.selections]
-        }
+        external
       });
     }
   }
@@ -149613,7 +149625,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -149622,11 +149638,21 @@ var FieldCollection = class {
       };
     }
     for (const subselect of selection.selectionSet.selections || []) {
-      if (subselect.kind !== "InlineFragment" || !subselect.typeCondition) {
-        this.inlineFragments[key].selection.add(subselect);
+      if (subselect.kind === "FragmentSpread" && !hoistFragments || subselect.kind === "Field" || subselect.kind === "InlineFragment" && !subselect.typeCondition) {
+        this.inlineFragments[key].selection.add({
+          selection: subselect,
+          external
+        });
+        continue;
+      } else if (subselect.kind === "FragmentSpread") {
+        this.add({
+          selection: subselect,
+          external: true
+        });
         continue;
+      } else {
+        this.walkInlineFragment({ selection: subselect, external, hoistFragments });
       }
-      this.walkInlineFragment(subselect);
     }
   }
   empty() {
@@ -149636,7 +149662,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -152035,7 +152062,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config22,
@@ -212213,6 +212241,8 @@ function testConfigFile({ plugins, ...config22 } = {}) {
 				customIdList: [CustomIdType]!
 				nodes(ids: [ID!]!): [Node!]!
     			monkeys: MonkeyConnection!
+				animals(first: Int, after: String): AnimalConnection
+
 			}
 
 			input UserFilter {
@@ -212469,7 +212499,7 @@ function artifactData({
   config: config5,
   document: document2
 }) {
-  let isManualLoad = true;
+  let isManualLoad = document2.filename.endsWith(".svelte");
   let set_blocking = void 0;
   graphql29.visit(document2.document, {
     Directive(node2, _, __, ___) {
@@ -305987,11 +306017,26 @@ async function fragmentTypedefs(input) {
             )
           )
         ]);
+        const non_exhaustive = AST18.tsTypeLiteral([
+          AST18.tsPropertySignature(
+            AST18.literal("__typename"),
+            AST18.tsTypeAnnotation(
+              AST18.tsLiteralType(AST18.stringLiteral("non-exhaustive; don't match this"))
+            )
+          )
+        ]);
         const initial_value_input = AST18.identifier("initialValue");
-        initial_value_input.typeAnnotation = AST18.tsTypeAnnotation(fragment_map);
+        initial_value_input.typeAnnotation = AST18.tsTypeAnnotation(
+          AST18.tsUnionType([fragment_map, non_exhaustive])
+        );
         const initial_value_or_null_input = AST18.identifier("initialValue");
         initial_value_or_null_input.typeAnnotation = AST18.tsTypeAnnotation(
-          AST18.tsUnionType([fragment_map, AST18.tsNullKeyword(), AST18.tsUndefinedKeyword()])
+          AST18.tsUnionType([
+            fragment_map,
+            AST18.tsNullKeyword(),
+            AST18.tsUndefinedKeyword(),
+            non_exhaustive
+          ])
         );
         const document_input = AST18.identifier("document");
         document_input.typeAnnotation = AST18.tsTypeAnnotation(

package/build/test-esm/index.js

@@ -92661,7 +92661,7 @@ function deepMerge2(filepath, ...targets) {
 }
 async function parseJS(str, config5) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config5 ? deepMerge2("", defaultConfig, config5) : defaultConfig).program;
@@ -149348,7 +149348,7 @@ function deepMerge22(filepath, ...targets) {
 }
 async function parseJS2(str, config22) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser2.parse)(str || "", config22 ? deepMerge22("", defaultConfig, config22) : defaultConfig).program;
@@ -149438,7 +149438,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config22,
@@ -149446,7 +149447,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -149459,6 +149461,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -149467,15 +149470,32 @@ var FieldCollection = class {
     this.fields = {};
     this.inlineFragments = {};
     this.fragmentSpreads = {};
+    this.hoistFragments = !!args.hoistFragments;
     this.filepath = args.filepath;
     for (const selection of args.selections) {
-      this.add(selection);
+      this.add({ selection });
     }
   }
   get size() {
     return Object.keys(this.fields).length + Object.keys(this.inlineFragments).length + Object.keys(this.fragmentSpreads).length;
   }
-  add(selection) {
+  add({ selection, external }) {
+    let includeFragments = this.config.defaultFragmentMasking === "disable";
+    const maskEnableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskEnableDirective
+    );
+    if (maskEnableDirective) {
+      includeFragments = false;
+    }
+    const maskDisableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskDisableDirective
+    );
+    if (maskDisableDirective) {
+      includeFragments = true;
+    }
+    if (this.ignoreMaskDisable) {
+      includeFragments = true;
+    }
     if (selection.kind === "Field") {
       const key = selection.alias?.value || selection.name.value;
       if (!this.fields[key]) {
@@ -149485,41 +149505,30 @@ var FieldCollection = class {
         };
       }
       for (const subselect of selection.selectionSet?.selections || []) {
-        this.fields[key].selection.add(subselect);
+        this.fields[key].selection.add({
+          selection: subselect,
+          external
+        });
+      }
+      if (!external && includeFragments) {
+        this.fields[key].selection.fragmentSpreads = {
+          ...this.collectFragmentSpreads(selection.selectionSet?.selections ?? []),
+          ...this.fields[key].selection.fragmentSpreads
+        };
       }
-      this.fields[key].selection.fragmentSpreads = {
-        ...this.collectFragmentSpreads(selection.selectionSet?.selections ?? []),
-        ...this.fields[key].selection.fragmentSpreads
-      };
       return;
     }
     if (selection.kind === "InlineFragment" && !selection.typeCondition) {
       for (const subselect of selection.selectionSet.selections) {
-        this.add(subselect);
+        this.add({ selection: subselect, external });
       }
     }
     if (selection.kind === "InlineFragment" && selection.typeCondition) {
-      this.walkInlineFragment(selection);
+      this.walkInlineFragment({ selection, external, hoistFragments: this.hoistFragments });
       return;
     }
     if (selection.kind === "FragmentSpread") {
-      let includeFragments = this.config.defaultFragmentMasking === "disable";
-      const maskEnableDirective = selection.directives?.find(
-        ({ name }) => name.value === this.config.maskEnableDirective
-      );
-      if (maskEnableDirective) {
-        includeFragments = false;
-      }
-      const maskDisableDirective = selection.directives?.find(
-        ({ name }) => name.value === this.config.maskDisableDirective
-      );
-      if (maskDisableDirective) {
-        includeFragments = true;
-      }
-      if (this.ignoreMaskDisable) {
-        includeFragments = true;
-      }
-      if (this.keepFragmentSpreadNodes) {
+      if (this.keepFragmentSpreadNodes && !external) {
         this.fragmentSpreads[selection.name.value] = selection;
       }
       if (!includeFragments) {
@@ -149533,18 +149542,21 @@ var FieldCollection = class {
         });
       }
       this.add({
-        kind: "InlineFragment",
-        typeCondition: {
-          kind: "NamedType",
-          name: {
-            kind: "Name",
-            value: definition.typeCondition.name.value
+        selection: {
+          kind: "InlineFragment",
+          typeCondition: {
+            kind: "NamedType",
+            name: {
+              kind: "Name",
+              value: definition.typeCondition.name.value
+            }
+          },
+          selectionSet: {
+            kind: "SelectionSet",
+            selections: [...definition.selectionSet.selections]
           }
         },
-        selectionSet: {
-          kind: "SelectionSet",
-          selections: [...definition.selectionSet.selections]
-        }
+        external
       });
     }
   }
@@ -149600,7 +149612,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -149609,11 +149625,21 @@ var FieldCollection = class {
       };
     }
     for (const subselect of selection.selectionSet.selections || []) {
-      if (subselect.kind !== "InlineFragment" || !subselect.typeCondition) {
-        this.inlineFragments[key].selection.add(subselect);
+      if (subselect.kind === "FragmentSpread" && !hoistFragments || subselect.kind === "Field" || subselect.kind === "InlineFragment" && !subselect.typeCondition) {
+        this.inlineFragments[key].selection.add({
+          selection: subselect,
+          external
+        });
+        continue;
+      } else if (subselect.kind === "FragmentSpread") {
+        this.add({
+          selection: subselect,
+          external: true
+        });
         continue;
+      } else {
+        this.walkInlineFragment({ selection: subselect, external, hoistFragments });
       }
-      this.walkInlineFragment(subselect);
     }
   }
   empty() {
@@ -149623,7 +149649,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -152022,7 +152049,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config22,
@@ -212199,6 +212227,8 @@ function testConfigFile({ plugins, ...config22 } = {}) {
 				customIdList: [CustomIdType]!
 				nodes(ids: [ID!]!): [Node!]!
     			monkeys: MonkeyConnection!
+				animals(first: Int, after: String): AnimalConnection
+
 			}
 
 			input UserFilter {
@@ -212455,7 +212485,7 @@ function artifactData({
   config: config5,
   document: document2
 }) {
-  let isManualLoad = true;
+  let isManualLoad = document2.filename.endsWith(".svelte");
   let set_blocking = void 0;
   graphql29.visit(document2.document, {
     Directive(node2, _, __, ___) {
@@ -305972,11 +306002,26 @@ async function fragmentTypedefs(input) {
             )
           )
         ]);
+        const non_exhaustive = AST18.tsTypeLiteral([
+          AST18.tsPropertySignature(
+            AST18.literal("__typename"),
+            AST18.tsTypeAnnotation(
+              AST18.tsLiteralType(AST18.stringLiteral("non-exhaustive; don't match this"))
+            )
+          )
+        ]);
         const initial_value_input = AST18.identifier("initialValue");
-        initial_value_input.typeAnnotation = AST18.tsTypeAnnotation(fragment_map);
+        initial_value_input.typeAnnotation = AST18.tsTypeAnnotation(
+          AST18.tsUnionType([fragment_map, non_exhaustive])
+        );
         const initial_value_or_null_input = AST18.identifier("initialValue");
         initial_value_or_null_input.typeAnnotation = AST18.tsTypeAnnotation(
-          AST18.tsUnionType([fragment_map, AST18.tsNullKeyword(), AST18.tsUndefinedKeyword()])
+          AST18.tsUnionType([
+            fragment_map,
+            AST18.tsNullKeyword(),
+            AST18.tsUndefinedKeyword(),
+            non_exhaustive
+          ])
         );
         const document_input = AST18.identifier("document");
         document_input.typeAnnotation = AST18.tsTypeAnnotation(

package/package.json

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