wesl 0.6.48 → 0.6.49

package/dist/index.d.ts

@@ -689,6 +689,8 @@ declare class BundleResolver implements ModuleResolver {
   private moduleToFilePath;
   private modulePathToDebugPath;
 }
+/** Convert file path to module path (e.g., "foo/bar.wesl" -> "package::foo::bar"). */
+declare function fileToModulePath(filePath: string, packageName: string, treatLibAsRoot: boolean): string;
 //#endregion
 //#region src/Linker.d.ts
 type LinkerTransform = (boundAST: TransformedAST) => TransformedAST;
@@ -980,6 +982,31 @@ declare function sanitizePackageName(npmName: string): string;
  */
 declare function npmNameVariations(sanitizedPath: string): Generator<string>;
 //#endregion
+//#region src/ModulePathUtil.d.ts
+/** WESL module path utilities for converting between :: and / separators. */
+/**
+ * Convert module path segments to relative file path.
+ * Handles package/packageName prefixes and super:: resolution.
+ *
+ * @param parts - module path as array e.g., ["package", "utils", "helper"]
+ * @param packageName - the current package's name (required)
+ * @param srcModuleParts - source module path for super:: resolution (optional)
+ * @returns relative file path e.g., "utils/helper", or undefined if external
+ */
+declare function modulePartsToRelativePath(parts: string[], packageName: string, srcModuleParts?: string[]): string | undefined;
+/** String variant of modulePartsToRelativePath. */
+declare function moduleToRelativePath(modulePath: string, packageName: string, srcModulePath?: string): string | undefined;
+/**
+ * Resolve super:: elements to absolute module path.
+ *
+ * @param parts - module path with potential super:: elements
+ * @param srcModuleParts - source module path for context
+ * @returns absolute module path parts (no super:: elements)
+ */
+declare function resolveSuper(parts: string[], srcModuleParts: string[]): string[];
+/** Normalize debug root to end with / or be empty. */
+declare function normalizeDebugRoot(root?: string): string;
+//#endregion
 //#region src/PathUtil.d.ts
 /** simplistic path manipulation utilities */
 /** return path with ./ and foo/.. elements removed */
