functionalscript 0.0.588 → 0.0.591

package/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x, 22.x, 23.x]
+        node-version: [16, 18, 20, 22, 23]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -34,7 +34,7 @@ jobs:
 
     strategy:
       matrix:
-        deno-version: [1.x, 2.x]
+        deno-version: [2]
 
     steps:
     - uses: actions/checkout@v2
@@ -55,7 +55,8 @@ jobs:
   COM:
     strategy:
       matrix:
-        os: ['ubuntu-latest', 'windows-latest', 'macos-14']
+        # https://docs.github.com/en/actions/using-jobs/choosing-the-runner-for-a-job#choosing-github-hosted-runners
+        os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
 
     runs-on: ${{ matrix.os }}
 

package/dev/module.mjs

@@ -1,4 +1,4 @@
-import { readdir, readFile, writeFile } from 'node:fs/promises'
+import { readdir, writeFile } from 'node:fs/promises'
 
 /**
  * @typedef {{
@@ -22,36 +22,16 @@ import { readdir, readFile, writeFile } from 'node:fs/promises'
 
 /**
  * @typedef {{
- *  [k in string]?: MutableModule
- * }} MutableDependencyMap
- */
-
-/**
- * @typedef {{
- *  dependencyMap: MutableDependencyMap
- *  exports?: unknown
- * }} MutableModule
- */
-
-/**
- * @typedef {{
- *  readonly dependencyMap: DependencyMap
- *  readonly exports?: unknown
+ *  readonly default?: unknown
  * }} Module
  */
 
-/**
- * @typedef {{
- *   readonly[k in string]?: Module
- * }} DependencyMap
- */
-
 /** @typedef {(name: string) => unknown} Require */
 
 /**
  * @typedef {{
- *  readonly[k in string]: Function
- * }} FunctionMap
+ *  readonly[k in string]: unknown
+ * }} UnknownMap
  */
 
 /**
@@ -59,12 +39,12 @@ import { readdir, readFile, writeFile } from 'node:fs/promises'
  * @typedef {readonly[string, T]} Entry
  */
 
-/** @type {(a: Entry<Function>, b: Entry<Function>) => number} */
+/** @type {(a: Entry<unknown>, b: Entry<unknown>) => number} */
 const cmp = ([a], [b]) => a < b ? -1 : a > b ? 1 : 0
 
 /**
  * @typedef {{
- *  [k in string]: MutableModule
+ *  [k in string]: Module
  * }} MutableModuleMap
  */
 
