functionalscript 0.36.0 → 0.38.0

package/{fs → fjs}/types/btree/remove/proof.f.js

@@ -1,8 +1,9 @@
-import { nodeRemove } from "./module.f.js";
-import { set as setSet } from "../set/module.f.js";
-import { cmp } from "../../string/module.f.js";
-import { stringify } from "../../../json/module.f.js";
-import { sort } from "../../object/module.f.js";
+import { nodeRemove } from './module.f.js';
+import { set as setSet } from '../set/module.f.js';
+import { cmp } from '../../string/module.f.js';
+import { stringify } from '../../../media/json/module.f.js';
+import { sort } from '../../object/module.f.js';
+import { assertEq, assertNotNullish } from '../../../asserts/module.f.js';
 const set = (node) => (value) => setSet(cmp(value))(() => value)(node);
 const remove = (node) => (value) => nodeRemove(cmp(value))(node);
 const jsonStr = stringify(sort);
@@ -24,10 +25,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("0");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("0"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[[["1"],"100",["1024"]],"1089",[["1156"],"121",["1225"]]],' +
@@ -41,10 +39,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"]],"16",[["169"],"196",["225"]]],' +
@@ -56,10 +51,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("4");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("4"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"]],"16",[["169"],"196",["225"]]],' +
@@ -71,10 +63,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("9");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("9"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"]],"16",[["169"],"196",["225"]]],' +
@@ -86,10 +75,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("16");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("16"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]]],' +
@@ -101,10 +87,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("25");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("25"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289","324"],"36",["361"],"400",["441","484"]]],' +
@@ -114,10 +97,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("36");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("36"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -127,10 +107,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("49");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("49"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -140,10 +117,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("64");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("64"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -153,10 +127,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("81");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("81"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -166,10 +137,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("100");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("100"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -179,10 +147,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("121");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("121"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -192,10 +157,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("144");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("144"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -205,10 +167,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("169");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("169"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"196",["225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -218,10 +177,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("196");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("196"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -231,10 +187,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("225");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("225"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -244,10 +197,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("256");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("256"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"289",[["324","361"],"400",["441","484"]]],' +
@@ -257,10 +207,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("289");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("289"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"324",[["361"],"400",["441","484"]]],' +
@@ -270,10 +217,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("324");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("324"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"361",[["400"],"441",["484"]]],' +
@@ -283,10 +227,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("361");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("361"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"400",["441","484"]]],' +
@@ -296,10 +237,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("400");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("400"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"441",["484"]]],' +
@@ -309,10 +247,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("441");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("441"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["484"]]],' +
@@ -322,10 +257,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("484");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("484"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],' +
@@ -337,10 +269,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("529");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("529"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"576",["625","676"]],' +
@@ -350,10 +279,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("576");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("576"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"625",["676"]],' +
@@ -363,10 +289,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("625");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("625"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["676"]],' +
@@ -376,10 +299,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("676");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("676"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],' +
@@ -389,10 +309,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("729");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("729"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],' +
@@ -402,10 +319,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("784");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("784"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"841",["900","961"]]]') {
@@ -413,10 +327,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("841");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("841"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"900",["961"]]]') {
@@ -424,10 +335,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("900");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("900"), null);
         const r = jsonStr(_map);
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["961"]]]') {
@@ -435,10 +343,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("961");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("961"), null);
         const r = jsonStr(_map);
         if (r !==
             '[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]]') {
@@ -446,10 +351,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1024");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1024"), null);
         const r = jsonStr(_map);
         if (r !==
             '[["1089"],"1156",["1225"],"1296",["1369","1444"]]') {
@@ -457,10 +359,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1089");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1089"), null);
         const r = jsonStr(_map);
         if (r !==
             '[["1156","1225"],"1296",["1369","1444"]]') {
@@ -468,10 +367,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1156");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1156"), null);
         const r = jsonStr(_map);
         if (r !==
             '[["1225"],"1296",["1369","1444"]]') {
@@ -479,10 +375,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1225");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1225"), null);
         const r = jsonStr(_map);
         if (r !==
             '[["1296"],"1369",["1444"]]') {
@@ -490,10 +383,7 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1296");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1296"), null);
         const r = jsonStr(_map);
         if (r !==
             '["1369","1444"]') {
@@ -501,131 +391,94 @@ const test = () => {
         }
     }
     {
-        _map = remove(_map)("1369");
-        if (_map === null) {
-            throw null;
-        }
+        _map = assertNotNullish(remove(_map)("1369"), null);
         const r = jsonStr(_map);
-        if (r !== '["1444"]') {
-            throw r;
-        }
+        assertEq(r, '["1444"]');
     }
     {
         _map = remove(_map)("1444");
-        if (_map !== null) {
-            throw _map;
-        }
+        assertEq(_map, null);
     }
 };
 const test2 = () => {
     let _map = ['1'];
     for (let i = 2; i <= 10; i++)
         _map = set(_map)((i * i).toString());
-    if (_map.length !== 3) {
-        throw _map;
-    }
+    assertEq(_map.length, 3, _map);
     let _s = jsonStr(_map);
-    if (_s !== '[[["1","100"],"16",["25","36"]],"4",[["49"],"64",["81","9"]]]') {
-        throw _s;
-    }
+    assertEq(_s, '[[["1","100"],"16",["25","36"]],"4",[["49"],"64",["81","9"]]]');
     {
-        _map = remove(_map)("4");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("4"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[[["1","100"],"16",["25","36"]],"49",[["64"],"81",["9"]]]') {
-            throw _s;
-        }
+        assertEq(_s, '[[["1","100"],"16",["25","36"]],"49",[["64"],"81",["9"]]]');
     }
     {
-        _map = remove(_map)("49");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("49"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[["1","100"],"16",["25","36"],"64",["81","9"]]') {
-            throw _s;
-        }
+        assertEq(_s, '[["1","100"],"16",["25","36"],"64",["81","9"]]');
     }
     {
-        _map = remove(_map)("64");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("64"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[["1","100"],"16",["25","36"],"81",["9"]]') {
-            throw _s;
-        }
+        assertEq(_s, '[["1","100"],"16",["25","36"],"81",["9"]]');
     }
     {
-        _map = remove(_map)("81");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("81"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[["1","100"],"16",["25"],"36",["9"]]') {
-            throw _s;
-        }
+        assertEq(_s, '[["1","100"],"16",["25"],"36",["9"]]');
     }
     {
-        _map = remove(_map)("36");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("36"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[["1","100"],"16",["25","9"]]') {
-            throw _s;
-        }
+        assertEq(_s, '[["1","100"],"16",["25","9"]]');
     }
     {
-        _map = remove(_map)("16");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("16"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[["1","100"],"25",["9"]]') {
-            throw _s;
-        }
+        assertEq(_s, '[["1","100"],"25",["9"]]');
     }
     {
-        _map = remove(_map)("25");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("25"), _map);
         _s = jsonStr(_map);
-        if (_s !== '[["1"],"100",["9"]]') {
-            throw _s;
-        }
+        assertEq(_s, '[["1"],"100",["9"]]');
     }
     {
-        _map = remove(_map)("100");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("100"), _map);
         _s = jsonStr(_map);
