functionalscript 0.0.592 → 0.1.594

package/json/parser/{test.f.cjs → test.f.mjs}

@@ -1,16 +1,18 @@
-const parser = require('./module.f.cjs')
-const tokenizer = require('../tokenizer/module.f.cjs')
-const { toArray } = require('../../types/list/module.f.cjs')
-const json = require('../module.f.cjs')
-const { sort } = require('../../types/object/module.f.cjs')
-const encoding = require('../../text/utf16/module.f.cjs');
+import parser from './module.f.mjs'
+import tokenizer, * as tokenizerT from '../tokenizer/module.f.mjs'
+import list from '../../types/list/module.f.mjs'
+const { toArray } = list
+import json from '../module.f.mjs'
+import o from '../../types/object/module.f.mjs'
+const { sort } = o
+import encoding from '../../text/utf16/module.f.mjs'
 
-/** @type {(s: string) => readonly tokenizer.JsonToken[]} */
+/** @type {(s: string) => readonly tokenizerT.JsonToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
 const stringify = json.stringify(sort)
 
-module.exports = {
+export default {
     valid: [
         () => {
             const tokenList = tokenizeString('null')

package/json/serializer/{module.f.cjs → module.f.mjs}

@@ -1,7 +1,7 @@
-const list = require('../../types/list/module.f.cjs')
+import list, * as List from '../../types/list/module.f.mjs'
 const { flat, reduce, empty } = list
-const object = require('../../types/object/module.f.cjs')
-const operator = require('../../types/function/operator/module.f.cjs')
+import object, * as O from '../../types/object/module.f.mjs'
+import operator, * as Operator from '../../types/function/operator/module.f.mjs'
 
 /**
  * @template T
@@ -36,10 +36,10 @@ const operator = require('../../types/function/operator/module.f.cjs')
 
 const jsonStringify = JSON.stringify
 
-/** @type {(_: string) => list.List<string>} */
+/** @type {(_: string) => List.List<string>} */
 const stringSerialize = input => [jsonStringify(input)]
 
-/** @type {(_: number) => list.List<string>} */
+/** @type {(_: number) => List.List<string>} */
 const numberSerialize = input => [jsonStringify(input)]
 
 const nullSerialize = ['null']
@@ -48,18 +48,18 @@ const trueSerialize = ['true']
 
 const falseSerialize = ['false']
 
-/** @type {(_: boolean) => list.List<string>} */
+/** @type {(_: boolean) => List.List<string>} */
 const boolSerialize = value => value ? trueSerialize : falseSerialize
 
 const comma = [',']
 
-/** @type {operator.Reduce<list.List<string>>} */
+/** @type {Operator.Reduce<List.List<string>>} */
 const joinOp = b => prior => flat([prior, comma, b])
 
-/** @type {(input: list.List<list.List<string>>) => list.List<string>} */
+/** @type {(input: List.List<List.List<string>>) => List.List<string>} */
 const join = reduce(joinOp)(empty)
 
