functionalscript 0.1.608 → 0.2.0

package/djs/parser/test.f.mjs

@@ -1,13 +1,13 @@
-import parser from './module.f.mjs'
-import tokenizer, * as tokenizerT from '../tokenizer/module.f.mjs'
-import list from '../../types/list/module.f.mjs'
+import * as parser from './module.f.mjs'
+import * as tokenizer from '../tokenizer/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { toArray } = list
-import djs from '../module.f.mjs'
-import o from '../../types/object/module.f.mjs'
+import * as djs from '../module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { sort } = o
-import encoding from '../../text/utf16/module.f.mjs'
+import * as encoding from '../../text/utf16/module.f.mjs'
 
-/** @type {(s: string) => readonly tokenizerT.DjsToken[]} */
+/** @type {(s: string) => readonly tokenizer.DjsToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
 const stringify = djs.stringify(sort)
@@ -15,243 +15,243 @@ const stringify = djs.stringify(sort)
 export default {
     valid: [
         () => {
-            const tokenList = tokenizeString('module.exports=null')
+            const tokenList = tokenizeString('export default null')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",null]') { throw result }
+            if (result !== '["ok",[[],[null]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=true')
+            const tokenList = tokenizeString('export default true')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",true]') { throw result }
+            if (result !== '["ok",[[],[true]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=false')
+            const tokenList = tokenizeString('export default false')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",false]') { throw result }
+            if (result !== '["ok",[[],[false]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=0.1')
+            const tokenList = tokenizeString('export default 0.1')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",0.1]') { throw result }
+            if (result !== '["ok",[[],[0.1]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=1.1e+2')
+            const tokenList = tokenizeString('export default 1.1e+2')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",110]') { throw result }
+            if (result !== '["ok",[[],[110]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports="abc"')
+            const tokenList = tokenizeString('export default "abc"')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok","abc"]') { throw result }
+            if (result !== '["ok",[[],["abc"]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[]')
+            const tokenList = tokenizeString('export default []')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[]]') { throw result }
+            if (result !== '["ok",[[],[["array",[]]]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[1]')
+            const tokenList = tokenizeString('export default [1]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[1]]') { throw result }
+            if (result !== '["ok",[[],[["array",[1]]]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[[]]')
+            const tokenList = tokenizeString('export default [[]]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[[]]]') { throw result }
+            if (result !== '["ok",[[],[["array",[["array",[]]]]]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[0,[1,[2,[]]],3]')
+            const tokenList = tokenizeString('export default [0,[1,[2,[]]],3]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[0,[1,[2,[]]],3]]') { throw result }
+            if (result !== '["ok",[[],[["array",[0,["array",[1,["array",[2,["array",[]]]]]],3]]]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={}')
+            const tokenList = tokenizeString('export default {}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",{}]') { throw result }
+            if (result !== '["ok",[[],[{}]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[{}]')
+            const tokenList = tokenizeString('export default [{}]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[{}]]') { throw result }
+            if (result !== '["ok",[[],[["array",[{}]]]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"a":true,"b":false,"c":null}')
+            const tokenList = tokenizeString('export default {"a":true,"b":false,"c":null}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",{"a":true,"b":false,"c":null}]') { throw result }
+            if (result !== '["ok",[[],[{"a":true,"b":false,"c":null}]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"a":{"b":{"c":["d"]}}}')
+            const tokenList = tokenizeString('export default {"a":{"b":{"c":["d"]}}}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",{"a":{"b":{"c":["d"]}}}]') { throw result }
+            if (result !== '["ok",[[],[{"a":{"b":{"c":["array",["d"]]}}}]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=1234567890n')
+            const tokenList = tokenizeString('export default 1234567890n')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",1234567890n]') { throw result }
+            if (result !== '["ok",[[],[1234567890n]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[1234567890n]')
+            const tokenList = tokenizeString('export default [1234567890n]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[1234567890n]]') { throw result }
+            if (result !== '["ok",[[],[["array",[1234567890n]]]]]') { throw result }
         }
     ],
     invalid: [
         () => {
-            const tokenList = tokenizeString('module.exports=')
+            const tokenList = tokenizeString('export default')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected end"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports="123')
+            const tokenList = tokenizeString('export default "123')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[,]')
+            const tokenList = tokenizeString('export default [,]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[1 2]')
+            const tokenList = tokenizeString('export default [1 2]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[1,,2]')
+            const tokenList = tokenizeString('export default [1,,2]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[]]')
+            const tokenList = tokenizeString('export default []]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=["a"')
+            const tokenList = tokenizeString('export default ["a"')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected end"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[1,]')
+            const tokenList = tokenizeString('export default [1,]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[,1]')
+            const tokenList = tokenizeString('export default [,1]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[:]')
+            const tokenList = tokenizeString('export default [:]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=]')
+            const tokenList = tokenizeString('export default ]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={,}')
+            const tokenList = tokenizeString('export default {,}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={1:2}')
+            const tokenList = tokenizeString('export default {1:2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"1"2}')
+            const tokenList = tokenizeString('export default {"1"2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"1"::2}')
+            const tokenList = tokenizeString('export default {"1"::2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"1":2,,"3":4')
+            const tokenList = tokenizeString('export default {"1":2,,"3":4')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={}}')
+            const tokenList = tokenizeString('export default {}}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"1":2')
+            const tokenList = tokenizeString('export default {"1":2')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected end"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={"1":2,}')
+            const tokenList = tokenizeString('export default {"1":2,}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={,"1":2}')
+            const tokenList = tokenizeString('export default {,"1":2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=}')
+            const tokenList = tokenizeString('export default }')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=[{]}')
+            const tokenList = tokenizeString('export default [{]}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={[}]')
+            const tokenList = tokenizeString('export default {[}]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports=10-5')
+            const tokenList = tokenizeString('export default 10-5')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
@@ -259,24 +259,24 @@ export default {
     ],
     validWhiteSpaces:[
         () => {
-            const tokenList = tokenizeString('module.exports=[ 0 , 1 , 2 ]')
+            const tokenList = tokenizeString('export default [ 0 , 1 , 2 ]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[0,1,2]]') { throw result }
+            if (result !== '["ok",[[],[["array",[0,1,2]]]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('module.exports={ "a" : 0 , "b" : 1 }')
+            const tokenList = tokenizeString('export default { "a" : 0 , "b" : 1 }')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",{"a":0,"b":1}]') { throw result }
+            if (result !== '["ok",[[],[{"a":0,"b":1}]]]') { throw result }
         },
     ],
     validModule:[
         () => {
-            const tokenList = tokenizeString('module.exports = null')
+            const tokenList = tokenizeString('export default null')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",null]') { throw result }
+            if (result !== '["ok",[[],[null]]]') { throw result }
         },
     ],
     invalidModule:[
@@ -292,5 +292,121 @@ export default {
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
-    ]
+        () => {
+            const tokenList = tokenizeString('export null')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('export default = null')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+    ],
+    validWithConst:[
+        () => {
+            const tokenList = tokenizeString('const a = 1 \n const b = 2 \n export default 3')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[[],[1,2,3]]]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('const a = 1 \n const b = 2 \n export default b')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[[],[1,2,["cref",1]]]]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('const a = 1 \n const b = 2 \n export default [b,a,b]')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[[],[1,2,["array",[["cref",1],["cref",0],["cref",1]]]]]]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('const a = 1 \n const b = 2 \n export default {"1st":b,"2nd":a,"3rd":b}')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[[],[1,2,{"1st":["cref",1],"2nd":["cref",0],"3rd":["cref",1]}]]]') { throw result }
+        },
+    ],
+    invalidWithConst:[
+        () => {
+            const tokenList = tokenizeString('const a = 1 const b = 2 export default 3')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('const = 1 \n const b = 2 \n export default 3')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('const a = 1 \n const a = 2 \n export default 3')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","duplicate id"]') { throw result }
+        },
+    ],
+    validWithArgs:[
+        () => {
+            const tokenList = tokenizeString('import a from "test/test.f.mjs" \n export default a')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[["test/test.f.mjs"],[["aref",0]]]]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import a from "first/test.f.mjs" \n import b from "second/test.f.mjs" \n export default [b, a, b]')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[["first/test.f.mjs","second/test.f.mjs"],[["array",[["aref",1],["aref",0],["aref",1]]]]]]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import a from "test/test.f.mjs" \n const b = null \n export default [b, a, b]')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[["test/test.f.mjs"],[null,["array",[["cref",0],["aref",0],["cref",0]]]]]]') { throw result }
+        },
+    ],
+    invalidWithArgs:[
+        () => {
+            const tokenList = tokenizeString('import a from "test/test.f.mjs" export default a')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import a from \n export default a')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import a "test/test.f.mjs" \n export default a')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import from "test/test.f.mjs" \n export default a')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import a from "first/test.f.mjs" \n import a from "second/test.f.mjs" \n export default [b, a, b]')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","duplicate id"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('import a from "test/test.f.mjs" \n const a = null \n export default null')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","duplicate id"]') { throw result }
+        },
+    ],
 }

package/djs/test.f.mjs

@@ -1,9 +1,9 @@
-import json from '../json/module.f.mjs'
-import list from '../types/object/module.f.mjs'
+import * as json from '../json/module.f.mjs'
+import * as list from '../types/object/module.f.mjs'
 const { sort } = list
-import f from '../types/function/module.f.mjs'
+import * as f from '../types/function/module.f.mjs'
 const { identity } = f
-import djs from './module.f.mjs'
+import * as djs from './module.f.mjs'
 
 export default {
     stringify: [

package/djs/tokenizer/module.f.d.mts

@@ -1,17 +1,13 @@
-declare namespace _default {
-    export { tokenize };
-}
-export default _default;
+/** @type {(input: list.List<number>) => list.List<DjsToken>} */
+export const tokenize: (input: list.List<number>) => list.List<DjsToken>;
 export type DjsToken = {
     readonly kind: "true" | "false" | "null";
 } | {
     readonly kind: "{" | "}" | ":" | "," | "[" | "]" | "." | "=";
-} | jsTokenizerT.StringToken | jsTokenizerT.NumberToken | jsTokenizerT.ErrorToken | jsTokenizerT.IdToken | jsTokenizerT.BigIntToken | jsTokenizerT.WhitespaceToken;
+} | jsTokenizer.StringToken | jsTokenizer.NumberToken | jsTokenizer.ErrorToken | jsTokenizer.IdToken | jsTokenizer.BigIntToken | jsTokenizer.WhitespaceToken | jsTokenizer.NewLineToken;
 export type ScanState = {
     readonly kind: "def" | "-";
 };
