wgsl-play 0.0.33 → 0.0.34

package/dist/WgslPlay.js

@@ -151,9 +151,10 @@ var WgslPlay = class extends HTMLElement {
 	}
 	/** Set sources from a full project with weslSrc. */
 	setProjectSources(weslSrc, rootModuleName) {
-		const entries = Object.entries(weslSrc).map(([k, v]) => [toModulePath(k), v]);
-		this._weslSrc = Object.fromEntries(entries);
-		this._rootModuleName = rootModuleName ? toModulePath(rootModuleName) : "package::main";
+		const pkg = this._linkOptions.packageName || "package";
+		const root = rootModuleName ?? "main";
+		this._weslSrc = toModulePaths(weslSrc, pkg);
+		this._rootModuleName = fileToModulePath(root, pkg, false);
 		this._fromFullProject = true;
 		this.rebuildPipeline();
 	}
@@ -285,13 +286,10 @@ var WgslPlay = class extends HTMLElement {
 			const source = el.source ?? el.textContent ?? "";
 			return { [this._rootModuleName]: source };
 		};
-		const conditions = el.conditions;
-		const rootModuleName = el.rootModuleName;
-		const libs = el.libs;
-		const weslSrc = getSources();
-		const entries = Object.entries(weslSrc).map(([k, v]) => [toModulePath(k), v]);
-		this._weslSrc = Object.fromEntries(entries);
-		this._rootModuleName = rootModuleName ? toModulePath(rootModuleName) : "package::main";
+		const { conditions, rootModuleName, libs } = el;
+		const root = rootModuleName ?? "main";
+		this._weslSrc = getSources();
+		this._rootModuleName = fileToModulePath(root, "package", false);
 		if (conditions) this._linkOptions = {
 			...this._linkOptions,
 			conditions
@@ -444,9 +442,11 @@ function upgradeProperty(el, prop) {
 		el[prop] = value;
 	}
 }
-/** Convert file path to module path (e.g., "effects/main.wesl" -> "package::effects::main"). */
-function toModulePath(filePath) {
-	return fileToModulePath(filePath, "package", false);
+/** Normalize all keys in a weslSrc record to module paths. */
+function toModulePaths(weslSrc, pkg) {
+	const result = {};
+	for (const [key, value] of Object.entries(weslSrc)) result[fileToModulePath(key, pkg, false)] = value;
+	return result;
 }
 
 //#endregion

package/dist/wgsl-play.js

@@ -5836,9 +5836,10 @@ var WgslPlay = class extends HTMLElement {
 	}
 	/** Set sources from a full project with weslSrc. */
 	setProjectSources(weslSrc, rootModuleName) {
-		const entries = Object.entries(weslSrc).map(([k, v]) => [toModulePath(k), v]);
-		this._weslSrc = Object.fromEntries(entries);
-		this._rootModuleName = rootModuleName ? toModulePath(rootModuleName) : "package::main";
+		const pkg = this._linkOptions.packageName || "package";
+		const root = rootModuleName ?? "main";
+		this._weslSrc = toModulePaths(weslSrc, pkg);
+		this._rootModuleName = fileToModulePath(root, pkg, false);
 		this._fromFullProject = true;
 		this.rebuildPipeline();
 	}
@@ -5970,13 +5971,10 @@ var WgslPlay = class extends HTMLElement {
 			const source = el.source ?? el.textContent ?? "";
 			return { [this._rootModuleName]: source };
 		};
-		const conditions = el.conditions;
-		const rootModuleName = el.rootModuleName;
-		const libs = el.libs;
-		const weslSrc = getSources();
-		const entries = Object.entries(weslSrc).map(([k, v]) => [toModulePath(k), v]);
-		this._weslSrc = Object.fromEntries(entries);
-		this._rootModuleName = rootModuleName ? toModulePath(rootModuleName) : "package::main";
+		const { conditions, rootModuleName, libs } = el;
+		const root = rootModuleName ?? "main";
+		this._weslSrc = getSources();
+		this._rootModuleName = fileToModulePath(root, "package", false);
 		if (conditions) this._linkOptions = {
 			...this._linkOptions,
 			conditions
@@ -6129,9 +6127,11 @@ function upgradeProperty(el, prop) {
 		el[prop] = value;
 	}
 }
-/** Convert file path to module path (e.g., "effects/main.wesl" -> "package::effects::main"). */
-function toModulePath(filePath) {
-	return fileToModulePath(filePath, "package", false);
+/** Normalize all keys in a weslSrc record to module paths. */
+function toModulePaths(weslSrc, pkg) {
+	const result = {};
+	for (const [key, value] of Object.entries(weslSrc)) result[fileToModulePath(key, pkg, false)] = value;
+	return result;
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgsl-play",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "type": "module",
   "files": [
     "dist",
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "wesl": "0.7.23",
-    "wesl-fetch": "0.0.11",
-    "wesl-gpu": "0.1.25"
+    "wesl-gpu": "0.1.25",
+    "wesl-fetch": "0.0.11"
   },
   "devDependencies": {
     "@playwright/test": "^1.53.2",

package/src/WgslPlay.ts

@@ -241,15 +241,10 @@ export class WgslPlay extends HTMLElement {
     weslSrc: Record<string, string>,
     rootModuleName?: string,
   ): void {
-    // Convert file paths to module paths if needed (for ?link imports)
-    const entries = Object.entries(weslSrc).map(([k, v]) => [
-      toModulePath(k),
-      v,
-    ]);
-    this._weslSrc = Object.fromEntries(entries);
-    this._rootModuleName = rootModuleName
-      ? toModulePath(rootModuleName)
-      : "package::main";
+    const pkg = this._linkOptions.packageName || "package";
+    const root = rootModuleName ?? "main";
+    this._weslSrc = toModulePaths(weslSrc, pkg);
+    this._rootModuleName = fileToModulePath(root, pkg, false);
     this._fromFullProject = true;
     this.rebuildPipeline();
   }
@@ -427,18 +422,10 @@ export class WgslPlay extends HTMLElement {
 
     // Load initial sources, conditions, and libs from source element.
     // Use discoverAndRebuild (not project setter) so external deps are fetched.
-    const conditions = (el as any).conditions;
-    const rootModuleName = (el as any).rootModuleName;
-    const libs = (el as any).libs;
-    const weslSrc = getSources();
-    const entries = Object.entries(weslSrc).map(([k, v]) => [
-      toModulePath(k),
-      v,
-    ]);
-    this._weslSrc = Object.fromEntries(entries);
-    this._rootModuleName = rootModuleName
-      ? toModulePath(rootModuleName)
-      : "package::main";
+    const { conditions, rootModuleName, libs } = el as any;
+    const root = rootModuleName ?? "main";
+    this._weslSrc = getSources();
+    this._rootModuleName = fileToModulePath(root, "package", false);
     if (conditions) this._linkOptions = { ...this._linkOptions, conditions };
     if (libs) this._libs = libs;
     this._fromFullProject = false;
@@ -629,7 +616,13 @@ function upgradeProperty(el: HTMLElement, prop: string): void {
   }
 }
 
-/** Convert file path to module path (e.g., "effects/main.wesl" -> "package::effects::main"). */
-function toModulePath(filePath: string): string {
-  return fileToModulePath(filePath, "package", false);
+/** Normalize all keys in a weslSrc record to module paths. */
+function toModulePaths(
+  weslSrc: Record<string, string>,
+  pkg: string,
+): Record<string, string> {
+  const result: Record<string, string> = {};
+  for (const [key, value] of Object.entries(weslSrc))
+    result[fileToModulePath(key, pkg, false)] = value;
+  return result;
 }