functionalscript 0.0.550 → 0.0.552

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.550",
+  "version": "0.0.552",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/prime_field/module.f.cjs

@@ -1,4 +1,5 @@
 const op = require('../types/function/operator/module.f.cjs')
+const { scalar_mul } = require('../types/bigint/module.f.cjs')
 
 /** @typedef {op.Reduce<bigint>} Reduce */
 
@@ -22,23 +23,6 @@ const op = require('../types/function/operator/module.f.cjs')
  * }} PrimeField
  */
 
-/** @type {<T>(zero: T, add: op.Reduce<T>) => (a: T) => (n: bigint) => T} */
-const scalar_mul = (zero, add) => a => n => {
-    let ai = a
-    let ni = n
-    let result = zero
-    while (true) {
-        if ((ni & 1n) === 1n) {
-            result = add(result)(ai)
-        }
-        ni >>= 1n
-        if (ni === 0n) {
-            return result
-        }
-        ai = add(ai)(ai)
-    }
-}
-
 /** @type {(p: bigint) => PrimeField} */
 const prime_field = p => {
     /** @type {Reduce} */
@@ -70,7 +54,7 @@ const prime_field = p => {
     /** @type {Unary} */
     const pow2 = a => mul(a)(a)
     /** @type {Reduce} */
-    const pow = scalar_mul(1n, mul)
+    const pow = scalar_mul({ 0: 1n, add: mul })
     return {
         p,
         middle,
@@ -92,7 +76,6 @@ const prime_field = p => {
 }
 
 module.exports = {
-    scalar_mul,
     prime_field,
     /** @type {(f: PrimeField) => (a: bigint) => bigint|null} */
     sqrt: ({p, mul, pow }) => {

package/secp/module.f.cjs

@@ -1,6 +1,7 @@
 const op = require('../types/function/operator/module.f.cjs')
 const pf = require('../prime_field/module.f.cjs')
-const { scalar_mul, prime_field, sqrt } = pf
+const { scalar_mul } = require('../types/bigint/module.f.cjs')
+const { prime_field, sqrt } = pf
 
 /** @typedef {readonly[bigint, bigint]} Point2D */
 
@@ -78,7 +79,7 @@ const curve = ({ p, a: [a0, a1], n }) => {
             return [x, neg(y)]
         },
         add: addPoint,
-        mul: scalar_mul(null, addPoint)
+        mul: scalar_mul({ 0: null, add: addPoint })
     }
 }
 

package/types/bigint/module.f.cjs

@@ -1,7 +1,10 @@
 const compare = require('../function/compare/module.f.cjs')
+const op = require('../function/operator/module.f.cjs')
 const { unsafeCmp } = compare
 const { reduce } = require('../list/module.f.cjs')
 
+/** @typedef {op.Unary<bigint, bigint>} Unary*/
+
 /** @type {(a: bigint) => (b: bigint) => bigint} */
 const addition = a => b => a + b
 
@@ -16,6 +19,31 @@ const sign = a => unsafeCmp(a)(0n)
 /** @type {(a: bigint) => string} */
 const serialize = a => `${a}n`
 
+/**
+ * @template T
+ * @typedef {{
+ *  readonly 0: T
+ *  readonly add: op.Reduce<T>
+ * }} Additive
+ */
+
+/** @type {<T>(a: Additive<T>) => (a: T) => (n: bigint) => T} */
+const scalar_mul = ({ 0: _0, add }) => a => n => {
+    let ai = a
+    let ni = n
+    let result = _0
+    while (true) {
+        if ((ni & 1n) === 1n) {
+            result = add(result)(ai)
+        }
+        ni >>= 1n
+        if (ni === 0n) {
+            return result
+        }
+        ai = add(ai)(ai)
+    }
+}
+
 module.exports = {
     /** @readonly */
     addition,
@@ -27,4 +55,6 @@ module.exports = {
     sign,
     /** @readonly */
     serialize,
-}
+    /** @readonly */
+    scalar_mul,
+}