-export type ScanInput = jsTokenizerT.JsToken | null;
-/** @type {(input: List.List<number>) => List.List<DjsToken>} */
-declare const tokenize: (input: List.List<number>) => List.List<DjsToken>;
-import * as jsTokenizerT from '../../js/tokenizer/module.f.mjs';
-import * as List from '../../types/list/module.f.mjs';
+export type ScanInput = jsTokenizer.JsToken | null;
+import * as list from '../../types/list/module.f.mjs';
+import * as jsTokenizer from '../../js/tokenizer/module.f.mjs';

package/djs/tokenizer/module.f.mjs

@@ -1,22 +1,23 @@
 // @ts-self-types="./module.f.d.mts"
 
 import * as Operator from '../../types/function/operator/module.f.mjs'
-import list, * as List from '../../types/list/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { empty, flat, stateScan } = list
-import bf from '../../types/bigfloat/module.f.mjs'
+import * as bf from '../../types/bigfloat/module.f.mjs'
 const { multiply } = bf
-import jsTokenizer, * as jsTokenizerT from '../../js/tokenizer/module.f.mjs'
+import * as jsTokenizer from '../../js/tokenizer/module.f.mjs'
 
 /**
  * @typedef {|
 * {readonly kind: 'true' | 'false' | 'null'} |
 * {readonly kind: '{' | '}' | ':' | ',' | '[' | ']' | '.' | '=' } |
-* jsTokenizerT.StringToken |
-* jsTokenizerT.NumberToken |
-* jsTokenizerT.ErrorToken |
-* jsTokenizerT.IdToken |
-* jsTokenizerT.BigIntToken |
-* jsTokenizerT.WhitespaceToken
+* jsTokenizer.StringToken |
+* jsTokenizer.NumberToken |
+* jsTokenizer.ErrorToken |
+* jsTokenizer.IdToken |
+* jsTokenizer.BigIntToken |
+* jsTokenizer.WhitespaceToken |
+* jsTokenizer.NewLineToken
 * } DjsToken
 */
 
