houdini 1.2.0 → 1.2.2

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;
@@ -70479,16 +70479,14 @@ function flattenSelections({
   filepath,
   selections,
   fragmentDefinitions,
-  ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  applyFragments
 }) {
   const fields = new FieldCollection({
     config: config4,
     filepath,
     selections,
     fragmentDefinitions,
-    ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    applyFragments: !!applyFragments
   });
   return fields.toSelectionSet();
 }
@@ -70499,25 +70497,36 @@ var FieldCollection = class {
   fields;
   inlineFragments;
   fragmentSpreads;
-  ignoreMaskDisable;
-  keepFragmentSpreadNodes;
+  applyFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
-    this.ignoreMaskDisable = args.ignoreMaskDisable;
-    this.keepFragmentSpreadNodes = args.keepFragmentSpreadNodes;
+    this.applyFragments = args.applyFragments;
     this.fields = {};
     this.inlineFragments = {};
     this.fragmentSpreads = {};
     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 include = this.config.defaultFragmentMasking === "disable";
+    const maskEnableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskEnableDirective
+    );
+    if (maskEnableDirective) {
+      include = false;
+    }
+    const maskDisableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskDisableDirective
+    );
+    if (maskDisableDirective) {
+      include = true;
+    }
     if (selection.kind === "Field") {
       const key = selection.alias?.value || selection.name.value;
       if (!this.fields[key]) {
@@ -70527,46 +70536,32 @@ 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 (this.applyFragments && !external) {
+        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 });
       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 (!external || include) {
         this.fragmentSpreads[selection.name.value] = selection;
       }
-      if (!includeFragments) {
-        return;
-      }
       const definition = this.fragmentDefinitions[selection.name.value];
       if (!definition) {
         throw new HoudiniError({
@@ -70574,20 +70569,25 @@ var FieldCollection = class {
           message: "Could not find referenced fragment definition: " + selection.name.value + "\n" + JSON.stringify(Object.keys(this.fragmentDefinitions), null, 4)
         });
       }
-      this.add({
-        kind: "InlineFragment",
-        typeCondition: {
-          kind: "NamedType",
-          name: {
-            kind: "Name",
-            value: definition.typeCondition.name.value
-          }
-        },
-        selectionSet: {
-          kind: "SelectionSet",
-          selections: [...definition.selectionSet.selections]
-        }
-      });
+      if (this.applyFragments || include) {
+        this.add({
+          selection: {
+            kind: "InlineFragment",
+            typeCondition: {
+              kind: "NamedType",
+              name: {
+                kind: "Name",
+                value: definition.typeCondition.name.value
+              }
+            },
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [...definition.selectionSet.selections]
+            }
+          },
+          external: !include
+        });
+      }
     }
   }
   collectFragmentSpreads(selections, result = {}) {
@@ -70642,7 +70642,10 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -70651,11 +70654,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 === "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
+        });
         continue;
+      } else {
+        this.walkInlineFragment({ selection: subselect, external });
       }
-      this.walkInlineFragment(subselect);
     }
   }
   empty() {
@@ -70664,8 +70677,7 @@ var FieldCollection = class {
       fragmentDefinitions: this.fragmentDefinitions,
       selections: [],
       filepath: this.filepath,
-      ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      applyFragments: this.applyFragments
     });
   }
 };
