houdini 1.0.0-next.5 → 1.0.0-next.6

package/build/codegen/validators/typeCheck.d.ts

@@ -1,4 +1,4 @@
 import * as graphql from 'graphql';
-import type { Config, CollectedGraphQLDocument } from '../../lib';
-export default function typeCheck(config: Config, docs: CollectedGraphQLDocument[]): Promise<void>;
+import type { Config, Document } from '../../lib';
+export default function typeCheck(config: Config, docs: Document[]): Promise<void>;
 export declare function getAndVerifyNodeInterface(config: Config): graphql.GraphQLInterfaceType | null;

package/build/codegen/validators/uniqueNames.d.ts

@@ -1,2 +1,2 @@
-import type { Config, CollectedGraphQLDocument } from '../../lib';
-export default function uniqueDocumentNames(config: Config, docs: CollectedGraphQLDocument[]): Promise<void>;
+import type { Config, Document } from '../../lib';
+export default function uniqueDocumentNames(config: Config, docs: Document[]): Promise<void>;

package/build/codegen-cjs/index.js

@@ -55155,7 +55155,7 @@ async function fragmentVariables(config2, documents) {
     name: "generated::fragmentVariables",
     kind: "HoudiniFragment" /* Fragment */,
     document: doc,
-    originalDocument: doc,
+    originalParsed: doc,
     generateStore: false,
     generateArtifact: false,
     filename: "generated::fragmentVariables",
@@ -56078,7 +56078,7 @@ async function paginate(config2, documents) {
         filename: doc.filename,
         name: refetchQueryName,
         document: queryDoc,
-        originalDocument: queryDoc,
+        originalParsed: queryDoc,
         generateArtifact: true,
         generateStore: false,
         refetch: doc.refetch,
@@ -56498,7 +56498,7 @@ async function addListFragments(config2, documents) {
     generateArtifact: false,
     generateStore: false,
     document: generatedDoc,
-    originalDocument: generatedDoc,
+    originalParsed: generatedDoc,
     filename: "generated::lists",
     originalString: "",
     artifact: null
@@ -57026,11 +57026,11 @@ function artifactGenerator(stats) {
           };
           const plugin_data = config2.plugins.reduce(
             (prev, plugin2) => {
-              if (!plugin2.artifact_data) {
+              if (!plugin2.artifactData) {
                 return prev;
               }
               const result = { ...prev };
-              const dataToAdd = plugin2.artifact_data({ config: config2, document: doc }) ?? {};
+              const dataToAdd = plugin2.artifactData({ config: config2, document: doc }) ?? {};
               if (Object.keys(dataToAdd).length > 0) {
                 result[plugin2.name] = dataToAdd;
               }
@@ -57075,10 +57075,10 @@ function artifactGenerator(stats) {
           }
           doc.artifact = artifact;
           for (const plugin2 of config2.plugins) {
-            if (!plugin2.artifact_end) {
+            if (!plugin2.artifactEnd) {
               continue;
             }
-            plugin2.artifact_end({ config: config2, document: doc });
+            plugin2.artifactEnd({ config: config2, document: doc });
           }
           const file = AST5.program([
             moduleExport(config2, "default", serializeValue(artifact)),
@@ -57118,18 +57118,18 @@ async function generateGraphqlReturnTypes(config2, docs) {
   const indexPath = path_exports.join(config2.runtimeDirectory, "index.d.ts");
   const fileContent = await fs_exports.readFile(indexPath) || "";
   const contents = await parseJS(fileContent);
-  const graphql_tag_return = config2.plugins.find(
-    (plugin2) => plugin2.graphql_tag_return
-  )?.graphql_tag_return;
-  if (!graphql_tag_return || !contents) {
+  const graphqlTagReturn = config2.plugins.find(
+    (plugin2) => plugin2.graphqlTagReturn
+  )?.graphqlTagReturn;
+  if (!graphqlTagReturn || !contents) {
     return fileContent;
   }
   const overloaded_returns = {};
   for (const doc of docs) {
-    const return_value = graphql_tag_return({
+    const return_value = graphqlTagReturn({
       config: config2,
       document: doc,
-      ensure_import({ identifier, module: module2 }) {
+      ensureImport({ identifier, module: module2 }) {
         ensureImports({
           config: config2,
           body: contents.script.body,
@@ -57177,18 +57177,18 @@ async function injectPlugins({
   importStatement,
   exportStatement
 }) {
-  const client_plugins = config2.plugins.filter((plugin2) => plugin2.client_plugins).reduce((acc, plugin2) => {
-    let plugins = plugin2.client_plugins;
+  const clientPlugins = config2.plugins.filter((plugin2) => plugin2.clientPlugins).reduce((acc, plugin2) => {
+    let plugins = plugin2.clientPlugins;
     if (typeof plugins === "function") {
       plugins = plugins(config2, config2.pluginConfig(plugin2.name));
     }
     return [...acc, ...Object.entries(plugins)];
   }, []);
-  return client_plugins.length > 0 ? `
-${client_plugins.map((plugin2, i) => importStatement(plugin2[0], `plugin${i}`))}
+  return clientPlugins.length > 0 ? `
+${clientPlugins.map((plugin2, i) => importStatement(plugin2[0], `plugin${i}`))}
 
 const plugins = [
-	${client_plugins.map((plugin2, i) => {
+	${clientPlugins.map((plugin2, i) => {
     const suffix = `(${JSON.stringify(plugin2[1])})`;
     return `plugin${i}${suffix}`;
   }).join(",\n")}
@@ -57232,18 +57232,18 @@ ${exportStatement("config")}
       },
       [path_exports.join(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
-    ...config2.plugins.filter((plugin2) => plugin2.include_runtime).map((plugin2) => generatePluginRuntime(config2, plugin2)),
+    ...config2.plugins.filter((plugin2) => plugin2.includeRuntime).map((plugin2) => generatePluginRuntime(config2, plugin2)),
     generatePluginIndex({ config: config2, exportStatement: exportStar })
   ]);
   await generateGraphqlReturnTypes(config2, docs);
 }
 async function generatePluginRuntime(config2, plugin2) {
-  if (houdini_mode.is_testing || !plugin2.include_runtime) {
+  if (houdini_mode.is_testing || !plugin2.includeRuntime) {
     return;
   }
   const runtime_path = path_exports.join(
     path_exports.dirname(plugin2.filepath),
-    typeof plugin2.include_runtime === "string" ? plugin2.include_runtime : plugin2.include_runtime[config2.module]
+    typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime[config2.module]
   );
   try {
     await fs_exports.stat(runtime_path);
@@ -57259,7 +57259,7 @@ async function generatePluginRuntime(config2, plugin2) {
     runtime_path,
     pluginDir,
     Object.fromEntries(
-      Object.entries(plugin2.transform_runtime ?? {}).map(([key, value]) => [
+      Object.entries(plugin2.transformRuntime ?? {}).map(([key, value]) => [
         path_exports.join(runtime_path, key),
         (content) => value({ config: config2, content })
       ])
@@ -57653,7 +57653,7 @@ async function generateDocumentTypes(config2, docs) {
   const typePaths = [];
   const fragmentDefinitions = {};
   for (const document of docs) {
-    for (const defn of document.originalDocument.definitions.filter(
+    for (const defn of document.originalParsed.definitions.filter(
       ({ kind }) => kind === "FragmentDefinition"
     )) {
       fragmentDefinitions[defn.name.value] = defn;
@@ -57661,47 +57661,54 @@ async function generateDocumentTypes(config2, docs) {
   }
   const missingScalars = /* @__PURE__ */ new Set();
   await Promise.all(
-    docs.map(async ({ originalDocument, name, filename, generateArtifact }) => {
-      if (!generateArtifact) {
-        return;
-      }
-      const typeDefPath = config2.artifactTypePath(originalDocument);
-      const program = AST11.program([]);
-      const visitedTypes = /* @__PURE__ */ new Set();
-      let definition = originalDocument.definitions.find(
-        (def) => (def.kind === "OperationDefinition" || def.kind === "FragmentDefinition") && def.name?.value === name
-      );
-      const selections = flattenSelections({
-        config: config2,
-        filepath: filename,
-        selections: definition.selectionSet.selections,
-        fragmentDefinitions,
-        applyFragments: definition.kind === "OperationDefinition"
-      });
-      if (definition?.kind === "OperationDefinition") {
-        await generateOperationTypeDefs(
-          config2,
-          filename,
-          program.body,
-          definition,
-          selections,
-          visitedTypes,
-          missingScalars
-        );
-      } else {
-        await generateFragmentTypeDefs(
-          config2,
-          filename,
-          program.body,
-          selections,
-          originalDocument.definitions,
-          visitedTypes,
-          missingScalars
+    docs.map(
+      async ({
+        originalParsed: originalDocument,
+        name,
+        filename,
+        generateArtifact
+      }) => {
+        if (!generateArtifact) {
+          return;
+        }
+        const typeDefPath = config2.artifactTypePath(originalDocument);
+        const program = AST11.program([]);
+        const visitedTypes = /* @__PURE__ */ new Set();
+        let definition = originalDocument.definitions.find(
+          (def) => (def.kind === "OperationDefinition" || def.kind === "FragmentDefinition") && def.name?.value === name
         );
+        const selections = flattenSelections({
+          config: config2,
+          filepath: filename,
+          selections: definition.selectionSet.selections,
+          fragmentDefinitions,
+          applyFragments: definition.kind === "OperationDefinition"
+        });
+        if (definition?.kind === "OperationDefinition") {
+          await generateOperationTypeDefs(
+            config2,
+            filename,
+            program.body,
+            definition,
+            selections,
+            visitedTypes,
+            missingScalars
+          );
+        } else {
+          await generateFragmentTypeDefs(
+            config2,
+            filename,
+            program.body,
+            selections,
+            originalDocument.definitions,
+            visitedTypes,
+            missingScalars
+          );
+        }
+        await fs_exports.writeFile(typeDefPath, recast11.print(program).code);
+        typePaths.push(typeDefPath);
       }
-      await fs_exports.writeFile(typeDefPath, recast11.print(program).code);
-      typePaths.push(typeDefPath);
-    })
+    )
   );
   const typeIndex = AST11.program(
     typePaths.sort((a, b) => a.localeCompare(b)).map((typePath) => {
@@ -57716,28 +57723,28 @@ async function generateDocumentTypes(config2, docs) {
       AST11.exportAllDeclaration(AST11.literal("./graphql"), null)
     ])
   );
-  const export_default_as = ({ module: module2, as }) => `
+  const exportDefaultAs = ({ module: module2, as }) => `
 export { default as ${as} } from "${module2}"
 `;
-  const export_star_from = ({ module: module2 }) => `
+  const exportStarFrom2 = ({ module: module2 }) => `
 export * from "${module2}"
 `;
   let indexContent = recast11.print(typeIndex).code;
   for (const plugin2 of config2.plugins) {
-    if (!plugin2.index_file) {
+    if (!plugin2.indexFile) {
       continue;
     }
-    indexContent = plugin2.index_file({
+    indexContent = plugin2.indexFile({
       config: config2,
       content: indexContent,
-      export_default_as,
-      export_star_from,
-      plugin_root: config2.pluginDirectory(plugin2.name),
+      exportDefaultAs,
+      exportStarFrom: exportStarFrom2,
+      pluginRoot: config2.pluginDirectory(plugin2.name),
       typedef: true,
       documents: docs
     });
-    if (plugin2.include_runtime) {
-      indexContent += export_star_from({
+    if (plugin2.includeRuntime) {
+      indexContent += exportStarFrom2({
         module: "./" + path_exports.relative(config2.rootDir, config2.pluginRuntimeDirectory(plugin2.name))
       });
     }
@@ -57984,10 +57991,10 @@ var graphql17 = __toESM(require_graphql2(), 1);
 var recast12 = __toESM(require_main2(), 1);
 var AST12 = recast12.types.builders;
 async function imperativeCacheTypef(config2, docs) {
-  const returnType = (doc) => config2.plugins.find((plugin2) => plugin2.graphql_tag_return)?.graphql_tag_return?.({
+  const returnType = (doc) => config2.plugins.find((plugin2) => plugin2.graphqlTagReturn)?.graphqlTagReturn?.({
     config: config2,
     document: doc,
-    ensure_import({ identifier, module: module2 }) {
+    ensureImport({ identifier, module: module2 }) {
       ensureImports({
         config: config2,
         body,
@@ -58358,27 +58365,30 @@ async function persistOutputGenerator(config2, docs) {
     console.log("Can only write the queryMap to a json file");
     return;
   }
-  const queryMap = docs.reduce((acc, { document, generateArtifact }) => {
-    if (!generateArtifact) {
-      return acc;
-    }
-    let rawString = graphql18.print(
-      graphql18.visit(document, {
-        Directive(node) {
-          if (config2.isInternalDirective(node.name.value)) {
-            return null;
+  const queryMap = docs.reduce(
+    (acc, { document, generateArtifact }) => {
+      if (!generateArtifact) {
+        return acc;
+      }
+      let rawString = graphql18.print(
+        graphql18.visit(document, {
+          Directive(node) {
+            if (config2.isInternalDirective(node.name.value)) {
+              return null;
+            }
           }
-        }
-      })
-    );
-    const operations = document.definitions.filter(
-      ({ kind }) => kind === graphql18.Kind.OPERATION_DEFINITION
-    );
-    if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
-      acc[hashDocument({ config: config2, document: rawString })] = rawString;
-    }
-    return acc;
-  }, {});
+        })
+      );
+      const operations = document.definitions.filter(
+        ({ kind }) => kind === graphql18.Kind.OPERATION_DEFINITION
+      );
+      if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
+        acc[hashDocument({ config: config2, document: rawString })] = rawString;
+      }
+      return acc;
+    },
+    {}
+  );
   if (Object.keys(queryMap).length === 0)
     return;
   await fs_exports.writeFile(config2.persistedQueryPath, JSON.stringify(queryMap, null, 4));
@@ -58447,32 +58457,32 @@ async function writeIndexFile2(config2, docs) {
   const definitionsDir = relative2(config2.definitionsDirectory);
   const cjs = config2.module === "commonjs";
   let body = cjs ? cjsIndexFilePreamble : "";
-  const export_star_from = ({ module: module2 }) => "\n" + (cjs ? exportStarFrom(module2) : `export * from "${module2}"`) + "\n";
-  const export_default_as = ({ module: module2, as }) => "\n" + (cjs ? exportDefaultFrom(module2, as) : `export { default as ${as} } from "${module2}"`) + "\n";
+  const exportStar = ({ module: module2 }) => "\n" + (cjs ? exportStarFrom(module2) : `export * from "${module2}"`) + "\n";
+  const exportDefaultAs = ({ module: module2, as }) => "\n" + (cjs ? exportDefaultFrom(module2, as) : `export { default as ${as} } from "${module2}"`) + "\n";
   body += [
-    export_star_from({ module: "./" + path_exports.join(runtimeDir, "client") }),
-    export_star_from({ module: runtimeDir }),
-    export_star_from({ module: artifactDir }),
-    export_star_from({ module: definitionsDir })
+    exportStar({ module: "./" + path_exports.join(runtimeDir, "client") }),
+    exportStar({ module: runtimeDir }),
+    exportStar({ module: artifactDir }),
+    exportStar({ module: definitionsDir })
   ].join("");
   for (const plugin2 of config2.plugins) {
-    if (plugin2.index_file) {
-      body = plugin2.index_file({
+    if (plugin2.indexFile) {
+      body = plugin2.indexFile({
         config: config2,
         content: body,
-        export_default_as,
-        export_star_from,
-        plugin_root: config2.pluginDirectory(plugin2.name),
+        exportDefaultAs,
+        exportStarFrom: exportStar,
+        pluginRoot: config2.pluginDirectory(plugin2.name),
         typedef: false,
         documents: docs
       });
     }
-    if (plugin2.include_runtime) {
-      body += export_star_from({
+    if (plugin2.includeRuntime) {
+      body += exportStar({
         module: relative2(config2.pluginRuntimeDirectory(plugin2.name))
       });
     }
-    if (!plugin2.index_file) {
+    if (!plugin2.indexFile) {
       continue;
     }
   }
@@ -59520,10 +59530,10 @@ async function runPipeline2(config2, docs) {
     deleted: []
   };
   const generatePlugins = config2.plugins.filter((plugin2) => plugin2.generate);
-  const after_validate = config2.plugins.filter((plugin2) => plugin2.after_validate).map((plugin2) => plugin2.after_validate);
+  const afterValidate = config2.plugins.filter((plugin2) => plugin2.afterValidate).map((plugin2) => plugin2.afterValidate);
   const validate2 = config2.plugins.filter((plugin2) => plugin2.validate).map((plugin2) => plugin2.validate);
-  const before_validate = config2.plugins.filter((plugin2) => plugin2.before_validate).map((plugin2) => plugin2.before_validate);
-  const transform_before_generate = config2.plugins.filter((plugin2) => plugin2.transform_before_generate).map((plugin2) => plugin2.transform_before_generate);
+  const beforeValidate = config2.plugins.filter((plugin2) => plugin2.beforeValidate).map((plugin2) => plugin2.beforeValidate);
+  const beforeGenerate = config2.plugins.filter((plugin2) => plugin2.beforeGenerate).map((plugin2) => plugin2.beforeGenerate);
   const wrapHook = (hooks) => hooks.map(
     (fn) => (config3, docs2) => fn({
       config: config3,
@@ -59536,20 +59546,20 @@ async function runPipeline2(config2, docs) {
       config2,
       [
         graphqlExtensions,
-        ...wrapHook(before_validate),
+        ...wrapHook(beforeValidate),
         typeCheck,
         uniqueDocumentNames,
         noIDAlias,
         validatePlugins,
         ...wrapHook(validate2),
-        ...wrapHook(after_validate),
+        ...wrapHook(afterValidate),
         addID,
         addTypename,
         addListFragments,
         paginate,
         fragmentVariables,
         includeFragmentDefinitions,
-        ...wrapHook(transform_before_generate),
+        ...wrapHook(beforeGenerate),
         artifactGenerator(artifactStats),
         runtimeGenerator,
         writeIndexFile2,
@@ -59560,14 +59570,13 @@ async function runPipeline2(config2, docs) {
           (plugin2) => async (config3, docs2) => await plugin2.generate({
             config: config3,
             documents: docs2,
-            plugin_root: config3.pluginDirectory(plugin2.name)
+            pluginRoot: config3.pluginDirectory(plugin2.name)
           })
         )
       ],
       docs
     );
   } catch (e) {
-    console.log(e);
     error = e;
   }
   const unchanged = artifactStats.total.length - artifactStats.changed.length - artifactStats.new.length - artifactStats.deleted.length;
@@ -59617,9 +59626,9 @@ async function collectDocuments(config2) {
     ".ts": []
   };
   for (const plugin2 of config2.plugins) {
-    if (plugin2.extensions && plugin2.extract_documents) {
+    if (plugin2.extensions && plugin2.extractDocuments) {
       for (const extension of plugin2.extensions) {
-        extractors[extension] = [...extractors[extension] || [], plugin2.extract_documents];
+        extractors[extension] = [...extractors[extension] || [], plugin2.extractDocuments];
       }
     }
   }
@@ -59718,7 +59727,7 @@ async function processGraphQLDocument(config2, filepath, document) {
     kind,
     document: parsedDoc,
     filename: filepath,
-    originalDocument: parsedDoc,
+    originalParsed: parsedDoc,
     generateArtifact: true,
     generateStore: true,
     originalString: document,