typegpu 0.11.7 → 0.11.8

package/core/declare/tgpuDeclare.js

@@ -1,7 +1,7 @@
 import { $internal, $resolve } from "../../shared/symbols.js";
 import { Void } from "../../data/wgslTypes.js";
 import { snip } from "../../data/snippet.js";
-import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 
 //#region src/core/declare/tgpuDeclare.ts
 /**
@@ -27,7 +27,7 @@ var TgpuDeclareImpl = class {
 	}
 	[$resolve](ctx) {
 		const externalMap = {};
-		for (const externals of this.#externalsToApply) applyExternals(externalMap, externals);
+		for (const externals of this.#externalsToApply) mergeExternals(externalMap, externals);
 		const replacedDeclaration = replaceExternalsInWgsl(ctx, externalMap, this.#declaration);
 		ctx.addDeclaration(replacedDeclaration);
 		return snip("", Void, "constant");

package/core/function/fnCore.js

@@ -5,7 +5,7 @@ import { undecorate } from "../../data/dataTypes.js";
 import { snip } from "../../data/snippet.js";
 import { getAttributesString } from "../../data/attributes.js";
 import { validateIdentifier } from "../../nameUtils.js";
-import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 import { extractArgs } from "./extractArgs.js";
 
 //#region src/core/function/fnCore.ts
@@ -28,7 +28,7 @@ function createFnCore(implementation, functionType, workgroupSize) {
 			if (functionType === "compute") attributes = `@compute @workgroup_size(${workgroupSize?.join(", ")}) `;
 			else if (functionType === "vertex") attributes = `@vertex `;
 			else if (functionType === "fragment") attributes = `@fragment `;
-			for (const externals of externalsToApply) applyExternals(externalMap, externals);
+			for (const externals of externalsToApply) mergeExternals(externalMap, externals);
 			const id = ctx.makeUniqueIdentifier(getName(this), "global");
 			if (typeof implementation === "string") {
 				if (!returnType) throw new Error("Explicit return type is required for string implementation");
@@ -37,7 +37,7 @@ function createFnCore(implementation, functionType, workgroupSize) {
 						const result = /* @__PURE__ */ validateIdentifier(arg.schemaKey);
 						if (!result.success) throw new Error(`Invalid argument name "${arg.schemaKey}"${result.error ? `: ${result.error}` : ""}`);
 					}
-					applyExternals(externalMap, { in: Object.fromEntries(entryInput.positionalArgs.map((a) => [a.schemaKey, a.schemaKey])) });
+					mergeExternals(externalMap, { in: Object.fromEntries(entryInput.positionalArgs.map((a) => [a.schemaKey, a.schemaKey])) });
 				}
 				const replacedImpl = replaceExternalsInWgsl(ctx, externalMap, implementation);
 				let header = "";
@@ -64,12 +64,12 @@ function createFnCore(implementation, functionType, workgroupSize) {
 				return snip(id, returnType, "runtime");
 			}
 			const pluginData = getFunctionMetadata(implementation);
-			const pluginExternals = pluginData?.externals;
-			if (pluginExternals) applyExternals(externalMap, Object.fromEntries(Object.entries(pluginExternals).filter(([name]) => !(name in externalMap))));
+			const pluginExternals = pluginData?.externals();
+			if (pluginExternals) mergeExternals(externalMap, Object.fromEntries(Object.entries(pluginExternals).filter(([name]) => !(name in externalMap))));
 			const ast = pluginData?.ast;
 			if (!ast) throw new Error("Missing metadata for tgpu.fn function body (either missing 'use gpu' directive, or misconfigured `unplugin-typegpu`)");
 			const maybeSecondArg = ast.params[1];