@@ -28,11 +29,11 @@ import jsTokenizer, * as jsTokenizerT from '../../js/tokenizer/module.f.mjs'
 
 /**
  * @typedef {|
-* jsTokenizerT.JsToken | null
+* jsTokenizer.JsToken | null
 * } ScanInput
 */
 
-/** @type {(input: jsTokenizerT.JsToken) => List.List<DjsToken>} */
+/** @type {(input: jsTokenizer.JsToken) => list.List<DjsToken>} */
 const mapToken = input =>
 {
     switch(input.kind)
@@ -53,12 +54,13 @@ const mapToken = input =>
         case 'string':
         case 'number':
         case 'ws':
+        case 'nl':
         case 'error': return [input]
         default: return jsTokenizer.isKeywordToken(input) ? [{ kind: 'id', value: input.kind }] : [{ kind: 'error', message: 'invalid token' }]
     }
 }
 
-/** @type {(input: ScanInput) => readonly [List.List<DjsToken>, ScanState]} */
+/** @type {(input: ScanInput) => readonly [list.List<DjsToken>, ScanState]} */
 const parseDefaultState = input =>
 {
     if (input === null) return [empty, { kind: 'def'}]
@@ -69,7 +71,7 @@ const parseDefaultState = input =>
     }
 }
 
