functionalscript 0.0.395 → 0.0.399

package/com/types/module.f.cjs

@@ -66,7 +66,7 @@ const paramList = compose(entries)(filterParam)
 const result = v => f => fa => {
     const type = fa._
     return type === undefined ? v : f(type)
-} 
+}
 
 module.exports = {
     /** @readonly */

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.395",
+  "version": "0.0.399",
   "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.6",
     "typescript": "^4.7.4"
   }
 }

package/test.f.cjs

@@ -14,6 +14,7 @@ require('./commonjs/test.cjs')
 require('./commonjs/package/dependencies/test.f.cjs')
 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/option/test.f.cjs')

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

@@ -9,7 +9,7 @@ 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(stringCmp(value))(() => value)(node)
 
 /** @type {(r: _.Result<json.Unknown>) => string} */
 const str = r => jsonStr(list.toArray(list.map(x => x[0])(r)))

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

@@ -6,7 +6,7 @@ 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(stringCmp(value))(() => value)(node)
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string> | undefined} */
 const remove = node => value => _.nodeRemove(stringCmp(value))(node)

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

@@ -5,7 +5,7 @@ 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(stringCmp(value))(() => value)(node)
 
 const jsonStr = json.stringify(sort)
 

package/types/btree/test.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(stringCmp(value))(() => value)(node)
 
 {
     /** @type {btree.Node<string>} */

package/types/function/module.f.cjs

@@ -17,6 +17,20 @@ const identity = value => value
 /** @type {<A, B, C>(f: (a: A) => (b: B) => C) => (b: B) => (a: A) => C} */
 const flip = f => b => a => f(a)(b)
 
+/**
+ * @template I,O
+ * @typedef {{
+ *  readonly result: Func<I, O>
+ *  readonly then: <T>(g: Func<O, T>) => Fn<I, T>
+ * }} Fn
+ */
+
+/** @type {<I, O>(f: (i: I) => O) => Fn<I, O>} */
+const fn = result => ({
+    result,
+    then: g => fn(compose(result)(g))
+})
+
 module.exports = {
     /** @readonly */
     compare: require('./compare/module.f.cjs'),
@@ -28,4 +42,6 @@ module.exports = {
     compose,
     /** @readonly */
     flip,
+    /** @readonly */
+    fn,
 }

package/types/function/test.f.cjs

@@ -0,0 +1,17 @@
+const { fn } = require('./module.f.cjs')
+
+{
+    /** @type {(x: string) => readonly[string]} */
+    const f = x => [x]
+    /** @type {(x: readonly[string]) => readonly[number]} */
+    const g = ([x]) => [x.length]
+    /** @type {(x: readonly[number]) => number} */
+    const w = ([x]) => x
+
+    const r = fn(f).then(g).then(w).result
+
+    const result = r('hello')
+    if (result !== 5) { throw r }
+}
+
+module.exports = {}

package/types/map/module.f.cjs

@@ -8,6 +8,7 @@ const { stringCmp } = require('../function/compare/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 */
 
@@ -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/string_set/module.f.cjs

@@ -1,9 +1,9 @@
 const btTypes = require('../btree/types/module.f.cjs')
 const btree = require('../btree/module.f.cjs')
-const { 
+const {
     find: { find, isFound },
-    remove: { remove: btreeRemove }, 
-    set: { set: btreeSet }, 
+    remove: { remove: btreeRemove },
+    set: { set: btreeSet },
     /** @type {(s: StringSet) => list.List<string>} */
     values,
 } = btree
@@ -18,7 +18,7 @@ const { compose } = require('../function/module.f.cjs')
 const contains = value => s => s !== undefined && isFound(find(stringCmp(value))(s).first)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-const set = value => btreeSet(stringCmp(value))(value)
+const set = value => btreeSet(stringCmp(value))(() => value)
 
 const fromValues = reduce(set)(undefined)