-/** @type {(open: string) => (close: string) => (input: list.List<list.List<string>>) => list.List<string>} */
+/** @type {(open: string) => (close: string) => (input: List.List<List.List<string>>) => List.List<string>} */
 const wrap = open => close => {
     const seqOpen = [open]
     const seqClose = [close]
@@ -72,12 +72,12 @@ const arrayWrap = wrap('[')(']')
 
 /**
  * @template T
- * @typedef {object.Entry<Unknown<T>>} Entry<T>
+ * @typedef {O.Entry<Unknown<T>>} Entry<T>
 */
 
 /**
  * @template T
- *  @typedef {(list.List<Entry<T>>)} Entries<T>
+ *  @typedef {(List.List<Entry<T>>)} Entries<T>
 */
 
 /**
@@ -85,7 +85,7 @@ const arrayWrap = wrap('[')(']')
  * @typedef {(entries: Entries<T>) => Entries<T>} MapEntries<T>
 */
 
-module.exports = {
+export default {
     /** @readonly */
     objectWrap,
     /** @readonly */

package/json/serializer/{test.f.cjs → test.f.mjs}

@@ -1,7 +1,8 @@
-const _ = require('./module.f.cjs')
-const { toArray } = require('../../types/list/module.f.cjs')
+import _, * as T from './module.f.mjs'
+import list from '../../types/list/module.f.mjs'
+const { toArray } = list
 
-module.exports = {
+export default {
     arrayWrap: [
         () => {
             const result = JSON.stringify(toArray(_.arrayWrap(null)))

package/json/{test.f.cjs → test.f.mjs}

@@ -1,8 +1,10 @@
-const json = require('./module.f.cjs')
-const { sort } = require('../types/object/module.f.cjs')
-const { identity } = require('../types/function/module.f.cjs')
+import json from './module.f.mjs'
+import o from '../types/object/module.f.mjs'
+const { sort } = o
+import f from '../types/function/module.f.mjs'
+const { identity } = f
 
-module.exports = {
+export default {
     setProperty: () => {
         if (json.setProperty("Hello")([])({}) !== "Hello") { throw 'error' }
     },

package/json/tokenizer/{module.f.cjs → module.f.mjs}

@@ -1,16 +1,17 @@
-const operator = require('../../types/function/operator/module.f.cjs')
-const list = require('../../types/list/module.f.cjs')
+import operator, * as Operator from '../../types/function/operator/module.f.mjs'
+import list, * as List from '../../types/list/module.f.mjs'
 const { empty, flat, stateScan } = list
-const { multiply } = require('../../types/bigfloat/module.f.cjs')
-const jsTokenizer = require('../../js/tokenizer/module.f.cjs')
+import bf from '../../types/bigfloat/module.f.mjs'
+const { multiply } = bf
+import jsTokenizer, * as jsTokenizerT from '../../js/tokenizer/module.f.mjs'
 
 /**
  * @typedef {|
 * {readonly kind: 'true' | 'false' | 'null' } |
 * {readonly kind: '{' | '}' | ':' | ',' | '[' | ']' } |
-* jsTokenizer.StringToken |
-* jsTokenizer.NumberToken |
-* jsTokenizer.ErrorToken
+* jsTokenizerT.StringToken |
+* jsTokenizerT.NumberToken |
+* jsTokenizerT.ErrorToken
 * } JsonToken
 */
 
@@ -22,11 +23,11 @@ const jsTokenizer = require('../../js/tokenizer/module.f.cjs')
 
 /**
  * @typedef {|
-* jsTokenizer.JsToken | null
+* jsTokenizerT.JsToken | null
 * } ScanInput
 */
 
-/** @type {(input: jsTokenizer.JsToken) => list.List<JsonToken>} */
+/** @type {(input: jsTokenizerT.JsToken) => List.List<JsonToken>} */
 const mapToken = input =>
 {
     switch(input.kind)
@@ -48,7 +49,7 @@ const mapToken = input =>
     }
 }
 
-/** @type {(input: ScanInput) => readonly [list.List<JsonToken>, ScanState]} */
+/** @type {(input: ScanInput) => readonly [List.List<JsonToken>, ScanState]} */
 const parseDefaultState = input =>
 {
     if (input === null) return [empty, { kind: 'def'}]
@@ -59,7 +60,7 @@ const parseDefaultState = input =>
     }
 }
 
-/** @type {(input: ScanInput) => readonly [list.List<JsonToken>, ScanState]} */
+/** @type {(input: ScanInput) => readonly [List.List<JsonToken>, ScanState]} */
 const parseMinusState = input =>
 {
     if (input === null) return [[{ kind: 'error', message: 'invalid token' }], { kind: 'def'}]
@@ -71,7 +72,7 @@ const parseMinusState = input =>
     }
 }
 
-/** @type {operator.StateScan<ScanInput, ScanState, list.List<JsonToken>>} */
+/** @type {Operator.StateScan<ScanInput, ScanState, List.List<JsonToken>>} */
 const scanToken = state => input => {
     switch(state.kind)
     {
@@ -80,15 +81,15 @@ const scanToken = state => input => {
     }
 }
 
-/** @type {(input: list.List<number>) => list.List<JsonToken>} */
+/** @type {(input: List.List<number>) => List.List<JsonToken>} */
 const tokenize = input =>
 {
-    /** @type {list.List<ScanInput>} */
+    /** @type {List.List<ScanInput>} */
     const jsTokens = jsTokenizer.tokenize(input)
     return flat(stateScan(scanToken)({ kind: 'def' })(list.concat(jsTokens)([null])))
 }
 
-module.exports = {
+export default {
     /** @readonly */
     tokenize
 }

package/json/tokenizer/{test.f.cjs → test.f.mjs}

@@ -1,15 +1,17 @@
-const tokenizer = require('./module.f.cjs')
-const { toArray, countdown } = require('../../types/list/module.f.cjs')
-const djs = require('../../djs/module.f.cjs')
-const { sort } = require('../../types/object/module.f.cjs')
-const encoding = require('../../text/utf16/module.f.cjs');
+import tokenizer, * as tokenizerT from './module.f.mjs'
+import list from '../../types/list/module.f.mjs'
+const { toArray, countdown } = list
+import djs from '../../djs/module.f.mjs'
+import o from '../../types/object/module.f.mjs'
+const { sort } = o
+import encoding from '../../text/utf16/module.f.mjs'
 
-/** @type {(s: string) => readonly tokenizer.JsonToken[]} */
+/** @type {(s: string) => readonly tokenizerT.JsonToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
 const stringify = djs.stringify(sort)
 
-module.exports = {
+export default {
     json: [
         () => {
             const result = tokenizeString('')

package/jsr.json

@@ -1,5 +1,5 @@
 {
   "name": "@functionalscript/functionalscript",
-  "version": "0.0.592",
+  "version": "0.1.594",
   "exports": "./index.f.mjs"
 }

package/nodejs/version/main.mjs

@@ -0,0 +1,5 @@
+import _ from './module.f.mjs'
+import child_process from 'node:child_process'
+import fs from 'node:fs'
+
+_.version({ child_process, fs })

package/nodejs/version/{module.f.cjs → module.f.mjs}

@@ -26,7 +26,7 @@ const { stringify, parse } = JSON
 
 /** @type {<T>(node: Node<T>) => readonly[T, T]} */
 const version = ({ child_process, fs }) => {
-    const version = `0.0.${child_process.execSync('git log --oneline').toString().split('\n').length - 1}`
+    const version = `0.1.${child_process.execSync('git log --oneline').toString().split('\n').length - 1}`
     const f = (/** @type {string} */jsonFile) => {
         const file = `${jsonFile}.json`
         return fs.writeFileSync(
@@ -45,7 +45,7 @@ const version = ({ child_process, fs }) => {
     ]
 }
 
-module.exports = {
+export default {
     /** @readonly */
     version,
 }

package/nodejs/version/{test.f.cjs → test.f.mjs}

@@ -1,4 +1,4 @@
-const _ = require('./module.f.cjs')
+import _, * as T from './module.f.mjs'
 
 const x = {
     "name": "functionalscript",
@@ -38,7 +38,7 @@ const x = {
 
 const e = '{\n' +
     '  "name": "functionalscript",\n' +
-    '  "version": "0.0.2",\n' +
+    '  "version": "0.1.2",\n' +
     '  "description": "FunctionalScript is a functional subset of JavaScript",\n' +
     '  "main": "module.f.cjs",\n' +
     '  "scripts": {\n' +
@@ -72,13 +72,13 @@ const e = '{\n' +
     '  }\n' +
     '}'
 
-/** @type {(s: string) => _.Buffer} */
+/** @type {(s: string) => T.Buffer} */
 const buffer = s => ({
     toString: () => s
 })
 
-module.exports = () => {
-    /** @type {_.Node<string>} */
+export default () => {
+    /** @type {T.Node<string>} */
     const node = {
         child_process: { execSync: () => buffer("123\n456\n") },
         fs: {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "functionalscript",
-  "version": "0.0.592",
+  "version": "0.1.594",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.f.mjs",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",
     "index": "node ./dev/index.mjs",
-    "version": "node ./nodejs/version/main.cjs",
+    "version": "node ./nodejs/version/main.mjs",
     "test-only": "node --trace-uncaught ./dev/test.mjs",
-    "comtest": "node ./com/test/build.cjs"
+    "comtest": "node ./com/test/build.mjs"
   },
   "repository": {
     "type": "git",

package/prime_field/{module.f.cjs → module.f.mjs}

@@ -1,9 +1,10 @@
-const op = require('../types/function/operator/module.f.cjs')
-const { scalar_mul } = require('../types/bigint/module.f.cjs')
+import * as Operator from '../types/function/operator/module.f.mjs'
+import bi from '../types/bigint/module.f.mjs'
+const { scalar_mul } = bi
 
-/** @typedef {op.Reduce<bigint>} Reduce */
+/** @typedef {Operator.Reduce<bigint>} Reduce */
 
-/** @typedef {op.Unary<bigint, bigint>} Unary*/
+/** @typedef {Operator.Unary<bigint, bigint>} Unary*/
 
 /**
  * @typedef {{
@@ -75,7 +76,7 @@ const prime_field = p => {
     }
 }
 
-module.exports = {
+export default {
     prime_field,
     /** @type {(f: PrimeField) => (a: bigint) => bigint|null} */
     sqrt: ({p, mul, pow }) => {

package/prime_field/{test.f.cjs → test.f.mjs}

@@ -1,6 +1,7 @@
-const { prime_field, sqrt } = require('./module.f.cjs')
+import _ from './module.f.mjs'
+const { prime_field, sqrt } = _
 
-module.exports = {
+export default {
     prime_field_test: () => {
         const p = 0xffffffff_ffffffff_ffffffff_ffffffff_ffffffff_ffffffff_fffffffe_fffffc2fn;
         const f = prime_field(p)

package/secp/{module.f.cjs → module.f.mjs}

@@ -1,6 +1,7 @@
-const op = require('../types/function/operator/module.f.cjs')
-const pf = require('../prime_field/module.f.cjs')
-const { scalar_mul } = require('../types/bigint/module.f.cjs')
+import * as op from '../types/function/operator/module.f.mjs'
+import pf, * as pfT from '../prime_field/module.f.mjs'
+import bi from '../types/bigint/module.f.mjs'
+const { scalar_mul } = bi
 const { prime_field, sqrt } = pf
 
 /** @typedef {readonly[bigint, bigint]} Point2D */
@@ -18,8 +19,8 @@ const { prime_field, sqrt } = pf
 
 /**
  * @typedef {{
- *  readonly pf: pf.PrimeField
- *  readonly nf: pf.PrimeField
+ *  readonly pf: pfT.PrimeField
+ *  readonly nf: pfT.PrimeField
  *  readonly y2: (x: bigint) => bigint
  *  readonly y: (x: bigint) => bigint|null
  *  readonly neg: (a: Point) => Point
@@ -83,7 +84,7 @@ const curve = ({ p, a: [a0, a1], n }) => {
     }
 }
 
-module.exports = {
+export default {
     curve,
     /** @type {(a: Point) => (b: Point) => boolean} */
     eq: a => b => {

package/secp/{test.f.cjs → test.f.mjs}

@@ -1,13 +1,13 @@
-const m = require('./module.f.cjs')
-const { curve, secp256k1, secp192r1, eq } = m
+import mt, * as mT from './module.f.mjs'
+const { curve, secp256k1, secp192r1, eq } = mt
 
-module.exports = {
+export default {
     test: () => {
-        /** @type {(c: m.Init) => void} */
+        /** @type {(c: mT.Init) => void} */
         const test_curve = c => {
             const { g } = c
             const { mul, neg, pf: { abs }, y: yf, nf: { p: n } } = curve(c)
-            /** @type {(p: m.Point) => void} */
+            /** @type {(p: mT.Point) => void} */
             const point_check = p => {
                 if (p === null) { throw 'null' }
                 const [x, y] = p
@@ -17,7 +17,7 @@ module.exports = {
             }
             point_check(g)
             point_check(neg(g))
-            /** @type {(p: m.Point) => void} */
+            /** @type {(p: mT.Point) => void} */
             const test_mul = p => {
                 if (mul(p)(0n) !== null) { throw 'O' }
                 if (mul(p)(1n) !== p) { throw 'p' }

package/sha2/{module.f.cjs → module.f.mjs}

@@ -1,4 +1,4 @@
-const array = require('../types/array/module.f.cjs')
+import array, * as arrayT from '../types/array/module.f.mjs'
 
 /**
  * @typedef {{
@@ -7,9 +7,9 @@ const array = require('../types/array/module.f.cjs')
  * }} HashInput
  */
 
-/** @typedef {array.Array8<number>} Hash8 */
+/** @typedef {arrayT.Array8<number>} Hash8 */
 
-/** @typedef {array.Array16<number>} Array16 */
+/** @typedef {arrayT.Array16<number>} Array16 */
 
 /** @type {(input: number) => (pos: number) => number} */
 const appendOneWithZeros = input => pos => (input >> pos << pos) | (1 << pos)
@@ -73,7 +73,7 @@ const smallSigma0 = smallSigma(7)(18)(3)
 
 const smallSigma1 = smallSigma(17)(19)(10)
 
-/** @type {(a: array.Array4<number>) => number} */
+/** @type {(a: arrayT.Array4<number>) => number} */
 const wi = ([a0, a1, a2, a3]) => (smallSigma1(a0) + a1 + smallSigma0(a2) + a3) | 0
 
 /** @type {(w: Array16) => Array16} */
@@ -194,7 +194,7 @@ const compress256 = compress(init256)
 
 const compress224 = compress(init224)
 
-module.exports = {
+export default {
     /** @readonly */
     padding,
     /** @readonly */

package/sha2/{test.f.cjs → test.f.mjs}

@@ -1,7 +1,8 @@
-const _ = require('./module.f.cjs')
-const json = require('../json/module.f.cjs')
-const { sort } = require('../types/object/module.f.cjs')
-const list = require('../types/list/module.f.cjs')
+import _ from './module.f.mjs'
+import json, * as jsonT from '../json/module.f.mjs'
+import o from '../types/object/module.f.mjs'
+const { sort } = o
+import list from '../types/list/module.f.mjs'
 
 /** @type {(a: number) => number} */
 const toU32 = x => (x + 0x1_0000_0000) % 0x1_0000_0000
@@ -9,7 +10,7 @@ const toU32 = x => (x + 0x1_0000_0000) % 0x1_0000_0000
 /** @type {(a: number) => string} */
 const toHexString = x => toU32(x).toString(16).padStart(8, '0')
 
-/** @type {(a: readonly json.Unknown[]) => string} */
+/** @type {(a: readonly jsonT.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)
 
 // {
@@ -32,7 +33,7 @@ const stringify = a => json.stringify(sort)(a)
 //     console.log(result.map(toHexString))
 // }
 
-module.exports = {
+export default {
     empty: {
         sha256: () => {
             const hash = _.computeSha256([])(0)

package/text/ascii/{module.f.cjs → module.f.mjs}

@@ -1,4 +1,4 @@
-const _range = require('../../types/range/module.f.cjs')
+import _range, * as Range from '../../types/range/module.f.mjs'
 
 /** @type {(s: string) => (i: number) => number} */
 const at = s => i => {
@@ -10,7 +10,7 @@ const at = s => i => {
 /** @type {(s: string) => number} */
 const one = s => at(s)(0)
 
-/** @type {(s: string) => _range.Range} */
+/** @type {(s: string) => Range.Range} */
 const range = s => {
     const f = at(s)
     const f0 = f(0)
@@ -18,7 +18,7 @@ const range = s => {
     return [f0, f(1)]
 }
 
-module.exports = {
+export default {
     /** @readonly */
     one,
     /** @readonly */

package/text/ascii/test.f.mjs

@@ -0,0 +1,14 @@
+import _ from './module.f.mjs'
+const { range } = _
+import json from '../../json/module.f.mjs'
+import o from '../../types/object/module.f.mjs'
+const { sort } = o
+
+const stringify = json.stringify(sort)
+
+export default {
+    range: () => {
+        const r = stringify(range("A"))
+        if (r !== '[65,65]') { throw r }
+    }
+}

package/text/{module.f.cjs → module.f.mjs}

@@ -1,20 +1,20 @@
-const list = require('../types/list/module.f.cjs')
+import list, * as List from '../types/list/module.f.mjs'
 const { flatMap } = list
 
 /** @typedef {ItemThunk|ItemArray} Block */
 
 /** @typedef {readonly Item[]} ItemArray */
 
-/** @typedef {() => list.List<Item>} ItemThunk */
+/** @typedef {() => List.List<Item>} ItemThunk */
 
 /** @typedef {string|ItemArray|ItemThunk} Item */
 
-/** @type {(indent: string) => (text: Block) => list.List<string>} */
+/** @type {(indent: string) => (text: Block) => List.List<string>} */
 const flat = indent => {
 
-    /** @type {(prefix: string) => (text: Block) => list.List<string>} */
+    /** @type {(prefix: string) => (text: Block) => List.List<string>} */
     const f = prefix => {
-        /** @type {(item: Item) => list.List<string>} */
+        /** @type {(item: Item) => List.List<string>} */
         const g = item => typeof (item) === 'string' ? [`${prefix}${item}`] : f(`${prefix}${indent}`)(item)
         return flatMap(g)
     }
@@ -25,7 +25,7 @@ const flat = indent => {
 /** @type {(type: string) => (name: string) => (body: Block) => Block} */
 const curly = type => name => body => [`${type} ${name}`, '{', body, '}']
 
-module.exports = {
+export default {
     /** @readonly */
     flat,
     /** @readonly */

package/text/sgr/{module.f.cjs → module.f.mjs}

@@ -5,7 +5,7 @@
  */
 const sgr = c => `\x1b[${c.toString()}m`
 
-module.exports = {
+export default {
     /** @readonly */
     sgr,
     /** @readonly */

package/text/{test.f.cjs → test.f.mjs}

@@ -1,8 +1,9 @@
-const _ = require('./module.f.cjs')
-const { join } = require('../types/string/module.f.cjs')
+import _, * as T from './module.f.mjs'
+import string from '../types/string/module.f.mjs'
+const { join } = string
 
-module.exports = () => {
-    /** @type {_.Block} */
+export default () => {
+    /** @type {T.Block} */
     const text = [
         'a',
         'b',