wesl-fetch 0.0.11 → 0.0.13

package/dist/index.js

@@ -2,7 +2,6 @@ import { gunzipSync } from "fflate";
 import { parseTar } from "nanotar";
 import { RecordResolver, fileToModulePath, findUnboundIdents, modulePartsToRelativePath, npmNameVariations, parseSrcModule, partition } from "wesl";
 import { resolve } from "resolve.exports";
-
 //#region src/BundleHydrator.ts
 const importPattern = /import\s+(?:\*\s+as\s+)?(\w+)\s+from\s+["']([^"']+)["']/g;
 const nestedBundlePattern = /package\/dist\/(.+)\/weslBundle\.js$/;
@@ -79,7 +78,6 @@ async function hydrateBundle(path, registry, hydrated, fetcher) {
 	Object.assign(placeholder, bundle);
 	return placeholder;
 }
-
 //#endregion
 //#region src/BundleLoader.ts
 /** Fetch and extract tgz file, returning tar entries (cached). */
@@ -173,7 +171,6 @@ function extractPackageName(bundleContent) {
 	if (!nameMatch) throw new Error("Could not extract package name from bundle");
 	return nameMatch[1];
 }
-
 //#endregion
 //#region src/FetchingResolver.ts
 /** Resolver with sync interface for findUnboundIdents and async API for fetching. */
@@ -257,7 +254,6 @@ async function fetchWithExtensions(baseUrl) {
 		if (response.ok) return response.text();
 	} catch {}
 }
-
 //#endregion
 //#region src/HttpPackageLoader.ts
 const packageJsonCache = /* @__PURE__ */ new Map();
@@ -396,7 +392,6 @@ async function fetchBundleFile(pkgName, bundlePath, packageBase) {
 function normalizeUrl(url) {
 	return url.replace(/([^:])\/+/g, "$1/");
 }
-
 //#endregion
 //#region src/PackageLoader.ts
 const virtualModules = ["constants", "env"];
@@ -405,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,
@@ -421,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,
@@ -502,6 +498,5 @@ async function fetchOnePackage(pkgId, loaded) {
 	} catch {}
 	throw new Error(`Package not found: ${pkgId}`);
 }
-
 //#endregion
-export { FetchingResolver, bundleRegistry, clearHttpCache, fetchBundleFilesFromNpm, fetchDependencies, fetchPackagesByName, fetchPackagesFromHttp, hydrateBundleRegistry, loadBundlesFromFiles, loadBundlesFromTgz, loadBundlesWithPackageName, loadShaderFromUrl };
+export { FetchingResolver, bundleRegistry, clearHttpCache, fetchBundleFilesFromNpm, fetchDependencies, fetchPackagesByName, fetchPackagesFromHttp, hydrateBundleRegistry, loadBundlesFromFiles, loadBundlesFromTgz, loadBundlesWithPackageName, loadShaderFromUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wesl-fetch",
   "description": "Browser-based HTTP fetching for WESL packages from npm",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "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.23"
+    "wesl": "0.7.25"
   },
   "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]);
     }
   }
 

package/tsdown.config.ts

@@ -5,5 +5,5 @@ export default defineConfig({
   target: "es2024",
   clean: true,
   platform: "browser",
-  external: ["wesl"],
+  deps: { neverBundle: ["wesl"] },
 });