@fraczak/k 7.0.2 → 7.2.0

package/backends/wasm/src/wasm.mjs

@@ -14,7 +14,9 @@ import {
   propertyListToPattern,
   Value,
   specializeKVM,
-  specializeObjectRelations
+  specializeObjectRelations,
+  compileRelationToPKIR,
+  lowerPKIRToKVM
 } from "@fraczak/k/backend-api.mjs";
 import { intersectPropertyListPatterns } from "@fraczak/k/codecs/runtime/codec.mjs";
 import { propertyListToFilter } from "@fraczak/k/codecs/runtime/show-value.mjs";
@@ -283,7 +285,7 @@ function cloneKVMFunction(kvmFunc) {
   };
 }
 
-function compileModule(mainRelName, defs) {
+function compileModule(mainRelName, defs, { usePKIR = false } = {}) {
   const compiled = new Set();
   const queue = [mainRelName];
   const wats = [];
@@ -299,8 +301,14 @@ function compileModule(mainRelName, defs) {
       throw new Error(`Relation ${name} not found`);
     }
 
-    const kvmFunc = lowerToKVM(relDef, name);
-    kvmFunc.typePatternGraph = relDef.typePatternGraph;
+    let kvmFunc;
+    if (usePKIR) {
+      const pkir = compileRelationToPKIR(relDef, name);
+      kvmFunc = lowerPKIRToKVM(pkir);
+    } else {
+      kvmFunc = lowerToKVM(relDef, name);
+      kvmFunc.typePatternGraph = relDef.typePatternGraph;
+    }
     scanCalls(kvmFunc.body, compiled, queue);
 
     kvmFunc.name = nameMap.get(name) || cleanName(name);
@@ -502,7 +510,7 @@ function buildExportPreamble(exportSpecs, libraries) {
 async function compileWasmArtifactFromDefs(
   defs,
   mainRelName = "__main__",
-  { typingMode = "generic" } = {}
+  { typingMode = "generic", usePKIR = false } = {}
 ) {
   resetTagIds();
   const mainRel = defs.rels[mainRelName];
@@ -510,7 +518,11 @@ async function compileWasmArtifactFromDefs(
     throw new Error(`No main relation (${mainRelName}) defined in script`);
   }
 
-  const { wat: moduleWatBody, relationNames, entryName } = compileModule(mainRelName, defs);
+  const { wat: moduleWatBody, relationNames, entryName } = compileModule(
+    mainRelName,
+    defs,
+    { usePKIR }
+  );
   assertRelationsConverged(defs, relationNames);
   const fullWat = runtimeWat.trim().slice(0, -1) + "\n" + moduleWatBody + "\n)";
   const graph = mainRel.typePatternGraph;
@@ -523,7 +535,12 @@ async function compileWasmArtifactFromDefs(
     entry: entryName || cleanName(mainRelName),
     inputPattern,
     outputPattern,
-    typing: classifyTyping(inputPattern, outputPattern, relTypeStatus(defs, mainRelName), typingMode),
+    typing: classifyTyping(
+      inputPattern,
+      outputPattern,
+      relTypeStatus(defs, mainRelName),
+      typingMode
+    ),
     tags: getTagEntries()
   };
   return appendCustomSection(await compileWat(fullWat), METADATA_SECTION, JSON.stringify(metadata));
@@ -598,12 +615,17 @@ async function compileWasmArtifactFromKVM(kvmInput, options = {}) {
   return appendCustomSection(await compileWat(fullWat), METADATA_SECTION, JSON.stringify(metadata));
 }
 
-async function compileWasmArtifactFromObject(object, { entry = null, inputEnvelopePattern = null } = {}) {
+async function compileWasmArtifactFromObject(
+  object,
+  { entry = null, inputEnvelopePattern = null, usePKIR = false } = {}
+) {
   if (!object?.rels) {
     throw new Error("Expected .ko input to contain k object relations");
   }
   if (object.main == null) {
-    throw new Error("Cannot compile a .klib library to WebAssembly without a main relation");
+    throw new Error(
+      "Cannot compile a .klib library to WebAssembly without a main relation"
+    );
   }
   const mainRelName = entry || object.main || "__main__";
   let defs = { rels: object.rels, compileStats: object.compileStats };
@@ -611,43 +633,126 @@ async function compileWasmArtifactFromObject(object, { entry = null, inputEnvelo
 
   if (inputEnvelopePattern) {
     const mainRel = object.rels[mainRelName];
-    if (!mainRel) throw new Error(`No main relation (${mainRelName}) defined in object`);
-    const inputPattern = getPatternPropertyList(mainRel.typePatternGraph, mainRel.def.patterns[0]);
-    const outputPattern = getPatternPropertyList(mainRel.typePatternGraph, mainRel.def.patterns[1]);
+    if (!mainRel) {
+      throw new Error(`No main relation (${mainRelName}) defined in object`);
+    }
+    const inputPattern = getPatternPropertyList(
+      mainRel.typePatternGraph,
+      mainRel.def.patterns[0]
+    );
+    const outputPattern = getPatternPropertyList(
+      mainRel.typePatternGraph,
+      mainRel.def.patterns[1]
+    );
     const typing = classifyTyping(inputPattern, outputPattern);
     if (typing.program === "polymorphic") {
-      const specialized = specializeObjectRelations(object, mainRelName, inputEnvelopePattern);
-      defs = { rels: specialized.rels, relAlias: specialized.relAlias, compileStats: specialized.compileStats };
+      const specialized = specializeObjectRelations(
+        object,
+        mainRelName,
+        inputEnvelopePattern
+      );
+      defs = {
+        rels: specialized.rels,
+        relAlias: specialized.relAlias,
+        compileStats: specialized.compileStats
+      };
       typingMode = "specialized";
     }
   }
 
-  return compileWasmArtifactFromDefs(defs, mainRelName, { typingMode });
+  return compileWasmArtifactFromDefs(defs, mainRelName, {
+    typingMode,
+    usePKIR
+  });
 }
 
 async function compileWasmArtifact(
   source,
-  { libraries = [], exports = [], source: sourceName = null, inputEnvelopePattern = null } = {}
+  {
+    libraries = [],
+    exports = [],
+    source: sourceName = null,
+    inputEnvelopePattern = null,
+    usePKIR = false
+  } = {}
 ) {
   const preamble = buildExportPreamble(exports, libraries);
   const fullSource = preamble + source;
-  const options = { libraries, ...(sourceName ? { source: sourceName } : {}) };
+  const options = {
+    libraries,
+    ...(sourceName ? { source: sourceName } : {})
+  };
   let defs = annotate(fullSource, options);
 
   let typingMode = "generic";
   if (inputEnvelopePattern) {
     const mainRel = defs.rels.__main__;
-    const inputPattern = getPatternPropertyList(mainRel.typePatternGraph, mainRel.def.patterns[0]);
-    const outputPattern = getPatternPropertyList(mainRel.typePatternGraph, mainRel.def.patterns[1]);
+    const inputPattern = getPatternPropertyList(
+      mainRel.typePatternGraph,
+      mainRel.def.patterns[0]
+    );
+    const outputPattern = getPatternPropertyList(
+      mainRel.typePatternGraph,
+      mainRel.def.patterns[1]
+    );
     if (classifyTyping(inputPattern, outputPattern).program === "polymorphic") {
-      const obj = { format: "k-object", rels: defs.rels, relAlias: defs.relAlias, compileStats: defs.compileStats, main: "__main__" };
-      const specialized = specializeObjectRelations(obj, "__main__", inputEnvelopePattern);
-      defs = { rels: specialized.rels, relAlias: specialized.relAlias, compileStats: specialized.compileStats };
+      const obj = {
+        format: "k-object",
+        rels: defs.rels,
+        relAlias: defs.relAlias,
+        compileStats: defs.compileStats,
+        main: "__main__"
+      };
+      const specialized = specializeObjectRelations(
+        obj,
+        "__main__",
+        inputEnvelopePattern
+      );
+      defs = {
+        rels: specialized.rels,
+        relAlias: specialized.relAlias,
+        compileStats: specialized.compileStats
+      };
       typingMode = "specialized";
     }
   }
 
-  return compileWasmArtifactFromDefs(defs, "__main__", { typingMode });
+  return compileWasmArtifactFromDefs(defs, "__main__", {
+    typingMode,
+    usePKIR
+  });
+}
+
+async function compileWasmArtifactFromPKIR(pkirInput, options = {}) {
+  let kvmProgram;
+  let entry = options.entry || "__main__";
+  if (pkirInput && typeof pkirInput === "object") {
+    if (pkirInput.format === "pk-ir" && pkirInput.functions) {
+      entry = pkirInput.entry || entry;
+      kvmProgram = {};
+      for (const [name, f] of Object.entries(pkirInput.functions)) {
+        kvmProgram[name] = lowerPKIRToKVM(f);
+      }
+    } else if (pkirInput.instructions) {
+      const kvm = lowerPKIRToKVM(pkirInput);
+      entry = kvm.name || entry;
+      kvmProgram = { [entry]: kvm };
+    } else if (pkirInput.functions) {
+      entry = pkirInput.entry || entry;
+      kvmProgram = {};
+      for (const [name, f] of Object.entries(pkirInput.functions)) {
+        kvmProgram[name] = lowerPKIRToKVM(f);
+      }
+    } else {
+      throw new Error("Invalid PKIR input for WebAssembly compilation");
+    }
+  } else {
+    throw new Error("Expected PKIR input object");
+  }
+  return compileWasmArtifactFromKVM(
+    { format: "k-vm", layer: "KVM", entry, functions: kvmProgram },
+    options
+  );
 }
 
 function createTagRegistry(entries) {
@@ -1050,6 +1155,7 @@ export {
   appendCustomSection,
   compileWasmArtifactFromKVM,
   compileWasmArtifactFromObject,
+  compileWasmArtifactFromPKIR,
   compileWasmArtifact,
   instantiateWasmArtifact,
   metadataFromModule,
@@ -1067,6 +1173,7 @@ export default {
   appendCustomSection,
   compileWasmArtifactFromKVM,
   compileWasmArtifactFromObject,
+  compileWasmArtifactFromPKIR,
   compileWasmArtifact,
   metadataFromModule,
   readArenaValue,

package/browser/repl-browser.mjs

@@ -311,13 +311,17 @@ export async function executeCommand(input) {
 function updateEngineUI() {
   const badge = document.getElementById("engine-badge");
   if (!badge) return;
-  badge.textContent = state.engine === "js" ? "js-in-process" : "wasm-in-process";
-  badge.title = `Engine: ${state.engine} (click to toggle wasm/js)`;
+  badge.classList.remove("js-mode", "pkir-mode");
   if (state.engine === "js") {
+    badge.textContent = "js-in-process";
     badge.classList.add("js-mode");
+  } else if (state.engine === "pkir") {
+    badge.textContent = "pkir-wasm";
+    badge.classList.add("pkir-mode");
   } else {
-    badge.classList.remove("js-mode");
+    badge.textContent = "wasm-in-process";
   }
+  badge.title = `Engine: ${state.engine} (click to toggle wasm/pkir/js)`;
 }
 
 function adjustInputHeight() {
@@ -979,11 +983,18 @@ export function initRepl() {
     }
   });
 
-  // Engine Badge toggle (wasm <-> js)
+  // Engine Badge toggle (wasm -> pkir -> js -> wasm)
   const engineBadge = document.getElementById("engine-badge");
   if (engineBadge) {
     engineBadge.onclick = () => {
-      const nextEngine = state.engine === "wasm" ? "js" : "wasm";
+      let nextEngine;
+      if (state.engine === "wasm") {
+        nextEngine = "pkir";
+      } else if (state.engine === "pkir") {
+        nextEngine = "js";
+      } else {
+        nextEngine = "wasm";
+      }
       executeCommand(`:engine ${nextEngine}`);
     };
   }

package/browser/tree-view.mjs

@@ -101,7 +101,9 @@ export function renderValueNode(val, currentDepth = 1, depthLimit = 3) {
     const populateChildren = () => {
       if (populated) return;
       populated = true;
-      for (const k of keys) {
+      const maxFields = 100;
+      const displayKeys = keys.slice(0, maxFields);
+      for (const k of displayKeys) {
         const row = document.createElement("div");
         row.className = "k-tree-row";
 
@@ -113,12 +115,25 @@ export function renderValueNode(val, currentDepth = 1, depthLimit = 3) {
         const childContainer = document.createElement("div");
         childContainer.className = "k-tree-child-val";
         childContainer.appendChild(
-          renderValueNode(val.product[k], isOpen ? currentDepth + 1 : 1, depthLimit)
+          renderValueNode(
+            val.product[k],
+            isOpen ? currentDepth + 1 : 1,
+            depthLimit
+          )
         );
         row.appendChild(childContainer);
 
         childrenContainer.appendChild(row);
       }
+      if (keys.length > maxFields) {
+        const moreRow = document.createElement("div");
+        moreRow.className = "k-tree-row k-tree-more";
+        moreRow.style.color = "var(--color-muted)";
+        moreRow.style.paddingLeft = "1.2rem";
+        moreRow.textContent =
+          `... and ${keys.length - maxFields} more fields`;
+        childrenContainer.appendChild(moreRow);
+      }
     };
 
     if (isOpen) {
@@ -169,13 +184,15 @@ export function renderValueNode(val, currentDepth = 1, depthLimit = 3) {
     if (isVariant(val.value)) {
       let chainCount = 0;
       let curr = val.value;
-      while (isVariant(curr)) {
+      while (isVariant(curr) && chainCount < 20) {
         chainCount++;
         curr = curr.value;
       }
       const badge = document.createElement("span");
       badge.className = "k-tree-badge";
-      badge.textContent = `+${chainCount} tags`;
+      badge.textContent = isVariant(curr)
+        ? "+20+ tags"
+        : `+${chainCount} tags`;
       summary.appendChild(badge);
     }
 
@@ -486,7 +503,15 @@ export function createOutputEntryElement({
 
   const valSummary = document.createElement("summary");
   valSummary.className = "k-tree-section-summary";
-  valSummary.innerHTML = `<span class="k-tree-arrow">▶</span> <span class="k-section-title">🌲 Value</span> <span class="k-section-preview">${escapeHtml(valueToK(value))}</span>`;
+  const rawValPreview = valueToK(value, 120);
+  const valPreview = rawValPreview.length > 120
+    ? `${rawValPreview.slice(0, 120)}...`
+    : rawValPreview;
+  const valEscaped = escapeHtml(valPreview);
+  valSummary.innerHTML =
+    `<span class="k-tree-arrow">▶</span> ` +
+    `<span class="k-section-title">🌲 Value</span> ` +
+    `<span class="k-section-preview">${valEscaped}</span>`;
   valSection.appendChild(valSummary);
 
   const valBody = document.createElement("div");
@@ -504,8 +529,15 @@ export function createOutputEntryElement({
 
     const patSummary = document.createElement("summary");
     patSummary.className = "k-tree-section-summary";
-    const patPreview = propertyListToFilter(value.pattern);
-    patSummary.innerHTML = `<span class="k-tree-arrow">▶</span> <span class="k-section-title">🌿 Pattern</span> <span class="k-section-preview">?${escapeHtml(patPreview)}</span>`;
+    const rawPatPreview = propertyListToFilter(value.pattern, "X", 120);
+    const patPreview = rawPatPreview.length > 120
+      ? `${rawPatPreview.slice(0, 120)}...`
+      : rawPatPreview;
+    const patEscaped = escapeHtml(patPreview);
+    patSummary.innerHTML =
+      `<span class="k-tree-arrow">▶</span> ` +
+      `<span class="k-section-title">🌿 Pattern</span> ` +
+      `<span class="k-section-preview">?${patEscaped}</span>`;
     patSection.appendChild(patSummary);
 
     patBody = document.createElement("div");
@@ -545,7 +577,14 @@ export function createOutputEntryElement({
 
   const rawPre = document.createElement("pre");
   rawPre.className = "k-raw-pre";
-  rawPre.textContent = rawText;
+  const MAX_RAW_PRE_CHARS = 100000;
+  if (rawText.length > MAX_RAW_PRE_CHARS) {
+    rawPre.textContent =
+      rawText.slice(0, MAX_RAW_PRE_CHARS) +
+      `\n\n... [truncated, ${rawText.length - MAX_RAW_PRE_CHARS} more characters]`;
+  } else {
+    rawPre.textContent = rawText;
+  }
   rawWrapper.appendChild(rawPre);
 
   container.appendChild(rawWrapper);