@fraczak/k 6.10.5 → 6.10.6

package/core.k

@@ -4,15 +4,12 @@
 --   1. $bits — the canonical binary number / bit-path type
 --   2. $string — unicode strings (used for labels)
 --   3. $pattern — the type of pattern graphs
---   4. Basic $bits arithmetic: succ, plus, times
 
 ---------------------------------------------------------------
 -- §1. Bits
 ---------------------------------------------------------------
 
 $ bit = < {} 0, {} 1 >;
-b0 = {}|0 $bit;
-b1 = {}|1 $bit;
 
 $ bits = < {} _, bits 0, bits 1 >;
 
@@ -21,85 +18,8 @@ _ = {}|_;
 0 = _ |0;
 1 = _ |1;
 
-inv = {() x, _ r} _inv;
-_inv = ${bits x, bits r} < {.x /0 x, .r |0 r} _inv, {.x /1 x, .r |1 r} _inv, .r >;
-
-concat = ${bits x, bits y} {.x inv x, .y y} concat_;
-concat_ = ${bits x, bits y}
-  <
-    {.x /0 x, .y |0 y} concat_,
-    {.x /1 x, .y |1 y} concat_,
-    .y
-  >;
-
----------------------------------------------------------------
--- §2. Bits arithmetic
----------------------------------------------------------------
-
--- successor (increment by 1)
-succ = {inv x, _ y} _inc;
-
-_inc = ?{X x, X y} 
-<
-    {.x </0,/_|_> x, .y |1 y} concat_,
-    {.x /1 x, .y |0 y} _inc
-> ?X;
-
--- constants
-2 = 1 succ;
-3 = 2 succ;
-4 = 3 succ;
-5 = 4 succ;
-6 = 5 succ;
-7 = 6 succ;
-8 = 7 succ;
-9 = 8 succ;
-10 = 9 succ;
-
--- addition on $bits (unsigned, LSB-first with carry)
-plus = ${bits x, bits y} {.x inv x, .y inv y, b0 c} _plus;
-_plus = {.x x, .y y, .c c, _ r} _plus_;
-_plus_ = ${bits x, bits y, bit c, bits r}
-  <
-    {.x /_ if, .y /_ and, .c/0 c, .r then} .then,
-    {.x /_ if, .y /_ and, .c/1 c, .r |1 then} .then,
-    {.x /_ if, .c/0 and, {.y x, .r y} concat_ then} .then,
-    {.y /_ if, .c/0 and, {.x x, .r y} concat_ then} .then,
-    <
-      {.x/_ _ x, .y /0 y, b0 c, .r |1 r},
-      {.x/_ _ x, .y /1 y, b1 c, .r |0 r},
-      {.y/_ _ y, .x /0 x, b0 c, .r |1 r},
-      {.y/_ _ y, .x /1 x, b1 c, .r |0 r},
-      {.x /0 x, .y /0 y, .c/0 b0 c, .r |0 r},
-      {.x /0 x, .y /0 y, .c/1 b0 c, .r |1 r},
-      {.x /0 x, .y /1 y, .c/0 b0 c, .r |1 r},
-      {.x /0 x, .y /1 y, .c/1 b1 c, .r |0 r},
-      {.x /1 x, .y /0 y, .c/0 b0 c, .r |1 r},
-      {.x /1 x, .y /0 y, .c/1 b1 c, .r |0 r},
-      {.x /1 x, .y /1 y, .c/0 b1 c, .r |0 r},
-      {.x /1 x, .y /1 y, .c/1 b1 c, .r |1 r}
-    > _plus_
-  >;
-
--- multiplication on $bits (unsigned, shift-and-add)
-times = ${bits x, bits y} {0 result, .x inv _x, .y y} _times;
-_times = ${bits result, bits _x, bits y}
-  <
-    { .y /_ if, .result then } .then,
-    {
-      .result |0 result,
-      ._x _x,
-      .y /0 y
-    } _times,
-    {
-      {._x x, .result |0 y, b0 c} _plus result,
-      ._x _x,
-      .y /1 y
-    } _times
-  >;
-
 ---------------------------------------------------------------
--- §3. Unicode and String
+-- §2. Unicode and String
 ---------------------------------------------------------------
 
 -- 8-bit octet used as a building block for UTF-8 payload pieces.
@@ -115,8 +35,9 @@ $ ascii = { bit 6, bit 5, bit 4, bit 3, bit 2, bit 1, bit 0 };
 -- Plane 0 is the Basic Multilingual Plane (BMP): U+0000..U+FFFF.
 $ u0080_07FF = { bit 10, bit 9, bit 8, bit 7, bit 6, bit 5, bit 4, bit 3, bit 2, bit 1, bit 0 };
 
