functionalscript 0.0.487 → 0.0.489

package/types/btree/remove/test.f.cjs

@@ -8,13 +8,13 @@ const { sort } = require('../../object/module.f.cjs')
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => s.set(cmp(value))(() => value)(node)
 
-/** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string> | undefined} */
+/** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string> | null} */
 const remove = node => value => _.nodeRemove(cmp(value))(node)
 
 const jsonStr = json.stringify(sort)
 
 const test = () => {
-    /** @type {btree.Node<string> | undefined} */
+    /** @type {btree.Node<string> | null} */
     let _map = ['1']
     for (let i = 2; i <= 38; i++)
         _map = set(_map)((i * i).toString())
@@ -32,7 +32,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("0")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[[["1"],"100",["1024"]],"1089",[["1156"],"121",["1225"]]],' +
@@ -46,7 +46,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("1")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"]],"16",[["169"],"196",["225"]]],' +
@@ -58,7 +58,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("4")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"]],"16",[["169"],"196",["225"]]],' +
@@ -70,7 +70,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("9")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"]],"16",[["169"],"196",["225"]]],' +
@@ -82,7 +82,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("16")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["100","1024"],"1089",["1156"],"121",["1225"]],"1296",[["1369"],"144",["1444"],"169",["196","225"]]],' +
@@ -94,7 +94,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("25")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -104,7 +104,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("36")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -114,7 +114,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("49")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -124,7 +124,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("64")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -134,7 +134,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("81")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -144,7 +144,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("100")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -154,7 +154,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("121")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw 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"]]],' +
@@ -164,7 +164,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("144")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"169",["196","225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -174,7 +174,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("169")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"196",["225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -184,7 +184,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("196")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["225"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -194,7 +194,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("225")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"256",[["289"],"324",["361"],"400",["441","484"]]],' +
@@ -204,7 +204,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("256")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"289",[["324","361"],"400",["441","484"]]],' +
@@ -214,7 +214,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("289")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"324",[["361"],"400",["441","484"]]],' +
@@ -224,7 +224,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("324")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],"361",[["400"],"441",["484"]]],' +
@@ -234,7 +234,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("361")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"400",["441","484"]]],' +
@@ -244,7 +244,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("400")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"441",["484"]]],' +
@@ -254,7 +254,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("441")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["484"]]],' +
@@ -264,7 +264,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("484")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],' +
@@ -276,7 +276,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("529")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"576",["625","676"]],' +
@@ -286,7 +286,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("576")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"625",["676"]],' +
@@ -296,7 +296,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("625")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["676"]],' +
@@ -306,7 +306,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("676")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],' +
@@ -316,7 +316,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("729")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]],' +
@@ -326,7 +326,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("784")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"841",["900","961"]]]'
@@ -334,7 +334,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("841")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369","1444"],"900",["961"]]]'
@@ -342,7 +342,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("900")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[[["1024"],"1089",["1156","1225"]],"1296",[["1369"],"1444",["961"]]]'
@@ -350,7 +350,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("961")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[["1024"],"1089",["1156","1225"],"1296",["1369","1444"]]'
@@ -358,7 +358,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("1024")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[["1089"],"1156",["1225"],"1296",["1369","1444"]]'
@@ -366,7 +366,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("1089")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[["1156","1225"],"1296",["1369","1444"]]'
@@ -374,7 +374,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("1156")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[["1225"],"1296",["1369","1444"]]'
@@ -382,7 +382,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("1225")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '[["1296"],"1369",["1444"]]'
@@ -390,7 +390,7 @@ const test = () => {
     }
     {
         _map = remove(_map)("1296")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !==
             '["1369","1444"]'
@@ -398,18 +398,18 @@ const test = () => {
     }
     {
         _map = remove(_map)("1369")
-        if (_map === undefined) { throw 'undefined' }
+        if (_map === null) { throw null }
         const r = jsonStr(_map)
         if (r !== '["1444"]') { throw r }
     }
     {
         _map = remove(_map)("1444")
-        if (_map !== undefined) { throw _map }
+        if (_map !== null) { throw _map }
     }
 }
 
 const test2 = () => {
-    /** @type {btree.Node<string>|undefined} */
+    /** @type {btree.Node<string>|null} */
     let _map = ['1']
     for (let i = 2; i <= 10; i++)
         _map = set(_map)((i * i).toString())
@@ -419,70 +419,70 @@ const test2 = () => {
 
     {
         _map = remove(_map)("4")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[[["1","100"],"16",["25","36"]],"49",[["64"],"81",["9"]]]') { throw _s }
     }
 
     {
         _map = remove(_map)("49")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[["1","100"],"16",["25","36"],"64",["81","9"]]') { throw _s }
     }
 
     {
         _map = remove(_map)("64")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[["1","100"],"16",["25","36"],"81",["9"]]') { throw _s }
     }
 
     {
         _map = remove(_map)("81")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[["1","100"],"16",["25"],"36",["9"]]') { throw _s }
     }
 
     {
         _map = remove(_map)("36")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[["1","100"],"16",["25","9"]]') { throw _s }
     }
 
     {
         _map = remove(_map)("16")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[["1","100"],"25",["9"]]') { throw _s }
     }
 
     {
         _map = remove(_map)("25")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '[["1"],"100",["9"]]') { throw _s }
     }
 
     {
         _map = remove(_map)("100")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '["1","9"]') { throw _s }
     }
 
     {
         _map = remove(_map)("9")
-        if (_map === undefined) { throw _map }
+        if (_map === null) { throw _map }
         _s = jsonStr(_map);
         if (_s !== '["1"]') { throw _s }
     }
 
     {
         _map = remove(_map)("1")
-        if (_map !== undefined) { throw _map }
+        if (_map !== null) { throw _map }
     }
 }
 

