functionalscript 0.0.208 → 0.0.214

package/.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [sergey-shandar] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

package/function/index.js

@@ -5,7 +5,7 @@
  */
 
 /** @type {<X, O>(f: Func<X, O>) => <I>(g: Func<I, X>) => Func<I, O>} */
-const combine = f => g => x => f(g(x))
+const compose = f => g => x => f(g(x))
 
 /** @type {<T>(value: T) => T} */
 const id = value => value
@@ -14,5 +14,5 @@ module.exports = {
     /** @readonly */
     id,
     /** @readonly */
-    combine,
+    compose,
 }

package/json/index.js

@@ -1,9 +1,8 @@
 const seq = require('../sequence')
-const map = require('../map')
 const op = require('../sequence/operator')
 const object = require('../object')
 const array = require('../sequence/array')
-const { id } = require('../function')
+const { compose } = require('../function')
 
 /** 
  * @typedef {{
@@ -25,7 +24,7 @@ const addProperty = value => {
         const [name, tail] = result
         return { ...srcObject, [name]: f(tail)(object.at(name)(srcObject)) }
     }
-    return path => f(array.sequence(path))
+    return compose(f)(array.sequence)
 }
 
 /** @type {(_: string) => seq.Sequence<string>} */
@@ -84,16 +83,16 @@ const serialize = sort => {
         f(v))
     /** @type {(object: Object) => seq.Sequence<string>} */
     const objectSerialize = input => {
-        const _0 = object.entries(input)
-        const _1 = sort(_0)
-        const _2 = seq.map(propertySerialize)(_1)
-        return objectList(_2)
+        const entries = object.entries(input)
+        const sortedEntries = sort(entries)
+        const serializedEntries = seq.map(propertySerialize)(sortedEntries)
+        return objectList(serializedEntries)
     }
     /** @type {(input: Array) => seq.Sequence<string>} */
     const arraySerialize = input => {
-        const _0 = array.sequence(input)
-        const _1 = seq.map(f)(_0)
-        return arrayList(_1)
+        const sequence = array.sequence(input)
+        const serializedEntries = seq.map(f)(sequence)
+        return arrayList(serializedEntries)
     }
     /** @type {(value: Json) => seq.Sequence < string >} */
     const f = value => {

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 { 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.208",
+   "version": "0.0.214",
    "description": "FunctionalScript is a functional subset of JavaScript",
    "main": "index.js",
    "scripts": {

package/sequence/asyncIterable/index.js

@@ -1,4 +1,4 @@
-const { 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 { 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 => ({
@@ -265,6 +265,21 @@ const zip = a => b => () => {
     return [[resultA[0], resultB[0]], zip(resultA[1])(resultB[1])]
 }
 
+/** @type {<T>(s: Sequence<T>) => Sequence<T>} */
+const reverse = s => {
+    /** @type {typeof s} */
+    let iResult = empty
+    let iSource = s
+    while (true) {
+        const result = next(iSource)
+        if (result === undefined) { return iResult }
+        /** @type {typeof s} */
+        const old = iResult
+        iResult = () => [result[0], old]
+        iSource = result[1]
+    }
+}
+
 module.exports = {
     /** @readonly */
     next,
@@ -326,4 +341,6 @@ module.exports = {
     includes,
     /** @readonly */
     zip,
+    /** @readonly */
+    reverse,
 }

package/sequence/iterable/index.js

@@ -1,5 +1,4 @@
-const { iterable } = require('..')
-const { 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 { combine } = require('../../function')
+const { compose } = require('../../function')
 
 {
     const r = i.sum([120, 300, 42])
@@ -33,7 +33,7 @@ const { 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,7 +1,8 @@
 const seq = require('.')
 const { sum } = require('./operator')
-const op = require('./operator')
 const array = require('./array')
+const json = require('../json')
+const { id } = require('../function')
 
 /** @type {<T>(input: seq.Sequence<T>) => void} */
 const print = input => {
@@ -64,3 +65,10 @@ const print = input => {
     const x = seq.join(':')(seq.list("1", "2", "3", "4", "5", "6"))
     if (x !== "1:2:3:4:5:6") { throw x }
 }
+
+{
+    const r = seq.reverse(seq.list(1, 2, 3, 4))
+    const s = array.fromSequence(r)
+    const j = json.stringify(id)(s)
+    if (j !== '[4,3,2,1]') { throw j }
+}