functionalscript 0.0.568 → 0.0.570

package/com/test/build.cjs

@@ -6,7 +6,7 @@ const { cpp, cs, rust } = build
 const { join } = require('../../types/string/module.f.cjs')
 const { log, error } = console
 const { bold, reset } = require('../../text/sgr/module.f.cjs')
-const { list } = require('../../types/module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
 
 const nodeJs = {
     dirname: __dirname,

package/issues/README.md

@@ -0,0 +1,30 @@
+# Issues
+
+## Allow Debugging During Test Run
+
+Currently, we read files as strings and then parse them as functions. See [dev/test.mjs](dev/test.mjs). In this case, debugger doesn't know about source code and can't debug the functions. The main reason for loading modules as functions was that Deno v1 didn't support `.cjs` files. However, Deno v2 support them.
+
+We can fix the issue by changing our test runner. The test runner will scan all directories and find all `test.f.cjs` files and then load them using `require`.
+
+**Note:** we will drop support for Deno v1.
+
+## Creating `./_module.f.cjs`
+
+We can write a script which will generate `./_module.f.cjs` before packaging. Note: the script should be added into [prepack](https://docs.npmjs.com/cli/v8/using-npm/scripts#pre--post-scripts). The module should never be used by other internal modules. It's only for internal consumptions. The structure will be like this
+
+```js
+module.exports = {
+    types: {
+        list: require('./types/list/module.f.cjs'),
+        // ...
+    },
+    // ...
+}
+```
+
+Then, users can use it like this:
+
+```js
+const { types: { list } } = require('functionalscript)
+//...
+```

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "functionalscript",
-  "version": "0.0.568",
+  "version": "0.0.570",
   "description": "FunctionalScript is a functional subset of JavaScript",
-  "main": "module.f.cjs",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",

package/text/test.f.cjs

@@ -1,5 +1,5 @@
 const _ = require('./module.f.cjs')
-const { string: { join } } = require('../types/module.f.cjs')
+const { join } = require('../types/string/module.f.cjs')
 
 module.exports = () => {
     /** @type {_.Block} */

package/text/utf16/test.f.cjs

@@ -1,7 +1,7 @@
 const encoding = require('./module.f.cjs')
 const json = require('../../json/module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
-const { list } = require('../../types/module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
 
 /** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)

package/text/utf8/test.f.cjs

@@ -1,7 +1,7 @@
 const encoding = require('./module.f.cjs')
 const json = require('../../json/module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
-const { list } = require('../../types/module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
 
 const stringify = json.stringify(sort)
 

package/types/bigint/module.f.cjs

@@ -44,17 +44,33 @@ const scalar_mul = ({ 0: _0, add }) => a => n => {
     }
 }
 
-/** @type {(a: bigint) => bigint} */
-const log2 = a => {
-    // Possible optimization: use a binary search in 32 bit value
-    let i = -1n
-    while (a > 0n) {
-        ++i
-        a >>= 1n
+const bit_len = (/** @type {bigint} */v) => {
+    if (v < 0n) { v = -v }
+    if (v === 0n) { return 0n }
+    let result = 1n
+    let i = 1n
+    while (true) {
+        const n = v >> i
+        if (n === 0n) {
+            break
+        }
+        v = n
+        result += i
+        i <<= 1n
     }
-    return i
+    while (i !== 0n) {
+        i >>= 1n
+        const n = v >> i
+        if (n !== 0n) {
+            result += i
+            v = n
+        }
+    }
+    return result
 }
 
+const log2 = (/** @type {bigint} */v) => v <= 0n ? -1n : bit_len(v) - 1n
+
 module.exports = {
     /** @readonly */
     addition,
@@ -70,4 +86,6 @@ module.exports = {
     scalar_mul,
     /** @readonly */
     log2,
+    /** @readonly */
+    bit_len,
 }

package/types/bigint/test.f.cjs

@@ -1,4 +1,4 @@
-const { sum, abs, serialize, log2 } = require('./module.f.cjs')
+const { sum, abs, serialize, log2, bit_len } = require('./module.f.cjs')
 
 module.exports = {
     sum: () => {
@@ -69,6 +69,48 @@ module.exports = {
         () => {
             const result = log2(16n)
             if (result !== 4n) { throw result }
+        },
+        () => {
+            // max for Bun (131_072 Bytes)
+            const v = 1_048_575n
+            const result = log2(1n << v)
+            if (result !== v) { throw result }
         }
-    ]
+    ],
+    bit_len: {
+        0: () => {
+            const s = bit_len(0n)
+            if (s !== 0n) { throw s }
+        },
+        m: () => {
+            let i = 0n
+            while (i < 10_000n) {
+                const s = bit_len(1n << i)
+                if (s !== i + 1n) { throw [s, i] }
+                i += 1n
+            }
+        },
+        big: () => {
+            const s = bit_len(1n << 1_000_000n)
+            if (s !== 1_000_001n) { throw s }
+        },
+        neg: [
+            () => {
+                const s = bit_len(-1n)
+                if (s !== 1n) { throw s }
+            },
+            () => {
+                const s = bit_len(-2n)
+                if (s !== 2n) { throw s }
+            },
+            () => {
+                const s = bit_len(-3n)
+                if (s !== 2n) { throw s }
+            },
+            () => {
+                const s = bit_len(-4n)
+                if (s !== 3n) { throw s }
+            },
+        ]
+    }
 }

package/types/byte_set/module.f.cjs

@@ -52,8 +52,7 @@ const counter = reverse(countdown(256))
 const toRangeMapOp = n => s => i => {
     const current = has(i + 1)(n)
     const prev = has(i)(n)
-    if (current === prev) { return null }
-    return [[prev ? [s] : [], i]]
+    return current === prev ? null : [[prev ? [s] : [], i]]
 }
 
 /** @type {(n: ByteSet) => (s: string) => rangeMap.RangeMap<sortedSet.SortedSet<string>>} */

package/types/range_map/module.f.cjs

@@ -27,7 +27,7 @@ const _range = require('../range/module.f.cjs')
  * @typedef {{
  *  readonly union: operator.Reduce<T>
  *  readonly equal: operator.Equal<T>
-  * }} Operators
+ * }} Operators
  */
 
 /**
@@ -41,41 +41,41 @@ const _range = require('../range/module.f.cjs')
  */
 
 /** @type {<T>(union: operator.Reduce<T>) => (equal: operator.Equal<T>) => sortedList.ReduceOp<Entry<T>, RangeState<T>>} */
-const reduceOp = union => equal => state => ([aItem, aMax]) => ([bItem, bMax])  => {
-  const sign = cmp(aMax)(bMax)
-  const min = sign === 1 ? bMax : aMax
-  const u = union(aItem)(bItem)
-  const newState = state !== null && equal(state[0])(u) ? null : state
-  return [newState, sign, [u, min]]
+const reduceOp = union => equal => state => ([aItem, aMax]) => ([bItem, bMax]) => {
+    const sign = cmp(aMax)(bMax)
+    const min = sign === 1 ? bMax : aMax
+    const u = union(aItem)(bItem)
+    const newState = state !== null && equal(state[0])(u) ? null : state
+    return [newState, sign, [u, min]]
 }
 
 /** @type {<T>(equal: operator.Equal<T>) => sortedList.TailReduce<Entry<T>, RangeState<T>>} */
 const tailReduce = equal => state => tail => {
-  if (state === null) { return tail }
-  const tailResult = next(tail)
-  if (tailResult === null) { return [state] }
-  if (equal(state[0])(tailResult.first[0])) { return tailResult }
-  return { first: state, tail: tailResult }
+    if (state === null) { return tail }
+    const tailResult = next(tail)
+    if (tailResult === null) { return [state] }
+    if (equal(state[0])(tailResult.first[0])) { return tailResult }
+    return { first: state, tail: tailResult }
 }
 
- /** @type {<T>(op: Operators<T>) => RangeMerge<T>} */
-const merge = ({union, equal}) => genericMerge({reduceOp: reduceOp(union)(equal), tailReduce: tailReduce(equal)})(null)
+/** @type {<T>(op: Operators<T>) => RangeMerge<T>} */
+const merge = ({ union, equal }) => genericMerge({ reduceOp: reduceOp(union)(equal), tailReduce: tailReduce(equal) })(null)
 
 /** @type {<T>(def: T) => (value: number) => (rm: RangeMapArray<T>) => T} */
 const get = def => value => rm => {
-  const len = rm.length
-  let b = 0
-  let e = len - 1
-  while (true) {
-    if (b >= len) { return def }
-    if (e - b < 0) { return rm[b][0] }
-    const mid = b + (e - b >> 1)
-    if (value <= rm[mid][1]) {
-      e = mid - 1
-    } else {
-      b = mid + 1
+    const len = rm.length
+    let b = 0
+    let e = len - 1
+    while (true) {
+        if (b >= len) { return def }
+        if (e - b < 0) { return rm[b][0] }
+        const mid = b + (e - b >> 1)
+        if (value <= rm[mid][1]) {
+            e = mid - 1
+        } else {
+            b = mid + 1
+        }
     }
-  }
 }
 
 /** @type {<T>(def: T) => (r: _range.Range) => (value: T) => RangeMapArray<T>} */

package/types/range_map/test.f.cjs

@@ -3,7 +3,7 @@ const { unsafeCmp } = require('../function/compare/module.f.cjs')
 const json = require('../../json/module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
 const sortedSet = require('../sorted_set/module.f.cjs')
-const { list } = require('../module.f.cjs')
+const list = require('../list/module.f.cjs')
 const operator = require("../function/operator/module.f.cjs")
 
 /** @type {(a: readonly json.Unknown[]) => string} */

package/module.f.cjs

@@ -1,22 +0,0 @@
-module.exports = {
-    /** @readonly */
-    com: require('./com/module.f.cjs'),
-    /** @readonly */
-    commonjs: require('./commonjs/module.f.cjs'),
-    /** @readonly */
-    dev: require('./dev/module.f.cjs'),
-    /** @readonly */
-    fsm: require('./fsm/module.f.cjs'),
-    /** @readonly */
-    html: require('./html/module.f.cjs'),
-    /** @readonly */
-    json: require('./json/module.f.cjs'),
-    /** @readonly */
-    nodejs: require('./nodejs/module.f.cjs'),
-    /** @readonly */
-    sha2: require('./sha2/module.f.cjs'),
-    /** @readonly */
-    text: require('./text/module.f.cjs'),
-    /** @readonly */
-    types: require('./types/module.f.cjs'),
-}

package/types/module.f.cjs

@@ -1,28 +0,0 @@
-module.exports = {
-    /** @readonly */
-    array: require('./array/module.f.cjs'),
-    /** @readonly */
-    btree: require('./btree/module.f.cjs'),
-    /** @readonly */
-    function: require('./function/module.f.cjs'),
-    /** @readonly */
-    list: require('./list/module.f.cjs'),
-    /** @readonly */
-    map: require('./map/module.f.cjs'),
-    /** @readonly */
-    nibbleSet: require('./nibble_set/module.f.cjs'),
-    /** @readonly */
-    object: require('./object/module.f.cjs'),
-    /** @readonly */
-    range: require('./range/module.f.cjs'),
-    /** @readonly */
-    result: require('./result/module.f.cjs'),
-    /** @readonly */
-    stringSet: require('./string_set/module.f.cjs'),
-    /** @readonly */
-    bigint: require('./bigint/module.f.cjs'),
-    /** @readonly */
-    number: require('./number/module.f.cjs'),
-    /** @readonly */
-    string: require('./string/module.f.cjs'),
-}