@fraczak/k 7.0.1 → 7.1.0

package/repl.mjs

@@ -50,7 +50,7 @@ const NAME_RE = /^[a-zA-Z0-9_+-][a-zA-Z0-9_?!+-]*$/;
 const COMMAND_NAMES = [
   "help", "rel",
   "codecs", "rels", "codec", "input", "reset", "klib", "ko", "load",
-  "engine", "wasm", "js",
+  "engine", "wasm", "pkir", "js",
   "quit", "exit"
 ];
 const CODEC_COMMAND_NAMES = ["load", "unload", "list"];
@@ -76,8 +76,10 @@ function emptyValue() {
 function createState(options = {}) {
   codes.load(cloneJSON(initialCodes));
   const engine = (options.engine || "wasm").toLowerCase();
-  if (engine !== "wasm" && engine !== "js") {
-    throw new Error(`Invalid engine '${options.engine}'. Valid engines: wasm, js`);
+  if (engine !== "wasm" && engine !== "pkir" && engine !== "js") {
+    throw new Error(
+      `Invalid engine '${options.engine}'. Valid engines: wasm, pkir, js`
+    );
   }
   return {
     engine,
@@ -768,7 +770,7 @@ function completeCommandArgument(line, state) {
   }
 
   if (command === "engine") {
-    return completeCommandWord(line, argStart, arg, ["wasm", "js"]);
+    return completeCommandWord(line, argStart, arg, ["wasm", "pkir", "js"]);
   }
 
   if (command === "input") {
@@ -1003,7 +1005,8 @@ async function executeExpressionWithWasm(annotated, state, lineOffset = 0) {
 
   const wasmCompileStart = performance.now();
   const wasmBytes = await compileWasmArtifactFromObject(obj, {
-    inputEnvelopePattern: inputValue?.pattern
+    inputEnvelopePattern: inputValue?.pattern,
+    usePKIR: state.engine === "pkir" || state.usePKIR
   });
   const runner = await instantiateWasmArtifact(wasmBytes);
   const wasmCompileMs = performance.now() - wasmCompileStart;
@@ -1242,8 +1245,10 @@ async function evaluateCommand(line, state) {
       if (!mode) {
         return [`Current engine: ${state.engine}`];
       }
-      if (mode !== "wasm" && mode !== "js") {
-        throw new Error(`Invalid engine '${arg.trim()}'. Valid engines: wasm, js`);
+      if (mode !== "wasm" && mode !== "pkir" && mode !== "js") {
+        throw new Error(
+          `Invalid engine '${arg.trim()}'. Valid engines: wasm, pkir, js`
+        );
       }
       state.engine = mode;
       return [`engine set to ${mode}`];
@@ -1252,6 +1257,10 @@ async function evaluateCommand(line, state) {
       state.engine = "wasm";
       return ["engine set to wasm"];
     }
+    case "pkir": {
+      state.engine = "pkir";
+      return ["engine set to pkir"];
+    }
     case "js": {
       state.engine = "js";
       return ["engine set to js"];
@@ -1290,7 +1299,7 @@ async function evaluateCommand(line, state) {
 
 function helpText() {
   return [
-    ":engine [wasm|js]    display or switch evaluation engine (wasm or js)",
+    ":engine [wasm|pkir|js]   display or switch evaluation engine",
     ":rel name            show relation definition",
     ":rels                list relation aliases",
     ":codec load file     load a codec module from file (e.g. :codec load codecs/int.mjs)",
@@ -1316,15 +1325,18 @@ function promptForState(state) {
 }
 
 function cliUsage() {
-  console.log("Usage: k-repl [options]");
+  console.log("Start the interactive k interpreter.");
+  console.log("Type :help inside the REPL for commands.");
   console.log("");
-  console.log("Start the interactive k interpreter. Type :help inside the REPL for commands.");
+  console.log("Usage: k-repl [options]");
   console.log("");
   console.log("Options:");
-  console.log("  --engine=<wasm|js>  Select evaluation engine (default: wasm)");
-  console.log("  --js                Shortcut for --engine=js");
-  console.log("  --wasm              Shortcut for --engine=wasm");
-  console.log("  -h, --help          Show this help.");
+  console.log("  --engine=<wasm|pkir|js>  Select engine: wasm, pkir, js");
+  console.log("                           (default: wasm).");
+  console.log("  --pkir                   Shortcut for --engine=pkir.");
+  console.log("  --wasm                   Shortcut for --engine=wasm.");
+  console.log("  --js                     Shortcut for --engine=js.");
+  console.log("  -h, --help               Show this help.");
 }
 
 function startRepl(options = {}) {
@@ -1428,18 +1440,24 @@ if (isMainEntrypoint()) {
       engine = "js";
     } else if (arg === "--wasm") {
       engine = "wasm";
+    } else if (arg === "--pkir") {
+      engine = "pkir";
     } else if (arg.startsWith("--engine=")) {
       const val = arg.slice("--engine=".length).toLowerCase();
-      if (val !== "wasm" && val !== "js") {
-        console.error(`Invalid engine '${val}'. Valid engines: wasm, js`);
+      if (val !== "wasm" && val !== "pkir" && val !== "js") {
+        console.error(
+          `Invalid engine '${val}'. Valid engines: wasm, pkir, js`
+        );
         exit(1);
       }
       engine = val;
     } else if (arg === "--engine") {
       i++;
       const val = (args[i] || "").toLowerCase();
-      if (val !== "wasm" && val !== "js") {
-        console.error(`Invalid engine '${val}'. Valid engines: wasm, js`);
+      if (val !== "wasm" && val !== "pkir" && val !== "js") {
+        console.error(
+          `Invalid engine '${val}'. Valid engines: wasm, pkir, js`
+        );
         exit(1);
       }
       engine = val;

package/scripts/benchmark-idempotency.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawnSync } from "node:child_process";
-import { mkdtempSync, statSync } from "node:fs";
+import { mkdtempSync, rmSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { performance } from "node:perf_hooks";
@@ -80,13 +80,17 @@ for (const example of benchmarkExamples) {
 
   for (let i = 0; i < iterations; i++) {
     const out = mkdtempSync(join(tmpdir(), `k-idempotency-bench-${example.replaceAll("/", "_")}-`));
-    const t0 = performance.now();
-    run(["objects/compile.mjs", example, join(out, "1.klib")]);
-    run(["objects/decompile.mjs", join(out, "1.klib"), join(out, "1.k")]);
-    run(["objects/compile.mjs", join(out, "1.k"), join(out, "2.klib")]);
-    run(["objects/decompile.mjs", join(out, "2.klib"), join(out, "2.k")]);
-    times.push(performance.now() - t0);
-    size = statSync(join(out, "1.klib")).size;
+    try {
+      const t0 = performance.now();
+      run(["objects/compile.mjs", example, join(out, "1.klib")]);
+      run(["objects/decompile.mjs", join(out, "1.klib"), join(out, "1.k")]);
+      run(["objects/compile.mjs", join(out, "1.k"), join(out, "2.klib")]);
+      run(["objects/decompile.mjs", join(out, "2.klib"), join(out, "2.k")]);
+      times.push(performance.now() - t0);
+      size = statSync(join(out, "1.klib")).size;
+    } finally {
+      rmSync(out, { recursive: true, force: true });
+    }
   }
 
   console.log([

package/scripts/benchmark.mjs

@@ -21,13 +21,12 @@ import {
   retypeObjectRelationForBackend,
   patternToPropertyList,
   propertyListToPattern,
-  parseFloat64,
   run,
   run_converged,
-  valueForCode,
   Value
 } from "../backend-api.mjs";
 import { parse as parseIntValue } from "../codecs/int.mjs";
+import { parse as parseFloatValue } from "../codecs/ieee.mjs";
 import {
   compileObjectBuffer as compileBackendObjectBuffer,
   decodeObject as decodeBackendObject
@@ -460,13 +459,10 @@ async function prepareState(suite) {
 }
 
 function ieeeInput(testCase, state) {
-  const float64Hash = state.typeAliases.float64;
-  const floatPairHash = state.typeAliases.float_pair;
-  const float64 = text => valueForCode(parseFloat64(text), float64Hash, codes.find);
-  return valueForCode(Value.product({
-    x: float64(testCase.input.x),
-    y: float64(testCase.input.y)
-  }), floatPairHash, codes.find);
+  return Value.product({
+    x: parseFloatValue(testCase.input.x),
+    y: parseFloatValue(testCase.input.y)
+  });
 }
 
 function arithmeticInput(testCase) {

package/scripts/build-repl-html.mjs

@@ -284,6 +284,17 @@ const htmlContent = `<!DOCTYPE html>
       border-color: rgba(240, 180, 41, 0.7);
     }
 
+    .engine-badge.pkir-mode {
+      background: rgba(187, 128, 255, 0.15);
+      color: #d2a8ff;
+      border-color: rgba(187, 128, 255, 0.4);
+    }
+
+    .engine-badge.pkir-mode:hover {
+      background: rgba(187, 128, 255, 0.3);
+      border-color: rgba(187, 128, 255, 0.7);
+    }
+
     .status-indicator {
       display: flex;
       align-items: center;
@@ -1644,7 +1655,7 @@ const htmlContent = `<!DOCTYPE html>
       <div class="nav-left">
         <div class="brand">
           <span class="brand-name">k repl</span>
-          <span id="engine-badge" class="engine-badge" title="Click to toggle engine (wasm/js)">wasm-in-process</span>
+          <span id="engine-badge" class="engine-badge" title="Click to toggle engine (wasm/pkir/js)">wasm-in-process</span>
         </div>
         <div class="status-indicator">
           <span id="status-dot" class="status-dot ready"></span>
@@ -1673,6 +1684,7 @@ const htmlContent = `<!DOCTYPE html>
               <option value="expr::rels">:rels (list relations)</option>
               <option value="expr::engine">:engine (show engine)</option>
               <option value="expr::engine wasm">:engine wasm</option>
+              <option value="expr::engine pkir">:engine pkir</option>
               <option value="expr::engine js">:engine js</option>
             </optgroup>
             <optgroup label="Codecs &amp; Format Adapters">
@@ -1867,7 +1879,7 @@ const htmlContent = `<!DOCTYPE html>
           <div class="help-section">
             <h4>REPL Commands</h4>
             <table class="help-table">
-              <tr><td><code>:engine [wasm|js]</code></td><td>Display or switch evaluation engine (<code>wasm</code> or <code>js</code>)</td></tr>
+              <tr><td><code>:engine [wasm|pkir|js]</code></td><td>Display or switch evaluation engine (<code>wasm</code>, <code>pkir</code>, or <code>js</code>)</td></tr>
               <tr><td><code>:load &lt;file&gt;</code></td><td>Load a <code>.k</code> source or <code>.klib</code> library into current state</td></tr>
               <tr><td><code>:rel &lt;name&gt;</code></td><td>Display definition of relation <code>&lt;name&gt;</code></td></tr>
               <tr><td><code>:rels</code></td><td>List all relation aliases</td></tr>
@@ -1888,8 +1900,8 @@ const htmlContent = `<!DOCTYPE html>
               <li><code>{} | ok</code> &mdash; Constant relation producing variant <code>ok</code> with empty document payload <code>{}</code></li>
               <li><code>not = &lt; / true | false, / false | true &gt;;</code> &mdash; Polymorphic negation via branch projections and ordered choice</li>
               <li><code>{} | true not</code> &mdash; Compose constant relation <code>{} | true</code> with <code>not</code> (evaluates to <code>{} | false</code>)</li>
-              <li><code>bool = ?&lt; {} true, {} false &gt;;</code> &mdash; Define a boolean pattern filter relation</li>
-              <li><code>not = bool ?X &lt; / true | false, {} | true &gt; ?X;</code> &mdash; Filtered boolean negation: guarded by <code>bool</code>, defaulting to <code>{} | true</code></li>
+              <li><code>bool? = ?&lt; {} true, {} false &gt;;</code> &mdash; Define a boolean pattern filter relation</li>
+              <li><code>not = bool? ?X &lt; / true | false, {} | true &gt; ?X;</code> &mdash; Filtered boolean negation: guarded by <code>bool?</code>, defaulting to <code>{} | true</code></li>
               <li><code>swap = { . y x, . x y };</code> &mdash; Define a product field-swapping relation</li>
               <li><code>{ {} | ok x, {} | nil y } swap</code> &mdash; Construct a product and pass it through <code>swap</code></li>
             </ul>