functionalscript 0.0.344 → 0.0.349

package/.github/workflows/node.js.yml

@@ -25,3 +25,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm install
     - run: npm test
+    - run: npm run version
+    - run: npm pack

package/.github/workflows/npm-publish.yml

@@ -30,7 +30,7 @@ jobs:
           node-version: 14
           registry-url: https://registry.npmjs.org/
       - run: npm ci
-      - run: node ./io/nodejs/version
+      - run: npm run version
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/commonjs/build/{index.js → main.f.js}

@@ -1,10 +1,10 @@
-const package_ = require('../package/index.js')
-const module_ = require('../module/index.js')
-const function_ = require('../module/function/index.js')
-const map = require('../../types/map/index.js')
-const object = require('../../types/object/index.js')
-const path = require('../path/index.js')
-const stringSet = require('../../types/stringSet/index.js')
+const package_ = require('../package/main.f.js')
+const module_ = require('../module/main.f.js')
+const function_ = require('../module/function/main.f.js')
+const map = require('../../types/map/main.f.js')
+const object = require('../../types/object/main.f.js')
+const path = require('../path/main.f.js')
+const stringSet = require('../../types/stringset/main.f.js')
 
 /**
  * @template M

package/commonjs/build/{test.js → test.f.js}

@@ -1,9 +1,9 @@
-const _ = require('./index.js')
-const map = require('../../types/map/index.js')
-const module_ = require('../module/index.js')
-const function_ = require('../module/function/index.js')
-const result = require('../../types/result/index.js')
-const package_ = require('../package/index.js')
+const _ = require('./main.f.js')
+const map = require('../../types/map/main.f.js')
+const module_ = require('../module/main.f.js')
+const function_ = require('../module/function/main.f.js')
+const result = require('../../types/result/main.f.js')
+const package_ = require('../package/main.f.js')
 
 /** @type {{ readonly [k in string]?: result.Result<function_.Function_, unknown> }} */
 const compileMap = {

package/commonjs/main.f.js

@@ -0,0 +1,20 @@
+/** @typedef {(packageName: string) => PackageMap|Package|undefined} PackageMap */
+
+/** 
+ * @typedef {readonly[
+ *  string, 
+ *  PackageMap, 
+ *  (fileName: string) => string|undefined
+ * ]} Package 
+ */
+
+module.exports = {
+    /** @readonly */
+    build: require('./build/main.f.js'),
+    /** @readonly */
+    module: require('./module/main.f.js'),
+    /** @readonly */
+    package: require('./package/main.f.js'),
+    /** @readonly */
+    path: require('./path/main.f.js'),
+}

package/commonjs/module/function/{index.js → main.f.js}

@@ -2,7 +2,7 @@
  * An IO interface for creating and running module functions.
  */
 
-const result = require('../../../types/result/index.js')
+const result = require('../../../types/result/main.f.js')
 
 /** @typedef {<M>(require: Require<M>) => (prior: M) => Result<M>} Function_ */
 

package/commonjs/module/{index.js → main.f.js}

@@ -1,4 +1,4 @@
-const object = require('../../types/object/index.js')
+const object = require('../../types/object/main.f.js')
 
 /**
  * @template M
@@ -52,6 +52,8 @@ const dir = id => {
 const idToString = id => `${id.package}/${id.path.join('/')}`
 
 module.exports = {
+    /** @readonly */
+    function: require('./function/main.f.js'),
     /** @readonly */
     dir,
     /** @readonly */

package/commonjs/package/dependencies/{index.js → main.f.js}

@@ -1,5 +1,5 @@
-const json = require('../../../json/index.js')
-const seq = require('../../../types/list/index.js')
+const json = require('../../../json/main.f.js')
+const list = require('../../../types/list/main.f.js')
 
 /** @typedef {readonly[string, string]} DependencyJson */
 
@@ -14,7 +14,7 @@ const isDependencyJson = ([, v]) => typeof v === 'string'
 const isDependenciesJson = j => {
     if (j === undefined) { return true }
     if (!json.isObject(j)) { return false }
-    return seq.every(seq.map(isDependencyJson)(Object.entries(j)))
+    return list.every(list.map(isDependencyJson)(Object.entries(j)))
 }
 
 module.exports = {

package/commonjs/package/dependencies/{test.js → test.f.js}

@@ -1,4 +1,4 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
 {
     if (!_.isDependenciesJson(undefined)) { throw 'error' }

package/commonjs/package/{index.js → main.f.js}

@@ -1,5 +1,5 @@
-const json = require('../../json/index.js')
-const dependencies = require('./dependencies/index.js')
+const json = require('../../json/main.f.js')
+const dependencies = require('./dependencies/main.f.js')
 
 /**
  * @typedef {{
@@ -31,6 +31,8 @@ const isPackageJson = j => {
  */
 
 module.exports = {
+    /** @readonly */
+    dependencies,
     /** @readonly */
     isPackageJson,
 }

package/commonjs/package/{test.js → test.f.js}

@@ -1,6 +1,6 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
-require('./dependencies/test.js')
+require('./dependencies/test.f.js')
 
 {
     if (_.isPackageJson(null)) { throw 'error' }

package/commonjs/path/{index.js → main.f.js}

@@ -1,6 +1,6 @@
-const list = require("../../types/list/index.js")
-const package_ = require("../package/index.js")
-const module_ = require("../module/index.js")
+const list = require("../../types/list/main.f.js")
+const package_ = require("../package/main.f.js")
+const module_ = require("../module/main.f.js")
 
 /** @typedef {readonly string[]} Items */
 

package/commonjs/path/{test.js → test.f.js}

@@ -1,10 +1,10 @@
-const _ = require('./index.js')
-const { todo } = require('../../dev/index.js')
-const json = require('../../json/index.js')
-const { identity } = require('../../types/function/index.js')
-const object = require('../../types/object/index.js')
-const { at } = require('../../types/object/index.js')
-const package_ = require('../package/index.js')
+const _ = require('./main.f.js')
+const { todo } = require('../../dev/main.f.js')
+const json = require('../../json/main.f.js')
+const { identity } = require('../../types/function/main.f.js')
+const object = require('../../types/object/main.f.js')
+const { at } = require('../../types/object/main.f.js')
+const package_ = require('../package/main.f.js')
 
 /** @type {(g: json.Unknown|undefined) => string} */
 const stringify = g => {

package/html/{index.js → main.f.js}

@@ -1,7 +1,6 @@
-const list = require('../types/list/index.js')
-const object = require('../types/object/index.js')
-const operator = require('../types/function/operator/index.js')
-const { compose } = require('../types/function/index.js')
+const list = require('../types/list/main.f.js')
+const object = require('../types/object/main.f.js')
+const { operator, compose } = require('../types/function/main.f.js')
 
 /**
  * @typedef {|

package/html/{test.js → test.f.js}

@@ -1,4 +1,4 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
 {
     const r = _.htmlToString(['html', []])

package/io/commonjs/{index.js → main.js}

@@ -1,6 +1,6 @@
-const { tryCatch } = require('../result/index.js')
-const { unwrap } = require('../../types/result/index.js')
-const moduleFunction = require('../../commonjs/module/function/index.js')
+const { tryCatch } = require('../result/main.js')
+const { unwrap } = require('../../types/result/main.f.js')
+const moduleFunction = require('../../commonjs/module/function/main.f.js')
 
 /** @type {(f: Function) => moduleFunction.Function_} */
 const build = f => immutableRequire => mutableData => {

package/io/commonjs/test.js

@@ -1,5 +1,5 @@
-const _ = require('./index.js')
-const run = require('../../commonjs/module/function/index.js')
+const _ = require('./main.js')
+const run = require('../../commonjs/module/function/main.f.js')
 
 // ok:
 {

package/io/result/{index.js → main.js}

@@ -1,4 +1,4 @@
-const result = require('../../types/result/index.js')
+const result = require('../../types/result/main.f.js')
 
 /** @type {<T>(f: () => T) => result.Result<T, unknown>} */
 const tryCatch = f => {

package/json/{index.js → main.f.js}

@@ -1,7 +1,7 @@
-const seq = require('../types/list/index.js')
-const object = require('../types/object/index.js')
-const op = require('../types/function/operator/index.js')
-const { compose } = require('../types/function/index.js')
+const list = require('../types/list/main.f.js')
+const object = require('../types/object/main.f.js')
+const operator = require('../types/function/operator/main.f.js')
+const { compose } = require('../types/function/main.f.js')
 
 /**
  * @typedef {{
@@ -13,11 +13,11 @@ const { compose } = require('../types/function/index.js')
 
 /** @typedef {Object|boolean|string|number|null|Array} Unknown */
 
-/** @type {(value: Unknown) => (path: seq.List<string>) => (src: Unknown|undefined) => Unknown} */
+/** @type {(value: Unknown) => (path: list.List<string>) => (src: Unknown|undefined) => Unknown} */
 const setProperty = value => {
-    /** @type {(path: seq.List<string>) => (src: Unknown|undefined) => Unknown} */
+    /** @type {(path: list.List<string>) => (src: Unknown|undefined) => Unknown} */
     const f = path => src => {
-        const result = seq.next(path)
+        const result = list.next(path)
         if (result === undefined) { return value }
         const srcObject = (src === undefined || src === null || typeof src !== 'object' || src instanceof Array) ? {} : src
         const { first, tail } = result
@@ -26,10 +26,10 @@ const setProperty = value => {
     return f
 }
 
-/** @type {(_: string) => seq.List<string>} */
+/** @type {(_: string) => list.List<string>} */
 const stringSerialize = input => [JSON.stringify(input)]
 
-/** @type {(_: number) => seq.List<string>} */
+/** @type {(_: number) => list.List<string>} */
 const numberSerialize = input => [JSON.stringify(input)]
 
 const nullSerialize = ['null']
@@ -38,46 +38,46 @@ const trueSerialize = ['true']
 
 const falseSerialize = ['false']
 
-/** @type {(_: boolean) => seq.List<string>} */
+/** @type {(_: boolean) => list.List<string>} */
 const boolSerialize = value => value ? trueSerialize : falseSerialize
 
 const colon = [':']
 const comma = [',']
 
-/** @type {op.Fold<seq.List<string>>} */
-const joinOp = b => prior => seq.flat([prior, comma, b])
+/** @type {operator.Fold<list.List<string>>} */
+const joinOp = b => prior => list.flat([prior, comma, b])
 
-/** @type {(input: seq.List<seq.List<string>>) => seq.List<string>} */
-const join = seq.fold(joinOp)([])
+/** @type {(input: list.List<list.List<string>>) => list.List<string>} */
+const join = list.fold(joinOp)([])
 
-/** @type {(open: string) => (close: string) => (input: seq.List<seq.List<string>>) => seq.List<string>} */
-const list = open => close => {
+/** @type {(open: string) => (close: string) => (input: list.List<list.List<string>>) => list.List<string>} */
+const wrap = open => close => {
     const seqOpen = [open]
     const seqClose = [close]
-    return input => seq.flat([seqOpen, join(input), seqClose])
+    return input => list.flat([seqOpen, join(input), seqClose])
 }
 
-const objectList = list('{')('}')
+const objectWrap = wrap('{')('}')
 
-const arrayList = list('[')(']')
+const arrayWrap = wrap('[')(']')
 
 /** @typedef {object.Entry<Unknown>} Entry*/
 
-/** @typedef {(seq.List<Entry>)} Entries */
+/** @typedef {(list.List<Entry>)} Entries */
 
 /** @typedef {(entries: Entries) => Entries} MapEntries */
 
-/** @type {(mapEntries: MapEntries) => (value: Unknown) => seq.List<string>} */
+/** @type {(mapEntries: MapEntries) => (value: Unknown) => list.List<string>} */
 const serialize = sort => {
-    /** @type {(kv: readonly[string, Unknown]) => seq.List<string>} */
-    const propertySerialize = ([k, v]) => seq.flat([
+    /** @type {(kv: readonly[string, Unknown]) => list.List<string>} */
+    const propertySerialize = ([k, v]) => list.flat([
         stringSerialize(k),
         colon,
         f(v)
     ])
-    /** @type {(object: Object) => seq.List<string>} */
-    const objectSerialize = input => objectList(seq.map(propertySerialize)(sort(Object.entries(input))))
-    /** @type {(value: Unknown) => seq.List<string>} */
+    /** @type {(object: Object) => list.List<string>} */
+    const objectSerialize = input => objectWrap(list.map(propertySerialize)(sort(Object.entries(input))))
+    /** @type {(value: Unknown) => list.List<string>} */
     const f = value => {
         switch (typeof value) {
             case 'boolean': { return boolSerialize(value) }
@@ -90,8 +90,8 @@ const serialize = sort => {
             }
         }
     }
-    /** @type {(input: Array) => seq.List<string>} */
-    const arraySerialize = compose(seq.map(f))(arrayList)
+    /** @type {(input: Array) => list.List<string>} */
+    const arraySerialize = compose(list.map(f))(arrayWrap)
     return f
 }
 
@@ -101,7 +101,7 @@ const serialize = sort => {
  *
  * @type {(mapEntries: MapEntries) => (value: Unknown) => string}
  */
-const stringify = sort => compose(serialize(sort))(seq.join(''))
+const stringify = sort => compose(serialize(sort))(list.join(''))
 
 /** @type {(value: string) => Unknown} */
 const parse = JSON.parse
@@ -110,6 +110,8 @@ const parse = JSON.parse
 const isObject = value => typeof value === 'object' && value !== null && !(value instanceof Array)
 
 module.exports = {
+    /** @readonly */
+    tokenizer: require('./tokenizer/main.f.js'),
     /** @readonly */
     setProperty,
     /** @readonly */

package/json/{test.js → test.f.js}

@@ -1,6 +1,6 @@
-const json = require('./index.js')
-const { sort } = require('../types/object/index.js')
-const { identity } = require('../types/function/index.js')
+const json = require('./main.f.js')
+const { sort } = require('../types/object/main.f.js')
+const { identity } = require('../types/function/main.f.js')
 
 if (json.setProperty("Hello")([])({}) !== "Hello") { throw 'error' }
 

package/json/tokenizer/{index.js → main.f.js}

@@ -1,6 +1,6 @@
-const operator = require('../../types/function/operator/index.js')
-const list = require('../../types/list/index.js')
-const range = require('../../types/range/index.js')
+const operator = require('../../types/function/operator/main.f.js')
+const list = require('../../types/list/main.f.js')
+const range = require('../../types/range/main.f.js')
 
 /**
  * @typedef {{

package/json/tokenizer/{test.js → test.f.js}

@@ -1,7 +1,7 @@
-const tokenizer = require('./index.js')
-const list = require('../../types/list/index.js')
-const json = require('../index.js')
-const { sort } = require('../../types/object/index.js')
+const tokenizer = require('./main.f.js')
+const list = require('../../types/list/main.f.js')
+const json = require('../main.f.js')
+const { sort } = require('../../types/object/main.f.js')
 
 /** @type {(s: string) => readonly tokenizer.JsonToken[]} */
 const tokenizeString = s => list.toArray(tokenizer.tokenize(list.toCharCodes(s)))

package/main.f.js

@@ -0,0 +1,14 @@
+module.exports = {
+    /** @readonly */
+    commonjs: require('./commonjs/main.f.js'),
+    /** @readonly */
+    dev: require('./dev/main.f.js'),
+    /** @readonly */
+    html: require('./html/main.f.js'),
+    /** @readonly */
+    json: require('./json/main.f.js'),
+    /** @readonly */
+    sha2: require('./sha2/main.f.js'),
+    /** @readonly */
+    types: require('./types/main.f.js'),
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "functionalscript",
-  "version": "0.0.344",
+  "version": "0.0.349",
   "description": "FunctionalScript is a functional subset of JavaScript",
-  "main": "index.js",
+  "main": "main.f.js",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",
-    "test-only": "node --trace-uncaught ./test"
+    "version": "node ./io/nodejs/version/main.js",
+    "test-only": "node --trace-uncaught ./test.f.js"
   },
   "repository": {
     "type": "git",
@@ -28,7 +29,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^17.0.42",
-    "typescript": "^4.7.3"
+    "@types/node": "^18.0.0",
+    "typescript": "^4.7.4"
   }
 }

package/sha2/{index.js → main.f.js}

@@ -1,4 +1,4 @@
-const array = require('../types/array/index.js')
+const array = require('../types/array/main.f.js')
 
 /**
  * @typedef {{

package/sha2/{test.js → test.f.js}

@@ -1,7 +1,7 @@
-const _ = require('./index.js')
-const json = require('../json/index.js')
-const { sort } = require('../types/object/index.js')
-const list = require('../types/list/index.js')
+const _ = require('./main.f.js')
+const json = require('../json/main.f.js')
+const { sort } = require('../types/object/main.f.js')
+const list = require('../types/list/main.f.js')
 
 /** @type {(a: number) => number} */
 const toU32 = x => (x + 0x1_0000_0000) % 0x1_0000_0000

package/{test.js → test.f.js}

@@ -1,21 +1,21 @@
-// const i = require('./index.js')
+const i = require('./main.f.js')
 
-require('./types/list/test.js')
-require('./types/array/test.js')
-require('./types/btree/test.js')
-require('./sha2/test.js')
-require('./json/test.js')
-require('./json/tokenizer/test.js')
-require('./types/object/test.js')
+require('./types/list/test.f.js')
+require('./types/array/test.f.js')
+require('./types/btree/test.f.js')
+require('./sha2/test.f.js')
+require('./json/test.f.js')
+require('./json/tokenizer/test.f.js')
+require('./types/object/test.f.js')
 require('./io/commonjs/test.js')
-require('./commonjs/package/dependencies/test.js')
-require('./commonjs/package/test.js')
-require('./commonjs/path/test.js')
-require('./types/function/compare/test.js')
-require('./types/stringSet/test.js')
-require('./commonjs/build/test.js')
-require('./types/range/test.js')
-require('./html/test.js')
+require('./commonjs/package/dependencies/test.f.js')
+require('./commonjs/package/test.f.js')
+require('./commonjs/path/test.f.js')
+require('./types/function/compare/test.f.js')
+require('./types/stringset/test.f.js')
+require('./commonjs/build/test.f.js')
+require('./types/range/test.f.js')
+require('./html/test.f.js')
 
 /** @type {() => never} */
 const assert = () => { throw 'assert' }

package/types/array/{index.js → main.f.js}

@@ -1,5 +1,4 @@
-const option = require('../option/index.js')
-const seq = require('../list/index.js')
+const option = require('../option/main.f.js')
 
 /**
  * @template T

package/types/array/{test.js → test.f.js}

@@ -1,6 +1,6 @@
-const _ = require('./index.js')
-const json = require('../../json/index.js')
-const { sort } = require('../object/index.js')
+const _ = require('./main.f.js')
+const json = require('../../json/main.f.js')
+const { sort } = require('../object/main.f.js')
 
 /** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)

package/types/btree/find/{index.js → main.f.js}

@@ -1,7 +1,7 @@
-const _ = require('../index.js')
-const list = require('../../list/index.js')
-const cmp = require('../../function/compare/index.js')
-const array = require('../../array/index.js')
+const _ = require('../types/main.f.js')
+const list = require('../../list/main.f.js')
+const cmp = require('../../function/compare/main.f.js')
+const array = require('../../array/main.f.js')
 
 /**
  * @template T

package/types/btree/find/{test.js → test.f.js}

@@ -1,10 +1,10 @@
-const _ = require('./index.js')
-const list = require('../../list/index.js')
-const json = require('../../../json/index.js')
-const { sort } = require('../../object/index.js')
-const btree = require('../index.js')
-const { stringCmp } = require('../../function/compare/index.js')
-const s = require('../set/index.js')
+const _ = require('./main.f.js')
+const list = require('../../list/main.f.js')
+const json = require('../../../json/main.f.js')
+const { sort } = require('../../object/main.f.js')
+const btree = require('../types/main.f.js')
+const { stringCmp } = require('../../function/compare/main.f.js')
+const s = require('../set/main.f.js')
 
 const jsonStr = json.stringify(sort)
 

package/types/btree/main.f.js

@@ -0,0 +1,40 @@
+const list = require('../list/main.f.js')
+const option = require('../option/main.f.js')
+const _ = require('./types/main.f.js')
+
+/** @type {<T>(node: _.Node<T>) => list.Thunk<T>} */
+const nodeValues = node => () => {
+    switch (node.length) {
+        case 1: case 2: { return node }
+        case 3: {
+            return list.flat([
+                nodeValues(node[0]),
+                [node[1]],
+                nodeValues(node[2])
+            ])
+        }
+        default: {
+            return list.flat([
+                nodeValues(node[0]),
+                [node[1]],
+                nodeValues(node[2]),
+                [node[3]],
+                nodeValues(node[4])
+            ])
+        }
+    }
+}
+
+/** @type {<T>(tree: _.Tree<T>) => list.List<T>} */
+const values = option.map(nodeValues)
+
+module.exports = {
+    /** @readonly */
+    find: require('./find/main.f.js'),
+    /** @readonly */
+    remove: require('./remove/main.f.js'),
+    /** @readonly */
+    set: require('./set/main.f.js'),
+    /** @readonly */
+    values,
+}

package/types/btree/remove/{index.js → main.f.js}

@@ -1,9 +1,9 @@
-const _ = require('../index.js')
-const cmp = require('../../function/compare/index.js')
-const find = require('../find/index.js')
-const list = require('../../list/index.js')
-const array = require('../../array/index.js')
-const option = require('../../option/index.js')
+const _ = require('../types/main.f.js')
+const cmp = require('../../function/compare/main.f.js')
+const find = require('../find/main.f.js')
+const list = require('../../list/main.f.js')
+const array = require('../../array/main.f.js')
+const option = require('../../option/main.f.js')
 
 /**
  * @template T

package/types/btree/remove/{test.js → test.f.js}

@@ -1,9 +1,9 @@
-const _ = require('./index.js')
-const btree = require('../index.js')
-const s = require('../set/index.js')
-const { stringCmp } = require('../../function/compare/index.js')
-const json = require('../../../json/index.js')
-const { sort } = require('../../object/index.js')
+const _ = require('./main.f.js')
+const btree = require('../types/main.f.js')
+const s = require('../set/main.f.js')
+const { stringCmp } = require('../../function/compare/main.f.js')
+const json = require('../../../json/main.f.js')
+const { sort } = require('../../object/main.f.js')
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => s.set(stringCmp(value))(value)(node)

package/types/btree/set/{index.js → main.f.js}

@@ -1,7 +1,7 @@
-const _ = require('../index.js')
-const find = require('../find/index.js')
-const cmp = require('../../function/compare/index.js')
-const list = require('../../list/index.js')
+const _ = require('../types/main.f.js')
+const find = require('../find/main.f.js')
+const cmp = require('../../function/compare/main.f.js')
+const list = require('../../list/main.f.js')
 
 /**
  * @template T

package/types/btree/set/{test.js → test.f.js}

@@ -1,8 +1,8 @@
-const _ = require('./index.js')
-const btree = require('../index.js')
-const { stringCmp } = require('../../function/compare/index.js')
-const json = require('../../../json/index.js')
-const { sort } = require('../../object/index.js')
+const _ = require('./main.f.js')
+const btree = require('../types/main.f.js')
+const { stringCmp } = require('../../function/compare/main.f.js')
+const json = require('../../../json/main.f.js')
+const { sort } = require('../../object/main.f.js')
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => _.set(stringCmp(value))(value)(node)

package/types/btree/{test.js → test.f.js}

@@ -1,15 +1,15 @@
-const btree = require('./index.js')
-const { values } = btree
-const json = require('../../json/index.js')
-const { sort } = require('../object/index.js')
-const { stringCmp } = require('../function/compare/index.js')
-const list = require('../list/index.js')
-const s = require('./set/index.js')
-const f = require('./find/index.js')
+const btree = require('./types/main.f.js')
+const { values } = require('./main.f.js')
+const json = require('../../json/main.f.js')
+const { sort } = require('../object/main.f.js')
+const { stringCmp } = require('../function/compare/main.f.js')
+const list = require('../list/main.f.js')
+const s = require('./set/main.f.js')
+const f = require('./find/main.f.js')
 
-require('./find/test.js')
-require('./set/test.js')
-require('./remove/test.js')
+require('./find/test.f.js')
+require('./set/test.f.js')
+require('./remove/test.f.js')
 
 const jsonStr = json.stringify(sort)
 

package/types/btree/{index.js → types/main.f.js}

@@ -1,6 +1,3 @@
-const seq = require('../list/index.js')
-const option = require('../option/index.js')
-
 /**
  * @template T
  * @typedef {readonly[T]} Array1
@@ -54,29 +51,6 @@ const option = require('../option/index.js')
  * @typedef {Node<T> | undefined} Tree
  */
 
-/** @type {<T>(node: Node<T>) => seq.Thunk<T>} */
-const nodeValues = node => () => {
-    switch (node.length) {
-        case 1: case 2: { return node }
-        case 3: {
-            return seq.flat([
-                nodeValues(node[0]),
-                [node[1]],
-                nodeValues(node[2])
-            ])
-        }
-        default: {
-            return seq.flat([
-                nodeValues(node[0]),
-                [node[1]],
-                nodeValues(node[2]),
-                [node[3]],
-                nodeValues(node[4])
-            ])
-        }
-    }
-}
-
 /**
  * @template T
  * @typedef {readonly[Node<T>]} Branch1
@@ -87,10 +61,4 @@ const nodeValues = node => () => {
  * @typedef { readonly[...Branch5<T>, T, Node<T>] } Branch7
  */
 
-/** @type {<T>(tree: Tree<T>) => seq.List<T>} */
-const values = option.map(nodeValues)
-
-module.exports = {
-    /** @readonly */
-    values,
-}
+module.exports = {}

package/types/function/compare/{index.js → main.f.js}

@@ -1,4 +1,4 @@
-const array = require('../../array/index.js')
+const array = require('../../array/main.f.js')
 
 /** @typedef {array.Index3} Index3 */
 /** @typedef {array.Index5} Index5 */

package/types/function/compare/{test.js → test.f.js}

@@ -1,4 +1,4 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
 {
     const result = _.numberCmp(4)(5)

package/types/function/{index.js → main.f.js}

@@ -18,6 +18,10 @@ const identity = value => value
 const flip = f => b => a => f(a)(b)
 
 module.exports = {
+    /** @readonly */
+    compare: require('./compare/main.f.js'),
+    /** @readonly */
+    operator: require('./operator/main.f.js'),
     /** @readonly */
     identity,
     /** @readonly */

package/types/list/{index.js → main.f.js}

@@ -1,6 +1,6 @@
-const { compose, identity } = require('../function/index.js')
-const operator = require('../function/operator/index.js')
-const { logicalNot, strictEqual, stateScanToScan, reduceToScan, foldToScan } = require('../function/operator/index.js')
+const { compose, identity } = require('../function/main.f.js')
+const operator = require('../function/operator/main.f.js')
+const { logicalNot, strictEqual, stateScanToScan, reduceToScan, foldToScan } = operator
 
 /**
  * @template T

package/types/list/{test.js → test.f.js}

@@ -1,7 +1,7 @@
-const _ = require('./index.js')
-const json = require('../../json/index.js')
-const { sort } = require('../object/index.js')
-const { addition, strictEqual, foldToScan } = require('../function/operator/index.js')
+const _ = require('./main.f.js')
+const json = require('../../json/main.f.js')
+const { sort } = require('../object/main.f.js')
+const { addition, strictEqual, foldToScan } = require('../function/operator/main.f.js')
 
 /** @type {(sequence: _.List<json.Unknown>) => string} */
 const stringify = sequence => json.stringify(sort)(_.toArray(sequence))

package/types/main.f.js

@@ -0,0 +1,20 @@
+module.exports = {
+    /** @readonly */
+    array: require('./array/main.f.js'),
+    /** @readonly */
+    btree: require('./btree/main.f.js'),
+    /** @readonly */
+    function: require('./function/main.f.js'),
+    /** @readonly */
+    list: require('./list/main.f.js'),
+    /** @readonly */
+    map: require('./map/main.f.js'),
+    /** @readonly */
+    object: require('./object/main.f.js'),
+    /** @readonly */
+    range: require('./range/main.f.js'),
+    /** @readonly */
+    result: require('./result/main.f.js'),
+    /** @readonly */
+    stringSet: require('./stringset/main.f.js'),
+}

package/types/map/{index.js → main.f.js}

@@ -1,11 +1,12 @@
-const btree = require('../btree/index.js')
-const { values } = require("../btree/index.js")
-const find = require('../btree/find/index.js')
-const s = require('../btree/set/index.js')
-const compare = require('../function/compare/index.js')
-const { stringCmp } = require('../function/compare/index.js')
-const list = require('../list/index.js')
-const btRemove = require('../btree/remove/index.js')
+const btTypes = require('../btree/types/main.f.js')
+const btree = require('../btree/main.f.js')
+const { values } = require("../btree/main.f.js")
+const find = require('../btree/find/main.f.js')
+const s = require('../btree/set/main.f.js')
+const compare = require('../function/compare/main.f.js')
+const { stringCmp } = require('../function/compare/main.f.js')
+const list = require('../list/main.f.js')
+const btRemove = require('../btree/remove/main.f.js')
 
 /** @typedef {compare.Sign} Sign */
 
@@ -21,7 +22,7 @@ const btRemove = require('../btree/remove/index.js')
 
 /**
  * @template T
- * @typedef {btree.Tree<Entry<T>>} Map
+ * @typedef {btTypes.Tree<Entry<T>>} Map
  */
 
 /** @type {(a: string) => <T>(b: Entry<T>) => Sign} */

package/types/map/{test.js → test.f.js}

@@ -1,5 +1,5 @@
-const { at, set, empty, entries, remove } = require('./index.js')
-const seq = require('../list/index.js')
+const { at, set, empty, entries, remove } = require('./main.f.js')
+const seq = require('../list/main.f.js')
 
 {
     let m = set('a')(1)(undefined)
@@ -53,7 +53,7 @@ const seq = require('../list/index.js')
 }
 
 {
-    /** @type {import('.').Map<number>} */
+    /** @type {import('./main.f').Map<number>} */
     let m = empty
     for (let i = 0; i < 100_000; ++i) {
         m = set((i * i).toString())(i)(m)

package/types/object/{index.js → main.f.js}

@@ -1,5 +1,5 @@
-const list = require('../list/index.js')
-const map = require('../map/index.js')
+const list = require('../list/main.f.js')
+const map = require('../map/main.f.js')
 
 /**
  * @template T

package/types/object/{test.js → test.f.js}

@@ -1,4 +1,4 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
 {
     const a = {}

package/types/range/{test.js → test.f.js}

@@ -1,4 +1,4 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
 {
     if (!_.contains([0, 5])(1)) { throw 1 }

package/types/{stringSet/index.js → stringset/main.f.js}

@@ -1,18 +1,17 @@
-const btree = require('../btree/index.js')
-const find = require('../btree/find/index.js')
-const btSet = require('../btree/set/index.js')
-const btRemove = require('../btree/remove/index.js')
-const { stringCmp } = require("../function/compare/index.js")
-const list = require('../list/index.js')
-const { compose } = require('../function/index.js')
+const btTypes = require('../btree/types/main.f.js')
+const btree = require('../btree/main.f.js')
+const { find } = btree
+const { stringCmp } = require("../function/compare/main.f.js")
+const list = require('../list/main.f.js')
+const { compose } = require('../function/main.f.js')
 
-/** @typedef {btree.Tree<string>} StringSet */
+/** @typedef {btTypes.Tree<string>} StringSet */
 
 /** @type {(value: string) => (set: StringSet) => boolean} */
 const contains = value => s => s !== undefined && find.isFound(find.find(stringCmp(value))(s).first)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-const set = value => btSet.set(stringCmp(value))(value)
+const set = value => btree.set.set(stringCmp(value))(value)
 
 /** @type {(s: StringSet) => list.List<string>} */
 const values = btree.values
@@ -20,7 +19,7 @@ const values = btree.values
 const fromValues = list.reduce(set)(undefined)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
-const remove = compose(stringCmp)(btRemove.remove)
+const remove = compose(stringCmp)(btree.remove.remove)
 
 module.exports = {
     /** @readonly */

package/types/{stringSet/test.js → stringset/test.f.js}

@@ -1,4 +1,4 @@
-const _ = require('./index.js')
+const _ = require('./main.f.js')
 
 {
     const r = _.set('hello')(undefined)

package/commonjs/index.js

@@ -1,11 +0,0 @@
-/** @typedef {(packageName: string) => PackageMap|Package|undefined} PackageMap */
-
-/** 
- * @typedef {readonly[
- *  string, 
- *  PackageMap, 
- *  (fileName: string) => string|undefined
- * ]} Package 
- */
-
-module.exports = {}