wgsl-test 0.2.1 → 0.2.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { DeviceCache, RenderUniforms, RenderUniforms as RenderUniforms$1, SamplerOptions, checkerboardTexture, colorBarsTexture, createSampler, createUniformsVirtualLib, edgePatternTexture, fullscreenTriangleVertex, gradientTexture, noiseTexture, radialGradientTexture, renderUniformBuffer, simpleRender, solidTexture, updateRenderUniforms, withErrorScopes } from "wesl-gpu";
+import { DeviceCache, FragmentRenderParams, RenderUniforms, SamplerOptions, WeslOptions, checkerboardTexture, colorBarsTexture, createSampler, createUniformsVirtualLib, edgePatternTexture, fullscreenTriangleVertex, gradientTexture, noiseTexture, radialGradientTexture, renderUniformBuffer, simpleRender, solidTexture, updateRenderUniforms, withErrorScopes } from "wesl-gpu";
 import { LinkParams, ModuleResolver, WeslBundle } from "wesl";
 import { WgslElementType, WgslElementType as WgslElementType$1 } from "thimbleberry";
 import { ImageData, ImageData as ImageData$1, MatchImageOptions } from "vitest-image-snapshot";
@@ -140,7 +140,7 @@ declare function testCompute(params: ComputeTestParams): Promise<number[]>;
 declare function runCompute(device: GPUDevice, module: GPUShaderModule, resultFormat?: WgslElementType$1, size?: number, dispatchWorkgroups?: number | [number, number, number]): Promise<number[]>;
 //#endregion
 //#region src/TestFragmentShader.d.ts
