functionalscript 0.0.396 → 0.0.400

package/commonjs/build/module.f.cjs

@@ -3,7 +3,7 @@ const module_ = require('../module/module.f.cjs')
 const { idToString, dir } = module_
 const function_ = require('../module/function/module.f.cjs')
 const map = require('../../types/map/module.f.cjs')
-const { set: mapSet } = map
+const { setReplace } = map
 const object = require('../../types/object/module.f.cjs')
 const { fromMap } = object
 const path = require('../path/module.f.cjs')
@@ -62,11 +62,11 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
             const rIdStr = idToString(r.id)
             if (setContains(rIdStr)(buildSet1)) { return error('circular reference') }
             const [state, m1] = build(buildSet1)(r.id)(r.source)(m)
-            return [state[0] === 'error' ? state : ['ok', state[1].exports], [mapSet(p)(rIdStr)(requireMap), m1]]
+            return [state[0] === 'error' ? state : ['ok', state[1].exports], [setReplace(p)(rIdStr)(requireMap), m1]]
         }
         return source => moduleMap => {
             /** @type {(s: module_.State) => (m: M) => Result<M>} */
-            const set = s => m => [s, moduleMapInterface.set(moduleIdStr)(s)(m)]
+            const set = s => m => [s, moduleMapInterface.setReplace(moduleIdStr)(s)(m)]
             /** @type {(e: module_.Error) => (m: M) => Result<M>} */
             const error = e => set(['error', e])
             // check compilation

package/commonjs/module/module.f.cjs

@@ -4,7 +4,7 @@ const object = require('../../types/object/module.f.cjs')
  * @template M
  * @typedef {{
  *  readonly at: (moduleId: string) => (moduleMap: M) => State | undefined
- *  readonly set: (moduleId: string) => (moduleState: State) => (moduleMap: M) => M
+ *  readonly setReplace: (moduleId: string) => (moduleState: State) => (moduleMap: M) => M
  * }} MapInterface
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.396",
+  "version": "0.0.400",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^18.6.3",
+    "@types/node": "^18.7.8",
     "typescript": "^4.7.4"
   }
 }

package/types/bigint/module.f.cjs

@@ -6,5 +6,8 @@ const addition = a => b => a + b
 const sum = fold(addition)(0n)
 
 module.exports = {
+    /** @readonly */
+    addition,
+    /** @readonly */
     sum,
 }

package/types/btree/find/test.f.cjs

@@ -3,19 +3,19 @@ const list = require('../../list/module.f.cjs')
 const json = require('../../../json/module.f.cjs')
 const { sort } = require('../../object/module.f.cjs')
 const btree = require('../types/module.f.cjs')
-const { stringCmp } = require('../../function/compare/module.f.cjs')
+const { cmp } = require('../../string/module.f.cjs')
 const s = require('../set/module.f.cjs')
 
 const jsonStr = json.stringify(sort)
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
-const set = node => value => s.set(stringCmp(value))(value)(node)
+const set = node => value => s.set(cmp(value))(() => value)(node)
 
 /** @type {(r: _.Result<json.Unknown>) => string} */
 const str = r => jsonStr(list.toArray(list.map(x => x[0])(r)))
 
 /** @type {(i: string) => (m: btree.Node<string>) => string} */
-const find = i => m => str(_.find(stringCmp(i))(m))
+const find = i => m => str(_.find(cmp(i))(m))
 
 {
     /** @type {btree.Node<string>} */

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

@@ -1,15 +1,15 @@
 const _ = require('./module.f.cjs')
 const btree = require('../types/module.f.cjs')
 const s = require('../set/module.f.cjs')
-const { stringCmp } = require('../../function/compare/module.f.cjs')
+const { cmp } = require('../../string/module.f.cjs')
 const json = require('../../../json/module.f.cjs')
 const { sort } = require('../../object/module.f.cjs')
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
-const set = node => value => s.set(stringCmp(value))(value)(node)
+const set = node => value => s.set(cmp(value))(() => value)(node)
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string> | undefined} */
-const remove = node => value => _.nodeRemove(stringCmp(value))(node)
+const remove = node => value => _.nodeRemove(cmp(value))(node)
 
 const jsonStr = json.stringify(sort)
 

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

