@fraczak/k 7.0.2 → 7.1.0

package/objects/inspect.mjs

@@ -6,20 +6,26 @@ import { decodeObject } from "../object.mjs";
 import { objectToKIRP } from "../kir.mjs";
 
 function helpText() {
+  const prog = argv[1] || "inspect.mjs";
   return [
     "Inspect a k .ko or .klib object.",
     "",
-    `Usage: ${argv[1]} [options] [object-file]`,
+    `Usage: ${prog} [options] [object-file]`,
     "",
     "Arguments:",
-    "  object-file    Input .ko or .klib file. Reads from stdin when omitted.",
+    "  object-file    Input .ko or .klib file (default: stdin).",
     "",
     "Options:",
     "  --kir          Print the KIR-P JSON view.",
-    "  --summary      Print a compact section summary. This is the default.",
+    "  --summary      Print a compact section summary (default).",
     "  -h, --help     Show this help.",
     "",
-    "KIR-P is an inspection/export view; it does not change the stored object format."
+    "KIR-P is an inspection/export view; it does not change the stored",
+    "object format.",
+    "",
+    "Examples:",
+    `  ${prog} program.ko`,
+    `  ${prog} --kir program.ko`
   ].join("\n");
 }
 
@@ -66,22 +72,21 @@ try {
   }
 
   let mode = "summary";
-  while (args.length > 0 && args[0].startsWith("--")) {
-    const option = args.shift();
-    if (option === "--kir") {
+  let inputPath = null;
+  for (const arg of args) {
+    if (arg === "--kir") {
       mode = "kir";
-    } else if (option === "--summary") {
+    } else if (arg === "--summary") {
       mode = "summary";
+    } else if (arg.startsWith("-")) {
+      throw new Error(`Unknown option: ${arg}`);
+    } else if (inputPath == null) {
+      inputPath = arg;
     } else {
-      throw new Error(`Unknown option: ${option}`);
+      throw new Error(`Unexpected argument: ${arg}`);
     }
   }
 
-  const inputPath = args.shift() || null;
-  if (args.length > 0) {
-    throw new Error(`Unexpected argument: ${args[0]}`);
-  }
-
   const buffer = inputPath == null ? await readStdinBytes() : fs.readFileSync(inputPath);
   const object = decodeObject(buffer);
   if (mode === "kir") {

package/objects/validate.mjs

@@ -346,19 +346,25 @@ export function validateKIRP(kir) {
 }
 
 function helpText() {
+  const prog = argv[1] || "validate.mjs";
   return [
     "Validate a k .ko/.klib object or KIR-P JSON file.",
     "",
-    `Usage: ${argv[1]} [options] [input-file]`,
+    `Usage: ${prog} [options] [input-file]`,
     "",
     "Arguments:",
-    "  input-file     Input .ko/.klib file, or KIR JSON with --kir. Reads stdin when omitted.",
+    "  input-file     Input .ko/.klib file, or KIR JSON with --kir.",
+    "                 Reads stdin when omitted.",
     "",
     "Options:",
-    "  --kir          Validate input as KIR-P JSON instead of a k object.",
+    "  --kir          Validate input as KIR-P JSON instead of an object.",
     "  -h, --help     Show this help.",
     "",
-    "Object validation also validates the derived KIR-P export view."
+    "Object validation also validates the derived KIR-P export view.",
+    "",
+    "Examples:",
+    `  ${prog} program.ko`,
+    `  ${prog} --kir program.kir.json`
   ].join("\n");
 }
 
@@ -382,18 +388,19 @@ async function main() {
   }
 
   let mode = "object";
-  while (args.length > 0 && args[0].startsWith("--")) {
-    const option = args.shift();
-    if (option === "--kir") {
+  let inputPath = null;
+  for (const arg of args) {
+    if (arg === "--kir") {
       mode = "kir";
+    } else if (arg.startsWith("-")) {
+      throw new Error(`Unknown option: ${arg}`);
+    } else if (inputPath == null) {
+      inputPath = arg;
     } else {
-      throw new Error(`Unknown option: ${option}`);
+      throw new Error(`Unexpected argument: ${arg}`);
     }
   }
 
-  const inputPath = args.shift() || null;
-  if (args.length > 0) throw new Error(`Unexpected argument: ${args[0]}`);
-
   const input = inputPath == null ? await readStdinBytes() : fs.readFileSync(inputPath);
   if (mode === "kir") {
     validateKIRP(JSON.parse(input.toString("utf8")));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "7.0.2",
+    "version": "7.1.0",
     "description": "k — a language for content-addressable schemas and data transformations over algebraic data types (products and tagged unions); includes runtime, contract derivation, REPL, and codec toolchain",
     "publishConfig": {
         "access": "public"
@@ -21,9 +21,17 @@
         "benchmark:html": "node scripts/render-benchmark.mjs",
         "perf:ieee": "node scripts/perf-ieee.mjs",
         "perf:ieee:full": "node scripts/perf-ieee.mjs --full",
+        "perf:ieee:pkir": "BACKENDS=pkir node scripts/perf-ieee.mjs",
+        "perf:ieee:llvm-pkir": "BACKENDS=llvm-pkir node scripts/perf-ieee.mjs",
         "perf:int": "node scripts/perf-int.mjs",
+        "perf:int:pkir": "BACKENDS=pkir node scripts/perf-int.mjs",
+        "perf:int:llvm-pkir": "BACKENDS=llvm-pkir node scripts/perf-int.mjs",
         "perf:mult": "node scripts/perf-multiplication.mjs",
+        "perf:mult:pkir": "node scripts/perf-multiplication.mjs --backends pkir",
+        "perf:mult:llvm-pkir": "node scripts/perf-multiplication.mjs --backends llvm-pkir",
         "perf:poly": "node scripts/perf-poly.mjs",
+        "perf:poly:pkir": "BACKENDS=pkir node scripts/perf-poly.mjs",
+        "perf:poly:llvm-pkir": "BACKENDS=llvm-pkir node scripts/perf-poly.mjs",
         "perf:poly:trace": "node scripts/perf-poly.mjs --trace",
         "perf:idempotency": "node scripts/benchmark-idempotency.mjs",
         "deps:graph": "node scripts/generate-dependency-graph.mjs",
@@ -44,10 +52,9 @@
         "k-inspect-object": "objects/inspect.mjs",
         "k-validate-object": "objects/validate.mjs",
         "k-kir": "kir.mjs",
+        "k-llvm": "backends/llvm/bin/k-llvm.mjs",
         "k-llvm-build": "backends/llvm/bin/k-llvm-build.mjs",
         "k-llvm-compile": "backends/llvm/bin/k-llvm-compile.mjs",
-        "k-llvm-jit": "backends/llvm/bin/k-llvm-jit.mjs",
-        "k-llvm-run": "backends/llvm/bin/k-llvm-run.mjs",
         "k-wasm": "backends/wasm/bin/k-wasm.mjs",
         "k-wasm-compile": "backends/wasm/bin/k-wasm-compile.mjs",
         "k-wasm-run": "backends/wasm/bin/k-wasm-run.mjs",