wesl-plugin 0.6.73 → 0.6.75

package/README.md

@@ -132,4 +132,4 @@ const myExtension: PluginExtension = {
 };
 ```
 
-See [PluginExtension.ts](https://github.com/wgsl-tooling-wg/wesl-js/blob/main/packages/wesl-plugin/src/PluginExtension.ts) for the full API.
+See [PluginExtension.ts](https://github.com/webgpu-tools/wesl-js/blob/main/packages/wesl-plugin/src/PluginExtension.ts) for the full API.

package/dist/{StaticExtension-CDqA2teq.mjs → StaticExtension-q_mP-ool.mjs}

@@ -8,13 +8,14 @@ import process from "node:process";
 import v8 from "node:v8";
 import { format, inspect } from "node:util";
 //#region src/extensions/LinkExtension.ts
+/** Extension that emits a JavaScript LinkParams object for runtime linking. */
 const linkBuildExtension = {
 	extensionName: "link",
 	emitFn: emitLinkJs
 };
 /** Emit a JavaScript LinkParams structure, ready for linking at runtime. */
-async function emitLinkJs(baseId, api, _conditions, options) {
-	const rootModuleName = noSuffix(await api.weslMain(baseId));
+async function emitLinkJs(shaderPath, api, _conditions, options) {
+	const rootModuleName = noSuffix(await api.weslMain(shaderPath));
 	const [{ weslSrc, dependencies: autoDeps }, debugWeslRoot] = await Promise.all([api.fetchProject(rootModuleName, options), api.debugWeslRoot()]);
 	const sanitizedDeps = autoDeps.map((dep) => dep.replaceAll("/", "_"));
 	const bundleImports = autoDeps.map((p, i) => `import ${sanitizedDeps[i]} from "${p}";`).join("\n");
@@ -22,7 +23,8 @@ async function emitLinkJs(baseId, api, _conditions, options) {
 	const linkParams = {
 		rootModuleName,
 		weslSrc,
-		debugWeslRoot
+		debugWeslRoot,
+		shaderRoot: debugWeslRoot
 	};
 	const libsStr = `libs: [${sanitizedDeps.join(", ")}]`;
 	return `
@@ -34,6 +36,7 @@ async function emitLinkJs(baseId, api, _conditions, options) {
     export default ${paramsName};
     `;
 }
+/** Serialize an object's fields as `key: value` pairs for embedding in generated JS. */
 function serializeFields(record) {
 	return Object.entries(record).map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`).join(",\n");
 }
