functionalscript 0.0.174 → 0.0.176

package/package.json

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

package/sequence/list/index.js

@@ -2,6 +2,7 @@ const array = require('../array')
 const option = require('../../option')
 const base = require('..')
 const { pipe } = require('../../function')
+const { todo } = require('../../dev')
 
 /**
  * @template T
@@ -53,15 +54,19 @@ const concat = a => b => () => {
 }
 
 /** @type {<T, R>(f: (value: T) => List<R>) => ListMap<T, R>} */
-const flatMap = f => {
-    /** @typedef {typeof f extends (value: infer T) => List<infer R> ? [T, R] : never} TR */
-    /** @typedef {TR[0]} T */
-    /** @typedef {TR[1]} R */
-    /** @type {(firstAntTail: FirstAndTail<T>) => Result<R>} */
-    const defined = ([first, tail]) => concat(f(first))(listMap(tail))()
-    /** @type {(list: List<T>) => List<R>} */
-    const listMap = list => () => option.map(defined)(list())
-    return listMap
+const flatMap = f => input => () => {
+    let i = input
+    while (true) { 
+        const result = i()
+        if (result === undefined) { return undefined }
+        const [first, tail] = result
+        const firstResult = f(first)() 
+        if (firstResult !== undefined) {
+            const [firstFirst, firstTail] = firstResult
+            return [firstFirst, concat(firstTail)(flatMap(f)(tail))]
+        }
+        i = tail
+    }
 }
 
 /** @type {<T>(list: List<List<T>>) => List<T>} */

package/sequence/list/test.js

@@ -12,13 +12,14 @@ const print = a => {
 
 {
     const big = list.fromArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 42, 60])
-    print(big)
+    // print(big)
     /*
     const list0 = list.fromArray([0, 1, 2, 3])
     const list1 = list.flatMap(x => list.fromArray([x, x * 2, x * 3]))(list0)
     const list2 = list.concat(list0)(list0)
     const list3 = list.inclusiveScan(sum)(list0)
     print(list3)
-    const r = list.find(x => x === 42)(list.fromArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 42, 60]))
     */
+    const r = list.find(x => x === 42)(big)
+    console.log(r)
 }