functionalscript 0.0.303 → 0.0.307

package/commonjs/path/index.js

@@ -21,18 +21,18 @@ const split = path => path.split('/')
 /** @typedef {readonly[list.List<string>] | undefined} OptionList */
 
 /** @type {(s: OptionList) => (items: string) => OptionList} */
-const normItemsOp = prior => item => {
+const normItemsOp = prior => first => {
     if (prior === undefined) { return undefined }
-    const priorList = prior[0]
-    switch (item) {
+    const tail = prior[0]
+    switch (first) {
         case '': case '.': { return prior }
         case '..': {
-            const result = list.next(priorList)
+            const result = list.next(tail)
             if (result === undefined) { return undefined }
             return [result.tail]
         }
         default: {
-            return [list.nonEmpty(item)(priorList)]
+            return [{ first, tail }]
         }
     }
 }

package/package.json

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

package/sha2/index.js

@@ -1,3 +1,5 @@
+const array = require('../types/array')
+
 /**
  * @typedef {{
  *  readonly f: (i: number) => number
@@ -5,12 +7,12 @@
  * }} HashInput
  */
 
-/** @typedef {Int32Array} Hash8 */
+/** @typedef {array.Array8<number>} Hash8 */
 
-/** @typedef {Int32Array} Array16 */
+/** @typedef {array.Array16<number>} Array16 */
 
 /** @type {(input: number) => (pos: number) => number} */
-const appendOne = input => pos => input | (1 << 31 - pos)
+const appendOneWithZeros = input => pos => (input >> pos << pos) | (1 << pos)
 
 /** @type {(input: number) => (pos: number) => number} */
 const mod = a => b => (a % b + b) % b
@@ -24,7 +26,7 @@ const padding = input => bitsCount => {
         i < appendBlockIndex ?
             input[i] :
         i === appendBlockIndex ?
-            (appendBlockIndex >= input.length ? 0x8000_0000 : appendOne(input[appendBlockIndex])(bitsCount % 32)) :
+            (appendBlockIndex >= input.length ? 0x8000_0000 : appendOneWithZeros(input[appendBlockIndex])(31 - bitsCount % 32)) :
         i === length - 2 ?
             (bitsCount / 0x1_0000_0000) | 0 :
         i === length - 1 ?
@@ -72,46 +74,59 @@ const smallSigma0 = smallSigma(7)(18)(3)
 const smallSigma1 = smallSigma(17)(19)(10)
 
 /** @type {Hash8} */
-const init256 = new Int32Array([0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19])
+const init256 = [0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19]
 
 /** @type {(input: readonly number[]) => (bitsCount: number) => Hash8} */
 const computeSha256 = input => bitsCount => compute(input)(bitsCount)(init256)
 
 /** @type {Hash8} */
-const init224 = new Int32Array([0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4])
+const init224 = [0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4]
 
 const k = [
-    new Int32Array([
+    [
         0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174]),
-    new Int32Array([
+        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174],
+    [
         0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967]),
-    new Int32Array([
+        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967],
+    [
         0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070]),
-    new Int32Array([
+        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070],
+    [
         0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2]),
+        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2],
 ];
 
 /** @type {(input: readonly number[]) => (bitsCount: number) => Hash8} */
 const computeSha224 = input => bitsCount => compute(input)(bitsCount)(init224)
 
+/** @type {(a: array.Array4<number>) => number} */
+const wi = a => (smallSigma1(a[0]) + a[1] + smallSigma0(a[2]) + a[3]) | 0
+
 /** @type {(input: Array16) => Array16} */
 const nextW = w => {
-    for (let t = 0; t < 16; t++) {
-        w[t] = smallSigma1(w[(t + 14) & 0xF]) + w[(t + 9) & 0xF] + smallSigma0(w[(t + 1) & 0xF]) + w[t]
-    }
-    return w
+    const _0 = wi([w[14], w[ 9], w[ 1], w[ 0]])
+    const _1 = wi([w[15], w[10], w[ 2], w[ 1]])
+    const _2 = wi([   _0, w[11], w[ 3], w[ 2]])
+    const _3 = wi([   _1, w[12], w[ 4], w[ 3]])
+    const _4 = wi([   _2, w[13], w[ 5], w[ 4]])
+    const _5 = wi([   _3, w[14], w[ 6], w[ 5]])
+    const _6 = wi([   _4, w[15], w[ 7], w[ 6]])
+    const _7 = wi([   _5,    _0, w[ 8], w[ 7]])
+    const _8 = wi([   _6,    _1, w[ 9], w[ 8]])
+    const _9 = wi([   _7,    _2, w[10], w[ 9]])
+    const _A = wi([   _8,    _3, w[11], w[10]])
+    const _B = wi([   _9,    _4, w[12], w[11]])
+    const _C = wi([   _A,    _5, w[13], w[12]])
+    const _D = wi([   _B,    _6, w[14], w[13]])
+    const _E = wi([   _C,    _7, w[15], w[14]])
+    const _F = wi([   _D,    _8,    _0, w[15]])
+    return [_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _A, _B, _C, _D, _E, _F]
 }
 
 /** @type {(init: Hash8) => (data: Array16) => Hash8} */
 const compress = init => data => {
-    let w = new Int32Array(16)
-    for (let t = 0; t < 16; t++) {
-        w[t] = data[t]
-    }
+    let w = data
 
     let a = init[0]
     let b = init[1]
@@ -139,16 +154,16 @@ const compress = init => data => {
         w = nextW(w)
     }
 
-    return new Int32Array([
-        init[0] + a,
-        init[1] + b,
-        init[2] + c,
-        init[3] + d,
-        init[4] + e,
-        init[5] + f,
-        init[6] + g,
-        init[7] + h,
-    ])
+    return [
+        (init[0] + a) | 0,
+        (init[1] + b) | 0,
+        (init[2] + c) | 0,
+        (init[3] + d) | 0,
+        (init[4] + e) | 0,
+        (init[5] + f) | 0,
+        (init[6] + g) | 0,
+        (init[7] + h) | 0,
+    ]
 }
 
 /** @type {(input: readonly number[]) => (bitsCount: number) => (init: Hash8) => Hash8} */
@@ -160,9 +175,9 @@ const compute = input => bitsCount => init => {
     const chunkCount = length / 16
     for (let i = 0; i < chunkCount; i++) {
         const s = i * 16
-        result = compress(result)(new Int32Array([
+        result = compress(result)([
             f(s + 0), f(s + 1), f(s + 2), f(s + 3), f(s + 4), f(s + 5), f(s + 6), f(s + 7),
-            f(s + 8), f(s + 9), f(s + 10), f(s + 11), f(s + 12), f(s + 13), f(s + 14), f(s + 15)]))
+            f(s + 8), f(s + 9), f(s + 10), f(s + 11), f(s + 12), f(s + 13), f(s + 14), f(s + 15)])
     }
 
     return result

package/sha2/test.js

@@ -34,20 +34,27 @@ const stringify = a => json.stringify(sort)(a)
 
 {
     const hash = _.computeSha256([])(0)
-    const result = stringify(Array.from(hash).map(toHexString))
+    const result = stringify(hash.map(toHexString))
     if (result !== '["e3b0c442","98fc1c14","9afbf4c8","996fb924","27ae41e4","649b934c","a495991b","7852b855"]') { throw result }
 }
 
 {
     const hash = _.computeSha224([])(0)
-    const result = stringify(Array.from(hash).map(toHexString))
+    const result = stringify(hash.map(toHexString))
     if (result !== '["d14a028c","2a3a2bc9","476102bb","288234c4","15a2b01f","828ea62a","c5b3e42f","bdd387cb"]') { throw result }
 }
 
 {
     //[0x68656C6C, 0x6F20776F, 0x726C6400] represents phrase 'hello world'
     const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C6400])(88)
-    const result = stringify(Array.from(hash).map(toHexString))
+    const result = stringify(hash.map(toHexString))
+    if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
+}
+
+{
+    //[0x68656C6C, 0x6F20776F, 0x726C6488] represents phrase 'hello world' with 1's at the end
+    const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C64FF])(88)
+    const result = stringify(hash.map(toHexString))
     if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
 }
 