@@ -36,16 +36,17 @@ const reduceOp = ([i, x]) => a => {
 
 const reduceBranch = reduce(reduceOp)
 
-/** @type {<T>(c: cmp.Compare<T>) => (value: T) => (node: _.Node<T>) => _.Node<T>} */
-const nodeSet = c => value => node => {
+/** @type {<T>(c: cmp.Compare<T>) => (g: (value?: T) => T) => (node: _.Node<T>) => _.Node<T>} */
+const nodeSet = c => g => node => {
     const { first, tail } = find(c)(node)
     const [i, x] = first;
-    /** @typedef {typeof value} T */
+    /** @typedef {typeof c extends cmp.Compare<infer T> ? T : never} T */
     /** @type {() => Branch1To3<T>} */
     const f = () => {
         switch (i) {
             case 0: {
                 // insert
+                const value = g()
                 switch (x.length) {
                     case 1: { return [[value, x[0]]] }
                     case 2: { return [[value], x[0], [x[1]]] }
@@ -54,14 +55,15 @@ const nodeSet = c => value => node => {
             case 1: {
                 // replace
                 switch (x.length) {
-                    case 1: { return [[value]] }
-                    case 2: { return [[value, x[1]]] }
-                    case 3: { return [[x[0], value, x[2]]] }
-                    case 5: { return [[x[0], value, x[2], x[3], x[4]]] }
+                    case 1: { return [[g(x[0])]] }
+                    case 2: { return [[g(x[0]), x[1]]] }
+                    case 3: { return [[x[0], g(x[1]), x[2]]] }
+                    case 5: { return [[x[0], g(x[1]), x[2], x[3], x[4]]] }
                 }
             }
             case 2: {
                 // insert
+                const value = g()
                 switch (x.length) {
                     case 1: { return [[x[0], value]] }
                     case 2: { return [[x[0]], value, [x[1]]] }
@@ -70,14 +72,14 @@ const nodeSet = c => value => node => {
             case 3: {
                 // replace
                 switch (x.length) {
-                    case 2: { return [[x[0], value]] }
-                    case 5: { return [[x[0], x[1], x[2], value, x[4]]]}
+                    case 2: { return [[x[0], g(x[1])]] }
+                    case 5: { return [[x[0], x[1], x[2], g(x[3]), x[4]]]}
                 }
             }
             case 4: {
                 // insert
                 const [v0, v1] = x;
-                return [[v0], v1, [value]]
+                return [[v0], v1, [g()]]
             }
         }
     }
@@ -85,8 +87,8 @@ const nodeSet = c => value => node => {
     return r.length === 1 ? r[0] : r
 }
 
-/** @type {<T>(c: cmp.Compare<T>) => (value: T) => (tree: _.Tree<T>) => _.Node<T>} */
-const set = c => value => tree => tree === undefined ? [value] : nodeSet(c)(value)(tree)
+/** @type {<T>(c: cmp.Compare<T>) => (f: (value?: T) => T) => (tree: _.Tree<T>) => _.Node<T>} */
+const set = c => f => tree => tree === undefined ? [f()] : nodeSet(c)(f)(tree)
 
 module.exports = {
     /** @readonly */

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

@@ -1,11 +1,11 @@
 const _ = require('./module.f.cjs')
 const btree = require('../types/module.f.cjs')
-const { stringCmp } = require('../../function/compare/module.f.cjs')
+const { cmp } = require('../../string/module.f.cjs')
 const json = require('../../../json/module.f.cjs')
 const { sort } = require('../../object/module.f.cjs')
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
-const set = node => value => _.set(stringCmp(value))(value)(node)
+const set = node => value => _.set(cmp(value))(() => value)(node)
 
 const jsonStr = json.stringify(sort)
 

package/types/btree/test.f.cjs

@@ -2,7 +2,7 @@ const btree = require('./types/module.f.cjs')
 const { values } = require('./module.f.cjs')
 const json = require('../../json/module.f.cjs')
 const { sort } = require('../object/module.f.cjs')
-const { stringCmp } = require('../function/compare/module.f.cjs')
+const { cmp } = require('../string/module.f.cjs')
 const list = require('../list/module.f.cjs')
 const s = require('./set/module.f.cjs')
 const f = require('./find/module.f.cjs')
@@ -17,7 +17,7 @@ const jsonStr = json.stringify(sort)
 const stringify = sequence => jsonStr(list.toArray(sequence))
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
-const set = node => value => s.set(stringCmp(value))(value)(node)
+const set = node => value => s.set(cmp(value))(() => value)(node)
 
 {
     /** @type {btree.Node<string>} */
@@ -45,7 +45,7 @@ const set = node => value => s.set(stringCmp(value))(value)(node)
     let _map = ['a']
     _map = set(_map)('b')
     _map = set(_map)('c')
-    const result = f.value(f.find(stringCmp('b'))(_map).first)
+    const result = f.value(f.find(cmp('b'))(_map).first)
     if (result !== 'b') { throw result }
 }
 
@@ -54,7 +54,7 @@ const set = node => value => s.set(stringCmp(value))(value)(node)
     let _map = ['a']
     _map = set(_map)('b')
     _map = set(_map)('c')
-    const result = f.value(f.find(stringCmp('e'))(_map).first)
+    const result = f.value(f.find(cmp('e'))(_map).first)
     if (result !== undefined) { throw result }
 }
 

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

@@ -27,19 +27,11 @@ const index5 = cmp => ([v0, v1]) => {
 /** @type {<T>(a: T) => (b: T) => Sign} */
 const unsafeCmp = a => b => a < b ? -1 : a === b ? 0 : 1
 
-/** @type {(a: string) => (b: string) => Sign} */
-const stringCmp = unsafeCmp
-
-/** @type {(a: number) => (b: number) => Sign} */
-const numberCmp = unsafeCmp
-
 module.exports = {
+    /** @readonly */
+    unsafeCmp,
     /** @readonly */
     index3,
     /** @readonly */
     index5,
-    /** @readonly */
-    stringCmp,
-    /** @readonly */
-    numberCmp,
 }

package/types/function/compare/test.f.cjs

@@ -1,13 +1,8 @@
-const _ = require('./module.f.cjs')
+const { unsafeCmp } = require('./module.f.cjs')
 
 {
-    const result = _.numberCmp(4)(5)
-    if (result !== -1) { throw result }
-}
-
-{
-    const result = _.stringCmp('3')('4')
-    if (result !== -1) { throw result }
+    const result = unsafeCmp(true)(false)
+    if (result !== 1) { throw result }
 }
 
 module.exports = {}

package/types/map/module.f.cjs

@@ -4,10 +4,11 @@ const btreeFind = require('../btree/find/module.f.cjs')
 const { value, find } = btreeFind
 const btreeSet = require('../btree/set/module.f.cjs').set
 const compare = require('../function/compare/module.f.cjs')
-const { stringCmp } = require('../function/compare/module.f.cjs')
+const { cmp } = require('../string/module.f.cjs')
 const list = require('../list/module.f.cjs')
 const { reduce } = list
 const { remove: btreeRemove } = require('../btree/remove/module.f.cjs')
+const operator = require('../function/operator/module.f.cjs')
 
 /** @typedef {compare.Sign} Sign */
 
@@ -27,7 +28,7 @@ const { remove: btreeRemove } = require('../btree/remove/module.f.cjs')
  */
 
 /** @type {(a: string) => <T>(b: Entry<T>) => Sign} */
-const keyCmp = a => ([b]) => stringCmp(a)(b)
+const keyCmp = a => ([b]) => cmp(a)(b)
 
 /** @type {(name: string) => <T>(map: Map<T>) => T|undefined} */
 const at = name => map => {
@@ -36,17 +37,23 @@ const at = name => map => {
     return result === undefined ? undefined : result[1]
 }
 
-/** @type {<T>(entry: Entry<T>) => (map: Map<T>) => Map<T>} */
-const setEntry = entry => btreeSet(keyCmp(entry[0]))(entry)
+/** @type {<T>(o: operator.Fold<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 {(name: string) => <T>(value: T) => (map: Map<T>) => Map<T>} */
-const set = name => value => setEntry([name, value])
+const setReplace = name => value => setUpdateEntry(replace)([name, value])
 
 /** @type {<T>(map: Map<T>) => list.List<Entry<T>>} */
 const entries = values
 
+/** @type {<T>(a: T) => (b: T) => T} */
+const replace = () => b => b
+
 /** @type {<T>(entries: list.List<Entry<T>>) => Map<T>} */
-const fromEntries = reduce(setEntry)(undefined)
+const fromEntries = reduce(setUpdateEntry(replace))(undefined)
 
 /** @type {(name: string) => <T>(map: Map<T>) => Map<T>} */
 const remove =  name => btreeRemove(keyCmp(name))
@@ -57,7 +64,9 @@ module.exports = {
     /** @readonly */
     at,
     /** @readonly */
-    set,
+    setUpdate,
+    /** @readonly */
+    setReplace,
     /** @readonly */
     entries,
     /** @readonly */

package/types/map/test.f.cjs

@@ -1,26 +1,26 @@
-const { at, set, empty, entries, remove } = require('./module.f.cjs')
+const { at, setReplace, setUpdate, empty, entries, remove } = require('./module.f.cjs')
 const seq = require('../list/module.f.cjs')
 
 {
-    let m = set('a')(1)(undefined)
+    let m = setReplace('a')(1)(undefined)
 
     if (at('a')(m) !== 1) { throw 'error' }
     if (at('b')(m) !== undefined) { throw 'error' }
 
-    m = set('b')(2)(m)
+    m = setReplace('b')(2)(m)
 
     if (at('a')(m) !== 1) { throw 'error' }
     if (at('b')(m) !== 2) { throw 'error' }
     if (at('c')(m) !== undefined) { throw 'error' }
 
-    m = set('z')(3)(m)
+    m = setReplace('z')(3)(m)
 
     if (at('a')(m) !== 1) { throw 'error' }
     if (at('b')(m) !== 2) { throw 'error' }
     if (at('z')(m) !== 3) { throw 'error' }
     if (at('')(m) !== undefined) { throw 'error' }
 
-    m = set('')(4)(m)
+    m = setReplace('')(4)(m)
 
     if (at('a')(m) !== 1) { throw 'error' }
     if (at('b')(m) !== 2) { throw 'error' }
@@ -28,7 +28,7 @@ const seq = require('../list/module.f.cjs')
     if (at('')(m) !== 4) { throw 'error' }
     if (at('Hello world!')(m) !== undefined) { throw 'error' }
 
-    m = set('Hello world!')(42)(m)
+    m = setReplace('Hello world!')(42)(m)
 
     if (at('a')(m) !== 1) { throw 'error' }
     if (at('b')(m) !== 2) { throw 'error' }
@@ -40,11 +40,14 @@ const seq = require('../list/module.f.cjs')
     // console.log(Array.from(m.entries()))
     m = remove('Hello world!')(m)
     if (at('Hello world!')(m) !== undefined) { throw m }
+
+    m = setUpdate(a => b => a + b)('a')(43)(m)
+    if (at('a')(m) !== 44) { throw 'error' }
 }
 
 {
-    let m = set('x')(12)(undefined)
-    m = set('y')(44)(m)
+    let m = setReplace('x')(12)(undefined)
+    m = setReplace('y')(44)(m)
     if (at('x')(m) !== 12) { throw 'error' }
     if (at('y')(m) !== 44) { throw 'error' }
     if (at('a')(m) !== undefined) { throw 'error' }
@@ -56,7 +59,7 @@ const seq = require('../list/module.f.cjs')
     /** @type {import('./module.f.cjs').Map<number>} */
     let m = empty
     for (let i = 0; i < 100_000; ++i) {
-        m = set((i * i).toString())(i)(m)
+        m = setReplace((i * i).toString())(i)(m)
         /*
         console.log()
         console.log(`# ${i}`)

package/types/number/module.f.cjs

@@ -1,5 +1,7 @@
 const { fold } = 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)
 
@@ -7,6 +9,9 @@ const min = fold(minOp)(undefined)
 
 const max = fold(maxOp)(undefined)
 
+/** @type {(a: number) => (b: number) => compare.Sign} */
+const cmp = unsafeCmp
+
 module.exports = {
     /** @readonly */
     sum,
@@ -14,4 +19,6 @@ module.exports = {
     min,
     /** @readonly */
     max,
+    /** @readonly */
+    cmp,
 }

package/types/number/test.f.cjs

@@ -1,4 +1,4 @@
-const { sum, min, max } = require('./module.f.cjs')
+const { sum, min, max, cmp } = require('./module.f.cjs')
 
 {
     const result = sum([2, 3, 4, 5])
@@ -20,4 +20,9 @@ const { sum, min, max } = require('./module.f.cjs')
     if (result !== 12) { throw result }
 }
 
+{
+    const result = cmp(4)(5)
+    if (result !== -1) { throw result }
+}
+
 module.exports = {}

package/types/string/module.f.cjs

@@ -1,6 +1,8 @@
 const list = require('../list/module.f.cjs')
 const { fold: listFold, 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
 
@@ -14,6 +16,9 @@ const concat = fold(concatOp)
 /** @type {(n: string) => (v: number) => string} */
 const repeat = v => compose(listRepeat(v))(concat)
 
+/** @type {(a: string) => (b: string) => compare.Sign} */
+const cmp = unsafeCmp
+
 module.exports = {
     /** @readonly */
     join,
@@ -21,4 +26,6 @@ module.exports = {
     concat,
     /** @readonly */
     repeat,
+    /** @readonly */
+    cmp,
 }

package/types/string/test.f.cjs

@@ -1,4 +1,4 @@
-const { join, concat, repeat } = require('./module.f.cjs')
+const { join, concat, repeat, cmp } = require('./module.f.cjs')
 const { repeat: repeatList } = require('../list/module.f.cjs')
 
 {
@@ -36,4 +36,9 @@ const { repeat: repeatList } = require('../list/module.f.cjs')
     if (s != 'xxxxx') { throw s }
 }
 
+{
+    const result = cmp('3')('4')
+    if (result !== -1) { throw result }
+}
+
 module.exports = {}

package/types/string_set/module.f.cjs

@@ -7,7 +7,7 @@ const {
     /** @type {(s: StringSet) => list.List<string>} */
     values,
 } = btree
-const { stringCmp } = require("../function/compare/module.f.cjs")
+const { cmp } = require("../string/module.f.cjs")
 const list = require('../list/module.f.cjs')
 const { reduce } = list
 const { compose } = require('../function/module.f.cjs')
@@ -15,15 +15,15 @@ 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(stringCmp(value))(s).first)
+const contains = value => s => s !== undefined && isFound(find(cmp(value))(s).first)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-const set = value => btreeSet(stringCmp(value))(value)
+const set = value => btreeSet(cmp(value))(() => value)
 
 const fromValues = reduce(set)(undefined)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-const remove = compose(stringCmp)(btreeRemove)
+const remove = compose(cmp)(btreeRemove)
 
 module.exports = {
     /** @readonly */