functionalscript 0.16.1 → 0.18.0

package/fs/djs/tokenizer-new/test.f.js

@@ -10,8 +10,15 @@ const descentParserCpOnly = (m, name, cp) => {
 const tokenizeString = s => {
     const m = descentParser(jsGrammar());
     const cp = toArray(stringToCodePointList(s));
-    const mr = descentParserCpOnly(m, '', cp);
-    const flatTokens = getTokensFromMatchResult(mr);
+    const [ast, ok, len] = descentParserCpOnly(m, '', cp);
+    if (cp.length === 0) {
+        return JSON.stringify([{ kind: 'eof' }]);
+    }
+    if (!ok)
+        return 'error';
+    if (cp.length > 0 && len !== cp.length)
+        return 'error';
+    const flatTokens = getTokensFromAstRule(ast);
     const filterTokens = concat(filter(filterFunc)(flatTokens))(['']);
     const tokens = flat(stateScan(scanFunc)(['', []])(filterTokens));
     const jsTokens = concat(map(toJsToken)(tokens))([{ kind: 'eof' }]);
@@ -19,8 +26,16 @@ const tokenizeString = s => {
     //return JSON.stringify(toArray(filterTokens))
     return JSON.stringify(result);
 };
+const isNlTag = (tag) => tag === '\n' || tag === '\r';
+const isWsTag = (tag) => tag === ' ' || tag === '\t';
 const scanFunc = (input, state) => {
     if (typeof input === 'string') {
+        if (isNlTag(input) && isNlTag(state[0]))
+            return [null, state];
+        if (isWsTag(input) && isWsTag(state[0]))
+            return [null, state];
+        if (isNlTag(input) && isWsTag(state[0]))
+            return [null, [input, []]];
         const newState = [input, []];
         if (state[0] === '') {
             return [null, newState];
@@ -42,6 +57,10 @@ const filterFunc = tk => {
         case ',':
         case 'number':
         case 'string':
+        case '\n':
+        case '\r':
+        case ' ':
+        case '\t':
             return true;
         default:
             return false;
@@ -56,6 +75,14 @@ const toJsToken = tk => {
         case ':':
         case ',':
             return { kind: tk[0] };
+        case '\n':
+        case '\r':
+            return { kind: 'nl' };
+        case ' ':
+        case '\t':
+            return { kind: 'ws' };
+        case 'string':
+            return { kind: 'string', value: String.fromCodePoint(...tk[1].slice(1, -1)) };
         default:
             return null;
     }
@@ -81,9 +108,6 @@ const getTokensFromAstRule = ast => {
         return [token];
     return { first: token, tail: getTokensFromAstSequence(ast.sequence) };
 };
-const getTokensFromMatchResult = mr => {
-    return getTokensFromAstRule(mr[0]);
-};
 export default {
     isValid: [() => {
             const m = descentParser(jsGrammar());
@@ -319,34 +343,48 @@ export default {
                 throw result;
             }
         },
-        //     () => {
-        //         const result = tokenizeString('ᄑ')
-        //         if (result !== '[{"kind":"error","message":"unexpected character"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('{ \t\n\r}')
-        //         if (result !== '[{"kind":"{"},{"kind":"nl"},{"kind":"}"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('""')
-        //         if (result !== '[{"kind":"string","value":""},{"kind":"eof"}]') { throw result }
-        //     },
-        // () => {
-        //     const result = tokenizeString('"value"')
-        //     if (result !== '[{"kind":"string","value":"value"},{"kind":"eof"}]') { throw result }
-        // },
-        //     () => {
-        //         const result = tokenizeString('"value')
-        //         if (result !== '[{"kind":"error","message":"\\" are missing"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('"value1" "value2"')
-        //         if (result !== '[{"kind":"string","value":"value1"},{"kind":"ws"},{"kind":"string","value":"value2"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('"')
-        //         if (result !== '[{"kind":"error","message":"\\" are missing"},{"kind":"eof"}]') { throw result }
-        //     },
+        () => {
+            const result = tokenizeString('ᄑ');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('{ \t\n\r}');
+            if (result !== '[{"kind":"{"},{"kind":"nl"},{"kind":"}"},{"kind":"eof"}]') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('""');
+            if (result !== '[{"kind":"string","value":""},{"kind":"eof"}]') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"value"');
+            if (result !== '[{"kind":"string","value":"value"},{"kind":"eof"}]') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"value');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"value1" "value2"');
+            if (result !== '[{"kind":"string","value":"value1"},{"kind":"ws"},{"kind":"string","value":"value2"},{"kind":"eof"}]') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
         //     () => {
         //         const result = tokenizeString('"\\\\"')
         //         if (result !== '[{"kind":"string","value":"\\\\"},{"kind":"eof"}]') { throw result }
@@ -359,22 +397,30 @@ export default {
         //         const result = tokenizeString('"\\/"')
         //         if (result !== '[{"kind":"string","value":"/"},{"kind":"eof"}]') { throw result }
         //     },
-        //     () => {
-        //         const result = tokenizeString('"\\x"')
-        //         if (result !== '[{"kind":"error","message":"unescaped character"},{"kind":"string","value":"x"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('"\\')
-        //         if (result !== '[{"kind":"error","message":"\\" are missing"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('"\r"')
-        //         if (result !== '[{"kind":"error","message":"unterminated string literal"},{"kind":"nl"},{"kind":"error","message":"\\" are missing"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('"\n null')
-        //         if (result !== '[{"kind":"error","message":"unterminated string literal"},{"kind":"nl"},{"kind":"null"},{"kind":"eof"}]') { throw result }
-        //     },
+        () => {
+            const result = tokenizeString('"\\x"');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"\\');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"\r"');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
+        () => {
+            const result = tokenizeString('"\n null');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
         //     () => {
         //         const result = tokenizeString('"\\b\\f\\n\\r\\t"')
         //         if (result !== '[{"kind":"string","value":"\\b\\f\\n\\r\\t"},{"kind":"eof"}]') { throw result }
@@ -387,10 +433,12 @@ export default {
         //         const result = tokenizeString('"\\uaBcDEeFf"')
         //         if (result !== '[{"kind":"string","value":"ꯍEeFf"},{"kind":"eof"}]') { throw result }
         //     },
-        //     () => {
-        //         const result = tokenizeString('"\\uEeFg"')
-        //         if (result !== '[{"kind":"error","message":"invalid hex value"},{"kind":"string","value":"g"},{"kind":"eof"}]') { throw result }
-        //     },
+        () => {
+            const result = tokenizeString('"\\uEeFg"');
+            if (result !== 'error') {
+                throw result;
+            }
+        },
         //     () => {
         //         const result = tokenizeString('0')
         //         if (result !== '[{"bf":[0n,0],"kind":"number","value":"0"},{"kind":"eof"}]') { throw result }
@@ -399,14 +447,14 @@ export default {
         //     const result = tokenizeString('[0]')
         //     if (result !== '[{"kind":"["},{"bf":[0n,0],"kind":"number","value":"0"},{"kind":"]"},{"kind":"eof"}]') { throw result }
         // },
-        //     () => {
-        //         const result = tokenizeString('00')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"eof"}]') { throw result }
-        //     },
-        //     () => {
-        //         const result = tokenizeString('0abc,')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"abc"},{"kind":","},{"kind":"eof"}]') { throw result }
-        //     },
+        // () => {
+        //     const result = tokenizeString('00')
+        //     if (result !== 'error') { throw result }
+        // },
+        // () => {
+        //     const result = tokenizeString('0abc,')
+        //     if (result !== 'error') { throw result }
+        // },
         //     () => {
         //         const result = tokenizeString('123456789012345678901234567890')
         //         if (result !== '[{"bf":[123456789012345678901234567890n,0],"kind":"number","value":"123456789012345678901234567890"},{"kind":"eof"}]') { throw result }
@@ -421,7 +469,7 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('0. 2')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"ws"},{"bf":[2n,0],"kind":"number","value":"2"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('10-0')
@@ -429,7 +477,7 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('9a:')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"a"},{"kind":":"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('-10')
@@ -441,7 +489,7 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('-00')
-        //         if (result !== '[{"kind":"-"},{"kind":"error","message":"invalid number"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('-.123')
@@ -457,11 +505,11 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('-0.')
-        //         if (result !== '[{"kind":"-"},{"kind":"error","message":"invalid number"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('-0.]')
-        //         if (result !== '[{"kind":"-"},{"kind":"error","message":"invalid number"},{"kind":"]"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('12.34')
@@ -473,11 +521,11 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('-12.')
-        //         if (result !== '[{"kind":"-"},{"kind":"error","message":"invalid number"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('12.]')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"]"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('0e1')
@@ -505,11 +553,11 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('0e')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('0e-')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('ABCdef1234567890$_')
@@ -529,11 +577,11 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('123_123')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"_123"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('123$123')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"$123"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('1234567890n')
@@ -549,19 +597,19 @@ export default {
         //     },
         //     () => {
         //         const result = tokenizeString('123.456n')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"n"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('123e456n')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"n"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('1234567890na')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"a"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
         //     () => {
         //         const result = tokenizeString('1234567890nn')
-        //         if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"id","value":"n"},{"kind":"eof"}]') { throw result }
+        //         if (result !== 'error') { throw result }
         //     },
     ],
     // operators:
@@ -876,11 +924,11 @@ export default {
     //     },
     //     () => {
     //         const result = tokenizeString('/* multiline comment *')
-    //         if (result !== '[{"kind":"error","message":"*/ expected"},{"kind":"eof"}]') { throw result }
+    //         if (result !== 'error') { throw result }
     //     },
     //     () => {
     //         const result = tokenizeString('/* multiline comment ')
-    //         if (result !== '[{"kind":"error","message":"*/ expected"},{"kind":"eof"}]') { throw result }
+    //         if (result !== 'error') { throw result }
     //     },
     //     () => {
     //         const result = tokenizeString('/* multiline comment \n * **/')

package/fs/djs/transpiler/module.f.d.ts

@@ -7,10 +7,10 @@ import { type Unknown } from '../module.f.ts';
 import { type Result } from '../../types/result/module.f.ts';
 import { type List } from '../../types/list/module.f.ts';
 import { type OrderedMap } from '../../types/ordered_map/module.f.ts';
-import type { Fs } from '../../io/module.f.ts';
 import { type ParseError } from '../parser/module.f.ts';
+import { type Effect } from '../../types/effects/module.f.ts';
+import { type ReadFile } from '../../types/effects/node/module.f.ts';
 export type ParseContext = {
-    readonly fs: Fs;
     readonly complete: OrderedMap<djsResult>;
     readonly stack: List<string>;
     readonly error: ParseError | null;
@@ -18,4 +18,4 @@ export type ParseContext = {
 export type djsResult = {
     djs: Unknown;
 };
-export declare const transpile: (fs: Fs) => (path: string) => Result<Unknown, ParseError>;
+export declare const transpile: (path: string) => Effect<ReadFile, Result<Unknown, ParseError>>;

package/fs/djs/transpiler/module.f.js

@@ -5,15 +5,16 @@
  */
 import {} from "../module.f.js";
 import { error, ok } from "../../types/result/module.f.js";
-import { fold, drop, map as listMap, toArray, includes } from "../../types/list/module.f.js";
-import {} from "../../types/function/operator/module.f.js";
+import { drop, map as listMap, toArray, includes } from "../../types/list/module.f.js";
 import { tokenize } from "../tokenizer/module.f.js";
 import { setReplace, at } from "../../types/ordered_map/module.f.js";
 import { stringToList } from "../../text/utf16/module.f.js";
 import { concat as pathConcat } from "../../path/module.f.js";
 import { parseFromTokens } from "../parser/module.f.js";
 import { run } from "../ast/module.f.js";
-import { decodeUtf8 } from "../../types/uint8array/module.f.js";
+import { pure } from "../../types/effects/module.f.js";
+import { readFile } from "../../types/effects/node/module.f.js";
+import { utf8ToString } from "../../text/module.f.js";
 const mapDjs = context => path => {
     const res = at(path)(context.complete);
     if (res === null) {
@@ -21,46 +22,50 @@ const mapDjs = context => path => {
     }
     return res.djs;
 };
+const parseModule = path => readFile(path).step(result => {
+    if (result[0] === 'error') {
+        return pure(error({ message: 'file not found', metadata: null }));
+    }
+    const tokens = tokenize(stringToList(utf8ToString(result[1])))(path);
+    return pure(parseFromTokens(tokens));
+});
 const transpileWithImports = path => parseModuleResult => context => {
     if (parseModuleResult[0] === 'ok') {
         const dir = pathConcat(path)('..');
         const pathsCombine = listMap(pathConcat(dir))(parseModuleResult[1][0]);
-        const contextWithImports = fold(foldNextModuleOp)({ ...context, stack: { first: path, tail: context.stack } })(pathsCombine);
-        if (contextWithImports.error !== null) {
-            return contextWithImports;
-        }
-        const args = toArray(listMap(mapDjs(contextWithImports))(pathsCombine));
-        const djs = { djs: run(parseModuleResult[1][1])(args) };
-        return { ...contextWithImports, stack: drop(1)(contextWithImports.stack), complete: setReplace(path)(djs)(contextWithImports.complete) };
-    }
-    return { ...context, error: parseModuleResult[1] };
-};
-const parseModule = path => context => {
-    const content = context.fs.readFileSync(path);
-    if (content === null) {
-        return error({ message: 'file not found', metadata: null });
+        const pathsArray = toArray(pathsCombine);
+        const contextWithStack = { ...context, stack: { first: path, tail: context.stack } };
+        return pathsArray.reduce((acc, p) => acc.step(ctx => foldNextModuleOp(p)(ctx)), pure(contextWithStack)).step(contextWithImports => {
+            if (contextWithImports.error !== null) {
+                return pure(contextWithImports);
+            }
+            const args = toArray(listMap(mapDjs(contextWithImports))(pathsCombine));
+            const djs = { djs: run(parseModuleResult[1][1])(args) };
+            return pure({
+                ...contextWithImports,
+                stack: drop(1)(contextWithImports.stack),
+                complete: setReplace(path)(djs)(contextWithImports.complete),
+            });
+        });
     }
-    const tokens = tokenize(stringToList(decodeUtf8(content)))(path);
-    return parseFromTokens(tokens);
+    return pure({ ...context, error: parseModuleResult[1] });
 };
 const foldNextModuleOp = path => context => {
     if (context.error !== null) {
-        return context;
+        return pure(context);
     }
     if (includes(path)(context.stack)) {
-        return { ...context, error: { message: 'circular dependency', metadata: null } };
+        return pure({ ...context, error: { message: 'circular dependency', metadata: null } });
     }
     if (at(path)(context.complete) !== null) {
-        return context;
+        return pure(context);
     }
-    const parseModuleResult = parseModule(path)(context);
-    return transpileWithImports(path)(parseModuleResult)(context);
+    return parseModule(path).step(parseModuleResult => transpileWithImports(path)(parseModuleResult)(context));
 };
-export const transpile = fs => path => {
-    const context = foldNextModuleOp(path)({ fs, stack: null, complete: null, error: null });
+export const transpile = path => foldNextModuleOp(path)({ stack: null, complete: null, error: null }).step((context) => {
     if (context.error !== null) {
-        return error(context.error);
+        return pure(error(context.error));
     }
     const result = at(path)(context.complete)?.djs;
-    return ok(result);
-};
+    return pure(ok(result));
+});

package/fs/djs/transpiler/test.f.js

@@ -1,17 +1,15 @@
 import { sort } from "../../types/object/module.f.js";
-import { setReplace } from "../../types/ordered_map/module.f.js";
 import { transpile } from "./module.f.js";
 import { stringifyAsTree } from "../serializer/module.f.js";
-import { createVirtualIo } from "../../io/virtual/module.f.js";
-import { encodeUtf8 } from "../../types/uint8array/module.f.js";
-const virtualFs = map => {
-    return createVirtualIo(map).fs;
+import { virtual, emptyState } from "../../types/effects/node/virtual/module.f.js";
+import { utf8 } from "../../text/module.f.js";
+const run = (root) => (path) => {
+    const [_, result] = virtual({ ...emptyState, root })(transpile(path));
+    return result;
 };
 export default {
     parse: () => {
-        const map = setReplace('a')(encodeUtf8('export default 1'))(null);
-        const fs = virtualFs(map);
-        const result = transpile(fs)('a');
+        const result = run({ a: utf8('export default 1') })('a');
         if (result[0] === 'error') {
             throw result[1];
         }
@@ -21,10 +19,7 @@ export default {
         }
     },
     parseWithSubModule: () => {
-        const map = setReplace('a/b')(encodeUtf8('import c from "c"\nexport default c'))(null);
-        const map2 = setReplace('a/c')(encodeUtf8('export default 2'))(map);
-        const fs = virtualFs(map2);
-        const result = transpile(fs)('a/b');
+        const result = run({ a: { b: utf8('import c from "c"\nexport default c'), c: utf8('export default 2') } })('a/b');
         if (result[0] === 'error') {
             throw result[1];
         }
@@ -34,12 +29,12 @@ export default {
         }
     },
     parseWithSubModules: () => {
-        const map = setReplace('a')(encodeUtf8('import b from "b"\nimport c from "c"\nexport default [b,c,b]'))(null);
-        const map2 = setReplace('b')(encodeUtf8('import d from "d"\nexport default [0,d]'))(map);
-        const map3 = setReplace('c')(encodeUtf8('import d from "d"\nexport default [1,d]'))(map2);
-        const map4 = setReplace('d')(encodeUtf8('export default 2'))(map3);
-        const fs = virtualFs(map4);
-        const result = transpile(fs)('a');
+        const result = run({
+            a: utf8('import b from "b"\nimport c from "c"\nexport default [b,c,b]'),
+            b: utf8('import d from "d"\nexport default [0,d]'),
+            c: utf8('import d from "d"\nexport default [1,d]'),
+            d: utf8('export default 2'),
+        })('a');
         if (result[0] === 'error') {
             throw result[1];
         }
@@ -49,9 +44,7 @@ export default {
         }
     },
     parseWithFileNotFoundError: () => {
-        const map = setReplace('a')(encodeUtf8('import b from "b"\nexport default b'))(null);
-        const fs = virtualFs(map);
-        const result = transpile(fs)('a');
+        const result = run({ a: utf8('import b from "b"\nexport default b') })('a');
         if (result[0] !== 'error') {
             throw result;
         }
@@ -60,11 +53,11 @@ export default {
         }
     },
     parseWithCycleError: () => {
-        const map = setReplace('a')(encodeUtf8('import b from "b"\nimport c from "c"\nexport default [b,c,b]'))(null);
-        const map2 = setReplace('b')(encodeUtf8('import c from "c"\nexport default c'))(map);
-        const map3 = setReplace('c')(encodeUtf8('import b from "b"\nexport default b'))(map2);
-        const fs = virtualFs(map3);
-        const result = transpile(fs)('a');
+        const result = run({
+            a: utf8('import b from "b"\nimport c from "c"\nexport default [b,c,b]'),
+            b: utf8('import c from "c"\nexport default c'),
+            c: utf8('import b from "b"\nexport default b'),
+        })('a');
         if (result[0] !== 'error') {
             throw result;
         }

package/fs/fjs/module.f.d.ts

@@ -1,7 +1,2 @@
-/**
- * FunctionalScript compiler entry points and command handlers.
- *
- * @module
- */
-import { type Io } from '../io/module.f.ts';
-export declare const main: (io: Io) => Promise<number>;
+import { type NodeProgram } from '../types/effects/node/module.f.ts';
+export declare const main: NodeProgram;

package/fs/fjs/module.f.js

@@ -3,36 +3,36 @@
  *
  * @module
  */
-import { fromIo } from "../io/module.f.js";
 import { compile } from "../djs/module.f.js";
 import { main as testMain } from "../dev/tf/module.f.js";
 import { main as casMain } from "../cas/module.f.js";
-export const main = async (io) => {
-    const { error } = io.console;
-    const { process, asyncImport } = io;
-    const { env } = process;
-    const [command, ...rest] = process.argv.slice(2);
-    const eRun = fromIo(io);
+import { import_, error } from "../types/effects/node/module.f.js";
+import { pure } from "../types/effects/module.f.js";
+export const main = options => {
+    const [command, ...rest] = options.args;
     switch (command) {
         case 'test':
         case 't':
-            return testMain(io);
+            return testMain({ ...options, args: rest });
         case 'compile':
         case 'c':
-            return compile(io)(rest);
+            return compile(rest);
         case 'cas':
         case 's':
-            return eRun(casMain(rest));
+            return casMain(rest);
         case 'run':
-        case 'r':
+        case 'r': {
             const [file, ...args] = rest;
-            const m = await asyncImport(file);
-            return eRun(m.default(args, env));
+            return import_(file).step(([s, v]) => {
+                if (s === 'error') {
+                    throw v;
+                }
+                return v.default({ ...options, args });
+            });
+        }
         case undefined:
-            error('Error: command is required');
-            return Promise.resolve(1);
+            return error('Error: command is required').step(() => pure(1));
         default:
-            error(`Error: Unknown command "${command}"`);
-            return Promise.resolve(1);
+            return error(`Error: Unknown command "${command}"`).step(() => pure(1));
     }
 };

package/fs/fjs/module.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 import { main } from "./module.f.js";
-import { legacyRun } from "../io/module.js";
-legacyRun(main);
+import effectRun from "../io/module.js";
+effectRun(main);

package/fs/html/module.f.d.ts

@@ -1,3 +1,9 @@
+/**
+ * HTML serialization helpers: `Element`/`Attributes` builders, void-tag
+ * handling, attribute/text escaping, and a UTF-8 emitter for full documents.
+ *
+ * @module
+ */
 import { type List } from '../types/list/module.f.ts';
 import { type Vec } from '../types/bit_vec/module.f.ts';
 type Tag = string;