@gasm-compiler/cli 0.1.1 → 0.3.0

package/README.md

@@ -4,6 +4,9 @@
 
 Compile WebAssembly (`.wasm`) or AssemblyScript (`.as`/`.ts`) files to WGSL compute shaders from the command line. Built on top of [`@gasm-compiler/core`](https://www.npmjs.com/package/@gasm-compiler/core).
 
+Version 0.2 defaults to strict Gasm v0.2 compilation. Use
+`--spec-version 0.1` only for archived v0.1 inputs.
+
 ---
 
 ## Installation

package/dist/cli.js

@@ -9,10 +9,13 @@ import { parseArgs } from "jsr:@std/cli/parse-args";
 import { resolve } from "jsr:@std/path";
 import { ensureFile } from "jsr:@std/fs";
 import {
+  compileToArtifact,
   compileWithDiagnostics,
   disassembleToWAT,
+  isParseError,
   parseWasmModule,
-  isParseError
+  prepareModule,
+  validateGasmMetadataSchema
 } from "@gasm-compiler/core";
 function printDiagnostics(diagnostics, verbose) {
   for (const w of diagnostics.warnings) {
@@ -24,13 +27,19 @@ function printDiagnostics(diagnostics, verbose) {
     for (const d of diagnostics.demotions) {
       counts.set(d.kind, (counts.get(d.kind) ?? 0) + 1);
     }
-    const parts = [...counts.entries()].map(([kind, count]) => `${kind} (${count})`);
+    const parts = [...counts.entries()].map(
+      ([kind, count]) => `${kind} (${count})`
+    );
     console.error(`demotions: ${parts.join(", ")}`);
   }
 }
 async function compileAssemblyScriptToWGSL(inputFile, options = {}) {
   const {
     output: outputFile,
+    metadata: metadataFile,
+    prepare,
+    strict = false,
+    specVersion: requestedSpecVersion,
     watOutput: watOutputFile,
     verbose = false,
     keepWasm = false,
@@ -41,6 +50,25 @@ async function compileAssemblyScriptToWGSL(inputFile, options = {}) {
     sourceMapping
   } = options;
   try {
+    if (requestedSpecVersion !== void 0 && requestedSpecVersion !== "0.1" && requestedSpecVersion !== "0.2") {
+      throw new Error(
+        `Unsupported spec version "${requestedSpecVersion}"; expected 0.1 or 0.2`
+      );
+    }
+    if (prepare !== void 0 && prepare !== "auto") {
+      throw new Error(
+        `Unsupported prepare mode "${prepare}"; expected "auto"`
+      );
+    }
+    if (prepare && strict) {
+      throw new Error("--prepare and --strict cannot be used together");
+    }
+    const specVersion = requestedSpecVersion ?? "0.2";
+    if (metadataFile && specVersion !== "0.2") {
+      throw new Error(
+        "--metadata requires --spec-version 0.2"
+      );
+    }
     if (verbose) console.log(`[1/4] Validating input file: ${inputFile}`);
     const resolvedInput = resolve(inputFile);
     const stats = await Deno.stat(resolvedInput);
@@ -49,7 +77,9 @@ async function compileAssemblyScriptToWGSL(inputFile, options = {}) {
     }
     const isWasm = resolvedInput.endsWith(".wasm");
     if (!isWasm && !resolvedInput.endsWith(".as") && !resolvedInput.endsWith(".ts")) {
-      console.warn("Warning: Input file does not have .as, .ts, or .wasm extension");
+      console.warn(
+        "Warning: Input file does not have .as, .ts, or .wasm extension"
+      );
     }
     let wasmPath = resolvedInput.replace(/\.(as|ts)$/, ".wasm");
     if (!isWasm) {
@@ -104,31 +134,82 @@ ${errorMsg}`);
     const demotionPolicy = {};
     if (denyF64Demotion) demotionPolicy.f64 = "deny";
     if (allowI64Demotion) demotionPolicy.i64 = "allow-lossy";
-    const validLevels = ["none", "minimal", "normal", "detailed", "verbose"];
+    const validLevels = [
+      "none",
+      "minimal",
+      "normal",
+      "detailed",
+      "verbose"
+    ];
     let sourceMappingLevel;
     if (sourceMapping) {
       if (validLevels.includes(sourceMapping)) {
         sourceMappingLevel = sourceMapping;
       } else {
-        console.warn(`Warning: Unknown source-mapping level "${sourceMapping}", using "normal"`);
+        console.warn(
+          `Warning: Unknown source-mapping level "${sourceMapping}", using "normal"`
+        );
         sourceMappingLevel = "normal";
       }
     }
-    const result = compileWithDiagnostics(wasmBytes, {
+    let compileOptions = {
       optimize,
       demotionPolicy,
       warningsAsErrors,
-      sourceMapping: sourceMappingLevel
-    });
+      sourceMapping: sourceMappingLevel,
+      specVersion
+    };
+    let compilationBytes = wasmBytes;
+    if (prepare === "auto" || strict) {
+      const prepared = prepareModule(wasmBytes, {
+        ...compileOptions,
+        mode: strict ? "strict" : "integrator"
+      });
+      for (const advisory of prepared.advisories) {
+        console.error(`advisory: ${advisory.message}`);
+      }
+      if (prepared.errors.length > 0) {
+        const first = prepared.errors[0];
+        throw new Error(`${first.code}: ${first.message}`);
+      }
+      compilationBytes = prepared.wasmBytes;
+      compileOptions = prepared.compileOptions;
+    }
+    const result = metadataFile ? compileToArtifact(compilationBytes, compileOptions) : compileWithDiagnostics(compilationBytes, compileOptions);
     printDiagnostics(result.diagnostics, verbose);
     if (!result.ok) {
       const first = result.diagnostics.errors[0];
-      throw new Error(first?.message ?? "Compilation failed");
+      throw new Error(
+        first ? `${first.code}: ${first.message}` : "Compilation failed"
+      );
     }
     const wgslCode = result.wgsl;
+    if (metadataFile) {
+      if (!("metadata" in result)) {
+        throw new Error("Compiler did not produce metadata");
+      }
+      const schema = validateGasmMetadataSchema(result.metadata);
+      if (!schema.valid) {
+        throw new Error(
+          `Generated metadata failed schema validation: ${schema.errors.join(", ")}`
+        );
+      }
+      const resolvedMetadata = resolve(metadataFile);
+      await ensureFile(resolvedMetadata);
+      await Deno.writeTextFile(
+        resolvedMetadata,
+        `${JSON.stringify(result.metadata, null, 2)}
+`
+      );
+      if (verbose) {
+        console.log(`\u2713 Metadata written to: ${resolvedMetadata}`);
+      } else {
+        console.log(`\u2713 Metadata written to: ${metadataFile}`);
+      }
+    }
     if (watOutputFile) {
       if (verbose) console.log("[4a/4] Generating WAT disassembly...");
-      const parseResult = parseWasmModule(wasmBytes);
+      const parseResult = parseWasmModule(compilationBytes);
       if (!isParseError(parseResult)) {
         const watCode = disassembleToWAT(parseResult);
         const resolvedWatOutput = resolve(watOutputFile);
@@ -140,7 +221,9 @@ ${errorMsg}`);
           console.log(`\u2713 WAT written to: ${watOutputFile}`);
         }
       } else {
-        console.warn(`Warning: Failed to parse WASM for WAT disassembly: ${parseResult.message}`);
+        console.warn(
+          `Warning: Failed to parse WASM for WAT disassembly: ${parseResult.message}`
+        );
       }
     }
     if (outputFile) {
@@ -174,7 +257,10 @@ async function getAssemblyScriptPath() {
   const possiblePaths = [
     // Relative to CLI package
     resolve(scriptDir, "../../node_modules/.bin/asc"),
-    resolve(scriptDir, "../../node_modules/.pnpm/assemblyscript@0.28.9/node_modules/assemblyscript/node_modules/.bin/asc"),
+    resolve(
+      scriptDir,
+      "../../node_modules/.pnpm/assemblyscript@0.28.9/node_modules/assemblyscript/node_modules/.bin/asc"
+    ),
     resolve(scriptDir, "../node_modules/.bin/asc"),
     resolve(scriptDir, "../examples/node_modules/.bin/asc"),
     // Relative to workspace root
@@ -196,16 +282,24 @@ async function getAssemblyScriptPath() {
 }
 
 // src/cli.ts
-var VERSION = "0.1.0";
+var VERSION = "0.3.0";
 async function main() {
   const args = parseArgs(Deno.args, {
-    string: ["output", "wat-output", "source-mapping"],
+    string: [
+      "output",
+      "metadata",
+      "prepare",
+      "spec-version",
+      "wat-output",
+      "source-mapping"
+    ],
     boolean: [
       "help",
       "version",
       "verbose",
       "keep-wasm",
       "optimize",
+      "strict",
       "deny-f64-demotion",
       "allow-i64-demotion",
       "warnings-as-errors"
@@ -229,12 +323,18 @@ async function main() {
     if (command === "compile") {
       if (args._.length < 2) {
         console.error("Error: compile requires an input file");
-        console.error("Usage: cli compile <input.as|wasm> [--output <output.wgsl>]");
+        console.error(
+          "Usage: cli compile <input.as|wasm> [--output <output.wgsl>]"
+        );
         Deno.exit(1);
       }
       const inputFile = args._[1];
       const options = {
         output: args.output,
+        metadata: args.metadata,
+        prepare: args.prepare,
+        strict: args.strict,
+        specVersion: args["spec-version"],
         watOutput: args["wat-output"],
         verbose: args.verbose,
         keepWasm: args["keep-wasm"],
@@ -251,7 +351,10 @@ async function main() {
       Deno.exit(1);
     }
   } catch (error) {
-    console.error("Error:", error instanceof Error ? error.message : String(error));
+    console.error(
+      "Error:",
+      error instanceof Error ? error.message : String(error)
+    );
     if (args.verbose && error instanceof Error && error.stack) {
       console.error("\nStack trace:");
       console.error(error.stack);
@@ -274,6 +377,10 @@ COMMANDS:
 
 OPTIONS:
     --output <file>           Write WGSL output to file (default: stdout)
+    --metadata <file>         Write validated Gasm v0.2 metadata sidecar JSON
+    --prepare auto            Infer and inject extensions for transient builds
+    --strict                  Analyze without modifying the input Wasm
+    --spec-version <version>  Compile as Gasm 0.1 or 0.2 (default: 0.2)
     --wat-output <file>       Also write WAT (WebAssembly Text) disassembly to file
     --verbose                 Show detailed compilation steps
     --keep-wasm               Keep intermediate WASM files

package/package.json

@@ -1,16 +1,14 @@
 {
   "name": "@gasm-compiler/cli",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "CLI for compiling WebAssembly/AssemblyScript to WGSL using Gasm Compiler",
   "type": "module",
   "main": "./dist/cli.js",
-  "types": "./dist/cli.d.ts",
   "bin": {
     "gasm-compiler": "./dist/cli.js"
   },
   "exports": {
     ".": {
-      "types": "./dist/cli.d.ts",
       "import": "./dist/cli.js",
       "default": "./dist/cli.js"
     }
@@ -35,7 +33,7 @@
     "cli"
   ],
   "dependencies": {
-    "@gasm-compiler/core": "0.1.1"
+    "@gasm-compiler/core": "0.5.0"
   },
   "devDependencies": {
     "assemblyscript": "v0.28.9",