wesl-plugin 0.6.0-pre7 → 0.6.0-pre8

package/dist/{chunk-MAE4GAHG.js → chunk-76TWXIYH.js}

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "./chunk-ZDLLLCLM.js";
+} from "./chunk-GFPPDTJP.js";
 
 // src/plugins/vite.ts
 import { createVitePlugin } from "unplugin";

package/dist/{chunk-ZDLLLCLM.js → chunk-GFPPDTJP.js}

@@ -212,9 +212,6 @@ var require_brace_expansion = __commonJS({
   }
 });
 
-// src/weslPlugin.ts
-import chokidar from "chokidar";
-
 // ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
 
@@ -6593,28 +6590,29 @@ import fs from "node:fs/promises";
 import path2 from "node:path";
 import toml from "toml";
 import { createUnplugin } from "unplugin";
-import {
-  filterMap,
-  parsedRegistry,
-  parseIntoRegistry
-} from "wesl";
+import { parsedRegistry, parseIntoRegistry } from "wesl";
 function weslPlugin(options = {}, meta) {
   const cache = {};
   const context = { cache, meta, options };
   return {
     name: "wesl-plugin",
     resolveId: buildResolver(options),
-    load: buildLoader(context)
+    load: buildLoader(context),
+    watchChange(id, change) {
+      if (id.endsWith("wesl.toml")) {
+        cache.weslToml = void 0;
+        cache.registry = void 0;
+      } else {
+        cache.registry = void 0;
+      }
+    }
   };
 }
 function pluginNames(options) {
-  const { extensions = [] } = options;
-  const suffixes = filterMap(extensions, (p) => p.extensionName);
-  return suffixes;
+  return options.extensions?.map((p) => p.extensionName) ?? [];
 }
 function pluginsByName(options) {
-  const { extensions = [] } = options;
-  const entries = filterMap(extensions, (p) => [p.extensionName, p]);
+  const entries = options.extensions?.map((p) => [p.extensionName, p]) ?? [];
   return Object.fromEntries(entries);
 }
 var pluginSuffix = /(?<baseId>.*\.w[eg]sl)\?(?<pluginName>[\w_-]+)/;
@@ -6622,9 +6620,6 @@ function buildResolver(options) {
   const suffixes = pluginNames(options);
   return resolver;
   function resolver(id) {
-    if (id === options.weslToml || id === "wesl.toml") {
-      return id;
-    }
     const matched = pluginSuffixMatch(id, suffixes);
     return matched ? id : null;
   }
@@ -6659,13 +6654,13 @@ function buildLoader(context) {
   }
 }
 async function getWeslToml(context, unpluginCtx) {
-  const { cache, options } = context;
+  const { cache } = context;
   if (cache.weslToml) return cache.weslToml;
-  const { weslToml: tomlFile = "wesl.toml" } = options;
+  const tomlFile = context.options.weslToml ?? "wesl.toml";
+  unpluginCtx.addWatchFile(tomlFile);
   let parsedToml;
   try {
     const tomlString = await fs.readFile(tomlFile, "utf-8");
-    unpluginCtx.addWatchFile(tomlFile);
     parsedToml = toml.parse(tomlString);
   } catch {
     console.log(`using defaults: no wesl.toml found at ${tomlFile}`);
@@ -6681,12 +6676,6 @@ async function getWeslToml(context, unpluginCtx) {
     ),
     toml: parsedToml
   };
-  if (context.meta.watchMode) {
-    chokidar.watch(tomlFile).on("change", () => {
-      cache.registry = void 0;
-      cache.weslToml = void 0;
-    });
-  }
   return cache.weslToml;
 }
 async function getRegistry(context, unpluginCtx) {
@@ -6700,14 +6689,9 @@ async function getRegistry(context, unpluginCtx) {
   const fullPaths = Object.keys(loaded).map(
     (p) => path2.resolve(resolvedWeslRoot, p)
   );
-  if (context.meta.watchMode) {
-    fullPaths.forEach((f) => {
-      chokidar.watch(f).on("change", () => {
-        console.log("resetting cache", f);
-        cache.registry = void 0;
-      });
-    });
-  }
+  fullPaths.forEach((f) => {
+    unpluginCtx.addWatchFile(f);
+  });
   cache.registry = registry;
   return registry;
 }

package/dist/{chunk-NFFZEA4R.js → chunk-IDITK737.js}

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "./chunk-ZDLLLCLM.js";
+} from "./chunk-GFPPDTJP.js";
 
 // src/plugins/webpack.ts
 import { createWebpackPlugin } from "unplugin";

package/dist/plugins/astro.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin_default
-} from "../chunk-ZDLLLCLM.js";
+} from "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/astro.ts

package/dist/plugins/esbuild.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-ZDLLLCLM.js";
+} from "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/esbuild.ts

package/dist/plugins/farm.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-ZDLLLCLM.js";
+} from "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/farm.ts

package/dist/plugins/nuxt.js

@@ -1,10 +1,10 @@
 import {
   webpack_default
-} from "../chunk-NFFZEA4R.js";
+} from "../chunk-IDITK737.js";
 import {
   vite_default
-} from "../chunk-MAE4GAHG.js";
-import "../chunk-ZDLLLCLM.js";
+} from "../chunk-76TWXIYH.js";
+import "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/nuxt.ts

