functionalscript 0.0.210 → 0.0.211

package/json/index.js

@@ -2,7 +2,7 @@ const seq = require('../sequence')
 const op = require('../sequence/operator')
 const object = require('../object')
 const array = require('../sequence/array')
-const { compose: combine } = require('../function')
+const { compose } = require('../function')
 
 /** 
  * @typedef {{
@@ -24,7 +24,7 @@ const addProperty = value => {
         const [name, tail] = result
         return { ...srcObject, [name]: f(tail)(object.at(name)(srcObject)) }
     }
-    return combine(f)(array.sequence)
+    return compose(f)(array.sequence)
 }
 
 /** @type {(_: string) => seq.Sequence<string>} */

package/map/index.js

@@ -2,7 +2,6 @@ const option = require("../option")
 const { getVisitor, setVisitor, values } = require("../btree")
 const { cmp } = require("../cmp")
 const seq = require("../sequence")
-const op = require("../sequence/operator")
 
 /** @typedef {import("../cmp").Sign} Sign */
 

package/module-manager/index.js

@@ -1,5 +1,5 @@
 const array = require('../sequence/array')
-const { compose: combine } = require('../function')
+const { compose } = require('../function')
 const option = require('../option')
 const { head, last, splitLast, splitFirst } = array
 const iter = require('../sequence/iterable')
@@ -88,7 +88,7 @@ const external = packages => {
     const defined = ([first, tail]) => externalOrInternal(packages(first))(tail)
     /** @type {(_: Path) => readonly [string, Path]|undefined} */
     const sf = splitFirst
-    return combine
+    return compose
         (option.map(defined))
         (sf)        
 }

package/package.json

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

package/sequence/asyncIterable/index.js

@@ -1,4 +1,4 @@
-const { compose: combine } = require('../../function')
+const { compose } = require('../../function')
 const seq = require('../operator')
 
 /**
@@ -69,7 +69,7 @@ const reduce = ([first, s]) => async c => {
 
 const sum = reduce(seq.sum)
 
-const join = combine(reduce)(seq.join)
+const join = compose(reduce)(seq.join)
 
 const length = reduce(seq.length)
 

package/sequence/index.js

@@ -1,5 +1,5 @@
 const seqOp = require('./operator')
-const { compose: combine } = require('../function')
+const { compose } = require('../function')
 const op = require('../function/operator')
 const { logicalNot, strictEqual } = require('../function/operator')
 
@@ -228,7 +228,7 @@ const some = f => input => find(x => x)(map(f)(input)) !== undefined
 const includes = value => some(strictEqual(value))
 
 /** @type {<T>(f: (value: T) => boolean) => SequenceReduce<T, boolean>} */
-const every = f => input => !some(combine(logicalNot)(f))(input)
+const every = f => input => !some(compose(logicalNot)(f))(input)
 
 /** @type {<T>(list: Sequence<T>) => Iterable<T>} */
 const iterable = list => ({

package/sequence/iterable/index.js

@@ -1,5 +1,4 @@
-const { iterable } = require('..')
-const { compose: combine } = require('../../function')
+const { compose } = require('../../function')
 const seq = require('../operator')
 
 /** @type {<T>(a: Iterable<T>) => (b: Iterable<T>) => Iterable<T>} */
@@ -40,7 +39,7 @@ const sum = reduce(seq.sum)
 
 const length = reduce(seq.length)
 
-const join = combine(reduce)(seq.join)
+const join = compose(reduce)(seq.join)
 
 /** @type {<T, R>(f: (value: T) => Iterable<R>) => (c: Iterable<T>) => Iterable<R>} */
 const flatMap = f => c => ({

package/sequence/iterable/test.js

@@ -1,5 +1,5 @@
 const i = require('.')
-const { compose: combine } = require('../../function')
+const { compose } = require('../../function')
 
 {
     const r = i.sum([120, 300, 42])
@@ -33,7 +33,7 @@ const { compose: combine } = require('../../function')
     /** @type {(_: string) => string|undefined} */
     const file = _ => 'x'
     /** @type {(_: string) => string|undefined} */
-    const x = p => combine
+    const x = p => compose
         (i.find(x => x !== undefined))
         (i.map(x => file(x())))        
         ([() => p, () => `${p}.js`, () => `${p}/index.js`])

package/sequence/test.js

@@ -1,6 +1,5 @@
 const seq = require('.')
 const { sum } = require('./operator')
-const op = require('./operator')
 const array = require('./array')
 
 /** @type {<T>(input: seq.Sequence<T>) => void} */