-			if (maybeSecondArg && maybeSecondArg.type === "i" && functionType !== "normal") applyExternals(externalMap, { [maybeSecondArg.name]: undecorate(returnType) });
+			if (maybeSecondArg && maybeSecondArg.type === "i" && functionType !== "normal") mergeExternals(externalMap, { [maybeSecondArg.name]: undecorate(returnType) });
 			const { code, returnType: actualReturnType } = ctx.resolveFunction({
 				functionType,
 				name: id,

package/core/rawCodeSnippet/tgpuRawCodeSnippet.js

@@ -2,7 +2,7 @@ import { $gpuValueOf, $internal, $ownSnippet, $resolve } from "../../shared/symb
 import { snip } from "../../data/snippet.js";
 import { inCodegenMode } from "../../execMode.js";
 import { valueProxyHandler } from "../valueProxyUtils.js";
-import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 
 //#region src/core/rawCodeSnippet/tgpuRawCodeSnippet.ts
 /**
@@ -65,7 +65,7 @@ var TgpuRawCodeSnippetImpl = class {
 	}
 	[$resolve](ctx) {
 		const externalMap = {};
-		for (const externals of this.#externalsToApply) applyExternals(externalMap, externals);
+		for (const externals of this.#externalsToApply) mergeExternals(externalMap, externals);
 		return snip(replaceExternalsInWgsl(ctx, externalMap, this.#expression), this.dataType, this.origin);
 	}
 	toString() {

package/core/resolve/externals.d.ts

@@ -4,7 +4,7 @@ import "../../types.js";
 
 /**
  * A key-value mapping where keys represent identifiers within shader code,
- * and values can be any type that can be resolved to a code string.
+ * and values can either be another ExternalMap, or be any type that can be resolved to a code string.
  */
 type ExternalMap = Record<string, unknown>;
 //#endregion

package/core/resolve/externals.js

@@ -4,29 +4,43 @@ import { isLooseData } from "../../data/dataTypes.js";
 import { isWgsl } from "../../types.js";
 
 //#region src/core/resolve/externals.ts
+function isResolvable(value) {
+	return isWgsl(value) || isLooseData(value) || hasTinyestMetadata(value);
+}
 /**
-* Merges two external maps into one. If a key is present in both maps, the value from the new map is used.
+* Merges two external maps into one.
 * If the external value is a namable object, it is given a name if it does not already have one.
 * @param existing - The existing external map.
 * @param newExternals - The new external map.
+*
+* NOTE:
+* This function attempts to avoid accidental reference modification
+* by performing a shallow copy before each modification,
+* but it cannot avoid `existing` modification.
+* Make sure that `existing` is created internally, instead of being passed in by users.
 */
-function applyExternals(existing, newExternals) {
+function mergeExternals(existing, newExternals) {
 	for (const [key, value] of Object.entries(newExternals)) {
-		existing[key] = value;
+		const existingValue = existing[key];
+		if (existingValue !== null && typeof existingValue === "object" && value !== null && typeof value === "object" && !isResolvable(existingValue) && !isResolvable(value)) {
+			const copiedValue = { ...existingValue };
+			mergeExternals(copiedValue, value);
+			existing[key] = copiedValue;
+		} else existing[key] = value;
 		if (value && (typeof value === "object" || typeof value === "function") && getName(value) === void 0) setName(value, key);
 	}
 }
-function addArgTypesToExternals(implementation, argTypes, applyExternals$1) {
+function addArgTypesToExternals(implementation, argTypes, applyExternals) {
 	const argTypeNames = [...implementation.matchAll(/:\s*(?<arg>.*?)\s*[,)]/g)].map((found) => found ? found[1] : void 0);
-	applyExternals$1(Object.fromEntries(argTypes.flatMap((argType, i) => {
+	applyExternals(Object.fromEntries(argTypes.flatMap((argType, i) => {
 		const argTypeName = argTypeNames ? argTypeNames[i] : void 0;
 		return isWgslStruct(argType) && argTypeName !== void 0 ? [[argTypeName, argType]] : [];
 	})));
 }
-function addReturnTypeToExternals(implementation, returnType, applyExternals$1) {
+function addReturnTypeToExternals(implementation, returnType, applyExternals) {
 	const matched = implementation.match(/->\s(?<output>[\w\d_]+)\s{/);
 	const outputName = matched ? matched[1]?.trim() : void 0;
-	if (isWgslStruct(returnType) && outputName && !/\s/g.test(outputName)) applyExternals$1({ [outputName]: returnType });
+	if (isWgslStruct(returnType) && outputName && !/\s/g.test(outputName)) applyExternals({ [outputName]: returnType });
 }
 function identifierRegex(name) {
 	return new RegExp(`(?<![\\w\\$_.])${name.replaceAll(".", "\\.").replaceAll("$", "\\$")}(?![\\w\\$_])`, "g");
@@ -44,7 +58,7 @@ function replaceExternalsInWgsl(ctx, externalMap, wgsl) {
 	return Object.entries(externalMap).reduce((acc, [externalName, external]) => {
 		const externalRegex = identifierRegex(externalName);
 		if (wgsl && externalName !== "Out" && externalName !== "in" && !externalRegex.test(wgsl)) console.warn(`The external '${externalName}' wasn't used in the resolved template.`);
-		if (isWgsl(external) || isLooseData(external) || hasTinyestMetadata(external)) return acc.replaceAll(externalRegex, ctx.resolve(external).value);
+		if (isResolvable(external)) return acc.replaceAll(externalRegex, ctx.resolve(external).value);
 		if (external !== null && typeof external === "object") {
 			const foundProperties = [...wgsl.matchAll(new RegExp(`${externalName.replaceAll(".", "\\.").replaceAll("$", "\\$")}\\.(?<prop>.*?)(?![\\w\\$_])`, "g"))].map((found) => found[1]);
 			return [...new Set(foundProperties)].reduce((innerAcc, prop) => prop && prop in external ? replaceExternalsInWgsl(ctx, { [`${externalName}.${prop}`]: external[prop] }, innerAcc) : innerAcc, acc);
@@ -55,4 +69,4 @@ function replaceExternalsInWgsl(ctx, externalMap, wgsl) {
 }
 
 //#endregion
-export { addArgTypesToExternals, addReturnTypeToExternals, applyExternals, replaceExternalsInWgsl };
+export { addArgTypesToExternals, addReturnTypeToExternals, mergeExternals, replaceExternalsInWgsl };

package/core/resolve/tgpuResolve.js

@@ -1,7 +1,7 @@
 import { $internal, $resolve } from "../../shared/symbols.js";
 import { Void } from "../../data/wgslTypes.js";
 import { snip } from "../../data/snippet.js";
-import { applyExternals, replaceExternalsInWgsl } from "./externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "./externals.js";
 import { isBindGroupLayout } from "../../tgpuBindGroupLayout.js";
 import { resolve } from "../../resolutionCtx.js";
 import { isPipeline } from "../pipeline/typeGuards.js";
@@ -20,7 +20,7 @@ function resolveFromTemplate(options) {
 	const { template, externals, unstable_shaderGenerator: shaderGenerator, names = "strict", config, enableExtensions } = options;
 	if (!template) console.warn("Calling resolve with an empty template is deprecated and will soon return an empty string. Consider using the 'tgpu.resolve(resolvableArray, options)' API instead.");
 	const dependencies = {};
-	applyExternals(dependencies, externals ?? {});
+	mergeExternals(dependencies, externals ?? {});
 	return resolve({
 		[$internal]: true,
 		[$resolve](ctx) {

package/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.11.7";
+var version = "0.11.8";
 
 //#endregion
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typegpu",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "description": "A thin layer between JS and WebGPU/WGSL that improves development experience and allows for faster iteration.",
   "keywords": [
     "compute",

package/shared/normalizeMetadata.js

@@ -20,7 +20,8 @@ function normalizeExternalsV2(externals) {
 }
 function normalizeMetadata(meta) {
 	if (meta.v === 1) {
-		const externals = typeof meta?.externals === "function" ? meta.externals() : meta?.externals;
+		const rawExternals = meta.externals;
+		const externals = typeof rawExternals === "function" ? rawExternals : () => rawExternals;
 		return {
 			...meta,
 			externals
@@ -30,7 +31,7 @@ function normalizeMetadata(meta) {
 		const externals = normalizeExternalsV2(meta?.externals);
 		return {
 			...meta,
-			externals
+			externals: () => externals
 		};
 	}
 	throw new Error(`Unrecognized TypeGPU metadata format: ${safeStringify(meta)}`);