functionalscript 0.0.214 → 0.0.218

package/btree/index.js

@@ -309,20 +309,20 @@ const replaceVisitor = {
 const values = node => () => {
     const f = () => {
         switch (node.length) {
-            case 1: case 2: { return seq.list(...node) }
+            case 1: case 2: { return node }
             case 3: { 
                 return seq.concat(
                     values(node[0]), 
-                    seq.list(node[1]), 
+                    [node[1]], 
                     values(node[2])
                 )
             }
             default: {
                 return seq.concat(
                     values(node[0]),
-                    seq.list(node[1]),
+                    [node[1]],
                     values(node[2]),
-                    seq.list(node[3]),
+                    [node[3]],
                     values(node[4])
                 )
             }

package/btree/test.js

@@ -25,7 +25,7 @@ const test = () => {
         /** @type {import('../sequence').Result<string>} */
         let _item = list.next(values(_map))
         while (_item !== undefined) {
-            _item = list.next(_item[1])
+            _item = list.next(_item.tail)
         }
     }
 }

package/function/index.js

@@ -4,15 +4,19 @@
  * @typedef {(_: I) => O} Func 
  */
 
-/** @type {<X, O>(f: Func<X, O>) => <I>(g: Func<I, X>) => Func<I, O>} */
-const compose = f => g => x => f(g(x))
+/** 
+ * Postfix Compose function.
+ *
+ * @type {<I, X>(g: Func<I, X>) => <O>(f: Func<X, O>) => Func<I, O>} 
+ */
+const compose = g => f => x => f(g(x))
 
 /** @type {<T>(value: T) => T} */
-const id = value => value
+const identity = value => value
 
 module.exports = {
     /** @readonly */
-    id,
+    identity,
     /** @readonly */
     compose,
 }

package/json/index.js

@@ -14,53 +14,50 @@ const { compose } = require('../function')
 
 /** @typedef {Object|boolean|string|number|null|Array} Json */
 
-/** @type {(value: Json) => (path: readonly string[]) => (src: Json|undefined) => Json} */
+/** @type {(value: Json) => (path: seq.Sequence<string>) => (src: Json|undefined) => Json} */
 const addProperty = value => {
     /** @type {(path: seq.Sequence<string>) => (src: Json|undefined) => Json} */
     const f = path => src => {
         const result = seq.next(path)
         if (result === undefined) { return value }
         const srcObject = (src === undefined || src === null || typeof src !== 'object' || src instanceof Array) ? {} : src
-        const [name, tail] = result
-        return { ...srcObject, [name]: f(tail)(object.at(name)(srcObject)) }
-    }
-    return compose(f)(array.sequence)
+        const { first, tail } = result
+        return { ...srcObject, [first]: f(tail)(object.at(first)(srcObject)) }
+    }    
+    return f
 }
 
 /** @type {(_: string) => seq.Sequence<string>} */
-const stringSerialize = input => seq.list(JSON.stringify(input))
+const stringSerialize = input => [JSON.stringify(input)]
 
 /** @type {(_: number) => seq.Sequence<string>} */
-const numberSerialize = input => seq.list(JSON.stringify(input))
+const numberSerialize = input => [JSON.stringify(input)]
 
-const nullSerialize = seq.list('null')
+const nullSerialize = ['null']
 
-const trueSerialize = seq.list('true')
+const trueSerialize = ['true']
 
-const falseSerialize = seq.list('false')
+const falseSerialize = ['false']
 
 /** @type {(_: boolean) => seq.Sequence<string>} */
 const boolSerialize = value => value ? trueSerialize : falseSerialize
 
-const colon = seq.list(':')
-const comma = seq.list(',')
+const colon = [':']
+const comma = [',']
 
 /** @type {op.Scan<seq.Sequence<string>, seq.Sequence<string>>} */
 const commaValue = a => [seq.concat(comma, a), commaValue]
 
-/** @type {op.Scan<seq.Sequence<string>, seq.Sequence<string>>} */
-const joinScan = value => [value, commaValue]
+/** @type {seq.FoldOperator<seq.Sequence<string>>} */
+const joinOp = a => b => seq.concat(a, comma, b)
 
-/** @type {seq.SequenceMap<seq.Sequence<string>, string>} */
-const join = input => {
-    const _0 = seq.scan(joinScan)(input)
-    return seq.flat(_0)
-}
+/** @type {(input: seq.Sequence<seq.Sequence<string>>) => seq.Sequence<string>} */
+const join = seq.fold(joinOp)([])
 
 /** @type {(open: string) => (close: string) => (input: seq.Sequence<seq.Sequence<string>>) => seq.Sequence<string>} */
 const list = open => close => {
-    const seqOpen = seq.list(open)
-    const seqClose = seq.list(close)
+    const seqOpen = [open]
+    const seqClose = [close]
     return input => seq.concat(seqOpen, join(input), seqClose)
 }
 
@@ -83,15 +80,15 @@ const serialize = sort => {
         f(v))
     /** @type {(object: Object) => seq.Sequence<string>} */
     const objectSerialize = input => {
-        const entries = object.entries(input)
+        const entries = Object.entries(input)
         const sortedEntries = sort(entries)
+        const _ = seq.toArray(sortedEntries)
         const serializedEntries = seq.map(propertySerialize)(sortedEntries)
         return objectList(serializedEntries)
     }
     /** @type {(input: Array) => seq.Sequence<string>} */
     const arraySerialize = input => {
-        const sequence = array.sequence(input)
-        const serializedEntries = seq.map(f)(sequence)
+        const serializedEntries = seq.map(f)(input)
         return arrayList(serializedEntries)
     }
     /** @type {(value: Json) => seq.Sequence < string >} */
@@ -118,7 +115,10 @@ const serialize = sort => {
  *  
  * @type {(mapEntries: MapEntries) => (value: Json) => string}
  */
-const stringify = sort => value => seq.join('')(serialize(sort)(value))
+const stringify = sort => value => {
+    const _s = serialize(sort)(value)
+    return seq.join('')(_s)
+}
 
 /** @type {(value: string) => Json} */
 const parse = value => JSON.parse(value)

package/json/test.js

@@ -1,16 +1,17 @@
 const json = require('.')
 const { sort } = require('../object')
-const { id } = require('../function')
+const { identity } = require('../function')
 
 if (json.addProperty("Hello")([])({}) !== "Hello") { throw 'error' }
 
 {
-    const x = json.stringify(sort)(json.addProperty("Hello")(['a'])({}))
+    const r = json.addProperty("Hello")(['a'])({})
+    const x = json.stringify(sort)(r)
     if (x !== '{"a":"Hello"}') { throw x }
 }
 
 {
-    const x = json.stringify(id)(json.addProperty("Hello")(['a'])({}))
+    const x = json.stringify(identity)(json.addProperty("Hello")(['a'])({}))
     if (x !== '{"a":"Hello"}') { throw x }
 }
 
@@ -20,7 +21,7 @@ if (json.addProperty("Hello")([])({}) !== "Hello") { throw 'error' }
 }
 
 {
-    const x = json.stringify(id)(json.addProperty("Hello")(['a'])({ c: [], b: 12 }))
+    const x = json.stringify(identity)(json.addProperty("Hello")(['a'])({ c: [], b: 12 }))
     if (x !== '{"c":[],"b":12,"a":"Hello"}') { throw x }
 }
 
@@ -34,6 +35,6 @@ if (json.addProperty("Hello")([])({}) !== "Hello") { throw 'error' }
 {
     const _0 = { a: { y: [24] }, c: [], b: 12 }
     const _1 = json.addProperty("Hello")(['a', 'x'])(_0)
-    const _2 = json.stringify(id)(_1)
+    const _2 = json.stringify(identity)(_1)
     if (_2 !== '{"a":{"y":[24],"x":"Hello"},"c":[],"b":12}') { throw _2 }
 }

package/map/index.js

@@ -56,14 +56,14 @@ const create = root => ({
  * @type {{
  *  readonly get: (name: string) => undefined
  *  readonly set: (name: string) => <T>(value: T) => Map<T>
- *  readonly entries: () => undefined
+ *  readonly entries: []
  *  readonly root: undefined
  * }} 
  */
 const empty = {
     get: () => undefined,
     set: name => value => create([[name, value]]),
-    entries: seq.empty,
+    entries: [],
     root: undefined
 }
 
@@ -73,7 +73,9 @@ const setOperator = map => ([k, v]) => map.set(k)(v)
 /** @type {<T>(entries: seq.Sequence<Entry<T>>) => Map<T>} */
 const fromEntries = entries => {
     /** @typedef {typeof entries extends seq.Sequence<Entry<infer T>> ? T : never} T */
-    return seq.fold(setOperator)(/** @type {Map<T>} */(empty))(entries)
+    /** @type {Map<T>} */
+    const init = empty
+    return seq.reduce(setOperator)(init)(entries)
 }
 
 module.exports = {

package/module-manager/index.js

@@ -82,15 +82,11 @@ const internal = pack => {
 const externalOrInternal = p => 
     p === undefined ? () => undefined : (typeof p === 'function' ? external(p) : internal(p))
 
-/** @type {(_: Dependencies) => (_: Path) => Module|undefined} */
+/** @type {(_: Dependencies) => (path: Path) => Module|undefined} */
 const external = packages => { 
     /** @type {(_: readonly [string, Path]) => Module|undefined} */
     const defined = ([first, tail]) => externalOrInternal(packages(first))(tail)
-    /** @type {(_: Path) => readonly [string, Path]|undefined} */
-    const sf = splitFirst
-    return compose
-        (option.map(defined))
-        (sf)        
+    return path => option.map(defined)(splitFirst(path))
 }
 
 /** @type {(_: Location) => (_: string) => Module|undefined} */

package/object/index.js

@@ -14,9 +14,6 @@ const map = require('../map')
  * @typedef {readonly[string, T]} Entry
  */
 
-/** @type {<T>(object: Map<T>) => seq.Sequence<Entry<T>>} */
-const entries = object => array.sequence(Object.entries(object))
-
 /** @type {(name: string) => <T>(object: Map<T>) => T|undefined} */
 const at = name => object => Object.getOwnPropertyDescriptor(object, name)?.value
 
@@ -24,8 +21,6 @@ const at = name => object => Object.getOwnPropertyDescriptor(object, name)?.valu
 const sort = entries => map.fromEntries(entries).entries
 
 module.exports = {
-    /** @readonly */
-    entries,
     /** @readonly */
     at,
     /** @readonly */

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "functionalscript",
-   "version": "0.0.214",
+   "version": "0.0.218",
    "description": "FunctionalScript is a functional subset of JavaScript",
    "main": "index.js",
    "scripts": {
@@ -19,7 +19,7 @@
    },
    "homepage": "https://github.com/functionalscript/functionalscript#readme",
    "devDependencies": {
-      "@types/node": "^16.11.9",
+      "@types/node": "^16.11.11",
       "typescript": "^4.5.2"
    }
 }

package/sequence/README.md

@@ -2,11 +2,26 @@
 
 Sequence types:
 
+- Sequence
 - Array
-- List
 - Iterable
 - AsyncIterable
 
+# Sequence Types
+
+```ts
+type Sequence<T> = 
+    readonly T[] |
+    Thunk<T> |
+
+type Thunk<T> = () => Node<T>
+
+type Node<T> =
+    undefined |
+    { readonly first: T, readonly tail: Sequence<T> } |
+    readonly[Sequence<T>, Sequence<T>]
+```
+
 ## Functions
 
 See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array

package/sequence/array/index.js

@@ -95,21 +95,6 @@ const splitLast = a => {
 /** @type {(index: number) => <T>(a: Array<T>) => readonly[T]|undefined} */
 const at = index => a => index < a.length ? [a[index]] : undefined
 
-/** @type {<T>(array: Array<T>) => seq.Sequence<T>} */
-const sequence = a => {
-    /** @typedef {typeof a extends Array<infer T> ? T : never} T */
-    /** @type {(index: number) => seq.Sequence<T>} */
-    const seq = index => () => {
-        const result = at(index)(a)
-        if (result === undefined) { return undefined }
-        return [result[0], seq(index + 1)]
-    }
-    return seq(0)
-}
-
-/** @type {<T>(list: seq.Sequence<T>) => readonly T[]} */
-const fromSequence = input => Array.from(seq.iterable(input))
-
 module.exports = {
     /** @readonly */
     at,
@@ -125,8 +110,4 @@ module.exports = {
     splitFirst,
     /** @readonly */
     splitLast,
-    /** @readonly */
-    sequence,
-    /** @readonly */
-    fromSequence,
 }

package/sequence/asyncIterable/index.js

@@ -69,7 +69,7 @@ const reduce = ([first, s]) => async c => {
 
 const sum = reduce(seq.sum)
 
-const join = compose(reduce)(seq.join)
+const join = compose(seq.join)(reduce)
 
 const length = reduce(seq.length)
 

package/sequence/index.js

@@ -1,346 +1,315 @@
-const seqOp = require('./operator')
 const { compose } = require('../function')
+const { logicalNot, strictEqual, addition } = require('../function/operator')
 const op = require('../function/operator')
-const { logicalNot, strictEqual } = require('../function/operator')
 
 /**
  * @template T
- * @typedef {() => Result<T>} SequenceFn
+ * @typedef { readonly T[] | Thunk<T> } Sequence<T>
  */
 
 /**
  * @template T
- * @typedef {readonly [Sequence<T>, Sequence<T>]} Concat
+ * @typedef { () => Node<T> } Thunk
  */
 
 /**
- * Use `next` function to get `first` and `tail` of the list.
- * 
- * Please note that the sequence also contains `Concat<T>. We need this as 
- * a 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 { SequenceFn<T> | Concat<T>} Sequence
+ * @typedef { Result<T> | Concat<T> } Node<T>
  */
 
 /**
  * @template T
- * @typedef {FirstAndTail<T>|undefined} Result<T>
+ * @typedef { readonly[Sequence<T>, Sequence<T>] } Concat<T>
  */
 
 /**
  * @template T
- * @typedef {readonly[T, Sequence<T>]} FirstAndTail
+ * @typedef { undefined | { readonly first: T, readonly tail: Sequence<T> } } Result
  */
 
 const empty = () => undefined
 
-/** @type {<F, T>(a: readonly[F, Sequence<T>]) => (b: Sequence<T>) => readonly[F, Sequence<T>]} */
-const norm = ([a0, a1]) => b => [a0, [a1, b]]
+/** @type {<T>(array: readonly T[]) => Result<T>} */
+const fromArray = array => {
+    /** @typedef {typeof array extends readonly(infer T)[] ? T : never} T */
+    /** @type {(index: number) => Result<T>} */
+    const at = index => {
+        if (array.length <= index) { return undefined }
+        return { first: array[index], tail: () => at(index + 1) }
+    }
+    return at(0)
+}
 
-/** @type {<T>(input: Sequence<T>) => Result<T>} */
-const next = input => {
-    let i = input
+/** @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) {
-        if (typeof i === 'function') { return i() }
-        const [a, b] = i
-        if (typeof a === 'function') { 
-            const result = a()
-            if (result !== undefined) { 
-                return norm(result)(b)
+        const n = node(i)
+        if (!(n instanceof Array)) { return n }
+        i = concatNext(n)
+    }
+}
+
+/** @type {<T>(sequence: Sequence<T>) => Iterable<T>} */
+const iterable = sequence => ({
+    *[Symbol.iterator]() {
+        let i = sequence
+        while (true) {
+            if (i instanceof Array) { return yield *i }
+            const n = node(i)
+            if (n === undefined) { return }
+            if (n instanceof Array) {
+                i = concatNext(n)
+            } else {
+                const { first, tail } = n
+                yield first
+                i = tail
             }
-            i = b
-        } else {
-            i = norm(a)(b)
         }
     }
+})
+
+/** @type {<T>(sequence: Sequence<T>) => readonly T[]} */
+const toArray = sequence => {
+    if (sequence instanceof Array) { return sequence }
+    return Array.from(iterable(sequence))
 }
 
-/** @type {<T>(input: Sequence<T>) => T|undefined} */
-const first = input => {
-    const result = next(input)
-    if (result === undefined) { return undefined }
-    return result[0]
+/** @type {<T>(sequence: Sequence<Sequence<T>>) => Thunk<T>} */
+const flat = sequence => () => {
+    const n = next(sequence)
+    if (n === undefined) { return undefined }
+    const { first, tail } = n
+    return [first, flat(tail)]
 }
 
-/**
- * @template T
- * @template R
- * @typedef {(list: Sequence<T>) => Sequence<R>} SequenceMap
- */
+/** @type {<T>(...array: readonly Sequence<T>[]) => Thunk<T>} */
+const concat = (...array) => flat(array)
 
-/**
- * @template T
- * @template R
- * @typedef {(list: Sequence<T>) => R} SequenceReduce
- */
+/** @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) }
+}
 
-/**
- * Note: the operation is not lazy. It traverse the given array and creates a linked list.
- *  
- * @type {<T>(...array: readonly T[]) => Sequence<T>} 
- */
-const list = (...array) => {
-    /** @typedef {typeof array extends readonly(infer T)[] ? T : never} T */
-    let i = array.length
-    /** @type {Sequence<T>} */
-    let result = empty
-    while (i !== 0) {
-        i = i - 1
-        /** @type {FirstAndTail<T>} */
-        const listResult = [array[i], result]
-        result = () => listResult
-    }
-    return result
+/** @type {<I, O>(f: (value: I) => Sequence<O>) => (input: Sequence<I>) => Thunk<O>} */
+const flatMap = f => sequence => flat(map(f)(sequence))
+
+/** @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
+    const fTail = filter(f)(tail)
+    return f(first) ? { first, tail: fTail } : fTail()
 }
 
-/** @type {<T>(...array: readonly Sequence<T>[]) => Sequence<T>} */
-const concat = (...array) => {
-    let i = array.length
-    if (i == 0) { return empty }
-    i = i - 1
-    let result = array[i]
-    while (i !== 0) {
-        i = i - 1
-        result = [array[i], result]
-    }
-    return result
+/** @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
+    const fFirst = f(first)
+    const fTail = filterMap(f)(tail)
+    return fFirst === undefined ? fTail() : { first: fFirst, tail: fTail }
 }
 
-/** @type {(_: number) => Sequence<number>} */
-const generate = n => {
-    /** @type {(_: number) => Sequence<number>} */
-    const f = i => () => {
-        if (n <= i) { return undefined }
-        return [i, f(i + 1)]
-    }
-    return f(0)
+/** @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 { first, tail } = result
+    if (!f(first)) { return undefined }
+    return { first, tail: takeWhile(f)(result.tail) }
 }
 
-/** @type {<T, R>(f: (value: T) => Sequence<R>) => SequenceMap<T, R>} */
-const flatMap = f => input => () => {
+/** @type {<T>(f: (value: T) => boolean) => (input: Sequence<T>) => Thunk<T>} */
+const dropWhile = f => input => () => {
     let i = input
-    while (true) { 
+    while (true) {
         const result = next(i)
         if (result === undefined) { return undefined }
-        const [first, tail] = result
-        const firstResult = next(f(first)) 
-        if (firstResult !== undefined) {
-            return norm(firstResult)(flatMap(f)(tail))
-        }
+        const { first, tail } = result
+        if (!f(first)) return result
         i = tail
     }
 }
 
-/** @type {<T>(list: Sequence<Sequence<T>>) => Sequence<T>} */
-const flat = flatMap(i => i)
-
-/** @type {<T, R>(f: (value: T) => R) => SequenceMap<T, R>} */
-const map = f => flatMap(i => list(f(i)))
-
-/** @type {<T>(f: (value: T) => boolean) => SequenceMap<T, T>} */
-const filter = f => flatMap(i => f(i) ? list(i) : empty)
-
-/** @type {<T, R>(f: (value: T) => R|undefined) => (value: T) => Sequence<R>} */
-const filterMapFunc = f => i => {
-    const result = f(i)
-    if (result === undefined) { return empty }
-    return list(result)
-}
-
-/** @type {<T, R>(f: (value: T) => R|undefined) => SequenceMap<T, R>} */
-const filterMap = f => flatMap(filterMapFunc(f)) 
-
-/** @type {<T, R>(s: seqOp.Scan<T, R>) => SequenceMap<T, R>} */
-const scan = s => input => () => {
+/** @type {<D>(def: D) => <T>(input: Sequence<T>) => D|T} */
+const first = def => input => {
     const result = next(input)
-    if (result === undefined) {
-        return result
-    }
-    const [first, tail] = result
-    const [newFirst, newS] = s(first)
-    return [newFirst, scan(newS)(tail)]
+    if (result === undefined) { return def }
+    return result.first
 }
 
-/** @type {<T, R>(s: seqOp.ExclusiveScan<T, R>) => SequenceMap<T, R>} */
-const exclusiveScan = ([first, s]) => input => () => [first, scan(s)(input)]
-
-/** @type {<T>(def: T) => (input: Sequence<T>) => T} */
+/** @type {<D>(def: D) => <T>(input: Sequence<T>) => D|T} */
 const last = def => input => {
+    /** @typedef {typeof input extends Sequence<infer T> ? T : never} T */
+    /** @type {(typeof def)|T} */
     let r = def
-    let i = input    
+    let i = input
     while (true) {
         const result = next(i)
         if (result === undefined) {
             return r
         }
-        r = result[0]
-        i = result[1]
+        r = result.first
+        i = result.tail
     }
 }
 
-/** @type {<T, R>(s: seqOp.ExclusiveScan<T, R>) => (input: Sequence<T>) => R} */
-const reduce = ([first, s]) => input => last(first)(scan(s)(input))
+/** @type {<D>(def: D) => <T>(f: (value: T) => boolean) => (sequence: Sequence<T>) => D|T} */
+const find = def => f => input => first(def)(filter(f)(input))
 
-/** @type {<T, R>(ro: op.ReduceOperator<R, T>) => (first: R) => (input: Sequence<T>) => R} */
-const fold = ro => first => reduce(seqOp.exclusiveScan(ro)(first))
+/** @type {<T>(f: (value: T) => boolean) => (sequence: Sequence<T>) => boolean} */
+const some = f => input => find(false)(x => x)(map(f)(input))
 
-const entries = scan(seqOp.entries)
+/** @type {<T>(f: (value: T) => boolean) => (sequence: Sequence<T>) => boolean} */
+const every = f => input => !some(compose(f)(logicalNot))(input)
 
-const sum = reduce(seqOp.sum)
+/** @type {<T>(value: T) => (sequence: Sequence<T>) => boolean} */
+const includes = value => some(strictEqual(value))
+
+/** @type {(count: number) => Thunk<number>} */
+const countdown = count => () => {
+    if (count <= 0) { return undefined }
+    const first = count - 1
+    return { first, tail: countdown(first) }
+}
 
-const length = reduce(seqOp.length)
+/**
+ * @template T,A
+ * @typedef {(value: T) => ScanState<T, A>} ScanFunc
+ */
 
-/** @type {(separator: string) => SequenceReduce<string, string>} */
-const join = separator => reduce(seqOp.join(separator))
+/**
+ * @template T,A
+ * @typedef {readonly[A, ScanFunc<T, A>]} ScanState
+ */
 
-/** @type {<T>(f: (value: T) => boolean) => SequenceMap<T, T>} */
-const takeWhile = f => input => () => {
+/** @type {<T,A>(operator: ScanFunc<T, A>) => (input: Sequence<T>) => Thunk<A>} */
+const scan = operator => input => () => {
     const result = next(input)
-    if (result === undefined || !f(result[0])) { return undefined }
-    return result
+    if (result === undefined) { return undefined }
+    const { first, tail } = result
+    const r = operator(first)
+    return { first: r[0], tail: scan(r[1])(tail) }
 }
 
-/** @type {(n: number) => <T>(input: Sequence<T>) => Sequence<T>} */
-const drop = n => input => () => {
-    let iN = n
-    let iInput = input
-    while (true) {
-        const result = next(iInput)
-        if (iN <= 0 || result === undefined) { return result }
-        iN = iN - 1
-        iInput = result[1]
-    }
-}
+/** @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))
 
-/** @type {(n: number) => <T>(input: Sequence<T>) => T|undefined} */
-const at = n => input => first(drop(n)(input))
+/**
+ * @template T,A 
+ * @typedef {(prior: A) => (value: T) => A} ReduceOperator
+ */
 
-/** @type {<T>(f: (value: T) => boolean) => SequenceReduce<T, T|undefined>} */
-const find = f => input => first(filter(f)(input))
+/** @type {<T,A>(operator: ReduceOperator<T, A>) => (init: A) => ScanState<T, A>} */
+const scanState = operator => init => [init, scanFunc(operator)(init)]
 
-/** @type {<T>(f: (value: T) => boolean) => SequenceReduce<T, boolean>} */
-const some = f => input => find(x => x)(map(f)(input)) !== undefined
+/** @type {<T,A>(operator: ReduceOperator<T, A>) => (init: A) => ScanFunc<T, A>} */
+const scanFunc = operator => init => value => {
+    const result = operator(init)(value)
+    return scanState(operator)(result)
+}
 
-/** @type {<T>(value: T) => SequenceReduce<T, boolean>} */
-const includes = value => some(strictEqual(value))
+/** @type {<T,A>(operator: ReduceOperator<T, A>) => (init: A) => (input: Sequence<T>) => A} */
+const reduce = operator => init => scanReduce(scanFunc(operator)(init))(init)
 
-/** @type {<T>(f: (value: T) => boolean) => SequenceReduce<T, boolean>} */
-const every = f => input => !some(compose(logicalNot)(f))(input)
+/** 
+ * @template T
+ * @typedef {ReduceOperator<T, T>} FoldOperator
+ */
 
-/** @type {<T>(list: Sequence<T>) => Iterable<T>} */
-const iterable = list => ({
-    *[Symbol.iterator]() {
-        let i = list
-        while (true) {
-            const result = next(i)
-            if (result === undefined) { return }
-            yield result[0]
-            i = result[1]
-        }
-    }
-})
+/** @type {<T>(operator: FoldOperator<T>) => <D>(def: D) => (input: Sequence<T>) => D|T} */
+const fold = operator => def => scanReduce(scanState(operator))(def)
 
-/** @type {<T>(list: Sequence<T>) => AsyncIterable<T>} */
-const asyncIterable = list => ({
-    async *[Symbol.asyncIterator]() {
-        let i = list
-        while (true) {
-            const result = next(i)
-            if (result === undefined) { return }
-            yield result[0]
-            i = result[1]
-        }
-    }
-})
+const sum = fold(addition)(0)
 
-/** @type {<A>(a: Sequence<A>) => <B>(b: Sequence<B>) => Sequence<readonly[A, B]>} */
-const zip = a => b => () => {
-    const resultA = next(a)
-    if (resultA === undefined) { return undefined }
-    const resultB = next(b)
-    if (resultB === undefined) { return undefined }
-    return [[resultA[0], resultB[0]], zip(resultA[1])(resultB[1])]
-}
+/** @type {(separator: string) => (input: Sequence<string>) => string} */
+const join = separator => fold(op.join(separator))('')
 
-/** @type {<T>(s: Sequence<T>) => Sequence<T>} */
-const reverse = s => {
-    /** @type {typeof s} */
-    let iResult = empty
-    let iSource = s
-    while (true) {
-        const result = next(iSource)
-        if (result === undefined) { return iResult }
-        /** @type {typeof s} */
-        const old = iResult
-        iResult = () => [result[0], old]
-        iSource = result[1]
-    }
-}
+/**
+ * @template T
+ * @typedef {readonly[number, T]} Entry
+ */
+
+/** @type {(index: number) => <T>(value: T) => ScanState<T, Entry<T>>} */
+const entryOp = index => value => [[index, value], entryOp(index + 1)]
+
+/** @type {<T>(input: Sequence<T>) => Thunk<Entry<T>>} */
+const entries = scan(entryOp(0))
 
 module.exports = {
+    /** @readonly */
+    empty,
+    /** @readonly */
+    iterable,
     /** @readonly */
     next,
     /** @readonly */
-    list,
+    toArray,
     /** @readonly */
-    empty,
+    flat,
     /** @readonly */
-    at,
+    last,
     /** @readonly */
     concat,
     /** @readonly */
-    generate,
-    /** @readonly */
     first,
     /** @readonly */
-    iterable,
-    /** @readonly */
-    asyncIterable,
+    map,
     /** @readonly */
     flatMap,
     /** @readonly */
-    flat,
-    /** @readonly */
-    map,
-    /** @readonly */
     filter,
     /** @readonly */
-    filterMap,
-    /** @readonly */
-    scan,
-    /** @readonly */
-    exclusiveScan,
-    /** @readonly */
-    last,
+    find,
     /** @readonly */
-    fold,
+    some,
     /** @readonly */
-    reduce,
+    every,
     /** @readonly */
-    entries,
+    includes,    
     /** @readonly */
-    sum,
+    takeWhile,
     /** @readonly */
-    join,
+    dropWhile,
     /** @readonly */
-    length,
+    scanFunc,
     /** @readonly */
-    drop,
+    scanState,
     /** @readonly */
-    find,
+    scan,
     /** @readonly */
-    takeWhile,
+    reduce,
     /** @readonly */
-    some,
+    fold,
     /** @readonly */
-    every,
+    sum,
     /** @readonly */
-    includes,
+    join,
     /** @readonly */
-    zip,
+    entries,
     /** @readonly */
-    reverse,
-}
+    countdown,
+}

package/sequence/iterable/index.js

@@ -39,7 +39,7 @@ const sum = reduce(seq.sum)
 
 const length = reduce(seq.length)
 
-const join = compose(reduce)(seq.join)
+const join = compose(seq.join)(reduce)
 
 /** @type {<T, R>(f: (value: T) => Iterable<R>) => (c: Iterable<T>) => Iterable<R>} */
 const flatMap = f => c => ({

package/sequence/iterable/test.js

@@ -34,8 +34,8 @@ const { compose } = require('../../function')
     const file = _ => 'x'
     /** @type {(_: string) => string|undefined} */
     const x = p => compose
-        (i.find(x => x !== undefined))
-        (i.map(x => file(x())))        
+        (i.map(x => file(x())))
+        (i.find(x => x !== undefined))                
         ([() => p, () => `${p}.js`, () => `${p}/index.js`])
     if (x('index.js') !== 'x') { throw 'error' }
 }

package/sequence/operator/index.js

@@ -35,7 +35,7 @@ const scan = operator => {
         return [result, f(result)]
     }
     return f
-} 
+}
 
 /** @type {<R, T>(operator: op.ReduceOperator<R, T>) => (first: R) => ExclusiveScan<T, R>} */
 const exclusiveScan = operator => first => [first, scan(operator)(first)]

package/sequence/test.js

@@ -1,74 +1,142 @@
-const seq = require('.')
-const { sum } = require('./operator')
-const array = require('./array')
+const _ = require('.')
 const json = require('../json')
-const { id } = require('../function')
-
-/** @type {<T>(input: seq.Sequence<T>) => void} */
-const print = input => {
-    let i = input
-    while (true) {
-        const result = seq.next(i)
-        if (result === undefined) { return }
-        console.log(result[0])
-        i = result[1]
-    }
+const { sort } = require('../object')
+const { addition } = require('../function/operator')
+
+/** @type {(sequence: _.Sequence<json.Json>) => string} */
+const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
+
+{
+    const s = stringify([1, 2, 3])
+    if (s !== '[1,2,3]') { throw s }
+}
+
+{
+    const result = stringify(_.countdown(10))
+    if (result !== '[9,8,7,6,5,4,3,2,1,0]') { throw result }
+}
+
+{
+    const result = stringify(_.concat([1, 2, 3], [4, 5], [6], [], [7, 8, 9]))
+    if (result !== '[1,2,3,4,5,6,7,8,9]') { throw result }
+}
+
+{
+    const result = _.concat([1], [2])
+    const x = _.next(result)
+}
+
+{
+    const result = stringify(_.flatMap(x => [x, x * 2, x * 3])([0, 1, 2, 3]))
+    if (result !== '[0,0,0,1,2,3,2,4,6,3,6,9]') { throw result }
+}
+
+{
+    const result = stringify(_.takeWhile(x => x < 6)([1, 2, 3, 4, 5, 6, 7, 8, 9]))
+    if (result !== '[1,2,3,4,5]') { throw result }
+}
+
+{
+    const result = _.find(undefined)(x => x % 2 === 0)([1, 2, 3, 4])
+    if (result !== 2) { throw result }
+}
+
+{
+    const result = stringify(_.takeWhile(x => x < 10)([1, 2, 3, 4, 5, 10, 11]))
+    if (result !== '[1,2,3,4,5]') { throw result }
+}
+
+{
+    const result = stringify(_.dropWhile(x => x < 10)([1, 2, 3, 4, 5, 10, 11]))
+    if (result !== '[10,11]') { throw result }
+}
+
+{
+    const op = _.scanState(addition)
+    const result = stringify(_.scan(op)([2, 3, 4, 5]))
+    if (result !== '[2,5,9,14]') { throw result }
+}
+
+{
+    const result = _.sum([2, 3, 4, 5])
+    if (result !== 14) { throw result }
+}
+
+{
+    const result = _.fold(addition)(undefined)([2, 3, 4, 5])
+    if (result !== 14) { throw result }
+}
+
+{
+    const result = _.fold(addition)(undefined)([])
+    if (result !== undefined) { throw result }
+}
+
+{
+    const result = _.join('/')([])
+    if (result !== '') { throw result }
+}
+
+{
+    const result = _.join('/')([''])
+    if (result !== '') { throw result }
+}
+
+{
+    const result = stringify(_.entries([]))
+    if (result !== '[]') { throw result }
 }
 
 {
-    const big = seq.list(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 42, 60)
-    const list0 = seq.list(0, 1, 2, 3)
-    const list1 = seq.flatMap(x => seq.list(x, x * 2, x * 3))(list0)
-    const list2 = seq.concat(list0, list0)
-    const list3 = seq.exclusiveScan(sum)(list0)
-    const r = seq.find(x => x === 42)(big)
-    if (seq.every(x => x > 0)(big) !== true) { throw 'x'}
-    if (seq.every(x => x < 20)(big) !== false) { throw 'x' }
-    if (seq.some(x => x > 100)(big) !== false) { throw 'x' }
-    if (seq.some(x => x > 50)(big) !== true) { throw 'x' }
-    if (seq.first(seq.drop(16)(big)) !== 42) { throw 'drop'}
+    const result = stringify(_.entries(['hello', 'world']))
+    if (result !== '[[0,"hello"],[1,"world"]]') { throw result }
+}
+
+// stress tests
+
+const stress = () => {
     {
-        const a = seq.map(seq.generate)(seq.generate(100_000))
-        const ar = array.fromSequence(a)
-        // This operation use a lot of stack because `...` 
-        // puts array items on a stack.
-        // Use `array.sequence` instead
-        const x = seq.concat(...ar)
-        const r = seq.next(x)
-        // print(x)
+        // 200_000_000 is too much
+        const n = 100_000_000
+        const result = _.toArray(_.countdown(n))
+        if (result.length !== n) { throw result.length }
+        const first = _.first(undefined)(result)
+        if (first !== n - 1) { throw first }
     }
+
     {
-        const a = array.fromSequence(seq.generate(1_000_000))
-        let x = seq.concat(array.sequence(a), big)
-        const r = seq.next(x)
-        // print(x)
+        /** @type {_.Sequence<number>} */
+        let sequence = []
+        // 2_000_000 is too much
+        for (let i = 0; i < 1_000_000; ++i) {
+            sequence = _.concat(sequence, [i])
+        }
+        const r = _.toArray(sequence)
     }
+
     {
-        let x = big
-        for (let i = 0; i < 1_000_000; ++i) {
-            x = seq.concat(seq.empty, x)
+        /** @type {_.Sequence<number>} */
+        let sequence = []
+        // 5_000_000 is too much
+        for (let i = 0; i < 2_000_000; ++i) {
+            sequence = _.concat(sequence, [i])
         }
-        const r = seq.next(x)
-        // print(x)
-    } 
+        const a = _.next(sequence)
+    }
+
     {
-        let x = big
-        for (let i = 0; i < 1_000_000; ++i) {
-            x = seq.concat(x, seq.list(i))
+        /** @type {_.Sequence<number>} */
+        let sequence = []
+        // 10_000_000 is too much
+        for (let i = 0; i < 5_000_000; ++i) {
+            sequence = _.concat([i], sequence)
         }
-        const r = seq.next(x)
-        // print(x)
+        const a = _.next(sequence)
     }
 }
 
-{
-    const x = seq.join(':')(seq.list("1", "2", "3", "4", "5", "6"))
-    if (x !== "1:2:3:4:5:6") { throw x }
-}
+//stress()
+
+module.exports = {
 
-{
-    const r = seq.reverse(seq.list(1, 2, 3, 4))
-    const s = array.fromSequence(r)
-    const j = json.stringify(id)(s)
-    if (j !== '[4,3,2,1]') { throw j }
 }

package/test.js

@@ -82,14 +82,14 @@ const assert_if = c => { if (c) { throw 'assert_if' } }
         constructor: undefined
     }
     const c = o['constructor']
-    console.log(c)
+    //console.log(c)
 }
 
 {
     /** @type {any} */
     const b = '42'
     const r = Number(b)
-    console.log(r)
+    //console.log(r)
 }
 
 {
@@ -106,7 +106,7 @@ const assert_if = c => { if (c) { throw 'assert_if' } }
     //const c = o['propertyIsEnumerable']
     //const c = o['toString']
     const c = o['valueOf']    
-    console.log(c)
+    //console.log(c)
 }
 
 {