functionalscript 0.0.592 → 0.1.594

package/com/types/{module.f.cjs → module.f.mjs}

@@ -1,6 +1,7 @@
-const obj = require('../../types/object/module.f.cjs')
-const list = require('../../types/list/module.f.cjs')
-const { compose } = require('../../types/function/module.f.cjs')
+import obj, * as O from '../../types/object/module.f.mjs'
+import list, * as List from '../../types/list/module.f.mjs'
+import f from '../../types/function/module.f.mjs'
+const { compose } = f
 const { filter } = list
 const { entries } = Object
 
@@ -16,7 +17,7 @@ const { entries } = Object
 
 /** @typedef {{readonly[k in string]: Type}} FieldArray */
 
-/** @typedef {obj.Entry<Type>} Field */
+/** @typedef {O.Entry<Type>} Field */
 
 /**
  * @typedef {{
@@ -27,7 +28,7 @@ const { entries } = Object
 
 /** @typedef {{readonly[k in string]: FieldArray}} MethodArray */
 
-/** @typedef {obj.Entry<FieldArray>} Method */
+/** @typedef {O.Entry<FieldArray>} Method */
 
 /** @typedef {BaseType|Id|Pointer} Type */
 
@@ -53,18 +54,18 @@ const { entries } = Object
 
 /** @typedef {readonly['*', Type]} Pointer */
 
-/** @type {(kv: obj.Entry<Type>) => boolean} */
+/** @type {(kv: O.Entry<Type>) => boolean} */
 const isParam = ([name]) => name !== '_'
 
 const filterParam = filter(isParam)
 
-/** @type {(fa: FieldArray) => list.List<Field> } */
+/** @type {(fa: FieldArray) => List.List<Field> } */
 const paramList = compose(entries)(filterParam)
 
 /** @type {<T>(v: T) => (f: (type: Type) => T) => (fa: FieldArray) => T} */
 const result = v => f => fa => '_' in fa ? f(fa._) : v
 