-        if (_s !== '["1","9"]') {
-            throw _s;
-        }
+        assertEq(_s, '["1","9"]');
     }
     {
-        _map = remove(_map)("9");
-        if (_map === null) {
-            throw _map;
-        }
+        _map = assertNotNullish(remove(_map)("9"), _map);
         _s = jsonStr(_map);
-        if (_s !== '["1"]') {
-            throw _s;
-        }
+        assertEq(_s, '["1"]');
     }
     {
         _map = remove(_map)("1");
-        if (_map !== null) {
-            throw _map;
-        }
+        assertEq(_map, null);
+    }
+};
+// Exercises the branch-merge-into-Branch5-sibling path in reduceValue0
+// (removing an underflowed left leaf merges into a 5-wide right branch).
+const test3 = () => {
+    let _map = ['1'];
+    for (let i = 2; i <= 50; i++)
+        _map = set(_map)(i.toString());
+    _map = assertNotNullish(remove(_map)('40'), _map);
+    _map = assertNotNullish(remove(_map)('10'), _map);
+    const r = jsonStr(_map);
+    if (r !==
+        '[[[[["1","11"],"12",["13"],"14",["15"]],"16",[["17"],"18",["19"]],"2",[["20"],"21",["22"]]],' +
+            '"23",' +
+            '[[["24"],"25",["26"]],"27",[["28"],"29",["3"]]]],' +
+            '"30",' +
+            '[[[["31"],"32",["33"]],"34",[["35"],"36",["37"],"38",["39"]]],' +
+            '"4",' +
+            '[[["41","42"],"43",["44"],"45",["46"]],"47",[["48"],"49",["5","50"]],"6",[["7"],"8",["9"]]]]]') {
+        throw r;
     }
 };
 export const proof = {
     test,
     test2,
+    test3,
 };

package/{fs → fjs}/types/btree/set/module.f.js

@@ -3,9 +3,9 @@
  *
  * @module
  */
-import { collapseRoot } from "../types/module.f.js";
-import { find } from "../find/module.f.js";
-import { fold } from "../../list/module.f.js";
+import { collapseRoot } from '../types/module.f.js';
+import { find } from '../find/module.f.js';
+import { fold } from '../../list/module.f.js';
 const b57 = b => b.length === 5 ? [b] : [[b[0], b[1], b[2]], b[3], [b[4], b[5], b[6]]];
 const reduceOp = ([i, x]) => a => {
     switch (i) {
@@ -86,7 +86,7 @@ const nodeSet = (c) => (g) => (node) => {
                 // insert
                 const value = g(null);
                 // TODO: remove after TSGO fix the regression.
-                const _xl = x.length;
+                // const _xl: 1|2 = x.length
                 switch (x.length) {
                     case 1: {
                         return [[x[0], value]];
@@ -96,12 +96,13 @@ const nodeSet = (c) => (g) => (node) => {
                     }
                 }
                 // TODO: remove after TSGO fix the regression.
+                // See https://github.com/microsoft/typescript-go/issues/4613
                 throw 'unreachable';
             }
             case 3: {
                 // replace
                 // TODO: remove after TSGO fix the regression.
-                const _xl = x.length;
+                // const _xl: 2|5 = x.length
                 switch (x.length) {
                     case 2: {
                         return [[x[0], g(x[1])]];
@@ -115,6 +116,8 @@ const nodeSet = (c) => (g) => (node) => {
             }
             case 4: {
                 // insert
+                // TODO: remove after TSGO fix the regression.
+                // const _xl: 2 = x.length
                 const [v0, v1] = x;
                 return [[v0], v1, [g(null)]];
             }