@fraczak/k 7.0.1 → 7.1.0

package/codecs/k-parse.mjs

@@ -7,10 +7,32 @@ import { isMainEntrypoint } from "./runtime/cli-entry.mjs";
 import { patternFromFilter } from "./runtime/pattern-k.mjs";
 import { encodeToWire } from "./runtime/prefix-codec.mjs";
 
-function usage(prog) {
-  console.error(`Usage: ${prog} [--input-type <type-script|type-file> | --input-pattern <pattern-script|pattern-file>] [value-file]`);
-  console.error("  Parse a textual k value and emit the self-hosted binary pattern+value stream.");
-  console.error("  If no pattern or type is provided, derive a closed pattern from the value.");
+function helpText() {
+  const prog = argv[1] || "k-parse.mjs";
+  return [
+    "Parse a textual k value and emit a binary pattern+value stream.",
+    "If no pattern or type is provided, derives a closed pattern from",
+    "the value.",
+    "",
+    `Usage: ${prog} [options] [value-file]`,
+    "",
+    "Arguments:",
+    "  value-file             Input textual k value file.",
+    "                         Reads from stdin when omitted.",
+    "",
+    "Options:",
+    "  --input-type type      Type filter script or file for pattern.",
+    "  --input-pattern json   Pattern JSON string or file.",
+    "  -h, --help             Show this help.",
+    "",
+    "Examples:",
+    `  echo '{"x": 1}' | ${prog} | k-print`,
+    `  ${prog} --input-type '<{} a, {} b>' value.kv`
+  ].join("\n");
+}
+
+function usage(stream = console.error) {
+  stream(helpText());
 }
 
 function maybeReadFile(s) {
@@ -31,11 +53,10 @@ function readAll(stream) {
 }
 
 async function main() {
-  const prog = argv[1];
   const args = argv.slice(2);
 
   if (args.includes("-h") || args.includes("--help")) {
-    usage(prog);
+    usage(console.log);
     return exit(0);
   }
 
@@ -51,13 +72,13 @@ async function main() {
     } else if (valueFile == null) {
       valueFile = args[i];
     } else {
-      usage(prog);
+      usage();
       return exit(1);
     }
   }
 
   if (inputTypeArg != null && inputPatternArg != null) {
-    usage(prog);
+    usage();
     return exit(1);
   }
 

package/codecs/k-print.mjs

@@ -5,13 +5,29 @@ import { argv, stdin, stdout } from "node:process";
 import { isMainEntrypoint } from "./runtime/cli-entry.mjs";
 import { decodeWire } from "./runtime/prefix-codec.mjs";
 
+function helpText() {
+  const prog = argv[1] || "k-print.mjs";
+  return [
+    "Read a binary pattern+value stream and print the decoded",
+    "textual value.",
+    "",
+    `Usage: ${prog} [options] [file]`,
+    "",
+    "Arguments:",
+    "  file         Input binary wire file (default: stdin).",
+    "",
+    "Options:",
+    "  --debug      Print decoded pattern and value as JSON.",
+    "  -h, --help   Show this help.",
+    "",
+    "Examples:",
+    `  echo '"hello"' | k-parse | ${prog}`,
+    `  ${prog} input.wire`
+  ].join("\n");
+}
+
 function usage(stream = console.error) {
-  stream(`Usage: ${argv[1]} [--debug] [file]`);
-  stream("  Read a binary pattern+value stream and print the decoded textual value.");
-  stream("");
-  stream("Options:");
-  stream("  --debug      Print decoded pattern and value as JSON.");
-  stream("  -h, --help   Show this help.");
+  stream(helpText());
 }
 
 function readAll(stream) {

package/codecs/runtime/codec-sdk.mjs

@@ -22,10 +22,14 @@ function printUsage(fileName, doc) {
   if (doc) {
     stdout.write(`${doc.trim()}\n\n`);
   }
-  stdout.write("Options:\n");
-  stdout.write("  --parse      Read external text from stdin, write binary pattern+value stream to stdout.\n");
-  stdout.write("  --print      Read binary pattern+value stream from stdin, write external text to stdout.\n");
-  stdout.write("  -h, --help   Show this help.\n");
+  stdout.write(
+    "Options:\n" +
+    "  --parse      Read external text from stdin, write binary\n" +
+    "               pattern+value stream to stdout.\n" +
+    "  --print      Read binary pattern+value stream from stdin,\n" +
+    "               write external text to stdout.\n" +
+    "  -h, --help   Show this help.\n"
+  );
 }
 
 function runCodecCLI(metaUrl, codec) {

package/codecs/show.mjs

@@ -6,13 +6,27 @@ import { isMainEntrypoint } from "./runtime/cli-entry.mjs";
 import { decodeWire } from "./runtime/prefix-codec.mjs";
 import { propertyListToFilter, valueToK } from "./runtime/show-value.mjs";
 
+function helpText() {
+  const prog = argv[1] || "show.mjs";
+  return [
+    "Pass a binary wire stream through unchanged on stdout while",
+    "printing the decoded value and filter to stderr.",
+    "",
+    `Usage: ${prog} [wire-file]`,
+    "",
+    "Arguments:",
+    "  wire-file    Input binary wire file (default: stdin).",
+    "",
+    "Options:",
+    "  -h, --help   Show this help.",
+    "",
+    "Examples:",
+    `  echo '"hello"' | k-parse | ${prog} | k-print`
+  ].join("\n");
+}
+
 function usage(stream = console.error) {
-  stream(`Usage: ${argv[1]} [wire-file]`);
-  stream("  Pass the wire stream through unchanged on stdout.");
-  stream("  Print the decoded value and filter to stderr.");
-  stream("");
-  stream("Options:");
-  stream("  -h, --help   Show this help.");
+  stream(helpText());
 }
 
 function readAll(stream) {

package/core.k

@@ -1,17 +1,17 @@
 -- core.k — the k standard core library
 --
 -- Defines:
---   1. bits — canonical binary number / bit-path relation
---   2. string — unicode strings relation (used for labels)
---   3. pattern — pattern graph relation
+--   1. bits? — canonical binary number / bit-path relation
+--   2. string? — unicode strings relation (used for labels)
+--   3. pattern? — pattern graph relation
 
 ---------------------------------------------------------------
 -- §1. Bits
 ---------------------------------------------------------------
 
-bit = ?< {} 0, {} 1 >;
+bit? = ?< {} 0, {} 1 >;
 
-bits = ?< {} _, bits 0, bits 1 > = bits;
+bits? = ?< {} _, bits? 0, bits? 1 > = bits?;
 
 _ = {}|_;
 
@@ -22,7 +22,7 @@ _ = {}|_;
 -- §2. Unicode and String
 ---------------------------------------------------------------
 
-string = ? <
+string? = ? <
   {} nil,
   {
     <
@@ -82,7 +82,7 @@ string = ? <
 -- to decode any value, first decode a pattern under that constant,
 -- then decode the value under the pattern just obtained.
 
-pattern = ? <
+pattern? = ? <
   {} nil,
   {
     <
@@ -150,4 +150,4 @@ pattern = ? <
   } cons
 > = Pattern;
 
-pattern
+pattern?

package/harness/format.mjs

@@ -1,6 +1,6 @@
 import { PHASES, formatUs } from "./trace.mjs";
 
-export function formatPhaseTable(phaseResults, backendIds = ["arm64", "llvm", "wasm", "kvm"]) {
+export function formatPhaseTable(phaseResults, backendIds = ["llvm", "wasm", "kvm"]) {
   const lines = [];
 
   for (const item of phaseResults) {
@@ -25,7 +25,7 @@ export function formatPhaseTable(phaseResults, backendIds = ["arm64", "llvm", "w
   return lines.join("\n");
 }
 
-export function formatProfileTable(profileResults, backendIds = ["arm64", "wasm", "kvm"]) {
+export function formatProfileTable(profileResults, backendIds = ["wasm", "kvm"]) {
   const lines = [];
 
   for (const item of profileResults) {

package/harness/registry.mjs

@@ -1,7 +1,6 @@
 import { NativeAdapter } from "./adapters/native.mjs";
 import { KVMAdapter } from "./adapters/kvm.mjs";
 import { WasmAdapter } from "./adapters/wasm.mjs";
-import { ARM64Adapter } from "./adapters/arm64.mjs";
 import { LLVMAdapter } from "./adapters/llvm.mjs";
 
 export function createRegistry(config = {}) {
@@ -16,7 +15,6 @@ export function createRegistry(config = {}) {
   register("kvm", () => new KVMAdapter(config.state));
   register("wasm", () => new WasmAdapter(config.wasm || {}));
   register("wasm-in-process", () => new WasmAdapter({ id: "wasm-in-process", mode: "in-process", ...(config.wasm || {}) }));
-  register("arm64", () => new ARM64Adapter(config.arm64 || {}));
   register("llvm", () => new LLVMAdapter(config.llvm || {}));
 
   return {

package/k.mjs

@@ -4,27 +4,58 @@
 import fs from "node:fs";
 import { argv, stdin, exit, stdout } from "node:process";
 import k from "./index.mjs";
-import { decodeWire, encodeToWire } from "./codecs/runtime/prefix-codec.mjs";
-import { decodeObject, objectToFunction, loadLibrary } from "./object.mjs";
-
-const prog = argv[1];
+import {
+  decodeWire,
+  encodeToWire
+} from "./codecs/runtime/prefix-codec.mjs";
+import {
+  compileLibrary,
+  decodeObject,
+  objectToFunction,
+  loadLibrary
+} from "./object.mjs";
 
 let kScript, inputStream;
 
-function usage() {
-  console.error(`Usage: ${prog} [ --lib lib-file ] [ --export spec ]... ( k-expr | file ) [ input-file ]`);
-  console.error(`       E.g.,  echo '["zebara","ela"]' | k-parse --input-type '$x=<{} zebara, {} ela>; $v={x 0, x 1}; $v' | ${prog} '{.1 0}'`);
-  console.error("Options:");
-  console.error("  --lib file      Load one .klib dependency before compiling.");
-  console.error("  --export spec   Export a library alias into scope. 'name' or 'libname:localname'. May be repeated.");
-  console.error("  -h, --help      Show this help.");
+function helpText() {
+  const prog = argv[1] || "k.mjs";
+  return [
+    "Compile and execute a k expression or file over a binary",
+    "pattern+value wire stream using the JavaScript interpreter.",
+    "",
+    `Usage: ${prog} [options]`,
+    "       ( source-snippet | input-file ) [ input-wire-file ]",
+    "",
+    "Arguments:",
+    "  source-snippet   Inline k source snippet.",
+    "  input-file       Source .k, .ko, or .klib file.",
+    "  input-wire-file  Optional binary wire input (default: stdin).",
+    "",
+    "Options:",
+    "  --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.",
+    "",
+    "Examples:",
+    `  echo '"abc"' | k-parse | ${prog} '{.1 0}' | k-print`,
+    `  echo '{"x":1,"y":2}' | k-json --parse | \\`,
+    `    ${prog} --lib Examples/poly.k --export concat \\`,
+    `      's={()xs,()ys}concat; s' | k-json --print`
+  ].join("\n");
+}
+
+function usage(stream = console.error) {
+  stream(helpText());
 }
 
 function isFile(filePath) {
   try {
     return fs.statSync(filePath).isFile();
   } catch (error) {
-    if (error?.code === "ENOENT" || error?.code === "ENOTDIR") return false;
+    if (error?.code === "ENOENT" || error?.code === "ENOTDIR") {
+      return false;
+    }
     throw error;
   }
 }
@@ -41,7 +72,7 @@ function compileFile(filePath, libraries, preamble) {
 ({ kScript, inputStream } = ((args) => {
   try {
     if (args.includes("-h") || args.includes("--help")) {
-      usage();
+      usage(console.log);
       return exit(0);
     }
 
@@ -53,9 +84,18 @@ function compileFile(filePath, libraries, preamble) {
         args.shift();
         const libPath = args.shift();
         if (!libPath) throw new Error("--lib requires a file argument");
-        if (libraries.length > 0) throw new Error("--lib may be specified at most once");
-        const libBuffer = fs.readFileSync(libPath);
-        libraries.push(loadLibrary(decodeObject(libBuffer)));
+        if (libraries.length > 0) {
+          throw new Error("--lib may be specified at most once");
+        }
+        if (libPath.endsWith(".k")) {
+          const raw = fs.readFileSync(libPath, "utf8");
+          libraries.push(
+            loadLibrary(compileLibrary(raw, { source: libPath }))
+          );
+        } else {
+          const libBuffer = fs.readFileSync(libPath);
+          libraries.push(loadLibrary(decodeObject(libBuffer)));
+        }
       } else if (args[0] === "--export") {
         args.shift();
         const spec = args.shift();