@fraczak/k 6.2.3 → 6.2.4

package/AGENTS.md

@@ -12,7 +12,7 @@
 - `npm run prepare` regenerates `parser.mjs` and `valueParser.mjs` from `.jison` grammars.
 - `npm test` runs the full suite through `scripts/run-tests.mjs`.
 - `node repl.mjs` (or `k-repl`) starts the interactive REPL.
-- `./k.mjs -k <file.k>` executes a k script on binary pattern+value stream input from stdin or a file; use `k-parse` and `k-print` at the boundaries.
+- `./k.mjs <file.k>` executes a k source/object file on binary pattern+value stream input from stdin or a file; if the argument is not an existing file, it is treated as an inline k expression.
 
 ## Coding Style & Naming Conventions
 - JavaScript uses ES modules (`.mjs`) with 2-space indentation and semicolons.

package/CLAUDE.md

@@ -20,7 +20,7 @@ npm test  # Run comprehensive test suite (unit tests, derivation tests, shell te
 
 **Running k programs:**
 ```bash
-./k.mjs -k <file.k>   # Execute k script
+./k.mjs <file.k>      # Execute k source/object file
 ./repl.mjs            # Start interactive REPL (or: k-repl)
 ```
 

package/DOCS/OBJECT_FILE_AND_PATTERN.md

@@ -133,12 +133,12 @@ Loading an object hydrates the type-pattern graphs back into runtime
 Object execution through `k.mjs`:
 
 ```sh
-echo "..." | some-codec --parse | k -k path/to/program.ko | some-codec --print
+echo "..." | some-codec --parse | k path/to/program.ko | some-codec --print
 ```
 
-The `-k` option accepts either an object file or a source `.k` file. `k.mjs`
-tries to load the file as an object first, then falls back to source parsing and
-compilation.
+When the first positional argument names an existing file, `k.mjs` loads it as
+either an object file or a source `.k` file. It tries to load the file as an
+object first, then falls back to source parsing and compilation.
 
 Standalone helpers live in `objects/`:
 

package/README.md

@@ -163,7 +163,7 @@ program for backend inspection and execution experiments.
 
 | Command | Purpose |
 | --- | --- |
-| `k` | Execute a k expression, or `-k` source/object file, over a binary stream |
+| `k` | Execute a k expression, or an existing source/object file, over a binary stream |
 | `k-repl` | Start the interactive interpreter |
 
 **Serialization boundaries**

package/k.mjs

