wesl-plugin 0.6.47 → 0.6.50

package/README.md

@@ -1,109 +1,135 @@
-# **WESL Plugin**
+# WESL Plugin
 
 [![NPM Version](https://img.shields.io/npm/v/wesl-plugin)](https://www.npmjs.com/package/wesl-plugin)
 [![Static Badge](https://img.shields.io/badge/Read%20the%20-Docs-blue)](https://wesl-lang.dev/)
 
-> The wesl-plugin handles `.wesl` and `.wgsl` files
-in JavaScript bundlers to make using webgpu shaders more convenient.
+Bundler plugin for importing `.wesl` and `.wgsl` shader files in JavaScript/TypeScript.
 
-Plugin features are accessed from JavaScript and TypeScript with `import` statements:
+## Install
 
-```ts
-import linkConfig from "./shaders/app.wesl?link";
 ```
-
-```ts
-import linkConfig from "./shaders/app.wesl?static";
+npm install wesl wesl-plugin
 ```
 
-Each plugin ?feature is enabled by its own wesl-plugin [extension](#extensions).
+## Quick Start
 
-## Install
+### Build-time linking (?static)
+
+Link shaders at build time for the smallest application bundle size. 
+
+```ts
+// vite.config.ts
+import { staticBuildExtension } from "wesl-plugin";
+import viteWesl from "wesl-plugin/vite";
 
+export default {
+  plugins: [viteWesl({ extensions: [staticBuildExtension] })]
+};
 ```
-npm install wesl
-npm install wesl-plugin
+
+```ts
+// app.ts
+import wgsl from "./shaders/main.wesl?static";
+
+const module = device.createShaderModule({ code: wgsl });
 ```
 
-### Vite Configuration
+### Runtime linking (?link)
 
-Add the wesl-plugin along with any selected extensions to `vite.config.ts`:
+Link shaders at runtime when you need dynamic conditions or constants:
 
 ```ts
-import { UserConfig } from "vite";
-import weslPlugin from "wesl-plugin/vite";
+// vite.config.ts
 import { linkBuildExtension } from "wesl-plugin";
+import viteWesl from "wesl-plugin/vite";
 
-const config: UserConfig = {
-  plugins: [ weslPlugin({ extensions: [linkBuildExtension] }) ],
+export default {
+  plugins: [viteWesl({ extensions: [linkBuildExtension] })]
 };
+```
+
+```ts
+// app.ts
+import { link } from "wesl";
+import shaderConfig from "./shaders/main.wesl?link";
+
+const linked = await link({
+  ...shaderConfig,
+  conditions: { MOBILE: isMobileGPU },
+  constants: { num_lights: 4 }
+});
 
-export default config;
+const module = linked.createShaderModule(device, {});
 ```
 
-In your JavaScript or TypeScript program you can then import
-wesl or wgsl shaders with a `?link` suffix and link them into WGSL at runtime.
+## Other Bundlers
 
 ```ts
-import linkConfig from "./shaders/app.wesl?link";
-
-function makeShaders() {
-  const vertShader = await link({
-    ...linkConfig, 
-    rootModuleName: "myVerts.wesl",
-    conditions: {mobileGPU: true}
-  });
-  const computeShader = await link({
-    ...linkConfig, 
-    rootModuleName: "myCompute.wesl",
-    constants: {num_lights: 1}
-  });
-}
-
+import viteWesl from "wesl-plugin/vite";
+import esbuildWesl from "wesl-plugin/esbuild";
+import rollupWesl from "wesl-plugin/rollup";
+import webpackWesl from "wesl-plugin/webpack";
+// Also: nuxt, farm, rspack, astro
 ```
 
-### Other Bundlers
+## Extensions
+
+Extensions enable different import suffixes:
+
+| Extension | Suffix | Output | Use Case |
+|-----------|--------|--------|----------|
+| `staticBuildExtension` | `?static` | WGSL string | Build-time linking, simplest |
+| `linkBuildExtension` | `?link` | LinkParams object | Runtime conditions/constants |
 
-The wesl-plugin is available for many popular bundlers:
+### Combining Extensions
 
-``` ts
-import weslPlugin from "wesl-plugin/esbuild"; 
-import weslPlugin from "wesl-plugin/rollup"; 
-import weslPlugin from "wesl-plugin/webpack"; 
-import weslPlugin from "wesl-plugin/nuxt"; 
-import weslPlugin from "wesl-plugin/farm"; 
-import weslPlugin from "wesl-plugin/rpack"; 
-// etc.
+```ts
+import { staticBuildExtension, linkBuildExtension } from "wesl-plugin";
+import viteWesl from "wesl-plugin/vite";
+
+export default {
+  plugins: [viteWesl({
+    extensions: [staticBuildExtension, linkBuildExtension]
+  })]
+};
 ```
 
-## Extensions
+### Conditions in Import Path
 
-- **LinkExtension** - import `?link` in JavaScript/TypeScript programs to conveniently assemble shader files and libraries for linking at runtime.
-Reads the `wesl.toml` file to find local shader files and libraries,
-Returns a `LinkParams` object ready to use for runtime linking.
+For `?static`, you can specify conditions directly in the import:
 
-- **StaticExtension** - import `?static` in JavaScript/TypeScript programs to
-link shader files at build time.
-Reads the `wesl.toml` file to find local shader files and libraries,
-Returns a wgsl string ready to use for `createShaderModule`.
+```ts
+import wgsl from "./app.wesl MOBILE=true DEBUG=false ?static";
+```
+
+## Configuration (wesl.toml)
+
+The plugin reads `wesl.toml` to find shader files and dependencies:
 
-### Prototype Extensions
+```toml
+weslFiles = ["shaders/**/*.wesl"]
+weslRoot = "shaders"
+dependencies = ["auto"]  # Auto-detect from package.json
+```
 
-- **SimpleReReflectExtension** - (_demo for extension writers_) import `?simple_reflect` to
-translate some wgsl `struct` elements into JavaScript and TypeScript.
-Demonstrates to wesl-plugin extension authors how to connect
-to the wesl-plugin, how to produce JavaScript, and how to produce TypeScript.
-- **BindingLayoutExtension** - (_prototype_) import `?bindingLayout` to collect JavaScript
-`BindingGroupLayout` objects.
-Works in concert with the `bindingStructsPlugin` to translate a proposed new WGSL
-feature for defining binding group layouts in shaders [#4957](https://github.com/gpuweb/gpuweb/issues/4957).
+## Prototype Extensions
 
-## Developing a wesl-plugin extension
+- **SimpleReflectExtension** - Demo for extension authors showing how to generate JS/TS from shader structs
+- **BindingLayoutExtension** - Prototype for generating `BindGroupLayout` objects from shaders
 
-To add a new extension to the wesl-plugin:
+## Writing Custom Extensions
 
-- Pick an import suffix (e.g. `?myExtension`).
-- Implement a function that returns a JavaScript string.
-  - Extensions have access to wgsl/wesl sources, a parsed abstract syntax tree for the sources, etc.
+```ts
+import type { PluginExtension } from "wesl-plugin";
+
+const myExtension: PluginExtension = {
+  extensionName: "myfeature",  // enables ?myfeature imports
+  emitFn: async (shaderPath, api, conditions) => {
+    const sources = await api.weslSrc();
+    // Return JavaScript code as a string
+    return `export default ${JSON.stringify(sources)};`;
+  }
+};
+```
 
-See [PluginExtension.ts](https://github.com/wgsl-tooling-wg/wesl-js/blob/master/tools/packages/wesl-plugin/src/PluginExtension.ts) for details.
+See [PluginExtension.ts](https://github.com/wgsl-tooling-wg/wesl-js/blob/main/tools/packages/wesl-plugin/src/PluginExtension.ts) for the full API.

package/dist/{WeslPlugin-BhkB-CW-.js → WeslPlugin-DFbg7Qiu.mjs}

@@ -1,4 +1,4 @@
-import { t as resolve } from "./import-meta-resolve-CUFqnZwT.js";
+import { t as resolve } from "./import-meta-resolve-CfcdqZRe.mjs";
 import path, { posix, win32 } from "node:path";
 import { RecordResolver, WeslParseError, filterMap, findUnboundIdents, npmNameVariations } from "wesl";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -17,16 +17,18 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
 	}
 	return to;
 };
@@ -225,7 +227,7 @@ function expand_(str, isTop) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/minimatch@10.0.3/node_modules/minimatch/dist/esm/assert-valid-pattern.js
+//#region ../../node_modules/.pnpm/minimatch@10.1.1/node_modules/minimatch/dist/esm/assert-valid-pattern.js
 const MAX_PATTERN_LENGTH = 1024 * 64;
 const assertValidPattern = (pattern) => {
 	if (typeof pattern !== "string") throw new TypeError("invalid pattern");
@@ -233,7 +235,7 @@ const assertValidPattern = (pattern) => {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/minimatch@10.0.3/node_modules/minimatch/dist/esm/brace-expressions.js
+//#region ../../node_modules/.pnpm/minimatch@10.1.1/node_modules/minimatch/dist/esm/brace-expressions.js
 const posixClasses = {
 	"[:alnum:]": ["\\p{L}\\p{Nl}\\p{Nd}", true],
 	"[:alpha:]": ["\\p{L}\\p{Nl}", true],
@@ -355,27 +357,33 @@ const parseClass = (glob$1, position) => {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/minimatch@10.0.3/node_modules/minimatch/dist/esm/unescape.js
+//#region ../../node_modules/.pnpm/minimatch@10.1.1/node_modules/minimatch/dist/esm/unescape.js
 /**
 * Un-escape a string that has been escaped with {@link escape}.
 *
-* If the {@link windowsPathsNoEscape} option is used, then square-brace
-* escapes are removed, but not backslash escapes.  For example, it will turn
-* the string `'[*]'` into `*`, but it will not turn `'\\*'` into `'*'`,
-* becuase `\` is a path separator in `windowsPathsNoEscape` mode.
+* If the {@link MinimatchOptions.windowsPathsNoEscape} option is used, then
+* square-bracket escapes are removed, but not backslash escapes.
+*
+* For example, it will turn the string `'[*]'` into `*`, but it will not
+* turn `'\\*'` into `'*'`, because `\` is a path separator in
+* `windowsPathsNoEscape` mode.
 *
-* When `windowsPathsNoEscape` is not set, then both brace escapes and
+* When `windowsPathsNoEscape` is not set, then both square-bracket escapes and
 * backslash escapes are removed.
 *
 * Slashes (and backslashes in `windowsPathsNoEscape` mode) cannot be escaped
 * or unescaped.
+*
+* When `magicalBraces` is not set, escapes of braces (`{` and `}`) will not be
+* unescaped.
 */
-const unescape = (s, { windowsPathsNoEscape = false } = {}) => {
-	return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
+const unescape = (s, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
+	if (magicalBraces) return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
+	return windowsPathsNoEscape ? s.replace(/\[([^\/\\{}])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\{}])\]/g, "$1$2").replace(/\\([^\/{}])/g, "$1");
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/minimatch@10.0.3/node_modules/minimatch/dist/esm/ast.js
+//#region ../../node_modules/.pnpm/minimatch@10.1.1/node_modules/minimatch/dist/esm/ast.js
 const types = new Set([
 	"!",
 	"?",
@@ -620,7 +628,7 @@ var AST = class AST {
 		const dot = allowDot ?? !!this.#options.dot;
 		if (this.#root === this) this.#fillNegs();
 		if (!this.type) {
-			const noEmpty = this.isStart() && this.isEnd();
+			const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s) => typeof s !== "string");
 			const src = this.#parts.map((p) => {
 				const [re, _, hasMagic$1, uflag] = typeof p === "string" ? AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
 				this.#hasMagic = this.#hasMagic || hasMagic$1;
@@ -715,8 +723,7 @@ var AST = class AST {
 				}
 			}
 			if (c === "*") {
-				if (noEmpty && glob$1 === "*") re += starNoEmpty;
-				else re += star$1;
+				re += noEmpty && glob$1 === "*" ? starNoEmpty : star$1;
 				hasMagic$1 = true;
 				continue;
 			}
@@ -737,22 +744,26 @@ var AST = class AST {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/minimatch@10.0.3/node_modules/minimatch/dist/esm/escape.js
+//#region ../../node_modules/.pnpm/minimatch@10.1.1/node_modules/minimatch/dist/esm/escape.js
 /**
 * Escape all magic characters in a glob pattern.
 *
-* If the {@link windowsPathsNoEscape | GlobOptions.windowsPathsNoEscape}
+* If the {@link MinimatchOptions.windowsPathsNoEscape}
 * option is used, then characters are escaped by wrapping in `[]`, because
 * a magic character wrapped in a character class can only be satisfied by
 * that exact character.  In this mode, `\` is _not_ escaped, because it is
 * not interpreted as a magic character, but instead as a path separator.
+*
+* If the {@link MinimatchOptions.magicalBraces} option is used,
+* then braces (`{` and `}`) will be escaped.
 */
-const escape = (s, { windowsPathsNoEscape = false } = {}) => {
+const escape = (s, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
+	if (magicalBraces) return windowsPathsNoEscape ? s.replace(/[?*()[\]{}]/g, "[$&]") : s.replace(/[?*()[\]\\{}]/g, "\\$&");
 	return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/minimatch@10.0.3/node_modules/minimatch/dist/esm/index.js
+//#region ../../node_modules/.pnpm/minimatch@10.1.1/node_modules/minimatch/dist/esm/index.js
 const minimatch = (p, pattern, options = {}) => {
 	assertValidPattern(pattern);
 	if (!options.nocomment && pattern.charAt(0) === "#") return false;
@@ -1259,16 +1270,23 @@ var Minimatch = class {
 				if (p !== GLOBSTAR || prev === GLOBSTAR) return;
 				if (prev === void 0) if (next !== void 0 && next !== GLOBSTAR) pp[i + 1] = "(?:\\/|" + twoStar + "\\/)?" + next;
 				else pp[i] = twoStar;
-				else if (next === void 0) pp[i - 1] = prev + "(?:\\/|" + twoStar + ")?";
+				else if (next === void 0) pp[i - 1] = prev + "(?:\\/|\\/" + twoStar + ")?";
 				else if (next !== GLOBSTAR) {
 					pp[i - 1] = prev + "(?:\\/|\\/" + twoStar + "\\/)" + next;
 					pp[i + 1] = GLOBSTAR;
 				}
 			});
-			return pp.filter((p) => p !== GLOBSTAR).join("/");
+			const filtered = pp.filter((p) => p !== GLOBSTAR);
+			if (this.partial && filtered.length >= 1) {
+				const prefixes = [];
+				for (let i = 1; i <= filtered.length; i++) prefixes.push(filtered.slice(0, i).join("/"));
+				return "(?:" + prefixes.join("|") + ")";
+			}
+			return filtered.join("/");
 		}).join("|");
 		const [open, close] = set.length > 1 ? ["(?:", ")"] : ["", ""];
 		re = "^" + open + re + close + "$";
+		if (this.partial) re = "^(?:\\/|" + open + re.slice(1, -1) + close + ")$";
 		if (this.negate) re = "^(?!" + re + ").+$";
 		try {
 			this.regexp = new RegExp(re, [...flags].join(""));
@@ -1319,7 +1337,7 @@ minimatch.escape = escape;
 minimatch.unescape = unescape;
 
 //#endregion
-//#region ../../node_modules/.pnpm/lru-cache@11.2.2/node_modules/lru-cache/dist/esm/index.js
+//#region ../../node_modules/.pnpm/lru-cache@11.2.4/node_modules/lru-cache/dist/esm/index.js
 /**
 * @module LRUCache
 */
@@ -1506,6 +1524,7 @@ var LRUCache = class LRUCache {
 	#sizes;
 	#starts;
 	#ttls;
+	#autopurgeTimers;
 	#hasDispose;
 	#hasFetchMethod;
 	#hasDisposeAfter;
@@ -1523,6 +1542,7 @@ var LRUCache = class LRUCache {
 		return {
 			starts: c.#starts,
 			ttls: c.#ttls,
+			autopurgeTimers: c.#autopurgeTimers,
 			sizes: c.#sizes,
 			keyMap: c.#keyMap,
 			keyList: c.#keyList,
@@ -1684,15 +1704,23 @@ var LRUCache = class LRUCache {
 		const starts = new ZeroArray(this.#max);
 		this.#ttls = ttls;
 		this.#starts = starts;
+		const purgeTimers = this.ttlAutopurge ? new Array(this.#max) : void 0;
+		this.#autopurgeTimers = purgeTimers;
 		this.#setItemTTL = (index, ttl, start = this.#perf.now()) => {
 			starts[index] = ttl !== 0 ? start : 0;
 			ttls[index] = ttl;
-			if (ttl !== 0 && this.ttlAutopurge) {
+			if (purgeTimers?.[index]) {
+				clearTimeout(purgeTimers[index]);
+				purgeTimers[index] = void 0;
+			}
+			if (ttl !== 0 && purgeTimers) {
 				const t = setTimeout(() => {
 					if (this.#isStale(index)) this.#delete(this.#keyList[index], "expire");
 				}, ttl + 1);
 				/* c8 ignore start */
 				if (t.unref) t.unref();
+				/* c8 ignore stop */
+				purgeTimers[index] = t;
 			}
 		};
 		this.#updateItemAge = (index) => {
@@ -2141,6 +2169,10 @@ var LRUCache = class LRUCache {
 			]);
 		}
 		this.#removeItemSize(head);
+		if (this.#autopurgeTimers?.[head]) {
+			clearTimeout(this.#autopurgeTimers[head]);
+			this.#autopurgeTimers[head] = void 0;
+		}
 		if (free) {
 			this.#keyList[head] = void 0;
 			this.#valList[head] = void 0;
@@ -2354,7 +2386,7 @@ var LRUCache = class LRUCache {
 	memo(k, memoOptions = {}) {
 		const memoMethod = this.#memoMethod;
 		if (!memoMethod) throw new Error("no memoMethod provided to constructor");
-		const { context, forceRefresh,...options } = memoOptions;
+		const { context, forceRefresh, ...options } = memoOptions;
 		const v = this.get(k, options);
 		if (!forceRefresh && v !== void 0) return v;
 		const vv = memoMethod(k, v, {
@@ -2421,6 +2453,10 @@ var LRUCache = class LRUCache {
 		if (this.#size !== 0) {
 			const index = this.#keyMap.get(k);
 			if (index !== void 0) {
+				if (this.#autopurgeTimers?.[index]) {
+					clearTimeout(this.#autopurgeTimers?.[index]);
+					this.#autopurgeTimers[index] = void 0;
+				}
 				deleted = true;
 				if (this.#size === 1) this.#clear(reason);
 				else {
@@ -2484,6 +2520,8 @@ var LRUCache = class LRUCache {
 		if (this.#ttls && this.#starts) {
 			this.#ttls.fill(0);
 			this.#starts.fill(0);
+			for (const t of this.#autopurgeTimers ?? []) if (t !== void 0) clearTimeout(t);
+			this.#autopurgeTimers?.fill(void 0);
 		}
 		if (this.#sizes) this.#sizes.fill(0);
 		this.#head = 0;
@@ -3318,7 +3356,7 @@ while (this[FLUSHCHUNK](this[BUFFERSHIFT]()) && this[BUFFER].length);
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
+//#region ../../node_modules/.pnpm/path-scurry@2.0.1/node_modules/path-scurry/dist/esm/index.js
 const realpathSync$2 = realpathSync$1.native;
 const defaultFS = {
 	lstatSync,
@@ -3363,7 +3401,7 @@ const ENOREALPATH = 512;
 const ENOCHILD = ENOENT | 576;
 const TYPEMASK = 1023;
 const entToType = (s) => s.isFile() ? IFREG : s.isDirectory() ? IFDIR : s.isSymbolicLink() ? IFLNK : s.isCharacterDevice() ? IFCHR : s.isBlockDevice() ? IFBLK : s.isSocket() ? IFSOCK : s.isFIFO() ? IFIFO : UNKNOWN;
-const normalizeCache = /* @__PURE__ */ new Map();
+const normalizeCache = new LRUCache({ max: 2 ** 12 });
 const normalize = (s) => {
 	const c = normalizeCache.get(s);
 	if (c) return c;
@@ -3371,7 +3409,7 @@ const normalize = (s) => {
 	normalizeCache.set(s, n);
 	return n;
 };
-const normalizeNocaseCache = /* @__PURE__ */ new Map();
+const normalizeNocaseCache = new LRUCache({ max: 2 ** 12 });
 const normalizeNocase = (s) => {
 	const c = normalizeNocaseCache.get(s);
 	if (c) return c;
@@ -3545,6 +3583,7 @@ var PathBase = class {
 	get parentPath() {
 		return (this.parent || this).fullpath();
 	}
+	/* c8 ignore start */
 	/**
 	* Deprecated alias for Dirent['parentPath'] Somewhat counterintuitively,
 	* this property refers to the *parent* path, not the path object itself.
@@ -3554,6 +3593,7 @@ var PathBase = class {
 	get path() {
 		return this.parentPath;
 	}
+	/* c8 ignore stop */
 	/**
 	* Do not create new Path objects directly.  They should always be accessed
 	* via the PathScurry class or other methods on the Path class.
@@ -4882,7 +4922,7 @@ const Path = process.platform === "win32" ? PathWin32 : PathPosix;
 const PathScurry = process.platform === "win32" ? PathScurryWin32 : process.platform === "darwin" ? PathScurryDarwin : PathScurryPosix;
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/pattern.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/pattern.js
 const isPatternList = (pl) => pl.length >= 1;
 const isGlobList = (gl) => gl.length >= 1;
 /**
@@ -5045,7 +5085,7 @@ var Pattern = class Pattern {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/ignore.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/ignore.js
 const defaultPlatform$1 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 /**
 * Class used to process ignored patterns
@@ -5117,7 +5157,7 @@ var Ignore = class {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/processor.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/processor.js
 /**
 * A cache of which patterns have been processed for a given Path
 */
@@ -5310,7 +5350,13 @@ var Processor = class Processor {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/walker.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/walker.js
+/**
+* Single-use utility classes to provide functionality to the {@link Glob}
+* methods.
+*
+* @module
+*/
 const makeIgnore = (ignore, opts) => typeof ignore === "string" ? new Ignore([ignore], opts) : Array.isArray(ignore) ? new Ignore(ignore, opts) : ignore;
 /**
 * basic walking utilities that all the glob walker types use
@@ -5589,7 +5635,7 @@ var GlobStream = class extends GlobUtil {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/glob.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/glob.js
 const defaultPlatform = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 /**
 * An object that can perform glob pattern traversals.
@@ -5776,7 +5822,7 @@ var Glob = class {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/has-magic.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/has-magic.js
 /**
 * Return true if the patterns provided contain any magic glob characters,
 * given the options provided.
@@ -5795,7 +5841,7 @@ const hasMagic = (pattern, options = {}) => {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/index.js
+//#region ../../node_modules/.pnpm/glob@13.0.0/node_modules/glob/dist/esm/index.js
 function globStreamSync(pattern, options = {}) {
 	return new Glob(pattern, options).streamSync();
 }
@@ -5843,7 +5889,7 @@ glob.glob = glob;
 
 //#endregion
 //#region ../../node_modules/.pnpm/toml@3.0.0/node_modules/toml/lib/parser.js
-var require_parser = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/toml@3.0.0/node_modules/toml/lib/parser.js": ((exports, module) => {
+var require_parser = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = (function() {
 		function peg$subclass(child, parent) {
 			function ctor() {
@@ -9478,11 +9524,11 @@ var require_parser = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/toml
 			parse
 		};
 	})();
-}) });
+}));
 
 //#endregion
 //#region ../../node_modules/.pnpm/toml@3.0.0/node_modules/toml/lib/compiler.js
-var require_compiler = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/toml@3.0.0/node_modules/toml/lib/compiler.js": ((exports, module) => {
+var require_compiler = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	function compile(nodes) {
 		var assignedPaths = [];
 		var valueAssignments = [];
@@ -9606,18 +9652,18 @@ var require_compiler = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/to
 		}
 	}
 	module.exports = { compile };
-}) });
+}));
 
 //#endregion
 //#region ../../node_modules/.pnpm/toml@3.0.0/node_modules/toml/index.js
-var require_toml = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/toml@3.0.0/node_modules/toml/index.js": ((exports, module) => {
+var require_toml = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var parser = require_parser();
 	var compiler = require_compiler();
 	module.exports = { parse: function(input) {
 		var nodes = parser.parse(input.toString());
 		return compiler.compile(nodes);
 	} };
-}) });
+}));
 
 //#endregion
 //#region ../wesl-tooling/src/LoadWeslToml.ts
@@ -9880,11 +9926,14 @@ function weslPlugin(options, meta) {
 		meta,
 		options
 	};
+	const log = options.debug ? debugLog : noopLog;
+	log("init", { extensions: options.extensions?.map((e) => e.extensionName) });
 	return {
 		name: "wesl-plugin",
-		resolveId: buildResolver(options, context),
-		load: buildLoader(context),
+		resolveId: buildResolver(options, context, log),
+		load: buildLoader(context, log),
 		watchChange(id, _change) {
+			log("watchChange", { id });
 			if (id.endsWith("wesl.toml")) {
 				cache.weslToml = void 0;
 				cache.registry = void 0;
@@ -9905,15 +9954,18 @@ function pluginsByName(options) {
 * or
 *   foo/bar.wesl COND=false ?static
 *
+* Bundlers may add extra query params (e.g. Vite adds ?import for dynamic imports,
+* ?t=123 for cache busting), so we capture the full query and search within it.
+*
 * someday it'd be nice to support import attributes like:
 *    import "foo.bar.wesl?static" with { COND: false};
 * (but that doesn't seem supported to be supported in the the bundler plugins yet)
 */
-const pluginMatch = /(^^)?(?<baseId>.*\.w[eg]sl)(?<cond>(\s*\w+(=\w+)?\s*)*)\?(?<pluginName>[\w_-]+)$/;
+const pluginMatch = /(^^)?(?<baseId>.*\.w[eg]sl)(?<cond>(\s*\w+(=\w+)?\s*)*)\?(?<query>.+)$/;
 const resolvedPrefix = "^^";
 /** build plugin entry for 'resolverId'
 * to validate our javascript virtual module imports (with e.g. ?static or ?link suffixes) */
-function buildResolver(options, context) {
+function buildResolver(options, context, log) {
 	const suffixes = pluginNames(options);
 	return resolver;
 	/**
@@ -9927,39 +9979,58 @@ function buildResolver(options, context) {
 		if (id.startsWith(resolvedPrefix)) return id;
 		if (id === context.weslToml) return id;
 		const matched = pluginSuffixMatch(id, suffixes);
+		log("resolveId", {
+			id,
+			matched: !!matched,
+			suffixes
+		});
 		if (matched) {
 			const { importParams, baseId, pluginName } = matched;
 			const importerDir = path.dirname(importer);
-			return resolvedPrefix + path.join(importerDir, baseId) + importParams + "?" + pluginName;
+			const result = resolvedPrefix + path.join(importerDir, baseId) + importParams + "?" + pluginName;
+			log("resolveId resolved", { result });
+			return result;
 		}
 		return matched ? id : null;
 	}
 }
+/** Find matching plugin suffix in query string (handles ?import&static, ?t=123&static, etc.) */
 function pluginSuffixMatch(id, suffixes) {
-	const suffixMatch = id.match(pluginMatch);
-	const pluginName = suffixMatch?.groups?.pluginName;
-	if (!pluginName || !suffixes.includes(pluginName)) return null;
+	const match$1 = id.match(pluginMatch);
+	const query = match$1?.groups?.query;
+	if (!query) return null;
+	const segments = query.split("&");
+	const pluginName = suffixes.find((s) => segments.includes(s));
+	if (!pluginName) return null;
 	return {
 		pluginName,
-		baseId: suffixMatch.groups.baseId,
-		importParams: suffixMatch.groups?.cond
+		baseId: match$1.groups.baseId,
+		importParams: match$1.groups?.cond
 	};
 }
 /** build plugin function for serving a javascript module in response to
 * an import of of our virtual import modules. */
-function buildLoader(context) {
+function buildLoader(context, log) {
 	const { options } = context;
 	const suffixes = pluginNames(options);
 	const pluginsMap = pluginsByName(options);
 	return loader;
 	async function loader(id) {
 		const matched = pluginSuffixMatch(id, suffixes);
+		log("load", {
+			id,
+			matched: matched?.pluginName ?? null
+		});
 		if (matched) {
 			const buildPluginApi = buildApi(context, this);
 			const plugin = pluginsMap[matched.pluginName];
 			const { baseId, importParams } = matched;
 			const conditions = importParamsToConditions(importParams);
 			const shaderPath = baseId.startsWith(resolvedPrefix) ? baseId.slice(2) : baseId;
+			log("load emitting", {
+				shaderPath,
+				conditions
+			});
 			return await plugin.emitFn(shaderPath, buildPluginApi, conditions);
 		}
 		return null;
@@ -9981,6 +10052,13 @@ function importParamsToConditions(importParams) {
 	});
 	return Object.fromEntries(condEntries);
 }
+function fmtDebugData(data) {
+	return data ? " " + JSON.stringify(data) : "";
+}
+function debugLog(msg, data) {
+	console.error(`[wesl-plugin] ${msg}${fmtDebugData(data)}`);
+}
+function noopLog() {}
 const unplugin = createUnplugin((options, meta) => {
 	return weslPlugin(options, meta);
 });

package/dist/WeslPluginOptions-DHLy1_Dm.d.mts

@@ -0,0 +1,11 @@
+import { n as PluginExtension } from "./PluginExtension-N4JBtncl.mjs";
+
+//#region src/WeslPluginOptions.d.ts
+interface WeslPluginOptions {
+  weslToml?: string;
+  extensions?: PluginExtension[];
+  /** Log plugin activity to stderr for debugging */
+  debug?: boolean;
+}
+//#endregion
+export { WeslPluginOptions as t };

package/dist/{import-meta-resolve-CUFqnZwT.js → import-meta-resolve-CfcdqZRe.mjs}

@@ -8,6 +8,19 @@ import v8 from "node:v8";
 import { format, inspect } from "node:util";
 
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/errors.js
+/**
+* @typedef ErrnoExceptionFields
+* @property {number | undefined} [errnode]
+* @property {string | undefined} [code]
+* @property {string | undefined} [path]
+* @property {string | undefined} [syscall]
+* @property {string | undefined} [url]
+*
+* @typedef {Error & ErrnoExceptionFields} ErrnoException
+*/
+/**
+* @typedef {(...parameters: Array<any>) => string} MessageFunction
+*/
 const own$1 = {}.hasOwnProperty;
 const classRegExp = /^([A-Z][a-z\d]*)+$/;
 const kTypes = new Set([
@@ -332,6 +345,20 @@ function determineSpecificType(value) {
 
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/package-json-reader.js
+/**
+* @typedef {import('./errors.js').ErrnoException} ErrnoException
+*
+* @typedef {'commonjs' | 'module' | 'none'} PackageType
+*
+* @typedef PackageConfig
+* @property {string} pjsonPath
+* @property {boolean} exists
+* @property {string | undefined} [main]
+* @property {string | undefined} [name]
+* @property {PackageType} type
+* @property {Record<string, unknown> | undefined} [exports]
+* @property {Record<string, unknown> | undefined} [imports]
+*/
 const hasOwnProperty$1 = {}.hasOwnProperty;
 const { ERR_INVALID_PACKAGE_CONFIG: ERR_INVALID_PACKAGE_CONFIG$1 } = codes;
 /** @type {Map<string, PackageConfig>} */
@@ -547,6 +574,11 @@ function getConditionsSet(conditions) {
 
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/resolve.js
+/**
+* @typedef {import('node:fs').Stats} Stats
+* @typedef {import('./errors.js').ErrnoException} ErrnoException
+* @typedef {import('./package-json-reader.js').PackageConfig} PackageConfig
+*/
 const RegExpPrototypeSymbolReplace = RegExp.prototype[Symbol.replace];
 const { ERR_NETWORK_IMPORT_DISALLOWED, ERR_INVALID_MODULE_SPECIFIER, ERR_INVALID_PACKAGE_CONFIG, ERR_INVALID_PACKAGE_TARGET, ERR_MODULE_NOT_FOUND, ERR_PACKAGE_IMPORT_NOT_DEFINED, ERR_PACKAGE_PATH_NOT_EXPORTED, ERR_UNSUPPORTED_DIR_IMPORT, ERR_UNSUPPORTED_RESOLVE_REQUEST } = codes;
 const own = {}.hasOwnProperty;
@@ -1203,6 +1235,9 @@ function defaultResolve(specifier, context = {}) {
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/index.js
 /**
+* @typedef {import('./lib/errors.js').ErrnoException} ErrnoException
+*/
+/**
 * Match `import.meta.resolve` except that `parent` is required (you can pass
 * `import.meta.url`).
 *

package/dist/{pluginIndex.d.ts → pluginIndex.d.mts}

@@ -1,4 +1,4 @@
-import { n as PluginExtension, r as PluginExtensionApi, t as ExtensionEmitFn } from "./PluginExtension-DlhUTOLC.js";
+import { n as PluginExtension, r as PluginExtensionApi, t as ExtensionEmitFn } from "./PluginExtension-N4JBtncl.mjs";
 
 //#region src/extensions/LinkExtension.d.ts
 declare const linkBuildExtension: PluginExtension;

package/dist/{pluginIndex.js → pluginIndex.mjs}

@@ -1,4 +1,4 @@
-import { t as resolve } from "./import-meta-resolve-CUFqnZwT.js";
+import { t as resolve } from "./import-meta-resolve-CfcdqZRe.mjs";
 import path from "node:path";
 import { link, noSuffix } from "wesl";
 import url from "node:url";
@@ -17,7 +17,7 @@ async function emitLinkJs(baseId, api) {
 	const autoDeps = await api.weslDependencies();
 	const sanitizedDeps = autoDeps.map((dep) => dep.replaceAll("/", "_"));
 	const bundleImports = autoDeps.map((p, i) => `import ${sanitizedDeps[i]} from "${p}";`).join("\n");
-	const paramsName = `link${path.basename(rootModuleName)}Config`;
+	const paramsName = `link${path.basename(rootModuleName).replace(/\W/g, "_")}Config`;
 	const linkParams = {
 		rootModuleName,
 		weslSrc,

package/dist/plugins/astro.d.mts

@@ -0,0 +1,7 @@
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
+
+//#region src/plugins/astro.d.ts
+declare const _default: (options: WeslPluginOptions) => any;
+//#endregion
+export { _default as default };

package/dist/plugins/{astro.js → astro.mjs}

@@ -1,5 +1,4 @@
-import { t as WeslPlugin_default } from "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
+import { t as WeslPlugin_default } from "../WeslPlugin-DFbg7Qiu.mjs";
 
 //#region src/plugins/astro.ts
 var astro_default = (options) => ({

package/dist/plugins/{esbuild.d.ts → esbuild.d.mts}

@@ -1,5 +1,5 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
 import * as esbuild0 from "esbuild";
 
 //#region src/plugins/esbuild.d.ts

package/dist/plugins/{esbuild.js → esbuild.mjs}

@@ -1,5 +1,4 @@
-import { n as weslPlugin } from "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
+import { n as weslPlugin } from "../WeslPlugin-DFbg7Qiu.mjs";
 import { createEsbuildPlugin } from "unplugin";
 
 //#region src/plugins/esbuild.ts

package/dist/plugins/{farm.d.ts → farm.d.mts}

@@ -1,5 +1,5 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
 import * as _farmfe_core0 from "@farmfe/core";
 
 //#region src/plugins/farm.d.ts

package/dist/plugins/farm.mjs

@@ -0,0 +1,8 @@
+import { n as weslPlugin } from "../WeslPlugin-DFbg7Qiu.mjs";
+import { createFarmPlugin } from "unplugin";
+
+//#region src/plugins/farm.ts
+var farm_default = createFarmPlugin(weslPlugin);
+
+//#endregion
+export { farm_default as default };

package/dist/plugins/{nuxt.d.ts → nuxt.d.mts}

@@ -1,5 +1,5 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
 import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/plugins/nuxt.d.ts

package/dist/plugins/{nuxt.js → nuxt.mjs}

@@ -1,7 +1,6 @@
-import "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
-import { t as vite_default } from "../vite-BqdMYd8l.js";
-import { t as webpack_default } from "../webpack-D-jacRMO.js";
+import "../WeslPlugin-DFbg7Qiu.mjs";
+import vite_default from "./vite.mjs";
+import webpack_default from "./webpack.mjs";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

package/dist/plugins/{rollup.d.ts → rollup.d.mts}

@@ -1,5 +1,5 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
 import * as rollup0 from "rollup";
 
 //#region src/plugins/rollup.d.ts

package/dist/plugins/{rollup.js → rollup.mjs}

@@ -1,5 +1,4 @@
-import { n as weslPlugin } from "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
+import { n as weslPlugin } from "../WeslPlugin-DFbg7Qiu.mjs";
 import { createRollupPlugin } from "unplugin";
 
 //#region src/plugins/rollup.ts

package/dist/plugins/rspack.d.mts

@@ -0,0 +1,7 @@
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
+
+//#region src/plugins/rspack.d.ts
+declare const _default: (options: WeslPluginOptions) => RspackPluginInstance;
+//#endregion
+export { _default as default };

package/dist/plugins/{rspack.js → rspack.mjs}

@@ -1,5 +1,4 @@
-import { n as weslPlugin } from "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
+import { n as weslPlugin } from "../WeslPlugin-DFbg7Qiu.mjs";
 import { createRspackPlugin } from "unplugin";
 
 //#region src/plugins/rspack.ts

package/dist/plugins/{vite.d.ts → vite.d.mts}

@@ -1,5 +1,5 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
 import * as vite0 from "vite";
 
 //#region src/plugins/vite.d.ts

package/dist/{vite-BqdMYd8l.js → plugins/vite.mjs}

@@ -1,8 +1,8 @@
-import { n as weslPlugin } from "./WeslPlugin-BhkB-CW-.js";
+import { n as weslPlugin } from "../WeslPlugin-DFbg7Qiu.mjs";
 import { createVitePlugin } from "unplugin";
 
 //#region src/plugins/vite.ts
 var vite_default = createVitePlugin(weslPlugin);
 
 //#endregion
-export { vite_default as t };
+export { vite_default as default };

package/dist/plugins/{webpack.d.ts → webpack.d.mts}

@@ -1,5 +1,5 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
+import "../PluginExtension-N4JBtncl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-DHLy1_Dm.mjs";
 import * as webpack0 from "webpack";
 
 //#region src/plugins/webpack.d.ts

package/dist/{webpack-D-jacRMO.js → plugins/webpack.mjs}

@@ -1,8 +1,8 @@
-import { n as weslPlugin } from "./WeslPlugin-BhkB-CW-.js";
+import { n as weslPlugin } from "../WeslPlugin-DFbg7Qiu.mjs";
 import { createWebpackPlugin } from "unplugin";
 
 //#region src/plugins/webpack.ts
 var webpack_default = createWebpackPlugin(weslPlugin);
 
 //#endregion
-export { webpack_default as t };
+export { webpack_default as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wesl-plugin",
   "description": "",
-  "version": "0.6.47",
+  "version": "0.6.50",
   "type": "module",
   "files": [
     "src",
@@ -9,23 +9,23 @@
   ],
   "repository": "github:wgsl-tooling-wg/wesl-js",
   "exports": {
-    ".": "./dist/pluginIndex.js",
+    ".": "./dist/pluginIndex.mjs",
     "./suffixes": {
       "types": "./src/defaultSuffixTypes.d.ts"
     },
-    "./astro": "./dist/plugins/astro.js",
-    "./rspack": "./dist/plugins/rspack.js",
-    "./vite": "./dist/plugins/vite.js",
-    "./webpack": "./dist/plugins/webpack.js",
-    "./rollup": "./dist/plugins/rollup.js",
-    "./esbuild": "./dist/plugins/esbuild.js",
-    "./nuxt": "./dist/plugins/nuxt.js",
-    "./farm": "./dist/plugins/farm.js",
+    "./astro": "./dist/plugins/astro.mjs",
+    "./rspack": "./dist/plugins/rspack.mjs",
+    "./vite": "./dist/plugins/vite.mjs",
+    "./webpack": "./dist/plugins/webpack.mjs",
+    "./rollup": "./dist/plugins/rollup.mjs",
+    "./esbuild": "./dist/plugins/esbuild.mjs",
+    "./nuxt": "./dist/plugins/nuxt.mjs",
+    "./farm": "./dist/plugins/farm.mjs",
     "./*": "./*"
   },
   "dependencies": {
     "unplugin": "^2.3.5",
-    "wesl": "0.6.47"
+    "wesl": "0.7.0"
   },
   "devDependencies": {
     "@nuxt/kit": "^3.17.6",

package/src/WeslPlugin.ts

@@ -50,6 +50,8 @@ export interface PluginContext {
   weslToml?: string;
 }
 
+type DebugLog = (msg: string, data?: Record<string, unknown>) => void;
+
 /**
  * A bundler plugin for processing WESL files.
  *
@@ -66,12 +68,16 @@ export function weslPlugin(
 ): UnpluginOptions {
   const cache: PluginCache = {};
   const context: PluginContext = { cache, meta, options };
+  const log = options.debug ? debugLog : noopLog;
+
+  log("init", { extensions: options.extensions?.map(e => e.extensionName) });
 
   return {
     name: "wesl-plugin",
-    resolveId: buildResolver(options, context),
-    load: buildLoader(context),
+    resolveId: buildResolver(options, context, log),
+    load: buildLoader(context, log),
     watchChange(id, _change) {
+      log("watchChange", { id });
       if (id.endsWith("wesl.toml")) {
         // The cache is shared for multiple imports
         cache.weslToml = undefined;
@@ -100,12 +106,15 @@ function pluginsByName(
  * or
  *   foo/bar.wesl COND=false ?static
  *
+ * Bundlers may add extra query params (e.g. Vite adds ?import for dynamic imports,
+ * ?t=123 for cache busting), so we capture the full query and search within it.
+ *
  * someday it'd be nice to support import attributes like:
  *    import "foo.bar.wesl?static" with { COND: false};
  * (but that doesn't seem supported to be supported in the the bundler plugins yet)
  */
 const pluginMatch =
-  /(^^)?(?<baseId>.*\.w[eg]sl)(?<cond>(\s*\w+(=\w+)?\s*)*)\?(?<pluginName>[\w_-]+)$/;
+  /(^^)?(?<baseId>.*\.w[eg]sl)(?<cond>(\s*\w+(=\w+)?\s*)*)\?(?<query>.+)$/;
 
 const resolvedPrefix = "^^";
 
@@ -114,6 +123,7 @@ const resolvedPrefix = "^^";
 function buildResolver(
   options: WeslPluginOptions,
   context: PluginContext,
+  log: DebugLog,
 ): Resolver {
   const suffixes = pluginNames(options);
   return resolver;
@@ -141,6 +151,7 @@ function buildResolver(
       return id;
     }
     const matched = pluginSuffixMatch(id, suffixes);
+    log("resolveId", { id, matched: !!matched, suffixes });
     if (matched) {
       const { importParams, baseId, pluginName } = matched;
 
@@ -149,6 +160,7 @@ function buildResolver(
       const pathToShader = path.join(importerDir, baseId);
       const result =
         resolvedPrefix + pathToShader + importParams + "?" + pluginName;
+      log("resolveId resolved", { result });
       return result;
     }
     return matched ? id : null; // this case doesn't happen AFAIK
@@ -161,20 +173,27 @@ interface PluginMatch {
   pluginName: string;
 }
 
+/** Find matching plugin suffix in query string (handles ?import&static, ?t=123&static, etc.) */
 function pluginSuffixMatch(id: string, suffixes: string[]): PluginMatch | null {
-  const suffixMatch = id.match(pluginMatch);
-  const pluginName = suffixMatch?.groups?.pluginName;
-  if (!pluginName || !suffixes.includes(pluginName)) return null;
+  const match = id.match(pluginMatch);
+  const query = match?.groups?.query;
+  if (!query) return null;
+
+  // Query params are &-separated; find one that matches a configured suffix
+  const segments = query.split("&");
+  const pluginName = suffixes.find(s => segments.includes(s));
+  if (!pluginName) return null;
+
   return {
     pluginName,
-    baseId: suffixMatch.groups!.baseId,
-    importParams: suffixMatch.groups?.cond,
+    baseId: match.groups!.baseId,
+    importParams: match.groups?.cond,
   };
 }
 
 /** build plugin function for serving a javascript module in response to
  * an import of of our virtual import modules. */
-function buildLoader(context: PluginContext): Loader {
+function buildLoader(context: PluginContext, log: DebugLog): Loader {
   const { options } = context;
   const suffixes = pluginNames(options);
   const pluginsMap = pluginsByName(options);
@@ -185,6 +204,7 @@ function buildLoader(context: PluginContext): Loader {
     id: string,
   ) {
     const matched = pluginSuffixMatch(id, suffixes);
+    log("load", { id, matched: matched?.pluginName ?? null });
     if (matched) {
       const buildPluginApi = buildApi(context, this);
       const plugin = pluginsMap[matched.pluginName];
@@ -194,6 +214,7 @@ function buildLoader(context: PluginContext): Loader {
         ? baseId.slice(resolvedPrefix.length)
         : baseId;
 
+      log("load emitting", { shaderPath, conditions });
       return await plugin.emitFn(shaderPath, buildPluginApi, conditions);
     }
 
@@ -226,6 +247,16 @@ function importParamsToConditions(
   return conditions;
 }
 
+function fmtDebugData(data?: Record<string, unknown>): string {
+  return data ? " " + JSON.stringify(data) : "";
+}
+
+function debugLog(msg: string, data?: Record<string, unknown>): void {
+  console.error(`[wesl-plugin] ${msg}${fmtDebugData(data)}`);
+}
+
+function noopLog(): void {}
+
 export const unplugin = createUnplugin(
   (options: WeslPluginOptions, meta: UnpluginContextMeta) => {
     return weslPlugin(options, meta);

package/src/WeslPluginOptions.ts

@@ -3,4 +3,7 @@ import type { PluginExtension } from "./PluginExtension.ts";
 export interface WeslPluginOptions {
   weslToml?: string;
   extensions?: PluginExtension[];
+
+  /** Log plugin activity to stderr for debugging */
+  debug?: boolean;
 }

package/src/extensions/LinkExtension.ts

@@ -32,7 +32,7 @@ async function emitLinkJs(
     .map((p, i) => `import ${sanitizedDeps[i]} from "${p}";`)
     .join("\n");
 
-  const rootName = path.basename(rootModuleName);
+  const rootName = path.basename(rootModuleName).replace(/\W/g, "_");
   const paramsName = `link${rootName}Config`;
 
   const linkParams: LinkParams = {

package/dist/WeslPluginOptions-BXvD7dWh.d.ts

@@ -1,9 +0,0 @@
-import { n as PluginExtension } from "./PluginExtension-DlhUTOLC.js";
-
-//#region src/WeslPluginOptions.d.ts
-interface WeslPluginOptions {
-  weslToml?: string;
-  extensions?: PluginExtension[];
-}
-//#endregion
-export { WeslPluginOptions as t };

package/dist/plugins/astro.d.ts

@@ -1,7 +0,0 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
-
-//#region src/plugins/astro.d.ts
-declare const _default: (options: WeslPluginOptions) => any;
-//#endregion
-export { _default as default };

package/dist/plugins/farm.js

@@ -1,9 +0,0 @@
-import { n as weslPlugin } from "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
-import { createFarmPlugin } from "unplugin";
-
-//#region src/plugins/farm.ts
-var farm_default = createFarmPlugin(weslPlugin);
-
-//#endregion
-export { farm_default as default };

package/dist/plugins/rspack.d.ts

@@ -1,7 +0,0 @@
-import "../PluginExtension-DlhUTOLC.js";
-import { t as WeslPluginOptions } from "../WeslPluginOptions-BXvD7dWh.js";
-
-//#region src/plugins/rspack.d.ts
-declare const _default: (options: WeslPluginOptions) => RspackPluginInstance;
-//#endregion
-export { _default as default };

package/dist/plugins/vite.js

@@ -1,5 +0,0 @@
-import "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
-import { t as vite_default } from "../vite-BqdMYd8l.js";
-
-export { vite_default as default };

package/dist/plugins/webpack.js

@@ -1,5 +0,0 @@
-import "../WeslPlugin-BhkB-CW-.js";
-import "../import-meta-resolve-CUFqnZwT.js";
-import { t as webpack_default } from "../webpack-D-jacRMO.js";
-
-export { webpack_default as default };