functionalscript 0.0.400 → 0.0.403

package/commonjs/build/module.f.cjs

@@ -8,7 +8,7 @@ const object = require('../../types/object/module.f.cjs')
 const { fromMap } = object
 const path = require('../path/module.f.cjs')
 const { parseAndFind } = path
-const stringSet = require('../../types/string_set/module.f.cjs')
+const stringSet = require('../../types/stringset/module.f.cjs')
 const { set: setSet, contains: setContains } = stringSet
 
 /**

package/commonjs/path/module.f.cjs

@@ -1,5 +1,5 @@
 const list = require("../../types/list/module.f.cjs")
-const { next, reduce, reverse, first, flat, toArray, filterMap, isEmpty, concat } = list
+const { next, fold, reverse, first, flat, toArray, filterMap, isEmpty, concat } = list
 const { join } = require('../../types/string/module.f.cjs')
 const package_ = require("../package/module.f.cjs")
 const module_ = require("../module/module.f.cjs")
@@ -38,7 +38,7 @@ const normItemsOp = first => prior => {
 
 /** @type {(items: list.List<string>) => OptionList} */
 const normItems = items => {
-    const result = reduce(normItemsOp)([undefined])(items)
+    const result = fold(normItemsOp)([undefined])(items)
     return result === undefined ? result : [reverse(result[0])]
 }
 

package/json/module.f.cjs

@@ -1,5 +1,5 @@
 const list = require('../types/list/module.f.cjs')
-const { next, flat, fold, map } = list
+const { next, flat, reduce: fold, map } = list
 const { concat } = require('../types/string/module.f.cjs')
 const object = require('../types/object/module.f.cjs')
 const { at } = object
@@ -50,7 +50,7 @@ const boolSerialize = value => value ? trueSerialize : falseSerialize
 const colon = [':']
 const comma = [',']
 
-/** @type {operator.Fold<list.List<string>>} */
+/** @type {operator.Reduce<list.List<string>>} */
 const joinOp = b => prior => flat([prior, comma, b])
 
 /** @type {(input: list.List<list.List<string>>) => list.List<string>} */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.400",
+  "version": "0.0.403",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/test.f.cjs

@@ -16,7 +16,7 @@ require('./commonjs/package/test.f.cjs')
 require('./commonjs/path/test.f.cjs')
 require('./types/function/test.f.cjs')
 require('./types/function/compare/test.f.cjs')
-require('./types/string_set/test.f.cjs')
+require('./types/stringset/test.f.cjs')
 require('./types/option/test.f.cjs')
 require('./commonjs/build/test.f.cjs')
 require('./types/range/test.f.cjs')

package/text/encoding/module.f.cjs

@@ -4,7 +4,7 @@ const operator = require('../../types/function/operator/module.f.cjs')
 const array = require('../../types/array/module.f.cjs')
 const { contains } = require('../../types/range/module.f.cjs')
 const { compose } = require('../../types/function/module.f.cjs')
-const { map, flat, stateScan, concat, fold, toArray, flatMap } = list
+const { map, flat, stateScan, concat, reduce, toArray, flatMap } = list
 const { ok, error } = result
 
 /** @typedef {result.Result<number,number>} ByteResult */
@@ -136,7 +136,7 @@ const stringToUtf16List = s => {
     return at(0)
 }
 
