functionalscript 0.3.10 → 0.3.12

package/bnf/test.f.js

@@ -0,0 +1,368 @@
+import { firstSet, setOp } from "./module.f.js";
+import * as j from "../json/module.f.js";
+import { sort } from "../types/object/module.f.js";
+const stringify = j.stringify(sort);
+const eq = (a, e) => () => {
+    const r = stringify(firstSet(a));
+    if (r !== e) {
+        throw [r, e];
+    }
+};
+// https://www.json.org/json-en.html
+const classic = () => {
+    // {"empty":true,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32]]}
+    const ws = () => ({ or: [
+            [],
+            ['\t', ws], // 9
+            ['\n', ws], // 10
+            ['\r', ws], // 13
+            [' ', ws], // 32
+        ] });
+    // {"empty":true,"map":[[false,42],[true,43],[false,44],[true,45]]}
+    const sign = { or: [
+            [],
+            '+', // 43
+            '-', // 45
+        ] };
+    // {"empty":false,"map":[[false,48],[true,57]]}
+    const onenine = [0x31, 0x39];
+    // {"empty":false,"map":[[false,47],[true,57]]}
+    const digit = { or: [
+            '0',
+            onenine,
+        ] };
+    // {"empty":false,"map":[[false,47],[true,57]]}
+    const digits = () => ({ or: [
+            digit,
+            [digit, digits]
+        ] });
+    // {"empty":true,"map":[[false,68],[true,69],[false,100],[true,101]]}
+    const exponent = { or: [
+            [],
+            ['E', sign, digits], // 69
+            ['e', sign, digits], // 101
+        ] };
+    // {"empty":true,"map":[[false,45],[true,46]]}
+    const fraction = { or: [
+            [],
+            ['.', digits] // 46
+        ] };
+    // {"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}
+    const integer = { or: [
+            digit, // 48-57
+            [onenine, digits],
+            ['-', digit], // 45
+            ['-', onenine, digits],
+        ] };
+    // {"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}
+    const number = [integer, fraction, exponent];
+    // {"empty":false,"map":[[false,47],[true,57],[false,64],[true,70],[false,96],[true,102]]}
+    const hex = { or: [
+            digit, // 48-57
+            [0x41, 0x46], // A..F
+            [0x61, 0x66], // a..f
+        ] };
+    // {"empty":false,"map":[[false,33],[true,34],[false,46],[true,47],[false,91],[true,92],[false,97],[true,98],[false,101],[true,102],[false,109],[true,110],[false,113],[true,114],[false,115],[true,117]]}
+    const escape = { or: [
+            '"', //  34
+            '/', //  47
+            '\\', //  92
+            'b', //  98
+            'f', // 102
+            'n', // 110
+            'r', // 114
+            't', // 116
+            ['u', hex, hex, hex, hex] // 117
+        ] };
+    // {"empty":false,"map":[[false,31],[true,33],[false,34],[true,1114111]]}
+    const character = { or: [
+            [0x20, 0x21], // exclude '"' 0x22
+            [0x23, 0x5B], // exclude '\' 0x5C
+            [0x5D, 0x10FFFF], // 93-1114111
+            ['\\', escape], // 92
+        ] };
+    // {"empty":true,"map":[[false,31],[true,33],[false,34],[true,1114111]]}
+    const characters = () => ({ or: [
+            [],
+            [character, characters]
+        ] });
+    // {"empty":false,"map":[[false,33],[true,34]]}
+    const string = ['"', characters, '"'];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const element = () => [ws, value, ws];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const elements = () => ({ or: [
+            element,
+            [element, ',', elements]
+        ] });
+    // {"empty":false,"map":[[false,90],[true,91]]}
+    const array = { or: [
+            ['[', ws, ']'], // 91
+            ['[', elements, ']'],
+        ] };
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}
+    const member = [ws, string, ws, ':', element];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}
+    const members = () => ({ or: [
+            member,
+            [member, ',', members],
+        ] });
+    // {"empty":false,"map":[[false,122],[true,123]]}
+    const object = { or: [
+            ['{', ws, '}'], // 123
+            ['{', members, '}'],
+        ] };
+    // {"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const value = { or: [
+            object, // 123
+            array, // 91
+            string, // 34
+            number, // 45, 48-57
+            'true', // 116
+            'false', // 102
+            'null', // 110
+        ] };
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const json = element;
+    return {
+        ws: eq(ws, '{"empty":true,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32]]}'),
+        sign: eq(sign, '{"empty":true,"map":[[false,42],[true,43],[false,44],[true,45]]}'),
+        digits: eq(digits, '{"empty":false,"map":[[false,47],[true,57]]}'),
+        exponent: eq(exponent, '{"empty":true,"map":[[false,68],[true,69],[false,100],[true,101]]}'),
+        fraction: eq(fraction, '{"empty":true,"map":[[false,45],[true,46]]}'),
+        onenine: eq(onenine, '{"empty":false,"map":[[false,48],[true,57]]}'),
+        digit: eq(digit, '{"empty":false,"map":[[false,47],[true,57]]}'),
+        string: eq(string, '{"empty":false,"map":[[false,33],[true,34]]}'),
+        member: eq(member, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}'),
+        members: eq(members, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}'),
+        object: eq(object, '{"empty":false,"map":[[false,122],[true,123]]}'),
+        array: eq(array, '{"empty":false,"map":[[false,90],[true,91]]}'),
+        integer: eq(integer, '{"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}'),
+        number: eq(number, '{"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}'),
+        value: eq(value, '{"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        element: eq(element, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        elements: eq(elements, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        json: eq(json, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        hex: eq(hex, '{"empty":false,"map":[[false,47],[true,57],[false,64],[true,70],[false,96],[true,102]]}'),
+        escape: eq(escape, '{"empty":false,"map":[[false,33],[true,34],[false,46],[true,47],[false,91],[true,92],[false,97],[true,98],[false,101],[true,102],[false,109],[true,110],[false,113],[true,114],[false,115],[true,117]]}'),
+        character: eq(character, '{"empty":false,"map":[[false,31],[true,33],[false,34],[true,1114111]]}'),
+        characters: eq(characters, '{"empty":true,"map":[[false,31],[true,33],[false,34],[true,1114111]]}'),
+    };
+};
+const deterministic = () => {
+    // {"empty":true,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32]]}
+    const ws = () => ({ or: [
+            [],
+            ['\t', ws], // 9
+            ['\n', ws], // 10
+            ['\r', ws], // 13
+            [' ', ws], // 32
+        ] });
+    // {"empty":true,"map":[[false,42],[true,43],[false,44],[true,45]]}
+    const sign = { or: [
+            [],
+            '+', // 43
+            '-', // 45
+        ] };
+    // {"empty":false,"map":[[false,48],[true,57]]}
+    const onenine = [0x31, 0x39];
+    // {"empty":false,"map":[[false,47],[true,57]]}
+    const digit = { or: [
+            '0',
+            onenine,
+        ] };
+    // {"empty":true,"map":[[false,47],[true,57]]}
+    const digits1 = () => ({ or: [
+            [],
+            [digit, digits1]
+        ]
+    });
+    // {"empty":false,"map":[[false,47],[true,57]]}
+    const digits = [digit, digits1];
+    // {"empty":true,"map":[[false,68],[true,69],[false,100],[true,101]]}
+    const exponent = { or: [
+            [],
+            ['E', sign, digits], // 69
+            ['e', sign, digits], // 101
+        ] };
+    // {"empty":true,"map":[[false,45],[true,46]]}
+    const fraction = { or: [
+            [],
+            ['.', digits] // 46
+        ] };
+    // {"empty":false,"map":[[false,47],[true,57]]}
+    const integer1 = { or: [
+            '0', // 48
+            [onenine, digits1], // 49-57
+        ] };
+    // {"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}
+    const integer = { or: [
+            integer1, // 48-57
+            ['-', integer1], // 45
+        ] };
+    // {"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}
+    const number = [integer, fraction, exponent];
+    // {"empty":false,"map":[[false,47],[true,57],[false,64],[true,70],[false,96],[true,102]]}
+    const hex = { or: [
+            digit, // 48-57
+            [0x41, 0x46], // A..F
+            [0x61, 0x66], // a..f
+        ] };
+    // {"empty":false,"map":[[false,33],[true,34],[false,46],[true,47],[false,91],[true,92],[false,97],[true,98],[false,101],[true,102],[false,109],[true,110],[false,113],[true,114],[false,115],[true,117]]}
+    const escape = { or: [
+            '"', //  34
+            '/', //  47
+            '\\', //  92
+            'b', //  98
+            'f', // 102
+            'n', // 110
+            'r', // 114
+            't', // 116
+            ['u', hex, hex, hex, hex] // 117
+        ] };
+    // {"empty":false,"map":[[false,31],[true,33],[false,34],[true,1114111]]}
+    const character = { or: [
+            [0x20, 0x21], // exclude '"' 0x22
+            [0x23, 0x5B], // exclude '\' 0x5C
+            [0x5D, 0x10FFFF], // 93-1114111
+            ['\\', escape], // 92
+        ] };
+    // {"empty":true,"map":[[false,31],[true,33],[false,34],[true,1114111]]}
+    const characters = () => ({ or: [
+            [],
+            [character, characters]
+        ] });
+    // {"empty":false,"map":[[false,33],[true,34]]}
+    const string = ['"', characters, '"'];
+    // {"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const element1 = () => [value, ws];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const element = [ws, element1];
+    // {"empty":true,"map":[[false,43],[true,44]]}
+    const elements2 = () => ({ or: [
+            [],
+            [',', elements] // 44
+        ] });
+    // {"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const elements1 = [element1, elements2];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const elements = [ws, elements1];
+    // {"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,92],[true,93],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const array1 = { or: [
+            [']'], // 93
+            [elements1, ']'],
+        ] };
+    // {"empty":false,"map":[[false,90],[true,91]]}
+    const array = ['[', ws, array1];
+    // {"empty":false,"map":[[false,33],[true,34]]}
+    const member1 = [string, ws, ':', element];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}
+    const member = [ws, member1];
+    // {"empty":true,"map":[[false,43],[true,44]]}
+    const members2 = () => ({ or: [
+            [],
+            [',', members], // 44
+        ] });
+    // {"empty":false,"map":[[false,33],[true,34]]}
+    const members1 = [member1, members2];
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}
+    const members = [ws, members1];
+    // {"empty":false,"map":[[false,33],[true,34],[false,124],[true,125]]}
+    const object1 = { or: [
+            ['}'], // 125
+            [members1, '}'],
+        ] };
+    // {"empty":false,"map":[[false,122],[true,123]]}
+    const object = ['{', ws, object1];
+    // {"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const value = { or: [
+            object, // 123
+            array, // 91
+            string, // 34
+            number, // 45, 48-57
+            'true', // 116
+            'false', // 102
+            'null', // 110
+        ] };
+    // {"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}
+    const json = element;
+    return {
+        ws: eq(ws, '{"empty":true,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32]]}'),
+        sign: eq(sign, '{"empty":true,"map":[[false,42],[true,43],[false,44],[true,45]]}'),
+        digits1: eq(digits1, '{"empty":true,"map":[[false,47],[true,57]]}'),
+        digits: eq(digits, '{"empty":false,"map":[[false,47],[true,57]]}'),
+        exponent: eq(exponent, '{"empty":true,"map":[[false,68],[true,69],[false,100],[true,101]]}'),
+        fraction: eq(fraction, '{"empty":true,"map":[[false,45],[true,46]]}'),
+        onenine: eq(onenine, '{"empty":false,"map":[[false,48],[true,57]]}'),
+        digit: eq(digit, '{"empty":false,"map":[[false,47],[true,57]]}'),
+        string: eq(string, '{"empty":false,"map":[[false,33],[true,34]]}'),
+        member1: eq(member1, '{"empty":false,"map":[[false,33],[true,34]]}'),
+        member: eq(member, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}'),
+        members2: eq(members2, '{"empty":true,"map":[[false,43],[true,44]]}'),
+        members1: eq(members1, '{"empty":false,"map":[[false,33],[true,34]]}'),
+        members: eq(members, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34]]}'),
+        object1: eq(object1, '{"empty":false,"map":[[false,33],[true,34],[false,124],[true,125]]}'),
+        object: eq(object, '{"empty":false,"map":[[false,122],[true,123]]}'),
+        array1: eq(array1, '{"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,92],[true,93],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        array: eq(array, '{"empty":false,"map":[[false,90],[true,91]]}'),
+        integer1: eq(integer1, '{"empty":false,"map":[[false,47],[true,57]]}'),
+        integer: eq(integer, '{"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}'),
+        number: eq(number, '{"empty":false,"map":[[false,44],[true,45],[false,47],[true,57]]}'),
+        value: eq(value, '{"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        element1: eq(element1, '{"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        element: eq(element, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        elements2: eq(elements2, '{"empty":true,"map":[[false,43],[true,44]]}'),
+        elements1: eq(elements1, '{"empty":false,"map":[[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        elements: eq(elements, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        json: eq(json, '{"empty":false,"map":[[false,8],[true,10],[false,12],[true,13],[false,31],[true,32],[false,33],[true,34],[false,44],[true,45],[false,47],[true,57],[false,90],[true,91],[false,101],[true,102],[false,109],[true,110],[false,115],[true,116],[false,122],[true,123]]}'),
+        hex: eq(hex, '{"empty":false,"map":[[false,47],[true,57],[false,64],[true,70],[false,96],[true,102]]}'),
+        escape: eq(escape, '{"empty":false,"map":[[false,33],[true,34],[false,46],[true,47],[false,91],[true,92],[false,97],[true,98],[false,101],[true,102],[false,109],[true,110],[false,113],[true,114],[false,115],[true,117]]}'),
+        character: eq(character, '{"empty":false,"map":[[false,31],[true,33],[false,34],[true,1114111]]}'),
+        characters: eq(characters, '{"empty":true,"map":[[false,31],[true,33],[false,34],[true,1114111]]}'),
+    };
+};
+//
+export default {
+    example: {
+        module: () => {
+            const grammar = [
+                { or: [[65, 90], [97, 122], [48, 57]] }, // Matches 'A-Z', 'a-z', and '0-9'
+            ];
+            const s = firstSet(grammar);
+            if (s.empty) {
+                throw s;
+            }
+            if (setOp.get('0'.codePointAt(0))(s.map) !== true) {
+                throw s;
+            }
+            if (setOp.get('h'.codePointAt(0))(s.map) !== true) {
+                throw s;
+            }
+            if (setOp.get('$'.codePointAt(0))(s.map) !== false) {
+                throw s;
+            }
+        },
+        types: () => {
+            const alpha = [65, 90]; // Matches 'A-Z'
+            const id2 = [alpha, alpha]; // Matches two uppercase letters
+            const digit = [48, 57]; // Matches '0-9'
+            // Matches two uppercase letters or one digit
+            const id2OrDigit = { or: [
+                    id2,
+                    digit,
+                ] };
+            // Matches 'true', 'false'
+            const bool = { or: [
+                    'true',
+                    'false',
+                ] };
+            const id = () => [alpha, { or: [
+                        [], // Empty
+                        id // Recursive
+                    ] }];
+            const _ = [id2OrDigit, bool, id];
+        }
+    },
+    classic,
+    deterministic,
+};

package/crypto/prime_field/module.f.d.ts

@@ -1,6 +1,4 @@
-import type * as Operator from '../../types/function/operator/module.f.ts';
-type Reduce = Operator.Reduce<bigint>;
-type Unary = Operator.Unary<bigint, bigint>;
+import type { Unary, Reduce } from '../../types/bigint/module.f.ts';
 /**
  * A type representing a prime field and its associated operations.
  */
@@ -40,4 +38,3 @@ export declare const prime_field: (p: bigint) => PrimeField;
  * ```
  */
 export declare const sqrt: ({ p, mul, pow }: PrimeField) => (a: bigint) => bigint | null;
-export {};

package/crypto/secp/module.f.d.ts

@@ -1,4 +1,4 @@
-import type * as Operator from '../../types/function/operator/module.f.ts';
+import type { Reduce } from '../../types/function/operator/module.f.ts';
 import { type PrimeField } from '../prime_field/module.f.ts';
 /**
  * A 2D point represented as a pair of `bigint` values `[x, y]`.
@@ -27,7 +27,7 @@ type Curve = {
     readonly y2: (x: bigint) => bigint;
     readonly y: (x: bigint) => bigint | null;
     readonly neg: (a: Point) => Point;
-    readonly add: Operator.Reduce<Point>;
+    readonly add: Reduce<Point>;
     readonly mul: (a: Point) => (n: bigint) => Point;
 };
 /**

package/dev/test/module.f.js

@@ -23,7 +23,8 @@ export default (input) => {
                     if (v.length === 0) {
                         const [[s, r], delta, state0] = measure(() => tryCatch(v))(state);
                         state = state0;
-                        if (s === 'error') {
+                        // Usual tests throw on error, but if the function name is 'throw', then the test passes if it throws.
+                        if ((s === 'error') === (v.name !== 'throw')) {
                             ts = addFail(delta)(ts);
                             if (isGitHub) {
                                 // https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions

package/fsc/module.f.js

@@ -1,15 +1,13 @@
-import * as operator from "../types/function/operator/module.f.js";
+import { strictEqual } from "../types/function/operator/module.f.js";
 import { merge as rangeMapMerge, fromRange, get, } from "../types/range_map/module.f.js";
-import * as list from "../types/list/module.f.js";
-const { reduce: listReduce } = list;
+import { reduce as listReduce, toArray, map } from "../types/list/module.f.js";
 import { range as asciiRange } from "../text/ascii/module.f.js";
 import { fn } from "../types/function/module.f.js";
 import { one } from "../types/range/module.f.js";
-const { toArray, map } = list;
 const fromCharCode = String.fromCharCode;
 const unexpectedSymbol = codePoint => [[`unexpected symbol ${codePoint}`], unexpectedSymbol];
 const def = () => unexpectedSymbol;
-const union = a => b => {
+const union = (a) => (b) => {
     if (a === def || a === b) {
         return b;
     }
@@ -22,7 +20,8 @@ const empty = [];
 const reduce = (a) => {
     const merge = rangeMapMerge({
         union,
-        equal: operator.strictEqual,
+        equal: strictEqual,
+        def,
     });
     return toArray(listReduce(merge)(empty)(a));
 };

package/fsm/module.f.d.ts

@@ -1,13 +1,13 @@
-import * as list from '../types/list/module.f.ts';
-import * as byteSet from '../types/byte_set/module.f.ts';
-import * as rangeMap from '../types/range_map/module.f.ts';
-type Rule = readonly [string, byteSet.ByteSet, string];
-export type Grammar = list.List<Rule>;
+import { type List } from '../types/list/module.f.ts';
+import { type ByteSet } from '../types/byte_set/module.f.ts';
+import { type RangeMapArray } from '../types/range_map/module.f.ts';
+type Rule = readonly [string, ByteSet, string];
+export type Grammar = List<Rule>;
 type Dfa = {
-    readonly [state in string]: rangeMap.RangeMapArray<string>;
+    readonly [state in string]: RangeMapArray<string>;
 };
-export declare const toRange: (s: string) => byteSet.ByteSet;
-export declare const toUnion: (s: string) => byteSet.ByteSet;
+export declare const toRange: (s: string) => ByteSet;
+export declare const toUnion: (s: string) => ByteSet;
 export declare const dfa: (grammar: Grammar) => Dfa;
-export declare const run: (dfa: Dfa) => (input: list.List<number>) => list.List<string>;
+export declare const run: (dfa: Dfa) => (input: List<number>) => List<string>;
 export {};

package/fsm/module.f.js

@@ -1,32 +1,23 @@
-import * as list from "../types/list/module.f.js";
-const { equal, isEmpty, fold, toArray, scan, foldScan, empty: emptyList } = list;
-import * as byteSet from "../types/byte_set/module.f.js";
-const { toRangeMap, union: byteSetUnion, one, empty } = byteSet;
-import * as sortedSet from "../types/sorted_set/module.f.js";
-const { intersect, union: sortedSetUnion } = sortedSet;
-import * as rangeMap from "../types/range_map/module.f.js";
-const { merge } = rangeMap;
-import * as cmp from "../types/function/compare/module.f.js";
-const { unsafeCmp } = cmp;
-import * as operator from "../types/function/operator/module.f.js";
-const { strictEqual } = operator;
-import * as j from "../json/module.f.js";
-const { stringify } = j;
-import * as f from "../types/function/module.f.js";
-const { identity } = f;
-import * as utf16 from "../text/utf16/module.f.js";
-const { stringToList } = utf16;
+import { equal, isEmpty, fold, toArray, scan, foldScan, empty as emptyList } from "../types/list/module.f.js";
+import { toRangeMap, union as byteSetUnion, one, empty, range } from "../types/byte_set/module.f.js";
+import { intersect, union as sortedSetUnion } from "../types/sorted_set/module.f.js";
+import { merge, get as rangeMapGet } from "../types/range_map/module.f.js";
+import { unsafeCmp } from "../types/function/compare/module.f.js";
+import { strictEqual } from "../types/function/operator/module.f.js";
+import { stringify } from "../json/module.f.js";
+import { identity } from "../types/function/module.f.js";
+import { stringToList } from "../text/utf16/module.f.js";
 const stringifyIdentity = stringify(identity);
 export const toRange = s => {
     const [b, e] = toArray(stringToList(s));
-    return byteSet.range([b, e]);
+    return range([b, e]);
 };
 const toUnionOp = i => bs => byteSetUnion(bs)(one(i));
 export const toUnion = s => {
     const codePoints = stringToList(s);
     return fold(toUnionOp)(empty)(codePoints);
 };
-const mergeOp = { union: sortedSetUnion(unsafeCmp), equal: equal(strictEqual) };
+const mergeOp = { union: sortedSetUnion(unsafeCmp), equal: equal(strictEqual), def: [] };
 const hasState = s => set => !isEmpty(intersect(unsafeCmp)([s])(set));
 const foldOp = set => ([ruleIn, bs, ruleOut]) => rm => {
     if (hasState(ruleIn)(set)) {
@@ -54,6 +45,6 @@ const emptyStateStringify = stringifyIdentity(emptyState);
 const initialState = [''];
 const initialStateStringify = stringifyIdentity(initialState);
 export const dfa = grammar => addEntry(grammar)(initialState)({});
-const get = rangeMap.get(emptyStateStringify);
+const get = rangeMapGet(emptyStateStringify);
 const runOp = dfa => input => s => get(input)(dfa[s]);
-export const run = dfa => input => foldScan(runOp(dfa))(initialStateStringify)(input);
+export const run = (dfa) => (input) => foldScan(runOp(dfa))(initialStateStringify)(input);

package/html/module.f.js

@@ -1,8 +1,7 @@
 import { map, flatMap, flat, concat as listConcat } from "../types/list/module.f.js";
 import { concat as stringConcat } from "../types/string/module.f.js";
 import { compose } from "../types/function/module.f.js";
-import * as utf16 from "../text/utf16/module.f.js";
-const { stringToList } = utf16;
+import { stringToList } from "../text/utf16/module.f.js";
 const { fromCharCode } = String;
 const { entries } = Object;
 /**

package/issues/31-json.f.d.ts

@@ -0,0 +1 @@
+type TerminalRange = readonly [number, number];