@fraczak/k 7.0.2 → 7.2.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", "limit",
   "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,
@@ -93,7 +95,8 @@ function createState(options = {}) {
     lastResult: null,
     lastMain: null,
     lastTiming: null,
-    showTiming: true
+    showTiming: true,
+    printLimit: options.printLimit ?? Infinity
   };
 }
 
@@ -352,7 +355,8 @@ function formatCodecOutput(output) {
 }
 
 function printValue(value, state = null) {
-  const lines = [valueWithEnvelopeToK(value)];
+  const limit = state?.printLimit ?? Infinity;
+  const lines = [valueWithEnvelopeToK(value, limit)];
   if (!state || value === undefined) return lines[0];
 
   const store = state.codecs || {};
@@ -361,7 +365,11 @@ function printValue(value, state = null) {
     try {
       const output = codec.print(value, { state });
       if (output != null) {
-        lines.push(`${codec.name}: ${formatCodecOutput(output)}`);
+        let text = formatCodecOutput(output);
+        if (Number.isFinite(limit) && text.length > limit) {
+          text = text.slice(0, limit) + "...";
+        }
+        lines.push(`${codec.name}: ${text}`);
       }
     } catch {
       // Codec cannot format this value; silently skip
@@ -768,7 +776,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 +1011,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 +1251,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,13 +1263,42 @@ 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"];
     }
+    case "limit": {
+      const mode = (arg || "").trim().toLowerCase();
+      if (!mode) {
+        const current = Number.isFinite(state.printLimit)
+          ? state.printLimit
+          : "none";
+        return [`Current output limit: ${current}`];
+      }
+      if (mode === "none" || mode === "infinity" || mode === "off") {
+        state.printLimit = Infinity;
+        return ["output limit disabled"];
+      }
+      const n = parseInt(mode, 10);
+      if (Number.isNaN(n) || n < 0) {
+        throw new Error(
+          `Invalid limit '${arg.trim()}'. Usage: :limit [num|none]`
+        );
+      }
+      state.printLimit = n;
+      return [`output limit set to ${n}`];
+    }
     case "reset": {
       const currentEngine = state.engine;
-      const fresh = createState({ engine: currentEngine });
+      const currentLimit = state.printLimit;
+      const fresh = createState({
+        engine: currentEngine,
+        printLimit: currentLimit
+      });
       Object.assign(state, fresh);
       return ["reset"];
     }
@@ -1290,9 +1330,10 @@ 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",
+    ":limit [num|none]    set maximum characters for value output",
     ":codec load file     load a codec module from file (e.g. :codec load codecs/int.mjs)",
     ":codec unload name   unload a registered codec",
     ":codec list          list loaded codecs (or simply :codecs)",
@@ -1316,15 +1357,19 @@ 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("  --limit=<num>            Set maximum characters for output.");
+  console.log("  -h, --help               Show this help.");
 }
 
 function startRepl(options = {}) {
@@ -1419,6 +1464,7 @@ function startRepl(options = {}) {
 if (isMainEntrypoint()) {
   const args = argv.slice(2);
   let engine = "wasm";
+  let printLimit = Infinity;
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "-h" || arg === "--help") {
@@ -1428,28 +1474,51 @@ 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;
+    } else if (arg.startsWith("--limit=")) {
+      const val = parseInt(arg.slice("--limit=".length), 10);
+      if (Number.isNaN(val) || val < 0) {
+        console.error(
+          `Invalid limit '${arg.slice("--limit=".length)}'.`
+        );
+        exit(1);
+      }
+      printLimit = val;
+    } else if (arg === "--limit") {
+      i++;
+      const val = parseInt(args[i] || "", 10);
+      if (Number.isNaN(val) || val < 0) {
+        console.error(`Invalid limit '${args[i]}'.`);
+        exit(1);
+      }
+      printLimit = val;
     } else {
       console.error(`Unknown option '${arg}'.`);
       cliUsage();
       exit(1);
     }
   }
-  startRepl({ engine });
+  startRepl({ engine, printLimit });
 }
 
 export {

package/scripts/build-repl-html.mjs

@@ -91,7 +91,14 @@ for (const filename of verifiedExamples) {
 }
 
 // Bundle verified codecs for browser VFS as 100% self-contained ES modules
-const verifiedCodecs = ["json.mjs", "utf8.mjs", "int.mjs", "unit.mjs", "ieee.mjs"];
+const verifiedCodecs = [
+  "json.mjs",
+  "djson.mjs",
+  "utf8.mjs",
+  "int.mjs",
+  "unit.mjs",
+  "ieee.mjs"
+];
 const codecsDir = path.join(projectRoot, "codecs");
 
 const browserCodecSdkShim = `
@@ -284,6 +291,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 +1662,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 +1691,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 +1886,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>