wesl-tooling 0.6.3 → 0.6.5

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { VirtualLibraryFn, WeslBundle, WeslDevice } from "wesl";
-import { GPUElementFormat } from "thimbleberry";
+import { VirtualLibraryFn, WeslBundle } from "wesl";
+import { WgslElementType, WgslElementType as WgslElementType$1 } from "thimbleberry";
 
 //#region src/ParseDependencies.d.ts
 /**
@@ -42,6 +42,18 @@ declare function dependencyBundles(weslSrc: Record<string, string>, projectDir:
 
 //#endregion
 //#region src/SimpleComputeShader.d.ts
+interface CompileShaderParams {
+  /** The project directory, used for resolving dependencies.  */
+  projectDir: string;
+  /** The GPUDevice to use for shader compilation. */
+  device: GPUDevice;
+  /** The WGSL/WESL shader source code. */
+  src: string;
+  /** Optional conditions for shader compilation. */
+  conditions?: Record<string, boolean>;
+  /** Optional virtual libraries to include in the shader. */
+  virtualLibs?: Record<string, VirtualLibraryFn>;
+}
 /**
  * Compiles a single WESL shader source string into a GPUShaderModule for testing
  * with automatic package detection.
@@ -51,11 +63,11 @@ declare function dependencyBundles(weslSrc: Record<string, string>, projectDir:
  * bundle to include in the link.
  *
  * @param projectDir - The project directory, used for resolving dependencies.
- * @param device - The WeslDevice to use for shader compilation.
+ * @param device - The GPUDevice to use for shader compilation.
  * @param src - The WESL shader source code.
  * @returns A Promise that resolves to the compiled GPUShaderModule.
  */
-declare function compileShader(projectDir: string, device: WeslDevice, src: string, virtualLibs?: Record<string, VirtualLibraryFn>): Promise<GPUShaderModule>;
+declare function compileShader(params: CompileShaderParams): Promise<GPUShaderModule>;
 /**
  * Transpiles and runs a simple compute shader on the GPU for testing.
  *
@@ -72,7 +84,7 @@ declare function compileShader(projectDir: string, device: WeslDevice, src: stri
  * @param resultFormat - format for interpreting the result buffer data. (default u32)
  * @returns storage result array (typically four numbers if the buffer format is u32 or f32)
  */
-declare function testComputeShader(projectDir: string, gpu: GPU, src: string, resultFormat?: GPUElementFormat): Promise<number[]>;
+declare function testComputeShader(projectDir: string, gpu: GPU, src: string, resultFormat: WgslElementType$1, conditions?: Record<string, boolean>): Promise<number[]>;
 /**
  * Transpiles and runs a simple compute shader on the GPU for testing.
  *
@@ -89,7 +101,7 @@ declare function testComputeShader(projectDir: string, gpu: GPU, src: string, re
  * @param resultFormat - format for interpreting the result buffer data. (default u32)
  * @returns storage result array
  */
-declare function runSimpleComputePipeline(device: GPUDevice, module: GPUShaderModule, resultFormat?: GPUElementFormat): Promise<number[]>;
+declare function runSimpleComputePipeline(device: GPUDevice, module: GPUShaderModule, resultFormat?: WgslElementType$1): Promise<number[]>;
 
 //#endregion
-export { compileShader, dependencyBundles, parseDependencies, runSimpleComputePipeline, testComputeShader };
+export { CompileShaderParams, WgslElementType, compileShader, dependencyBundles, parseDependencies, runSimpleComputePipeline, testComputeShader };

package/dist/index.js

@@ -2,7 +2,7 @@ import { resolve } from "import-meta-resolve";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { WeslParseError, filterMap, findUnboundIdents, link, parseIntoRegistry, parsedRegistry, requestWeslDevice } from "wesl";
-import { copyBuffer } from "thimbleberry";
+import { copyBuffer, elementStride } from "thimbleberry";
 
 //#region src/ParseDependencies.ts
 /**
@@ -95,17 +95,19 @@ const resultBufferSize = 16;
 * bundle to include in the link.
 *
 * @param projectDir - The project directory, used for resolving dependencies.
-* @param device - The WeslDevice to use for shader compilation.
+* @param device - The GPUDevice to use for shader compilation.
 * @param src - The WESL shader source code.
 * @returns A Promise that resolves to the compiled GPUShaderModule.
 */
-async function compileShader(projectDir, device, src, virtualLibs) {
+async function compileShader(params) {
+	const { projectDir, device, src, conditions, virtualLibs } = params;
 	const weslSrc = { main: src };
 	const libs = await dependencyBundles(weslSrc, projectDir);
 	const linked = await link({
 		weslSrc,
 		libs,
-		virtualLibs
+		virtualLibs,
+		conditions
 	});
 	return device.createShaderModule({ code: linked.dest });
 }
@@ -125,26 +127,27 @@ async function compileShader(projectDir, device, src, virtualLibs) {
 * @param resultFormat - format for interpreting the result buffer data. (default u32)
 * @returns storage result array (typically four numbers if the buffer format is u32 or f32)
 */
-async function testComputeShader(projectDir, gpu, src, resultFormat = "f32") {
+async function testComputeShader(projectDir, gpu, src, resultFormat, conditions = {}) {
 	const adapter = await gpu.requestAdapter();
 	const device = await requestWeslDevice(adapter);
 	try {
-		const arraySize = resultBufferSize / elementByteSize(resultFormat);
+		const arraySize = resultBufferSize / elementStride(resultFormat);
 		const arrayType = `array<${resultFormat}, ${arraySize}>`;
 		const virtualLibs = { test: () => `@group(0) @binding(0) var <storage, read_write> results: ${arrayType};` };
-		const module = await compileShader(projectDir, device, src, virtualLibs);
+		const params = {
+			projectDir,
+			device,
+			src,
+			conditions,
+			virtualLibs
+		};
+		const module = await compileShader(params);
 		const result = await runSimpleComputePipeline(device, module, resultFormat);
 		return result;
 	} finally {
 		device.destroy();
 	}
 }
-/** size in bytes of a wgsl numeric type, e.g. 'f32' => 4 */
-function elementByteSize(fmt) {
-	const found = fmt.match(/\d+/);
-	const bits = Number.parseInt(found?.[0]);
-	return bits / 8;
-}
 /**
 * Transpiles and runs a simple compute shader on the GPU for testing.
 *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wesl-tooling",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "type": "module",
   "files": [
     "dist"
@@ -10,7 +10,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "import-meta-resolve": "^4.1.0",
-    "thimbleberry": "^0.2.9"
+    "thimbleberry": "^0.2.10"
   },
   "devDependencies": {
     "dependent_package": "x",