functionalscript 0.0.574 → 0.0.576

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

@@ -10,6 +10,8 @@ on:
 jobs:
   publish-npm:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write # This is required for requesting the JWT
     steps:
       - uses: actions/checkout@v2
         with:
@@ -18,11 +20,18 @@ jobs:
         with:
           node-version: 22
           registry-url: https://registry.npmjs.org/
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: 2
       # - run: npm ci
       - run: npm run version
+      - run: npm run index
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+      - run: deno publish
+
+
 
   # publish-gpr:
   #   runs-on: ubuntu-latest

package/dev/index.mjs

@@ -0,0 +1,3 @@
+import { index } from "./module.mjs"
+
+index()

package/dev/module.mjs

@@ -1,4 +1,4 @@
-import { readdir, readFile } from 'node:fs/promises'
+import { readdir, readFile, writeFile } from 'node:fs/promises'
 
 /**
  * @typedef {{
@@ -165,3 +165,59 @@ export const loadModuleMap = async () => {
 
     return build()
 }
+
+/**
+ * @typedef {{
+ *  readonly[k in string]: string | FolderMap
+ * }} FolderMap
+ */
+
+/** @type {(m: FolderMap) => (s: readonly string[]) => FolderMap } */
+const folderMapAdd = m => s => {
+    const [first, ...rest] = s
+    const firstResult = m[first]
+    return typeof firstResult === 'string'
+        ? m
+        : {
+            ...m,
+            [first]: rest.length === 1
+                ? rest[0]
+                : folderMapAdd(firstResult === undefined ? {} : firstResult)(rest)
+        }
+}
+
+const indent = '  '
+
+/** @type {(i: string) => (p: string) => (m: FolderMap) => string} */
+const codeAdd = i => p => m => {
+    let result = ''
+    for (const [k, v] of Object.entries(m)) {
+        const np = `${p}${k}/`
+        if (typeof v === 'string') {
+            result += `${i}${k}: require("${np}${v}"),\n`
+        } else {
+            result += `${i}${k}: \{\n`
+            result += codeAdd(i + indent)(np)(v)
+            result += `${i}\},\n`
+        }
+    }
+    return result
+}
+
+export const index = async() => {
+    /** @type {FolderMap} */
+    let m = {}
+    for (const k in await loadModuleMap()) {
+        const [, ...s] = k.split('/')
+        if (s[s.length - 1] === 'module.f.cjs') {
+            m = folderMapAdd(m)(s)
+        }
+    }
+    console.log(m)
+    let s =
+        '// Generated file.\n' +
+        'module.exports = {\n'
+    s += codeAdd(indent)('./')(m)
+    s += '}\n'
+    await writeFile('index.f.cjs', s)
+}

package/index.f.cjs

@@ -0,0 +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"),
+  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"),
+}

package/jsr.json

@@ -1,5 +1,5 @@
 {
-    "name": "@functionalscript/functionalscript",
-    "version": "0.0.0",
-    "exports": "./module.f.cjs"
+  "name": "@functionalscript/functionalscript",
+  "version": "0.0.576",
+  "exports": "./index.f.cjs"
 }

package/nodejs/version/module.f.cjs

@@ -24,17 +24,26 @@
 
 const { stringify, parse } = JSON
 
-/** @type {<T>(node: Node<T>) => T} */
-const version = ({ child_process, fs }) =>
-    fs.writeFileSync(
-        'package.json',
-        stringify(
-            {
-                ...parse(fs.readFileSync('package.json').toString()),
-                version: `0.0.${child_process.execSync('git log --oneline').toString().split('\n').length - 1}`
-            },
-            null,
-            2))
+/** @type {<T>(node: Node<T>) => readonly[T, T]} */
+const version = ({ child_process, fs }) => {
+    const version = `0.0.${child_process.execSync('git log --oneline').toString().split('\n').length - 1}`
+    const f = (/** @type {string} */jsonFile) => {
+        const file = `${jsonFile}.json`
+        return fs.writeFileSync(
+            file,
+            stringify(
+                {
+                    ...parse(fs.readFileSync(file).toString()),
+                    version
+                },
+                null,
+                2))
+    }
+    return [
+        f('package'),
+        f('jsr')
+    ]
+}
 
 module.exports = {
     /** @readonly */

package/nodejs/version/test.f.cjs

@@ -86,6 +86,6 @@ module.exports = () => {
             writeFileSync: (_, content) => content
         }
     }
-    const v = _.version(node)
-    if (v !== e) { throw [v, e] }
+    const [n, d] = _.version(node)
+    if (n !== e) { throw [n, e] }
 }

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "functionalscript",
-  "version": "0.0.574",
+  "version": "0.0.576",
   "description": "FunctionalScript is a functional subset of JavaScript",
+  "main": "index.f.cjs",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",
+    "index": "node ./dev/index.mjs",
     "version": "node ./nodejs/version/main.cjs",
     "test-only": "node --trace-uncaught ./dev/test.mjs",
     "comtest": "node ./com/test/build.cjs"
@@ -29,7 +31,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^22.9.3",
+    "@types/node": "^22.10.0",
     "typescript": "^5.7.2"
   }
 }