wesl-link 0.6.33 → 0.6.36

package/bin/wesl-link

@@ -9754,6 +9754,81 @@ function zip(as, bs) {
 	return as.map((a, i) => [a, bs[i]]);
 }
 
+//#endregion
+//#region ../wesl-tooling/src/PackageNameUtils.ts
+/** Generate npm package name variations from sanitized WESL identifier.
+*
+* Uses double-underscore encoding to distinguish scoped vs unscoped packages:
+* - Has __ → scoped package (try @scope/pkg variants)
+* - No __ → unscoped package (try pkg variants)
+*
+* Examples:
+*   "lygia__shader_utils" → ["@lygia/shader_utils", "@lygia/shader-utils"]
+*   "random_wgsl" → ["random_wgsl", "random-wgsl"]
+*/
+function* npmNameVariations(sanitizedPath) {
+	const [pkg, sub] = breakAt(sanitizedPath, "/");
+	let pkgName = pkg;
+	let scopePrefix = "";
+	if (pkg.includes("__")) {
+		const [scope, ...rest] = pkg.split("__");
+		pkgName = rest.join("__");
+		scopePrefix = `@${scope}/`;
+	}
+	yield `${scopePrefix}${pkgName}${sub}`;
+	yield `${scopePrefix}${pkgName.replaceAll("_", "-")}${sub}`;
+}
+/** Break string at first occurrence of delimiter.
+* @returns [before, after] where after includes the delimiter */
+function breakAt(str, delimiter) {
+	const index = str.indexOf(delimiter);
+	if (index === -1) return [str, ""];
+	return [str.slice(0, index), str.slice(index)];
+}
+
+//#endregion
+//#region ../wesl-tooling/src/NpmResolver.ts
+/** Find longest resolvable npm subpath from WESL module path segments.
+*
+* A WESL statement containing a WESL module path like 'import foo__bar::baz::elem;' references
+* an npm package, an export within that package, a module within the WeslBundle,
+* and an element within the WESL module.
+* This function returns the npm package and export portion from the module path.
+* The return value is usable to dynamically import the corresponding weslBundle.js file.
+*
+* Translation from a WESL module path to an npm package path involves:
+* - Mapping WESL package names to their npm counterparts (e.g., 'foo__bar' -> '@foo/bar')
+* - Probing to find the longest valid export subpath within the package
+*   - package.json allows export subpaths, so 'mypkg::gpu' could be 'mypkg/gpu' or just 'mypkg' in npm
+* - Probing to handle variations in package naming
+*   - foo_bar could be foo-bar in npm
+*
+* Note that the resolution is based on package.json.
+* The resolved file itself may not exist yet. (e.g. dist/weslBundle.js may not have been built yet)
+*
+* @param mPath - Module path segments
+* @param importerURL - Base URL for resolution (e.g., 'file:///path/to/project/')
+* @returns Longest resolvable subpath (e.g., 'foo/bar/baz' or 'foo')
+*/
+function npmResolveWESL(mPath, importerURL) {
+	for (const subPath of exportSubpaths(mPath)) for (const npmPath of npmNameVariations(subPath)) if (tryResolve(npmPath, importerURL)) return npmPath;
+}
+/** Try Node.js module resolution.
+* @return undefined if unresolvable. */
+function tryResolve(path$2, importerURL) {
+	try {
+		return resolve(path$2, importerURL);
+	} catch {
+		return;
+	}
+}
+/** Yield possible export subpaths from module path, longest first.
+* Drops the last segment (element name) and iterates down. */
+function* exportSubpaths(mPath) {
+	const longest = mPath.length - 1;
+	for (let i = longest; i >= 0; i--) yield mPath.slice(0, i).join("/");
+}
+
 //#endregion
 //#region ../wesl-tooling/src/ParseDependencies.ts
 /**
@@ -9786,32 +9861,9 @@ function parseDependencies(weslSrc, projectDir) {
 	const pkgRefs = unbound.filter((modulePath) => modulePath.length > 1 && modulePath[0] !== "constants");
 	if (pkgRefs.length === 0) return [];
 	const projectURL = projectDirURL(projectDir);
-	const deps = filterMap(pkgRefs, (mPath) => unboundToDependency(mPath, projectURL));
+	const deps = filterMap(pkgRefs, (mPath) => npmResolveWESL(mPath, projectURL));
 	return [...new Set(deps)];
 }
-/** Find longest resolvable npm subpath from module path segments.
-*
-* @param mPath - Module path segments (e.g., ['foo', 'bar', 'baz', 'elem'])
-* @param importerURL - Base URL for resolution (e.g., 'file:///path/to/project/')
-* @returns Longest resolvable subpath (e.g., 'foo/bar/baz' or 'foo')
-*/
-function unboundToDependency(mPath, importerURL) {
-	return [...exportSubpaths(mPath)].find((subPath) => tryResolve(subPath, importerURL));
-}
-/** Try Node.js module resolution; returns undefined if unresolvable. */
-function tryResolve(path$2, importerURL) {
-	try {
-		return resolve(path$2, importerURL);
-	} catch {
-		return;
-	}
-}
-/** Yield possible export subpaths from module path, longest first.
-* Drops the last segment (element name) and iterates down. */
-function* exportSubpaths(mPath) {
-	const longest = mPath.length - 1;
-	for (let i = longest; i >= 0; i--) yield mPath.slice(0, i).join("/");
-}
 /**
 * Load WeslBundle instances referenced by WESL sources.
 *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wesl-link",
-  "version": "0.6.33",
+  "version": "0.6.36",
   "type": "module",
   "bin": "bin/wesl-link",
   "files": [
@@ -11,8 +11,8 @@
   "dependencies": {
     "import-meta-resolve": "^4.1.0",
     "yargs": "^18.0.0",
-    "mini-parse": "0.6.33",
-    "wesl": "0.6.33"
+    "mini-parse": "0.6.36",
+    "wesl": "0.6.36"
   },
   "devDependencies": {
     "wesl-tooling": "x"