functionalscript 0.6.11 → 0.7.0

package/bnf/data/module.f.d.ts

@@ -1,3 +1,5 @@
+import { type CodePoint } from '../../text/utf16/module.f.ts';
+import { type RangeMapArray } from '../../types/range_map/module.f.ts';
 import { type Rule as FRule } from '../module.f.ts';
 export type TerminalRange = number;
 export type Sequence = readonly string[];
@@ -8,7 +10,44 @@ export type Variant = {
 export type Rule = Variant | Sequence | TerminalRange;
 /** The full grammar */
 export type RuleSet = Readonly<Record<string, Rule>>;
+type EmptyTag = string | true | undefined;
+type DispatchRule = {
+    readonly emptyTag: EmptyTag;
+    readonly rangeMap: Dispatch;
+};
+type Dispatch = RangeMapArray<DispatchResult>;
+type DispatchResult = DispatchRuleCollection | null;
+type DispatchRuleCollection = {
+    readonly tag: string | undefined;
+    readonly rules: DispatchRule[];
+};
+type DispatchMap = {
+    readonly [id in string]: DispatchRule;
+};
+/**
+ * Represents a parsed Abstract Syntax Tree (AST) sequence.
+ */
+export type AstSequence = readonly (AstRule | CodePoint)[];
+/**
+ * Represents a parsed AST rule, consisting of a rule name and its parsed sequence.
+ */
+export type AstRule = readonly [string, AstSequence];
+/**
+ * Represents the remaining input after a match attempt, or `null` if no match is possible.
+ */
+export type Remainder = readonly CodePoint[] | null;
+/**
+ * Represents the result of a match operation, including the parsed AST rule and the remainder of the input.
+ */
+export type MatchResult = readonly [AstRule, Remainder];
+/**
+ * Represents an LL(1) parser function for matching input against grammar rules.
+ */
+export type Match = (name: string, s: readonly CodePoint[]) => MatchResult;
 export declare const toData: (fr: FRule) => readonly [RuleSet, string];
+export declare const dispatchMap: (ruleSet: RuleSet) => DispatchMap;
+export declare const parser: (fr: FRule) => Match;
+export {};
 /**
  * Either `{ variantItem: id }` or `id`.
  */

package/bnf/data/module.f.js

@@ -1,6 +1,9 @@
+import { todo } from "../../dev/module.f.js";
 import { stringToCodePointList } from "../../text/utf16/module.f.js";
+import { strictEqual } from "../../types/function/operator/module.f.js";
 import { map, toArray } from "../../types/list/module.f.js";
-import { oneEncode, } from "../module.f.js";
+import { rangeMap } from "../../types/range_map/module.f.js";
+import { oneEncode, rangeDecode, } from "../module.f.js";
 const { entries } = Object;
 const find = (map) => (fr) => {
     for (const [k, v] of entries(map)) {
@@ -74,7 +77,87 @@ export const toData = (fr) => {
     const [, ruleSet, id] = toDataAdd({})(fr);
     return [ruleSet, id];
 };
-// type Dispatch = RangeMapArray<string>;
+const dispatchOp = rangeMap({
+    union: a => b => {
+        if (a === null) {
+            return b;
+        }
+        if (b === null) {
+            return a;
+        }
+        throw ['can not merge [', a, '][', b, ']'];
+    },
+    equal: strictEqual,
+    def: null,
+});
+export const dispatchMap = (ruleSet) => {
+    const addRuleToDispatch = (dr, rule) => {
+        if (dr === null)
+            return null;
+        return { tag: dr.tag, rules: [...dr.rules, rule] };
+    };
+    const addTagToDispatch = (dr, tag) => {
+        if (dr === null)
+            return null;
+        return { tag, rules: dr.rules };
+    };
+    const dispatchRule = (dm, name) => {
+        if (name in dm) {
+            return dm;
+        }
+        const rule = ruleSet[name];
+        if (typeof rule === 'number') {
+            const range = rangeDecode(rule);
+            const dispatch = dispatchOp.fromRange(range)({ tag: undefined, rules: [] });
+            const dr = { emptyTag: undefined, rangeMap: dispatch };
+            return { ...dm, [name]: dr };
+        }
+        else if (rule instanceof Array) {
+            let emptyTag = true;
+            let result = [];
+            for (const item of rule) {
+                dm = dispatchRule(dm, item);
+                const dr = dm[item];
+                if (emptyTag === true) {
+                    result = toArray(dispatchOp.merge(result)(dr.rangeMap));
+                    emptyTag = dr.emptyTag !== undefined ? true : undefined;
+                }
+                else {
+                    result = result.map(x => [addRuleToDispatch(x[0], dr), x[1]]);
+                }
+            }
+            const dr = { emptyTag, rangeMap: result };
+            return { ...dm, [name]: dr };
+        }
+        else {
+            const entries = Object.entries(rule);
+            let result = [];
+            let emptyTag = undefined;
+            for (const [tag, item] of entries) {
+                dm = dispatchRule(dm, item);
+                const dr = dm[item];
+                if (dr.emptyTag !== undefined) {
+                    emptyTag = tag;
+                }
+                else {
+                    const d = dr.rangeMap.map(x => [addTagToDispatch(x[0], tag), x[1]]);
+                    result = toArray(dispatchOp.merge(result)(d));
+                }
+            }
+            const dr = { emptyTag, rangeMap: result };
+            return { ...dm, [name]: dr };
+        }
+    };
+    let result = {};
+    for (const k in ruleSet) {
+        result = dispatchRule(result, k);
+    }
+    return result;
+};
+export const parser = (fr) => {
+    const data = toData(fr);
+    return todo();
+};
 /**
  * Either `{ variantItem: id }` or `id`.
  */

package/bnf/data/test.f.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     toData: (() => void)[];
     variantTest: () => void;
+    dispatch: (() => void)[];
     example: () => void;
 };
 export default _default;

package/bnf/data/test.f.js

@@ -2,7 +2,7 @@ import { stringify } from "../../json/module.f.js";
 import { sort } from "../../types/object/module.f.js";
 import { range } from "../module.f.js";
 import { classic, deterministic } from "../testlib.f.js";
-import { toData } from "./module.f.js";
+import { dispatchMap, toData } from "./module.f.js";
 export default {
     toData: [
         () => {
@@ -62,6 +62,54 @@ export default {
             throw result;
         }
     },
+    dispatch: [
+        () => {
+            const terminalRangeRule = range('AF');
+            const data = toData(terminalRangeRule);
+            const dm = dispatchMap(data[0]);
+            const result = JSON.stringify(dm);
+            if (result != '{"":{"rangeMap":[[null,64],[{"rules":[]},70]]}}') {
+                throw result;
+            }
+        },
+        () => {
+            const stringRule = 'AB';
+            const data = toData(stringRule);
+            const dm = dispatchMap(data[0]);
+            const result = JSON.stringify(dm);
+            if (result != '{"0":{"rangeMap":[[null,64],[{"rules":[]},65]]},"1":{"rangeMap":[[null,65],[{"rules":[]},66]]},"":{"rangeMap":[[null,64],[{"rules":[{"rangeMap":[[null,65],[{"rules":[]},66]]}]},65]]}}') {
+                throw result;
+            }
+        },
+        () => {
+            const emptyRule = '';
+            const data = toData(emptyRule);
+            const dm = dispatchMap(data[0]);
+            const result = JSON.stringify(dm);
+            if (result != '{"":{"emptyTag":true,"rangeMap":[]}}') {
+                throw result;
+            }
+        },
+        () => {
+            const variantRule = { 'a': range('AA'), 'b': range('BB') };
+            const data = toData(variantRule);
+            const dm = dispatchMap(data[0]);
+            const result = JSON.stringify(dm);
+            if (result != '{"0":{"rangeMap":[[null,64],[{"rules":[]},65]]},"1":{"rangeMap":[[null,65],[{"rules":[]},66]]},"":{"rangeMap":[[null,64],[{"tag":"a","rules":[]},65],[{"tag":"b","rules":[]},66]]}}') {
+                throw result;
+            }
+        },
+        () => {
+            const emptyRule = '';
+            const variantRule = { 'e': emptyRule, 'a': range('AA') };
+            const data = toData(variantRule);
+            const dm = dispatchMap(data[0]);
+            const result = JSON.stringify(dm);
+            if (result != '{"0":{"emptyTag":true,"rangeMap":[]},"1":{"rangeMap":[[null,64],[{"rules":[]},65]]},"":{"emptyTag":"e","rangeMap":[[null,64],[{"tag":"a","rules":[]},65]]}}') {
+                throw result;
+            }
+        },
+    ],
     example: () => {
         const grammar = {
             space: 0x000020_000020,

package/dev/test.f.js

@@ -18,7 +18,7 @@ export default {
     ctorUndefined: () => {
         /** @type {any} */
         const o = {
-            constructor: void 0
+            constructor: undefined
         };
         const c = o['constructor'];
         //console.log(c)

package/dev/tf/all.test.js

@@ -0,0 +1,43 @@
+import { io } from "../../io/module.js";
+import { loadModuleMap } from "../module.f.js";
+import { isTest, parseTestSet } from "./module.f.js";
+import * as nodeTest from 'node:test';
+const isBun = typeof Bun !== 'undefined';
+const createFramework = (fw) => (prefix, f) => fw.test(prefix, t => f((name, v) => t.test(name, v)));
+const createBunFramework = (fw) => (prefix, f) => f((name, v) => fw.test(`${prefix}: ${name}`, v));
+const framework = isBun ? createBunFramework(nodeTest) : createFramework(nodeTest);
+const parse = parseTestSet(io.tryCatch);
+const scanModule = (x) => async (subTestRunner) => {
+    let subTests = [x];
+    while (true) {
+        const [first, ...rest] = subTests;
+        if (first === undefined) {
+            break;
+        }
+        subTests = rest;
+        //
+        const [name, value] = first;
+        const set = parse(value);
+        if (typeof set === 'function') {
+            await subTestRunner(name, () => {
+                const r = set();
+                subTests = [...subTests, [`${name}()`, r]];
+            });
+        }
+        else {
+            for (const [j, y] of set) {
+                const pr = `${name}/${j}`;
+                subTests = [...subTests, [pr, y]];
+            }
+        }
+    }
+};
+const run = async () => {
+    const x = await loadModuleMap(io);
+    for (const [i, v] of Object.entries(x)) {
+        if (isTest(i)) {
+            framework(i, scanModule(['', v.default]));
+        }
+    }
+};
+await run();

package/dev/{test → tf}/module.f.d.ts

@@ -1,6 +1,6 @@
 import { type CsiConsole } from '../../text/sgr/module.f.ts';
 import type * as Result from '../../types/result/module.f.ts';
-import type { Io, Performance } from '../../io/module.f.ts';
+import type { Io, Performance, TryCatch } from '../../io/module.f.ts';
 import { type ModuleMap } from '../module.f.ts';
 type Log<T> = CsiConsole;
 type Measure<T> = <R>(f: () => R) => (state: T) => readonly [R, number, T];
@@ -14,6 +14,9 @@ type Input<T> = {
     readonly env: (n: string) => string | undefined;
 };
 export declare const isTest: (s: string) => boolean;
+export type Test = () => unknown;
+export type TestSet = Test | readonly (readonly [string, unknown])[];
+export declare const parseTestSet: (t: TryCatch) => (x: unknown) => TestSet;
 export declare const test: <T>(input: Input<T>) => readonly [number, T];
 export declare const anyLog: (f: (s: string) => void) => (s: string) => <T>(state: T) => T;
 export declare const measure: (p: Performance) => <R>(f: () => R) => <T>(state: T) => readonly [R, number, T];

package/dev/{test → tf}/module.f.js

@@ -13,49 +13,71 @@ const timeFormat = (a) => {
     const e = x.substring(s);
     return `${b}.${e} ms`;
 };
+export const parseTestSet = (t) => (x) => {
+    switch (typeof x) {
+        case 'function': {
+            if (x.length === 0) {
+                const xt = x;
+                if (xt.name !== 'throw') {
+                    return xt;
+                }
+                // Usual tests throw on error, but if the function name is 'throw',
+                // then the test passes if it throws.
+                return () => {
+                    const [tag, value] = t(xt);
+                    if (tag === 'ok') {
+                        throw value;
+                    }
+                    return value;
+                };
+            }
+            break;
+        }
+        case 'object': {
+            if (x !== null) {
+                return Object.entries(x);
+            }
+            break;
+        }
+    }
+    return [];
+};
 export const test = (input) => {
     let { moduleMap, log, error, measure, tryCatch, env, state } = input;
     const isGitHub = env('GITHUB_ACTION') !== undefined;
+    const parse = parseTestSet(tryCatch);
     const f = ([k, v]) => {
         const test = i => v => ([ts, state]) => {
             const next = test(`${i}| `);
-            switch (typeof v) {
-                case 'function': {
-                    if (v.length === 0) {
-                        const [[s, r], delta, state0] = measure(() => tryCatch(v))(state);
-                        state = state0;
-                        // 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
-                                // https://github.com/OndraM/ci-detector/blob/main/src/Ci/GitHubActions.php
-                                error(`::error file=${k},line=1,title=[3]['a']()::${r}`);
-                            }
-                            else {
-                                error(`${i}() ${fgRed}error${reset}, ${timeFormat(delta)}`);
-                                error(`${fgRed}${r}${reset}`);
-                            }
-                        }
-                        else {
-                            ts = addPass(delta)(ts);
-                            log(`${i}() ${fgGreen}ok${reset}, ${timeFormat(delta)}`);
-                        }
-                        [ts, state] = next(r)([ts, state]);
+            const set = parse(v);
+            if (typeof set === 'function') {
+                const [[s, r], delta, state0] = measure(() => tryCatch(set))(state);
+                state = state0;
+                if (s !== 'ok') {
+                    ts = addFail(delta)(ts);
+                    if (isGitHub) {
+                        // https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions
+                        // https://github.com/OndraM/ci-detector/blob/main/src/Ci/GitHubActions.php
+                        error(`::error file=${k},line=1,title=[3]['a']()::${r}`);
                     }
-                    break;
-                }
-                case 'object': {
-                    if (v !== null) {
-                        const f = ([k, v]) => ([time, state]) => {
-                            log(`${i}${k}:`);
-                            [time, state] = next(v)([time, state]);
-                            return [time, state];
-                        };
-                        [ts, state] = fold(f)([ts, state])(v instanceof Array ? entries(v) : Object.entries(v));
+                    else {
+                        error(`${i}() ${fgRed}error${reset}, ${timeFormat(delta)}`);
+                        error(`${fgRed}${r}${reset}`);
                     }
-                    break;
                 }
+                else {
+                    ts = addPass(delta)(ts);
+                    log(`${i}() ${fgGreen}ok${reset}, ${timeFormat(delta)}`);
+                    [ts, state] = next(r)([ts, state]);
+                }
+            }
+            else {
+                const f = ([k, v]) => ([time, state]) => {
+                    log(`${i}${k}:`);
+                    [time, state] = next(v)([time, state]);
+                    return [time, state];
+                };
+                [ts, state] = fold(f)([ts, state])(set);
             }
             return [ts, state];
         };

package/dev/tf/test.f.d.ts

@@ -0,0 +1,4 @@
+declare const _default: {
+    throw: () => never;
+};
+export default _default;

package/dev/tf/test.f.js

@@ -0,0 +1,5 @@
+export default {
+    throw: () => {
+        throw [() => { }, () => { }];
+    }
+};

package/io/module.f.d.ts

@@ -77,6 +77,7 @@ export type Process = {
     readonly stdout: Writable;
     readonly stderr: Writable;
 };
+export type TryCatch = <T>(f: () => T) => Result<T, unknown>;
 /**
  * Core IO operations interface providing access to system resources
  */
@@ -87,7 +88,7 @@ export type Io = {
     readonly asyncImport: (s: string) => Promise<Module>;
     readonly performance: Performance;
     readonly fetch: (url: string) => Promise<Response>;
-    readonly tryCatch: <T>(f: () => T) => Result<T, unknown>;
+    readonly tryCatch: TryCatch;
     readonly asyncTryCatch: <T>(f: () => Promise<T>) => Promise<Result<T, unknown>>;
 };
 /**

package/issues/test.f.d.ts

@@ -1,7 +1,12 @@
 declare const _default: {
     literal: () => void;
     ownProperty: {
-        nullish: () => void;
+        null: {
+            throw: () => PropertyDescriptor | undefined;
+        };
+        undefined: {
+            throw: () => PropertyDescriptor | undefined;
+        };
         bool: () => void;
         array: () => void;
         object: {

package/issues/test.f.js

@@ -6,19 +6,11 @@ export default {
         const m = '<html>Hello</html>';
     },
     ownProperty: {
-        nullish: () => {
-            /* // panic
-            const v = Object.getOwnPropertyDescriptor(null, 0)
-            if (v !== undefined) {
-                throw v
-            }
-            */
-            /* // panic
-            const v = Object.getOwnPropertyDescriptor(undefined, 0)
-            if (v !== undefined) {
-                throw v
-            }
-            */
+        null: {
+            throw: () => Object.getOwnPropertyDescriptor(null, 0),
+        },
+        undefined: {
+            throw: () => Object.getOwnPropertyDescriptor(undefined, 0),
         },
         bool: () => {
             const v = at(true)('x');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.6.11",
+  "version": "0.7.0",
   "type": "module",
   "files": [
     "**/*.js",
@@ -10,11 +10,12 @@
   "scripts": {
     "prepack": "tsc --NoEmit false",
     "git-clean": "git clean -xf",
-    "test20": "npm run prepack && node ./dev/test/module.js",
-    "test22": "tsc && node --experimental-strip-types ./dev/test/module.ts",
-    "test": "tsc && node ./dev/test/module.ts",
+    "test20": "npm run prepack && node --test",
+    "test22": "tsc && node --test --experimental-strip-types",
+    "test": "tsc && node --test",
     "index": "node ./dev/index/module.ts",
     "fsc": "node ./fsc/module.ts",
+    "fst": "node ./dev/tf/module.ts",
     "update": "npm run index && npm install"
   },
   "engines": {
@@ -22,7 +23,7 @@
   },
   "bin": {
     "fsc": "fsc/module.js",
-    "fst": "dev/test/module.js"
+    "fst": "dev/tf/module.js"
   },
   "repository": {
     "type": "git",
@@ -44,8 +45,8 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^24.0.15",
-    "@typescript/native-preview": "^7.0.0-dev.20250719.1",
-    "typescript": "^5.8.3"
+    "@types/node": "^24.2.0",
+    "@typescript/native-preview": "^7.0.0-dev.20250805.1",
+    "typescript": "^5.9.2"
   }
 }

package/text/module.f.d.ts

@@ -5,7 +5,6 @@ type ItemArray = readonly Item[];
 type ItemThunk = () => List<Item>;
 export type Item = string | ItemArray | ItemThunk;
 export declare const flat: (indent: string) => (text: Block) => List<string>;
-export declare const curly: (type: string) => (name: string) => (body: Block) => Block;
 /**
  * Converts a string to an UTF-8, represented as an MSB first bit vector.
  *

package/text/module.f.js

@@ -1,6 +1,6 @@
 import { msb, u8List, u8ListToVec } from "../types/bit_vec/module.f.js";
 import { flatMap } from "../types/list/module.f.js";
-import * as utf8 from "./utf8/module.f.js";
+import { fromCodePointList, toCodePointList } from "./utf8/module.f.js";
 import { stringToCodePointList, codePointListToString } from "./utf16/module.f.js";
 export const flat = (indent) => {
     const f = (prefix) => {
@@ -9,18 +9,18 @@ export const flat = (indent) => {
     };
     return f('');
 };
-export const curly = (type) => (name) => (body) => [`${type} ${name}`, '{', body, '}'];
+const u8ListToVecMsb = u8ListToVec(msb);
 /**
  * Converts a string to an UTF-8, represented as an MSB first bit vector.
  *
  * @param s The input string to be converted.
  * @returns The resulting UTF-8 bit vector, MSB first.
  */
-export const msbUtf8 = (s) => u8ListToVec(msb)(utf8.fromCodePointList(stringToCodePointList(s)));
+export const msbUtf8 = (s) => u8ListToVecMsb(fromCodePointList(stringToCodePointList(s)));
 /**
  * Converts a UTF-8 bit vector with MSB first encoding to a string.
  *
  * @param msbV - The UTF-8 bit vector with MSB first encoding.
  * @returns The resulting string.
  */
-export const msbUtf8ToString = (msbV) => codePointListToString(utf8.toCodePointList(u8List(msb)(msbV)));
+export const msbUtf8ToString = (msbV) => codePointListToString(toCodePointList(u8List(msb)(msbV)));

package/deno/module.d.ts

@@ -1,8 +0,0 @@
-type DenoTestStep = {
-    readonly step: (name: string, f: () => void | Promise<void>) => Promise<void>;
-};
-type DenoFunc = (t: DenoTestStep) => void | Promise<void>;
-type DenoArg = readonly [string, DenoFunc];
-export type DenoTest = (...arg: DenoArg) => void;
-declare const _default: () => Promise<void>;
-export default _default;

package/deno/module.js

@@ -1,53 +0,0 @@
-import { io } from "../io/module.js";
-import { loadModuleMap } from "../dev/module.f.js";
-import { isTest } from "../dev/test/module.f.js";
-const denoTest = (x) => async (t) => {
-    let subTests = [x];
-    while (true) {
-        const [first, ...rest] = subTests;
-        if (first === undefined) {
-            break;
-        }
-        subTests = rest;
-        //
-        const [name, value] = first;
-        if (value === null) {
-            continue;
-        }
-        switch (typeof value) {
-            case "function": {
-                if (value.length === 0) {
-                    const g = value.name === 'throw'
-                        ? () => {
-                            try {
-                                value();
-                                throw new Error(`Expected ${name} to throw, but it did not.`);
-                            }
-                            catch { }
-                        }
-                        : () => {
-                            const r = value();
-                            subTests = [...subTests, [`${name}()`, r]];
-                        };
-                    await t.step(name, g);
-                }
-                break;
-            }
-            case "object": {
-                for (const [j, y] of Object.entries(value)) {
-                    const pr = `${name}/${j}`;
-                    subTests = [...subTests, [pr, y]];
-                }
-                break;
-            }
-        }
-    }
-};
-export default async () => {
-    const x = await loadModuleMap(io);
-    for (const [i, v] of Object.entries(x)) {
-        if (isTest(i)) {
-            Deno.test(i, denoTest(['', v.default]));
-        }
-    }
-};

package/deno/test.js

@@ -1,2 +0,0 @@
-import run from "./module.js";
-await run();