-/** @type {(input: ScanInput) => readonly [List.List<DjsToken>, ScanState]} */
+/** @type {(input: ScanInput) => readonly [list.List<DjsToken>, ScanState]} */
 const parseMinusState = input =>
 {
     if (input === null) return [[{ kind: 'error', message: 'invalid token' }], { kind: 'def'}]
@@ -82,7 +84,7 @@ const parseMinusState = input =>
     }
 }
 
-/** @type {Operator.StateScan<ScanInput, ScanState, List.List<DjsToken>>} */
+/** @type {Operator.StateScan<ScanInput, ScanState, list.List<DjsToken>>} */
 const scanToken = state => input => {
     switch(state.kind)
     {
@@ -91,15 +93,10 @@ const scanToken = state => input => {
     }
 }
 
-/** @type {(input: List.List<number>) => List.List<DjsToken>} */
-const tokenize = input =>
+/** @type {(input: list.List<number>) => list.List<DjsToken>} */
+export const tokenize = input =>
 {
-    /** @type {List.List<ScanInput>} */
+    /** @type {list.List<ScanInput>} */
     const jsTokens = jsTokenizer.tokenize(input)
     return flat(stateScan(scanToken)({ kind: 'def' })(list.concat(jsTokens)([null])))
 }
-
-export default {
-    /** @readonly */
-    tokenize
-}

package/djs/tokenizer/test.f.mjs

@@ -1,12 +1,12 @@
-import tokenizer, * as tokenizerT from './module.f.mjs'
-import list from '../../types/list/module.f.mjs'
+import * as tokenizer from './module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { toArray } = list
-import djs from '../module.f.mjs'
-import o from '../../types/object/module.f.mjs'
+import * as djs from '../module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { sort } = o
-import encoding from '../../text/utf16/module.f.mjs'
+import * as encoding from '../../text/utf16/module.f.mjs'
 
-/** @type {(s: string) => readonly tokenizerT.DjsToken[]} */
+/** @type {(s: string) => readonly tokenizer.DjsToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
 const stringify = djs.stringify(sort)
@@ -47,7 +47,7 @@ export default {
         },
         () => {
             const result = stringify(tokenizeString('{ \t\n\r}'))
-            if (result !== '[{"kind":"{"},{"kind":"ws"},{"kind":"}"}]') { throw result }
+            if (result !== '[{"kind":"{"},{"kind":"nl"},{"kind":"}"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('""'))