-const utf16ListToString = compose(map(String.fromCharCode))(fold(operator.concat)(''))
+const utf16ListToString = compose(map(String.fromCharCode))(reduce(operator.concat)(''))
 
 module.exports = {
     /** @readonly */

package/types/bigint/module.f.cjs

@@ -1,9 +1,9 @@
-const { fold } = require('../list/module.f.cjs')
+const { reduce } = require('../list/module.f.cjs')
 
 /** @type {(a: bigint) => (b: bigint) => bigint} */
 const addition = a => b => a + b
 
-const sum = fold(addition)(0n)
+const sum = reduce(addition)(0n)
 
 module.exports = {
     /** @readonly */

package/types/btree/remove/module.f.cjs

@@ -2,7 +2,7 @@ const _ = require('../types/module.f.cjs')
 const cmp = require('../../function/compare/module.f.cjs')
 const find = require('../find/module.f.cjs')
 const list = require('../../list/module.f.cjs')
-const { reduce: listReduce, concat, next } = list
+const { fold, concat, next } = list
 const array = require('../../array/module.f.cjs')
 const { map } = require('../../option/module.f.cjs')
 
@@ -111,7 +111,7 @@ const reduceX = ms => ([i, n]) => a => {
     }
 }
 
-const reduce = listReduce(reduceX([reduceValue0, reduceValue2]))
+const reduce = fold(reduceX([reduceValue0, reduceValue2]))
 
 const initReduce = reduceX([initValue0, initValue1])
 

package/types/btree/set/module.f.cjs

@@ -3,7 +3,7 @@ const btreeFind = require('../find/module.f.cjs')
 const { find } = btreeFind
 const cmp = require('../../function/compare/module.f.cjs')
 const list = require('../../list/module.f.cjs')
-const { reduce } = list
+const { fold } = list
 
 /**
  * @template T
@@ -34,7 +34,7 @@ const reduceOp = ([i, x]) => a => {
     }
 }
 
-const reduceBranch = reduce(reduceOp)
+const reduceBranch = fold(reduceOp)
 
 /** @type {<T>(c: cmp.Compare<T>) => (g: (value?: T) => T) => (node: _.Node<T>) => _.Node<T>} */
 const nodeSet = c => g => node => {

package/types/function/operator/module.f.cjs

@@ -7,13 +7,13 @@
 
 /**
  * @template I,O
- * @typedef {Binary<I, O, O>} Reduce
+ * @typedef {Binary<I, O, O>} FoldT
  */
 
-/** @type {(separator: string) => Fold<string>} */
+/** @type {(separator: string) => Reduce<string>} */
 const join = separator => value => prior => `${prior}${separator}${value}`
 
-/** @type {Fold<string>} */
+/** @type {Reduce<string>} */
 const concat = i => acc => `${acc}${i}`
 
 /**
@@ -49,27 +49,27 @@ const stateScanToScan = op => prior => i => {
     return [o, stateScanToScan(op)(s)]
 }
 
-/** @type {<I, O>(reduce: Reduce<I, O>) => (prior: O) => Scan<I, O>} */
-const reduceToScan = reduce => prior => i => {
-    const result = reduce(i)(prior)
-    return [result, reduceToScan(reduce)(result)]
+/** @type {<I, O>(fold: FoldT<I, O>) => (prior: O) => Scan<I, O>} */
+const foldToScan = fold => prior => i => {
+    const result = fold(i)(prior)
+    return [result, foldToScan(fold)(result)]
 }
 
 /**
  * @template T
- * @typedef {Reduce<T, T>} Fold
+ * @typedef {FoldT<T, T>} Reduce
  */
 
-/** @type {<T>(fold: Fold<T>) => Scan<T, T>} */
-const foldToScan = op => init => [init, reduceToScan(op)(init)]
+/** @type {<T>(fold: Reduce<T>) => Scan<T, T>} */
+const reduceToScan = op => init => [init, foldToScan(op)(init)]
 
-/** @type {Fold<number>} */
+/** @type {Reduce<number>} */
 const addition = a => b => a + b
 
-/** @type {Fold<number>} */
+/** @type {Reduce<number>} */
 const min = a => b => a < b ? a : b
 
-/** @type {Fold<number>} */
+/** @type {Reduce<number>} */
 const max = a => b => a > b ? a : b
 
 const increment = addition(1)
@@ -94,10 +94,10 @@ module.exports = {
     /** @readonly */
     stateScanToScan,
     /** @readonly */
-    reduceToScan,
-    /** @readonly */
     foldToScan,
     /** @readonly */
+    reduceToScan,
+    /** @readonly */
     counter,
     /** @readonly */
     concat,

package/types/list/module.f.cjs

@@ -1,14 +1,12 @@
 const { compose, identity } = require('../function/module.f.cjs')
 const operator = require('../function/operator/module.f.cjs')
 const {
-    join: joinOp,
-    concat: concatOp,
     counter,
     logicalNot,
     strictEqual,
     stateScanToScan,
-    reduceToScan,
-    foldToScan
+    foldToScan,
+    reduceToScan
 } = operator
 
 /**
@@ -252,18 +250,18 @@ const scan = op => apply(scanStep(op))
 /** @type {<I, S, O>(op: operator.StateScan<I, S, O>) => (init: S) => (input: List<I>) => Thunk<O>} */
 const stateScan = op => init => scan(stateScanToScan(op)(init))
 
-/** @type {<I,O>(op: operator.Reduce<I, O>) => (init: O) => (input: List<I>) => Thunk<O>} */
-const reduceScan = op => init => scan(reduceToScan(op)(init))
+/** @type {<I,O>(op: operator.FoldT<I, O>) => (init: O) => (input: List<I>) => Thunk<O>} */
+const foldScan = op => init => scan(foldToScan(op)(init))
 
-/** @type {<I,O>(op: operator.Reduce<I, O>) => (init: O) => (input: List<I>) => O} */
-const reduce = op => init => input => last(init)(reduceScan(op)(init)(input))
+/** @type {<I,O>(op: operator.FoldT<I, O>) => (init: O) => (input: List<I>) => O} */
+const fold = op => init => input => last(init)(foldScan(op)(init)(input))
 
-/** @type {<T>(op: operator.Fold<T>) => <D>(def: D) => (input: List<T>) => D|T} */
-const fold = op => def => input => last(def)(scan(foldToScan(op))(input))
+/** @type {<T>(op: operator.Reduce<T>) => <D>(def: D) => (input: List<T>) => D|T} */
+const reduce = op => def => input => last(def)(scan(reduceToScan(op))(input))
 
 
 /** @type {<T>(input: List<T>) => number} */
-const length = reduce(counter)(0)
+const length = fold(counter)(0)
 
 /**
  * @template T
@@ -285,7 +283,7 @@ const entries = input => {
 const reverseOperator = first => tail => ({ first, tail })
 
 /** @type {<T>(input: List<T>) => List<T>} */
-const reverse = reduce(reverseOperator)(undefined)
+const reverse = fold(reverseOperator)(undefined)
 
 /** @type {<A>(a: List<A>) => <B>(b: List<B>) => List<readonly[A, B]>} */
 const zip = a => b => () => {
@@ -361,12 +359,12 @@ module.exports = {
     /** @readonly */
     stateScan,
     /** @readonly */
-    reduceScan,
-    /** @readonly */
-    reduce,
+    foldScan,
     /** @readonly */
     fold,
     /** @readonly */
+    reduce,
+    /** @readonly */
     length,
     /** @readonly */
     entries,

package/types/list/test.f.cjs

@@ -1,7 +1,7 @@
 const _ = require('./module.f.cjs')
 const json = require('../../json/module.f.cjs')
 const { sort } = require('../object/module.f.cjs')
-const { addition, strictEqual, foldToScan } = require('../function/operator/module.f.cjs')
+const { addition, strictEqual, reduceToScan } = require('../function/operator/module.f.cjs')
 
 /** @type {(sequence: _.List<json.Unknown>) => string} */
 const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
@@ -94,18 +94,18 @@ const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
 }
 
 {
-    const op = foldToScan(addition)
+    const op = reduceToScan(addition)
     const result = stringify(_.scan(op)([2, 3, 4, 5]))
     if (result !== '[2,5,9,14]') { throw result }
 }
 
 {
-    const result = _.fold(addition)(undefined)([2, 3, 4, 5])
+    const result = _.reduce(addition)(undefined)([2, 3, 4, 5])
     if (result !== 14) { throw result }
 }
 
 {
-    const result = _.fold(addition)(undefined)([])
+    const result = _.reduce(addition)(undefined)([])
     if (result !== undefined) { throw result }
 }
 

package/types/map/module.f.cjs

@@ -6,7 +6,7 @@ const btreeSet = require('../btree/set/module.f.cjs').set
 const compare = require('../function/compare/module.f.cjs')
 const { cmp } = require('../string/module.f.cjs')
 const list = require('../list/module.f.cjs')
-const { reduce } = list
+const { fold } = list
 const { remove: btreeRemove } = require('../btree/remove/module.f.cjs')
 const operator = require('../function/operator/module.f.cjs')
 
@@ -37,11 +37,11 @@ const at = name => map => {
     return result === undefined ? undefined : result[1]
 }
 
-/** @type {<T>(o: operator.Fold<T>) => (entry: Entry<T>) => (map: Map<T>) => Map<T>} */
+/** @type {<T>(o: operator.Reduce<T>) => (entry: Entry<T>) => (map: Map<T>) => Map<T>} */
 const setUpdateEntry = o => entry => btreeSet(keyCmp(entry[0]))(old => old === undefined ? entry : [old[0], o(old[1])(entry[1])])
 
-/** @type {<T>(o: operator.Fold<T>) => (name: string) => (value: T) => (map: Map<T>) => Map<T>} */
-const setUpdate = o => name => value => setUpdateEntry(o)([name, value])
+/** @type {<T>(o: operator.Reduce<T>) => (name: string) => (value: T) => (map: Map<T>) => Map<T>} */
+const setReduce = o => name => value => setUpdateEntry(o)([name, value])
 
 /** @type {(name: string) => <T>(value: T) => (map: Map<T>) => Map<T>} */
 const setReplace = name => value => setUpdateEntry(replace)([name, value])
@@ -53,7 +53,7 @@ const entries = values
 const replace = () => b => b
 
 /** @type {<T>(entries: list.List<Entry<T>>) => Map<T>} */
-const fromEntries = reduce(setUpdateEntry(replace))(undefined)
+const fromEntries = fold(setUpdateEntry(replace))(undefined)
 
 /** @type {(name: string) => <T>(map: Map<T>) => Map<T>} */
 const remove =  name => btreeRemove(keyCmp(name))
@@ -64,7 +64,7 @@ module.exports = {
     /** @readonly */
     at,
     /** @readonly */
-    setUpdate,
+    setReduce,
     /** @readonly */
     setReplace,
     /** @readonly */

package/types/map/test.f.cjs

@@ -1,4 +1,4 @@
-const { at, setReplace, setUpdate, empty, entries, remove } = require('./module.f.cjs')
+const { at, setReplace, setReduce, empty, entries, remove } = require('./module.f.cjs')
 const seq = require('../list/module.f.cjs')
 
 {
@@ -41,7 +41,7 @@ const seq = require('../list/module.f.cjs')
     m = remove('Hello world!')(m)
     if (at('Hello world!')(m) !== undefined) { throw m }
 
-    m = setUpdate(a => b => a + b)('a')(43)(m)
+    m = setReduce(a => b => a + b)('a')(43)(m)
     if (at('a')(m) !== 44) { throw 'error' }
 }
 

package/types/module.f.cjs

@@ -16,7 +16,7 @@ module.exports = {
     /** @readonly */
     result: require('./result/module.f.cjs'),
     /** @readonly */
-    string_set: require('./string_set/module.f.cjs'),
+    stringset: require('./stringset/module.f.cjs'),
     /** @readonly */
     bigint: require('./bigint/module.f.cjs'),
     /** @readonly */

package/types/number/module.f.cjs

@@ -1,13 +1,13 @@
-const { fold } = require('../list/module.f.cjs')
+const { reduce } = require('../list/module.f.cjs')
 const { addition, min: minOp, max: maxOp } = require('../function/operator/module.f.cjs')
 const compare = require('../function/compare/module.f.cjs')
 const { unsafeCmp } = compare
 
-const sum = fold(addition)(0)
+const sum = reduce(addition)(0)
 
-const min = fold(minOp)(undefined)
+const min = reduce(minOp)(undefined)
 
-const max = fold(maxOp)(undefined)
+const max = reduce(maxOp)(undefined)
 
 /** @type {(a: number) => (b: number) => compare.Sign} */
 const cmp = unsafeCmp

package/types/string/module.f.cjs

@@ -1,17 +1,17 @@
 const list = require('../list/module.f.cjs')
-const { fold: listFold, repeat: listRepeat } = list
+const { reduce: listReduce, repeat: listRepeat } = list
 const { compose } = require('../function/module.f.cjs')
 const compare = require('../function/compare/module.f.cjs')
 const { unsafeCmp } = compare
 const op = require('../function/operator/module.f.cjs')
 const { join: joinOp, concat: concatOp } = op
 
-/** @type {(o: op.Fold<string>) => (input: list.List<string>) => string} */
-const fold = o => listFold(o)('')
+/** @type {(o: op.Reduce<string>) => (input: list.List<string>) => string} */
+const reduce = o => listReduce(o)('')
 
-const join = compose(joinOp)(fold)
+const join = compose(joinOp)(reduce)
 
-const concat = fold(concatOp)
+const concat = reduce(concatOp)
 
 /** @type {(n: string) => (v: number) => string} */
 const repeat = v => compose(listRepeat(v))(concat)

package/types/{string_set → stringset}/module.f.cjs

@@ -9,18 +9,21 @@ const {
 } = btree
 const { cmp } = require("../string/module.f.cjs")
 const list = require('../list/module.f.cjs')
-const { reduce } = list
+const { fold } = list
 const { compose } = require('../function/module.f.cjs')
 
 /** @typedef {btTypes.Tree<string>} StringSet */
 
 /** @type {(value: string) => (set: StringSet) => boolean} */
-const contains = value => s => s !== undefined && isFound(find(cmp(value))(s).first)
+const contains = value => {
+    const f = find(cmp(value))
+    return s => s !== undefined && isFound(f(s).first)
+}
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
 const set = value => btreeSet(cmp(value))(() => value)
 
-const fromValues = reduce(set)(undefined)
+const fromValues = fold(set)(undefined)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
 const remove = compose(cmp)(btreeRemove)