@@ -94,9 +74,9 @@ export const env =
     }
 
 export const loadModuleMap = async () => {
-    /** @type {() => Promise<FunctionMap>} */
+    /** @type {() => Promise<UnknownMap>} */
     const load = async () => {
-        /** @type {(readonly[string, Function])[]} */
+        /** @type {(readonly[string, unknown])[]} */
         const map = []
         /** @type {(path: string) => Promise<void>} */
         const f = async p => {
@@ -107,8 +87,8 @@ export const loadModuleMap = async () => {
                     if (i.isDirectory()) {
                         await f(file)
                     } else if (name.endsWith('.f.cjs')) {
-                        const source = await readFile(file, 'utf8')
-                        map.push([file, Function('module', 'require', `"use strict";${source}`)])
+                        const source = await import(`../${file}`)
+                        map.push([file, source.default])
                     }
                 }
             }
@@ -124,7 +104,7 @@ export const loadModuleMap = async () => {
     const build = () => {
         /** @type {MutableModuleMap} */
         const d = {}
-        /** @type {(base: readonly string[]) => (k: string) => readonly[string, MutableModule]} */
+        /** @type {(base: readonly string[]) => (k: string) => readonly[string, Module]} */
         const getModule = base => k => {
             const relativePath = k.split('/')
             const dif = relativePath.filter(v => v === '..').length
@@ -138,18 +118,8 @@ export const loadModuleMap = async () => {
                 }
             }
             {
-                /** @type {MutableDependencyMap} */
-                const dependencyMap = {}
-                /** @type {MutableModule} */
-                const module = { dependencyMap }
-                const get = getModule(remove_tail(path)(1))
-                /** @type {(s: string) => unknown} */
-                const newReq = s => {
-                    const [p, result] = get(s)
-                    dependencyMap[p] = result
-                    return result.exports
-                }
-                map[pathStr](module, newReq)
+                /** @type {Module} */
+                const module = { default: map[pathStr] }
                 d[pathStr] = module
                 return [pathStr, module]
             }

package/dev/test/module.f.cjs

@@ -11,8 +11,7 @@ const result = require('../../types/result/module.f.cjs')
 
 /**
  * @typedef {{
- *  readonly dependencyMap: DependencyMap
- *  readonly exports?: unknown
+ *  readonly default?: unknown
  * }} Module
  */
 
@@ -121,7 +120,7 @@ const main = input => {
         return ([ts, state]) => {
             if (isTest(k)) {
                 state = log(`testing ${k}`)(state);
-                [ts, state] = test('| ')(v.exports)([ts, state])
+                [ts, state] = test('| ')(v.default)([ts, state])
             }
             return [ts, state]
         }

package/dev/test.mjs

@@ -24,7 +24,7 @@ const anyLog = f => s => state => {
 
 /** @type {<T>(f: () => T) => Result<T, unknown>} */
 const tryCatch = f => {
-    // Side effect: `try catch` is not allowed in FunctionalScript.
+    // `try catch` is not allowed in FunctionalScript.
     try {
         return ['ok', f()]
     } catch (e) {
@@ -45,7 +45,7 @@ const main = async() => {
     const moduleMap = await loadModuleMap()
 
     /** @type {any} */
-    const f = moduleMap['./dev/test/module.f.cjs'].exports
+    const f = moduleMap['./dev/test/module.f.cjs'].default
     const r = f({
         moduleMap,
         log: anyLog(console.log),

package/index.f.cjs

@@ -1,40 +1,40 @@
 // Generated file.
 module.exports = {
-  types: {
-    nullable: require("./types/nullable/module.f.cjs"),
-    array: require("./types/array/module.f.cjs"),
-    function: require("./types/function/module.f.cjs"),
-    list: require("./types/list/module.f.cjs"),
-    btree: require("./types/btree/module.f.cjs"),
-    string: require("./types/string/module.f.cjs"),
-    map: require("./types/map/module.f.cjs"),
-    object: require("./types/object/module.f.cjs"),
-    bigint: require("./types/bigint/module.f.cjs"),
-    bigfloat: require("./types/bigfloat/module.f.cjs"),
-    sorted_list: require("./types/sorted_list/module.f.cjs"),
-    number: require("./types/number/module.f.cjs"),
-    range: require("./types/range/module.f.cjs"),
-    range_map: require("./types/range_map/module.f.cjs"),
-    result: require("./types/result/module.f.cjs"),
-    string_set: require("./types/string_set/module.f.cjs"),
-    sorted_set: require("./types/sorted_set/module.f.cjs"),
-    byte_set: require("./types/byte_set/module.f.cjs"),
-    nibble_set: require("./types/nibble_set/module.f.cjs"),
-  },
   com: require("./com/module.f.cjs"),
-  text: require("./text/module.f.cjs"),
-  json: require("./json/module.f.cjs"),
-  js: {
-    tokenizer: require("./js/tokenizer/module.f.cjs"),
-  },
   commonjs: require("./commonjs/module.f.cjs"),
   dev: require("./dev/module.f.cjs"),
   djs: require("./djs/module.f.cjs"),
   fsc: require("./fsc/module.f.cjs"),
   fsm: require("./fsm/module.f.cjs"),
   html: require("./html/module.f.cjs"),
+  js: {
+    tokenizer: require("./js/tokenizer/module.f.cjs"),
+  },
+  json: require("./json/module.f.cjs"),
   nodejs: require("./nodejs/module.f.cjs"),
   prime_field: require("./prime_field/module.f.cjs"),
   secp: require("./secp/module.f.cjs"),
   sha2: require("./sha2/module.f.cjs"),
+  text: require("./text/module.f.cjs"),
+  types: {
+    array: require("./types/array/module.f.cjs"),
+    bigfloat: require("./types/bigfloat/module.f.cjs"),
+    bigint: require("./types/bigint/module.f.cjs"),
+    btree: require("./types/btree/module.f.cjs"),
+    byte_set: require("./types/byte_set/module.f.cjs"),
+    function: require("./types/function/module.f.cjs"),
+    list: require("./types/list/module.f.cjs"),
+    map: require("./types/map/module.f.cjs"),
+    nibble_set: require("./types/nibble_set/module.f.cjs"),
+    nullable: require("./types/nullable/module.f.cjs"),
+    number: require("./types/number/module.f.cjs"),
+    object: require("./types/object/module.f.cjs"),
+    range: require("./types/range/module.f.cjs"),
+    range_map: require("./types/range_map/module.f.cjs"),
+    result: require("./types/result/module.f.cjs"),
+    sorted_list: require("./types/sorted_list/module.f.cjs"),
+    sorted_set: require("./types/sorted_set/module.f.cjs"),
+    string: require("./types/string/module.f.cjs"),
+    string_set: require("./types/string_set/module.f.cjs"),
+  },
 }

package/issues/README.md

@@ -1,5 +1,5 @@
 # Issues
 
-1. [test-debug](./test-debug.md).
-2. [esm](./esm.md)
-3. [publish](publish.md)
+1. [X] [test-debug](./test-debug.md).
+2. [ ] [esm](./esm.md)
+3. [ ] [publish](publish.md)

package/jsr.json

@@ -1,5 +1,5 @@
 {
   "name": "@functionalscript/functionalscript",
-  "version": "0.0.588",
+  "version": "0.0.591",
   "exports": "./index.f.cjs"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.588",
+  "version": "0.0.591",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.f.cjs",
   "scripts": {