functionalscript 0.0.163 → 0.0.164

package/async/iterable/index.js

@@ -1,4 +1,3 @@
-const { todo } = require('../../dev')
 const { pipe } = require('../../func')
 const mapReduce = require('../../map-reduce')
 
@@ -7,6 +6,12 @@ const mapReduce = require('../../map-reduce')
  * @typedef {Promise<T>|T} PromiseOrValue
  */
 
+/** 
+ * @template T
+ * @template R
+ * @typedef {(f: (value: T) => PromiseOrValue<R>) => (c: AsyncIterable<T>) => AsyncIterable<R>} Map
+ */
+
 /** @type {<T, R>(f: (value: T) => PromiseOrValue<R>) => (c: AsyncIterable<T>) => AsyncIterable<R>} */
 const map = f => c => ({
     async *[Symbol.asyncIterator]() {
@@ -45,7 +50,7 @@ const flatMap = f => pipe(map(f))(flatten)
  * @typedef {(accumulator: A) => (value: T) => PromiseOrValue<A>} Merge
  */
 
-/** @type {<A, T>(f: Merge<A, T>) => (init: A) => (c: AsyncIterable<T>) => Promise<A>} */
+/** @type {<A, T>(merge: Merge<A, T>) => (init: A) => (c: AsyncIterable<T>) => Promise<A>} */
 const reduce = merge => init => async c => {
     let result = init
     for await (const i of c) {
@@ -54,20 +59,20 @@ const reduce = merge => init => async c => {
     return result
 }
 
-/** @type {<A, T>(f: Merge<A, T>) => (init: A) => (c: AsyncIterable<T>) => AsyncIterable<A>} */
-const exclusiveScan = reduceFn => init => c => ({
+/** @type {<A, T>(merg: Merge<A, T>) => (init: A) => (c: AsyncIterable<T>) => AsyncIterable<A>} */
+const exclusiveScan = merge => init => c => ({
     async *[Symbol.asyncIterator]() {
         let result = init
         for await (const i of c) {
-            result = await reduceFn(result)(i)
+            result = await merge(result)(i)
             yield result
         }
     }
 })
 
-/** @type {<A, T>(f: Merge<A, T>) => (init: A) => (c: AsyncIterable<T>) => AsyncIterable<A>} */
-const inclusiveScan = reduceFn => init => {
-    const e = exclusiveScan(reduceFn)(init)
+/** @type {<A, T>(merge: Merge<A, T>) => (init: A) => (c: AsyncIterable<T>) => AsyncIterable<A>} */
+const inclusiveScan = merge => init => {
+    const e = exclusiveScan(merge)(init)
     return c => ({
         async *[Symbol.asyncIterator]() {
             yield init

package/func/index.js

@@ -1,12 +1,40 @@
-/** @type {<I, X>(_: (_: I) => X) => <O>(_: (_: X) => O) => (_: I) => O} */
+/** 
+ * @template I
+ * @template O
+ * @typedef {(_: I) => O} Func 
+ */
+
+/** @type {<X, O>(f: Func<X, O>) => <I>(g: Func<I, X>) => Func<I, O>} */
+const combine = f => g => x => f(g(x))
+
+/** @type {<I, X>(g: Func<I, X>) => <O>(g: Func<X, O>) => Func<I, O>} */
 const pipe = g => f => x => f(g(x))
 
 /** @type {<T>(value: T) => T} */
 const id = value => value
 
+/**
+ * @template I
+ * @template O
+ * @typedef {{
+ *  readonly pipe: <R>(f: Func<O, R>) => Pipe<I, R>
+ *  readonly call: Func<I, O>
+ * }} Pipe
+ */
+
+/** @type {<I, O>(f: Func<I, O>) => Pipe<I, O>} */
+const pipex = call => ({
+    pipe: f => pipex(pipe(call)(f)),
+    call,
+}) 
+
 module.exports = {
     /** @readonly */
     id,
     /** @readonly */
     pipe,
+    /** @readonly */
+    combine,
+    /** @readonly */
+    pipex,
 }

package/package.json

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