@@ -72591,7 +72603,8 @@ function prepareSelection({
   inConnection,
   typeMap,
   abstractTypes,
-  globalLoading
+  globalLoading,
+  includeFragments
 }) {
   let object = {};
   const loadingTypes = [];
@@ -72611,7 +72624,8 @@ function prepareSelection({
             document,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields || {}
         );
       } else {
@@ -72659,7 +72673,8 @@ function prepareSelection({
             document,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields
         };
         if (field.directives?.find((d) => d.name.value === config4.loadingDirective)) {
@@ -72777,7 +72792,8 @@ function prepareSelection({
           inConnection: connectionState,
           typeMap,
           abstractTypes,
-          globalLoading: forceLoading
+          globalLoading: forceLoading,
+          includeFragments
         });
         if (Object.values(fieldObj.selection.fields ?? {}).some((field2) => field2.required)) {
           fieldObj.nullable = true;
@@ -73110,13 +73126,13 @@ function artifactGenerator(stats) {
               document: doc,
               rootType,
               globalLoading,
+              includeFragments: doc.kind !== ArtifactKind.Fragment,
               selections: flattenSelections({
                 config: config4,
                 filepath: doc.filename,
                 selections: selectionSet.selections,
                 fragmentDefinitions,
-                ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                applyFragments: doc.kind !== ArtifactKind.Fragment
               }),
               operations: operationsByPath(
                 config4,
@@ -74081,8 +74097,7 @@ async function generateDocumentTypes(config4, docs) {
         config: config4,
         filepath: filename,
         selections: definition.selectionSet.selections,
-        fragmentDefinitions,
-        keepFragmentSpreadNodes: true
+        fragmentDefinitions
       });
       if (definition?.kind === "OperationDefinition") {
         await generateOperationTypeDefs(

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;
@@ -70473,16 +70473,14 @@ function flattenSelections({
   filepath,
   selections,
   fragmentDefinitions,
-  ignoreMaskDisable,
-  keepFragmentSpreadNodes
+  applyFragments
 }) {
   const fields = new FieldCollection({
     config: config4,
     filepath,
     selections,
     fragmentDefinitions,
-    ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes
+    applyFragments: !!applyFragments
   });
   return fields.toSelectionSet();
 }
@@ -70493,25 +70491,36 @@ var FieldCollection = class {
   fields;
   inlineFragments;
   fragmentSpreads;
-  ignoreMaskDisable;
-  keepFragmentSpreadNodes;
+  applyFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
-    this.ignoreMaskDisable = args.ignoreMaskDisable;
-    this.keepFragmentSpreadNodes = args.keepFragmentSpreadNodes;
+    this.applyFragments = args.applyFragments;
     this.fields = {};
     this.inlineFragments = {};
     this.fragmentSpreads = {};
     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 include = this.config.defaultFragmentMasking === "disable";
+    const maskEnableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskEnableDirective
+    );
+    if (maskEnableDirective) {
+      include = false;
+    }
+    const maskDisableDirective = selection.directives?.find(
+      ({ name }) => name.value === this.config.maskDisableDirective
+    );
+    if (maskDisableDirective) {
+      include = true;
+    }
     if (selection.kind === "Field") {
       const key = selection.alias?.value || selection.name.value;
       if (!this.fields[key]) {
@@ -70521,46 +70530,32 @@ 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 (this.applyFragments && !external) {
+        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 });
       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 (!external || include) {
         this.fragmentSpreads[selection.name.value] = selection;
       }
-      if (!includeFragments) {
-        return;
-      }
       const definition = this.fragmentDefinitions[selection.name.value];
       if (!definition) {
         throw new HoudiniError({
@@ -70568,20 +70563,25 @@ var FieldCollection = class {
           message: "Could not find referenced fragment definition: " + selection.name.value + "\n" + JSON.stringify(Object.keys(this.fragmentDefinitions), null, 4)
         });
       }
-      this.add({
-        kind: "InlineFragment",
-        typeCondition: {
-          kind: "NamedType",
-          name: {
-            kind: "Name",
-            value: definition.typeCondition.name.value
-          }
-        },
-        selectionSet: {
-          kind: "SelectionSet",
-          selections: [...definition.selectionSet.selections]
-        }
-      });
+      if (this.applyFragments || include) {
+        this.add({
+          selection: {
+            kind: "InlineFragment",
+            typeCondition: {
+              kind: "NamedType",
+              name: {
+                kind: "Name",
+                value: definition.typeCondition.name.value
+              }
+            },
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [...definition.selectionSet.selections]
+            }
+          },
+          external: !include
+        });
+      }
     }
   }
   collectFragmentSpreads(selections, result = {}) {
@@ -70636,7 +70636,10 @@ var FieldCollection = class {
       })
     );
   }
-  walkInlineFragment(selection) {
+  walkInlineFragment({
+    selection,
+    external
+  }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
       this.inlineFragments[key] = {
@@ -70645,11 +70648,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 === "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
+        });
         continue;
+      } else {
+        this.walkInlineFragment({ selection: subselect, external });
       }
-      this.walkInlineFragment(subselect);
     }
   }
   empty() {
@@ -70658,8 +70671,7 @@ var FieldCollection = class {
       fragmentDefinitions: this.fragmentDefinitions,
       selections: [],
       filepath: this.filepath,
-      ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes
+      applyFragments: this.applyFragments
     });
   }
 };
@@ -72585,7 +72597,8 @@ function prepareSelection({
   inConnection,
   typeMap,
   abstractTypes,
-  globalLoading
+  globalLoading,
+  includeFragments
 }) {
   let object = {};
   const loadingTypes = [];
@@ -72605,7 +72618,8 @@ function prepareSelection({
             document,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields || {}
         );
       } else {
@@ -72653,7 +72667,8 @@ function prepareSelection({
             document,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields
         };
         if (field.directives?.find((d) => d.name.value === config4.loadingDirective)) {
@@ -72771,7 +72786,8 @@ function prepareSelection({
           inConnection: connectionState,
           typeMap,
           abstractTypes,
-          globalLoading: forceLoading
+          globalLoading: forceLoading,
+          includeFragments
         });
         if (Object.values(fieldObj.selection.fields ?? {}).some((field2) => field2.required)) {
           fieldObj.nullable = true;
@@ -73104,13 +73120,13 @@ function artifactGenerator(stats) {
               document: doc,
               rootType,
               globalLoading,
+              includeFragments: doc.kind !== ArtifactKind.Fragment,
               selections: flattenSelections({
                 config: config4,
                 filepath: doc.filename,
                 selections: selectionSet.selections,
                 fragmentDefinitions,
-                ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true
+                applyFragments: doc.kind !== ArtifactKind.Fragment
               }),
               operations: operationsByPath(
                 config4,
@@ -74075,8 +74091,7 @@ async function generateDocumentTypes(config4, docs) {
         config: config4,
         filepath: filename,
         selections: definition.selectionSet.selections,
-        fragmentDefinitions,
-        keepFragmentSpreadNodes: true
+        fragmentDefinitions
       });
       if (definition?.kind === "OperationDefinition") {
         await generateOperationTypeDefs(

package/package.json

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