functionalscript 0.0.422 → 0.0.423

package/.github/workflows/bun.yml

@@ -12,4 +12,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: curl https://bun.sh/install | bash
-    - run: /home/runner/.bun/bin/bun ./test.f.cjs
+    - run: /home/runner/.bun/bin/bun ./test.mjs

package/.github/workflows/deno.yml

@@ -14,4 +14,4 @@ jobs:
     - uses: denoland/setup-deno@v1
       with:
         deno-version: v1.x
-    - run: deno run --allow-read --allow-env ./denotest.mjs
+    - run: deno run --allow-read --allow-env --allow-net ./test.mjs

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "functionalscript",
-  "version": "0.0.422",
+  "version": "0.0.423",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",
     "version": "node ./nodejs/version/main.cjs",
-    "test-only": "node --trace-uncaught ./test.f.cjs"
+    "test-only": "node --trace-uncaught ./test.mjs"
   },
   "repository": {
     "type": "git",

package/{denotest.mjs → test.mjs}

@@ -1,69 +1,70 @@
-// import * as fs from "https://deno.land/std/node/fs.ts"
-
 /**
- * @type {{
- *  readonly readDir: (path: string | URL) => AsyncIterable<DirEntry>,
- *  readonly readTextFile: (path: string | URL) => Promise<string>,
- * }}
+ * @typedef {{
+ *  readonly withFileTypes: true
+ * }} Options
  */
-const {
-    readDir,
-    readTextFile,
-} = Deno
 
 /**
  * @typedef {{
- *  readonly isDirectory: boolean
- *  readonly isFile: boolean
- *  readonly isSymlink: boolean
  *  readonly name: string
- * }} DirEntry
+ *  readonly isDirectory: () => boolean
+ * }} Dirent
  */
 
-/** @typedef {{ exports?: unknown }} Module */
-
-/** @typedef {(name: string) => unknown} Require */
-
 /**
  * @typedef {{
- *  [k in string]: Function
- * }} FunctionMap
+ *  readonly readdir: (path: string, options: Options) => Promise<readonly Dirent[]>
+ *  readonly readFile: (path: string, options: 'utf8') => Promise<Buffer>
+ * }} FsPromises
  */
 
-/** @type {(path: string) => Promise<FunctionMap>} */
-const dir = async p => {
+/** @type {FsPromises} */
+const { readdir, readFile } = await import(globalThis.Deno ? 'https://deno.land/std/node/fs/promises.ts' : 'node:fs/promises')
+
+const load = async() => {
     /** @type {FunctionMap} */
     const map = {}
     /** @type {(path: string) => Promise<void>} */
     const f = async p => {
-        for await (const i of readDir(p)) {
+        for (const i of await readdir(p, { withFileTypes: true })) {
             const { name } = i
             if (!name.startsWith('.')) {
                 const file = `${p}/${name}`
-                if (i.isDirectory) {
+                if (i.isDirectory()) {
                     if (!['node_modules', 'target'].includes(name)) {
                         await f(file)
                     }
                 } else if (name.endsWith('.f.cjs')) {
                     console.log(`loading ${file}`)
-                    const source = await readTextFile(file)
+                    const source = await readFile(file, 'utf8')
                     map[file] = Function('module', 'require', `"use strict";${source}`)
                 }
             }
         }
     }
-    await f(p)
+    await f('.')
     return map
 }
 
+const map = await load()
+
+/** @typedef {{ exports?: unknown }} Module */
+
+/** @typedef {(name: string) => unknown} Require */
+
+/**
+ * @typedef {{
+ *  [k in string]: Function
+ * }} FunctionMap
+ */
+
 /**
  * @typedef {{
  *  [k in string]: unknown
  * }} ModuleMap
  */
 
-const run = async () => {
-    const m = await dir('.')
+const build = async () => {
     /** @type {ModuleMap} */
     const d = {}
     /** @type {(base: readonly string[]) => (i: string) => (k: string) => unknown} */
@@ -79,7 +80,7 @@ const run = async () => {
             /** @type {Module} */
             const me = {}
             console.log(`${i}building ${pathStr}`)
-            m[pathStr](me, req(newBase)(`${i}| `))
+            map[pathStr](me, req(newBase)(`${i}| `))
             const newResult = me.exports
             d[pathStr] = newResult
             return newResult
@@ -88,9 +89,10 @@ const run = async () => {
         }
     }
     const r = req(['.'])('')
-    for (const k of Object.keys(m)) {
+    for (const k of Object.keys(map)) {
         r(k)
     }
+    return d
 }
 
-run()
+const modules = await build()

package/tsconfig.json

@@ -97,5 +97,5 @@
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
   },
-  "exclude": ["target", "denotest.mjs"]
+  "exclude": ["target", "test.mjs"]
 }