@@ -1119,4 +1146,4 @@ declare function offsetToLineNumber(offset: number, text: string): [lineNum: num
  */
 declare function errorHighlight(source: string, span: Span): [string, string];
 //#endregion
-export { AbstractElem, AbstractElemBase, AliasElem, Attribute, AttributeElem, BatchModuleResolver, BinaryExpression, BinaryOperator, BindIdentsParams, BindResults, BindingAST, BindingStructElem, BoundAndTransformed, BuiltinAttribute, BundleResolver, ComponentExpression, ComponentMemberExpression, CompositeResolver, Conditions, ConstAssertElem, ConstElem, ContainerElem, DeclIdent, DeclIdentElem, DeclarationElem, DiagnosticAttribute, DiagnosticDirective, DirectiveElem, DirectiveVariant, ElemWithAttributes, ElemWithContentsBase, ElifAttribute, ElseAttribute, EmittableElem, EnableDirective, ExpressionElem, ExtendedGPUValidationError, FnElem, FnParamElem, FunctionCallExpression, GlobalDeclarationElem, GlobalVarElem, GrammarElem, HasAttributes, Ident, IfAttribute, ImportCollection, ImportElem, ImportItem, ImportSegment, ImportStatement, InterpolateAttribute, LetElem, LexicalScope, LinkConfig, LinkParams, LinkRegistryParams, LinkedWesl, LinkerTransform, Literal, LiveDecls, ManglerFn, ModuleElem, ModuleResolver, NameElem, OverrideElem, ParenthesizedExpression, PartialScope, RecordResolver, RecordResolverOptions, RefIdent, RefIdentElem, RequiresDirective, Scope, SimpleMemberRef, SrcModule, StableState, StandardAttribute, StatementElem, StructElem, StructMemberElem, StuffElem, SwitchClauseElem, SyntheticElem, TerminalElem, TextElem, TransformedAST, TranslateTimeExpressionElem, TranslateTimeFeature, TypeRefElem, TypeTemplateParameter, TypedDeclElem, UnaryExpression, UnaryOperator, UnknownExpressionElem, VarElem, VirtualLibrary, VirtualLibraryFn, VirtualLibrarySet, WeslAST, WeslBundle, WeslDevice, WeslGPUCompilationInfo, WeslGPUCompilationMessage, WeslJsPlugin, WeslParseContext, WeslParseError, WeslParseState, WeslStream, _linkSync, astToString, attributeToString, bindAndTransform, bindIdents, bindIdentsRecursive, bindingStructsPlugin, blankWeslParseState, childIdent, childScope, containsScope, debugContentsToString, emptyScope, errorHighlight, filterMap, findMap, findRefsToBindingStructs, findUnboundIdents, findValidRootDecls, flatImports, groupBy, grouped, identToString, isGlobal, last, lengthPrefixMangle, link, linkRegistry, liveDeclsToString, lowerBindingStructs, makeLiveDecls, makeWeslDevice, mapForward, mapValues, markBindingStructs, markEntryTypes, mergeScope, minimalMangle, minimallyMangledName, multiKeySet, nextIdentId, noSuffix, normalize, normalizeModuleName, npmNameVariations, offsetToLineNumber, overlapTail, parseSrcModule, partition, publicDecl, replaceWords, requestWeslDevice, resetScopeIds, sanitizePackageName, scan, scopeToString, scopeToStringLong, syntheticWeslParseState, transformBindingReference, transformBindingStruct, underscoreMangle };
+export { AbstractElem, AbstractElemBase, AliasElem, Attribute, AttributeElem, BatchModuleResolver, BinaryExpression, BinaryOperator, BindIdentsParams, BindResults, BindingAST, BindingStructElem, BoundAndTransformed, BuiltinAttribute, BundleResolver, ComponentExpression, ComponentMemberExpression, CompositeResolver, Conditions, ConstAssertElem, ConstElem, ContainerElem, DeclIdent, DeclIdentElem, DeclarationElem, DiagnosticAttribute, DiagnosticDirective, DirectiveElem, DirectiveVariant, ElemWithAttributes, ElemWithContentsBase, ElifAttribute, ElseAttribute, EmittableElem, EnableDirective, ExpressionElem, ExtendedGPUValidationError, FnElem, FnParamElem, FunctionCallExpression, GlobalDeclarationElem, GlobalVarElem, GrammarElem, HasAttributes, Ident, IfAttribute, ImportCollection, ImportElem, ImportItem, ImportSegment, ImportStatement, InterpolateAttribute, LetElem, LexicalScope, LinkConfig, LinkParams, LinkRegistryParams, LinkedWesl, LinkerTransform, Literal, LiveDecls, ManglerFn, ModuleElem, ModuleResolver, NameElem, OverrideElem, ParenthesizedExpression, PartialScope, RecordResolver, RecordResolverOptions, RefIdent, RefIdentElem, RequiresDirective, Scope, SimpleMemberRef, SrcModule, StableState, StandardAttribute, StatementElem, StructElem, StructMemberElem, StuffElem, SwitchClauseElem, SyntheticElem, TerminalElem, TextElem, TransformedAST, TranslateTimeExpressionElem, TranslateTimeFeature, TypeRefElem, TypeTemplateParameter, TypedDeclElem, UnaryExpression, UnaryOperator, UnknownExpressionElem, VarElem, VirtualLibrary, VirtualLibraryFn, VirtualLibrarySet, WeslAST, WeslBundle, WeslDevice, WeslGPUCompilationInfo, WeslGPUCompilationMessage, WeslJsPlugin, WeslParseContext, WeslParseError, WeslParseState, WeslStream, _linkSync, astToString, attributeToString, bindAndTransform, bindIdents, bindIdentsRecursive, bindingStructsPlugin, blankWeslParseState, childIdent, childScope, containsScope, debugContentsToString, emptyScope, errorHighlight, fileToModulePath, filterMap, findMap, findRefsToBindingStructs, findUnboundIdents, findValidRootDecls, flatImports, groupBy, grouped, identToString, isGlobal, last, lengthPrefixMangle, link, linkRegistry, liveDeclsToString, lowerBindingStructs, makeLiveDecls, makeWeslDevice, mapForward, mapValues, markBindingStructs, markEntryTypes, mergeScope, minimalMangle, minimallyMangledName, modulePartsToRelativePath, moduleToRelativePath, multiKeySet, nextIdentId, noSuffix, normalize, normalizeDebugRoot, normalizeModuleName, npmNameVariations, offsetToLineNumber, overlapTail, parseSrcModule, partition, publicDecl, replaceWords, requestWeslDevice, resetScopeIds, resolveSuper, sanitizePackageName, scan, scopeToString, scopeToStringLong, syntheticWeslParseState, transformBindingReference, transformBindingStruct, underscoreMangle };

package/dist/index.js

@@ -1024,6 +1024,47 @@ function minimallyMangledName(proposedName, globalNames) {
 	return renamed;
 }
 
+//#endregion
+//#region src/ModulePathUtil.ts
+/** WESL module path utilities for converting between :: and / separators. */
+/**
+* Convert module path segments to relative file path.
+* Handles package/packageName prefixes and super:: resolution.
+*
+* @param parts - module path as array e.g., ["package", "utils", "helper"]
+* @param packageName - the current package's name (required)
+* @param srcModuleParts - source module path for super:: resolution (optional)
+* @returns relative file path e.g., "utils/helper", or undefined if external
+*/
+function modulePartsToRelativePath(parts, packageName, srcModuleParts) {
+	const resolved = srcModuleParts ? resolveSuper(parts, srcModuleParts) : parts;
+	const rootSegment = resolved[0];
+	if (rootSegment === "package" || rootSegment === packageName) return resolved.slice(1).join("/");
+}
+/** String variant of modulePartsToRelativePath. */
+function moduleToRelativePath(modulePath, packageName, srcModulePath) {
+	const srcParts = srcModulePath?.split("::");
+	return modulePartsToRelativePath(modulePath.split("::"), packageName, srcParts);
+}
+/**
+* Resolve super:: elements to absolute module path.
+*
+* @param parts - module path with potential super:: elements
+* @param srcModuleParts - source module path for context
+* @returns absolute module path parts (no super:: elements)
+*/
+function resolveSuper(parts, srcModuleParts) {
+	const lastSuper = parts.lastIndexOf("super");
+	if (lastSuper === -1) return parts;
+	return [...srcModuleParts.slice(0, -(lastSuper + 1)), ...parts.slice(lastSuper + 1)];
+}
+/** Normalize debug root to end with / or be empty. */
+function normalizeDebugRoot(root) {
+	if (root === void 0) return "./";
+	if (root === "") return "";
+	return root.endsWith("/") ? root : root + "/";
+}
+
 //#endregion
 //#region src/FlattenTreeImport.ts
 /**
@@ -2544,7 +2585,7 @@ function matchingImport(identParts, flatImports$1) {
 }
 /** @return an exported root declIdent for the provided path */
 function findExport(modulePathParts, srcModule, resolver, conditions = {}, virtuals) {
-	const modulePath = absoluteModulePath(modulePathParts, srcModule).slice(0, -1).join("::");
+	const modulePath = resolveSuper(modulePathParts, srcModule.modulePath.split("::")).slice(0, -1).join("::");
 	const moduleAst = resolver.resolveModule(modulePath) ?? virtualModule(modulePathParts[0], conditions, virtuals);
 	if (!moduleAst) return void 0;
 	const name$1 = last(modulePathParts);
@@ -2609,14 +2650,6 @@ function stdWgsl(name$1) {
 function qualifiedIdent(identParts) {
 	if (identParts.length > 1) return identParts;
 }
-/** Convert a module path with super:: elements to one with no super:: elements */
-function absoluteModulePath(modulePathParts, srcModule) {
-	const lastSuper = modulePathParts.lastIndexOf("super");
-	if (lastSuper === -1) return modulePathParts;
-	const base = srcModule.modulePath.split("::").slice(0, -(lastSuper + 1));
-	const noSupers = modulePathParts.slice(lastSuper + 1);
-	return [...base, ...noSupers];
-}
 /** Collect all declarations in a scope (used when scope is already validated) */
 function collectDecls(scope, found) {
 	for (const item of scope.contents) if (item.kind === "decl") found.push(item);
@@ -2884,9 +2917,7 @@ var RecordResolver = class {
 		return findInVariants(this.sources, filePath);
 	}
 	moduleToFilePath(modulePath) {
-		const parts = modulePath.split("::");
-		if (parts[0] !== this.packageName && parts[0] !== "package") return modulePath;
-		return parts.slice(1).join("/");
+		return moduleToRelativePath(modulePath, this.packageName) ?? modulePath;
 	}
 	modulePathToDebugPath(modulePath) {
 		const filePath = this.moduleToFilePath(modulePath);
@@ -2895,7 +2926,8 @@ var RecordResolver = class {
 	/** Return all modules, parsing them on-demand if needed. */
 	allModules() {
 		for (const filePath of Object.keys(this.sources)) {
-			const modulePath = fileToModulePath(filePath, this.packageName, this.packageName !== "package");
+			const treatLibAsRoot = this.packageName !== "package";
+			const modulePath = fileToModulePath(filePath, this.packageName, treatLibAsRoot);
 			this.resolveModule(modulePath);
 		}
 		return this.astCache.entries();
@@ -2926,7 +2958,8 @@ var BundleResolver = class {
 		this.debugWeslRoot = normalizeDebugRoot(debugWeslRoot);
 	}
 	resolveModule(modulePath) {
-		if (modulePath !== this.packageName && !modulePath.startsWith(this.packageName + "::")) return;
+		const pkgPrefix = this.packageName + "::";
+		if (modulePath !== this.packageName && !modulePath.startsWith(pkgPrefix)) return;
 		const cached = this.astCache.get(modulePath);
 		if (cached) return cached;
 		const source = this.findSource(modulePath);
@@ -2948,9 +2981,7 @@ var BundleResolver = class {
 		return findInVariants(this.sources, filePath);
 	}
 	moduleToFilePath(modulePath) {
-		const parts = modulePath.split("::");
-		if (parts[0] !== this.packageName) return modulePath;
-		return parts.slice(1).join("/");
+		return moduleToRelativePath(modulePath, this.packageName) ?? modulePath;
 	}
 	modulePathToDebugPath(modulePath) {
 		const filePath = this.moduleToFilePath(modulePath);
@@ -2964,12 +2995,6 @@ function fileToModulePath(filePath, packageName, treatLibAsRoot) {
 	const moduleSuffix = noSuffix(normalize(filePath)).replaceAll("/", "::");
 	return packageName + "::" + moduleSuffix;
 }
-/** Normalize debug root to end with / or be empty. */
-function normalizeDebugRoot(debugWeslRoot) {
-	if (debugWeslRoot === void 0) return "./";
-	if (debugWeslRoot === "") return "";
-	return debugWeslRoot.endsWith("/") ? debugWeslRoot : debugWeslRoot + "/";
-}
 /** Try path variants with and without ./ prefix and extension suffixes. */
 function findInVariants(sources, basePath, extensions = ["wesl", "wgsl"]) {
 	for (const prefix of ["", "./"]) {
@@ -3486,4 +3511,4 @@ function makeWeslDevice(device) {
 }
 
 //#endregion
-export { BundleResolver, CompositeResolver, LinkedWesl, RecordResolver, WeslParseError, WeslStream, _linkSync, astToString, attributeToString, bindAndTransform, bindIdents, bindIdentsRecursive, bindingStructsPlugin, blankWeslParseState, childIdent, childScope, containsScope, debugContentsToString, emptyScope, errorHighlight, filterMap, findMap, findRefsToBindingStructs, findUnboundIdents, findValidRootDecls, flatImports, groupBy, grouped, identToString, isGlobal, last, lengthPrefixMangle, link, linkRegistry, liveDeclsToString, lowerBindingStructs, makeLiveDecls, makeWeslDevice, mapForward, mapValues, markBindingStructs, markEntryTypes, mergeScope, minimalMangle, minimallyMangledName, multiKeySet, nextIdentId, noSuffix, normalize, normalizeModuleName, npmNameVariations, offsetToLineNumber, overlapTail, parseSrcModule, partition, publicDecl, replaceWords, requestWeslDevice, resetScopeIds, sanitizePackageName, scan, scopeToString, scopeToStringLong, syntheticWeslParseState, transformBindingReference, transformBindingStruct, underscoreMangle };
+export { BundleResolver, CompositeResolver, LinkedWesl, RecordResolver, WeslParseError, WeslStream, _linkSync, astToString, attributeToString, bindAndTransform, bindIdents, bindIdentsRecursive, bindingStructsPlugin, blankWeslParseState, childIdent, childScope, containsScope, debugContentsToString, emptyScope, errorHighlight, fileToModulePath, filterMap, findMap, findRefsToBindingStructs, findUnboundIdents, findValidRootDecls, flatImports, groupBy, grouped, identToString, isGlobal, last, lengthPrefixMangle, link, linkRegistry, liveDeclsToString, lowerBindingStructs, makeLiveDecls, makeWeslDevice, mapForward, mapValues, markBindingStructs, markEntryTypes, mergeScope, minimalMangle, minimallyMangledName, modulePartsToRelativePath, moduleToRelativePath, multiKeySet, nextIdentId, noSuffix, normalize, normalizeDebugRoot, normalizeModuleName, npmNameVariations, offsetToLineNumber, overlapTail, parseSrcModule, partition, publicDecl, replaceWords, requestWeslDevice, resetScopeIds, resolveSuper, sanitizePackageName, scan, scopeToString, scopeToStringLong, syntheticWeslParseState, transformBindingReference, transformBindingStruct, underscoreMangle };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wesl",
-  "version": "0.6.48",
+  "version": "0.6.49",
   "type": "module",
   "files": [
     "dist",

package/src/BindIdents.ts

@@ -7,6 +7,7 @@ import type { FlatImport } from "./FlattenTreeImport.ts";
 import type { LinkRegistryParams, VirtualLibraryFn } from "./Linker.ts";
 import { type LiveDecls, makeLiveDecls } from "./LiveDeclarations.ts";
 import { type ManglerFn, minimalMangle } from "./Mangler.ts";
+import { resolveSuper } from "./ModulePathUtil.ts";
 import type { ModuleResolver } from "./ModuleResolver.ts";
 import { flatImports, parseSrcModule, type WeslAST } from "./ParseWESL.ts";
 import type {
@@ -485,7 +486,8 @@ function findExport(
   conditions: Conditions = {},
   virtuals?: VirtualLibrarySet,
 ): FoundDecl | undefined {
-  const fqPathParts = absoluteModulePath(modulePathParts, srcModule);
+  const srcModuleParts = srcModule.modulePath.split("::");
+  const fqPathParts = resolveSuper(modulePathParts, srcModuleParts);
   const modulePath = fqPathParts.slice(0, -1).join("::");
   const moduleAst =
     resolver.resolveModule(modulePath) ??
@@ -586,20 +588,6 @@ function qualifiedIdent(identParts: string[]): string[] | undefined {
   if (identParts.length > 1) return identParts;
 }
 
-/** Convert a module path with super:: elements to one with no super:: elements */
-function absoluteModulePath(
-  modulePathParts: string[],
-  srcModule: SrcModule,
-): string[] {
-  const lastSuper = modulePathParts.lastIndexOf("super");
-  if (lastSuper === -1) return modulePathParts;
-
-  const srcModuleParts = srcModule.modulePath.split("::");
-  const base = srcModuleParts.slice(0, -(lastSuper + 1));
-  const noSupers = modulePathParts.slice(lastSuper + 1);
-  return [...base, ...noSupers];
-}
-
 /** Collect all declarations in a scope (used when scope is already validated) */
 function collectDecls(scope: Scope, found: DeclIdent[]): void {
   for (const item of scope.contents) {

package/src/ModulePathUtil.ts

@@ -0,0 +1,59 @@
+/** WESL module path utilities for converting between :: and / separators. */
+
+/**
+ * Convert module path segments to relative file path.
+ * Handles package/packageName prefixes and super:: resolution.
+ *
+ * @param parts - module path as array e.g., ["package", "utils", "helper"]
+ * @param packageName - the current package's name (required)
+ * @param srcModuleParts - source module path for super:: resolution (optional)
+ * @returns relative file path e.g., "utils/helper", or undefined if external
+ */
+export function modulePartsToRelativePath(
+  parts: string[],
+  packageName: string,
+  srcModuleParts?: string[],
+): string | undefined {
+  const resolved = srcModuleParts ? resolveSuper(parts, srcModuleParts) : parts;
+
+  const rootSegment = resolved[0];
+  if (rootSegment === "package" || rootSegment === packageName) {
+    return resolved.slice(1).join("/");
+  }
+  return undefined;
+}
+
+/** String variant of modulePartsToRelativePath. */
+export function moduleToRelativePath(
+  modulePath: string,
+  packageName: string,
+  srcModulePath?: string,
+): string | undefined {
+  const srcParts = srcModulePath?.split("::");
+  const parts = modulePath.split("::");
+  return modulePartsToRelativePath(parts, packageName, srcParts);
+}
+
+/**
+ * Resolve super:: elements to absolute module path.
+ *
+ * @param parts - module path with potential super:: elements
+ * @param srcModuleParts - source module path for context
+ * @returns absolute module path parts (no super:: elements)
+ */
+export function resolveSuper(
+  parts: string[],
+  srcModuleParts: string[],
+): string[] {
+  const lastSuper = parts.lastIndexOf("super");
+  if (lastSuper === -1) return parts;
+  const base = srcModuleParts.slice(0, -(lastSuper + 1));
+  return [...base, ...parts.slice(lastSuper + 1)];
+}
+
+/** Normalize debug root to end with / or be empty. */
+export function normalizeDebugRoot(root?: string): string {
+  if (root === undefined) return "./";
+  if (root === "") return "";
+  return root.endsWith("/") ? root : root + "/";
+}

package/src/ModuleResolver.ts

@@ -1,9 +1,8 @@
+import { moduleToRelativePath, normalizeDebugRoot } from "./ModulePathUtil.ts";
 import { parseSrcModule, type WeslAST } from "./ParseWESL.ts";
 import { normalize, noSuffix } from "./PathUtil.ts";
 import type { WeslBundle } from "./WeslBundle.ts";
 
-const libRegex = /^lib\.w[eg]sl$/i;
-
 /**
  * Resolves module paths to parsed ASTs.
  *
@@ -35,6 +34,8 @@ export interface RecordResolverOptions {
   debugWeslRoot?: string;
 }
 
+const libRegex = /^lib\.w[eg]sl$/i;
+
 /** Module resolver for in-memory source records. Lazy by default. */
 export class RecordResolver implements BatchModuleResolver {
   readonly astCache = new Map<string, WeslAST>();
@@ -60,12 +61,7 @@ export class RecordResolver implements BatchModuleResolver {
     if (!source) return undefined;
 
     const debugFilePath = this.modulePathToDebugPath(modulePath);
-
-    const ast = parseSrcModule({
-      modulePath,
-      debugFilePath,
-      src: source,
-    });
+    const ast = parseSrcModule({ modulePath, debugFilePath, src: source });
     this.astCache.set(modulePath, ast);
     return ast;
   }
@@ -78,13 +74,7 @@ export class RecordResolver implements BatchModuleResolver {
   }
 
   private moduleToFilePath(modulePath: string): string {
-    const parts = modulePath.split("::");
-    if (parts[0] !== this.packageName && parts[0] !== "package") {
-      return modulePath;
-    }
-
-    const pathParts = parts.slice(1);
-    return pathParts.join("/");
+    return moduleToRelativePath(modulePath, this.packageName) ?? modulePath;
   }
 
   private modulePathToDebugPath(modulePath: string): string {
@@ -95,10 +85,11 @@ export class RecordResolver implements BatchModuleResolver {
   /** Return all modules, parsing them on-demand if needed. */
   allModules(): Iterable<[string, WeslAST]> {
     for (const filePath of Object.keys(this.sources)) {
+      const treatLibAsRoot = this.packageName !== "package";
       const modulePath = fileToModulePath(
         filePath,
         this.packageName,
-        this.packageName !== "package",
+        treatLibAsRoot,
       );
       this.resolveModule(modulePath);
     }
@@ -137,10 +128,8 @@ export class BundleResolver implements ModuleResolver {
   }
 
   resolveModule(modulePath: string): WeslAST | undefined {
-    if (
-      modulePath !== this.packageName &&
-      !modulePath.startsWith(this.packageName + "::")
-    ) {
+    const pkgPrefix = this.packageName + "::";
+    if (modulePath !== this.packageName && !modulePath.startsWith(pkgPrefix)) {
       return undefined;
     }
 
@@ -151,11 +140,7 @@ export class BundleResolver implements ModuleResolver {
     if (!source) return undefined;
 
     const debugFilePath = this.modulePathToDebugPath(modulePath);
-    const ast = parseSrcModule({
-      modulePath,
-      debugFilePath,
-      src: source,
-    });
+    const ast = parseSrcModule({ modulePath, debugFilePath, src: source });
     this.astCache.set(modulePath, ast);
     return ast;
   }
@@ -173,11 +158,7 @@ export class BundleResolver implements ModuleResolver {
   }
 
   private moduleToFilePath(modulePath: string): string {
-    const parts = modulePath.split("::");
-    if (parts[0] !== this.packageName) {
-      return modulePath;
-    }
-    return parts.slice(1).join("/");
+    return moduleToRelativePath(modulePath, this.packageName) ?? modulePath;
   }
 
   private modulePathToDebugPath(modulePath: string): string {
@@ -187,7 +168,7 @@ export class BundleResolver implements ModuleResolver {
 }
 
 /** Convert file path to module path (e.g., "foo/bar.wesl" -> "package::foo::bar"). */
-function fileToModulePath(
+export function fileToModulePath(
   filePath: string,
   packageName: string,
   treatLibAsRoot: boolean,
@@ -204,13 +185,6 @@ function fileToModulePath(
   return packageName + "::" + moduleSuffix;
 }
 
-/** Normalize debug root to end with / or be empty. */
-function normalizeDebugRoot(debugWeslRoot?: string): string {
-  if (debugWeslRoot === undefined) return "./";
-  if (debugWeslRoot === "") return "";
-  return debugWeslRoot.endsWith("/") ? debugWeslRoot : debugWeslRoot + "/";
-}
-
 /** Try path variants with and without ./ prefix and extension suffixes. */
 function findInVariants(
   sources: Record<string, string>,

package/src/index.ts

@@ -8,6 +8,7 @@ export * from "./LinkedWesl.ts";
 export * from "./Linker.ts";
 export * from "./LiveDeclarations.ts";
 export * from "./Mangler.ts";
+export * from "./ModulePathUtil.ts";
 export * from "./ModuleResolver.ts";
 export * from "./ParseWESL.ts";
 export * from "./PathUtil.ts";