houdini-svelte 1.2.30 → 1.2.32

package/build/plugin-cjs/index.js

@@ -144471,6 +144471,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/plugin-esm/index.js

@@ -144465,6 +144465,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/preprocess-cjs/index.js

@@ -81865,7 +81865,15 @@ 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) {
+      if (!plugin2.includeRuntime) {
+        continue;
+      }
+      const includePath = relative(this.projectRoot, this.pluginDirectory(plugin2.name));
+      include.push(`${includePath}/**/*{${extensions.join(",")}}`);
+    }
+    return include;
   }
   pluginConfig(name) {
     return this.configFile.plugins?.[name] ?? {};
@@ -176258,6 +176266,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/preprocess-esm/index.js

@@ -81862,7 +81862,15 @@ 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) {
+      if (!plugin2.includeRuntime) {
+        continue;
+      }
+      const includePath = relative(this.projectRoot, this.pluginDirectory(plugin2.name));
+      include.push(`${includePath}/**/*{${extensions.join(",")}}`);
+    }
+    return include;
   }
   pluginConfig(name) {
     return this.configFile.plugins?.[name] ?? {};
@@ -176254,6 +176262,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/test-cjs/index.js

@@ -139063,9 +139063,11 @@ ${exportStatement("plugins")}
 				` : content;
 }
 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_exports2.recursiveCopy(config2.runtimeSource, config2.runtimeDirectory, {
       [path_exports2.join(config2.runtimeSource, "lib", "constants.js")]: (content) => {
@@ -139083,66 +139085,47 @@ ${exportStatement("config")}
       },
       [path_exports2.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
-      })
-    ),
+    transformPluginRuntimes({ 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_mode2.is_testing || !plugin2.includeRuntime) {
-    return;
-  }
-  const runtime_path = path_exports2.join(
-    path_exports2.dirname(plugin2.filepath),
-    typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime[config2.module]
-  );
-  try {
-    await fs_exports2.stat(runtime_path);
-  } catch {
-    throw new HoudiniError2({
-      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_exports2.mkdirp(pluginDir);
-  await fs_exports2.recursiveCopy(
-    runtime_path,
-    pluginDir,
-    Object.fromEntries(
-      Object.entries(transformMap).map(([key, value2]) => [
-        path_exports2.join(runtime_path, key),
-        (content) => value2({
+async function transformPluginRuntimes({ config: config2, docs }) {
+  const { importStatement, exportDefaultStatement, exportStarStatement } = moduleStatments(config2);
+  await Promise.all(
+    config2.plugins.filter((plugin2) => plugin2.includeRuntime).map(async (plugin2) => {
+      let transformMap = plugin2.transformRuntime ?? {};
+      if (transformMap && typeof transformMap === "function") {
+        transformMap = transformMap(docs, { config: config2 });
+      }
+      for (const [target, transform] of Object.entries(transformMap)) {
+        const targetPath = path_exports2.join(config2.pluginRuntimeDirectory(plugin2.name), target);
+        const content = await fs_exports2.readFile(targetPath);
+        if (!content) {
+          return;
+        }
+        const transformed = transform({
           config: config2,
           content,
           importStatement,
           exportDefaultStatement,
           exportStarStatement
-        })
-      ])
-    )
+        });
+        await fs_exports2.writeFile(targetPath, transformed);
+      }
+    })
   );
 }
+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
+  };
+}
 var recast12 = __toESM3(require_main22(), 1);
 var recast9 = __toESM3(require_main22(), 1);
 var recast8 = __toESM3(require_main22(), 1);
@@ -200684,7 +200667,15 @@ 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) {
+      if (!plugin2.includeRuntime) {
+        continue;
+      }
+      const includePath = relative3(this.projectRoot, this.pluginDirectory(plugin2.name));
+      include.push(`${includePath}/**/*{${extensions.join(",")}}`);
+    }
+    return include;
   }
   pluginConfig(name) {
     return this.configFile.plugins?.[name] ?? {};
@@ -267347,6 +267338,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/test-esm/index.js

@@ -139054,9 +139054,11 @@ ${exportStatement("plugins")}
 				` : content;
 }
 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_exports2.recursiveCopy(config2.runtimeSource, config2.runtimeDirectory, {
       [path_exports2.join(config2.runtimeSource, "lib", "constants.js")]: (content) => {
@@ -139074,66 +139076,47 @@ ${exportStatement("config")}
       },
       [path_exports2.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
-      })
-    ),
+    transformPluginRuntimes({ 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_mode2.is_testing || !plugin2.includeRuntime) {
-    return;
-  }
-  const runtime_path = path_exports2.join(
-    path_exports2.dirname(plugin2.filepath),
-    typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime[config2.module]
-  );
-  try {
-    await fs_exports2.stat(runtime_path);
-  } catch {
-    throw new HoudiniError2({
-      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_exports2.mkdirp(pluginDir);
-  await fs_exports2.recursiveCopy(
-    runtime_path,
-    pluginDir,
-    Object.fromEntries(
-      Object.entries(transformMap).map(([key, value2]) => [
-        path_exports2.join(runtime_path, key),
-        (content) => value2({
+async function transformPluginRuntimes({ config: config2, docs }) {
+  const { importStatement, exportDefaultStatement, exportStarStatement } = moduleStatments(config2);
+  await Promise.all(
+    config2.plugins.filter((plugin2) => plugin2.includeRuntime).map(async (plugin2) => {
+      let transformMap = plugin2.transformRuntime ?? {};
+      if (transformMap && typeof transformMap === "function") {
+        transformMap = transformMap(docs, { config: config2 });
+      }
+      for (const [target, transform] of Object.entries(transformMap)) {
+        const targetPath = path_exports2.join(config2.pluginRuntimeDirectory(plugin2.name), target);
+        const content = await fs_exports2.readFile(targetPath);
+        if (!content) {
+          return;
+        }
+        const transformed = transform({
           config: config2,
           content,
           importStatement,
           exportDefaultStatement,
           exportStarStatement
-        })
-      ])
-    )
+        });
+        await fs_exports2.writeFile(targetPath, transformed);
+      }
+    })
   );
 }
+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
+  };
+}
 var recast12 = __toESM3(require_main22(), 1);
 var recast9 = __toESM3(require_main22(), 1);
 var recast8 = __toESM3(require_main22(), 1);
@@ -200674,7 +200657,15 @@ 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) {
+      if (!plugin2.includeRuntime) {
+        continue;
+      }
+      const includePath = relative3(this.projectRoot, this.pluginDirectory(plugin2.name));
+      include.push(`${includePath}/**/*{${extensions.join(",")}}`);
+    }
+    return include;
   }
   pluginConfig(name) {
     return this.configFile.plugins?.[name] ?? {};
@@ -267336,6 +267327,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-svelte",
-  "version": "1.2.30",
+  "version": "1.2.32",
   "description": "The svelte plugin for houdini",
   "keywords": [
     "typescript",
@@ -32,7 +32,7 @@
     "rollup": "^3.7.4",
     "svelte": "^3.57.0",
     "vite": "^4.1.1",
-    "houdini": "^1.2.30"
+    "houdini": "^1.2.32"
   },
   "files": [
     "build"