@@ -1297,17 +1300,20 @@ const staticBuildExtension = {
 };
 /** Emit a JS module exporting the statically linked WGSL string. */
 async function emitStaticJs(baseId, api, conditions, _options) {
-	const { resolvedRoot, tomlDir } = await api.weslToml();
+	const { tomlDir } = await api.weslToml();
 	const parentModule = url.pathToFileURL(path.join(tomlDir, "wesl.toml")).toString();
 	const rootModuleName = noSuffix(await api.weslMain(baseId));
-	const [weslSrc, dependencies] = await Promise.all([api.weslSrc(), api.weslDependencies()]);
+	const [weslSrc, dependencies, debugWeslRoot] = await Promise.all([
+		api.weslSrc(),
+		api.weslDependencies(),
+		api.debugWeslRoot()
+	]);
 	const libFileUrls = dependencies.map((d) => resolve(d, parentModule));
-	const libs = (await Promise.all(libFileUrls.map((f) => import(f)))).map((m) => m.default);
 	const { dest: wgsl } = await link({
 		weslSrc,
 		rootModuleName,
-		debugWeslRoot: path.relative(tomlDir, resolvedRoot).replaceAll(path.sep, "/"),
-		libs,
+		debugWeslRoot,
+		libs: (await Promise.all(libFileUrls.map((f) => import(f)))).map((m) => m.default),
 		conditions
 	});
 	return `

package/dist/{WeslPlugin-B91dE_tA.mjs → WeslPlugin-BIolevHn.mjs}

@@ -1,4 +1,4 @@
-import { n as resolve, r as linkBuildExtension, t as staticBuildExtension } from "./StaticExtension-CDqA2teq.mjs";
+import { n as resolve, r as linkBuildExtension, t as staticBuildExtension } from "./StaticExtension-q_mP-ool.mjs";
 import path, { posix, win32 } from "node:path";
 import { RecordResolver, WeslParseError, discoverModules, fileToModulePath, filterMap, findUnboundIdents, freshResolver, npmNameVariations } from "wesl";
 import fs, { lstat, readdir, readlink, realpath } from "node:fs/promises";
@@ -7093,11 +7093,7 @@ async function getScopedProject(rootModuleName, context, unpluginCtx) {
 }
 /** Resolve dependencies using pre-computed unbound refs (avoids re-parsing). */
 function resolveDepsFromUnbound(dependencies, unbound, projectDir) {
-	const depsArray = Array.isArray(dependencies) ? dependencies : [dependencies ?? "auto"];
-	if (!depsArray.includes("auto")) return depsArray;
-	const base = depsArray.filter((dep) => dep !== "auto");
-	const discovered = resolvePkgDeps(unbound, projectDir);
-	return [...new Set([...base, ...discovered])];
+	return resolveDepsWithDiscovery(dependencies, () => resolvePkgDeps(unbound, projectDir));
 }
 /** Load and cache the wesl.toml configuration. */
 async function getWeslToml(context, unpluginCtx) {
@@ -7148,11 +7144,14 @@ async function findDependencies(context, unpluginCtx) {
 }
 /** Resolve the dependency list, replacing "auto" entries with discovered deps. */
 function resolveDeps(dependencies, weslSrc, projectDir) {
+	return resolveDepsWithDiscovery(dependencies, () => parseDependencies(weslSrc, projectDir));
+}
+/** Normalize deps array, replace "auto" with discovered deps, deduplicate. */
+function resolveDepsWithDiscovery(dependencies, discover) {
 	const depsArray = Array.isArray(dependencies) ? dependencies : [dependencies ?? "auto"];
 	if (!depsArray.includes("auto")) return depsArray;
 	const base = depsArray.filter((dep) => dep !== "auto");
-	const discovered = parseDependencies(weslSrc, projectDir);
-	return [...new Set([...base, ...discovered])];
+	return [...new Set([...base, ...discover()])];
 }
 /** @return a function that resolves a shader path to a weslRoot-relative module path. */
 function makeGetWeslMain(context, unpluginContext) {

package/dist/WeslPluginOptions-B84JB1bv.d.mts

@@ -0,0 +1,13 @@
+import { n as PluginExtension } from "./PluginExtension-DTjKL6rt.mjs";
+
+//#region src/WeslPluginOptions.d.ts
+interface WeslPluginOptions {
+  /** Path to wesl.toml config file (default: auto-detected from project root). */
+  weslToml?: string;
+  /** Custom plugin extensions for additional import suffixes or code generation. */
+  extensions?: PluginExtension[];
+  /** Log plugin activity to stderr for debugging. */
+  debug?: boolean;
+}
+//#endregion
+export { WeslPluginOptions as t };

package/dist/pluginIndex.d.mts

@@ -1,6 +1,7 @@
 import { i as ProjectSources, n as PluginExtension, r as PluginExtensionApi, t as ExtensionEmitFn } from "./PluginExtension-DTjKL6rt.mjs";
 
 //#region src/extensions/LinkExtension.d.ts
+/** Extension that emits a JavaScript LinkParams object for runtime linking. */
 declare const linkBuildExtension: PluginExtension;
 //#endregion
 //#region src/extensions/ReflectExtension.d.ts

package/dist/pluginIndex.mjs

@@ -1,4 +1,4 @@
-import { r as linkBuildExtension, t as staticBuildExtension } from "./StaticExtension-CDqA2teq.mjs";
+import { r as linkBuildExtension, t as staticBuildExtension } from "./StaticExtension-q_mP-ool.mjs";
 import fs from "node:fs/promises";
 import { originalTypeName, weslStructs, wgslTypeToTs } from "wesl-reflect";
 //#region src/extensions/ReflectExtension.ts

package/dist/plugins/astro.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 
 //#region src/plugins/astro.d.ts
 declare const _default: (options: WeslPluginOptions) => any;

package/dist/plugins/astro.mjs

@@ -1,5 +1,5 @@
-import { t as unplugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { t as unplugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 //#region src/plugins/astro.ts
 var astro_default = (options) => ({
 	name: "wesl-plugin",

package/dist/plugins/esbuild.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 import * as esbuild from "esbuild";
 
 //#region src/plugins/esbuild.d.ts

package/dist/plugins/esbuild.mjs

@@ -1,5 +1,5 @@
-import { n as weslPlugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { n as weslPlugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import { createEsbuildPlugin } from "unplugin";
 //#region src/plugins/esbuild.ts
 var esbuild_default = createEsbuildPlugin(weslPlugin);

package/dist/plugins/farm.mjs

@@ -1,5 +1,5 @@
-import { n as weslPlugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { n as weslPlugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import { createFarmPlugin } from "unplugin";
 //#region src/plugins/farm.ts
 var farm_default = createFarmPlugin(weslPlugin);

package/dist/plugins/nuxt.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/plugins/nuxt.d.ts

package/dist/plugins/nuxt.mjs

@@ -1,5 +1,5 @@
-import "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import vite_default from "./vite.mjs";
 import webpack_default from "./webpack.mjs";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";

package/dist/plugins/rollup.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 import * as rollup from "rollup";
 
 //#region src/plugins/rollup.d.ts

package/dist/plugins/rollup.mjs

@@ -1,5 +1,5 @@
-import { n as weslPlugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { n as weslPlugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import { createRollupPlugin } from "unplugin";
 //#region src/plugins/rollup.ts
 var rollup_default = createRollupPlugin(weslPlugin);

package/dist/plugins/rspack.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 
 //#region src/plugins/rspack.d.ts
 declare const _default: (options?: WeslPluginOptions | undefined) => RspackPluginInstance;

package/dist/plugins/rspack.mjs

@@ -1,5 +1,5 @@
-import { n as weslPlugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { n as weslPlugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import { createRspackPlugin } from "unplugin";
 //#region src/plugins/rspack.ts
 var rspack_default = createRspackPlugin(weslPlugin);

package/dist/plugins/vite.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 import * as vite from "vite";
 
 //#region src/plugins/vite.d.ts

package/dist/plugins/vite.mjs

@@ -1,5 +1,5 @@
-import { n as weslPlugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { n as weslPlugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import { createVitePlugin } from "unplugin";
 //#region src/plugins/vite.ts
 var vite_default = createVitePlugin(weslPlugin);

package/dist/plugins/webpack.d.mts

@@ -1,4 +1,4 @@
-import { t as WeslPluginOptions } from "../WeslPluginOptions-D81oyynl.mjs";
+import { t as WeslPluginOptions } from "../WeslPluginOptions-B84JB1bv.mjs";
 import * as webpack from "webpack";
 
 //#region src/plugins/webpack.d.ts

package/dist/plugins/webpack.mjs

@@ -1,5 +1,5 @@
-import { n as weslPlugin } from "../WeslPlugin-B91dE_tA.mjs";
-import "../StaticExtension-CDqA2teq.mjs";
+import { n as weslPlugin } from "../WeslPlugin-BIolevHn.mjs";
+import "../StaticExtension-q_mP-ool.mjs";
 import { createWebpackPlugin } from "unplugin";
 //#region src/plugins/webpack.ts
 var webpack_default = createWebpackPlugin(weslPlugin);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "wesl-plugin",
   "description": "",
-  "version": "0.6.73",
+  "version": "0.6.75",
   "type": "module",
   "files": [
     "src",
     "dist"
   ],
-  "repository": "github:wgsl-tooling-wg/wesl-js",
+  "repository": "github:webgpu-tools/wesl-js",
   "exports": {
     ".": "./dist/pluginIndex.mjs",
     "./suffixes": {
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "unplugin": "^2.3.5",
-    "wesl": "0.7.25",
-    "wesl-reflect": "0.0.4"
+    "wesl": "0.7.27",
+    "wesl-reflect": "0.0.6"
   },
   "devDependencies": {
     "@nuxt/kit": "^3.17.6",

package/src/PluginApi.ts

@@ -64,14 +64,9 @@ function resolveDepsFromUnbound(
   unbound: string[][],
   projectDir: string,
 ): string[] {
-  const depsArray = Array.isArray(dependencies)
-    ? dependencies
-    : [dependencies ?? "auto"];
-  if (!depsArray.includes("auto")) return depsArray;
-
-  const base = depsArray.filter(dep => dep !== "auto");
-  const discovered = resolvePkgDeps(unbound, projectDir);
-  return [...new Set([...base, ...discovered])];
+  return resolveDepsWithDiscovery(dependencies, () =>
+    resolvePkgDeps(unbound, projectDir),
+  );
 }
 
 /** Load and cache the wesl.toml configuration. */
@@ -156,6 +151,16 @@ function resolveDeps(
   dependencies: string | string[] | undefined,
   weslSrc: Record<string, string>,
   projectDir: string,
+): string[] {
+  return resolveDepsWithDiscovery(dependencies, () =>
+    parseDependencies(weslSrc, projectDir),
+  );
+}
+
+/** Normalize deps array, replace "auto" with discovered deps, deduplicate. */
+function resolveDepsWithDiscovery(
+  dependencies: string | string[] | undefined,
+  discover: () => string[],
 ): string[] {
   const depsArray = Array.isArray(dependencies)
     ? dependencies
@@ -163,8 +168,7 @@ function resolveDeps(
   if (!depsArray.includes("auto")) return depsArray;
 
   const base = depsArray.filter(dep => dep !== "auto");
-  const discovered = parseDependencies(weslSrc, projectDir);
-  return [...new Set([...base, ...discovered])];
+  return [...new Set([...base, ...discover()])];
 }
 
 /** @return a function that resolves a shader path to a weslRoot-relative module path. */

package/src/WeslPluginOptions.ts

@@ -1,9 +1,12 @@
 import type { PluginExtension } from "./PluginExtension.ts";
 
 export interface WeslPluginOptions {
+  /** Path to wesl.toml config file (default: auto-detected from project root). */
   weslToml?: string;
+
+  /** Custom plugin extensions for additional import suffixes or code generation. */
   extensions?: PluginExtension[];
 
-  /** Log plugin activity to stderr for debugging */
+  /** Log plugin activity to stderr for debugging. */
   debug?: boolean;
 }

package/src/extensions/LinkExtension.ts

@@ -5,6 +5,7 @@ import type {
   PluginExtensionApi,
 } from "../PluginExtension.ts";
 
+/** Extension that emits a JavaScript LinkParams object for runtime linking. */
 export const linkBuildExtension: PluginExtension = {
   extensionName: "link",
   emitFn: emitLinkJs,
@@ -12,12 +13,12 @@ export const linkBuildExtension: PluginExtension = {
 
 /** Emit a JavaScript LinkParams structure, ready for linking at runtime. */
 async function emitLinkJs(
-  baseId: string,
+  shaderPath: string,
   api: PluginExtensionApi,
   _conditions?: Record<string, boolean>,
   options?: Record<string, string>,
 ): Promise<string> {
-  const rootModule = await api.weslMain(baseId);
+  const rootModule = await api.weslMain(shaderPath);
   const rootModuleName = noSuffix(rootModule);
 
   const [{ weslSrc, dependencies: autoDeps }, debugWeslRoot] =
@@ -35,7 +36,12 @@ async function emitLinkJs(
   const rootName = path.basename(rootModuleName).replace(/\W/g, "_");
   const paramsName = `link${rootName}Config`;
 
-  const linkParams: LinkParams = { rootModuleName, weslSrc, debugWeslRoot };
+  const linkParams: LinkParams & { shaderRoot?: string } = {
+    rootModuleName,
+    weslSrc,
+    debugWeslRoot,
+    shaderRoot: debugWeslRoot,
+  };
   const libsStr = `libs: [${sanitizedDeps.join(", ")}]`;
   const linkParamsStr = `{
     ${serializeFields(linkParams)},
@@ -49,6 +55,7 @@ async function emitLinkJs(
     `;
 }
 
+/** Serialize an object's fields as `key: value` pairs for embedding in generated JS. */
 function serializeFields(record: Record<string, any>) {
   return Object.entries(record)
     .map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`)

package/src/extensions/StaticExtension.ts

@@ -20,7 +20,7 @@ async function emitStaticJs(
   conditions?: Conditions,
   _options?: Record<string, string>,
 ): Promise<string> {
-  const { resolvedRoot, tomlDir } = await api.weslToml();
+  const { tomlDir } = await api.weslToml();
 
   const tomlUrl = url.pathToFileURL(path.join(tomlDir, "wesl.toml"));
   const parentModule = tomlUrl.toString();
@@ -28,9 +28,10 @@ async function emitStaticJs(
   const rootModule = await api.weslMain(baseId);
   const rootModuleName = noSuffix(rootModule);
 
-  const [weslSrc, dependencies] = await Promise.all([
+  const [weslSrc, dependencies, debugWeslRoot] = await Promise.all([
     api.weslSrc(),
     api.weslDependencies(),
+    api.debugWeslRoot(),
   ]);
 
   const libFileUrls = dependencies.map(d => resolve(d, parentModule));
@@ -38,9 +39,6 @@ async function emitStaticJs(
   const libModules = await Promise.all(libFileUrls.map(f => import(f)));
   const libs = libModules.map(m => m.default);
 
-  const tomlRelative = path.relative(tomlDir, resolvedRoot);
-  const debugWeslRoot = tomlRelative.replaceAll(path.sep, "/");
-
   const { dest: wgsl } = await link({
     weslSrc,
     rootModuleName,

package/dist/WeslPluginOptions-D81oyynl.d.mts

@@ -1,11 +0,0 @@
-import { n as PluginExtension } from "./PluginExtension-DTjKL6rt.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 };