functionalscript 0.0.422 → 0.0.425

package/types/btree/test.f.cjs

@@ -19,7 +19,7 @@ const stringify = sequence => jsonStr(list.toArray(sequence))
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => s.set(cmp(value))(() => value)(node)
 
-{
+const valueTest1 = () => {
     /** @type {btree.Node<string>} */
     let _map = ['a']
     _map = set(_map)('b')
@@ -31,7 +31,7 @@ const set = node => value => s.set(cmp(value))(() => value)(node)
     if (result !== '["a","b","c","d","e","f"]') { throw result }
 }
 
-{
+const valuesTest2 = () => {
     /** @type {btree.Node<string>} */
     let _map = ['1']
     for(let i = 2; i <= 10; i++)
@@ -40,7 +40,7 @@ const set = node => value => s.set(cmp(value))(() => value)(node)
     if (result !== '["1","100","16","25","36","4","49","64","81","9"]') { throw result }
 }
 
-{
+const findTrue = () => {
     /** @type {btree.Node<string>} */
     let _map = ['a']
     _map = set(_map)('b')
@@ -49,7 +49,7 @@ const set = node => value => s.set(cmp(value))(() => value)(node)
     if (result !== 'b') { throw result }
 }
 
-{
+const find = () => {
     /** @type {btree.Node<string>} */
     let _map = ['a']
     _map = set(_map)('b')
@@ -76,6 +76,10 @@ const test = () => {
     }
 }
 
-test()
-
-module.exports = {}
+module.exports = {
+    valueTest1,
+    valuesTest2,
+    findTrue,
+    find,
+    test,
+}

package/types/byteSet/module.f.cjs

@@ -1,8 +1,6 @@
 /** @typedef {bigint} byteSet */
 /** @typedef {number} byte */
 
-const empty = 0n
-
 /** @type {(n: byte) => (s: byteSet) => boolean} */
 const has = n => s => ((s >> BigInt(n)) & 1n) === 1n
 
@@ -13,14 +11,14 @@ const set = n => s => s | (1n << BigInt(n))
 const unset = n => s => s & ~(1n << BigInt(n))
 
 /** @type {(r: readonly[number, number]) => (s: byteSet) => byteSet} */
- const setRange = r => s => s | ((1n << BigInt(r[1] - r[0] + 1)) - 1n << BigInt(r[0]))
+ const setRange = ([b, e]) => s => s | ((1n << BigInt(e - b + 1)) - 1n << BigInt(b))
 
 // how to define FA???
 // const stateA = [init, set] ????
 
 module.exports = {
     /** @readonly */
-    empty,
+    empty: 0n,
     /** @readonly */
     has,
     /** @readonly */

package/types/byteSet/test.f.cjs

@@ -1,44 +1,41 @@
 const _ = require('./module.f.cjs')
 
-{
-    if (_.has(0)(_.empty)) { throw _.empty }
-    if (_.has(1)(_.empty)) { throw _.empty }
-    if (_.has(33)(_.empty)) { throw _.empty }
-}
-
-{
-    const s = _.set(0)(_.empty)
-    if (s !== 1n) { throw s }
-    if (!_.has(0)(s)) { throw s }
-    if (_.has(1)(s)) { throw s }
-    if (_.has(33)(s)) { throw s }
-}
-
-{
-    const s = _.set(33)(_.empty)
-    if (s !== 8589934592n) { throw s }
-    if (_.has(0)(s)) { throw s }
-    if (_.has(1)(s)) { throw s }
-    if (!_.has(33)(s)) { throw s }
-}
-
-{
-    const a = _.set(0)(_.empty)
-    const result = _.unset(0)(a)
-    if (result !== 0n) { throw result }
-}
-
-{
-    const a = _.set(255)(_.empty)
-    const result = _.unset(255)(a)
-    if (result !== 0n) { throw result }
-}
-
-{
-    const result = _.setRange([2, 5])(_.empty)
-    if (result !== 60n) { throw result }
-}
-
 module.exports = {
-
+    has: [
+        () => {
+            if (_.has(0)(_.empty)) { throw _.empty }
+            if (_.has(1)(_.empty)) { throw _.empty }
+            if (_.has(33)(_.empty)) { throw _.empty }
+        },
+        () => {
+            const s = _.set(0)(_.empty)
+            if (s !== 1n) { throw s }
+            if (!_.has(0)(s)) { throw s }
+            if (_.has(1)(s)) { throw s }
+            if (_.has(33)(s)) { throw s }
+        },
+        () => {
+            const s = _.set(33)(_.empty)
+            if (s !== 8589934592n) { throw s }
+            if (_.has(0)(s)) { throw s }
+            if (_.has(1)(s)) { throw s }
+            if (!_.has(33)(s)) { throw s }
+        }
+    ],
+    setRange: () => {
+        const result = _.setRange([2, 5])(_.empty)
+        if (result !== 60n) { throw result }
+    },
+    unset: [
+        () => {
+            const a = _.set(0)(_.empty)
+            const result = _.unset(0)(a)
+            if (result !== 0n) { throw result }
+        },
+        () => {
+            const a = _.set(255)(_.empty)
+            const result = _.unset(255)(a)
+            if (result !== 0n) { throw result }
+        }
+    ]
 }

package/types/function/compare/module.f.cjs

@@ -25,7 +25,7 @@ const index5 = cmp => ([v0, v1]) => {
 }
 
 /** @type {<T>(a: T) => (b: T) => Sign} */
-const unsafeCmp = a => b => a < b ? -1 : a === b ? 0 : 1
+const unsafeCmp = a => b => a < b ? -1 : a > b ? 1 : 0
 
 module.exports = {
     /** @readonly */

package/types/function/compare/test.f.cjs

@@ -1,8 +1,6 @@
 const { unsafeCmp } = require('./module.f.cjs')
 
-{
+module.exports = () => {
     const result = unsafeCmp(true)(false)
     if (result !== 1) { throw result }
 }
-
-module.exports = {}

package/types/function/test.f.cjs

@@ -1,6 +1,6 @@
 const { fn } = require('./module.f.cjs')
 
-{
+module.exports = () => {
     /** @type {(x: string) => readonly[string]} */
     const f = x => [x]
     /** @type {(x: readonly[string]) => readonly[number]} */
@@ -13,5 +13,3 @@ const { fn } = require('./module.f.cjs')
     const result = r('hello')
     if (result !== 5) { throw r }
 }
-
-module.exports = {}