functionalscript 0.1.609 → 0.2.0

package/json/parser/module.f.mjs

@@ -1,20 +1,20 @@
 // @ts-self-types="./module.f.d.mts"
-import result, * as Result from '../../types/result/module.f.mjs'
-import list, * as List from '../../types/list/module.f.mjs'
+import * as result from '../../types/result/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { fold, first, drop, toArray } = list
 import * as Operator from '../../types/function/operator/module.f.mjs'
 import * as Tokenizer from '../tokenizer/module.f.mjs'
-import map, * as Map from '../../types/map/module.f.mjs'
+import * as map from '../../types/map/module.f.mjs'
 const { setReplace } = map
 import * as Json from '../module.f.mjs'
-import o from '../../types/object/module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { fromMap } = o
 
 
 /**
  * @typedef {{
 * readonly kind: 'object'
-* readonly values: Map.Map<Json.Unknown>
+* readonly values: map.Map<Json.Unknown>
 * readonly key: string
 * }} JsonObject
 * */
@@ -22,7 +22,7 @@ const { fromMap } = o
 /**
  * @typedef {{
 * readonly kind: 'array'
-* readonly values: List.List<Json.Unknown>
+* readonly values: list.List<Json.Unknown>
 * }} JsonArray
 * */
 
@@ -33,7 +33,7 @@ const { fromMap } = o
 * } JsonStackElement
 */
 
-/** @typedef {List.List<JsonStackElement>} JsonStack */
+/** @typedef {list.List<JsonStackElement>} JsonStack */
 
 /**
  * @typedef {{
@@ -206,8 +206,8 @@ const foldOp = token => state => {
     }
 }
 
-/** @type {(tokenList: List.List<Tokenizer.JsonToken>) => Result.Result<Json.Unknown, string>} */
-const parse = tokenList => {
+/** @type {(tokenList: list.List<Tokenizer.JsonToken>) => result.Result<Json.Unknown, string>} */
+export const parse = tokenList => {
     const state = fold(foldOp)({ status: '', top: null, stack: null })(tokenList)
     switch (state.status) {
         case 'result': return result.ok(state.value)
@@ -215,8 +215,3 @@ const parse = tokenList => {
         default: return result.error('unexpected end')
     }
 }
-
-export default {
-    /** @readonly */
-    parse
-}

package/json/parser/test.f.mjs

@@ -1,13 +1,13 @@
-import parser from './module.f.mjs'
-import tokenizer, * as Tokenizer from '../tokenizer/module.f.mjs'
-import list from '../../types/list/module.f.mjs'
+import * as parser from './module.f.mjs'
+import * as tokenizer from '../tokenizer/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { toArray } = list
-import json from '../module.f.mjs'
-import o from '../../types/object/module.f.mjs'
+import * as json from '../module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { sort } = o
-import encoding from '../../text/utf16/module.f.mjs'
+import * as encoding from '../../text/utf16/module.f.mjs'
 
-/** @type {(s: string) => readonly Tokenizer.JsonToken[]} */
+/** @type {(s: string) => readonly tokenizer.JsonToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
 const stringify = json.stringify(sort)

package/json/serializer/module.f.d.mts

@@ -1,12 +1,12 @@
-declare namespace _default {
-    export { objectWrap };
-    export { arrayWrap };
-    export { stringSerialize };
-    export { numberSerialize };
-    export { nullSerialize };
-    export { boolSerialize };
-}
-export default _default;
+/** @type {(_: string) => list.List<string>} */
+export const stringSerialize: (_: string) => list.List<string>;
+/** @type {(_: number) => list.List<string>} */
+export const numberSerialize: (_: number) => list.List<string>;
+export const nullSerialize: string[];
+/** @type {(_: boolean) => list.List<string>} */
+export const boolSerialize: (_: boolean) => list.List<string>;
+export const objectWrap: (input: list.List<list.List<string>>) => list.List<string>;
+export const arrayWrap: (input: list.List<list.List<string>>) => list.List<string>;
 /**
  * <T>
  */
@@ -27,19 +27,10 @@ export type Entry<T> = O.Entry<Unknown<T>>;
 /**
  * <T>
  */
-export type Entries<T> = (List.List<Entry<T>>);
+export type Entries<T> = (list.List<Entry<T>>);
 /**
  * <T>
  */
 export type MapEntries<T> = (entries: Entries<T>) => Entries<T>;
-declare const objectWrap: (input: List.List<List.List<string>>) => List.List<string>;
-declare const arrayWrap: (input: List.List<List.List<string>>) => List.List<string>;
-/** @type {(_: string) => List.List<string>} */
-declare const stringSerialize: (_: string) => List.List<string>;
-/** @type {(_: number) => List.List<string>} */
-declare const numberSerialize: (_: number) => List.List<string>;
-declare const nullSerialize: string[];
-/** @type {(_: boolean) => List.List<string>} */
-declare const boolSerialize: (_: boolean) => List.List<string>;
+import * as list from '../../types/list/module.f.mjs';
 import * as O from '../../types/object/module.f.mjs';
-import * as List from '../../types/list/module.f.mjs';

package/json/serializer/module.f.mjs

@@ -1,5 +1,5 @@
 // @ts-self-types="./module.f.d.mts"
-import list, * as List from '../../types/list/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { flat, reduce, empty } = list
 import * as O from '../../types/object/module.f.mjs'
 import * as Operator from '../../types/function/operator/module.f.mjs'
@@ -37,39 +37,39 @@ import * as Operator from '../../types/function/operator/module.f.mjs'
 
 const jsonStringify = JSON.stringify
 
-/** @type {(_: string) => List.List<string>} */
-const stringSerialize = input => [jsonStringify(input)]
+/** @type {(_: string) => list.List<string>} */
+export const stringSerialize = input => [jsonStringify(input)]
 
-/** @type {(_: number) => List.List<string>} */
-const numberSerialize = input => [jsonStringify(input)]
+/** @type {(_: number) => list.List<string>} */
+export const numberSerialize = input => [jsonStringify(input)]
 
-const nullSerialize = ['null']
+export const nullSerialize = ['null']
 
 const trueSerialize = ['true']
 
 const falseSerialize = ['false']
 
-/** @type {(_: boolean) => List.List<string>} */
-const boolSerialize = value => value ? trueSerialize : falseSerialize
+/** @type {(_: boolean) => list.List<string>} */
+export 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]
     return input => flat([seqOpen, join(input), seqClose])
 }
 
