functionalscript 0.0.298 → 0.0.302

package/package.json

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

package/sha2/index.js

@@ -0,0 +1,178 @@
+/**
+ * @typedef {{
+ *  readonly f: (i: number) => number
+ *  readonly length: number
+ * }} HashInput
+ */
+
+/** @typedef {Int32Array} Hash8 */
+
+/** @typedef {Int32Array} Array16 */
+
+/** @type {(input: number) => (pos: number) => number} */
+const appendOne = input => pos => input | (1 << 31 - pos)
+
+/** @type {(input: number) => (pos: number) => number} */
+const mod = a => b => (a % b + b) % b
+
+/** @type  {(input: readonly number[]) => (bits: number) => HashInput} */
+const padding = input => bitsCount => {
+    const appendBlockIndex = (bitsCount / 32) | 0
+    const length = (bitsCount + mod(447 - bitsCount)(512) + 65) / 32
+    /** @type {(i: number) => number} */
+    const f = i =>
+        i < appendBlockIndex ?
+            input[i] :
+        i === appendBlockIndex ?
+            (appendBlockIndex >= input.length ? 0x8000_0000 : appendOne(input[appendBlockIndex])(bitsCount % 32)) :
+        i === length - 2 ?
+            (bitsCount / 0x1_0000_0000) | 0 :
+        i === length - 1 ?
+            bitsCount % 0x1_0000_0000 : 0
+    return ({ f, length })
+}
+
+/** @type {(d: number) => (n: number) => number} */
+const rotr = d => {
+    const r = 32 - d
+    return n => n >>> d | n << r
+}
+
+/** @type {(x: number) => (y: number) => (z: number) => number} */
+const ch = x => y => z => x & y ^ ~x & z
+
+/** @type {(x: number) => (y: number) => (z: number) => number} */
+const maj = x => y => z => x & y ^ x & z ^ y & z
+
+/** @type {(d: number) => (n: number) => number} */
+const shr = d => n => n >>> d
+
+/** @type {(a: number) => (b: number) => (c: number) => (x: number) => number} */
+const bigSigma = a => b => c => {
+    const ra = rotr(a)
+    const rb = rotr(b)
+    const rc = rotr(c)
+    return x => ra(x) ^ rb(x) ^ rc(x)
+}
+
+const bigSigma0 = bigSigma(2)(13)(22)
+
+const bigSigma1 = bigSigma(6)(11)(25)
+
+/** @type {(a: number) => (b: number) => (c: number) => (x: number) => number} */
+const smallSigma = a => b => c => {
+    const ra = rotr(a)
+    const rb = rotr(b)
+    const sc = shr(c)
+    return x => ra(x) ^ rb(x) ^ sc(x)
+}
+
+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])
+
+/** @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 k = [
+    new Int32Array([
+        0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174]),
+    new Int32Array([
+        0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967]),
+    new Int32Array([
+        0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070]),
+    new Int32Array([
+        0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2]),
+];
+
+/** @type {(input: readonly number[]) => (bitsCount: number) => Hash8} */
+const computeSha224 = input => bitsCount => compute(input)(bitsCount)(init224)
+
+/** @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
+}
+
+/** @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 a = init[0]
+    let b = init[1]
+    let c = init[2]
+    let d = init[3]
+    let e = init[4]
+    let f = init[5]
+    let g = init[6]
+    let h = init[7]
+
+    for (let i = 0; i < 4; ++i) {
+        const ki = k[i]
+        for (let j = 0; j < 16; ++j) {
+            const t1 = h + bigSigma1(e) + ch(e)(f)(g) + ki[j] + w[j]
+            const t2 = bigSigma0(a) + maj(a)(b)(c)
+            h = g
+            g = f
+            f = e
+            e = (d + t1) | 0
+            d = c
+            c = b
+            b = a
+            a = (t1 + t2) | 0
+        }
+        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,
+    ])
+}
+
+/** @type {(input: readonly number[]) => (bitsCount: number) => (init: Hash8) => Hash8} */
+const compute = input => bitsCount => init => {
+    const { f, length } = padding(input)(bitsCount)
+
+    let result = init
+
+    const chunkCount = length / 16
+    for (let i = 0; i < chunkCount; i++) {
+        const s = i * 16
+        result = compress(result)(new Int32Array([
+            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)]))
+    }
+
+    return result
+}
+
+module.exports = {
+    /** @readonly */
+    padding,
+    /** @readonly */
+    computeSha256,
+    /** @readonly */
+    computeSha224
+}

