functionalscript 0.0.194 → 0.0.197

package/btree/index.js

@@ -339,8 +339,8 @@ module.exports = {
      * @type { <T>(cmp: Cmp<T>) => (node: Node<T>) => T|undefined }
      */
     getVisitor: cmp => node => {
-        const result = visit(getVisitor)(cmp)(() => { throw '' })(node)
-        if ('done' in result && result.done) { return result.value }
+        const _0 = visit(getVisitor)(cmp)(() => { throw '' })(node)
+        if ('done' in _0 && _0.done) { return _0.value }
         return undefined
     },
     /** @readonly */

package/btree/test.js

@@ -13,18 +13,18 @@ const set = node => value => {
 
 const test = () => {
     /** @type {btree.Node<string>} */
-    let node = ['a']
-    node = set(node)('b')
-    node = set(node)('c')
-    node = set(node)('d')
-    node = set(node)('e')
-    node = set(node)('f')
+    let _map = ['a']
+    _map = set(_map)('b')
+    _map = set(_map)('c')
+    _map = set(_map)('d')
+    _map = set(_map)('e')
+    _map = set(_map)('f')
     //
     {
         /** @type {import('../sequence').Result<string>} */
-        let result = list.next(valuesList(node))
-        while (result !== undefined) {
-            result = list.next(result[1])
+        let _item = list.next(valuesList(_map))
+        while (_item !== undefined) {
+            _item = list.next(_item[1])
         }
     }
 }

package/cmp/index.js

@@ -18,8 +18,8 @@ const index3 = cmp => value => /** @type {Index3} */ (cmp(value) + 1)
 
 /** @type {<T>(cmp: Cmp<T>) => (v2: Array2<T>) => Index5} */
 const index5 = cmp => ([v0, v1]) => {
-    const cmpV0 = cmp(v0)
-    return /** @type {Index5} */ (cmpV0 <= 0 ? cmpV0 + 1 : cmp(v1) + 3)
+    const _0 = cmp(v0)
+    return /** @type {Index5} */ (_0 <= 0 ? _0 + 1 : cmp(v1) + 3)
 }
 
 /** @type {(a: string) => (b: string) => Sign} */

package/json/index.js

@@ -2,6 +2,7 @@ const seq = require('../sequence')
 const map = require('../map')
 const op = require('../sequence/operator')
 const option = require('../option')
+const array = require('../sequence/array')
 
 /** 
  * @typedef {{
@@ -23,7 +24,7 @@ const addProperty = value => {
         const [name, tail] = result
         return { ...srcObject, [name]: f(tail)(srcObject[name]) }
     }
-    return path => f(seq.fromArray(path))
+    return path => f(array.sequence(path))
 }
 
 /** @type {(kv: readonly[string, Json]) => seq.Sequence<string>} */
@@ -60,16 +61,16 @@ const arrayList = list('[')(']')
 /** @type {(object: Object) => seq.Sequence<string>} */
 const objectStringify = object => {
     const _0 = Object.entries(object)
-    const _1 = seq.fromArray(_0)
+    const _1 = array.sequence(_0)
     const _2 = map.fromEntries(_1)
     const _3 = _2.entries
     const _4 = seq.map(property)(_3)
     return objectList(_4)
 }
 
-/** @type {(array: Array) => seq.Sequence<string>} */
-const arrayStringify = array => {
-    const _0 = seq.fromArray(array)
+/** @type {(input: Array) => seq.Sequence<string>} */
+const arrayStringify = input => {
+    const _0 = array.sequence(input)
     const _1 = seq.map(stringSequence)(_0)
     return arrayList(_1)
 }

package/map/index.js

@@ -43,9 +43,9 @@ const keyCmp = a => ([b]) => cmp(a)(b)
 const create = root => ({
     get: name => option.map(([,value]) => value)(getVisitor(keyCmp(name))(root)),
     set: name => value => {
-        const result = setVisitor(keyCmp(name))(() => [name, value])(root)
-        if ('replace' in result) { return create(result.replace) }
-        if ('overflow' in result) { return create(result.overflow) }
+        const _0 = setVisitor(keyCmp(name))(() => [name, value])(root)
+        if ('replace' in _0) { return create(_0.replace) }
+        if ('overflow' in _0) { return create(_0.overflow) }
         throw ''
     },
     entries: values(root),

package/package.json

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

package/sequence/array/index.js

@@ -1,4 +1,5 @@
 const option = require('../../option')
+const seq = require('..')
 
 /**
  * @template T
@@ -94,6 +95,18 @@ 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)
+}
+
 module.exports = {
     /** @readonly */
     at,
@@ -109,4 +122,6 @@ module.exports = {
     splitFirst,
     /** @readonly */
     splitLast,
+    /** @readonly */
+    sequence,
 }

package/sequence/index.js

@@ -1,4 +1,3 @@
-const array = require('./array')
 const seqOp = require('./operator')
 const { combine } = require('../function')
 const op = require('../function/operator')
@@ -33,7 +32,7 @@ const { logicalNot, strictEqual } = require('../function/operator')
 
 /**
  * @template T
- * @typedef {array.Tuple2<T, Sequence<T>>} FirstAndTail
+ * @typedef {readonly[T, Sequence<T>]} FirstAndTail
  */
 
 const empty = () => undefined
@@ -93,18 +92,6 @@ const list = (...array) => {
     }
 }
 
-/** @type {<T>(array: array.Array<T>) => Sequence<T>} */
-const fromArray = a => {
-    /** @typedef {typeof a extends array.Array<infer T> ? T : never} T */
-    /** @type {(index: number) => Sequence<T>} */
-    const at = index => () => {
-        const result = array.at(index)(a)
-        if (result === undefined) { return undefined }
-        return [result[0], at(index + 1)]
-    }
-    return at(0)
-}
-
 /** @type {<T>(...array: readonly Sequence<T>[]) => Sequence<T>} */
 const concat = (...array) => {
     let i = array.length
@@ -265,7 +252,7 @@ const asyncIterable = list => ({
     }
 })
 
-/** @type {<A>(a: Sequence<A>) => <B>(b: Sequence<B>) => Sequence<array.Tuple2<A, B>>} */
+/** @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 }
@@ -293,8 +280,6 @@ module.exports = {
     /** @readonly */
     first,
     /** @readonly */
-    fromArray,
-    /** @readonly */
     toArray,
     /** @readonly */
     iterable,

package/sequence/iterable/index.js

@@ -1,3 +1,4 @@
+const { iterable } = require('..')
 const { combine } = require('../../function')
 const seq = require('../operator')
 

package/sequence/test.js

@@ -1,6 +1,7 @@
 const seq = require('.')
 const { sum } = require('./operator')
 const op = require('./operator')
+const array = require('./array')
 
 /** @type {<T>(input: seq.Sequence<T>) => void} */
 const print = input => {
@@ -14,9 +15,9 @@ const print = input => {
 }
 
 {
-    const big = seq.fromArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 42, 60])
-    const list0 = seq.fromArray([0, 1, 2, 3])
-    const list1 = seq.flatMap(x => seq.fromArray([x, x * 2, x * 3]))(list0)
+    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)
@@ -27,7 +28,7 @@ const print = input => {
     if (seq.first(seq.drop(16)(big)) !== 42) { throw 'drop'}
     {
         const a = seq.toArray(seq.generate(1_000_000))
-        let x = seq.concat(seq.fromArray(a), big)
+        let x = seq.concat(array.sequence(a), big)
         const r = seq.next(x)
         // print(x)
     }
@@ -57,6 +58,6 @@ const print = input => {
 }
 
 {
-    const x = seq.join(':')(seq.fromArray(["1", "2", "3", "4", "5", "6"]))
+    const x = seq.join(':')(seq.list("1", "2", "3", "4", "5", "6"))
     if (x !== "1:2:3:4:5:6") { throw x }
 }