-const objectWrap = wrap('{')('}')
+export const objectWrap = wrap('{')('}')
 
-const arrayWrap = wrap('[')(']')
+export const arrayWrap = wrap('[')(']')
 
 /**
  * @template T
@@ -78,25 +78,10 @@ const arrayWrap = wrap('[')(']')
 
 /**
  * @template T
- *  @typedef {(List.List<Entry<T>>)} Entries<T>
+ *  @typedef {(list.List<Entry<T>>)} Entries<T>
 */
 
 /**
  * @template T
  * @typedef {(entries: Entries<T>) => Entries<T>} MapEntries<T>
 */
-
-export default {
-    /** @readonly */
-    objectWrap,
-    /** @readonly */
-    arrayWrap,
-    /** @readonly */
-    stringSerialize,
-    /** @readonly */
-    numberSerialize,
-    /** @readonly */
-    nullSerialize,
-    /** @readonly */
-    boolSerialize,
-}

package/json/serializer/test.f.mjs

@@ -1,5 +1,5 @@
-import _, * as T from './module.f.mjs'
-import list from '../../types/list/module.f.mjs'
+import * as _ from './module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { toArray } = list
 
 export default {

package/json/test.f.mjs

@@ -1,7 +1,7 @@
-import json from './module.f.mjs'
-import o from '../types/object/module.f.mjs'
+import * as json from './module.f.mjs'
+import * as o from '../types/object/module.f.mjs'
 const { sort } = o
-import f from '../types/function/module.f.mjs'
+import * as f from '../types/function/module.f.mjs'
 const { identity } = f
 
 export default {

package/json/tokenizer/module.f.d.mts

@@ -1,17 +1,13 @@
-declare namespace _default {
-    export { tokenize };
-}
-export default _default;
+/** @type {(input: list.List<number>) => list.List<JsonToken>} */
+export const tokenize: (input: list.List<number>) => list.List<JsonToken>;
 export type JsonToken = {
     readonly kind: "true" | "false" | "null";
 } | {
     readonly kind: "{" | "}" | ":" | "," | "[" | "]";
-} | JsTokenizer.StringToken | JsTokenizer.NumberToken | JsTokenizer.ErrorToken;
+} | jsTokenizer.StringToken | jsTokenizer.NumberToken | jsTokenizer.ErrorToken;
 export type ScanState = {
     readonly kind: "def" | "-";
 };
-export type ScanInput = JsTokenizer.JsToken | null;
-/** @type {(input: List.List<number>) => List.List<JsonToken>} */
-declare const tokenize: (input: List.List<number>) => List.List<JsonToken>;
-import * as JsTokenizer from '../../js/tokenizer/module.f.mjs';
-import * as List from '../../types/list/module.f.mjs';
+export type ScanInput = jsTokenizer.JsToken | null;
+import * as list from '../../types/list/module.f.mjs';
+import * as jsTokenizer from '../../js/tokenizer/module.f.mjs';

package/json/tokenizer/module.f.mjs

@@ -1,18 +1,18 @@
 // @ts-self-types="./module.f.d.mts"
 import * as Operator from '../../types/function/operator/module.f.mjs'
-import list, * as List from '../../types/list/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { empty, flat, stateScan } = list
-import bf from '../../types/bigfloat/module.f.mjs'
+import * as bf from '../../types/bigfloat/module.f.mjs'
 const { multiply } = bf
-import jsTokenizer, * as JsTokenizer from '../../js/tokenizer/module.f.mjs'
+import * as jsTokenizer from '../../js/tokenizer/module.f.mjs'
 
 /**
  * @typedef {|
 * {readonly kind: 'true' | 'false' | 'null' } |
 * {readonly kind: '{' | '}' | ':' | ',' | '[' | ']' } |
-* JsTokenizer.StringToken |
-* JsTokenizer.NumberToken |
-* JsTokenizer.ErrorToken
+* jsTokenizer.StringToken |
+* jsTokenizer.NumberToken |
+* jsTokenizer.ErrorToken
 * } JsonToken
 */
 
@@ -24,11 +24,11 @@ import jsTokenizer, * as JsTokenizer from '../../js/tokenizer/module.f.mjs'
 
 /**
  * @typedef {|
-* JsTokenizer.JsToken | null
+* jsTokenizer.JsToken | null
 * } ScanInput
 */
 
-/** @type {(input: JsTokenizer.JsToken) => List.List<JsonToken>} */
+/** @type {(input: jsTokenizer.JsToken) => list.List<JsonToken>} */
 const mapToken = input =>
 {
     switch(input.kind)
@@ -51,7 +51,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'}]
@@ -62,7 +62,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'}]
@@ -74,7 +74,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)
     {
@@ -83,15 +83,10 @@ const scanToken = state => input => {
     }
 }
 
-/** @type {(input: List.List<number>) => List.List<JsonToken>} */
-const tokenize = input =>
+/** @type {(input: list.List<number>) => list.List<JsonToken>} */
+export 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])))
 }