-interface FragmentTestParams {
+interface FragmentTestParams extends WeslOptions, FragmentRenderParams {
   /** WESL/WGSL source code for the fragment shader to test.
    * Either src or moduleName must be provided, but not both. */
   src?: string;
@@ -153,31 +153,6 @@ interface FragmentTestParams {
    * Optional: defaults to searching upward from cwd for package.json or wesl.toml.
    * Typically use `import.meta.url`. */
   projectDir?: string;
-  /** GPU device for running the tests.
-   * Typically use `getGPUDevice()` from wgsl-test. */
-  device: GPUDevice;
-  /** Texture format for the output texture. Default: "rgba32float" */
-  textureFormat?: GPUTextureFormat;
-  /** Size of the output texture. Default: [1, 1] for simple color tests.
-   * Use [2, 2] for derivative tests (forms a complete 2x2 quad for dpdx/dpdy). */
-  size?: [width: number, height: number];
-  /** Flags for conditional compilation to test shader specialization.
-   * Useful for testing `@if` statements in the shader. */
-  conditions?: LinkParams["conditions"];
-  /** Constants for shader compilation.
-   * Injects host-provided values via the `constants::` namespace. */
-  constants?: LinkParams["constants"];
-  /** Uniform values for the shader (time, mouse).
-   * Resolution is auto-populated from the size parameter.
-   * Creates test::Uniforms struct available in the shader. */
-  uniforms?: RenderUniforms$1;
-  /** Input textures for the shader.
-   * Bindings: textures at [1..n], samplers at [n+1..n+m].
-   * Binding 0 is reserved for uniforms. */
-  textures?: GPUTexture[];
-  /** Samplers for the input textures.
-   * Must be length 1 (reused for all textures) or match textures.length exactly. */
-  samplers?: GPUSampler[];
   /** Use source shaders from current package instead of built bundles.
    * Default: true for faster iteration during development. */
   useSourceShaders?: boolean;

package/dist/index.js

@@ -1,8 +1,8 @@
-import { DeviceCache, DeviceCache as DeviceCache$1, checkerboardTexture, colorBarsTexture, createSampler, createUniformsVirtualLib, edgePatternTexture, fullscreenTriangleVertex, gradientTexture, linkFragmentShader, noiseTexture, radialGradientTexture, renderUniformBuffer, renderUniformBuffer as renderUniformBuffer$1, simpleRender, simpleRender as simpleRender$1, solidTexture, updateRenderUniforms, withErrorScopes, withErrorScopes as withErrorScopes$1 } from "wesl-gpu";
+import { DeviceCache, DeviceCache as DeviceCache$1, checkerboardTexture, colorBarsTexture, createSampler, createUniformsVirtualLib, edgePatternTexture, fullscreenTriangleVertex, gradientTexture, noiseTexture, radialGradientTexture, renderUniformBuffer, runFragment, simpleRender, solidTexture, updateRenderUniforms, withErrorScopes, withErrorScopes as withErrorScopes$1 } from "wesl-gpu";
 import * as path$1 from "node:path";
 import path, { posix, win32 } from "node:path";
 import { URL as URL$1, fileURLToPath, pathToFileURL } from "node:url";
-import { CompositeResolver, RecordResolver, WeslParseError, filterMap, findUnboundIdents, link, normalizeModuleName, npmNameVariations, parseSrcModule } from "wesl";
+import { CompositeResolver, RecordResolver, WeslParseError, filterMap, findUnboundIdents, link, moduleToRelativePath, normalizeDebugRoot, normalizeModuleName, npmNameVariations, parseSrcModule } from "wesl";
 import * as fs$3 from "node:fs";
 import fs, { realpathSync, statSync } from "node:fs";
 import * as fs$2 from "node:fs/promises";
@@ -125,23 +125,16 @@ var FileModuleResolver = class {
 	}
 	/** Convert module path (package::foo::bar) to filesystem path (baseDir/foo/bar) */
 	moduleToFilePath(modulePath) {
-		const parts = modulePath.split("::");
-		if (!(parts[0] === "package" || parts[0] === this.packageName)) return void 0;
-		const relativePath = parts.slice(1).join("/");
+		const relativePath = moduleToRelativePath(modulePath, this.packageName);
+		if (!relativePath) return void 0;
 		return `${this.baseDir}/${relativePath}`;
 	}
 	/** Convert module path to debug path for error messages */
 	modulePathToDebugPath(modulePath) {
-		const relativePath = modulePath.split("::").slice(1).join("/");
-		return normalizeDebugRoot(this.debugWeslRoot) + relativePath + ".wesl";
+		const relative = moduleToRelativePath(modulePath, this.packageName) ?? "";
+		return normalizeDebugRoot(this.debugWeslRoot) + relative + ".wesl";
 	}
 };
-/** Normalize debugWeslRoot to ensure it ends with / or is empty */
-function normalizeDebugRoot(debugWeslRoot) {
-	if (debugWeslRoot === void 0) return "./";
-	if (debugWeslRoot === "") return "";
-	return debugWeslRoot.endsWith("/") ? debugWeslRoot : debugWeslRoot + "/";
-}
 
 //#endregion
 //#region ../../node_modules/.pnpm/@isaacs+balanced-match@4.0.1/node_modules/@isaacs/balanced-match/dist/esm/index.js
@@ -11454,7 +11447,7 @@ async function expectFragmentImage(device, moduleName, opts = {}) {
 */
 async function testFragment(params) {
 	const { textureFormat = "rgba32float" } = params;
-	const data = await runFragment(params);
+	const data = await runFragment$1(params);
 	const count = numComponents(textureFormat);
 	return data.slice(0, count);
 }
@@ -11468,7 +11461,7 @@ async function testFragment(params) {
 */
 async function testFragmentImage(params) {
 	const { textureFormat = "rgba32float", size = [1, 1] } = params;
-	const data = imageToUint8(await runFragment(params), textureFormat, size[0], size[1]);
+	const data = imageToUint8(await runFragment$1(params), textureFormat, size[0], size[1]);
 	return {
 		data: new Uint8ClampedArray(data),
 		width: size[0],
@@ -11476,33 +11469,20 @@ async function testFragmentImage(params) {
 		colorSpace: "srgb"
 	};
 }
-async function runFragment(params) {
-	const { projectDir, device, src, moduleName, useSourceShaders } = params;
-	const { conditions = {}, constants } = params;
-	const { textureFormat = "rgba32float", size = [1, 1] } = params;
-	const { textures, samplers, uniforms = {} } = params;
+async function runFragment$1(params) {
+	const { projectDir, src, moduleName, useSourceShaders } = params;
 	const fragmentSrc = await resolveShaderSource(src, moduleName, projectDir);
 	const ctx = await resolveShaderContext({
 		src: fragmentSrc,
 		projectDir,
 		useSourceShaders
 	});
-	return await simpleRender$1({
-		device,
-		module: await linkFragmentShader({
-			device,
-			fragmentSource: fragmentSrc,
-			bundles: ctx.libs,
-			resolver: ctx.resolver,
-			packageName: ctx.packageName,
-			conditions,
-			constants
-		}),
-		outputFormat: textureFormat,
-		size,
-		textures,
-		samplers,
-		uniformBuffer: renderUniformBuffer$1(device, size, uniforms)
+	return runFragment({
+		...params,
+		src: fragmentSrc,
+		libs: params.libs ?? ctx.libs,
+		resolver: params.resolver ?? ctx.resolver,
+		packageName: params.packageName ?? ctx.packageName
 	});
 }
 /** Convert texture data to RGBA Uint8ClampedArray for image comparison. */