package/{types/crypto → sha2}/test.js

@@ -1,12 +1,13 @@
 const _ = require('.')
-const json = require('../../json')
-const { sort } = require('../object')
+const json = require('../json')
+const { sort } = require('../types/object')
+const list = require('../types/list')
+
+/** @type {(a: number) => number} */
+const toU32 = x => (x + 0x1_0000_0000) % 0x1_0000_0000
 
 /** @type {(a: number) => string} */
-const toHexString = x =>
-{
-    return x >= 0 ? x.toString(16).padStart(8, '0') : (x + 0x100000000).toString(16).padStart(8, '0')
-}
+const toHexString = x => toU32(x).toString(16).padStart(8, '0')
 
 /** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)
@@ -33,27 +34,33 @@ const stringify = a => json.stringify(sort)(a)
 
 {
     const hash = _.computeSha256([])(0)
-    const result = stringify(hash.map(toHexString))
+    const result = stringify(Array.from(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))
+    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(hash.map(toHexString))
+    const result = stringify(Array.from(hash).map(toHexString))
     if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
 }
 
 {
     const input = Array(8).fill(0x31313131)
     const result = _.computeSha256(input)(256)
-    if (result[0] !== 0x8a83665f) { throw result[0] }
+    if (toU32(result[0]) !== 0x8a83665f) { throw result[0] }
 }
 
 {
     const input = Array(16).fill(0x31313131)
     const hash = _.computeSha256(input)(512)
-    const result = stringify(hash.map(toHexString))
+    const result = stringify(Array.from(hash).map(toHexString))
     if (result !== '["3138bb9b","c78df27c","473ecfd1","410f7bd4","5ebac1f5","9cf3ff9c","fe4db77a","ab7aedd3"]') { throw result }
 }
 

package/test.js

@@ -3,7 +3,7 @@ const i = require('./')
 require('./types/list/test')
 require('./types/array/test')
 require('./types/btree/test')
-require('./types/crypto/test')
+require('./sha2/test')
 require('./json/test')
 require('./types/object/test')
 require('./io/commonjs/test')

package/types/crypto/index.js

@@ -1,193 +0,0 @@
-/**
- * @typedef {{
- *  readonly input: number[]
- *  readonly length: number
- * }} HashInput
- */
-
-/**
- * @typedef {readonly[number, number, number, number, number, number, number, number]} HashOutput8
- */
-
-/** @type  {(input: number) => (pos: number) => number} */
-const appendOne = input => pos =>
-{
-    return input | (1 << 31 - pos)
-}
-
-/** @type  {(input: number) => (pos: number) => number} */
-const unsignedMod = a => b =>
-{
-    return (a % b + b) % b
-}
-
-/** @type  {(input: number[]) => (length: number) => readonly number[]} */
-const padding = input => length =>
-{
-    const appendBlockIndex = Math.floor(length / 32)
-    //console.log(appendBlockIndex)
-    const k = unsignedMod(447 - length)(512)
-    //console.log(k)
-    const outputLength = length + k + 65
-    //console.log(outputLength)
-    let o = new Array(outputLength / 32)
-    //console.log(o.length)
-    for(let i = 0; i < o.length; i++)
-    {
-        if (i < appendBlockIndex)
-            o[i] = input[i];
-        else if (i == appendBlockIndex)
-            o[i] = appendBlockIndex >= input.length ? 0x80000000 : appendOne(input[appendBlockIndex])(length % 32);
-        else if (i == o.length - 2)
-            o[i] = Math.floor(length / 4294967296)
-        else if (i == o.length - 1)
-            o[i] = length % 4294967296
-        else
-            o[i] = 0
-    }
-    return o;
-}
-
-/** @type {(x: number) => (y: number) => (z: number) => number} */
-const ch = x => y => z => 
-{
-    return x & y ^ ~x & z
-}
-
-/** @type {(x: number) => (y: number) => (z: number) => number} */
-const maj = x => y => z => 
-{
-    return x & y ^ x & z ^ y & z
-}
-
-/** @type {(n: number) => (d: number) => number} */
-const rotr = n => d =>
-{
-    return n >>> d | n << (32-d)
-}
-
-/** @type {(n: number) => (d: number) => number} */
-const shr = n => d =>
-{
-    return n >>> d
-}
-
-/** @type {(x: number) => number} */
-const bsig0 = x =>  
-{
-    return rotr(x)(2) ^ rotr(x)(13) ^ rotr(x)(22)
-}
-
-/** @type {(x: number) => number} */
-const bsig1 = x =>  
-{
-    return rotr(x)(6) ^ rotr(x)(11) ^ rotr(x)(25)
-}
-
-/** @type {(x: number) => number} */
-const ssig0 = x =>  
-{
-    return rotr(x)(7) ^ rotr(x)(18) ^ shr(x)(3)
-}
-
-/** @type {(x: number) => number} */
-const ssig1 = x =>  
-{
-    return rotr(x)(17) ^ rotr(x)(19) ^ shr(x)(10)
-}
-
-/** @type {(x: number) => number} */
-const mod2pow32 = x =>
-{
-    return x % 4294967296
-}
-
-/** @type {(input: number[]) => (length: number) => HashOutput8} */
-const computeSha256 = input => length =>
-{
-    const padded = padding(input)(length)
-
-    let h0 = 0x6a09e667
-    let h1 = 0xbb67ae85
-    let h2 = 0x3c6ef372
-    let h3 = 0xa54ff53a
-    let h4 = 0x510e527f
-    let h5 = 0x9b05688c
-    let h6 = 0x1f83d9ab
-    let h7 = 0x5be0cd19
-
-    const k = [
-        0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-        0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-        0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-        0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-    ];
-
-    // /** @type {(a: number) => string} */
-    // const toHexString = x =>
-    // {
-    //     return x >= 0 ? x.toString(16).padStart(8, '0') : (x + 0x100000000).toString(16).padStart(8, '0')
-    // }
-
-    let w = new Array(64)
-    const chunkCount = padded.length / 16
-    for(let i = 0; i < chunkCount; i++)
-    {
-        for(let t = 0; t < 16; t++)
-        {
-            w[t] = padded[t + i * 16]
-        }
-    
-        for(let t = 16; t < 64; t++)
-        {
-            w[t] = mod2pow32(ssig1(w[t - 2]) + w[t - 7] + ssig0(w[t-15]) + w[t - 16])
-        }
-    
-        //console.log(w.map(toHexString))
-    
-        let a = h0
-        let b = h1
-        let c = h2
-        let d = h3
-        let e = h4
-        let f = h5
-        let g = h6
-        let h = h7
-    
-        for(let t = 0; t < 64; t++)
-        {
-            let t1 = mod2pow32(h + bsig1(e) + ch(e)(f)(g) + k[t] + w[t])
-            let t2 = mod2pow32(bsig0(a) + maj(a)(b)(c))
-            h = g
-            g = f
-            f = e
-            e = mod2pow32(d + t1)
-            d = c
-            c = b
-            b = a
-            a = mod2pow32(t1 + t2)
-        }
-    
-        h0 = mod2pow32(h0 + a)
-        h1 = mod2pow32(h1 + b)
-        h2 = mod2pow32(h2+ c)
-        h3 = mod2pow32(h3 + d)
-        h4 = mod2pow32(h4 + e)
-        h5 = mod2pow32(h5 + f)
-        h6 = mod2pow32(h6 + g)
-        h7 = mod2pow32(h7 + h)
-    }
-
-    return [h0, h1, h2, h3, h4, h5, h6, h7]
-}
-
-module.exports = {
-    /** @readonly */
-    padding,
-    /** @readonly */
-    computeSha256,
-}