@fraczak/k 7.0.2 → 7.2.0

package/objects/compile.mjs

@@ -13,38 +13,43 @@ import {
 import { objectToKVMArtifact } from "../kvm.mjs";
 
 function helpText() {
+  const prog = argv[1] || "compile.mjs";
   return [
-    "Compile a k source, .ko, or .klib into .ko, .klib, or .kvm output.",
-    "Output format is inferred from the output file extension, or from --format.",
+    "Compile k source, .ko, or .klib into .ko, .klib, or .kvm output.",
+    "Output format is inferred from the output extension or --format.",
     "",
-    `Usage: ${argv[1]} [options] [source-snippet | input-file [output-file]]`,
+    `Usage: ${prog} [options]`,
+    "       [source-snippet | input-file [output-file]]",
     "",
     "Arguments:",
-    "  source-snippet  Inline k source, in the same style as k.mjs.",
-    "  input-file      Source .k, .ko, or .klib file. Reads UTF-8 source from stdin when omitted.",
-    "  output-file     Output path (.ko, .klib, or .kvm). Writes to stdout when omitted.",
+    "  source-snippet   Inline k source, in the same style as k.mjs.",
+    "  input-file       Source .k, .ko, or .klib file.",
+    "                   Reads UTF-8 source from stdin when omitted.",
+    "  output-file      Output path (.ko, .klib, or .kvm).",
+    "                   Writes to stdout when omitted.",
     "",
     "Options:",
-    "  --lib file       Load one .klib or .k library dependency before compiling.",
-    "  --export spec    Export a library alias into the source scope. May be repeated.",
-    "                   spec is 'name' or 'libname:localname'.",
-    "  --format fmt     Output format: ko, klib, or kvm. Overrides extension detection.",
-    "  -h, --help       Show this help.",
+    "  -o, --output path  Specify output file path explicitly.",
+    "  --format fmt       Output format: ko, klib, or kvm.",
+    "                     Overrides extension detection.",
+    "  --lib file         Load one .klib or .k library before compiling.",
+    "  --export spec      Export library alias into scope. Repeatable.",
+    "                     spec is 'name' or 'libname:localname'.",
+    "  -h, --help         Show this help.",
     "",
-    "Existing input paths are read as files. A non-existing input with .k, .ko,",
-    "or .klib extension is reported as a missing file; otherwise it is compiled",
-    "as inline k source.",
+    "Existing input paths are read as files. A non-existing input with",
+    ".k, .ko, or .klib extension is reported as missing; otherwise it is",
+    "compiled as inline k source.",
     "",
     ".kvm is a polymorphic kVM template artifact (layer: KVM-P).",
     "A .klib input can only be copied to .klib output.",
     "",
     "Examples:",
-    `  ${argv[1]} 'x = |x; x x'`,
-    `  ${argv[1]} program.k program.ko`,
-    `  ${argv[1]} program.k program.klib`,
-    `  ${argv[1]} program.k program.kvm`,
-    `  ${argv[1]} --lib Examples/arithmetics.k --export plus:+ --export succ --export int '{succ int x,int y}+' a.kvm`,
-    `  ${argv[1]} --lib core.klib --export add --export mul:times program.k program.ko`
+    `  ${prog} 'x = |x; x x'`,
+    `  ${prog} program.k -o program.ko`,
+    `  ${prog} program.k program.klib`,
+    `  ${prog} program.k program.kvm`,
+    `  ${prog} --lib core.klib --export add program.k program.ko`
   ].join("\n");
 }
 
@@ -144,6 +149,7 @@ try {
 
   const libraries = [];
   let format = null;
+  let explicitOutput = null;
   const exports = [];
 
   while (args.length > 0) {
@@ -151,7 +157,13 @@ try {
       args.shift();
       break;
     }
-    if (args[0] === "--lib") {
+    if (args[0] === "-o" || args[0] === "--output") {
+      args.shift();
+      explicitOutput = args.shift();
+      if (!explicitOutput) {
+        throw new Error("-o/--output requires a file argument");
+      }
+    } else if (args[0] === "--lib") {
       args.shift();
       const libPath = args.shift();
       if (!libPath) throw new Error("--lib requires a file argument");
@@ -172,7 +184,7 @@ try {
       format = args.shift();
       if (!["ko", "klib", "kvm"].includes(format))
         throw new Error(`Unknown format: ${format}. Use ko, klib, or kvm.`);
-    } else if (args[0].startsWith("--")) {
+    } else if (args[0].startsWith("-")) {
       throw new Error(`Unknown option: ${args[0]}`);
     } else {
       break;
@@ -180,11 +192,13 @@ try {
   }
 
   const inputArg = args.shift() || null;
-  const outputPath = args.shift() || null;
+  const positionalOutput = args.shift() || null;
   if (args.length > 0) {
     throw new Error(`Unexpected argument: ${args[0]}`);
   }
 
+  const outputPath = explicitOutput || positionalOutput || null;
+
   const outputFormat = format || inferFormat(outputPath);
   const input = resolveInput(inputArg);
   const inputType = input.type;

package/objects/decompile.mjs

@@ -5,20 +5,24 @@ import { argv, exit, stdin, stdout } from "node:process";
 import { decompileObjectBuffer } from "../object.mjs";
 
 function helpText() {
+  const prog = argv[1] || "decompile.mjs";
   return [
     "Decompile a .ko or .klib object into readable k source.",
     "",
-    `Usage: ${argv[1]} [ object-file [ k-file ] ]`,
+    `Usage: ${prog} [options] [ object-file [ k-file ] ]`,
     "",
     "Arguments:",
-    "  object-file  Input .ko or .klib path. Reads object data from stdin when omitted.",
-    "  k-file       Output .k path. Writes source to stdout when omitted.",
+    "  object-file        Input .ko or .klib path.",
+    "                     Reads object data from stdin when omitted.",
+    "  k-file             Output .k path (default: stdout).",
     "",
     "Options:",
-    "  -h, --help   Show this help.",
+    "  -o, --output path  Specify output file path explicitly.",
+    "  -h, --help         Show this help.",
     "",
-    "Example:",
-    `  ${argv[1]} program.ko program.decompiled.k`
+    "Examples:",
+    `  ${prog} program.ko -o program.decompiled.k`,
+    `  ${prog} program.ko program.decompiled.k`
   ].join("\n");
 }
 
@@ -35,13 +39,39 @@ async function readStdinBuffer() {
 }
 
 try {
-  const [, , objectPath, outputPath] = argv;
-  if (objectPath === "-h" || objectPath === "--help") {
+  const rawArgs = argv.slice(2);
+  if (rawArgs.includes("-h") || rawArgs.includes("--help")) {
     usage(console.log);
     exit(0);
   }
 
-  const objectBuffer = objectPath == null ? await readStdinBuffer() : fs.readFileSync(objectPath);
+  let explicitOutput = null;
+  const remainingArgs = [];
+  while (rawArgs.length > 0) {
+    const arg = rawArgs[0];
+    if (arg === "-o" || arg === "--output") {
+      rawArgs.shift();
+      explicitOutput = rawArgs.shift();
+      if (!explicitOutput) {
+        throw new Error("-o/--output requires a file argument");
+      }
+    } else if (arg.startsWith("-")) {
+      throw new Error(`Unknown option: ${arg}`);
+    } else {
+      remainingArgs.push(rawArgs.shift());
+    }
+  }
+
+  const objectPath = remainingArgs.shift() || null;
+  const positionalOutput = remainingArgs.shift() || null;
+  if (remainingArgs.length > 0) {
+    throw new Error(`Unexpected argument: ${remainingArgs[0]}`);
+  }
+  const outputPath = explicitOutput || positionalOutput || null;
+
+  const objectBuffer = objectPath == null
+    ? await readStdinBuffer()
+    : fs.readFileSync(objectPath);
   const source = decompileObjectBuffer(objectBuffer);
   if (outputPath == null) {
     stdout.write(source);
@@ -49,7 +79,7 @@ try {
     fs.writeFileSync(outputPath, source);
   }
 } catch (error) {
-  console.error(error);
+  console.error(error.message || String(error));
   usage();
   exit(1);
 }

package/objects/extract-aliases.mjs

@@ -5,24 +5,28 @@ import { argv, exit, stdin, stdout } from "node:process";
 import { extractAliasesFromObjectBuffer } from "../object.mjs";
 
 function helpText() {
+  const prog = argv[1] || "extract-aliases.mjs";
   return [
-    "Extract metadata aliases from a .ko or .klib as a valid k source snippet.",
+    "Extract metadata aliases from a .ko or .klib as valid k source.",
     "",
-    `Usage: ${argv[1]} [ object-file [ k-file ] ]`,
+    `Usage: ${prog} [options] [ object-file [ k-file ] ]`,
     "",
-    "Output is grouped by metadata type (code, then rel), then sorted by alias",
-    "name and compiledAt. Earlier definitions of the same alias are commented",
-    "out so only the latest one remains active.",
+    "Output is grouped by metadata type (code, then rel), then sorted",
+    "by alias name and compiledAt. Earlier definitions of the same alias",
+    "are commented out so only the latest one remains active.",
     "",
     "Arguments:",
-    "  object-file  Input .ko or .klib path. Reads object data from stdin when omitted.",
-    "  k-file       Output .k path. Writes source to stdout when omitted.",
+    "  object-file        Input .ko or .klib path.",
+    "                     Reads object data from stdin when omitted.",
+    "  k-file             Output .k path (default: stdout).",
     "",
     "Options:",
-    "  -h, --help   Show this help.",
+    "  -o, --output path  Specify output file path explicitly.",
+    "  -h, --help         Show this help.",
     "",
-    "Example:",
-    `  ${argv[1]} core.klib aliases.k`
+    "Examples:",
+    `  ${prog} core.klib -o aliases.k`,
+    `  ${prog} core.klib aliases.k`
   ].join("\n");
 }
 
@@ -39,13 +43,39 @@ async function readStdinBuffer() {
 }
 
 try {
-  const [, , objectPath, outputPath] = argv;
-  if (objectPath === "-h" || objectPath === "--help") {
+  const rawArgs = argv.slice(2);
+  if (rawArgs.includes("-h") || rawArgs.includes("--help")) {
     usage(console.log);
     exit(0);
   }
 
-  const objectBuffer = objectPath == null ? await readStdinBuffer() : fs.readFileSync(objectPath);
+  let explicitOutput = null;
+  const remainingArgs = [];
+  while (rawArgs.length > 0) {
+    const arg = rawArgs[0];
+    if (arg === "-o" || arg === "--output") {
+      rawArgs.shift();
+      explicitOutput = rawArgs.shift();
+      if (!explicitOutput) {
+        throw new Error("-o/--output requires a file argument");
+      }
+    } else if (arg.startsWith("-")) {
+      throw new Error(`Unknown option: ${arg}`);
+    } else {
+      remainingArgs.push(rawArgs.shift());
+    }
+  }
+
+  const objectPath = remainingArgs.shift() || null;
+  const positionalOutput = remainingArgs.shift() || null;
+  if (remainingArgs.length > 0) {
+    throw new Error(`Unexpected argument: ${remainingArgs[0]}`);
+  }
+  const outputPath = explicitOutput || positionalOutput || null;
+
+  const objectBuffer = objectPath == null
+    ? await readStdinBuffer()
+    : fs.readFileSync(objectPath);
   const source = extractAliasesFromObjectBuffer(objectBuffer);
   if (outputPath == null) {
     stdout.write(source);
@@ -53,7 +83,7 @@ try {
     fs.writeFileSync(outputPath, source);
   }
 } catch (error) {
-  console.error(error);
+  console.error(error.message || String(error));
   usage();
   exit(1);
 }

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.2.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,13 +52,13 @@
         "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",
+        "k-djson": "codecs/djson.mjs",
         "k-ieee": "codecs/ieee.mjs",
         "k-int": "codecs/int.mjs",
         "k-json": "codecs/json.mjs",