wesl-gpu 0.1.1 → 0.1.3

package/dist/index.js

@@ -335,20 +335,28 @@ async function linkAndCreatePipeline(params) {
 * - a virtual module containing a std uniform buffer (for size, etc.)
 */
 async function linkFragmentShader(params) {
-	const { device, fragmentSource, bundles = [], resolver } = params;
-	const { conditions, constants, packageName } = params;
+	const { fragmentSource, conditions, constants, packageName, config } = params;
+	const { device, resolver, libs = [], rootModuleName = "main" } = params;
+	const { weslSrc, virtualLibs } = params;
 	const fullSource = `${fragmentSource}\n\n${fullscreenTriangleVertex}`;
-	let sourceParams;
-	if (resolver) sourceParams = { resolver: new CompositeResolver([new RecordResolver({ main: fullSource }, { packageName }), resolver]) };
-	else sourceParams = { weslSrc: { main: fullSource } };
+	const resolvers = [];
+	resolvers.push(new RecordResolver({ [rootModuleName]: fullSource }, { packageName }));
+	if (weslSrc) resolvers.push(new RecordResolver(weslSrc, { packageName }));
+	let finalResolver = resolvers.length === 1 ? resolvers[0] : new CompositeResolver(resolvers);
+	if (resolver) finalResolver = new CompositeResolver([finalResolver, resolver]);
+	const mergedVirtualLibs = {
+		...createUniformsVirtualLib(),
+		...virtualLibs
+	};
 	return (await link({
-		...sourceParams,
-		rootModuleName: "main",
+		resolver: finalResolver,
+		rootModuleName,
 		packageName,
-		libs: bundles,
-		virtualLibs: createUniformsVirtualLib(),
+		libs,
+		virtualLibs: mergedVirtualLibs,
 		conditions,
-		constants
+		constants,
+		config
 	})).createShaderModule(device);
 }
 /** Create fullscreen fragment render pipeline from a shader module. */
@@ -492,4 +500,41 @@ function createBindGroup(device, uniformBuffer, textures = [], samplers = []) {
 }
 
 //#endregion
-export { DeviceCache, checkerboardTexture, colorBarsTexture, createBindGroup, createSampler, createUniformsVirtualLib, edgePatternTexture, fullscreenTriangleVertex, fullscreenVertexCount, gradientTexture, linkAndCreatePipeline, linkFragmentShader, noiseTexture, radialGradientTexture, renderFrame, renderUniformBuffer, simpleRender, solidTexture, updateRenderUniforms, withErrorScopes };
+//#region src/RunFragment.ts
+/**
+* Run a fragment shader and return pixel data.
+*
+* Combines linking, uniform setup, and rendering into a single call.
+* Useful for shader testing or single-frame renders.
+*
+* @returns Pixel data as a flattened number array
+*/
+async function runFragment(params) {
+	const { src, device } = params;
+	const { textureFormat = "rgba32float", size = [1, 1] } = params;
+	const { textures, samplers, uniforms = {} } = params;
+	return simpleRender({
+		device,
+		module: await linkFragmentShader({
+			device,
+			fragmentSource: src,
+			resolver: params.resolver,
+			weslSrc: params.weslSrc,
+			libs: params.libs,
+			virtualLibs: params.virtualLibs,
+			conditions: params.conditions,
+			constants: params.constants,
+			packageName: params.packageName,
+			rootModuleName: params.rootModuleName,
+			config: params.config
+		}),
+		outputFormat: textureFormat,
+		size,
+		textures,
+		samplers,
+		uniformBuffer: renderUniformBuffer(device, size, uniforms)
+	});
+}
+
+//#endregion
+export { DeviceCache, checkerboardTexture, colorBarsTexture, createBindGroup, createSampler, createUniformsVirtualLib, edgePatternTexture, fullscreenTriangleVertex, fullscreenVertexCount, gradientTexture, linkAndCreatePipeline, linkFragmentShader, noiseTexture, radialGradientTexture, renderFrame, renderUniformBuffer, runFragment, simpleRender, solidTexture, updateRenderUniforms, withErrorScopes };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wesl-gpu",
   "description": "Browser-compatible WebGPU utilities for shader testing and rendering",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "repository": "github:wgsl-tooling-wg/wesl-js",
   "exports": {
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "thimbleberry": "^0.2.10",
-    "wesl": "0.6.47"
+    "wesl": "0.6.49"
   },
   "devDependencies": {
     "@webgpu/types": "^0.1.65"

package/src/FragmentParams.ts

@@ -0,0 +1,42 @@
+import type { LinkParams } from "wesl";
+import type { RenderUniforms } from "./RenderUniforms.ts";
+
+/** WESL linker options - aligned with wesl's LinkParams */
+export type WeslOptions = Pick<
+  LinkParams,
+  | "resolver"
+  | "weslSrc"
+  | "rootModuleName"
+  | "conditions"
+  | "libs"
+  | "virtualLibs"
+  | "packageName"
+  | "constants"
+  | "config"
+>;
+
+/** GPU rendering params for fragment shaders */
+export interface FragmentRenderParams {
+  device: GPUDevice;
+
+  /** Output texture format. Default: "rgba32float" */
+  textureFormat?: GPUTextureFormat;
+
+  /** Output texture size. Default: [1, 1] */
+  size?: [width: number, height: number];
+
+  /** Uniform values (time, mouse). Resolution auto-populated from size. */
+  uniforms?: RenderUniforms;
+
+  /** Input textures. Bindings: [1..n], samplers at [n+1..n+m]. */
+  textures?: GPUTexture[];
+
+  /** Samplers. Length 1 (reused) or match textures.length. */
+  samplers?: GPUSampler[];
+}
+
+/** Combined params for fragment shader execution */
+export interface FragmentParams extends WeslOptions, FragmentRenderParams {
+  /** Fragment shader source (vertex shader auto-provided) */
+  src: string;
+}

package/src/FragmentPipeline.ts

@@ -1,29 +1,14 @@
-import type { LinkParams, ModuleResolver, WeslBundle } from "wesl";
 import { CompositeResolver, link, RecordResolver } from "wesl";
+import type { WeslOptions } from "./FragmentParams.ts";
 import { fullscreenTriangleVertex } from "./FullscreenVertex.ts";
 import { createUniformsVirtualLib } from "./RenderUniforms.ts";
 
-export interface LinkFragmentParams {
+export type LinkFragmentParams = WeslOptions & {
   device: GPUDevice;
 
   /** Fragment shader source (vertex shader is auto-provided) */
   fragmentSource: string;
-
-  /** WESL library bundles for dependencies */
-  bundles?: WeslBundle[];
-
-  /** Resolver for lazy file loading (e.g., useSourceShaders mode in tests) */
-  resolver?: ModuleResolver;
-
-  /** Conditional compilation flags */
-  conditions?: Record<string, boolean>;
-
-  /** Compile-time constants */
-  constants?: Record<string, string | number>;
-
-  /** Package name (allows imports to mention the current package by name instead of package::) */
-  packageName?: string;
-}
+};
 
 export interface LinkAndCreateParams extends LinkFragmentParams {
   format: GPUTextureFormat;
@@ -52,31 +37,36 @@ export async function linkAndCreatePipeline(
 export async function linkFragmentShader(
   params: LinkFragmentParams,
 ): Promise<GPUShaderModule> {
-  const { device, fragmentSource, bundles = [], resolver } = params;
-  const { conditions, constants, packageName } = params;
+  const { fragmentSource, conditions, constants, packageName, config } = params;
+  const { device, resolver, libs = [], rootModuleName = "main" } = params;
+  const { weslSrc, virtualLibs } = params;
 
   const fullSource = `${fragmentSource}\n\n${fullscreenTriangleVertex}`;
 
-  // Use provided resolver or fall back to simple weslSrc
-  let sourceParams: Pick<LinkParams, "resolver" | "weslSrc">;
-  if (resolver) {
-    const srcResolver = new RecordResolver(
-      { main: fullSource },
-      { packageName },
-    );
-    sourceParams = { resolver: new CompositeResolver([srcResolver, resolver]) };
-  } else {
-    sourceParams = { weslSrc: { main: fullSource } };
-  }
+  // Build resolver chain: fragmentSource first, then weslSrc, then provided resolver
+  const resolvers: RecordResolver[] = [];
+  resolvers.push(
+    new RecordResolver({ [rootModuleName]: fullSource }, { packageName }),
+  );
+  if (weslSrc) resolvers.push(new RecordResolver(weslSrc, { packageName }));
+
+  let finalResolver =
+    resolvers.length === 1 ? resolvers[0] : new CompositeResolver(resolvers);
+  if (resolver)
+    finalResolver = new CompositeResolver([finalResolver, resolver]);
+
+  // Merge user virtualLibs with default uniforms lib
+  const mergedVirtualLibs = { ...createUniformsVirtualLib(), ...virtualLibs };
 
   const linked = await link({
-    ...sourceParams,
-    rootModuleName: "main",
+    resolver: finalResolver,
+    rootModuleName,
     packageName,
-    libs: bundles,
-    virtualLibs: createUniformsVirtualLib(),
+    libs,
+    virtualLibs: mergedVirtualLibs,
     conditions,
     constants,
+    config,
   });
 
   return linked.createShaderModule(device);

package/src/RunFragment.ts

@@ -0,0 +1,43 @@
+import type { FragmentParams } from "./FragmentParams.ts";
+import { linkFragmentShader } from "./FragmentPipeline.ts";
+import { renderUniformBuffer } from "./RenderUniforms.ts";
+import { simpleRender } from "./SimpleRender.ts";
+
+/**
+ * Run a fragment shader and return pixel data.
+ *
+ * Combines linking, uniform setup, and rendering into a single call.
+ * Useful for shader testing or single-frame renders.
+ *
+ * @returns Pixel data as a flattened number array
+ */
+export async function runFragment(params: FragmentParams): Promise<number[]> {
+  const { src, device } = params;
+  const { textureFormat = "rgba32float", size = [1, 1] } = params;
+  const { textures, samplers, uniforms = {} } = params;
+
+  const module = await linkFragmentShader({
+    device,
+    fragmentSource: src,
+    resolver: params.resolver,
+    weslSrc: params.weslSrc,
+    libs: params.libs,
+    virtualLibs: params.virtualLibs,
+    conditions: params.conditions,
+    constants: params.constants,
+    packageName: params.packageName,
+    rootModuleName: params.rootModuleName,
+    config: params.config,
+  });
+
+  const uniformBuffer = renderUniformBuffer(device, size, uniforms);
+  return simpleRender({
+    device,
+    module,
+    outputFormat: textureFormat,
+    size,
+    textures,
+    samplers,
+    uniformBuffer,
+  });
+}

package/src/index.ts

@@ -1,8 +1,10 @@
 export * from "./DeviceCache.ts";
 export * from "./ErrorScopes.ts";
 export * from "./ExampleTextures.ts";
+export * from "./FragmentParams.ts";
 export * from "./FragmentPipeline.ts";
 export * from "./FragmentRender.ts";
 export * from "./FullscreenVertex.ts";
 export * from "./RenderUniforms.ts";
+export * from "./RunFragment.ts";
 export * from "./SimpleRender.ts";