wgsl-edit 0.0.24 → 0.0.25

package/dist/wgsl-edit.js

@@ -22045,9 +22045,8 @@ function flatImports(ast, conditions) {
 //#region ../wesl/src/BindIdents.ts
 /** Bind ref idents to declarations and mangle global declaration names. */
 function bindIdents(params) {
-	const { rootAst, resolver, virtuals, accumulateUnbound } = params;
+	const { rootAst, resolver, virtuals, accumulateUnbound, discoveryMode } = params;
 	const { conditions = {}, mangler = minimalMangle } = params;
-	const { discoveryMode } = params;
 	const packageName = rootAst.srcModule.modulePath.split("::")[0];
 	const rootDecls = discoveryMode ? findAllRootDecls(rootAst.rootScope) : findValidRootDecls(rootAst.rootScope, conditions);
 	const { globalNames, knownDecls } = initRootDecls(rootDecls);
@@ -22058,6 +22057,7 @@ function bindIdents(params) {
 		virtuals,
 		mangler,
 		packageName,
+		rootModulePath: rootAst.srcModule.modulePath,
 		foundScopes: /* @__PURE__ */ new Set(),
 		globalNames,
 		globalStatements: /* @__PURE__ */ new Map(),
@@ -22068,8 +22068,9 @@ function bindIdents(params) {
 		decls: new Map(rootDecls.map((d) => [d.originalName, d])),
 		parent: null
 	};
-	const fromRootDecls = rootDecls.flatMap((decl) => processDependentScope(decl, bindContext));
-	const fromRefs = bindIdentsRecursive(rootAst.rootScope, bindContext, liveDecls);
+	const fromRootDecls = rootDecls.flatMap((d) => processDependentScope(d, bindContext));
+	const { rootScope } = rootAst;
+	const fromRefs = bindIdentsRecursive(rootScope, bindContext, liveDecls);
 	const newStatements = [...bindContext.globalStatements.values()];
 	return {
 		decls: [...fromRootDecls, ...fromRefs],
@@ -22114,11 +22115,7 @@ function findAllRootDecls(rootScope) {
 function publicDecl(scope, name, conditions) {
 	return getValidRootDecls(scope, conditions).find((d) => d.originalName === name);
 }
-/**
-* Recursively bind references to declarations in this scope and child scopes.
-* Tracks @else state to ensure filtered @else blocks don't pull in unused declarations.
-* @return new declarations found
-*/
+/** Recursively bind refs to decls in this scope and children. @return new declarations found */
 function bindIdentsRecursive(scope, bindContext, liveDecls) {
 	const { dontFollowDecls, foundScopes } = bindContext;
 	if (foundScopes.has(scope)) return [];
@@ -22156,11 +22153,7 @@ function processDependentScope(decl, ctx) {
 	if (!rootDecls) return [];
 	return bindIdentsRecursive(dependentScope, ctx, makeLiveDecls(rootDecls));
 }
-/**
-* Trace references to their declarations.
-* Mutates to mangle declarations and mark std references.
-* @return found declaration, or undefined if already processed
-*/
+/** Resolve a ref to its declaration, mangling globals and marking std refs. */
 function handleRef(ident, liveDecls, bindContext) {
 	if (ident.refersTo || ident.std) return;
 	if (ident.conditionRef) return;
@@ -22240,7 +22233,8 @@ function findExport(pathParts, srcModule, ctx) {
 	const modulePath = resolveModulePath(pathParts, srcModule.modulePath.split("::")).slice(0, -1).join("::");
 	const moduleAst = ctx.resolver.resolveModule(modulePath) ?? virtualModule(pathParts[0], ctx);
 	if (!moduleAst) return void 0;
-	const decl = publicDecl(moduleAst.rootScope, last(pathParts), ctx.conditions);
+	const name = last(pathParts);
+	const decl = publicDecl(moduleAst.rootScope, name, ctx.conditions);
 	if (decl) return {
 		decl,
 		moduleAst
@@ -22251,9 +22245,14 @@ function virtualModule(moduleName, ctx) {
 	const found = ctx.virtuals?.[moduleName];
 	if (!found) return void 0;
 	if (found.ast) return found.ast;
-	const src = found.fn(ctx.conditions);
+	const { conditions, rootModulePath, packageName } = ctx;
+	const src = found.fn({
+		conditions,
+		rootModulePath,
+		packageName
+	});
 	found.ast = parseSrcModule({
-		modulePath: ctx.packageName + "::" + moduleName,
+		modulePath: packageName + "::" + moduleName,
 		debugFilePath: moduleName,
 		src
 	});
@@ -22273,8 +22272,8 @@ function rootLiveDecls(decl, conditions) {
 	assertThatDebug(scope.kind === "scope");
 	const root = scope;
 	if (!root._scopeDecls) {
-		const rootDecls = findValidRootDecls(scope, conditions);
-		root._scopeDecls = { decls: new Map(rootDecls.map((d) => [d.originalName, d])) };
+		const decls = findValidRootDecls(scope, conditions);
+		root._scopeDecls = { decls: new Map(decls.map((d) => [d.originalName, d])) };
 	}
 	return root._scopeDecls;
 }
@@ -22799,8 +22798,9 @@ function flattenLibraryTree(libs) {
 * that share some sources.)
 */
 function linkRegistry(params) {
-	const { transformedAst, newDecls, newStatements } = bindAndTransform(params);
-	return SrcMapBuilder.build(emitWgsl(transformedAst.moduleElem, transformedAst.srcModule, newDecls, newStatements, params.conditions));
+	const { transformedAst: ast, newDecls, newStatements } = bindAndTransform(params);
+	const builders = emitWgsl(ast.moduleElem, ast.srcModule, newDecls, newStatements, params.conditions);
+	return SrcMapBuilder.build(builders);
 }
 /** Bind identifiers and apply transform plugins */
 function bindAndTransform(params) {
@@ -22858,6 +22858,7 @@ function applyTransformPlugins(rootModule, globalNames, config) {
 	};
 	return filterMap(config?.plugins ?? [], (plugin) => plugin.transform).reduce((ast, transform) => transform(ast), startAst);
 }
+/** Assemble WGSL output from prologue statements, root module, and imported declarations. */
 function emitWgsl(rootModuleElem, srcModule, newDecls, newStatements, conditions = {}) {
 	const prologueBuilders = newStatements.map((s) => emitStatement(s, conditions));
 	const rootBuilder = new SrcMapBuilder({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wgsl-edit",
   "description": "Web component for editing WGSL/WESL with CodeMirror",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "type": "module",
   "files": [
     "dist",
@@ -36,9 +36,9 @@
     "@codemirror/view": "^6.0.0",
     "@lezer/highlight": "^1.2.1",
     "codemirror": "^6.0.0",
-    "wesl-fetch": "0.0.13",
-    "wesl": "0.7.25",
-    "lezer-wesl": "0.6.46"
+    "lezer-wesl": "0.6.47",
+    "wesl": "0.7.26",
+    "wesl-fetch": "0.0.14"
   },
   "devDependencies": {
     "@playwright/test": "^1.53.2",