--- High-byte classes for common BMP ranges, excluding surrogate/private-use partitions.
--- BMP (Basic Multilingual Plane) is Plane 0: the first 65,536 code points.
+-- High-byte classes for common BMP ranges, excluding surrogate and
+-- private-use partitions.
+-- BMP (Basic Multilingual Plane) is Plane 0: first 65,536 code points.
 $ bmp_hi_common = <
   { bit 2, bit 1, bit 0 } h08_0F,
   { bit 6, bit 5, bit 4, bit 3, bit 2, bit 1, bit 0 } h10_7F,
@@ -165,12 +86,12 @@ $ unicode = <
 $ string = < {} nil, { unicode car, string cdr } cons >;
 
 ---------------------------------------------------------------
--- §4. Pattern
+-- §3. Pattern
 ---------------------------------------------------------------
 
 -- Edge: a labeled edge in a pattern graph.
 -- 'label' is the field name or tag name.
--- 'target' is the index (as $bits) of the target node in the pattern list.
+-- 'target' is index (as $bits) of the target node in the pattern list.
 
 $ edge = { string label, bits target };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "6.10.5",
+    "version": "6.10.6",
     "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",
     "exports": {

package/scripts/build-repl-html.mjs

@@ -130,7 +130,7 @@ for (const filename of verifiedCodecs) {
       }]
     });
     const bundledContent = buildRes.outputFiles[0].text;
-    vfsFiles[`codecs/${filename}`] = bundledContent;
+    vfsFiles[filename] = bundledContent;
   }
 }
 
@@ -1668,7 +1668,6 @@ const htmlContent = `<!DOCTYPE html>
               <option value="expr:{} | ok">{} | ok</option>
               <option value="expr:()">()</option>
               <option value="expr:$ bool = &lt; {} true, {} false &gt;; not = $ bool &lt; / true | false, {} | true &gt; $ bool; {} | true not">not (boolean relation with fallback)</option>
-              <option value="expr:{10 x, 5 y} plus">{10 x, 5 y} plus (bits)</option>
               <option value="expr:1 succ">1 succ</option>
               <option value="expr:{10 int x, 5 int y} plus">{10 int x, 5 int y} plus (int)</option>
               <option value="expr:{10 int x, 5 int y} karatsuba">{10 int x, 5 int y} karatsuba</option>
@@ -1681,21 +1680,21 @@ const htmlContent = `<!DOCTYPE html>
             <optgroup label="Codecs &amp; Format Adapters">
               <option value="expr::codecs">:codecs</option>
               <option value="expr::input">:input (interactive dialog)</option>
-              <option value="expr::codec load codecs/int.mjs">:codec load codecs/int.mjs</option>
-              <option value="expr::codec load codecs/utf8.mjs">:codec load codecs/utf8.mjs</option>
-              <option value="expr::codec load codecs/json.mjs">:codec load codecs/json.mjs</option>
-              <option value="expr::codec load codecs/ieee.mjs">:codec load codecs/ieee.mjs</option>
-              <option value="expr::codec load codecs/unit.mjs">:codec load codecs/unit.mjs</option>
-              <option value="expr::input codecs/json.mjs {&quot;a&quot;:12,&quot;b&quot;:&quot;hello&quot;}">:input codecs/json.mjs {"a":12,"b":"hello"}</option>
-              <option value="expr::input codecs/int.mjs [0,1,2]">:input codecs/int.mjs [0,1,2]</option>
+              <option value="expr::codec load int.mjs">:codec load int.mjs</option>
+              <option value="expr::codec load utf8.mjs">:codec load utf8.mjs</option>
+              <option value="expr::codec load json.mjs">:codec load json.mjs</option>
+              <option value="expr::codec load ieee.mjs">:codec load ieee.mjs</option>
+              <option value="expr::codec load unit.mjs">:codec load unit.mjs</option>
+              <option value="expr::input json.mjs {&quot;a&quot;:12,&quot;b&quot;:&quot;hello&quot;}">:input json.mjs {"a":12,"b":"hello"}</option>
+              <option value="expr::input int.mjs [0,1,2]">:input int.mjs [0,1,2]</option>
             </optgroup>
           </select>
           <button id="btn-load-example" class="btn btn-primary">Load</button>
         </div>
 
         <!-- File Upload -->