-
-export default {
-    /** @readonly */
-    tokenize
-}

package/json/tokenizer/test.f.mjs

@@ -1,12 +1,12 @@
-import tokenizer, * as Tokenizer from './module.f.mjs'
-import list from '../../types/list/module.f.mjs'
+import * as tokenizer from './module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { toArray } = list
-import djs from '../../djs/module.f.mjs'
-import o from '../../types/object/module.f.mjs'
+import * as djs from '../../djs/module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { sort } = o
-import encoding from '../../text/utf16/module.f.mjs'
+import * as encoding from '../../text/utf16/module.f.mjs'
 
-/** @type {(s: string) => readonly Tokenizer.JsonToken[]} */
+/** @type {(s: string) => readonly tokenizer.JsonToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
 const stringify = djs.stringify(sort)

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@functionalscript/functionalscript",
-  "version": "0.1.609",
+  "version": "0.2.0",
   "exports": {
     "./com/cpp": "./com/cpp/module.f.mjs",
     "./com/cs": "./com/cs/module.f.mjs",

package/nodejs/version/main.mjs

@@ -1,4 +1,4 @@
-import _ from './module.f.mjs'
+import * as _ from './module.f.mjs'
 import fs from 'node:fs'
 
 _.updateVersion({ fs })

package/nodejs/version/module.f.d.mts

@@ -1,8 +1,7 @@
-declare namespace _default {
-    export { getVersion };
-    export { updateVersion };
-}
-export default _default;
+/** @type {<T>(fs: Fs<T>) => string} */
+export const getVersion: <T>(fs: Fs<T>) => string;
+/** @type {<T>(node: Node<T>) => readonly[T, T]} */
+export const updateVersion: <T>(node: Node<T>) => readonly [T, T];
 export type Buffer = {};
 export type Fs<T> = {
     readonly readFileSync: (name: string) => Buffer;
@@ -11,7 +10,3 @@ export type Fs<T> = {
 export type Node<T> = {
     readonly fs: Fs<T>;
 };
-/** @type {<T>(fs: Fs<T>) => string} */
-declare const getVersion: <T>(fs: Fs<T>) => string;
-/** @type {<T>(node: Node<T>) => readonly[T, T]} */
-declare const updateVersion: <T>(node: Node<T>) => readonly [T, T];

package/nodejs/version/module.f.mjs

@@ -20,7 +20,7 @@
 const { stringify, parse } = JSON
 
 /** @type {<T>(fs: Fs<T>) => string} */
-const getVersion = fs => readJson(fs)('package').version
+export const getVersion = fs => readJson(fs)('package').version
 
 const jsonFile = (/** @type {string} */jsonFile) => `${jsonFile}.json`
 
@@ -28,7 +28,7 @@ const jsonFile = (/** @type {string} */jsonFile) => `${jsonFile}.json`
 const readJson = fs => name => parse(fs.readFileSync(jsonFile(name)).toString())
 
 /** @type {<T>(node: Node<T>) => readonly[T, T]} */
-const updateVersion = ({ fs }) => {
+export const updateVersion = ({ fs }) => {
     const f = (/** @type {string} */name) => {
         return fs.writeFileSync(
             jsonFile(name),
@@ -45,8 +45,3 @@ const updateVersion = ({ fs }) => {
         f('jsr')
     ]
 }
-
-export default {
-    getVersion,
-    updateVersion,
-}

package/nodejs/version/test.f.mjs

@@ -1,4 +1,4 @@
-import _, * as T from './module.f.mjs'
+import * as _ from './module.f.mjs'
 
 const version = '0.3.0'
 
@@ -82,13 +82,13 @@ const e = '{\n' +
     '  }\n' +
     '}'
 
-/** @type {(s: string) => T.Buffer} */
+/** @type {(s: string) => _.Buffer} */
 const buffer = s => ({
     toString: () => s
 })
 
 export default () => {
-    /** @type {T.Node<string>} */
+    /** @type {_.Node<string>} */
     const node = {
         fs: {
             readFileSync: n => buffer(JSON.stringify(x[n])),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.1.609",
+  "version": "0.2.0",
   "type": "module",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "scripts": {

package/prime_field/module.f.d.mts

@@ -1,25 +1,3 @@
-declare namespace _default {
-    export { prime_field };
-    export let sqrt: (f: PrimeField) => (a: bigint) => bigint | null;
-}
-export default _default;
-export type Reduce = Operator.Reduce<bigint>;
-export type Unary = Operator.Unary<bigint, bigint>;
-export type PrimeField = {
-    readonly p: bigint;
-    readonly middle: bigint;
-    readonly max: bigint;
-    readonly neg: Unary;
-    readonly sub: Reduce;
-    readonly add: Reduce;
-    readonly abs: Unary;
-    readonly mul: Reduce;
-    readonly reciprocal: Unary;
-    readonly div: Reduce;
-    readonly pow: Reduce;
-    readonly pow2: Unary;
-    readonly pow3: Unary;
-};
 /** @typedef {Operator.Reduce<bigint>} Reduce */
 /** @typedef {Operator.Unary<bigint, bigint>} Unary*/
 /**
@@ -40,5 +18,24 @@ export type PrimeField = {
  * }} PrimeField
  */
 /** @type {(p: bigint) => PrimeField} */
-declare const prime_field: (p: bigint) => PrimeField;
+export const prime_field: (p: bigint) => PrimeField;
+/** @type {(f: PrimeField) => (a: bigint) => bigint|null} */
+export const sqrt: (f: PrimeField) => (a: bigint) => bigint | null;
+export type Reduce = Operator.Reduce<bigint>;
+export type Unary = Operator.Unary<bigint, bigint>;
+export type PrimeField = {
+    readonly p: bigint;
+    readonly middle: bigint;
+    readonly max: bigint;
+    readonly neg: Unary;
+    readonly sub: Reduce;
+    readonly add: Reduce;
+    readonly abs: Unary;
+    readonly mul: Reduce;
+    readonly reciprocal: Unary;
+    readonly div: Reduce;
+    readonly pow: Reduce;
+    readonly pow2: Unary;
+    readonly pow3: Unary;
+};
 import * as Operator from '../types/function/operator/module.f.mjs';

package/prime_field/module.f.mjs

@@ -1,6 +1,6 @@
 // @ts-self-types="./module.f.d.mts"
 import * as Operator from '../types/function/operator/module.f.mjs'
-import bi from '../types/bigint/module.f.mjs'
+import * as bi from '../types/bigint/module.f.mjs'
 const { scalar_mul } = bi
 
 /** @typedef {Operator.Reduce<bigint>} Reduce */
@@ -26,7 +26,7 @@ const { scalar_mul } = bi
  */
 
 /** @type {(p: bigint) => PrimeField} */
-const prime_field = p => {
+export const prime_field = p => {
     /** @type {Reduce} */
     const sub = a => b => {
         const r = a - b
@@ -77,15 +77,12 @@ const prime_field = p => {
     }
 }
 
-export default {
-    prime_field,
-    /** @type {(f: PrimeField) => (a: bigint) => bigint|null} */
-    sqrt: ({p, mul, pow }) => {
-        if ((p & 3n) !== 3n) { throw 'sqrt' }
-        const sqrt_k = (p + 1n) >> 2n
-        return a => {
-            const result = pow(a)(sqrt_k)
-            return mul(result)(result) === a ? result : null
-        }
+/** @type {(f: PrimeField) => (a: bigint) => bigint|null} */
+export const sqrt = ({p, mul, pow }) => {
+    if ((p & 3n) !== 3n) { throw 'sqrt' }
+    const sqrt_k = (p + 1n) >> 2n
+    return a => {
+        const result = pow(a)(sqrt_k)
+        return mul(result)(result) === a ? result : null
     }
 }

package/prime_field/test.f.mjs

@@ -1,4 +1,4 @@
-import _ from './module.f.mjs'
+import * as _ from './module.f.mjs'
 const { prime_field, sqrt } = _
 
 export default {

package/secp/module.f.d.mts

@@ -1,27 +1,3 @@
-declare namespace _default {
-    export { curve };
-    export let eq: (a: Point) => (b: Point) => boolean;
-    export let secp256k1: Init;
-    export let secp192r1: Init;
-}
-export default _default;
-export type Point2D = readonly [bigint, bigint];
-export type Point = Point2D | null;
-export type Init = {
-    readonly p: bigint;
-    readonly a: readonly [bigint, bigint];
-    readonly g: readonly [bigint, bigint];
-    readonly n: bigint;
-};
-export type Curve = {
-    readonly pf: Pf.PrimeField;
-    readonly nf: Pf.PrimeField;
-    readonly y2: (x: bigint) => bigint;
-    readonly y: (x: bigint) => bigint | null;
-    readonly neg: (a: Point) => Point;
-    readonly add: Operator.Reduce<Point>;
-    readonly mul: (a: Point) => (n: bigint) => Point;
-};
 /** @typedef {readonly[bigint, bigint]} Point2D */
 /** @typedef {Point2D|null} Point */
 /**
@@ -34,8 +10,8 @@ export type Curve = {
  */
 /**
  * @typedef {{
- *  readonly pf: Pf.PrimeField
- *  readonly nf: Pf.PrimeField
+ *  readonly pf: pf.PrimeField
+ *  readonly nf: pf.PrimeField
  *  readonly y2: (x: bigint) => bigint
  *  readonly y: (x: bigint) => bigint|null
  *  readonly neg: (a: Point) => Point
@@ -44,6 +20,29 @@ export type Curve = {
  * }} Curve
  */
 /** @type {(i: Init) => Curve} */
-declare const curve: (i: Init) => Curve;
-import * as Pf from '../prime_field/module.f.mjs';
+export const curve: (i: Init) => Curve;
+/** @type {(a: Point) => (b: Point) => boolean} */
+export const eq: (a: Point) => (b: Point) => boolean;
+/** @type {Init} */
+export const secp256k1: Init;
+/** @type {Init} */
+export const secp192r1: Init;
+export type Point2D = readonly [bigint, bigint];
+export type Point = Point2D | null;
+export type Init = {
+    readonly p: bigint;
+    readonly a: readonly [bigint, bigint];
+    readonly g: readonly [bigint, bigint];
+    readonly n: bigint;
+};
+export type Curve = {
+    readonly pf: pf.PrimeField;
+    readonly nf: pf.PrimeField;
+    readonly y2: (x: bigint) => bigint;
+    readonly y: (x: bigint) => bigint | null;
+    readonly neg: (a: Point) => Point;
+    readonly add: Operator.Reduce<Point>;
+    readonly mul: (a: Point) => (n: bigint) => Point;
+};
+import * as pf from '../prime_field/module.f.mjs';
 import * as Operator from '../types/function/operator/module.f.mjs';