@@ -60,7 +67,7 @@ const stringify = a => json.stringify(sort)(a)
 {
     const input = Array(16).fill(0x31313131)
     const hash = _.computeSha256(input)(512)
-    const result = stringify(Array.from(hash).map(toHexString))
+    const result = stringify(hash.map(toHexString))
     if (result !== '["3138bb9b","c78df27c","473ecfd1","410f7bd4","5ebac1f5","9cf3ff9c","fe4db77a","ab7aedd3"]') { throw result }
 }
 

package/types/array/index.js

@@ -57,6 +57,8 @@ const seq = require('../list')
  * @typedef {readonly[T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T]} Array16
  */
 
+/** @typedef {0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15} Index16 */
+
 /**
  * @template T
  * @typedef {Array1<T>| Array2<T> | Array3<T> | Array4<T> | Array5<T>} Array1_5

package/types/function/operator/index.js

@@ -13,6 +13,9 @@
 /** @type {(separator: string) => Fold<string>} */
 const join = separator => prior => value => `${prior}${separator}${value}`
 
+/** @type {Fold<string>} */
+const concat = a => b => `${a}${b}`
+
 /** @type {Fold<number>} */
 const addition = a => b => a + b
 
@@ -26,8 +29,8 @@ const addition = a => b => a + b
 const logicalNot = v => !v
 
 /**
- * @template T 
- * @typedef {Binary<T, T, boolean>} Equal 
+ * @template T
+ * @typedef {Binary<T, T, boolean>} Equal
  */
 
 /** @type {<T>(a: T) => (b: T) => boolean} */
