functionalscript 0.8.0 → 0.8.2

package/djs/ast/test.f.js

@@ -1,38 +1,37 @@
-import * as list from "../../types/object/module.f.js";
-const { sort } = list;
-import * as shared from "./module.f.js";
+import { sort } from "../../types/object/module.f.js";
+import { run } from "./module.f.js";
 import { stringifyAsTree } from "../serializer/module.f.js";
 export default {
     test: () => {
-        const djs = shared.run([1])([]);
+        const djs = run([1])([]);
         const result = stringifyAsTree(sort)(djs);
         if (result !== '1') {
             throw result;
         }
     },
     testCref: () => {
-        const djs = shared.run([1, 2, 3, 4, 5, ['cref', 3]])([11, 12, 13, 14, 15]);
+        const djs = run([1, 2, 3, 4, 5, ['cref', 3]])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
         if (result !== '4') {
             throw result;
         }
     },
     testAref: () => {
-        const djs = shared.run([1, 2, 3, 4, 5, ['aref', 3]])([11, 12, 13, 14, 15]);
+        const djs = run([1, 2, 3, 4, 5, ['aref', 3]])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
         if (result !== '14') {
             throw result;
         }
     },
     testArray: () => {
-        const djs = shared.run([1, 2, 3, 4, 5, ['array', [['aref', 3], ['cref', 3]]]])([11, 12, 13, 14, 15]);
+        const djs = run([1, 2, 3, 4, 5, ['array', [['aref', 3], ['cref', 3]]]])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
         if (result !== '[14,4]') {
             throw result;
         }
     },
     testObj: () => {
-        const djs = shared.run([1, 2, 3, 4, 5, { "key": { "key2": ['array', [['aref', 3], ['cref', 3]]] } }])([11, 12, 13, 14, 15]);
+        const djs = run([1, 2, 3, 4, 5, { "key": { "key2": ['array', [['aref', 3], ['cref', 3]]] } }])([11, 12, 13, 14, 15]);
         const result = stringifyAsTree(sort)(djs);
         if (result !== '{"key":{"key2":[14,4]}}') {
             throw result;

package/djs/parser/module.f.d.ts

@@ -1,4 +1,4 @@
-import * as result from '../../types/result/module.f.ts';
+import { type Result } from '../../types/result/module.f.ts';
 import { type List } from '../../types/list/module.f.ts';
 import type { DjsTokenWithMetadata } from '../tokenizer/module.f.ts';
 import { type OrderedMap } from '../../types/ordered_map/module.f.ts';
@@ -7,11 +7,11 @@ import type { AstModule } from '../ast/module.f.ts';
 import type { TokenMetadata } from '../../js/tokenizer/module.f.ts';
 export type ParseContext = {
     readonly fs: Fs;
-    readonly complete: OrderedMap<result.Result<AstModule, string>>;
+    readonly complete: OrderedMap<Result<AstModule, string>>;
     readonly stack: List<string>;
 };
 export type ParseError = {
     readonly message: string;
     readonly metadata: TokenMetadata | null;
 };
-export declare const parseFromTokens: (tokenList: List<DjsTokenWithMetadata>) => result.Result<AstModule, ParseError>;
+export declare const parseFromTokens: (tokenList: List<DjsTokenWithMetadata>) => Result<AstModule, ParseError>;

package/djs/parser/module.f.js

@@ -1,4 +1,4 @@
-import * as result from "../../types/result/module.f.js";
+import { error, ok } from "../../types/result/module.f.js";
 import { fold, first, drop, toArray, length, concat } from "../../types/list/module.f.js";
 import { setReplace, at } from "../../types/ordered_map/module.f.js";
 import { fromMap } from "../../types/object/module.f.js";
@@ -351,8 +351,8 @@ const foldOp = token => state => {
 export const parseFromTokens = (tokenList) => {
     const state = fold(foldOp)({ state: '', module: { refs: null, modules: null, consts: null } })(tokenList);
     switch (state.state) {
-        case 'result': return result.ok([toArray(state.module.modules), toArray(state.module.consts)]);
-        case 'error': return result.error(state.error);
-        default: return result.error({ message: 'unexpected end', metadata: null });
+        case 'result': return ok([toArray(state.module.modules), toArray(state.module.consts)]);
+        case 'error': return error(state.error);
+        default: return error({ message: 'unexpected end', metadata: null });
     }
 };