houdini-svelte 1.2.32 → 1.2.34

package/build/plugin-cjs/index.js

@@ -78971,7 +78971,7 @@ function page_id(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {
@@ -144045,7 +144045,7 @@ function page_id2(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {

package/build/plugin-esm/index.js

@@ -78966,7 +78966,7 @@ function page_id(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {
@@ -144039,7 +144039,7 @@ function page_id2(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {

package/build/preprocess-cjs/index.js

@@ -81867,10 +81867,11 @@ var Config = class {
     );
     const include = [`src/**/*{${extensions.join(",")}}`];
     for (const plugin2 of this.plugins) {
-      if (!plugin2.includeRuntime) {
+      const runtimeDir = this.pluginRuntimeSource(plugin2);
+      if (!runtimeDir) {
         continue;
       }
-      const includePath = relative(this.projectRoot, this.pluginDirectory(plugin2.name));
+      const includePath = relative(this.projectRoot, runtimeDir);
       include.push(`${includePath}/**/*{${extensions.join(",")}}`);
     }
     return include;
@@ -81916,6 +81917,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(
@@ -83082,7 +83092,7 @@ function page_id(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {
@@ -175840,7 +175850,7 @@ function page_id2(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {

package/build/preprocess-esm/index.js

@@ -81864,10 +81864,11 @@ var Config = class {
     );
     const include = [`src/**/*{${extensions.join(",")}}`];
     for (const plugin2 of this.plugins) {
-      if (!plugin2.includeRuntime) {
+      const runtimeDir = this.pluginRuntimeSource(plugin2);
+      if (!runtimeDir) {
         continue;
       }
-      const includePath = relative(this.projectRoot, this.pluginDirectory(plugin2.name));
+      const includePath = relative(this.projectRoot, runtimeDir);
       include.push(`${includePath}/**/*{${extensions.join(",")}}`);
     }
     return include;
@@ -81913,6 +81914,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(
@@ -83079,7 +83089,7 @@ function page_id(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {
@@ -175836,7 +175846,7 @@ function page_id2(path3) {
   if (path3.endsWith("/") && path3.length > 1) {
     path3 = path3.substring(0, path3.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path3) {

package/build/test-cjs/index.js

@@ -78974,7 +78974,7 @@ function page_id(path32) {
   if (path32.endsWith("/") && path32.length > 1) {
     path32 = path32.substring(0, path32.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path32) {
@@ -139040,6 +139040,53 @@ async function generatePluginIndex({
     fs_exports2.writeFile(path_exports2.join(config2.pluginRootDirectory, "index.d.ts"), typedefs)
   ]);
 }
+async function generatePluginRuntimes({
+  config: config2,
+  docs
+}) {
+  if (houdini_mode2.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_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({
+              config: config2,
+              content,
+              importStatement,
+              exportDefaultStatement,
+              exportStarStatement
+            })
+          ])
+        )
+      );
+    })
+  );
+}
 async function injectConfig({
   config: config2,
   content,
@@ -139085,37 +139132,14 @@ ${exportStatement("config")}
       },
       [path_exports2.join(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
-    transformPluginRuntimes({ config: config2, docs }),
+    generatePluginRuntimes({
+      config: config2,
+      docs
+    }),
     generatePluginIndex({ config: config2, exportStatement: exportStar })
   ]);
   await generateGraphqlReturnTypes(config2, docs);
 }
-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}`;
@@ -200669,10 +200693,11 @@ var Config = class {
     );
     const include = [`src/**/*{${extensions.join(",")}}`];
     for (const plugin2 of this.plugins) {
-      if (!plugin2.includeRuntime) {
+      const runtimeDir = this.pluginRuntimeSource(plugin2);
+      if (!runtimeDir) {
         continue;
       }
-      const includePath = relative3(this.projectRoot, this.pluginDirectory(plugin2.name));
+      const includePath = relative3(this.projectRoot, runtimeDir);
       include.push(`${includePath}/**/*{${extensions.join(",")}}`);
     }
     return include;
@@ -200718,6 +200743,15 @@ var Config = class {
     );
     return headers;
   }
+  pluginRuntimeSource(plugin2) {
+    if (!plugin2.includeRuntime) {
+      return null;
+    }
+    return join4(
+      dirname3(plugin2.filepath),
+      typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime?.[this.module]
+    );
+  }
   async sourceFiles() {
     return [
       ...new Set(
@@ -266912,7 +266946,7 @@ function page_id2(path32) {
   if (path32.endsWith("/") && path32.length > 1) {
     path32 = path32.substring(0, path32.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path32) {

package/build/test-esm/index.js

@@ -78966,7 +78966,7 @@ function page_id(path32) {
   if (path32.endsWith("/") && path32.length > 1) {
     path32 = path32.substring(0, path32.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path32) {
@@ -139031,6 +139031,53 @@ async function generatePluginIndex({
     fs_exports2.writeFile(path_exports2.join(config2.pluginRootDirectory, "index.d.ts"), typedefs)
   ]);
 }
+async function generatePluginRuntimes({
+  config: config2,
+  docs
+}) {
+  if (houdini_mode2.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_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({
+              config: config2,
+              content,
+              importStatement,
+              exportDefaultStatement,
+              exportStarStatement
+            })
+          ])
+        )
+      );
+    })
+  );
+}
 async function injectConfig({
   config: config2,
   content,
@@ -139076,37 +139123,14 @@ ${exportStatement("config")}
       },
       [path_exports2.join(config2.runtimeSource, "client", "plugins", "injectedPlugins.js")]: (content) => injectPlugins({ config: config2, content, importStatement, exportStatement })
     }),
-    transformPluginRuntimes({ config: config2, docs }),
+    generatePluginRuntimes({
+      config: config2,
+      docs
+    }),
     generatePluginIndex({ config: config2, exportStatement: exportStar })
   ]);
   await generateGraphqlReturnTypes(config2, docs);
 }
-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}`;
@@ -200659,10 +200683,11 @@ var Config = class {
     );
     const include = [`src/**/*{${extensions.join(",")}}`];
     for (const plugin2 of this.plugins) {
-      if (!plugin2.includeRuntime) {
+      const runtimeDir = this.pluginRuntimeSource(plugin2);
+      if (!runtimeDir) {
         continue;
       }
-      const includePath = relative3(this.projectRoot, this.pluginDirectory(plugin2.name));
+      const includePath = relative3(this.projectRoot, runtimeDir);
       include.push(`${includePath}/**/*{${extensions.join(",")}}`);
     }
     return include;
@@ -200708,6 +200733,15 @@ var Config = class {
     );
     return headers;
   }
+  pluginRuntimeSource(plugin2) {
+    if (!plugin2.includeRuntime) {
+      return null;
+    }
+    return join4(
+      dirname3(plugin2.filepath),
+      typeof plugin2.includeRuntime === "string" ? plugin2.includeRuntime : plugin2.includeRuntime?.[this.module]
+    );
+  }
   async sourceFiles() {
     return [
       ...new Set(
@@ -266901,7 +266935,7 @@ function page_id2(path32) {
   if (path32.endsWith("/") && path32.length > 1) {
     path32 = path32.substring(0, path32.length - 1);
   }
-  const special_chars = ["/", "]", "[", "(", ")"];
+  const special_chars = ["/", "]", "[", "(", ")", "-"];
   const mask = "_";
   let copy = "";
   for (const char of path32) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "1.2.32",
+  "version": "1.2.34",
   "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.32"
+    "houdini": "^1.2.34"
   },
   "files": [
     "build"