@luma.gl/shaders 10.0.0-alpha.6 → 10.0.0-alpha.8

package/dist/lib/shader-generator/glsl/generate-glsl.d.ts

@@ -1,4 +1,4 @@
-import { ShaderModule } from "../../../lib/shader-module/shader-module.js";
+import { ShaderModule } from "../../shader-module/shader-module.js";
 export type GLSLGenerationOptions = {
     shaderLanguage: 'glsl';
     uniforms: 'scoped-interface-blocks' | 'unscoped-interface-blocks' | 'uniforms';

package/dist/lib/shader-generator/glsl/generate-glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-glsl.d.ts","sourceRoot":"","sources":["../../../../src/lib/shader-generator/glsl/generate-glsl.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAGtE,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,yBAAyB,GAAG,2BAA2B,GAAG,UAAU,CAAC;CAChF,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,UAEzF"}
+{"version":3,"file":"generate-glsl.d.ts","sourceRoot":"","sources":["../../../../src/lib/shader-generator/glsl/generate-glsl.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAG/D,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,yBAAyB,GAAG,2BAA2B,GAAG,UAAU,CAAC;CAChF,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,UAEzF"}

package/dist/lib/shader-generator/wgsl/generate-wgsl.d.ts

@@ -1,4 +1,4 @@
-import { ShaderModule } from "../../../lib/shader-module/shader-module.js";
+import { ShaderModule } from "../../shader-module/shader-module.js";
 export type WGSLGenerationOptions = {
     shaderLanguage: 'wgsl';
 };

package/dist/lib/shader-generator/wgsl/generate-wgsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-wgsl.d.ts","sourceRoot":"","sources":["../../../../src/lib/shader-generator/wgsl/generate-wgsl.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAGtE,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,UAEzF;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,qBAAqB,UAsB/B"}
+{"version":3,"file":"generate-wgsl.d.ts","sourceRoot":"","sources":["../../../../src/lib/shader-generator/wgsl/generate-wgsl.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAG/D,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,qBAAqB,UAEzF;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,qBAAqB,UAsB/B"}

package/dist/lib/shader-plugin.cjs

@@ -24,45 +24,56 @@ module.exports = __toCommonJS(shader_plugin_exports);
 var import_types = require("../types.cjs");
 const SHADER_PLUGIN_INJECTION_TARGET_REGEX = /^(vs|fs):(?:#(?:decl|main-start|main-end)|[A-Za-z_][\w-]*)$/;
 function resolveShaderPlugins(plugins = [], shaderLanguage) {
-  const modules = [];
-  const defines = {};
-  const injections = {};
-  const vertexInputs = {};
-  const varyings = {};
+  const resolved = {
+    modules: [],
+    hooks: [],
+    defines: {},
+    injections: {},
+    vertexInputs: {},
+    interStageVariables: {}
+  };
   for (const plugin of plugins) {
-    appendShaderPluginVariant({ modules, defines, injections, vertexInputs, varyings }, plugin);
-    appendShaderPluginVariant({ modules, defines, injections, vertexInputs, varyings }, plugin[shaderLanguage]);
+    appendShaderPlugin(resolved, plugin, shaderLanguage);
   }
-  for (const name of Object.keys(varyings)) {
+  const { vertexInputs, interStageVariables } = resolved;
+  for (const name of Object.keys(interStageVariables)) {
     if (vertexInputs[name]) {
       throw new Error(`ShaderPlugin name "${name}" cannot be both a vertex input and a varying`);
     }
   }
-  return { modules, defines, injections, vertexInputs, varyings };
+  return resolved;
 }
-function mergeShaderPluginModules(modules = [], pluginModules = []) {
+function mergeShaderPluginModules(modules = [], pluginModules = [], options = {}) {
+  var _a, _b;
   const mergedModules = [...modules];
-  const seenModuleNames = new Set(mergedModules.map((module2) => module2.name));
+  const selectedModules = /* @__PURE__ */ new Map();
+  for (const module2 of mergedModules) {
+    const selected = selectedModules.get(module2.name);
+    if (selected && selected !== module2)
+      (_a = options.onConflict) == null ? void 0 : _a.call(options, module2.name, selected, module2);
+    if (!selected)
+      selectedModules.set(module2.name, module2);
+  }
   for (const pluginModule of pluginModules) {
-    if (!seenModuleNames.has(pluginModule.name)) {
+    const selected = selectedModules.get(pluginModule.name);
+    if (selected && selected !== pluginModule) {
+      (_b = options.onConflict) == null ? void 0 : _b.call(options, pluginModule.name, selected, pluginModule);
+    }
+    if (!selected) {
       mergedModules.push(pluginModule);
-      seenModuleNames.add(pluginModule.name);
+      selectedModules.set(pluginModule.name, pluginModule);
     }
   }
   return mergedModules;
 }
-function appendShaderPluginVariant(resolved, variant) {
-  var _a;
-  if (!variant) {
-    return;
-  }
-  if ((_a = variant.modules) == null ? void 0 : _a.length) {
-    resolved.modules.push(...variant.modules);
+function appendShaderPlugin(resolved, plugin, shaderLanguage) {
+  if (plugin.module) {
+    resolved.modules.push(plugin.module);
   }
-  if (variant.defines) {
-    Object.assign(resolved.defines, variant.defines);
+  if (plugin.defines) {
+    Object.assign(resolved.defines, plugin.defines);
   }
-  for (const [name, type] of Object.entries(variant.vertexInputs || {})) {
+  for (const [name, type] of Object.entries(plugin.vertexInputs || {})) {
     assertShaderPluginInterfaceName(name, "vertex input");
     const existingType = resolved.vertexInputs[name];
     if (existingType && existingType !== type) {
@@ -70,23 +81,62 @@ function appendShaderPluginVariant(resolved, variant) {
     }
     resolved.vertexInputs[name] = type;
   }
-  for (const [name, varying] of Object.entries(variant.varyings || {})) {
+  for (const [name, varying] of Object.entries(plugin.interStageVariables || {})) {
     assertShaderPluginInterfaceName(name, "varying");
-    const normalizedVarying = normalizeShaderPluginVarying(name, varying);
-    const existingVarying = resolved.varyings[name];
+    const normalizedVarying = normalizeShaderPluginInterStageVariable(name, varying);
+    const existingVarying = resolved.interStageVariables[name];
     if (existingVarying && (existingVarying.type !== normalizedVarying.type || existingVarying.interpolation !== normalizedVarying.interpolation)) {
       throw new Error(`ShaderPlugin varying "${name}" has conflicting declarations "${existingVarying.type}/${existingVarying.interpolation}" and "${normalizedVarying.type}/${normalizedVarying.interpolation}"`);
     }
-    resolved.varyings[name] = normalizedVarying;
+    resolved.interStageVariables[name] = normalizedVarying;
   }
-  for (const injection of variant.injections || []) {
-    assertNamedShaderPluginInjectionTarget(injection.target);
-    if (!resolved.injections[injection.target]) {
-      resolved.injections[injection.target] = [];
+  for (const hook of plugin.hooks || []) {
+    const declarationSource = typeof hook === "string" ? selectShaderLanguage(hook, shaderLanguage) : void 0;
+    if (typeof hook === "string" && declarationSource === void 0)
+      continue;
+    const signature = typeof hook === "string" ? declarationSource.slice(declarationSource.indexOf("(")) : hook[shaderLanguage];
+    if (signature === void 0)
+      continue;
+    const target = typeof hook === "string" ? declarationSource.split("(")[0] : getShaderPluginTarget(hook);
+    if (!/^(vs|fs):[A-Za-z_][A-Za-z0-9_]*$/.test(target) || !/^\([^]*\)$/.test(signature.trim())) {
+      throw new Error(`Invalid ShaderPlugin hook ${target}`);
     }
-    const injections = resolved.injections[injection.target];
+    const declaration = { hook: `${target}${signature.trim()}` };
+    const existing = resolved.hooks.find((value) => value.hook.split("(")[0] === target);
+    if (existing && existing.hook !== declaration.hook) {
+      throw new Error(`Conflicting ShaderPlugin hook ${target}`);
+    }
+    if (!existing)
+      resolved.hooks.push(declaration);
+  }
+  const pluginInjections = Array.isArray(plugin.injections) ? plugin.injections : Object.entries(plugin.injections || {}).flatMap(([key, source]) => {
+    const target = selectShaderLanguage(key, shaderLanguage);
+    if (target === void 0)
+      return [];
+    const [stage, ...name] = target.split(":");
+    if (stage !== "vs" && stage !== "fs")
+      throw new Error(`Invalid ShaderPlugin injection ${key}`);
+    return [
+      {
+        stage: stage === "vs" ? "vertex" : "fragment",
+        target: name.join(":"),
+        [shaderLanguage]: source
+      }
+    ];
+  });
+  for (const injection of pluginInjections) {
+    const source = injection[shaderLanguage];
+    if (source === void 0)
+      continue;
+    const target = getShaderPluginTarget(injection);
+    assertNamedShaderPluginInjectionTarget(target);
+    if (!resolved.injections[target]) {
+      resolved.injections[target] = [];
+    }
+    const injections = resolved.injections[target];
     injections.push({
-      injection: injection.injection,
+      pluginName: plugin.name,
+      injection: source,
       order: injection.order ?? 0
     });
   }
@@ -96,7 +146,7 @@ function assertShaderPluginInterfaceName(name, kind) {
     throw new Error(`ShaderPlugin ${kind} "${name}" must be a valid non-reserved identifier`);
   }
 }
-function normalizeShaderPluginVarying(name, varying) {
+function normalizeShaderPluginInterStageVariable(name, varying) {
   const { primitiveType } = import_types.shaderTypeDecoder.getAttributeShaderTypeInfo(varying.type);
   const integerType = primitiveType === "i32" || primitiveType === "u32";
   const interpolation = varying.interpolation || (integerType ? "flat" : "smooth");
@@ -110,6 +160,16 @@ function assertNamedShaderPluginInjectionTarget(target) {
     throw new Error(`ShaderPlugin injection target "${target}" must be a named shader anchor or hook`);
   }
 }
+function getShaderPluginTarget(value) {
+  if (value.stage !== "vertex" && value.stage !== "fragment" || value.target.includes(":")) {
+    throw new Error("ShaderPlugin object targets require an explicit stage and unqualified target");
+  }
+  return `${value.stage === "vertex" ? "vs" : "fs"}:${value.target}`;
+}
+function selectShaderLanguage(value, language) {
+  const match = /^(glsl|wgsl):([\s\S]+)$/.exec(value);
+  return match ? match[1] === language ? match[2] : void 0 : value;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   mergeShaderPluginModules,

package/dist/lib/shader-plugin.d.ts

@@ -1,68 +1,86 @@
+import type { ShaderHook } from "./shader-assembly/shader-hooks.js";
 import type { ShaderInjection } from "./shader-assembly/shader-injections.js";
 import type { ShaderModule } from "./shader-module/shader-module.js";
 import { type AttributeShaderType } from "../types.js";
 /** Named shader anchor or hook target accepted by ShaderPlugin injections. */
 export type ShaderPluginInjectionTarget = 'vs:#decl' | 'vs:#main-start' | 'vs:#main-end' | 'fs:#decl' | 'fs:#main-start' | 'fs:#main-end' | `vs:${string}` | `fs:${string}`;
+/** Explicit stage and unqualified target for plugin object declarations. */
+export type ShaderPluginTarget = {
+    /** Shader stage containing this extension point. */
+    stage: 'vertex' | 'fragment';
+    /** Unqualified hook name or structural anchor such as #main-start. */
+    target: string;
+};
+/** Hook function declared by a plugin, with parameter signatures per language. */
+export type ShaderPluginHook = ShaderPluginTarget & {
+    /** GLSL parameter list, including parentheses. */
+    glsl?: string;
+    /** WGSL parameter list, including parentheses. */
+    wgsl?: string;
+};
 /** Named shader source injection contributed by a ShaderPlugin. */
-export type ShaderPluginInjection = {
-    /** Named shader anchor or hook that receives this source. */
-    target: ShaderPluginInjectionTarget;
-    /** Shader source to inject at the target. */
-    injection: string;
+export type ShaderPluginInjection = ShaderPluginTarget & {
+    /** GLSL source for this target. Omit to skip this injection when assembling GLSL. */
+    glsl?: string;
+    /** WGSL source for this target. Omit to skip this injection when assembling WGSL. */
+    wgsl?: string;
     /** Relative injection order within the target. */
     order?: number;
 };
-/** Portable interpolation modes for ShaderPlugin varyings. */
-export type ShaderPluginVaryingInterpolation = 'smooth' | 'flat';
+/** Portable interpolation modes for ShaderPlugin inter-stage variables. */
+export type ShaderPluginInterStageVariableInterpolation = 'smooth' | 'flat';
 /** Cross-stage value contributed by a ShaderPlugin. */
-export type ShaderPluginVarying = {
+export type ShaderPluginInterStageVariable = {
     /** Portable scalar or vector shader type. */
     type: AttributeShaderType;
     /** Defaults to smooth for floating-point types and flat for integer types. */
-    interpolation?: ShaderPluginVaryingInterpolation;
+    interpolation?: ShaderPluginInterStageVariableInterpolation;
 };
-/** Fully normalized ShaderPlugin varying declaration. */
-export type ResolvedShaderPluginVarying = {
+/** Fully normalized ShaderPlugin inter-stage variable declaration. */
+export type ResolvedShaderPluginInterStageVariable = {
     type: AttributeShaderType;
-    interpolation: ShaderPluginVaryingInterpolation;
+    interpolation: ShaderPluginInterStageVariableInterpolation;
 };
-/** Shared or backend-specific shader assembly contributions. */
-export type ShaderPluginVariant = {
-    /** Shader modules added to shader assembly. */
-    modules?: ShaderModule[];
-    /** Boolean preprocessor defines added to shader assembly. */
-    defines?: Record<string, boolean>;
-    /** Named code injections added to shader assembly. */
-    injections?: ShaderPluginInjection[];
+/** Reusable shader assembly descriptor with one portable interface and language-specific source. */
+export type ShaderPlugin = {
+    /** Stable plugin identifier. */
+    name: string;
+    /** Primary shader module. Supporting modules belong in its dependencies; omit for injection-only plugins. */
+    module?: ShaderModule<any, any, any>;
+    /** Boolean or numeric preprocessor defines added to shader assembly. */
+    defines?: Record<string, boolean | number>;
+    /** Named injections as explicit-stage objects or optionally language-qualified string keys. */
+    injections?: ShaderPluginInjection[] | Record<string, string>;
+    /** Callable extension points as explicit-stage objects or optionally language-qualified signatures. */
+    hooks?: (ShaderPluginHook | string)[];
     /** Shader-facing vertex inputs added by this plugin. Buffer ownership remains with the caller. */
     vertexInputs?: Record<string, AttributeShaderType>;
     /** Values transported from the selected vertex entry point to the fragment entry point. */
-    varyings?: Record<string, ShaderPluginVarying>;
-};
-/** Reusable cross-backend shader assembly descriptor. */
-export type ShaderPlugin = ShaderPluginVariant & {
-    /** Stable plugin identifier. */
-    name: string;
-    /** GLSL-only shader assembly contributions. */
-    glsl?: ShaderPluginVariant;
-    /** WGSL-only shader assembly contributions. */
-    wgsl?: ShaderPluginVariant;
+    interStageVariables?: Record<string, ShaderPluginInterStageVariable>;
 };
 /** ShaderPlugin contributions resolved for one shader language. */
 export type ResolvedShaderPlugins = {
     /** Resolved shader modules in plugin declaration order. */
     modules: ShaderModule[];
-    /** Resolved boolean preprocessor defines. */
-    defines: Record<string, boolean>;
+    /** Language-selected hook declarations. */
+    hooks: ShaderHook[];
+    /** Resolved boolean or numeric preprocessor defines. */
+    defines: Record<string, boolean | number>;
     /** Resolved named code injections grouped by target. */
     injections: Record<string, ShaderInjection[]>;
     /** Resolved shader-facing vertex inputs in plugin declaration order. */
     vertexInputs: Record<string, AttributeShaderType>;
-    /** Resolved cross-stage varyings in plugin declaration order. */
-    varyings: Record<string, ResolvedShaderPluginVarying>;
+    /** Resolved inter-stage variables in plugin declaration order. */
+    interStageVariables: Record<string, ResolvedShaderPluginInterStageVariable>;
 };
-/** Resolve shared and backend-specific contributions from shader plugins. */
+/** Resolve plugin interfaces and select injection source for one shader language. */
 export declare function resolveShaderPlugins(plugins: readonly ShaderPlugin[] | undefined, shaderLanguage: 'glsl' | 'wgsl'): ResolvedShaderPlugins;
-/** Preserve explicit module inputs while appending plugin modules by first-seen name. */
-export declare function mergeShaderPluginModules(modules?: readonly ShaderModule[], pluginModules?: readonly ShaderModule[]): ShaderModule[];
+/**
+ * Preserve explicit module inputs while appending plugin modules by first-seen name.
+ * Optional diagnostics report distinct descriptors sharing a name, without changing selection.
+ * Descriptor identity is checked; equivalent independently-created descriptors also report a conflict.
+ */
+export declare function mergeShaderPluginModules(modules?: readonly ShaderModule[], pluginModules?: readonly ShaderModule[], options?: {
+    onConflict?: (name: string, selected: ShaderModule, ignored: ShaderModule) => void;
+}): ShaderModule[];
 //# sourceMappingURL=shader-plugin.d.ts.map

package/dist/lib/shader-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-plugin.d.ts","sourceRoot":"","sources":["../../src/lib/shader-plugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAC,+CAA4C;AACzE,OAAO,KAAK,EAAC,YAAY,EAAC,yCAAsC;AAChE,OAAO,EAAoB,KAAK,mBAAmB,EAAC,oBAAiB;AAErE,8EAA8E;AAC9E,MAAM,MAAM,2BAA2B,GACnC,UAAU,GACV,gBAAgB,GAChB,cAAc,GACd,UAAU,GACV,gBAAgB,GAChB,cAAc,GACd,MAAM,MAAM,EAAE,GACd,MAAM,MAAM,EAAE,CAAC;AAEnB,mEAAmE;AACnE,MAAM,MAAM,qBAAqB,GAAG;IAClC,6DAA6D;IAC7D,MAAM,EAAE,2BAA2B,CAAC;IACpC,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,gCAAgC,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEjE,uDAAuD;AACvD,MAAM,MAAM,mBAAmB,GAAG;IAChC,6CAA6C;IAC7C,IAAI,EAAE,mBAAmB,CAAC;IAC1B,8EAA8E;IAC9E,aAAa,CAAC,EAAE,gCAAgC,CAAC;CAClD,CAAC;AAEF,yDAAyD;AACzD,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,aAAa,EAAE,gCAAgC,CAAC;CACjD,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,mBAAmB,GAAG;IAChC,+CAA+C;IAC/C,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,sDAAsD;IACtD,UAAU,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACrC,kGAAkG;IAClG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACnD,2FAA2F;IAC3F,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAChD,CAAC;AAEF,yDAAyD;AACzD,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG;IAC/C,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,+CAA+C;IAC/C,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,+CAA+C;IAC/C,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,qBAAqB,GAAG;IAClC,2DAA2D;IAC3D,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,6CAA6C;IAC7C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAC9C,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAClD,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;CACvD,CAAC;AAKF,6EAA6E;AAC7E,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,SAAS,YAAY,EAAE,YAAK,EACrC,cAAc,EAAE,MAAM,GAAG,MAAM,GAC9B,qBAAqB,CAsBvB;AAED,yFAAyF;AACzF,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,SAAS,YAAY,EAAO,EACrC,aAAa,GAAE,SAAS,YAAY,EAAO,GAC1C,YAAY,EAAE,CAYhB"}
+{"version":3,"file":"shader-plugin.d.ts","sourceRoot":"","sources":["../../src/lib/shader-plugin.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-plugin.js

@@ -3,47 +3,62 @@
 // SPDX-FileCopyrightText: Copyright (c) vis.gl contributors
 import { shaderTypeDecoder } from "../types.js";
 const SHADER_PLUGIN_INJECTION_TARGET_REGEX = /^(vs|fs):(?:#(?:decl|main-start|main-end)|[A-Za-z_][\w-]*)$/;
-/** Resolve shared and backend-specific contributions from shader plugins. */
+/** Resolve plugin interfaces and select injection source for one shader language. */
 export function resolveShaderPlugins(plugins = [], shaderLanguage) {
-    const modules = [];
-    const defines = {};
-    const injections = {};
-    const vertexInputs = {};
-    const varyings = {};
+    const resolved = {
+        modules: [],
+        hooks: [],
+        defines: {},
+        injections: {},
+        vertexInputs: {},
+        interStageVariables: {}
+    };
     for (const plugin of plugins) {
-        appendShaderPluginVariant({ modules, defines, injections, vertexInputs, varyings }, plugin);
-        appendShaderPluginVariant({ modules, defines, injections, vertexInputs, varyings }, plugin[shaderLanguage]);
+        appendShaderPlugin(resolved, plugin, shaderLanguage);
     }
-    for (const name of Object.keys(varyings)) {
+    const { vertexInputs, interStageVariables } = resolved;
+    for (const name of Object.keys(interStageVariables)) {
         if (vertexInputs[name]) {
             throw new Error(`ShaderPlugin name "${name}" cannot be both a vertex input and a varying`);
         }
     }
-    return { modules, defines, injections, vertexInputs, varyings };
+    return resolved;
 }
-/** Preserve explicit module inputs while appending plugin modules by first-seen name. */
-export function mergeShaderPluginModules(modules = [], pluginModules = []) {
+/**
+ * Preserve explicit module inputs while appending plugin modules by first-seen name.
+ * Optional diagnostics report distinct descriptors sharing a name, without changing selection.
+ * Descriptor identity is checked; equivalent independently-created descriptors also report a conflict.
+ */
+export function mergeShaderPluginModules(modules = [], pluginModules = [], options = {}) {
     const mergedModules = [...modules];
-    const seenModuleNames = new Set(mergedModules.map(module => module.name));
+    const selectedModules = new Map();
+    for (const module of mergedModules) {
+        const selected = selectedModules.get(module.name);
+        if (selected && selected !== module)
+            options.onConflict?.(module.name, selected, module);
+        if (!selected)
+            selectedModules.set(module.name, module);
+    }
     for (const pluginModule of pluginModules) {
-        if (!seenModuleNames.has(pluginModule.name)) {
+        const selected = selectedModules.get(pluginModule.name);
+        if (selected && selected !== pluginModule) {
+            options.onConflict?.(pluginModule.name, selected, pluginModule);
+        }
+        if (!selected) {
             mergedModules.push(pluginModule);
-            seenModuleNames.add(pluginModule.name);
+            selectedModules.set(pluginModule.name, pluginModule);
         }
     }
     return mergedModules;
 }
-function appendShaderPluginVariant(resolved, variant) {
-    if (!variant) {
-        return;
-    }
-    if (variant.modules?.length) {
-        resolved.modules.push(...variant.modules);
+function appendShaderPlugin(resolved, plugin, shaderLanguage) {
+    if (plugin.module) {
+        resolved.modules.push(plugin.module);
     }
-    if (variant.defines) {
-        Object.assign(resolved.defines, variant.defines);
+    if (plugin.defines) {
+        Object.assign(resolved.defines, plugin.defines);
     }
-    for (const [name, type] of Object.entries(variant.vertexInputs || {})) {
+    for (const [name, type] of Object.entries(plugin.vertexInputs || {})) {
         assertShaderPluginInterfaceName(name, 'vertex input');
         const existingType = resolved.vertexInputs[name];
         if (existingType && existingType !== type) {
@@ -51,10 +66,10 @@ function appendShaderPluginVariant(resolved, variant) {
         }
         resolved.vertexInputs[name] = type;
     }
-    for (const [name, varying] of Object.entries(variant.varyings || {})) {
+    for (const [name, varying] of Object.entries(plugin.interStageVariables || {})) {
         assertShaderPluginInterfaceName(name, 'varying');
-        const normalizedVarying = normalizeShaderPluginVarying(name, varying);
-        const existingVarying = resolved.varyings[name];
+        const normalizedVarying = normalizeShaderPluginInterStageVariable(name, varying);
+        const existingVarying = resolved.interStageVariables[name];
         if (existingVarying &&
             (existingVarying.type !== normalizedVarying.type ||
                 existingVarying.interpolation !== normalizedVarying.interpolation)) {
@@ -62,16 +77,59 @@ function appendShaderPluginVariant(resolved, variant) {
                 `"${existingVarying.type}/${existingVarying.interpolation}" and ` +
                 `"${normalizedVarying.type}/${normalizedVarying.interpolation}"`);
         }
-        resolved.varyings[name] = normalizedVarying;
+        resolved.interStageVariables[name] = normalizedVarying;
+    }
+    for (const hook of plugin.hooks || []) {
+        const declarationSource = typeof hook === 'string' ? selectShaderLanguage(hook, shaderLanguage) : undefined;
+        if (typeof hook === 'string' && declarationSource === undefined)
+            continue;
+        const signature = typeof hook === 'string'
+            ? declarationSource.slice(declarationSource.indexOf('('))
+            : hook[shaderLanguage];
+        if (signature === undefined)
+            continue;
+        const target = typeof hook === 'string' ? declarationSource.split('(')[0] : getShaderPluginTarget(hook);
+        if (!/^(vs|fs):[A-Za-z_][A-Za-z0-9_]*$/.test(target) || !/^\([^]*\)$/.test(signature.trim())) {
+            throw new Error(`Invalid ShaderPlugin hook ${target}`);
+        }
+        const declaration = { hook: `${target}${signature.trim()}` };
+        const existing = resolved.hooks.find(value => value.hook.split('(')[0] === target);
+        if (existing && existing.hook !== declaration.hook) {
+            throw new Error(`Conflicting ShaderPlugin hook ${target}`);
+        }
+        if (!existing)
+            resolved.hooks.push(declaration);
     }
-    for (const injection of variant.injections || []) {
-        assertNamedShaderPluginInjectionTarget(injection.target);
-        if (!resolved.injections[injection.target]) {
-            resolved.injections[injection.target] = [];
+    const pluginInjections = Array.isArray(plugin.injections)
+        ? plugin.injections
+        : Object.entries(plugin.injections || {}).flatMap(([key, source]) => {
+            const target = selectShaderLanguage(key, shaderLanguage);
+            if (target === undefined)
+                return [];
+            const [stage, ...name] = target.split(':');
+            if (stage !== 'vs' && stage !== 'fs')
+                throw new Error(`Invalid ShaderPlugin injection ${key}`);
+            return [
+                {
+                    stage: stage === 'vs' ? 'vertex' : 'fragment',
+                    target: name.join(':'),
+                    [shaderLanguage]: source
+                }
+            ];
+        });
+    for (const injection of pluginInjections) {
+        const source = injection[shaderLanguage];
+        if (source === undefined)
+            continue;
+        const target = getShaderPluginTarget(injection);
+        assertNamedShaderPluginInjectionTarget(target);
+        if (!resolved.injections[target]) {
+            resolved.injections[target] = [];
         }
-        const injections = resolved.injections[injection.target];
+        const injections = resolved.injections[target];
         injections.push({
-            injection: injection.injection,
+            pluginName: plugin.name,
+            injection: source,
             order: injection.order ?? 0
         });
     }
@@ -81,7 +139,7 @@ function assertShaderPluginInterfaceName(name, kind) {
         throw new Error(`ShaderPlugin ${kind} "${name}" must be a valid non-reserved identifier`);
     }
 }
-function normalizeShaderPluginVarying(name, varying) {
+function normalizeShaderPluginInterStageVariable(name, varying) {
     const { primitiveType } = shaderTypeDecoder.getAttributeShaderTypeInfo(varying.type);
     const integerType = primitiveType === 'i32' || primitiveType === 'u32';
     const interpolation = varying.interpolation || (integerType ? 'flat' : 'smooth');
@@ -95,4 +153,14 @@ function assertNamedShaderPluginInjectionTarget(target) {
         throw new Error(`ShaderPlugin injection target "${target}" must be a named shader anchor or hook`);
     }
 }
+function getShaderPluginTarget(value) {
+    if ((value.stage !== 'vertex' && value.stage !== 'fragment') || value.target.includes(':')) {
+        throw new Error('ShaderPlugin object targets require an explicit stage and unqualified target');
+    }
+    return `${value.stage === 'vertex' ? 'vs' : 'fs'}:${value.target}`;
+}
+function selectShaderLanguage(value, language) {
+    const match = /^(glsl|wgsl):([\s\S]+)$/.exec(value);
+    return match ? (match[1] === language ? match[2] : undefined) : value;
+}
 //# sourceMappingURL=shader-plugin.js.map

package/dist/lib/shader-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"shader-plugin.js","sourceRoot":"","sources":["../../src/lib/shader-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shader-plugin.js","sourceRoot":"","sources":["../../src/lib/shader-plugin.ts"],"names":[],"mappings":"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"}

package/dist/lib/wgsl-shader-assembler.cjs

@@ -37,7 +37,7 @@ class WGSLShaderAssembler extends import_shader_assembler_base.ShaderAssembler {
   assembleWGSLShader(props) {
     var _a, _b, _c;
     const modules = this._getModuleList(props.modules);
-    const hookFunctions = this._hookFunctions;
+    const hookFunctions = [...this._hookFunctions, ...props.hookFunctions || []];
     const translated = this._transpileShader(props, modules, props.source, props.shaderStage ?? (props.computeEntryPoint ? "compute" : void 0));
     const entryPoints = {
       vertex: ((_a = translated.entryPoints) == null ? void 0 : _a.vertex) ?? props.vertexEntryPoint,

package/dist/lib/wgsl-shader-assembler.js

@@ -18,7 +18,7 @@ export class WGSLShaderAssembler extends ShaderAssembler {
      */
     assembleWGSLShader(props) {
         const modules = this._getModuleList(props.modules); // Combine with default modules
-        const hookFunctions = this._hookFunctions; // TODO - combine with default hook functions
+        const hookFunctions = [...this._hookFunctions, ...(props.hookFunctions || [])];
         const translated = this._transpileShader(props, modules, props.source, props.shaderStage ?? (props.computeEntryPoint ? 'compute' : undefined));
         const entryPoints = {
             vertex: translated.entryPoints?.vertex ?? props.vertexEntryPoint,

package/dist/lib/wgsl-shader-assembler.js.map

@@ -1 +1 @@
-{"version":3,"file":"wgsl-shader-assembler.js","sourceRoot":"","sources":["../../src/lib/wgsl-shader-assembler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wgsl-shader-assembler.js","sourceRoot":"","sources":["../../src/lib/wgsl-shader-assembler.ts"],"names":[],"mappings":"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"}