functionalscript 0.0.219 → 0.0.227

package/README.md

@@ -16,7 +16,7 @@ A workaround for this problem is to use `let` for renaming objects.
 ## Install FunctionalScript As A Library
 
 ```
-npm install -S github:functionalscript/functionscript
+npm install -S github:functionalscript/functionalscript
 ```
 
 ## JSON

package/package.json

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

package/sequence/index.js

@@ -19,16 +19,24 @@ const op = require('../function/operator')
 
 /**
  * @template T
- * @typedef { readonly[Sequence<T>, Sequence<T>] } Concat<T>
+ * @typedef { readonly[Sequence<T>, Sequence<T>]} Concat<T>
  */
 
 /**
  * @template T
- * @typedef { undefined | { readonly first: T, readonly tail: Sequence<T> } } Result
+ * @typedef { undefined | ResultOne<T> } Result
+ */
+
+/**
+ * @template T
+ * @typedef {{ readonly first: T, readonly tail: Sequence<T> }} ResultOne
  */
 
 const empty = () => undefined
 
+/** @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 */
@@ -43,27 +51,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] }
+        }
     }
 }
 
@@ -73,15 +77,11 @@ const iterable = sequence => ({
         let i = sequence
         while (true) {
             if (i instanceof Array) { return yield *i }
-            const n = node(i)
+            const n = next(i)
             if (n === undefined) { return }
-            if (n instanceof Array) {
-                i = concatNext(n)
-            } else {
-                const { first, tail } = n
-                yield first
-                i = tail
-            }
+            const { first, tail } = n
+            yield first
+            i = tail
         }
     }
 })
@@ -92,47 +92,50 @@ const toArray = sequence => {
     return Array.from(iterable(sequence))
 }
 
-/** @type {<T>(sequence: Sequence<Sequence<T>>) => Thunk<T>} */
-const flat = sequence => () => {
-    const n = next(sequence)
+/** @type {<I, O>(f: (result: ResultOne<I>) => Node<O>) => (input: Sequence<I>) => Thunk<O>} */
+const nextMap = f => input => () => {
+    const n = next(input)
     if (n === undefined) { return undefined }
-    const { first, tail } = n
-    return [first, flat(tail)]
+    return f(n)
 }
 
+/** @type {<T>(result: ResultOne<Sequence<T>>) => Node<T>} */
+const flatFn = ({first, tail}) => [first, flat(tail)]
+
+/** @type {<T>(sequence: Sequence<Sequence<T>>) => Thunk<T>} */
+const flat = nextMap(flatFn)
+
 /** @type {<T>(...array: readonly Sequence<T>[]) => Thunk<T>} */
 const concat = (...array) => flat(array)
 
+/** @type {<I, O>(f: (value: I) => O) => (result: ResultOne<I>) => Node<O>} */
+const mapFn = f => ({ first, tail }) => ({ first: f(first), tail: map(f)(tail) })
+
 /** @type {<I, O>(f: (value: I) => O) => (input: Sequence<I>) => Thunk<O>} */
-const map = f => sequence => () => {
-    const n = next(sequence)
-    if (n === undefined) { return undefined }
-    const { first, tail } = n
-    return { first: f(first), tail: map(f)(tail) }
-}
+const map = f => nextMap(mapFn(f))
 
 /** @type {<I, O>(f: (value: I) => Sequence<O>) => (input: Sequence<I>) => Thunk<O>} */
-const flatMap = f => sequence => flat(map(f)(sequence))
+const flatMap = f => compose(map(f))(flat)
 
-/** @type {<T>(f: (value: T) => boolean) => (input: Sequence<T>) => Thunk<T>} */
-const filter = f => sequence => () => {
-    const n = next(sequence)
-    if (n === undefined) { return undefined }
-    const { first, tail } = n
+/** @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 {<I, O>(f: (value: I) => O|undefined) => (input: Sequence<I>) => Thunk<O>} */
-const filterMap = f => sequence => () => {
-    const n = next(sequence)
-    if (n === undefined) { return undefined }
-    const { first, tail } = n
+/** @type {<T>(f: (value: T) => boolean) => (input: Sequence<T>) => Thunk<T>} */
+const filter = f => nextMap(filterFn(f))
+
+/** @type {<I, O>(f: (value: I) => O|undefined) => (result: ResultOne<I>) => Node<O>} */
+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) => (input: Sequence<T>) => Thunk<T>} */
 const takeWhile = f => input => () => {
     const result = next(input)
@@ -144,14 +147,11 @@ const takeWhile = f => input => () => {
 
 /** @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 result = next(input)
+    if (result === undefined) { return undefined }
+    const { first, tail } = result
+    if (f(first)) { return nodeOne(dropWhile(f)(tail)) }
+    return result
 }
 
 /** @type {<D>(def: D) => <T>(input: Sequence<T>) => D|T} */
@@ -248,6 +248,12 @@ const sum = fold(addition)(0)
 /** @type {(separator: string) => (input: Sequence<string>) => string} */
 const join = separator => fold(op.join(separator))('')
 
+/** @type {(a: number) => () => number} */
+const counter = a => () => a + 1
+
+/** @type {<T>(input: Sequence<T>) => number} */
+const length = reduce(counter)(0)
+
 /**
  * @template T
  * @typedef {readonly[number, T]} Entry
@@ -283,6 +289,8 @@ module.exports = {
     /** @readonly */
     filter,
     /** @readonly */
+    filterMap,
+    /** @readonly */
     find,
     /** @readonly */
     some,
@@ -311,5 +319,7 @@ module.exports = {
     /** @readonly */
     entries,
     /** @readonly */
+    length,
+    /** @readonly */
     countdown,
 }

package/sequence/test.js

@@ -95,6 +95,18 @@ const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
 // 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 +145,20 @@ 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 }
+    }
 }
 
-//stress()
+// stress()
 
 module.exports = {