houdini 1.2.0 → 1.2.1

package/build/vite-cjs/index.js

@@ -70197,7 +70197,7 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 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;
@@ -70480,7 +70480,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config4,
@@ -70488,7 +70489,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -70501,6 +70503,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -70509,15 +70512,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]) {
@@ -70527,41 +70547,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) {
@@ -70575,18 +70584,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
       });
     }
   }
@@ -70642,7 +70654,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -70651,11 +70667,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() {
@@ -70665,7 +70691,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -73116,7 +73143,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config4,

package/build/vite-esm/index.js

@@ -70191,7 +70191,7 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 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;
@@ -70474,7 +70474,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config4,
@@ -70482,7 +70483,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -70495,6 +70497,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -70503,15 +70506,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]) {
@@ -70521,41 +70541,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) {
@@ -70569,18 +70578,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
       });
     }
   }
@@ -70636,7 +70648,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -70645,11 +70661,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() {
@@ -70659,7 +70685,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -73110,7 +73137,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config4,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",