-module.exports = {
+export default {
     /** @readonly */
     paramList,
     /** @readonly */

package/com/types/{testlib.f.cjs → testlib.f.mjs}

@@ -1,7 +1,7 @@
-const _ = require('./module.f.cjs')
+import * as _ from './module.f.mjs'
 
 /** @type {_.Library} */
-module.exports = {
+export default {
     Slice: {
         struct: {
             Start: ['*', 'u8'],

package/commonjs/build/{module.f.cjs → module.f.mjs}

@@ -1,29 +1,29 @@
-const package_ = require('../package/module.f.cjs')
-const module_ = require('../module/module.f.cjs')
+import package_, * as packageT from '../package/module.f.mjs'
+import module_, * as moduleT from '../module/module.f.mjs'
 const { idToString, dir } = module_
-const function_ = require('../module/function/module.f.cjs')
-const map = require('../../types/map/module.f.cjs')
+import * as function_ from '../module/function/module.f.mjs'
+import map, * as Map from '../../types/map/module.f.mjs'
 const { empty: mapEmpty, setReplace } = map
-const object = require('../../types/object/module.f.cjs')
+import object from '../../types/object/module.f.mjs'
 const { fromMap } = object
-const path = require('../path/module.f.cjs')
+import path from '../path/module.f.mjs'
 const { parseAndFind } = path
-const stringSet = require('../../types/string_set/module.f.cjs')
+import stringSet, * as StringSet from '../../types/string_set/module.f.mjs'
 const { set: setSet, contains: setContains, empty: stringSetEmpty } = stringSet
 
 /**
  * @template M
  * @typedef {{
- *  readonly packageGet: package_.Get
- *  readonly moduleMapInterface: module_.MapInterface<M>
- *  readonly moduleId: module_.Id
+ *  readonly packageGet: packageT.Get
+ *  readonly moduleMapInterface: moduleT.MapInterface<M>
+ *  readonly moduleId: moduleT.Id
  *  readonly moduleMap: M
  * }} Config
  */
 
 /**
  * @template M
- * @typedef {readonly[module_.State, M]} Result
+ * @typedef {readonly[moduleT.State, M]} Result
  */
 
 /** @type {<M>(moduleMap: M) => Result<M>} */
@@ -31,19 +31,19 @@ const notFound = moduleMap => [['error', ['file not found']], moduleMap]
 
 /**
  * @type {(compile: function_.Compile) =>
- *  (packageGet: package_.Get) =>
- *  <M>(moduleMapInterface: module_.MapInterface<M>) =>
- *  (moduleId: module_.Id) =>
+ *  (packageGet: packageT.Get) =>
+ *  <M>(moduleMapInterface: moduleT.MapInterface<M>) =>
+ *  (moduleId: moduleT.Id) =>
  *  (moduleMap: M) =>
  *  Result<M>
  * }
  */
 const getOrBuild = compile => packageGet => moduleMapInterface =>  {
-    /** @typedef {typeof moduleMapInterface extends module_.MapInterface<infer M> ? M : never} M */
+    /** @typedef {typeof moduleMapInterface extends moduleT.MapInterface<infer M> ? M : never} M */
 
     /**
-     * @type {(buildSet: stringSet.StringSet) =>
-     *  (moduleId: module_.Id) =>
+     * @type {(buildSet: StringSet.StringSet) =>
+     *  (moduleId: moduleT.Id) =>
      *  (source: string) =>
      *  (moduleMap: M) =>
      *  Result<M>}
@@ -52,9 +52,9 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
         const moduleIdStr = idToString(moduleId)
         const buildSet1 = setSet(moduleIdStr)(buildSet)
         const moduleDir = dir(moduleId)
-        /** @type {function_.Require<readonly[map.Map<string>, M]>} */
+        /** @type {function_.Require<readonly[Map.Map<string>, M]>} */
         const require_ = p => ([requireMap, m]) => {
-            /** @type {(e: unknown) => function_.Result<readonly[map.Map<string>, M]>} */
+            /** @type {(e: unknown) => function_.Result<readonly[Map.Map<string>, M]>} */
             const error = e => [['error', e], [requireMap, m]]
             if (moduleDir === null) { return error('file not found') }
             const r = parseAndFind(packageGet)(moduleDir)(p)
@@ -65,9 +65,9 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
             return [state[0] === 'error' ? state : ['ok', state[1].exports], [setReplace(p)(rIdStr)(requireMap), m1]]
         }
         return source => moduleMap => {
-            /** @type {(s: module_.State) => (m: M) => Result<M>} */
+            /** @type {(s: moduleT.State) => (m: M) => Result<M>} */
             const set = s => m => [s, moduleMapInterface.setReplace(moduleIdStr)(s)(m)]
-            /** @type {(e: module_.Error) => (m: M) => Result<M>} */
+            /** @type {(e: moduleT.Error) => (m: M) => Result<M>} */
             const error = e => set(['error', e])
             // check compilation
             const [kind, result] = compile(source)
@@ -80,7 +80,7 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
             return x(moduleMap2)
         }
     }
-    /** @type {(moduleId: module_.Id) => (moduleMap: M) => Result<M>} */
+    /** @type {(moduleId: moduleT.Id) => (moduleMap: M) => Result<M>} */
     const f = moduleId => moduleMap => {
         const moduleIdStr = idToString(moduleId)
         // check moduleMap
@@ -98,7 +98,7 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
     return f
 }
 
-module.exports = {
+export default {
     /** @readonly */
     getOrBuild,
 }

package/commonjs/build/{test.f.cjs → test.f.mjs}

@@ -1,12 +1,13 @@
-const _ = require('./module.f.cjs')
-const map = require('../../types/map/module.f.cjs')
-const module_ = require('../module/module.f.cjs')
-const function_ = require('../module/function/module.f.cjs')
-const result = require('../../types/result/module.f.cjs')
-const package_ = require('../package/module.f.cjs')
-const { at } = require('../../types/object/module.f.cjs')
+import _ from './module.f.mjs'
+import map, * as Map from '../../types/map/module.f.mjs'
+import * as Module from '../module/module.f.mjs'
+import * as ModuleFunction from '../module/function/module.f.mjs'
+import * as Result from '../../types/result/module.f.mjs'
+import * as Package from '../package/module.f.mjs'
+import o from '../../types/object/module.f.mjs'
+const { at } = o
 
-/** @type {{ readonly [k in string]?: result.Result<function_.Function_, unknown> }} */
+/** @type {{ readonly [k in string]?: Result.Result<ModuleFunction.Function_, unknown> }} */
 const compileMap = {
     ':index.js': [
         'ok',
@@ -30,7 +31,7 @@ const compileMap = {
         () => m0 => [['ok', 'x:r.js'], m0]],
 }
 
-/** @type {function_.Compile} */
+/** @type {ModuleFunction.Compile} */
 const compile = source => compileMap[source] ?? ['error', 'invalid source']
 
 /** @typedef {{ readonly [k in string]: string }} StringMap */
@@ -55,7 +56,7 @@ const packageMap = {
     },
 }
 
-/** @type {package_.Get} */
+/** @type {Package.Get} */
 const packageGet = packageId => {
     const p = at(packageId)(packageMap)
     return p === null ? null :
@@ -68,9 +69,9 @@ const packageGet = packageId => {
 const getOrBuild = _.getOrBuild
     (compile)
     (packageGet)
-    (/** @type {module_.MapInterface<map.Map<module_.State>>} */(map))
+    (/** @type {Module.MapInterface<Map.Map<Module.State>>} */(map))
 
-module.exports = () => {
+export default () => {
     let [r, m] = getOrBuild({ package: '', path: ['index.js'] })(map.empty)
     {
         if (r === null) { throw 'r === null' }

package/commonjs/module/function/{module.f.cjs → module.f.mjs}

@@ -2,13 +2,13 @@
  * An IO interface for creating and running module functions.
  */
 
-const result = require('../../../types/result/module.f.cjs')
+import * as Result from '../../../types/result/module.f.mjs'
 
 /** @typedef {<M>(require: Require<M>) => (prior: M) => Result<M>} Function_ */
 
 /**
  * @template M
- * @typedef {readonly[result.Result<unknown, unknown>, M]} Result
+ * @typedef {readonly[Result.Result<unknown, unknown>, M]} Result
  */
 
 /**
@@ -16,6 +16,6 @@ const result = require('../../../types/result/module.f.cjs')
  * @typedef {(path: string) => (prior: M) => Result<M>} Require
  */
 
-/** @typedef {(source: string) => result.Result<Function_, unknown>} Compile */
+/** @typedef {(source: string) => Result.Result<Function_, unknown>} Compile */
 
-module.exports = {}
+export default {}

package/commonjs/module/{module.f.cjs → module.f.mjs}

@@ -1,4 +1,4 @@
-const object = require('../../types/object/module.f.cjs')
+import object, * as O from '../../types/object/module.f.mjs'
 
 /**
  * @template M
@@ -18,7 +18,7 @@ const object = require('../../types/object/module.f.cjs')
 /**
  * @typedef {{
  *  readonly exports: unknown
- *  readonly requireMap: object.Map<string>
+ *  readonly requireMap: O.Map<string>
  * }} Module
  */
 
@@ -51,9 +51,7 @@ const dir = id => {
 /** @type {(id: Id) => string} */
 const idToString = id => `${id.package}/${id.path.join('/')}`
 
-module.exports = {
-    /** @readonly */
-    function: require('./function/module.f.cjs'),
+export default {
     /** @readonly */
     dir,
     /** @readonly */

package/commonjs/module.f.mjs

@@ -0,0 +1,11 @@
+/** @typedef {(packageName: string) => PackageMap|Package|null} PackageMap */
+
+/**
+ * @typedef {readonly[
+ *  string,
+ *  PackageMap,
+ *  (fileName: string) => string|null
+ * ]} Package
+ */
+
+export default {}

package/commonjs/{module.cjs → module.mjs}

@@ -1,8 +1,10 @@
-const { tryCatch } = require('../types/result/module.cjs')
-const { unwrap } = require('../types/result/module.f.cjs')
-const moduleFunction = require('./module/function/module.f.cjs')
+import unsafeResult from '../types/result/module.mjs'
+const { tryCatch } = unsafeResult
+import result from '../types/result/module.f.mjs'
+const { unwrap } = result
+import * as ModuleFunction from './module/function/module.f.mjs'
 
-/** @type {(f: Function) => moduleFunction.Function_} */
+/** @type {(f: Function) => ModuleFunction.Function_} */
 const build = f => immutableRequire => mutableData => {
     /** @type {(path: string) => unknown} */
     const mutableRequire = path => {
@@ -20,12 +22,12 @@ const build = f => immutableRequire => mutableData => {
     return [result, mutableData]
 }
 
-/** @type {moduleFunction.Compile} */
+/** @type {ModuleFunction.Compile} */
 const compile = source =>
     // Side effect: a `Function` constructor is not allowed in FunctionalScript.
     tryCatch(() => build(Function('module', 'require', `"use strict";${source}`)))
 
-module.exports = {
+export default {
     /** @readonly */
     compile,
 }

package/commonjs/package/dependencies/{module.f.cjs → module.f.mjs}

@@ -1,6 +1,6 @@
-const json = require('../../../json/module.f.cjs')
+import json, * as jsonT from '../../../json/module.f.mjs'
 const { isObject } = json
-const list = require('../../../types/list/module.f.cjs')
+import list from '../../../types/list/module.f.mjs'
 const { map, every } = list
 const { entries } = Object
 
@@ -10,17 +10,17 @@ const { entries } = Object
 
 /** @typedef {DependencyMapJson|null} DependenciesJson */
 
-/** @type {(entry: json.Entry) => boolean} */
+/** @type {(entry: jsonT.Entry) => boolean} */
 const isDependencyJson = ([, v]) => typeof v === 'string'
 
-/** @type {(j: json.Unknown) => j is DependenciesJson} */
+/** @type {(j: jsonT.Unknown) => j is DependenciesJson} */
 const isDependenciesJson = j => {
     if (j === null) { return true }
     if (!isObject(j)) { return false }
     return every(map(isDependencyJson)(entries(j)))
 }
 
-module.exports = {
+export default {
     /** @readonly */
     isDependenciesJson,
 }

package/commonjs/package/dependencies/{test.f.cjs → test.f.mjs}

@@ -1,6 +1,6 @@
-const _ = require('./module.f.cjs')
+import _ from './module.f.mjs'
 
-module.exports = () => {
+export default () => {
     if (!_.isDependenciesJson(null)) { throw 'error' }
     if (!_.isDependenciesJson({})) { throw 'error' }
     if (!_.isDependenciesJson({'a':'b'})) { throw 'error' }

package/commonjs/package/{module.f.cjs → module.f.mjs}

@@ -1,18 +1,19 @@
-const json = require('../../json/module.f.cjs')
+import json, * as jsonT from '../../json/module.f.mjs'
 const { isObject } = json
-const dependencies = require('./dependencies/module.f.cjs')
+import dependencies, * as dependenciesT from './dependencies/module.f.mjs'
 const { isDependenciesJson } = dependencies
-const { at } = require('../../types/object/module.f.cjs')
+import o from '../../types/object/module.f.mjs'
+const { at } = o
 
 /**
  * @typedef {{
  *  readonly name: string
  *  readonly version: string
- *  readonly dependencies?: dependencies.DependenciesJson
+ *  readonly dependencies?: dependenciesT.DependenciesJson
  * }} PackageJson
  */
 
-/** @type {(j: json.Unknown) => j is PackageJson} */
+/** @type {(j: jsonT.Unknown) => j is PackageJson} */
 const isPackageJson = j => {
     if (!isObject(j)) { return false }
     if (typeof j.name !== 'string') { return false }
@@ -33,7 +34,7 @@ const isPackageJson = j => {
  * @typedef {(packageId: string) => Package | null} Get
  */
 
-module.exports = {
+export default {
     /** @readonly */
     dependencies,
     /** @readonly */

package/commonjs/package/{test.f.cjs → test.f.mjs}

@@ -1,6 +1,6 @@
-const _ = require('./module.f.cjs')
+import _ from './module.f.mjs'
 
-module.exports = () => {
+export default () => {
     if (_.isPackageJson(null)) { throw 'error' }
     if (_.isPackageJson({})) { throw 'error' }
     if (_.isPackageJson({name:'x',version:12})) { throw 'error' }

package/commonjs/path/{module.f.cjs → module.f.mjs}

@@ -1,8 +1,9 @@
-const list = require("../../types/list/module.f.cjs")
+import list, * as List from '../../types/list/module.f.mjs'
 const { next, fold, reverse, first, flat, toArray, filterMap, isEmpty, concat } = list
-const { join } = require('../../types/string/module.f.cjs')
-const package_ = require("../package/module.f.cjs")
-const module_ = require("../module/module.f.cjs")
+import string from '../../types/string/module.f.mjs'
+const { join } = string
+import package_, * as packageT from '../package/module.f.mjs'
+import module_, * as moduleT from '../module/module.f.mjs'
 
 /** @typedef {readonly string[]} Items */
 
@@ -17,7 +18,7 @@ const module_ = require("../module/module.f.cjs")
 /** @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 => {
@@ -36,7 +37,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])]
@@ -46,7 +47,7 @@ const firstNull = first(null)
 
 /** @type {(local: string) => (path: string) => LocalPath|null} */
 const parseLocal = local => {
-    /** @type {(path: string) => readonly[boolean, boolean, list.List<string>]} */
+    /** @type {(path: string) => readonly[boolean, boolean, List.List<string>]} */
     const fSeq = path => {
         const pathSeq = split(path)
         const dir = [null, '', '.', '..'].includes(pathSeq[pathSeq.length - 1])
@@ -67,9 +68,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)
@@ -97,7 +98,7 @@ 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 =>
@@ -131,7 +132,7 @@ const parse = packageId => dependencies => {
 
 /**
  * @typedef {{
- *  readonly id: module_.Id
+ *  readonly id: moduleT.Id
  *  readonly source: string
  * }} FoundResult
  */
@@ -139,8 +140,8 @@ const parse = packageId => dependencies => {
 /** @typedef {FoundResult| null} Result */
 
 /**
- * @type {(packageGet: package_.Get) =>
- *  (moduleId: module_.Id) =>
+ * @type {(packageGet: packageT.Get) =>
+ *  (moduleId: moduleT.Id) =>
  *  (path: string) =>
  *  Result
  * }
@@ -163,7 +164,7 @@ const parseAndFind = packageGet => moduleId => path => {
     return firstNull(filterMap(tryFile)(fileList))
 }
 
-module.exports = {
+export default {
     /** @readonly */
     parseLocal,
     /** @readonly */

package/commonjs/path/{test.f.cjs → test.f.mjs}

@@ -1,18 +1,20 @@
-const _ = require('./module.f.cjs')
-const { todo } = require('../../dev/module.f.cjs')
-const json = require('../../json/module.f.cjs')
-const { identity } = require('../../types/function/module.f.cjs')
-const object = require('../../types/object/module.f.cjs')
-const { at } = require('../../types/object/module.f.cjs')
-const package_ = require('../package/module.f.cjs')
+import _ from './module.f.mjs'
+import dev from '../../dev/module.f.mjs'
+const { todo } = dev
+import json, * as jsonT from '../../json/module.f.mjs'
+import f from '../../types/function/module.f.mjs'
+const { identity } = f
+import object, * as O from '../../types/object/module.f.mjs'
+const { at } = object
+import * as packageT from '../package/module.f.mjs'
 
-/** @type {<T>(o: object.Map<T>) => (s: string) => T|null} */
+/** @type {<T>(o: O.Map<T>) => (s: string) => T|null} */
 const i = o => s => at(s)(o)
 
-/** @type {(g: json.Unknown) => string} */
+/** @type {(g: jsonT.Unknown) => string} */
 const stringify = json.stringify(identity)
 
-module.exports = {
+export default {
     0: () => {
         const result = _.parseLocal('')('./a')
         if (stringify(result) !== '{"external":false,"dir":false,"items":["a"]}') { throw result }
@@ -68,7 +70,7 @@ module.exports = {
         },
     },
     9: () => {
-        /** @type {object.Map<package_.Package>} */
+        /** @type {O.Map<packageT.Package>} */
         const packages = {
             '': {
                 dependency: () => todo(),
@@ -79,7 +81,7 @@ module.exports = {
         if (result !== '{"id":{"package":"","path":["a","c"]},"source":"return \\"a/c\\""}') { throw result }
     },
     10: () => {
-        /** @type {object.Map<package_.Package>} */
+        /** @type {O.Map<packageT.Package>} */
         const packages = {
             '': {
                 dependency: x => {
@@ -129,7 +131,7 @@ module.exports = {
         }
     },
     11: () => {
-        /** @type {object.Map<package_.Package>} */
+        /** @type {O.Map<packageT.Package>} */
         const packages = {
             '': {
                 dependency: x => {
@@ -156,7 +158,7 @@ module.exports = {
         }
     },
     12: () => {
-        /** @type {object.Map<package_.Package>} */
+        /** @type {O.Map<packageT.Package>} */
         const packages = {
             '': {
                 dependency: x => {

package/commonjs/{test.cjs → test.mjs}

@@ -1,7 +1,7 @@
-const _ = require('./module.cjs')
-const run = require('./module/function/module.f.cjs')
+import _ from './module.mjs'
+import run, * as runT from './module/function/module.f.mjs'
 
-module.exports = {
+export default {
     ok: () => {
         const source = 'module.exports = "Hello world!"'
         const m = _.compile(source)
@@ -32,7 +32,7 @@ module.exports = {
         const d = _.compile(depSource)
         if (d[0] !== 'ok') { throw d }
 
-        /** @type {run.Require<number>} */
+        /** @type {runT.Require<number>} */
         const req = path => prior => {
             if (path !== 'm') { throw path }
             return d[1](req)(prior + 1)

package/dev/{module.f.cjs → module.f.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     /** @readonly */
     todo: () => { throw 'not implemented' },
 }

package/dev/module.mjs

@@ -86,7 +86,7 @@ export const loadModuleMap = async () => {
                     const file = `${p}/${name}`
                     if (i.isDirectory()) {
                         await f(file)
-                    } else if (name.endsWith('.f.cjs')) {
+                    } else if (name.endsWith('.f.cjs') || name.endsWith('.f.mjs')) {
                         const source = await import(`../${file}`)
                         map.push([file, source.default])
                     }
@@ -183,8 +183,10 @@ export const index = async() => {
     let m = {}
     for (const k in await loadModuleMap()) {
         const [, ...s] = k.split('/')
-        if (s[s.length - 1] === 'module.f.cjs') {
-            m = folderMapAdd(m)(s)
+        switch (s[s.length - 1]) {
+            case 'module.f.cjs': case 'module.f.mjs':
+                m = folderMapAdd(m)(s)
+                break
         }
     }
     const [e, i] = codeAdd(indent)('')(m)