@@ -93,4 +96,6 @@ module.exports = {
     foldToScan,
     /** @readonly */
     counter,
+    /** @readonly */
+    concat,
 }

package/types/list/index.js

@@ -44,14 +44,13 @@ const { logicalNot, strictEqual, stateScanToScan, reduceToScan, foldToScan } = r
  * }} Concat
  */
 
-/** @type {<T>(first: T) => (tail: List<T>) => NonEmpty<T>} */
-const nonEmpty = first => tail => ({ first, tail })
-
-/** @type {(i: number) => <T>(array: readonly T[]) => Result<T>} */
-const fromArrayAt = i => array => i < array.length ? nonEmpty(array[i])(() => fromArrayAt(i + 1)(array)) : undefined
-
 /** @type {<T>(array: readonly T[]) => Result<T>} */
-const fromArray = fromArrayAt(0)
+const fromArray = array => {
+    /** @typedef {typeof array extends readonly (infer T)[] ? T : never} T */
+    /** @type {(i: number) => Result<T>} */
+    const at = i => i < array.length ? { first: array[i], tail: () => at(i + 1) } : undefined
+    return at(0)
+}
 
 /** @type {<T>(a: List<T>) => (b: List<T>) => List<T>} */
 const concat = a => b => b === undefined ? a : ({ isConcat: true, a, b })
@@ -78,7 +77,7 @@ const next = list => {
         }
 
         if (a !== undefined) {
-            return nonEmpty(a.first)(concat(a.tail)(b))
+            return { first: a.first, tail: concat(a.tail)(b) }
         }
 
         if (b === undefined) { return undefined }
@@ -120,7 +119,7 @@ const flatStep = n => concat(n.first)(flat(n.tail))
 const flat = apply(flatStep)
 
 /** @type {<I, O>(f: (value: I) => O) => (n: NonEmpty<I>) => List<O>} */
