wesl-fetch 0.0.12 → 0.0.14

package/dist/index.js

@@ -400,7 +400,8 @@ async function fetchDependencies(rootModuleSource, options) {
 	const shaderRoot = options?.shaderRoot ?? "/shaders";
 	const currentPath = options?.currentPath;
 	const existingSources = options?.existingSources;
-	const skipExternal = options?.skipExternal ?? false;
+	const fetchLibs = options?.fetchLibs ?? true;
+	const fetchSources = options?.fetchSources ?? true;
 	const rootModuleName = currentPath ? urlToModulePath(currentPath, shaderRoot) : "package::main";
 	const resolver = new FetchingResolver({
 		...existingSources,
@@ -416,12 +417,12 @@ async function fetchDependencies(rootModuleSource, options) {
 		const unresolved = getNonVirtualUnresolved(resolver, fetched);
 		if (unresolved.length === 0) break;
 		const [internal, external] = partition(unresolved, isInternal);
-		await Promise.all(internal.map((p) => resolver.resolveModuleAsync(p)));
-		if (skipExternal) for (const p of external) fetched.add(p.split("::")[0]);
-		else {
+		if (fetchSources) await Promise.all(internal.map((p) => resolver.resolveModuleAsync(p)));
+		else for (const p of internal) fetched.add(p);
+		if (fetchLibs) {
 			const newLibs = await fetchExternalBundles(external, fetched);
 			libs.push(...newLibs);
-		}
+		} else for (const p of external) fetched.add(p.split("::")[0]);
 	}
 	return {
 		libs,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wesl-fetch",
   "description": "Browser-based HTTP fetching for WESL packages from npm",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "type": "module",
   "repository": "github:wgsl-tooling-wg/wesl-js",
   "exports": {
@@ -11,7 +11,7 @@
     "fflate": "^0.8.2",
     "nanotar": "^0.2.0",
     "resolve.exports": "^2.0.3",
-    "wesl": "0.7.24"
+    "wesl": "0.7.26"
   },
   "scripts": {
     "build": "tsdown",

package/src/PackageLoader.ts

@@ -47,8 +47,10 @@ export interface FetchOptions {
   currentPath?: string;
   /** Pre-existing sources to include. */
   existingSources?: Record<string, string>;
-  /** Skip fetching external packages from npm (default: false). */
-  skipExternal?: boolean;
+  /** Fetch library packages from npm (default: true). */
+  fetchLibs?: boolean;
+  /** Fetch local .wesl source files via HTTP (default: true). */
+  fetchSources?: boolean;
 }
 
 const virtualModules = ["constants", "env"];
@@ -61,7 +63,8 @@ export async function fetchDependencies(
   const shaderRoot = options?.shaderRoot ?? "/shaders";
   const currentPath = options?.currentPath;
   const existingSources = options?.existingSources;
-  const skipExternal = options?.skipExternal ?? false;
+  const fetchLibs = options?.fetchLibs ?? true;
+  const fetchSources = options?.fetchSources ?? true;
 
   const rootModuleName = currentPath
     ? urlToModulePath(currentPath, shaderRoot)
@@ -84,13 +87,17 @@ export async function fetchDependencies(
     if (unresolved.length === 0) break;
 
     const [internal, external] = partition(unresolved, isInternal);
-    await Promise.all(internal.map(p => resolver.resolveModuleAsync(p)));
-
-    if (skipExternal) {
-      for (const p of external) fetched.add(p.split("::")[0]);
+    if (fetchSources) {
+      await Promise.all(internal.map(p => resolver.resolveModuleAsync(p)));
     } else {
+      for (const p of internal) fetched.add(p);
+    }
+
+    if (fetchLibs) {
       const newLibs = await fetchExternalBundles(external, fetched);
       libs.push(...newLibs);
+    } else {
+      for (const p of external) fetched.add(p.split("::")[0]);
     }
   }