functionalscript 0.0.222 → 0.0.229

package/package.json

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

package/sequence/index.js

@@ -19,7 +19,7 @@ const op = require('../function/operator')
 
 /**
  * @template T
- * @typedef { readonly[Sequence<T>, Sequence<T>] } Concat<T>
+ * @typedef { readonly[Sequence<T>, Sequence<T>]} Concat<T>
  */
 
 /**
@@ -34,6 +34,12 @@ const op = require('../function/operator')
 
 const empty = () => undefined
 
+/** @type {<T>(first: T) => (tail: Sequence<T>) => Sequence<T>} */
+const create = first => tail => () => ({ first, tail })
+
+/** @type {<T>(sequence: Sequence<T>) => Node<T>} */
+const nodeOne = sequence => [empty, sequence]
+
 /** @type {<T>(array: readonly T[]) => Result<T>} */
 const fromArray = array => {
     /** @typedef {typeof array extends readonly(infer T)[] ? T : never} T */
@@ -48,27 +54,23 @@ const fromArray = array => {
 /** @type {<T>(sequence: Sequence<T>) => Node<T>} */
 const node = sequence => sequence instanceof Array ? fromArray(sequence) : sequence()
 
-/** @type {<T>(concat: Concat<T>) => Sequence<T>} */
-const concatNext = ([a, b]) => {
-    const result = node(a)
-    if (result === undefined) {
-        return b
-    } else if (result instanceof Array) {
-        const [aa, ab] = result
-        return () => [aa, () => [ab, b]]
-    } else {
-        const { first, tail } = result
-        return () => ({ first, tail: () => [tail, b] })
-    }
-}
-
 /** @type {<T>(sequence: Sequence<T>) => Result<T>} */
 const next = sequence => {
     let i = sequence
     while (true) {
         const n = node(i)
         if (!(n instanceof Array)) { return n }
-        i = concatNext(n)
+        const [a, b] = n
+        const result = node(a)
+        if (result === undefined) {
+            i = b
+        } else if (result instanceof Array) {
+            const [aa, ab] = result
+            i = () => [aa, () => [ab, b]]
+        } else {
+            const { first, tail } = result
+            return { first, tail: () => [tail, b] }
+        }
     }
 }
 
@@ -121,7 +123,7 @@ const flatMap = f => compose(map(f))(flat)
 /** @type {<T>(f: (value: T) => boolean) => (result: ResultOne<T>) => Node<T>} */
 const filterFn = f => ({ first, tail }) => {
     const fTail = filter(f)(tail)
-    return f(first) ? { first, tail: fTail } : fTail()
+    return f(first) ? { first, tail: fTail } : nodeOne(fTail)
 }
 
 /** @type {<T>(f: (value: T) => boolean) => (input: Sequence<T>) => Thunk<T>} */
@@ -131,32 +133,26 @@ const filter = f => nextMap(filterFn(f))
 const filterMapFn = f => ({first, tail}) => {
     const fFirst = f(first)
     const fTail = filterMap(f)(tail)
-    return fFirst === undefined ? fTail() : { first: fFirst, tail: fTail }
+    return fFirst === undefined ? nodeOne(fTail) : { first: fFirst, tail: fTail }
 }
 
 /** @type {<I, O>(f: (value: I) => O|undefined) => (input: Sequence<I>) => Thunk<O>} */
 const filterMap = f => nextMap(filterMapFn(f))
 
+/** @type {<T>(f: (value: T) => boolean) => (result: ResultOne<T>) => Node<T>} */
+const takeWhileFn = f => ({ first, tail }) => f(first) ? { first, tail: takeWhile(f)(tail) } :undefined
+
 /** @type {<T>(f: (value: T) => boolean) => (input: Sequence<T>) => Thunk<T>} */
-const takeWhile = f => input => () => {
-    const result = next(input)
-    if (result === undefined) { return undefined }
+const takeWhile = f => nextMap(takeWhileFn(f))
+
+/** @type {<T>(f: (value: T) => boolean) => (result: ResultOne<T>) => Node<T>} */
+const dropWhileFn = f => result => {
     const { first, tail } = result
-    if (!f(first)) { return undefined }
-    return { first, tail: takeWhile(f)(result.tail) }
+    return f(first) ? nodeOne(dropWhile(f)(tail)) : result
 }
 
 /** @type {<T>(f: (value: T) => boolean) => (input: Sequence<T>) => Thunk<T>} */
-const dropWhile = f => input => () => {
-    let i = input
-    while (true) {
-        const result = next(i)
-        if (result === undefined) { return undefined }
-        const { first, tail } = result
-        if (!f(first)) return result
-        i = tail
-    }
-}
+const dropWhile = f => nextMap(dropWhileFn(f))
 
 /** @type {<D>(def: D) => <T>(input: Sequence<T>) => D|T} */
 const first = def => input => {
@@ -210,15 +206,15 @@ const countdown = count => () => {
  * @typedef {readonly[A, ScanFunc<T, A>]} ScanState
  */
 
-/** @type {<T,A>(operator: ScanFunc<T, A>) => (input: Sequence<T>) => Thunk<A>} */
-const scan = operator => input => () => {
-    const result = next(input)
-    if (result === undefined) { return undefined }
-    const { first, tail } = result
-    const r = operator(first)
-    return { first: r[0], tail: scan(r[1])(tail) }
+/** @type {<T,A>(operator: ScanFunc<T, A>) => (result: ResultOne<T>) => Node<A>} */
+const scanFn = operator => ({first, tail}) => {
+    const [value, nextOperator] = operator(first)
+    return { first: value, tail: scan(nextOperator)(tail) }
 }
 
+/** @type {<T,A>(operator: ScanFunc<T, A>) => (input: Sequence<T>) => Thunk<A>} */
+const scan = operator => nextMap(scanFn(operator))
+
 /** @type {<T,A>(operator: ScanFunc<T, A>) => <D>(def: D)=> (input: Sequence<T>) => D|A} */
 const scanReduce = operator => def => input => last(def)(scan(operator)(input))
 
@@ -269,6 +265,12 @@ const entryOp = index => value => [[index, value], entryOp(index + 1)]
 /** @type {<T>(input: Sequence<T>) => Thunk<Entry<T>>} */
 const entries = scan(entryOp(0))
 
+/** @type {<T>(prior: Sequence<T>) => (value: T) => Sequence<T>} */
+const reverseOp = prior => value => create(value)(prior)
+
+/** @type {<T>(input: Sequence<T>) => Sequence<T>} */
+const reverse = reduce(reverseOp)(empty)
+
 module.exports = {
     /** @readonly */
     empty,
@@ -293,6 +295,8 @@ module.exports = {
     /** @readonly */
     filter,
     /** @readonly */
+    filterMap,
+    /** @readonly */
     find,
     /** @readonly */
     some,
@@ -323,5 +327,7 @@ module.exports = {
     /** @readonly */
     length,
     /** @readonly */
+    reverse,
+    /** @readonly */
     countdown,
 }

package/sequence/test.js

@@ -92,9 +92,31 @@ const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
     if (result !== '[[0,"hello"],[1,"world"]]') { throw result }
 }
 
+{
+    const result = stringify(_.reverse([]))
+    if (result !== '[]') { throw result }
+}
+
+{
+    const result = stringify(_.reverse([1,2,3,4,5]))
+    if (result !== '[5,4,3,2,1]') { throw result }
+}
+
 // stress tests
 
 const stress = () => {
+
+    {
+        // 100_000_000 is too much
+        const n = 50_000_000
+        const result = _.toArray(_.countdown(n))
+        if (result.length !== n) { throw result.length }
+        const len = _.length(_.filter(x => x > n)(result))
+        if (len !== 0) { throw len }
+    }
+
+    console.log('first')
+
     {
         // 200_000_000 is too much
         const n = 100_000_000
@@ -133,9 +155,31 @@ const stress = () => {
         }
         const a = _.next(sequence)
     }
+
+    console.log('filterMap')
+
+    {
+        // 100_000_000 is too much
+        const n = 50_000_000
+        const result = _.toArray(_.countdown(n))
+        if (result.length !== n) { throw result.length }
+        const len = _.length(_.filterMap(() => undefined)(result))
+        if (len !== 0) { throw len }
+    }
+
+    console.log('dropWhile')
+
+    {
+        // 50_000_000 is too much
+        const n = 20_000_000
+        const result = _.toArray(_.countdown(n))
+        if (result.length !== n) { throw result.length }
+        const len = _.length(_.dropWhile(() => true)(result))
+        if (len !== 0) { throw len }
+    }
 }
 
-stress()
+// stress()
 
 module.exports = {