functionalscript 0.8.0 → 0.8.1

package/js/tokenizer/module.f.d.ts

@@ -1,5 +1,5 @@
-import * as list from '../../types/list/module.f.ts';
-import type * as bigfloatT from '../../types/bigfloat/module.f.ts';
+import { type List } from '../../types/list/module.f.ts';
+import { type BigFloat } from '../../types/bigfloat/module.f.ts';
 export type StringToken = {
     readonly kind: 'string';
     readonly value: string;
@@ -7,7 +7,7 @@ export type StringToken = {
 export type NumberToken = {
     readonly kind: 'number';
     readonly value: string;
-    readonly bf: bigfloatT.BigFloat;
+    readonly bf: BigFloat;
 };
 export type BigIntToken = {
     readonly kind: 'bigint';
@@ -94,5 +94,5 @@ export type JsTokenWithMetadata = {
 };
 type ErrorMessage = '" are missing' | 'unescaped character' | 'invalid hex value' | 'unexpected character' | 'invalid number' | 'invalid token' | '*\/ expected' | 'unterminated string literal' | 'eof';
 export declare const isKeywordToken: (token: JsToken) => boolean;
-export declare const tokenize: (input: list.List<number>) => (path: string) => list.List<JsTokenWithMetadata>;
+export declare const tokenize: (input: List<number>) => (path: string) => List<JsTokenWithMetadata>;
 export {};

package/js/tokenizer/module.f.js

@@ -1,16 +1,10 @@
-import * as operator from "../../types/function/operator/module.f.js";
-import * as range_map from "../../types/range_map/module.f.js";
-const { merge, fromRange, get } = range_map;
-import * as list from "../../types/list/module.f.js";
-import * as map from "../../types/ordered_map/module.f.js";
-const { at } = map;
-import * as _range from "../../types/range/module.f.js";
-const { one } = _range;
-const { empty, stateScan, flat, toArray, reduce: listReduce, scan, map: listMap } = list;
-const { fromCharCode } = String;
-import * as ascii from "../../text/ascii/module.f.js";
-const { range } = ascii;
-const { 
+import { strictEqual } from "../../types/function/operator/module.f.js";
+import { merge, fromRange, get } from "../../types/range_map/module.f.js";
+import { empty, stateScan, flat, toArray, reduce as listReduce, scan, map as listMap } from "../../types/list/module.f.js";
+import { at, fromEntries } from "../../types/ordered_map/module.f.js";
+import { one } from "../../types/range/module.f.js";
+import {} from "../../types/bigfloat/module.f.js";
+import { range, 
 //
 backspace, ht, lf, ff, cr, 
 //
@@ -26,7 +20,8 @@ leftSquareBracket, reverseSolidus, rightSquareBracket, lowLine,
 //
 latinSmallLetterRange, latinSmallLetterA, latinSmallLetterB, latinSmallLetterE, latinSmallLetterF, latinSmallLetterN, latinSmallLetterR, latinSmallLetterT, latinSmallLetterU, 
 //
-leftCurlyBracket, rightCurlyBracket, dollarSign } = ascii;
+leftCurlyBracket, rightCurlyBracket, dollarSign } from "../../text/ascii/module.f.js";
+const { fromCharCode } = String;
 const rangeOneNine = range('19');
 const rangeSetNewLine = [
     one(lf),
@@ -106,7 +101,7 @@ const union = def => a => b => {
 };
 const rangeMapMerge = def => merge({
     union: union(def),
-    equal: operator.strictEqual,
+    equal: strictEqual,
     def,
 });
 const rangeFunc = r => f => def => fromRange(def)(r)(f);
@@ -194,7 +189,7 @@ const keywordEntries = [
     ['with', { kind: 'with' }],
     ['yield', { kind: 'yield' }],
 ];
-const keywordMap = map.fromEntries(keywordEntries);
+const keywordMap = fromEntries(keywordEntries);
 export const isKeywordToken = token => at(token.kind)(keywordMap) !== null;
 /**
  * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators
@@ -256,7 +251,7 @@ const operatorEntries = [
     ['}', { kind: '}' }],
     ['~', { kind: '~' }]
 ];
-const operatorMap = map.fromEntries(operatorEntries);
+const operatorMap = fromEntries(operatorEntries);
 const getOperatorToken = op => at(op)(operatorMap) ?? { kind: 'error', message: 'invalid token' };
 const hasOperatorToken = op => at(op)(operatorMap) !== null;
 const initialStateOp = create((state) => () => [[{ kind: 'error', message: 'unexpected character' }], state])([

package/js/tokenizer/test.f.js

@@ -1,14 +1,12 @@
-import * as tokenizer from "./module.f.js";
-import * as list from "../../types/list/module.f.js";
-const { toArray } = list;
-import * as serializer from "../../djs/serializer/module.f.js";
-import * as o from "../../types/object/module.f.js";
-const { sort } = o;
-import * as encoding from "../../text/utf16/module.f.js";
-const tokenizeString = s => toArray(list.map(withoutMetada)(tokenizer.tokenize(encoding.stringToList(s))('')));
-const tokenizeStringWithMetadata = s => toArray(tokenizer.tokenize(encoding.stringToList(s))(''));
-const stringify = serializer.stringifyAsTree(sort);
-const withoutMetada = tokenWithMetada => { return tokenWithMetada.token; };
+import { tokenize } from "./module.f.js";
+import { map, toArray } from "../../types/list/module.f.js";
+import { stringifyAsTree } from "../../djs/serializer/module.f.js";
+import { sort } from "../../types/object/module.f.js";
+import { stringToList } from "../../text/utf16/module.f.js";
+const tokenizeString = s => toArray(map(withoutMetada)(tokenize(stringToList(s))('')));
+const tokenizeStringWithMetadata = s => toArray(tokenize(stringToList(s))(''));
+const stringify = stringifyAsTree(sort);
+const withoutMetada = tokenWithMetada => tokenWithMetada.token;
 export default {
     djs: [
         () => {

package/json/module.f.d.ts

@@ -1,16 +1,16 @@
-import * as list from '../types/list/module.f.ts';
-import * as object from '../types/object/module.f.ts';
+import { type List } from '../types/list/module.f.ts';
+import { type Entry as ObjectEntry } from '../types/object/module.f.ts';
 type Object = {
     readonly [k in string]: Unknown;
 };
 type Array = readonly Unknown[];
 export type Primitive = boolean | string | number | null;
 export type Unknown = Primitive | Object | Array;
-export declare const setProperty: (value: Unknown) => (path: list.List<string>) => (src: Unknown) => Unknown;
-export type Entry = object.Entry<Unknown>;
-type Entries = list.List<Entry>;
+export declare const setProperty: (value: Unknown) => (path: List<string>) => (src: Unknown) => Unknown;
+export type Entry = ObjectEntry<Unknown>;
+type Entries = List<Entry>;
 type MapEntries = (entries: Entries) => Entries;
-export declare const serialize: (mapEntries: MapEntries) => (value: Unknown) => list.List<string>;
+export declare const serialize: (mapEntries: MapEntries) => (value: Unknown) => List<string>;
 /**
  * The standard `JSON.stringify` rules determined by
  * https://262.ecma-international.org/6.0/#sec-ordinary-object-internal-methods-and-internal-slots-ownpropertykeys

package/json/module.f.js

@@ -1,14 +1,9 @@
-import * as list from "../types/list/module.f.js";
-const { next, flat, map } = list;
-import * as string from "../types/string/module.f.js";
-const { concat } = string;
-import * as object from "../types/object/module.f.js";
-const { at } = object;
-import * as f from "../types/function/module.f.js";
-const { compose, fn } = f;
+import { next, flat, map } from "../types/list/module.f.js";
+import { concat } from "../types/string/module.f.js";
+import { at } from "../types/object/module.f.js";
+import { compose, fn } from "../types/function/module.f.js";
+import { objectWrap, arrayWrap, stringSerialize, numberSerialize, nullSerialize, boolSerialize } from "./serializer/module.f.js";
 const { entries } = Object;
-import * as s from "./serializer/module.f.js";
-const { objectWrap, arrayWrap, stringSerialize, numberSerialize, nullSerialize, boolSerialize } = s;
 export const setProperty = value => {
     const f = path => src => {
         const result = next(path);

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

@@ -1,5 +1,5 @@
-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 * as Tokenizer from '../tokenizer/module.f.ts';
-import type * as Json from '../module.f.ts';
-export declare const parse: (tokenList: List<Tokenizer.JsonToken>) => result.Result<Json.Unknown, string>;
+import { type JsonToken } from '../tokenizer/module.f.ts';
+import { type Unknown } from '../module.f.ts';
+export declare const parse: (tokenList: List<JsonToken>) => Result<Unknown, string>;

package/json/parser/module.f.js

@@ -1,6 +1,9 @@
-import * as result from "../../types/result/module.f.js";
+import { error, ok } from "../../types/result/module.f.js";
 import { fold, first, drop, toArray, concat } from "../../types/list/module.f.js";
+import {} from "../../types/function/operator/module.f.js";
+import {} from "../tokenizer/module.f.js";
 import { setReplace } from "../../types/ordered_map/module.f.js";
+import {} from "../module.f.js";
 import { fromMap } from "../../types/object/module.f.js";
 const addKeyToObject = obj => key => ({ kind: 'object', values: obj.values, key: key });
 const addValueToObject = obj => value => ({ kind: 'object', values: setReplace(obj.key)(value)(obj.values), key: '' });
@@ -151,8 +154,8 @@ const foldOp = token => state => {
 export const parse = tokenList => {
     const state = fold(foldOp)({ status: '', top: null, stack: null })(tokenList);
     switch (state.status) {
-        case 'result': return result.ok(state.value);
-        case 'error': return result.error(state.message);
-        default: return result.error('unexpected end');
+        case 'result': return ok(state.value);
+        case 'error': return error(state.message);
+        default: return error('unexpected end');
     }
 };

package/json/parser/test.f.js

@@ -1,18 +1,16 @@
-import * as parser from "./module.f.js";
-import * as tokenizer from "../tokenizer/module.f.js";
-import * as list from "../../types/list/module.f.js";
-const { toArray } = list;
-import * as json from "../module.f.js";
-import * as o from "../../types/object/module.f.js";
-const { sort } = o;
-import * as encoding from "../../text/utf16/module.f.js";
-const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)));
-const stringify = json.stringify(sort);
+import { parse } from "./module.f.js";
+import { tokenize } from "../tokenizer/module.f.js";
+import { toArray } from "../../types/list/module.f.js";
+import { stringify as jsonStringify } from "../module.f.js";
+import { sort } from "../../types/object/module.f.js";
+import { stringToList } from "../../text/utf16/module.f.js";
+const tokenizeString = s => toArray(tokenize(stringToList(s)));
+const stringify = jsonStringify(sort);
 export default {
     valid: [
         () => {
             const tokenList = tokenizeString('null');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",null]') {
                 throw result;
@@ -20,7 +18,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('true');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",true]') {
                 throw result;
@@ -28,7 +26,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('false');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",false]') {
                 throw result;
@@ -36,7 +34,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('0.1');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",0.1]') {
                 throw result;
@@ -44,7 +42,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('1.1e+2');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",110]') {
                 throw result;
@@ -52,7 +50,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('"abc"');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok","abc"]') {
                 throw result;
@@ -60,7 +58,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",[]]') {
                 throw result;
@@ -68,7 +66,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[1]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",[1]]') {
                 throw result;
@@ -76,7 +74,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[[]]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",[[]]]') {
                 throw result;
@@ -84,7 +82,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[0,[1,[2,[]]],3]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",[0,[1,[2,[]]],3]]') {
                 throw result;
@@ -92,7 +90,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",{}]') {
                 throw result;
@@ -100,7 +98,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[{}]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",[{}]]') {
                 throw result;
@@ -108,7 +106,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"a":true,"b":false,"c":null}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",{"a":true,"b":false,"c":null}]') {
                 throw result;
@@ -116,7 +114,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"a":{"b":{"c":["d"]}}}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",{"a":{"b":{"c":["d"]}}}]') {
                 throw result;
@@ -124,7 +122,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[1,]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",[1]]') {
                 throw result;
@@ -132,7 +130,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"a":1,}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["ok",{"a":1}]') {
                 throw result;
@@ -142,7 +140,7 @@ export default {
     invalid: [
         () => {
             const tokenList = tokenizeString('');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected end"]') {
                 throw result;
@@ -150,7 +148,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('"123');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -158,7 +156,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[,]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -166,7 +164,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[1 2]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -174,7 +172,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[1,,2]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -182,7 +180,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[]]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -190,7 +188,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('["a"');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected end"]') {
                 throw result;
@@ -198,7 +196,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[,1]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -206,7 +204,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[:]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -214,7 +212,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString(']');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -222,7 +220,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{,}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -230,7 +228,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{1:2}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -238,7 +236,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"1"2}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -246,7 +244,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"1"::2}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -254,7 +252,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"1":2,,"3":4');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -262,7 +260,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{}}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -270,7 +268,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{"1":2');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected end"]') {
                 throw result;
@@ -278,7 +276,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{,"1":2}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -286,7 +284,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -294,7 +292,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('[{]}');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -302,7 +300,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('{[}]');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -310,7 +308,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('10-5');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;
@@ -318,7 +316,7 @@ export default {
         },
         () => {
             const tokenList = tokenizeString('undefined');
-            const obj = parser.parse(tokenList);
+            const obj = parse(tokenList);
             const result = stringify(obj);
             if (result !== '["error","unexpected token"]') {
                 throw result;

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

@@ -1,7 +1,7 @@
-import * as list from '../../types/list/module.f.ts';
-export declare const stringSerialize: (_: string) => list.List<string>;
-export declare const numberSerialize: (_: number) => list.List<string>;
+import { type List } from '../../types/list/module.f.ts';
+export declare const stringSerialize: (_: string) => List<string>;
+export declare const numberSerialize: (_: number) => List<string>;
 export declare const nullSerialize: string[];
-export declare const boolSerialize: (_: boolean) => list.List<string>;
-export declare const objectWrap: (input: list.List<list.List<string>>) => list.List<string>;
-export declare const arrayWrap: (input: list.List<list.List<string>>) => list.List<string>;
+export declare const boolSerialize: (_: boolean) => List<string>;
+export declare const objectWrap: (input: List<List<string>>) => List<string>;
+export declare const arrayWrap: (input: List<List<string>>) => List<string>;

package/json/serializer/module.f.js

@@ -1,5 +1,6 @@
-import * as list from "../../types/list/module.f.js";
-const { flat, reduce, empty } = list;
+import { flat, reduce, empty } from "../../types/list/module.f.js";
+import {} from "../../types/object/module.f.js";
+import {} from "../../types/function/operator/module.f.js";
 const jsonStringify = JSON.stringify;
 export const stringSerialize = input => [jsonStringify(input)];
 export const numberSerialize = input => [jsonStringify(input)];