@@ -12,14 +12,23 @@ const prog = argv[1];
 let kScript, inputStream;
 
 function usage() {
-  console.error(`Usage: ${prog} [ --lib lib-file ]... [ --export spec ]... ( k-expr | -k file ) [ input-file ]`);
+  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 a .klib dependency before compiling. May be repeated.");
+  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 isFile(filePath) {
+  try {
+    return fs.statSync(filePath).isFile();
+  } catch (error) {
+    if (error?.code === "ENOENT" || error?.code === "ENOTDIR") return false;
+    throw error;
+  }
+}
+
 function compileFile(filePath, libraries, preamble) {
   const buffer = fs.readFileSync(filePath);
   try {
@@ -44,6 +53,7 @@ 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)));
       } else if (args[0] === "--export") {
@@ -86,10 +96,10 @@ function compileFile(filePath, libraries, preamble) {
         throw new Error("Missing script argument");
       }
       if (arg === "-k") {
-        return compileFile(args.shift(), libraries, buildExportPreamble());
-      } else {
-        return buildExportPreamble() + arg;
+        throw new Error("-k is no longer supported; pass the source/object file path directly");
       }
+      if (isFile(arg)) return compileFile(arg, libraries, buildExportPreamble());
+      return buildExportPreamble() + arg;
     })(args.shift());
     let kScript = typeof kScriptStr === "function" ? kScriptStr : k.compile(kScriptStr, { libraries });
     inputStream = (function (arg) {

package/kvm.mjs

@@ -430,7 +430,7 @@ function usage() {
   const prog = argv[1] || "kvm.mjs";
   console.error(`Usage: node ${prog} [ options ] ( k-expr | -k file ) [ input-file ]`);
   console.error("Options:");
-  console.error("  --lib file          Load a .klib dependency before compiling. May be repeated.");
+  console.error("  --lib file          Load one .klib dependency before compiling.");
   console.error("  --envelope-free     Run the interpreter in envelope-free mode.");
   console.error("  -h, --help          Show this help.");
 }
@@ -454,6 +454,7 @@ async function main() {
       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)));
     } else {

package/objects/README.md

@@ -11,7 +11,7 @@ Compiles `.k` source into an executable object file (`.ko`), library file
 extension, or from `--format`.
 
 ```bash
-k-compile [--lib lib-file]... [--format ko|klib|kvm] [source-snippet | input-file [output-file]]
+k-compile [--lib lib-file] [--format ko|klib|kvm] [source-snippet | input-file [output-file]]
 ```
 
 Existing input paths are read as files. A non-existing input with `.k`, `.ko`,

package/objects/compile.mjs

@@ -25,7 +25,7 @@ function helpText() {
     "  output-file     Output path (.ko, .klib, or .kvm). Writes to stdout when omitted.",
     "",
     "Options:",
-    "  --lib file       Load a .klib dependency before compiling. May be repeated.",
+    "  --lib file       Load one .klib 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.",
@@ -168,6 +168,7 @@ try {
       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");
       libraries.push(loadLibrary(decodeObject(fs.readFileSync(libPath))));
     } else if (args[0] === "--export") {
       args.shift();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "6.2.3",
+    "version": "6.2.4",
     "description": "k — a language for composing first-order partial functions over algebraic data types (products and tagged unions); includes runtime, type derivation, REPL, and codec toolchain",
     "main": "index.mjs",
     "scripts": {

package/run.mjs

@@ -238,32 +238,31 @@ function compiledExp(findCode, exp, typePatternGraph) {
     case "product": {
       const labels = exp.product.map(({ label }) => label);
       const fieldFns = exp.product.map(({ exp: e }) => compiledExp(findCode, e, typePatternGraph));
-      if (staticOutputPattern) {
-        fn = (value) => {
-          if (value === undefined) return undefined;
-          const result = {};
-          for (let i = 0, len = labels.length; i < len; i++) {
-            const r = fieldFns[i](value);
-            if (r === undefined) return undefined;
-            result[labels[i]] = r;
-          }
-          return new Product(result, staticOutputPattern);
-        };
-      } else {
-        fn = (value) => {
-          if (value === undefined) return undefined;
-          const result = {};
-          const patternEntries = [];
-          for (let i = 0, len = labels.length; i < len; i++) {
-            const r = fieldFns[i](value);
-            if (r === undefined) return undefined;
-            const label = labels[i];
-            result[label] = r;
-            patternEntries.push([label, r.pattern]);
-          }
-          return new Product(result, composePattern("closed-product", patternEntries));
-        };
-      }
+      fn = (value) => {
+        if (value === undefined) return undefined;
+        const result = {};
+        const patternEntries = [];
+        for (let i = 0, len = labels.length; i < len; i++) {
+          const r = fieldFns[i](value);
+          if (r === undefined) return undefined;
+          const label = labels[i];
+          result[label] = r;
+          patternEntries.push([label, r.pattern]);
+        }
+        const dynamicOutputPattern = composePattern("closed-product", patternEntries);
+        const pattern = staticOutputPattern && dynamicOutputPattern
+          ? intersectPatterns(staticOutputPattern, dynamicOutputPattern)
+          : staticOutputPattern || dynamicOutputPattern;
+        if (!pattern && staticOutputPattern && dynamicOutputPattern) {
+          throw new TypeError(
+            `Type Error in '${exp.op}'${expLocation(exp)}\n` +
+            ` - Product value envelope does not intersect expression output pattern.\n` +
+            ` - output pattern: ${patternPreview(staticOutputPattern)}\n` +
+            ` - product envelope: ${patternPreview(dynamicOutputPattern)}`
+          );
+        }
+        return new Product(result, pattern);
+      };
       break;
     }
     case "vid":

package/tests/integration.sh

@@ -19,6 +19,22 @@ grep -q '"__main__"' "$TMP_DIR/stdin.kvm"
 ./objects/compile.mjs --lib "$TMP_DIR/export.klib" --export id:alias 'alias' "$TMP_DIR/export.ko"
 ./objects/decompile.mjs "$TMP_DIR/export.ko" | grep -q '^----- main -----$'
 node ./codecs/unit.mjs --parse | ./k.mjs --lib "$TMP_DIR/export.klib" --export id:alias 'alias' | node ./codecs/unit.mjs --print | grep -qx '{}'
+node ./codecs/unit.mjs --parse | ./k.mjs "$TMP_DIR/export.ko" | node ./codecs/unit.mjs --print | grep -qx '{}'
+if ./k.mjs --lib "$TMP_DIR/export.klib" --lib "$TMP_DIR/export.klib" '()' > "$TMP_DIR/two-lib.out" 2> "$TMP_DIR/two-lib.err"; then
+  echo "expected repeated --lib to fail" >&2
+  exit 1
+fi
+grep -q -- '--lib may be specified at most once' "$TMP_DIR/two-lib.err"
+if ./objects/compile.mjs --lib "$TMP_DIR/export.klib" --lib "$TMP_DIR/export.klib" '()' "$TMP_DIR/two-lib.ko" > "$TMP_DIR/two-lib-compile.out" 2> "$TMP_DIR/two-lib-compile.err"; then
+  echo "expected repeated k-compile --lib to fail" >&2
+  exit 1
+fi
+grep -q -- '--lib may be specified at most once' "$TMP_DIR/two-lib-compile.err"
+if ./kvm.mjs --lib "$TMP_DIR/export.klib" --lib "$TMP_DIR/export.klib" '()' > "$TMP_DIR/two-lib-kvm.out" 2> "$TMP_DIR/two-lib-kvm.err"; then
+  echo "expected repeated k-vm --lib to fail" >&2
+  exit 1
+fi
+grep -q -- '--lib may be specified at most once' "$TMP_DIR/two-lib-kvm.err"
 if ./objects/compile.mjs "$TMP_DIR/missing.k" > "$TMP_DIR/missing.out" 2> "$TMP_DIR/missing.err"; then
   echo "expected missing .k input to fail" >&2
   exit 1
@@ -27,11 +43,20 @@ grep -q 'Input file not found:' "$TMP_DIR/missing.err"
 
 echo '["zebara", "ela", "kupa", ala, owca]' | node ./codecs/k-parse.mjs | ./k.mjs '{.1 0,.3 1}' | node ./codecs/k-print.mjs
 echo 
+echo "a" | ./codecs/k-parse.mjs --input-type '?< {} a, X b, ...>' | ./k.mjs '{() i, /a o}' | ./codecs/show.mjs > "$TMP_DIR/polymorphic-relation.wire" 2> "$TMP_DIR/polymorphic-relation.show"
+grep -Fqx '{{}|a i, {} o} ?{<{}=X0 a, (...) b, ...> i, X0 o}' "$TMP_DIR/polymorphic-relation.show"
+./codecs/k-print.mjs "$TMP_DIR/polymorphic-relation.wire" | grep -qx '{"i":"a","o":{}}'
+echo
 echo '-21' | node ./codecs/int.mjs --parse | node ./codecs/int.mjs --print | grep -qx -- '-21'
 echo
 node ./codecs/unit.mjs --parse | node ./codecs/unit.mjs --print | grep -qx '{}'
 echo 
-printf 'A🙂\nBé~\t' | ./codecs/utf8.mjs --parse | ./k.mjs -k Examples/byte.k |./codecs/utf8.mjs --print
+if ./k.mjs -k Examples/byte.k > "$TMP_DIR/dash-k.out" 2> "$TMP_DIR/dash-k.err"; then
+  echo "expected -k to fail" >&2
+  exit 1
+fi
+grep -q -- '-k is no longer supported' "$TMP_DIR/dash-k.err"
+printf 'A🙂\nBé~\t' | ./codecs/utf8.mjs --parse | ./k.mjs Examples/byte.k |./codecs/utf8.mjs --print
 echo
 ./objects/compile.mjs Examples/ieee.k "$TMP_DIR/ieee.klib"
 MUL=`./objects/extract-aliases.mjs "$TMP_DIR/ieee.klib" | grep '^mul = @' | sed 's/^mul = \(@[^;]*\);.*$/\1/'`