functionalscript 0.1.609 → 0.2.1

package/commonjs/module/module.f.mjs

@@ -40,7 +40,7 @@ import * as O from '../../types/object/module.f.mjs'
  */
 
 /** @type {(id: Id) => Id | null} */
-const dir = id => {
+export const dir = id => {
     const len = id.path.length
     if (len < 1) { return null }
     return {
@@ -50,11 +50,4 @@ const dir = id => {
 }
 
 /** @type {(id: Id) => string} */
-const idToString = id => `${id.package}/${id.path.join('/')}`
-
-export default {
-    /** @readonly */
-    dir,
-    /** @readonly */
-    idToString,
-}
+export const idToString = id => `${id.package}/${id.path.join('/')}`

package/commonjs/module.f.mjs

@@ -9,5 +9,3 @@
  *  (fileName: string) => string|null
  * ]} Package
  */
-
-export default {}

package/commonjs/module.mjs

@@ -1,6 +1,6 @@
 import unsafeResult from '../types/result/module.mjs'
 const { tryCatch } = unsafeResult
-import result from '../types/result/module.f.mjs'
+import * as result from '../types/result/module.f.mjs'
 const { unwrap } = result
 import * as ModuleFunction from './module/function/module.f.mjs'
 
@@ -23,11 +23,6 @@ const build = f => immutableRequire => mutableData => {
 }
 
 /** @type {ModuleFunction.Compile} */
-const compile = source =>
+export const compile = source =>
     // Side effect: a `Function` constructor is not allowed in FunctionalScript.
     tryCatch(() => build(Function('module', 'require', `"use strict";${source}`)))
-
-export default {
-    /** @readonly */
-    compile,
-}

package/commonjs/package/dependencies/module.f.mjs

@@ -1,7 +1,7 @@
 // @ts-self-types="./module.f.d.mts"
-import json, * as Json from '../../../json/module.f.mjs'
+import * as json from '../../../json/module.f.mjs'
 const { isObject } = json
-import list from '../../../types/list/module.f.mjs'
+import * as list from '../../../types/list/module.f.mjs'
 const { map, every } = list
 const { entries } = Object
 
@@ -11,17 +11,12 @@ const { entries } = Object
 
 /** @typedef {DependencyMapJson|null} DependenciesJson */
 
-/** @type {(entry: Json.Entry) => boolean} */
+/** @type {(entry: json.Entry) => boolean} */
 const isDependencyJson = ([, v]) => typeof v === 'string'
 
-/** @type {(j: Json.Unknown) => j is DependenciesJson} */
-const isDependenciesJson = j => {
+/** @type {(j: json.Unknown) => j is DependenciesJson} */
+export const isDependenciesJson = j => {
     if (j === null) { return true }
     if (!isObject(j)) { return false }
     return every(map(isDependencyJson)(entries(j)))
 }
-
-export default {
-    /** @readonly */
-    isDependenciesJson,
-}

package/commonjs/package/dependencies/test.f.mjs

@@ -1,4 +1,4 @@
-import _ from './module.f.mjs'
+import * as _ from './module.f.mjs'
 
 export default () => {
     if (!_.isDependenciesJson(null)) { throw 'error' }

package/commonjs/package/module.f.mjs

@@ -1,21 +1,21 @@
 // @ts-self-types="./module.f.d.mts"
-import json, * as Json from '../../json/module.f.mjs'
+import * as json from '../../json/module.f.mjs'
 const { isObject } = json
-import dependencies, * as Dependencies from './dependencies/module.f.mjs'
+import * as dependencies from './dependencies/module.f.mjs'
 const { isDependenciesJson } = dependencies
-import o from '../../types/object/module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { at } = o
 
 /**
  * @typedef {{
  *  readonly name: string
  *  readonly version: string
- *  readonly dependencies?: Dependencies.DependenciesJson
+ *  readonly dependencies?: dependencies.DependenciesJson
  * }} PackageJson
  */
 
-/** @type {(j: Json.Unknown) => j is PackageJson} */
-const isPackageJson = j => {
+/** @type {(j: json.Unknown) => j is PackageJson} */
+export const isPackageJson = j => {
     if (!isObject(j)) { return false }
     if (typeof j.name !== 'string') { return false }
     if (typeof j.version !== 'string') { return false }
@@ -34,10 +34,3 @@ const isPackageJson = j => {
  * @note Current package has an empty string '' as a packageId.
  * @typedef {(packageId: string) => Package | null} Get
  */
-
-export default {
-    /** @readonly */
-    dependencies,
-    /** @readonly */
-    isPackageJson,
-}

package/commonjs/package/test.f.mjs

@@ -1,4 +1,4 @@
-import _ from './module.f.mjs'
+import * as _ from './module.f.mjs'
 
 export default () => {
     if (_.isPackageJson(null)) { throw 'error' }

package/commonjs/path/module.f.mjs

@@ -1,7 +1,7 @@
 // @ts-self-types="./module.f.d.mts"
-import list, * as List from '../../types/list/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { next, fold, reverse, first, flat, toArray, filterMap, isEmpty, concat } = list
-import string from '../../types/string/module.f.mjs'
+import * as string from '../../types/string/module.f.mjs'
 const { join } = string
 import * as Package from '../package/module.f.mjs'
 import * as Module from '../module/module.f.mjs'
@@ -19,7 +19,7 @@ import * as Module from '../module/module.f.mjs'
 /** @type {(path: string) => readonly string[]} */
 const split = path => path.split('/')
 
-/** @typedef {readonly[List.List<string>] | null} OptionList */
+/** @typedef {readonly[list.List<string>] | null} OptionList */
 
 /** @type {(items: string) => (prior: OptionList) => OptionList} */
 const normItemsOp = first => prior => {
@@ -38,7 +38,7 @@ const normItemsOp = first => prior => {
     }
 }
 
-/** @type {(items: List.List<string>) => OptionList} */
+/** @type {(items: list.List<string>) => OptionList} */
 const normItems = items => {
     const result = fold(normItemsOp)([list.empty])(items)
     return result === null ? result : [reverse(result[0])]
@@ -47,8 +47,8 @@ const normItems = items => {
 const firstNull = first(null)
 
 /** @type {(local: string) => (path: string) => LocalPath|null} */
-const parseLocal = local => {
-    /** @type {(path: string) => readonly[boolean, boolean, List.List<string>]} */
+export const parseLocal = local => {
+    /** @type {(path: string) => readonly[boolean, boolean, list.List<string>]} */
     const fSeq = path => {
         const pathSeq = split(path)
         const dir = [null, '', '.', '..'].includes(pathSeq[pathSeq.length - 1])
@@ -69,9 +69,9 @@ const parseLocal = local => {
     }
 }
 
-/** @typedef {readonly[string, List.List<string>]} IdPath */
+/** @typedef {readonly[string, list.List<string>]} IdPath */
 
-/** @type {(prior: readonly[string|null, List.List<string>]) => List.Thunk<IdPath>} */
+/** @type {(prior: readonly[string|null, list.List<string>]) => list.Thunk<IdPath>} */
 const variants = prior => () => {
     const [a, b] = prior
     const r = next(b)
@@ -99,10 +99,10 @@ const mapDependency = d => ([external, internal]) => {
 /**
  * @type {(d: (local: string) => string|null) =>
  *  (dir: boolean) =>
- *  (items: List.List<string>) =>
+ *  (items: list.List<string>) =>
  *  Path|null}
  */
-const parseGlobal = dependencies =>
+export const parseGlobal = dependencies =>
 {
     const fMap = filterMap(mapDependency(dependencies))
     return dir => items => {
@@ -120,7 +120,7 @@ const parseGlobal = dependencies =>
  *  (path: string) =>
  *  Path|null }
  */
-const parse = packageId => dependencies => {
+export const parse = packageId => dependencies => {
     const pg = parseGlobal(dependencies)
     return local => path => {
         const parsed = parseLocal(local)(path)
@@ -147,7 +147,7 @@ const parse = packageId => dependencies => {
  *  Result
  * }
  */
-const parseAndFind = packageGet => moduleId => path => {
+export const parseAndFind = packageGet => moduleId => path => {
     const currentPack = packageGet(moduleId.package)
     if (currentPack === null) { return null }
     const p = parse(moduleId.package)(currentPack.dependency)(moduleId.path.join('/'))(path)
@@ -164,14 +164,3 @@ const parseAndFind = packageGet => moduleId => path => {
     const fileList = p.dir || isEmpty(p.items) ? [indexJs] : [file, `${file}.js`, indexJs]
     return firstNull(filterMap(tryFile)(fileList))
 }
-
-export default {
-    /** @readonly */
-    parseLocal,
-    /** @readonly */
-    parseGlobal,
-    /** @readonly */
-    parse,
-    /** @readonly */
-    parseAndFind,
-}

package/commonjs/path/test.f.mjs

@@ -1,17 +1,17 @@
-import _ from './module.f.mjs'
-import dev from '../../dev/module.f.mjs'
+import * as _ from './module.f.mjs'
+import * as dev from '../../dev/module.f.mjs'
 const { todo } = dev
-import json, * as Json from '../../json/module.f.mjs'
-import f from '../../types/function/module.f.mjs'
+import * as json from '../../json/module.f.mjs'
+import * as f from '../../types/function/module.f.mjs'
 const { identity } = f
-import object, * as O from '../../types/object/module.f.mjs'
+import * as object from '../../types/object/module.f.mjs'
 const { at } = object
 import * as Package from '../package/module.f.mjs'
 
-/** @type {<T>(o: O.Map<T>) => (s: string) => T|null} */
+/** @type {<T>(o: object.Map<T>) => (s: string) => T|null} */
 const i = o => s => at(s)(o)
 
-/** @type {(g: Json.Unknown) => string} */
+/** @type {(g: json.Unknown) => string} */
 const stringify = json.stringify(identity)
 
 export default {
@@ -70,7 +70,7 @@ export default {
         },
     },
     9: () => {
-        /** @type {O.Map<Package.Package>} */
+        /** @type {object.Map<Package.Package>} */
         const packages = {
             '': {
                 dependency: () => todo(),
@@ -81,7 +81,7 @@ export default {
         if (result !== '{"id":{"package":"","path":["a","c"]},"source":"return \\"a/c\\""}') { throw result }
     },
     10: () => {
-        /** @type {O.Map<Package.Package>} */
+        /** @type {object.Map<Package.Package>} */
         const packages = {
             '': {
                 dependency: x => {
@@ -131,7 +131,7 @@ export default {
         }
     },
     11: () => {
-        /** @type {O.Map<Package.Package>} */
+        /** @type {object.Map<Package.Package>} */
         const packages = {
             '': {
                 dependency: x => {
@@ -158,7 +158,7 @@ export default {
         }
     },
     12: () => {
-        /** @type {O.Map<Package.Package>} */
+        /** @type {object.Map<Package.Package>} */
         const packages = {
             '': {
                 dependency: x => {

package/commonjs/test.mjs

@@ -1,4 +1,4 @@
-import _ from './module.mjs'
+import * as _ from './module.mjs'
 import * as Run from './module/function/module.f.mjs'
 
 export default {

package/dev/module.f.mjs

@@ -1,6 +1,3 @@
 // @ts-self-types="./module.f.d.mts"
 
-export default {
-    /** @readonly */
-    todo: () => { throw 'not implemented' },
-}
+export const todo = () => { throw 'not implemented' }

package/dev/module.mjs

@@ -183,7 +183,7 @@ export const index = async () => {
     const n = '/module.f.mjs'
     const jsr_json = JSON.parse(await readFile(jj, { encoding: 'utf8' }))
     const list = Object.keys(await loadModuleMap()).filter(v => v.endsWith(n))
-    const exportsA = list.map(v => [v.replace(n, ''), v])
+    const exportsA = list.filter(v => !v.startsWith('./out')).map(v => [v.replace(n, ''), `./out/${v}`])
     const exports = Object.fromEntries(exportsA)
     await writeFile(
         jj,

package/dev/test/module.f.mjs

@@ -1,8 +1,8 @@
 // @ts-self-types="./module.f.d.mts"
-import list from '../../types/list/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { fold } = list
-import sgr from '../../text/sgr/module.f.mjs'
-const { reset, fgGreen, fgRed, bold } = sgr
+import * as sgr from '../../text/sgr/module.f.mjs'
+const { reset, fgGreen, fgRed, bold } = sgr.codes
 import * as Result from '../../types/result/module.f.mjs'
 
 /**
@@ -80,7 +80,7 @@ const timeFormat = a => {
 }
 
 /** @type {<T>(input: Input<T>) => readonly[number, T]} */
-const main = input => {
+export default input => {
     let { moduleMap, log, error, measure, tryCatch, env, state } = input
     const isGitHub = env('GITHUB_ACTION') !== void 0
     /** @typedef {input extends Input<infer T> ? T : never} T */
@@ -146,5 +146,3 @@ const main = input => {
     state = log(`${bold}Time: ${timeFormat(ts.time)}${reset}`)(state);
     return [ts.fail !== 0 ? 1 : 0, state]
 }
-
-export default main

package/djs/module.f.mjs

@@ -1,16 +1,16 @@
 // @ts-self-types="./module.f.d.mts"
 
-import list, * as List from '../types/list/module.f.mjs'
+import * as list from '../types/list/module.f.mjs'
 const { flat, map } = list
-import string from '../types/string/module.f.mjs'
+import * as string from '../types/string/module.f.mjs'
 const { concat } = string
 import * as O from '../types/object/module.f.mjs'
-import f from '../types/function/module.f.mjs'
+import * as f from '../types/function/module.f.mjs'
 const { compose, fn } = f
 const { entries } = Object
-import bi from '../types/bigint/module.f.mjs'
+import * as bi from '../types/bigint/module.f.mjs'
 const { serialize: bigintSerialize } = bi
-import j from '../json/serializer/module.f.mjs'
+import * as j from '../json/serializer/module.f.mjs'
 const { objectWrap, arrayWrap, stringSerialize, numberSerialize, nullSerialize, boolSerialize } = j
 
 /**
@@ -27,26 +27,26 @@ const colon = [':']
 
 /** @typedef {O.Entry<Unknown>} Entry*/
 
-/** @typedef {(List.List<Entry>)} Entries */
+/** @typedef {(list.List<Entry>)} Entries */
 
 /** @typedef {(entries: Entries) => Entries} MapEntries */
 
-/** @type {(mapEntries: MapEntries) => (value: Unknown) => List.List<string>} */
-const serialize = sort => {
-    /** @type {(kv: readonly[string, Unknown]) => List.List<string>} */
+/** @type {(mapEntries: MapEntries) => (value: Unknown) => list.List<string>} */
+export const serialize = sort => {
+    /** @type {(kv: readonly[string, Unknown]) => list.List<string>} */
     const propertySerialize = ([k, v]) => flat([
         stringSerialize(k),
         colon,
         f(v)
     ])
     const mapPropertySerialize = map(propertySerialize)
-    /** @type {(object: Object) => List.List<string>} */
+    /** @type {(object: Object) => list.List<string>} */
     const objectSerialize = fn(entries)
         .then(sort)
         .then(mapPropertySerialize)
         .then(objectWrap)
         .result
-    /** @type {(value: Unknown) => List.List<string>} */
+    /** @type {(value: Unknown) => list.List<string>} */
     const f = value => {
         switch (typeof value) {
             case 'boolean': { return boolSerialize(value) }
@@ -70,11 +70,4 @@ const serialize = sort => {
  *
  * @type {(mapEntries: MapEntries) => (value: Unknown) => string}
  */
-const stringify = sort => compose(serialize(sort))(concat)
-
-export default {
-    /** @readonly */
-    stringify,
-    /** @readonly */
-    serialize,
-}
+export const stringify = sort => compose(serialize(sort))(concat)

package/djs/parser/module.f.mjs

@@ -1,13 +1,13 @@
 // @ts-self-types="./module.f.d.mts"
 
-import result, * as Result from '../../types/result/module.f.mjs'
-import list, * as List from '../../types/list/module.f.mjs'
+import * as result from '../../types/result/module.f.mjs'
+import * as list from '../../types/list/module.f.mjs'
 const { fold, first, drop, toArray, map: listMap, length } = list
 import * as Operator from '../../types/function/operator/module.f.mjs'
 import * as tokenizerT from '../tokenizer/module.f.mjs'
-import map, * as Map from '../../types/map/module.f.mjs'
+import * as map from '../../types/map/module.f.mjs'
 const { setReplace, at } = map
-import o, * as O from '../../types/object/module.f.mjs'
+import * as o from '../../types/object/module.f.mjs'
 const { fromMap } = o
 
 /** @typedef {[readonly string[], readonly DjsConst[]] } DjsModule */
@@ -24,9 +24,9 @@ const { fromMap } = o
 * }} DjsObject
 */
 
-/** @typedef {['array', List.List<DjsConst>]} DjsStackArray */
+/** @typedef {['array', list.List<DjsConst>]} DjsStackArray */
 
-/** @typedef {['object', Map.Map<DjsConst>, string]} DjsStackObject */
+/** @typedef {['object', map.Map<DjsConst>, string]} DjsStackObject */
 
 
 /**
@@ -36,15 +36,15 @@ const { fromMap } = o
 * } DjsStackElement
 */
 
-/** @typedef {List.List<DjsStackElement>} DjsStack */
+/** @typedef {list.List<DjsStackElement>} DjsStack */
 
 /** @typedef {InitialState | NewLineRequiredState | ImportState | ConstState | ExportState | ParseValueState | ResultState | ErrorState} ParserState */
 
 /**
  * @typedef {{
-*  readonly refs: Map.Map<DjsModuleRef>
-*  readonly modules: List.List<string>
-*  readonly consts: List.List<DjsConst>
+*  readonly refs: map.Map<DjsModuleRef>
+*  readonly modules: list.List<string>
+*  readonly consts: list.List<DjsConst>
 * }} ModuleState
 */
 
@@ -153,7 +153,7 @@ const parseConstOp = token => state => {
         case 'nl': return state
         case 'id': {
             if (map.at(token.value)(state.module.refs) !== null)
-                return { state: 'error', message: 'duplicate id' }      
+                return { state: 'error', message: 'duplicate id' }
             /** @type {DjsModuleRef} */
             let cref = ['cref', length(state.module.consts)]
             let refs = map.setReplace(token.value)(cref)(state.module.refs)
@@ -232,7 +232,7 @@ const pushKey = state => key => {
 
 /** @type {(state: ParseValueState) => (value: DjsConst) => ParserState} */
 const pushValue = state => value => {
-    if (state.top === null) { 
+    if (state.top === null) {
         let consts = list.concat(state.module.consts)([value])
         switch(state.state)
         {
@@ -262,7 +262,7 @@ const startArray = state => {
 const endArray = state => {
     const top = state.top;
     /** @type {ParseValueState} */
-    const newState = { ... state, valueState: '', top: first(null)(state.stack), stack: drop(1)(state.stack) }    
+    const newState = { ... state, valueState: '', top: first(null)(state.stack), stack: drop(1)(state.stack) }
     if (top !== null && top[0] === 'array')
     {
         /** @type {DjsArray} */
@@ -391,13 +391,13 @@ const foldOp = token => state => {
         case 'import+from': return parseImportFromOp(token)(state)
         case 'const': return parseConstOp(token)(state)
         case 'const+name': return parseConstNameOp(token)(state)
-        case 'export': return parseExportOp(token)(state)        
+        case 'export': return parseExportOp(token)(state)
         case 'result': return { state: 'error', message: 'unexpected token' }
         case 'error': return { state: 'error', message: state.message }
         case 'constValue':
-        case 'exportValue': 
+        case 'exportValue':
         {
-            switch (state.valueState) 
+            switch (state.valueState)
             {
                 case '': return parseValueOp(token)(state)
                 case '[': return parseArrayStartOp(token)(state)
@@ -413,8 +413,8 @@ const foldOp = token => state => {
     }
 }
 
-/** @type {(tokenList: List.List<tokenizerT.DjsToken>) => Result.Result<DjsModule, string>} */
-const parse = tokenList => {
+/** @type {(tokenList: list.List<tokenizerT.DjsToken>) => result.Result<DjsModule, string>} */
+export const parse = 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) ])
@@ -422,9 +422,3 @@ const parse = tokenList => {
         default: return result.error('unexpected end')
     }
 }
-
-
-export default {
-    /** @readonly */
-    parse
-}

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)
@@ -72,7 +72,7 @@ export default {
             const tokenList = tokenizeString('export default [0,[1,[2,[]]],3]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
-            if (result !== '["ok",[[],[["array",[0,["array",[1,["array",[2,["array",[]]]]]],3]]]]]') { throw result }            
+            if (result !== '["ok",[[],[["array",[0,["array",[1,["array",[2,["array",[]]]]]],3]]]]]') { throw result }
         },
         () => {
             const tokenList = tokenizeString('export default {}')
@@ -395,7 +395,7 @@ export default {
             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)

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: [