wesl-plugin 0.6.70 → 0.6.72

package/README.md

@@ -96,10 +96,10 @@ export default {
 
 ### Conditions in Import Path
 
-For `?static`, you can specify conditions directly in the import:
+For `?static`, you can specify conditions as query parameters:
 
 ```ts
-import wgsl from "./app.wesl MOBILE=true DEBUG=false ?static";
+import wgsl from "./app.wesl?MOBILE=true&DEBUG=false&static";
 ```
 
 ## Configuration (wesl.toml)
@@ -124,7 +124,7 @@ import type { PluginExtension } from "wesl-plugin";
 
 const myExtension: PluginExtension = {
   extensionName: "myfeature",  // enables ?myfeature imports
-  emitFn: async (shaderPath, api, conditions) => {
+  emitFn: async (shaderPath, api, conditions, options) => {
     const sources = await api.weslSrc();
     // Return JavaScript code as a string
     return `export default ${JSON.stringify(sources)};`;

package/dist/{PluginExtension-nH8vi0nm.d.mts → PluginExtension-DTjKL6rt.d.mts}

@@ -31,14 +31,16 @@ interface WeslTomlInfo {
 }
 //#endregion
 //#region src/PluginExtension.d.ts
-/** function type required for for emit extensions */
+/** function type required for emit extensions */
 type ExtensionEmitFn = (/** absolute path to the shader to which the extension is attached */
 
 shaderPath: string, /** support functions available to plugin extensions */
 
 pluginApi: PluginExtensionApi, /** static conditions specified on the js import */
 
-conditions?: Record<string, boolean>) => Promise<string>;
+conditions?: Record<string, boolean>, /** plugin-level options from query params (e.g., { include: "all" }) */
+
+options?: Record<string, string>) => Promise<string>;
 /** an extension that runs inside the wesl-js build plugin */
 interface PluginExtension extends WeslJsPlugin {
   /** javascript imports with this suffix will trigger the plugin */
@@ -47,6 +49,10 @@ interface PluginExtension extends WeslJsPlugin {
    *   e.g. import myPluginJs from "./foo.wesl?myPlugin"; */
   emitFn: ExtensionEmitFn;
 }
+interface ProjectSources {
+  weslSrc: Record<string, string>;
+  dependencies: string[];
+}
 /** api supplied to plugin extensions */
 interface PluginExtensionApi {
   weslToml: () => Promise<WeslTomlInfo>;
@@ -54,6 +60,12 @@ interface PluginExtensionApi {
   weslRegistry: () => Promise<BatchModuleResolver>;
   weslMain: (baseId: string) => Promise<string>;
   weslDependencies: () => Promise<string[]>;
+  /** weslRoot relative to tomlDir, with forward slashes. */
+  debugWeslRoot: () => Promise<string>;
+  /** Get weslSrc scoped to modules reachable from a root, plus their deps. */
+  scopedProject: (rootModuleName: string) => Promise<ProjectSources>;
+  /** Fetch project sources, either all or scoped to reachable modules. */
+  fetchProject: (rootModuleName: string, options?: Record<string, string>) => Promise<ProjectSources>;
 }
 //#endregion
-export { PluginExtension as n, PluginExtensionApi as r, ExtensionEmitFn as t };
+export { ProjectSources as i, PluginExtension as n, PluginExtensionApi as r, ExtensionEmitFn as t };

package/dist/{StaticExtension-Chl5KPpw.mjs → StaticExtension-CDqA2teq.mjs}

@@ -7,19 +7,15 @@ import fs, { realpathSync, statSync } from "node:fs";
 import process from "node:process";
 import v8 from "node:v8";
 import { format, inspect } from "node:util";
-
 //#region src/extensions/LinkExtension.ts
 const linkBuildExtension = {
 	extensionName: "link",
 	emitFn: emitLinkJs
 };
 /** Emit a JavaScript LinkParams structure, ready for linking at runtime. */
-async function emitLinkJs(baseId, api) {
-	const { resolvedRoot, tomlDir } = await api.weslToml();
-	const weslSrc = await api.weslSrc();
+async function emitLinkJs(baseId, api, _conditions, options) {
 	const rootModuleName = noSuffix(await api.weslMain(baseId));
-	const debugWeslRoot = path.relative(tomlDir, resolvedRoot).replaceAll(path.sep, "/");
-	const autoDeps = await api.weslDependencies();
+	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");
 	const paramsName = `link${path.basename(rootModuleName).replace(/\W/g, "_")}Config`;
@@ -41,7 +37,6 @@ async function emitLinkJs(baseId, api) {
 function serializeFields(record) {
 	return Object.entries(record).map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`).join(",\n");
 }
-
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/errors.js
 /**
@@ -378,7 +373,6 @@ function determineSpecificType(value) {
 	if (inspected.length > 28) inspected = `${inspected.slice(0, 25)}...`;
 	return `type ${typeof value} (${inspected})`;
 }
-
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/package-json-reader.js
 /**
@@ -474,7 +468,6 @@ function getPackageScopeConfig(resolved) {
 function getPackageType(url) {
 	return getPackageScopeConfig(url).type;
 }
-
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/get-format.js
 const { ERR_UNKNOWN_FILE_EXTENSION } = codes;
@@ -578,7 +571,6 @@ function defaultGetFormatWithoutErrors(url, context) {
 	if (!hasOwnProperty.call(protocolHandlers, protocol)) return null;
 	return protocolHandlers[protocol](url, context, true) || null;
 }
-
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/utils.js
 const { ERR_INVALID_ARG_VALUE } = codes;
@@ -607,7 +599,6 @@ function getConditionsSet(conditions) {
 	}
 	return getDefaultConditionsSet();
 }
-
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/lib/resolve.js
 /**
@@ -1267,7 +1258,6 @@ function defaultResolve(specifier, context = {}) {
 		format: defaultGetFormatWithoutErrors(url, { parentURL })
 	};
 }
-
 //#endregion
 //#region ../../node_modules/.pnpm/import-meta-resolve@4.1.0/node_modules/import-meta-resolve/index.js
 /**
@@ -1298,40 +1288,32 @@ function resolve(specifier, parent) {
 		throw error;
 	}
 }
-
 //#endregion
 //#region src/extensions/StaticExtension.ts
-/**
-* a wesl-js ?static build extension that statically links from the root file
-* and emits a JavaScript file containing the linked wgsl string.
-*
-* use it like this:
-*   import wgsl from "./shaders/app.wesl?static";
-*
-* or with conditions, like this:
-*   import wgsl from "../shaders/foo/app.wesl MOBILE=true FUN SAFE=false ?static";
-*/
+/** Build extension for ?static imports: links WESL at build time, emits WGSL string. */
 const staticBuildExtension = {
 	extensionName: "static",
 	emitFn: emitStaticJs
 };
-/** Emit a JavaScript file containing the wgsl string */
-async function emitStaticJs(baseId, api, conditions) {
+/** Emit a JS module exporting the statically linked WGSL string. */
+async function emitStaticJs(baseId, api, conditions, _options) {
 	const { resolvedRoot, tomlDir } = await api.weslToml();
 	const parentModule = url.pathToFileURL(path.join(tomlDir, "wesl.toml")).toString();
-	const futureLibs = (await api.weslDependencies()).map((d) => resolve(d, parentModule)).map((f) => import(f));
-	const libs = (await Promise.all(futureLibs)).map((m) => m.default);
-	return `
-    export const wgsl = \`${(await link({
-		weslSrc: await api.weslSrc(),
-		rootModuleName: noSuffix(await api.weslMain(baseId)),
+	const rootModuleName = noSuffix(await api.weslMain(baseId));
+	const [weslSrc, dependencies] = await Promise.all([api.weslSrc(), api.weslDependencies()]);
+	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,
 		conditions
-	})).dest}\`;
+	});
+	return `
+    export const wgsl = \`${wgsl}\`;
     export default wgsl;
   `;
 }
-
 //#endregion
-export { resolve as n, linkBuildExtension as r, staticBuildExtension as t };
+export { resolve as n, linkBuildExtension as r, staticBuildExtension as t };