wesl-packager 0.6.6 → 0.6.9

package/README.md

@@ -1,15 +1,9 @@
-# WGSL-Packager
+# WESL-Packager
 
 A command tool to bundle WGSL/WESL files into an npm package.
 
-## Usage
-
-Create a bundled package in the `dist` directory
-from sources in the `src/shaders` directory.
-
-```sh
-npx wesl-packager --rootDir src/shaders --outDir dist
-```
+See [Publishing Packages](https://wesl-lang.dev/docs/Publishing-Packages#wesl-packager-options)
+for documentation on how to use `wesl-packager`.
 
 ### Development
 

package/bin/wesl-packager

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 import { exit } from "node:process";
 import { hideBin } from "yargs/helpers";
+import path from "node:path";
+import { loadModules, parseDependencies, versionFromPackageJson, zip } from "wesl-tooling";
 import yargs from "yargs";
 import fs, { mkdir } from "node:fs/promises";
-import path from "node:path";
 import { Biome, Distribution } from "@biomejs/js-api";
-import { glob } from "glob";
 import { noSuffix } from "wesl";
-import { parseDependencies } from "wesl-tooling";
 
 //#region \0raw:/Users/lee/wesl-js/tools/packages/wesl/src/WeslBundle.ts
 var WeslBundle_default = "export interface WeslBundle {\n  /** name of the package, e.g. random_wgsl */\n  name: string;\n\n  /** wesl edition of the code e.g. unstable_2025_1 */\n  edition: string;\n\n  /** map of wesl/wgsl modules:\n   *    keys are file paths, relative to package root (e.g. \"./lib.wgsl\")\n   *    values are wgsl/wesl code strings\n   */\n  modules: Record<string, string>;\n\n  /** packages referenced by this package */\n  dependencies?: WeslBundle[];\n}\n";
@@ -17,12 +16,8 @@ var WeslBundle_default = "export interface WeslBundle {\n  /** name of the packa
 const biome = await setupBiome();
 /** write weslBundle .js and .d.ts files for this shader */
 async function packageWgsl(args) {
-	const { projectDir, outDir, multiBundle } = args;
-	const modules = await loadModules(args);
-	if (Object.entries(modules).length === 0) {
-		console.error("no WGSL/WESL files found in", args.src);
-		throw new Error("no WGSL/WESL files found");
-	}
+	const { projectDir, outDir, multiBundle, baseDir, src } = args;
+	const modules = await loadModules(projectDir, baseDir, src);
 	const pkgJsonPath = path.join(projectDir, "package.json");
 	const { name } = await loadPackageFields(pkgJsonPath);
 	const edition = "unstable_2025_1";
@@ -120,19 +115,6 @@ function bundleToJsString(bundle, dependencies) {
 		return result;
 	} else return jsonString;
 }
-/** load the wesl/wgsl shader sources */
-async function loadModules(args) {
-	const { rootDir } = args;
-	const shaderFiles = await glob(`${args.src}`, { ignore: "node_modules/**" });
-	const promisedSrcs = shaderFiles.map((f) => fs.readFile(f, { encoding: "utf8" }));
-	const src = await Promise.all(promisedSrcs);
-	const relativePaths = shaderFiles.map((p) => path.relative(rootDir, p));
-	const moduleEntries = zip(relativePaths, src);
-	return Object.fromEntries(moduleEntries);
-}
-function zip(as, bs) {
-	return as.map((a, i) => [a, bs[i]]);
-}
 /** parse and extract fields from package.json that we care about
 * (the name of the package) */
 async function loadPackageFields(pkgJsonPath) {
@@ -163,15 +145,22 @@ async function packagerCli(rawArgs$1) {
 	await packageWgsl(cliArgs);
 }
 async function parseArgs(args) {
-	const appVersion = await versionFromPackageJson();
+	const projectDir = path.join(import.meta.url, "..");
+	const appVersion = await versionFromPackageJson(projectDir);
 	return yargs(args).command("$0", "create an npm package from WGSL/WESL files").version(appVersion).option("src", {
 		type: "string",
 		default: "./shaders/*.w[eg]sl",
 		describe: "WGSL/WESL files to bundle in the package (glob syntax)"
 	}).option("rootDir", {
+		deprecated: true,
+		type: "string",
+		default: "./shaders",
+		describe: "use --baseDir instead"
+	}).option("baseDir", {
+		deprecated: true,
 		type: "string",
 		default: "./shaders",
-		describe: "base directory of WGSL/WESL files"
+		describe: "root directory for shaders"
 	}).option("projectDir", {
 		type: "string",
 		default: ".",
@@ -194,12 +183,6 @@ async function parseArgs(args) {
 		describe: "where to put bundled output files (relative to projectDir)"
 	}).help().parse();
 }
-async function versionFromPackageJson() {
-	const pkgJsonPath = new URL("../package.json", import.meta.url);
-	const pkgModule = await import(pkgJsonPath.href, { with: { type: "json" } });
-	const version = pkgModule.default.version;
-	return version;
-}
 
 //#endregion
 //#region src/main.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wesl-packager",
-  "version": "0.6.6",
+  "version": "0.6.9",
   "type": "module",
   "files": [
     "bin"
@@ -12,8 +12,8 @@
     "glob": "^11.0.2",
     "import-meta-resolve": "^4.1.0",
     "yargs": "^17.7.2",
-    "wesl": "0.6.6",
-    "wesl-tooling": "0.6.6"
+    "wesl": "0.6.9",
+    "wesl-tooling": "0.6.9"
   },
   "devDependencies": {
     "@types/diff": "^8.0.0",
@@ -26,13 +26,9 @@
     "tsdown": "^0.11.12"
   },
   "scripts": {
-    "echo": "echo",
     "build": "tsdown",
     "build:watch": "tsdown --watch",
-    "format": "prettier . --write",
-    "lint": "eslint src",
-    "organize": "organize-imports-cli tsconfig.json",
-    "typecheck": "tsc",
+    "typecheck": "tsgo",
     "test": "FORCE_COLOR=1 vitest",
     "test:once": "vitest run"
   }