houdini 1.2.0 → 1.2.1

package/build/codegen-esm/index.js

@@ -56999,7 +56999,7 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 async function parseJS(str, config2) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config2 ? deepMerge2("", defaultConfig, config2) : defaultConfig).program;
@@ -57282,7 +57282,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config2,
@@ -57290,7 +57291,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -57303,6 +57305,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -57311,15 +57314,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]) {
@@ -57329,41 +57349,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) {
@@ -57377,18 +57386,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
       });
     }
   }
@@ -57444,7 +57456,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -57453,11 +57469,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() {
@@ -57467,7 +57493,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -59912,7 +59939,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config2,

package/build/lib-cjs/index.js

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

package/build/lib-esm/index.js

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

package/build/test-cjs/index.js

@@ -57592,7 +57592,7 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 async function parseJS(str, config2) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config2 ? deepMerge2("", defaultConfig, config2) : defaultConfig).program;
@@ -57691,7 +57691,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config2,
@@ -57699,7 +57700,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -57712,6 +57714,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -57720,15 +57723,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]) {
@@ -57738,41 +57758,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) {
@@ -57786,18 +57795,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
       });
     }
   }
@@ -57853,7 +57865,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -57862,11 +57878,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() {
@@ -57876,7 +57902,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -60321,7 +60348,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config2,
@@ -63564,6 +63592,8 @@ function testConfigFile({ plugins, ...config2 } = {}) {
 				customIdList: [CustomIdType]!
 				nodes(ids: [ID!]!): [Node!]!
     			monkeys: MonkeyConnection!
+				animals(first: Int, after: String): AnimalConnection
+
 			}
 
 			input UserFilter {

package/build/test-esm/index.js

@@ -57587,7 +57587,7 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 async function parseJS(str, config2) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "jsx"],
+    plugins: ["typescript", "importAssertions"],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config2 ? deepMerge2("", defaultConfig, config2) : defaultConfig).program;
@@ -57686,7 +57686,8 @@ function flattenSelections({
   selections,
   fragmentDefinitions,
   ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  keepFragmentSpreadNodes,
+  hoistFragments
 }) {
   const fields = new FieldCollection({
     config: config2,
@@ -57694,7 +57695,8 @@ function flattenSelections({
     selections,
     fragmentDefinitions,
     ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
+    hoistFragments
   });
   return fields.toSelectionSet();
 }
@@ -57707,6 +57709,7 @@ var FieldCollection = class {
   fragmentSpreads;
   ignoreMaskDisable;
   keepFragmentSpreadNodes;
+  hoistFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
@@ -57715,15 +57718,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]) {
@@ -57733,41 +57753,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) {
@@ -57781,18 +57790,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
       });
     }
   }
@@ -57848,7 +57860,11 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external,
+    hoistFragments
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -57857,11 +57873,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() {
@@ -57871,7 +57897,8 @@ var FieldCollection = class {
       selections: [],
       filepath: this.filepath,
       ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
+      hoistFragments: this.hoistFragments
     });
   }
 };
@@ -60316,7 +60343,8 @@ function artifactGenerator(stats) {
                 selections: selectionSet.selections,
                 fragmentDefinitions,
                 ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                keepFragmentSpreadNodes: true,
+                hoistFragments: true
               }),
               operations: operationsByPath(
                 config2,
@@ -63559,6 +63587,8 @@ function testConfigFile({ plugins, ...config2 } = {}) {
 				customIdList: [CustomIdType]!
 				nodes(ids: [ID!]!): [Node!]!
     			monkeys: MonkeyConnection!
+				animals(first: Int, after: String): AnimalConnection
+
 			}
 
 			input UserFilter {