package/dist/plugins/rollup.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-ZDLLLCLM.js";
+} from "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/rollup.ts

package/dist/plugins/rspack.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-ZDLLLCLM.js";
+} from "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/rspack.ts

package/dist/plugins/vite.js

@@ -1,7 +1,7 @@
 import {
   vite_default
-} from "../chunk-MAE4GAHG.js";
-import "../chunk-ZDLLLCLM.js";
+} from "../chunk-76TWXIYH.js";
+import "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 export {
   vite_default as default

package/dist/plugins/webpack.js

@@ -1,7 +1,7 @@
 import {
   webpack_default
-} from "../chunk-NFFZEA4R.js";
-import "../chunk-ZDLLLCLM.js";
+} from "../chunk-IDITK737.js";
+import "../chunk-GFPPDTJP.js";
 import "../chunk-JSBRDJBE.js";
 export {
   webpack_default as default

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "wesl-plugin",
   "type": "module",
-  "version": "0.6.0-pre7",
+  "version": "0.6.0-pre8",
   "dependencies": {
-    "chokidar": "^4.0.3",
     "toml": "^3.0.0",
     "unplugin": "^2.1.2",
-    "wesl": "0.6.0-pre7"
+    "wesl": "0.6.0-pre8"
   },
   "devDependencies": {
     "@nuxt/kit": "^3.15.2",

package/src/weslPlugin.ts

@@ -1,4 +1,3 @@
-import chokidar from "chokidar";
 import { glob } from "glob";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -13,12 +12,7 @@ import type {
     UnpluginOptions
 } from "unplugin";
 import { createUnplugin } from "unplugin";
-import {
-    filterMap,
-    parsedRegistry,
-    ParsedRegistry,
-    parseIntoRegistry
-} from "wesl";
+import { parsedRegistry, ParsedRegistry, parseIntoRegistry } from "wesl";
 import { PluginExtension, PluginExtensionApi } from "./PluginExtension.js";
 import type { WeslPluginOptions } from "./weslPluginOptions.js";
 
@@ -102,20 +96,26 @@ export function weslPlugin(
     name: "wesl-plugin",
     resolveId: buildResolver(options),
     load: buildLoader(context),
+    watchChange(id, change) {
+      if (id.endsWith("wesl.toml")) {
+        // The cache is shared for multiple imports
+        cache.weslToml = undefined;
+        cache.registry = undefined;
+      } else {
+        cache.registry = undefined;
+      }
+    },
   };
 }
 
 function pluginNames(options: WeslPluginOptions): string[] {
-  const { extensions = [] } = options;
-  const suffixes = filterMap(extensions, p => p.extensionName);
-  return suffixes;
+  return options.extensions?.map(p => p.extensionName) ?? [];
 }
 
 function pluginsByName(
   options: WeslPluginOptions,
 ): Record<string, PluginExtension> {
-  const { extensions = [] } = options;
-  const entries = filterMap(extensions, p => [p.extensionName, p]);
+  const entries = options.extensions?.map(p => [p.extensionName, p]) ?? [];
   return Object.fromEntries(entries);
 }
 
@@ -131,9 +131,6 @@ function buildResolver(options: WeslPluginOptions): Resolver {
     this: UnpluginBuildContext & UnpluginContext,
     id: string,
   ): string | null {
-    if (id === options.weslToml || id === "wesl.toml") {
-      return id;
-    }
     const matched = pluginSuffixMatch(id, suffixes);
     return matched ? id : null;
   }
@@ -190,14 +187,15 @@ async function getWeslToml(
   context: PluginContext,
   unpluginCtx: UnpluginBuildContext & UnpluginContext,
 ): Promise<WeslTomlInfo> {
-  const { cache, options } = context;
+  const { cache } = context;
   if (cache.weslToml) return cache.weslToml;
-  const { weslToml: tomlFile = "wesl.toml" } = options;
+
+  const tomlFile = context.options.weslToml ?? "wesl.toml";
+  unpluginCtx.addWatchFile(tomlFile); // The cache gets cleared by the watchChange hook
 
   let parsedToml: WeslToml;
   try {
     const tomlString = await fs.readFile(tomlFile, "utf-8");
-    unpluginCtx.addWatchFile(tomlFile);
     parsedToml = toml.parse(tomlString) as WeslToml;
   } catch {
     console.log(`using defaults: no wesl.toml found at ${tomlFile}`);
@@ -213,15 +211,6 @@ async function getWeslToml(
     ),
     toml: parsedToml,
   };
-
-  if (context.meta.watchMode) {
-    // clear cache on wesl.toml change
-    chokidar.watch(tomlFile).on("change", () => {
-      cache.registry = undefined;
-      cache.weslToml = undefined;
-    });
-  }
-
   return cache.weslToml;
 }
 
@@ -247,14 +236,9 @@ async function getRegistry(
   );
 
   // trigger clearing cache on shader file change
-  if (context.meta.watchMode) {
-    fullPaths.forEach(f => {
-      chokidar.watch(f).on("change", () => {
-        console.log("resetting cache", f);
-        cache.registry = undefined;
-      });
-    });
-  }
+  fullPaths.forEach(f => {
+    unpluginCtx.addWatchFile(f);
+  });
 
   cache.registry = registry;
   return registry;