package/types/btree/set/module.f.cjs

@@ -36,7 +36,7 @@ const reduceOp = ([i, x]) => a => {
 
 const reduceBranch = fold(reduceOp)
 
-/** @type {<T>(c: cmp.Compare<T>) => (g: (value?: T) => T) => (node: _.Node<T>) => _.Node<T>} */
+/** @type {<T>(c: cmp.Compare<T>) => (g: (value: T | null) => T) => (node: _.Node<T>) => _.Node<T>} */
 const nodeSet = c => g => node => {
     const { first, tail } = find(c)(node)
     const [i, x] = first;
@@ -46,7 +46,7 @@ const nodeSet = c => g => node => {
         switch (i) {
             case 0: {
                 // insert
-                const value = g()
+                const value = g(null)
                 switch (x.length) {
                     case 1: { return [[value, x[0]]] }
                     case 2: { return [[value], x[0], [x[1]]] }
@@ -63,7 +63,7 @@ const nodeSet = c => g => node => {
             }
             case 2: {
                 // insert
-                const value = g()
+                const value = g(null)
                 switch (x.length) {
                     case 1: { return [[x[0], value]] }
                     case 2: { return [[x[0]], value, [x[1]]] }
@@ -79,7 +79,7 @@ const nodeSet = c => g => node => {
             case 4: {
                 // insert
                 const [v0, v1] = x;
-                return [[v0], v1, [g()]]
+                return [[v0], v1, [g(null)]]
             }
         }
     }
@@ -87,8 +87,8 @@ const nodeSet = c => g => node => {
     return r.length === 1 ? r[0] : r
 }
 
-/** @type {<T>(c: cmp.Compare<T>) => (f: (value?: T) => T) => (tree: _.Tree<T>) => _.Node<T>} */
-const set = c => f => tree => tree === undefined ? [f()] : nodeSet(c)(f)(tree)
+/** @type {<T>(c: cmp.Compare<T>) => (f: (value: T|null) => T) => (tree: _.Tree<T>) => _.Node<T>} */
+const set = c => f => tree => tree === null ? [f(null)] : nodeSet(c)(f)(tree)
 
 module.exports = {
     /** @readonly */

package/types/btree/test.f.cjs

@@ -55,7 +55,7 @@ const find = () => {
     _map = set(_map)('b')
     _map = set(_map)('c')
     const result = f.value(f.find(cmp('e'))(_map).first)
-    if (result !== undefined) { throw result }
+    if (result !== null) { throw result }
 }
 
 const test = () => {
@@ -70,7 +70,7 @@ const test = () => {
     {
         /** @type {list.Result<string>} */
         let _item = list.next(values(_map))
-        while (_item !== undefined) {
+        while (_item !== null) {
             _item = list.next(_item.tail)
         }
     }

package/types/btree/types/module.f.cjs

@@ -48,7 +48,7 @@
 
 /**
  * @template T
- * @typedef {Node<T> | undefined} Tree
+ * @typedef {Node<T> | null} Tree
  */
 
 /**

package/types/byte_set/module.f.cjs

@@ -1,4 +1,4 @@
-const { fn } = require('../function/module.f.cjs')
+const { fn, compose } = require('../function/module.f.cjs')
 const rangeMap = require('../range_map/module.f.cjs')
 const sortedSet = require('../sorted_set/module.f.cjs')
 const list = require('../list/module.f.cjs')
@@ -31,17 +31,17 @@ const union = a => b => a | b
 /** @type {(a: ByteSet) => (b: ByteSet) => ByteSet} */
 const intersect = a => b => a & b
 
-/** @type {(a: ByteSet) => (b: ByteSet) => ByteSet} */
-const difference = a => b => intersect(a)(complement(b))
-
 /** @type {(n: ByteSet) => ByteSet} */
 const complement = n => universe ^ n
 
+/** @type {(a: ByteSet) => (b: ByteSet) => ByteSet} */
+const difference = compose(intersect)(compose(complement))
+
 // additional operations
 
-const set = fn(one).then(union).result
+const set = compose(one)(union)
 
-const setRange = fn(range).then(union).result
+const setRange = compose(range)(union)
 
 /** @type {(n: Byte) => (s: ByteSet) => ByteSet} */
 const unset = n => s => difference(s)(one(n))
@@ -49,11 +49,10 @@ const unset = n => s => difference(s)(one(n))
 const counter = reverse(countdown(256))
 
 /** @type {(n: ByteSet) => (s: string) => (i: number) => rangeMap.RangeMap<sortedSet.SortedSet<string>>} */
-const toRangeMapOp = n => s => i =>
-{
+const toRangeMapOp = n => s => i => {
     const current = has(i + 1)(n)
     const prev = has(i)(n)
-    if (current === prev) { return undefined }
+    if (current === prev) { return null }
     return [[prev ? [s] : [], i]]
 }