functionalscript 0.0.178 → 0.0.180

package/btree/index.js

@@ -358,7 +358,7 @@ const valuesList = node => () => {
             }
         }
     }
-    return f()()
+    return list.get(f())
 }
 
 module.exports = {

package/btree/test.js

@@ -1,6 +1,7 @@
 const btree = require('.')
 const { setVisitor, valuesList } = btree
 const { cmp } = require('../cmp') 
+const list = require('../sequence/list')
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => {
@@ -21,11 +22,11 @@ const test = () => {
     //
     {
         /** @type {import('../sequence/list').Result<string>} */
-        let result = valuesList(node)()
+        let result = list.get(valuesList(node))
         while (result !== undefined) {
             const t = result[0]
             console.log(t)
-            result = result[1]()
+            result = list.get(result[1])
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.178",
+  "version": "0.0.180",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {

package/sequence/README.md

@@ -12,7 +12,7 @@ Sequence types:
 See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array
 
 - `length: Sequence<infer T> => number`
-- `at: number => Sequence<infer T> = T`
+- `at: number => Sequence<infer T> = T|undefined`
 - `concat: Sequence<infer T> => Sequence<T> => Sequence<T>`
 - `entries: Sequence<infer T> => Sequence<[number, T]>`
 - `every: (infer T => boolean) => Sequence<T> => boolean`
@@ -24,7 +24,6 @@ See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Obj
 - `includes: infer T => Sequence<T> => boolean`
 - `indexOf: infer T => Sequence<T> => number`
 - `join: string => Sequence<string> => string`
-- `keys: Sequence<T> => Sequence<string>`
 - `lastIndexOf: infer T => Sequence<T> => number`
 - `map: (infer T => infer R) => Sequence<T> => Sequence<R>`
 - `reduce: ...Scan<T, R> => Sequence<T> => R`
@@ -38,6 +37,7 @@ See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Obj
 
 ### Priority 3.
 
+- `keys: Sequence<T> => Sequence<string>`
 - `values: Sequence<infer T> => Sequence<T>`
 
 ## Prohibited Array Operations

package/sequence/array/index.js

@@ -30,6 +30,13 @@ const option = require('../../option')
  * @typedef {readonly [T, T, T]} Array3
  */
 
+/**
+ * @template T0
+ * @template T1
+ * @template T2
+ * @typedef {readonly [T0, T1, T2]} Tuple3
+ */
+
 /** @typedef {0|1|2} Index3 */
 
 /**

package/sequence/index.js

@@ -56,7 +56,10 @@ const join = separator => ['', value => [value, scan(op.join(separator))(value)]
 
 const sum = inclusiveScan(op.addition)(0)
 
-const length = inclusiveScan(a => () => a + 1)(0)
+/** @type {(a: number) => () => number} */
+const counter = a => () => a + 1
+
+const length = inclusiveScan(counter)(0)
 
 /**
  * @template T

package/sequence/list/index.js

@@ -6,7 +6,23 @@ const { todo } = require('../../dev')
 
 /**
  * @template T
- * @typedef {() => Result<T>} List
+ * @typedef {() => Result<T>} ListFunc
+ */
+
+/**
+ * We need this workaround because modern JavaScript implementations
+ * don't support ES6 TCO (Tail Call Optimization)
+ * 
+ * Without this wotkaround we may have a stack overflow if a list
+ * contains a lot of concateneted lists.
+ * 
+ * @template T
+ * @typedef {readonly [List<T>, List<T>]} Concat
+ */
+
+/**
+ * @template T
+ * @typedef { ListFunc<T> | Concat<T>} List
  */
 
 /**
@@ -21,60 +37,56 @@ const { todo } = require('../../dev')
 
 const empty = () => undefined
 
+/** @type {<T>(list: List<T>) => Result<T>} */
+const get = list => {
+    let i = list
+    while (true) {
+        if (typeof i === 'function') { return i() }
+        const [a, b] = i
+        if (typeof a === 'function') { 
+            const result = a()
+            if (result !== undefined) { 
+                return [result[0], [result[1], b]]
+            }
+            i = b
+        } else {
+            i = [a[0], [a[1], b]]
+        }
+    }
+}
+
 /**
  * @template T
  * @template R
  * @typedef {(list: List<T>) => List<R>} ListMap
  */
 
-/** @type {<T>(first: T) => ListMap<T, T>} */
-const list = first => tail => () => [first, tail]
-
 /** @type {<T>(first: T) => List<T>} */
-const one = first => list(first)(empty)
+const one = first => () => [first, empty]
 
 /** @type {<T>(array: array.Array<T>) => List<T>} */
 const fromArray = a => {
     /** @typedef {typeof a extends array.Array<infer T> ? T : never} T */
     /** @type {(index: number) => List<T>} */
-    const at = index => {
-        /** @type {(value: readonly [T]) => Result<T>} */
-        const result = ([value]) => list(value)(at(index + 1))()
-        return () => option.map(result)(array.at(index)(a))
+    const at = index => () => {
+        const result = array.at(index)(a)
+        if (result === undefined) { return undefined }
+        return [result[0], at(index + 1)]
     }
     return at(0)
 }
 
-/**
- * Note: the function is not completly lazy.
- *       it calls `a()` as soon as `a` and `b` are provided.
- *       Othrewise we may have a stack overflow if a list 
- *       contains a lot of concateneted empty lists.
- *       And we can't relay on ES6 TCO (Tail Call Optimization) 
- *       because it's not supported by Chrome and Firefox.
- * @type {<T>(list0: List<T>) => ListMap<T, T>} 
- */
-const concat = a => b => {
-    const result = a()
-    if (result !== undefined) {
-        const [first, tail] = result
-        return () => [first, concat(tail)(b)]
-    }
-    return b
-    // /** @typedef {typeof a extends List<infer T> ? T : never} T */
-    // /** @type {(firstAntTail: FirstAndTail<T>) => Result<T>} */
-    // const defined = ([first, tail]) => [first, concat(tail)(b)]
-    // return option.match(defined)(b)(a())
-}
+/** @type {<T>(list0: List<T>) => ListMap<T, T>} */
+const concat = a => b => [a, b]
 
 /** @type {<T, R>(f: (value: T) => List<R>) => ListMap<T, R>} */
 const flatMap = f => input => () => {
     let i = input
     while (true) { 
-        const result = i()
+        const result = get(i)
         if (result === undefined) { return undefined }
         const [first, tail] = result
-        const firstResult = f(first)() 
+        const firstResult = get(f(first)) 
         if (firstResult !== undefined) {
             const [firstFirst, firstTail] = firstResult
             return [firstFirst, concat(firstTail)(flatMap(f)(tail))]
@@ -102,25 +114,29 @@ const scan = s => input => () => {
         const [newFirst, newS] = s(first)
         return [newFirst, scan(newS)(tail)]
     }
-    return option.map(defined)(input())
+    return option.map(defined)(get(input))
 }
 
 /** @type {<T, R>(s: base.InclusiveScan<T, R>) => ListMap<T, R>} */
-const inclusiveScan = ([first, s]) => input => list(first)(scan(s)(input))
+const inclusiveScan = ([first, s]) => input => () => [first, scan(s)(input)]
 
 /** @type {<T>(def: T) => (input: List<T>) => T} */
 const last = def => input => {
-    let i = input()
     let r = def
-    while (i !== undefined) {
-        r = i[0]
-        i = i[1]()
+    let i = input    
+    while (true) {
+        const result = get(i)
+        if (result === undefined) {
+            return r
+        }
+        r = result[0]
+        i = result[1]
     }
     return r
 }
 
 /** @type {<T, R>(s: base.InclusiveScan<T, R>) => (input: List<T>) => R} */
-const reduce = s => input => last(s[0])(inclusiveScan(s)(input))
+const reduce = ([first, s]) => input => last(first)(scan(s)(input))
 
 const entries = scan(base.entries)
 
@@ -130,12 +146,19 @@ const length = reduce(base.length)
 
 const join = pipe(base.join)(reduce)
 
+/** @type {<T>(f: (value: T) => boolean) => ListMap<T, T>} */
+const takeWhile = f => input => () => {
+    const result = get(input)
+    if (result === undefined || !f(result[0])) { return undefined }
+    return result
+}
+
 /** @type {<T>(f: (value: T) => boolean) => (input: List<T>) => T|undefined} */
 const find = f => input => {
     /** @typedef {typeof f extends (value: infer T) => boolean ? T : never} T */
     /** @type {(result: FirstAndTail<T>) => T} */
     const defined = ([first]) => first
-    return option.map(defined)(filter(f)(input)())
+    return option.map(defined)(get(filter(f)(input)))
 }
 
 /**
@@ -144,17 +167,19 @@ const find = f => input => {
  */
 const iterable = list => ({
     *[Symbol.iterator]() {
-        let result = list()
-        while (result !== undefined) {
+        let i = list
+        while (true) {
+            const result = get(i)
+            if (result === undefined) { return }
             yield result[0]
-            result = result[1]()
+            i = result[1]
         }
     }
 })
 
 module.exports = {
     /** @readonly */
-    list,
+    get,
     /** @readonly */
     one,
     /** @readonly */

package/sequence/list/test.js

@@ -3,10 +3,12 @@ const { sum } = require('..')
 
 /** @type {<T>(l: list.List<T>) => void} */
 const print = a => {
-    let i = a()
-    while (i !== undefined) {
-        console.log(i[0])
-        i = i[1]()
+    let i = a
+    while (true) {
+        const result = list.get(i)
+        if (result === undefined) { return }
+        console.log(result[0])
+        i = result[1]
     }
 }
 
@@ -19,18 +21,18 @@ const print = a => {
     const r = list.find(x => x === 42)(big)
     {
         let x = big
-        for (let i = 0; i < 10000; ++i) {
+        for (let i = 0; i < 1_000_000; ++i) {
             x = list.concat(list.empty)(x)
         }
-        const r = x()
+        const r = list.get(x)
         print(x)
     } 
     {
         let x = big
-        for (let i = 0; i < 10000; ++i) {
-            x = list.concat(x)(list.empty)
+        for (let i = 0; i < 1_000_000; ++i) {
+            x = list.concat(x)(list.one(i))
         }
-        const r = x()
-        print(x)
+        const r = list.get(x)
+        // print(x)
     }
 }