-const mapStep = f => n => nonEmpty(f(n.first))(map(f)(n.tail))
+const mapStep = f => n => ({ first: f(n.first), tail: map(f)(n.tail) })
 
 /** @type {<I, O>(f: (value: I) => O) => (input: List<I>) => List<O>} */
 const map = f => apply(mapStep(f))
@@ -131,7 +130,7 @@ const flatMap = f => compose(map(f))(flat)
 /** @type {<T>(f: (value: T) => boolean) => (n: NonEmpty<T>) => List<T>} */
 const filterStep = f => n => {
     const tail = filter(f)(n.tail)
-    return f(n.first) ? nonEmpty(n.first)(tail) : tail
+    return f(n.first) ? { first: n.first, tail } : tail
 }
 
 /** @type {<T>(f: (value: T) => boolean) => (input: List<T>) => List<T>} */
@@ -140,20 +139,20 @@ const filter = f => apply(filterStep(f))
 /** @type {<I, O>(f: (value: I) => O|undefined) => (n: NonEmpty<I>) => List<O>} */
 const filterMapStep = f => n => {
     const [first, tail] = [f(n.first), filterMap(f)(n.tail)]
-    return first === undefined ? tail : nonEmpty(first)(tail)
+    return first === undefined ? tail : { first, tail }
 }
 
 /** @type {<I, O>(f: (value: I) => O|undefined) => (input: List<I>) => List<O>} */
 const filterMap = f => apply(filterMapStep(f))
 
 /** @type {<T>(f: (value: T) => boolean) => (n: NonEmpty<T>) => List<T>} */
-const takeWhileStep = f => n => f(n.first) ? nonEmpty(n.first)(takeWhile(f)(n.tail)) : undefined
+const takeWhileStep = f => n => f(n.first) ? { first: n.first, tail: takeWhile(f)(n.tail) } : undefined
 
 /** @type {<T>(f: (value: T) => boolean) => (input: List<T>) => List<T>} */
 const takeWhile = f => apply(takeWhileStep(f))
 
 /** @type {(n: number) => <T>(result: NonEmpty<T>) => List<T>} */
-const takeStep = n => ne => 0 < n ? nonEmpty(ne.first)(take(n - 1)(ne.tail)) : undefined
+const takeStep = n => ne => 0 < n ? { first: ne.first, tail: take(n - 1)(ne.tail) } : undefined
 
 /** @type {(n: number) => <T>(input: List<T>) => List<T>} */
 const take = n => apply(takeStep(n))
@@ -177,10 +176,11 @@ const first = def => input => {
     return result.first
 }
 
