houdini 1.2.31 → 1.2.33

package/build/vite-cjs/index.js

@@ -69153,7 +69153,16 @@ var Config = class {
     const extensions = [".graphql", ".gql", ".ts", ".js"].concat(
       this.plugins.flatMap((plugin2) => plugin2.extensions ?? [])
     );
-    return [`src/**/*{${extensions.join(",")}}`];
+    const include = [`src/**/*{${extensions.join(",")}}`];
+    for (const plugin2 of this.plugins) {
+      const runtimeDir = this.pluginRuntimeSource(plugin2);
+      if (!runtimeDir) {
+        continue;
+      }
+      const includePath = relative(this.projectRoot, runtimeDir);
+      include.push(`${includePath}/**/*{${extensions.join(",")}}`);
+    }
+    return include;
   }
   pluginConfig(name) {
     return this.configFile.plugins?.[name] ?? {};
@@ -69196,6 +69205,15 @@ var Config = class {
     );
     return headers;
   }
+  pluginRuntimeSource(plugin2) {
+    if (!plugin2.includeRuntime) {
+      return null;
+    }
+    return join2(
+      dirname(plugin2.filepath),
+      typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime?.[this.module]
+    );
+  }
   async sourceFiles() {
     return [
       ...new Set(
@@ -73890,6 +73908,55 @@ async function generatePluginIndex({
   ]);
 }
 
+// src/codegen/generators/runtime/pluginRuntime.ts
+async function generatePluginRuntimes({
+  config: config2,
+  docs
+}) {
+  if (houdini_mode.is_testing) {
+    return;
+  }
+  const { importStatement, exportDefaultStatement, exportStarStatement } = moduleStatments(config2);
+  await Promise.all(
+    config2.plugins.filter((plugin2) => plugin2.includeRuntime).map(async (plugin2) => {
+      const runtime_path = config2.pluginRuntimeSource(plugin2);
+      if (!runtime_path) {
+        return;
+      }
+      try {
+        await fs_exports.stat(runtime_path);
+      } catch {
+        throw new HoudiniError({
+          message: "Cannot find runtime to generate for " + plugin2.name,
+          description: "Maybe it was bundled?"
+        });
+      }
+      const pluginDir = config2.pluginRuntimeDirectory(plugin2.name);
+      let transformMap = plugin2.transformRuntime ?? {};
+      if (transformMap && typeof transformMap === "function") {
+        transformMap = transformMap(docs, { config: config2 });
+      }
+      await fs_exports.mkdirp(pluginDir);
+      await fs_exports.recursiveCopy(
+        runtime_path,
+        pluginDir,
+        Object.fromEntries(
+          Object.entries(transformMap).map(([key, value]) => [
+            path_exports.join(runtime_path, key),
+            (content) => value({
+              config: config2,
+              content,
+              importStatement,
+              exportDefaultStatement,
+              exportStarStatement
+            })
+          ])
+        )
+      );
+    })
+  );
+}
+
 // src/codegen/generators/runtime/runtimeConfig.ts
 async function injectConfig({
   config: config2,
@@ -73916,9 +73983,11 @@ ${exportStatement("plugins")}
 
 // src/codegen/generators/runtime/index.ts
 async function runtimeGenerator(config2, docs) {
-  const importStatement = config2.module === "commonjs" ? importDefaultFrom : (where, as) => `import ${as} from '${where}'`;
-  const exportStatement = config2.module === "commonjs" ? exportDefault : (as) => `export default ${as}`;
-  const exportStar = config2.module === "commonjs" ? exportStarFrom : (where) => `export * from '${where}'`;
+  const {
+    importStatement,
+    exportDefaultStatement: exportStatement,
+    exportStarStatement: exportStar
+  } = moduleStatments(config2);
   await Promise.all([
     fs_exports.recursiveCopy(config2.runtimeSource, config2.runtimeDirectory, {
       [path_exports.join(config2.runtimeSource, "lib", "constants.js")]: (content) => {
@@ -73936,65 +74005,23 @@ ${exportStatement("config")}
       },
       [path_exports.join(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
-    ...config2.plugins.filter((plugin2) => plugin2.includeRuntime).map(
-      (plugin2) => generatePluginRuntime({
-        config: config2,
-        docs,
-        plugin: plugin2,
-        importStatement,
-        exportDefaultStatement: exportStatement,
-        exportStarStatement: exportStar
-      })
-    ),
+    generatePluginRuntimes({
+      config: config2,
+      docs
+    }),
     generatePluginIndex({ config: config2, exportStatement: exportStar })
   ]);
   await generateGraphqlReturnTypes(config2, docs);
 }
-async function generatePluginRuntime({
-  config: config2,
-  docs,
-  plugin: plugin2,
-  importStatement,
-  exportDefaultStatement,
-  exportStarStatement
-}) {
-  if (houdini_mode.is_testing || !plugin2.includeRuntime) {
-    return;
-  }
-  const runtime_path = path_exports.join(
-    path_exports.dirname(plugin2.filepath),
-    typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime[config2.module]
-  );
-  try {
-    await fs_exports.stat(runtime_path);
-  } catch {
-    throw new HoudiniError({
-      message: "Cannot find runtime to generate for " + plugin2.name,
-      description: "Maybe it was bundled?"
-    });
-  }
-  const pluginDir = config2.pluginRuntimeDirectory(plugin2.name);
-  let transformMap = plugin2.transformRuntime ?? {};
-  if (transformMap && typeof transformMap === "function") {
-    transformMap = transformMap(docs, { config: config2 });
-  }
-  await fs_exports.mkdirp(pluginDir);
-  await fs_exports.recursiveCopy(
-    runtime_path,
-    pluginDir,
-    Object.fromEntries(
-      Object.entries(transformMap).map(([key, value]) => [
-        path_exports.join(runtime_path, key),
-        (content) => value({
-          config: config2,
-          content,
-          importStatement,
-          exportDefaultStatement,
-          exportStarStatement
-        })
-      ])
-    )
-  );
+function moduleStatments(config2) {
+  const importStatement = config2.module === "commonjs" ? importDefaultFrom : (where, as) => `import ${as} from '${where}'`;
+  const exportDefaultStatement = config2.module === "commonjs" ? exportDefault : (as) => `export default ${as}`;
+  const exportStarStatement = config2.module === "commonjs" ? exportStarFrom : (where) => `export * from '${where}'`;
+  return {
+    importStatement,
+    exportDefaultStatement,
+    exportStarStatement
+  };
 }
 
 // src/codegen/generators/typescript/documentTypes.ts
@@ -79208,6 +79235,9 @@ function find_exported_fn(body, name) {
       if (init.type === "TSSatisfiesExpression") {
         init = init.expression;
       }
+      if (init.type === "CallExpression" && init.arguments[0] && (init.arguments[0].type === "FunctionExpression" || init.arguments[0].type === "ArrowFunctionExpression")) {
+        init = init.arguments[0];
+      }
       if (init.type === "FunctionExpression" || init.type === "ArrowFunctionExpression") {
         return init;
       }

package/build/vite-esm/index.js

@@ -69146,7 +69146,16 @@ var Config = class {
     const extensions = [".graphql", ".gql", ".ts", ".js"].concat(
       this.plugins.flatMap((plugin2) => plugin2.extensions ?? [])
     );
-    return [`src/**/*{${extensions.join(",")}}`];
+    const include = [`src/**/*{${extensions.join(",")}}`];
+    for (const plugin2 of this.plugins) {
+      const runtimeDir = this.pluginRuntimeSource(plugin2);
+      if (!runtimeDir) {
+        continue;
+      }
+      const includePath = relative(this.projectRoot, runtimeDir);
+      include.push(`${includePath}/**/*{${extensions.join(",")}}`);
+    }
+    return include;
   }
   pluginConfig(name) {
     return this.configFile.plugins?.[name] ?? {};
@@ -69189,6 +69198,15 @@ var Config = class {
     );
     return headers;
   }
+  pluginRuntimeSource(plugin2) {
+    if (!plugin2.includeRuntime) {
+      return null;
+    }
+    return join2(
+      dirname(plugin2.filepath),
+      typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime?.[this.module]
+    );
+  }
   async sourceFiles() {
     return [
       ...new Set(
@@ -73883,6 +73901,55 @@ async function generatePluginIndex({
   ]);
 }
 
+// src/codegen/generators/runtime/pluginRuntime.ts
+async function generatePluginRuntimes({
+  config: config2,
+  docs
+}) {
+  if (houdini_mode.is_testing) {
+    return;
+  }
+  const { importStatement, exportDefaultStatement, exportStarStatement } = moduleStatments(config2);
+  await Promise.all(
+    config2.plugins.filter((plugin2) => plugin2.includeRuntime).map(async (plugin2) => {
+      const runtime_path = config2.pluginRuntimeSource(plugin2);
+      if (!runtime_path) {
+        return;
+      }
+      try {
+        await fs_exports.stat(runtime_path);
+      } catch {
+        throw new HoudiniError({
+          message: "Cannot find runtime to generate for " + plugin2.name,
+          description: "Maybe it was bundled?"
+        });
+      }
+      const pluginDir = config2.pluginRuntimeDirectory(plugin2.name);
+      let transformMap = plugin2.transformRuntime ?? {};
+      if (transformMap && typeof transformMap === "function") {
+        transformMap = transformMap(docs, { config: config2 });
+      }
+      await fs_exports.mkdirp(pluginDir);
+      await fs_exports.recursiveCopy(
+        runtime_path,
+        pluginDir,
+        Object.fromEntries(
+          Object.entries(transformMap).map(([key, value]) => [
+            path_exports.join(runtime_path, key),
+            (content) => value({
+              config: config2,
+              content,
+              importStatement,
+              exportDefaultStatement,
+              exportStarStatement
+            })
+          ])
+        )
+      );
+    })
+  );
+}
+
 // src/codegen/generators/runtime/runtimeConfig.ts
 async function injectConfig({
   config: config2,
@@ -73909,9 +73976,11 @@ ${exportStatement("plugins")}
 
 // src/codegen/generators/runtime/index.ts
 async function runtimeGenerator(config2, docs) {
-  const importStatement = config2.module === "commonjs" ? importDefaultFrom : (where, as) => `import ${as} from '${where}'`;
-  const exportStatement = config2.module === "commonjs" ? exportDefault : (as) => `export default ${as}`;
-  const exportStar = config2.module === "commonjs" ? exportStarFrom : (where) => `export * from '${where}'`;
+  const {
+    importStatement,
+    exportDefaultStatement: exportStatement,
+    exportStarStatement: exportStar
+  } = moduleStatments(config2);
   await Promise.all([
     fs_exports.recursiveCopy(config2.runtimeSource, config2.runtimeDirectory, {
       [path_exports.join(config2.runtimeSource, "lib", "constants.js")]: (content) => {
@@ -73929,65 +73998,23 @@ ${exportStatement("config")}
       },
       [path_exports.join(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
-    ...config2.plugins.filter((plugin2) => plugin2.includeRuntime).map(
-      (plugin2) => generatePluginRuntime({
-        config: config2,
-        docs,
-        plugin: plugin2,
-        importStatement,
-        exportDefaultStatement: exportStatement,
-        exportStarStatement: exportStar
-      })
-    ),
+    generatePluginRuntimes({
+      config: config2,
+      docs
+    }),
     generatePluginIndex({ config: config2, exportStatement: exportStar })
   ]);
   await generateGraphqlReturnTypes(config2, docs);
 }
-async function generatePluginRuntime({
-  config: config2,
-  docs,
-  plugin: plugin2,
-  importStatement,
-  exportDefaultStatement,
-  exportStarStatement
-}) {
-  if (houdini_mode.is_testing || !plugin2.includeRuntime) {
-    return;
-  }
-  const runtime_path = path_exports.join(
-    path_exports.dirname(plugin2.filepath),
-    typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime[config2.module]
-  );
-  try {
-    await fs_exports.stat(runtime_path);
-  } catch {
-    throw new HoudiniError({
-      message: "Cannot find runtime to generate for " + plugin2.name,
-      description: "Maybe it was bundled?"
-    });
-  }
-  const pluginDir = config2.pluginRuntimeDirectory(plugin2.name);
-  let transformMap = plugin2.transformRuntime ?? {};
-  if (transformMap && typeof transformMap === "function") {
-    transformMap = transformMap(docs, { config: config2 });
-  }
-  await fs_exports.mkdirp(pluginDir);
-  await fs_exports.recursiveCopy(
-    runtime_path,
-    pluginDir,
-    Object.fromEntries(
-      Object.entries(transformMap).map(([key, value]) => [
-        path_exports.join(runtime_path, key),
-        (content) => value({
-          config: config2,
-          content,
-          importStatement,
-          exportDefaultStatement,
-          exportStarStatement
-        })
-      ])
-    )
-  );
+function moduleStatments(config2) {
+  const importStatement = config2.module === "commonjs" ? importDefaultFrom : (where, as) => `import ${as} from '${where}'`;
+  const exportDefaultStatement = config2.module === "commonjs" ? exportDefault : (as) => `export default ${as}`;
+  const exportStarStatement = config2.module === "commonjs" ? exportStarFrom : (where) => `export * from '${where}'`;
+  return {
+    importStatement,
+    exportDefaultStatement,
+    exportStarStatement
+  };
 }
 
 // src/codegen/generators/typescript/documentTypes.ts
@@ -79201,6 +79228,9 @@ function find_exported_fn(body, name) {
       if (init.type === "TSSatisfiesExpression") {
         init = init.expression;
       }
+      if (init.type === "CallExpression" && init.arguments[0] && (init.arguments[0].type === "FunctionExpression" || init.arguments[0].type === "ArrowFunctionExpression")) {
+        init = init.arguments[0];
+      }
       if (init.type === "FunctionExpression" || init.type === "ArrowFunctionExpression") {
         return init;
       }

package/package.json

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