@fluffylabs/anan-as 1.1.6 → 1.2.0-47bd114

package/dist/bin/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { readFileSync } from "node:fs";
-import minimist from "minimist";
+import { parseArgs } from "node:util";
 import { disassemble, HasMetadata, InputKind, prepareProgram, pvmDestroy, pvmResume, pvmSetRegisters, pvmStart, } from "../build/release.js";
 import { LOG_GAS_COST, LOG_HOST_CALL_INDEX, printLogHostCall, WHAT } from "./src/log-host-call.js";
 import { STATUS } from "./src/trace-parse.js";
@@ -52,16 +52,19 @@ function main() {
     }
 }
 function handleDisassemble(args) {
-    const parsed = minimist(args, {
-        boolean: ["spi", "metadata", "help"],
-        alias: { h: "help" },
-        default: { metadata: true },
+    const { values, positionals: files } = parseArgs({
+        args,
+        allowPositionals: true,
+        options: {
+            spi: { type: "boolean", default: false },
+            "no-metadata": { type: "boolean", default: false },
+            help: { type: "boolean", short: "h", default: false },
+        },
     });
-    if (parsed.help) {
+    if (values.help) {
         console.log(HELP_TEXT);
         return;
     }
-    const files = parsed._;
     if (files.length === 0) {
         console.error("Error: No file provided for disassemble command.");
         console.error("Usage: anan-as disassemble [--spi] [--no-metadata] <file.(jam|pvm|spi|bin)>");
@@ -87,32 +90,37 @@ function handleDisassemble(args) {
         console.error("Supported extensions: .jam, .pvm, .spi, .bin");
         process.exit(1);
     }
-    const kind = parsed.spi ? InputKind.SPI : InputKind.Generic;
-    const hasMetadata = parsed.metadata ? HasMetadata.Yes : HasMetadata.No;
+    const kind = values.spi ? InputKind.SPI : InputKind.Generic;
+    const hasMetadata = values["no-metadata"] ? HasMetadata.No : HasMetadata.Yes;
     const f = readFileSync(file);
     const name = kind === InputKind.Generic ? "generic PVM" : "JAM SPI";
     console.log(`🤖 Assembly of ${file} (as ${name})`);
     console.log(disassemble(Array.from(f), kind, hasMetadata));
 }
 function handleRun(args) {
-    const parsed = minimist(args, {
-        boolean: ["spi", "logs", "metadata", "help", "log-host-call"],
-        /** Prevents parsing hex values as numbers. */
-        string: ["pc", "gas", "_"],
-        alias: { h: "help" },
-        default: { metadata: true, logs: true, "log-host-call": true },
+    const { values, positionals: files } = parseArgs({
+        args,
+        allowPositionals: true,
+        options: {
+            spi: { type: "boolean", default: false },
+            "no-logs": { type: "boolean", default: false },
+            "no-metadata": { type: "boolean", default: false },
+            "no-log-host-call": { type: "boolean", default: false },
+            help: { type: "boolean", short: "h", default: false },
+            pc: { type: "string" },
+            gas: { type: "string" },
+        },
     });
-    if (parsed.help) {
+    if (values.help) {
         console.log(HELP_TEXT);
         return;
     }
-    const files = parsed._;
     if (files.length === 0) {
         console.error("Error: No file provided for run command.");
         console.error("Usage: anan-as run [--spi] [--no-logs] [--no-metadata] [--pc <number>] [--gas <number>] <file.jam> [spi-args.bin]");
         process.exit(1);
     }
-    const kind = parsed.spi ? InputKind.SPI : InputKind.Generic;
+    const kind = values.spi ? InputKind.SPI : InputKind.Generic;
     let programFile;
     let spiArgsStr;
     if (kind === InputKind.SPI) {
@@ -136,12 +144,12 @@ function handleRun(args) {
     }
     // Validate SPI args file if provided
     const spiArgs = parseSpiArgs(spiArgsStr);
-    const logs = parsed.logs;
-    const logHostCall = parsed["log-host-call"];
-    const hasMetadata = parsed.metadata ? HasMetadata.Yes : HasMetadata.No;
+    const logs = !values["no-logs"];
+    const logHostCall = !values["no-log-host-call"];
+    const hasMetadata = values["no-metadata"] ? HasMetadata.No : HasMetadata.Yes;
     // Parse and validate PC and gas options
-    const initialPc = parsePc(parsed);
-    const initialGas = parseGas(parsed);
+    const initialPc = parsePc(values.pc);
+    const initialGas = parseGas(values.gas);
     const programCode = Array.from(readFileSync(programFile));
     const name = kind === InputKind.Generic ? "generic PVM" : "JAM SPI";
     console.log(`🚀 Running ${programFile} (as ${name})`);
@@ -185,16 +193,21 @@ function handleRun(args) {
     }
 }
 function handleReplayTrace(args) {
-    const parsed = minimist(args, {
-        boolean: ["metadata", "verify", "logs", "help", "log-host-call"],
-        alias: { h: "help" },
-        default: { metadata: true, logs: true, verify: true, "log-host-call": true },
+    const { values, positionals: files } = parseArgs({
+        args,
+        allowPositionals: true,
+        options: {
+            "no-metadata": { type: "boolean", default: false },
+            "no-verify": { type: "boolean", default: false },
+            "no-logs": { type: "boolean", default: false },
+            "no-log-host-call": { type: "boolean", default: false },
+            help: { type: "boolean", short: "h", default: false },
+        },
     });
-    if (parsed.help) {
+    if (values.help) {
         console.log(HELP_TEXT);
         return;
     }
-    const files = parsed._;
     if (files.length === 0) {
         console.error("Error: No trace file provided for replay-trace command.");
         console.error("Usage: anan-as replay-trace [--no-metadata] [--no-verify] [--no-logs] <trace.log>");
@@ -206,10 +219,10 @@ function handleReplayTrace(args) {
         process.exit(1);
     }
     const file = files[0];
-    const hasMetadata = parsed.metadata ? HasMetadata.Yes : HasMetadata.No;
-    const verify = parsed.verify;
-    const logs = parsed.logs;
-    const logHostCall = parsed["log-host-call"];
+    const hasMetadata = values["no-metadata"] ? HasMetadata.No : HasMetadata.Yes;
+    const verify = !values["no-verify"];
+    const logs = !values["no-logs"];
+    const logHostCall = !values["no-log-host-call"];
     try {
         const summary = replayTraceFile(file, {
             logs,
@@ -227,16 +240,10 @@ function handleReplayTrace(args) {
         process.exit(1);
     }
 }
-function parseGas(parsed) {
-    if (parsed.gas === undefined) {
+function parseGas(gasStr) {
+    if (gasStr === undefined) {
         return BigInt(10_000);
     }
-    // Ensure it's a string/number, not boolean
-    if (typeof parsed.gas === "boolean") {
-        console.error("Error: --gas requires a value.");
-        process.exit(1);
-    }
-    const gasStr = String(parsed.gas);
     // Reject floats and non-integer strings
     if (gasStr.includes(".") || !/^-?\d+$/.test(gasStr)) {
         console.error("Error: --gas must be a valid integer.");
@@ -269,16 +276,10 @@ function parseSpiArgs(spiArgsStr) {
         return Array.from(readFileSync(spiArgsStr));
     }
 }
-function parsePc(parsed) {
-    if (parsed.pc === undefined) {
+function parsePc(pcStr) {
+    if (pcStr === undefined) {
         return 0;
     }
-    // Ensure it's a string/number, not boolean
-    if (typeof parsed.pc === "boolean") {
-        console.error("Error: --pc requires a value.");
-        process.exit(1);
-    }
-    const pcStr = String(parsed.pc);
     // Reject floats and non-integer strings
     if (pcStr.includes(".") || !/^-?\d+$/.test(pcStr)) {
         console.error("Error: --pc must be a valid integer.");