wesl-plugin 0.6.69 → 0.6.71

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-N4JBtncl.d.mts → PluginExtension-CHxUB0-8.d.mts}

@@ -31,10 +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>;
+
+pluginApi: PluginExtensionApi, /** static conditions specified on the js import */
+
+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 */
@@ -43,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>;
@@ -50,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-BvgvwnkI.mjs → StaticExtension-Q8HMuFJa.mjs}

@@ -14,12 +14,9 @@ const linkBuildExtension = {
 	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`;
@@ -165,8 +162,8 @@ codes.ERR_INVALID_PACKAGE_CONFIG = createError(
 	* @param {string} [base]
 	* @param {string} [message]
 	*/
-	(path$1, base, message) => {
-		return `Invalid package config ${path$1}${base ? ` while importing ${base}` : ""}${message ? `. ${message}` : ""}`;
+	(path, base, message) => {
+		return `Invalid package config ${path}${base ? ` while importing ${base}` : ""}${message ? `. ${message}` : ""}`;
 	},
 	Error
 );
@@ -196,8 +193,8 @@ codes.ERR_MODULE_NOT_FOUND = createError(
 	* @param {string} base
 	* @param {boolean} [exactUrl]
 	*/
-	(path$1, base, exactUrl = false) => {
-		return `Cannot find ${exactUrl ? "module" : "package"} '${path$1}' imported from ${base}`;
+	(path, base, exactUrl = false) => {
+		return `Cannot find ${exactUrl ? "module" : "package"} '${path}' imported from ${base}`;
 	},
 	Error
 );
@@ -235,8 +232,8 @@ codes.ERR_UNKNOWN_FILE_EXTENSION = createError(
 	* @param {string} extension
 	* @param {string} path
 	*/
-	(extension, path$1) => {
-		return `Unknown file extension "${extension}" for ${path$1}`;
+	(extension, path) => {
+		return `Unknown file extension "${extension}" for ${path}`;
 	},
 	TypeError
 );
@@ -471,8 +468,8 @@ function getPackageScopeConfig(resolved) {
 * @param {URL} url - The URL to get the package type for.
 * @returns {PackageType}
 */
-function getPackageType(url$1) {
-	return getPackageScopeConfig(url$1).type;
+function getPackageType(url) {
+	return getPackageScopeConfig(url).type;
 }
 
 //#endregion
@@ -537,8 +534,8 @@ function getDataProtocolModuleFormat(parsed) {
 * @param {URL} url
 * @returns {string}
 */
-function extname(url$1) {
-	const pathname = url$1.pathname;
+function extname(url) {
+	const pathname = url.pathname;
 	let index = pathname.length;
 	while (index--) {
 		const code = pathname.codePointAt(index);
@@ -550,22 +547,22 @@ function extname(url$1) {
 /**
 * @type {ProtocolHandler}
 */
-function getFileProtocolModuleFormat(url$1, _context, ignoreErrors) {
-	const value = extname(url$1);
+function getFileProtocolModuleFormat(url, _context, ignoreErrors) {
+	const value = extname(url);
 	if (value === ".js") {
-		const packageType = getPackageType(url$1);
+		const packageType = getPackageType(url);
 		if (packageType !== "none") return packageType;
 		return "commonjs";
 	}
 	if (value === "") {
-		const packageType = getPackageType(url$1);
+		const packageType = getPackageType(url);
 		if (packageType === "none" || packageType === "commonjs") return "commonjs";
 		return "module";
 	}
-	const format$1 = extensionFormatMap[value];
-	if (format$1) return format$1;
+	const format = extensionFormatMap[value];
+	if (format) return format;
 	if (ignoreErrors) return;
-	throw new ERR_UNKNOWN_FILE_EXTENSION(value, fileURLToPath(url$1));
+	throw new ERR_UNKNOWN_FILE_EXTENSION(value, fileURLToPath(url));
 }
 function getHttpProtocolModuleFormat() {}
 /**
@@ -573,10 +570,10 @@ function getHttpProtocolModuleFormat() {}
 * @param {{parentURL: string}} context
 * @returns {string | null}
 */
-function defaultGetFormatWithoutErrors(url$1, context) {
-	const protocol = url$1.protocol;
+function defaultGetFormatWithoutErrors(url, context) {
+	const protocol = url.protocol;
 	if (!hasOwnProperty.call(protocolHandlers, protocol)) return null;
-	return protocolHandlers[protocol](url$1, context, true) || null;
+	return protocolHandlers[protocol](url, context, true) || null;
 }
 
 //#endregion
@@ -649,10 +646,10 @@ function emitInvalidSegmentDeprecation(target, request, match, packageJsonUrl, i
 * @param {string} [main]
 * @returns {void}
 */
-function emitLegacyIndexDeprecation(url$1, packageJsonUrl, base, main) {
+function emitLegacyIndexDeprecation(url, packageJsonUrl, base, main) {
 	if (process.noDeprecation) return;
-	if (defaultGetFormatWithoutErrors(url$1, { parentURL: base.href }) !== "module") return;
-	const urlPath = fileURLToPath(url$1.href);
+	if (defaultGetFormatWithoutErrors(url, { parentURL: base.href }) !== "module") return;
+	const urlPath = fileURLToPath(url.href);
 	const packagePath = fileURLToPath(new URL$1(".", packageJsonUrl));
 	const basePath = fileURLToPath(base);
 	if (!main) process.emitWarning(`No "main" or "exports" field defined in the package.json for ${packagePath} resolving the main entry point "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\nDefault "index" lookups for the main are deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
@@ -662,9 +659,9 @@ function emitLegacyIndexDeprecation(url$1, packageJsonUrl, base, main) {
 * @param {string} path
 * @returns {Stats | undefined}
 */
-function tryStatSync(path$1) {
+function tryStatSync(path) {
 	try {
-		return statSync(path$1);
+		return statSync(path);
 	} catch {}
 }
 /**
@@ -678,8 +675,8 @@ function tryStatSync(path$1) {
 * @param {URL} url
 * @returns {boolean}
 */
-function fileExists(url$1) {
-	const stats = statSync(url$1, { throwIfNoEntry: false });
+function fileExists(url) {
+	const stats = statSync(url, { throwIfNoEntry: false });
 	const isFile = stats ? stats.isFile() : void 0;
 	return isFile === null || isFile === void 0 ? false : isFile;
 }
@@ -695,7 +692,7 @@ function legacyMainResolve(packageJsonUrl, packageConfig, base) {
 	if (packageConfig.main !== void 0) {
 		guess = new URL$1(packageConfig.main, packageJsonUrl);
 		if (fileExists(guess)) return guess;
-		const tries$1 = [
+		const tries = [
 			`./${packageConfig.main}.js`,
 			`./${packageConfig.main}.json`,
 			`./${packageConfig.main}.node`,
@@ -703,9 +700,9 @@ function legacyMainResolve(packageJsonUrl, packageConfig, base) {
 			`./${packageConfig.main}/index.json`,
 			`./${packageConfig.main}/index.node`
 		];
-		let i$1 = -1;
-		while (++i$1 < tries$1.length) {
-			guess = new URL$1(tries$1[i$1], packageJsonUrl);
+		let i = -1;
+		while (++i < tries.length) {
+			guess = new URL$1(tries[i], packageJsonUrl);
 			if (fileExists(guess)) break;
 			guess = void 0;
 		}
@@ -826,12 +823,12 @@ function resolvePackageTargetString(target, subpath, match, packageJsonUrl, base
 	if (subpath !== "" && !pattern && target[target.length - 1] !== "/") throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
 	if (!target.startsWith("./")) {
 		if (internal && !target.startsWith("../") && !target.startsWith("/")) {
-			let isURL$1 = false;
+			let isURL = false;
 			try {
 				new URL$1(target);
-				isURL$1 = true;
+				isURL = true;
 			} catch {}
-			if (!isURL$1) return packageResolve(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target + subpath, packageJsonUrl, conditions);
+			if (!isURL) return packageResolve(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target + subpath, packageJsonUrl, conditions);
 		}
 		throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
 	}
@@ -1096,8 +1093,8 @@ function packageResolve(specifier, base, conditions) {
 	const packageConfig = getPackageScopeConfig(base);
 	/* c8 ignore next 16 */
 	if (packageConfig.exists) {
-		const packageJsonUrl$1 = pathToFileURL(packageConfig.pjsonPath);
-		if (packageConfig.name === packageName && packageConfig.exports !== void 0 && packageConfig.exports !== null) return packageExportsResolve(packageJsonUrl$1, packageSubpath, packageConfig, base, conditions);
+		const packageJsonUrl = pathToFileURL(packageConfig.pjsonPath);
+		if (packageConfig.name === packageName && packageConfig.exports !== void 0 && packageConfig.exports !== null) return packageExportsResolve(packageJsonUrl, packageSubpath, packageConfig, base, conditions);
 	}
 	let packageJsonUrl = new URL$1("./node_modules/" + packageName + "/package.json", base);
 	let packageJsonPath = fileURLToPath(packageJsonUrl);
@@ -1111,12 +1108,12 @@ function packageResolve(specifier, base, conditions) {
 			packageJsonPath = fileURLToPath(packageJsonUrl);
 			continue;
 		}
-		const packageConfig$1 = read(packageJsonPath, {
+		const packageConfig = read(packageJsonPath, {
 			base,
 			specifier
 		});
-		if (packageConfig$1.exports !== void 0 && packageConfig$1.exports !== null) return packageExportsResolve(packageJsonUrl, packageSubpath, packageConfig$1, base, conditions);
-		if (packageSubpath === ".") return legacyMainResolve(packageJsonUrl, packageConfig$1, base);
+		if (packageConfig.exports !== void 0 && packageConfig.exports !== null) return packageExportsResolve(packageJsonUrl, packageSubpath, packageConfig, base, conditions);
+		if (packageSubpath === ".") return legacyMainResolve(packageJsonUrl, packageConfig, base);
 		return new URL$1(packageSubpath, packageJsonUrl);
 	} while (packageJsonPath.length !== lastPath.length);
 	throw new ERR_MODULE_NOT_FOUND(packageName, fileURLToPath(base), false);
@@ -1261,10 +1258,10 @@ function defaultResolve(specifier, context = {}) {
 	if (protocol === "node:") return { url: specifier };
 	if (parsed && parsed.protocol === "node:") return { url: specifier };
 	const conditions = getConditionsSet(context.conditions);
-	const url$1 = moduleResolve(specifier, new URL$1(parentURL), conditions, false);
+	const url = moduleResolve(specifier, new URL$1(parentURL), conditions, false);
 	return {
-		url: url$1.href,
-		format: defaultGetFormatWithoutErrors(url$1, { parentURL })
+		url: url.href,
+		format: defaultGetFormatWithoutErrors(url, { parentURL })
 	};
 }
 
@@ -1301,34 +1298,28 @@ function resolve(specifier, parent) {
 
 //#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;
   `;
 }