-/** @type {<D>(def: D) => <T>(input: List<T>) => D|T} */
-const last = def => input => {
-    /** @typedef {typeof input extends List<infer T> ? T : never} T */
-    let i = nonEmpty(/** @type {(typeof def)|T} */(def))(input)
+/** @type {<D>(first: D) => <T>(tail: List<T>) => D|T} */
+const last = first => tail => {
+    /** @typedef {typeof tail extends List<infer T> ? T : never} T */
+    /** @type {NonEmpty<typeof first|T>} */
+    let i = { first, tail }
     while (true) {
         const result = next(i.tail)
         if (result === undefined) {
@@ -212,19 +212,19 @@ const includes = value => input => some(map(strictEqual(value))(input))
 const countdown = count => () => {
     if (count <= 0) { return undefined }
     const first = count - 1
-    return nonEmpty(first)(countdown(first))
+    return { first, tail: countdown(first) }
 }
 
 /** @type {<T>(list: List<T>) => List<T>} */
 const cycle = list => () => {
     const i = next(list)
-    return i === undefined ? undefined : nonEmpty(i.first)(concat(i.tail)(cycle(list)))
+    return i === undefined ? undefined : { first: i.first, tail: concat(i.tail)(cycle(list)) }
 }
 
 /** @type {<I, O>(op: operator.Scan<I, O>) => (ne: NonEmpty<I>) => List<O>} */
 const scanStep = op => ne => {
-    const [o, newOp] = op(ne.first)
-    return nonEmpty(o)(scan(newOp)(ne.tail))
+    const [first, newOp] = op(ne.first)
+    return { first, tail: scan(newOp)(ne.tail) }
 }
 
 /** @type {<I, O>(op: operator.Scan<I, O>) => (input: List<I>) => List<O>} */
@@ -263,13 +263,13 @@ const length = reduce(operator.counter)(0)
 const entryOperator = index => value => [[index, value], index + 1]
 
 /** @type {<T>(input: List<T>) => List<Entry<T>>} */
-const entries = (input) => {
+const entries = input => {
     /** @typedef {typeof input extends List<infer T> ? T : never} T */
     return stateScan(/** @type {operator.StateScan<T, Number, Entry<T>>} */(entryOperator))(0)(input)
 }
 
 /** @type {<T>(prior: List<T>) => (value: T) => List<T>} */
-const reverseOperator = prior => value => nonEmpty(value)(prior)
+const reverseOperator = tail => first => ({ first, tail })
 
 /** @type {<T>(input: List<T>) => List<T>} */
 const reverse = reduce(reverseOperator)(undefined)
@@ -283,26 +283,36 @@ const zip = a => b => () => {
     if (aResult === undefined) { return undefined }
     const bResult = next(b)
     if (bResult === undefined) { return undefined }
-    return nonEmpty(tuple2(aResult.first)(bResult.first))(zip(aResult.tail)(bResult.tail))
+    return { first: tuple2(aResult.first)(bResult.first), tail: zip(aResult.tail)(bResult.tail) }
 }
 
 /** @type {<T>(e: operator.Equal<T>) => (a: List<T>) => (b: List<T>) => List<boolean>} */
 const equalZip = e => a => b => () => {
     const [aResult, bResult] = [next(a), next(b)]
     return aResult === undefined || bResult === undefined
-        ? nonEmpty(aResult === bResult)(undefined)
-        : nonEmpty(e(aResult.first)(bResult.first))(equalZip(e)(aResult.tail)(bResult.tail))
+        ? { first: aResult === bResult, tail: undefined }
+        : { first: e(aResult.first)(bResult.first), tail: equalZip(e)(aResult.tail)(bResult.tail) }
 }
 
 /** @type {<T>(e: operator.Equal<T>) => (a: List<T>) => (b: List<T>) => boolean} */
 const equal = e => a => b => every(equalZip(e)(a)(b))
 
+/** @type {(s: string) => List<number>} */
+const toCharCodes = s => {
+    /** @type {(i: number) => Result<number>} */
+    const at = i => {
+        const first = s.charCodeAt(i)
+        return isNaN(first) ? undefined : { first, tail: () => at(i + 1) }
+    }
+    return at(0)
+}
+
+const fromCharCodes = compose(map(String.fromCharCode))(fold(operator.concat)(''))
+
 module.exports = {
     /** @readonly */
     empty: undefined,
     /** @readonly */
-    nonEmpty,
-    /** @readonly */
     concat,
     /** @readonly */
     next,
@@ -374,4 +384,8 @@ module.exports = {
     zip,
     /** @readonly */
     equal,
+    /** @readonly */
+    toCharCodes,
+    /** @readonly */
+    fromCharCodes,
 }

package/types/list/test.js

@@ -234,6 +234,12 @@ const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
     if (result !== false) { throw result }
 }
 
+{
+    const r = _.toCharCodes("Hello world!")
+    const x = _.fromCharCodes(r)
+    if (x !== "Hello world!") { throw x }
+}
+
 // stress tests
 
 const stress = () => {