-        <label class="btn btn-secondary btn-file" title="Upload local .k or .klib file into VFS">
-          <input type="file" id="file-upload" accept=".k,.klib,.wat,.ko" style="display:none;">
+        <label class="btn btn-secondary btn-file" title="Upload local file into VFS">
+          <input type="file" id="file-upload" accept=".k,.klib,.wat,.ko,.mjs,.js,.json" style="display:none;">
           <span>📁 Upload</span>
         </label>
 

package/tests/test-repl-html.mjs

@@ -139,15 +139,15 @@ if (chromiumBin) {
     const vfsList = await evaluateAsync(`window.kRepl.getAllVfsFiles().sort()`);
     const expectedFiles = [
       "arithmetics.k",
-      "codecs/ieee.mjs",
-      "codecs/int.mjs",
-      "codecs/json.mjs",
-      "codecs/unit.mjs",
-      "codecs/utf8.mjs",
       "core.k",
       "ieee.k",
+      "ieee.mjs",
+      "int.mjs",
+      "json.mjs",
       "karatsuba-mult.k",
-      "poly.k"
+      "poly.k",
+      "unit.mjs",
+      "utf8.mjs"
     ].sort();
     assert.deepStrictEqual(vfsList, expectedFiles, `getAllVfsFiles() must match curated files list, got: ${JSON.stringify(vfsList)}`);
 
@@ -635,7 +635,81 @@ if (chromiumBin) {
     assert.strictEqual(engineCheck.jsEngine, "js");
     assert.strictEqual(engineCheck.badgeJsText, "js-in-process");
     assert.strictEqual(engineCheck.wasmEngine, "wasm");
-    assert.strictEqual(engineCheck.badgeWasmText, "wasm-in-process");
+    // 7. Test uploading a file (adds to VFS without auto-loading)
+    const uploadCheck = await evaluateAsync(`(async () => {
+      const codecCode = \`export default {
+        name: "custom.mjs",
+        target: "(...)",
+        format: "custom",
+        parse: (raw) => raw,
+        print: (v) => "CUSTOM_VAL"
+      };\`;
+      const file = new File(
+        [codecCode],
+        "custom.mjs",
+        { type: "text/javascript" }
+      );
+      await window.kRepl.handleFileUpload(file);
+
+      const vfsContent = window.kRepl.getVfsFile("custom.mjs");
+      const inVfsList = window.kRepl.getAllVfsFiles().includes("custom.mjs");
+
+      // Verify system message showed upload confirmation
+      const systemMessages = Array.from(
+        document.querySelectorAll(".system-msg")
+      ).map(el => el.textContent);
+      const hasUploadedMsg = systemMessages.some(
+        m => m.includes("Uploaded custom.mjs into VFS")
+      );
+
+      // Verify it was NOT auto-loaded (:codecs does not list it)
+      await window.kRepl.executeCommand(":codecs");
+      const linesBefore = Array.from(
+        document.querySelectorAll(".entry-line")
+      ).map(el => el.textContent);
+      const codecsBefore = linesBefore[linesBefore.length - 1];
+
+      // Explicitly load it to prove it can be loaded as a codec
+      await window.kRepl.executeCommand(":codec load custom.mjs");
+      const linesAfter = Array.from(
+        document.querySelectorAll(".entry-line")
+      ).map(el => el.textContent);
+      const codecsAfter = linesAfter[linesAfter.length - 1];
+
+      return {
+        hasVfsContent: typeof vfsContent === "string" &&
+          vfsContent.includes("custom.mjs"),
+        inVfsList,
+        hasUploadedMsg,
+        codecsBefore,
+        codecsAfter
+      };
+    })()`);
+    assert.strictEqual(
+      uploadCheck.hasVfsContent,
+      true,
+      "Uploaded file must be present in VFS"
+    );
+    assert.strictEqual(
+      uploadCheck.inVfsList,
+      true,
+      "Uploaded file must be in getAllVfsFiles()"
+    );
+    assert.strictEqual(
+      uploadCheck.hasUploadedMsg,
+      true,
+      "Upload confirmation message must be displayed"
+    );
+    assert.strictEqual(
+      uploadCheck.codecsBefore.includes("custom.mjs"),
+      false,
+      "Upload must NOT auto-load the file"
+    );
+    assert.strictEqual(
+      uploadCheck.codecsAfter.includes("custom.mjs"),
+      true,
+      "Explicit :codec load of uploaded file must succeed"
+    );
 
     ws.close();
     console.log("   Browser execution verified successfully!");