functionalscript 0.0.591 → 0.0.592

package/dev/module.mjs

@@ -158,20 +158,24 @@ const folderMapAdd = m => s => {
 
 const indent = '  '
 
-/** @type {(i: string) => (p: string) => (m: FolderMap) => string} */
+/** @type {(i: string) => (p: string) => (m: FolderMap) => readonly[string,string]} */
 const codeAdd = i => p => m => {
     let result = ''
+    let im = ''
     for (const [k, v] of Object.entries(m)) {
-        const np = `${p}${k}/`
+        const np = `${p}${k}`
         if (typeof v === 'string') {
-            result += `${i}${k}: require("${np}${v}"),\n`
+            result += `${i}${k}: ${np},\n`
+            im += `import ${np} from './${np.replaceAll('$', '/')}/${v}'\n`
         } else {
+            const [r, x] = codeAdd(i + indent)(`${np}\$`)(v)
             result += `${i}${k}: \{\n`
-            result += codeAdd(i + indent)(np)(v)
+            result += r
             result += `${i}\},\n`
+            im += x
         }
     }
-    return result
+    return [result, im]
 }
 
 export const index = async() => {
@@ -183,11 +187,12 @@ export const index = async() => {
             m = folderMapAdd(m)(s)
         }
     }
-    console.log(m)
+    const [e, i] = codeAdd(indent)('')(m)
     let s =
         '// Generated file.\n' +
-        'module.exports = {\n'
-    s += codeAdd(indent)('./')(m)
-    s += '}\n'
-    await writeFile('index.f.cjs', s)
+        i +
+        'export default {\n' +
+        e +
+        '}\n'
+    await writeFile('index.f.mjs', s)
 }

package/index.f.mjs

@@ -0,0 +1,73 @@
+// Generated file.
+import com from './com/module.f.cjs'
+import commonjs from './commonjs/module.f.cjs'
+import dev from './dev/module.f.cjs'
+import djs from './djs/module.f.cjs'
+import fsc from './fsc/module.f.cjs'
+import fsm from './fsm/module.f.cjs'
+import html from './html/module.f.cjs'
+import js$tokenizer from './js/tokenizer/module.f.cjs'
+import json from './json/module.f.cjs'
+import nodejs from './nodejs/module.f.cjs'
+import prime_field from './prime_field/module.f.cjs'
+import secp from './secp/module.f.cjs'
+import sha2 from './sha2/module.f.cjs'
+import text from './text/module.f.cjs'
+import types$array from './types/array/module.f.cjs'
+import types$bigfloat from './types/bigfloat/module.f.cjs'
+import types$bigint from './types/bigint/module.f.cjs'
+import types$btree from './types/btree/module.f.cjs'
+import types$byte_set from './types/byte_set/module.f.cjs'
+import types$function from './types/function/module.f.cjs'
+import types$list from './types/list/module.f.cjs'
+import types$map from './types/map/module.f.cjs'
+import types$nibble_set from './types/nibble_set/module.f.cjs'
+import types$nullable from './types/nullable/module.f.cjs'
+import types$number from './types/number/module.f.cjs'
+import types$object from './types/object/module.f.cjs'
+import types$range from './types/range/module.f.cjs'
+import types$range_map from './types/range_map/module.f.cjs'
+import types$result from './types/result/module.f.cjs'
+import types$sorted_list from './types/sorted_list/module.f.cjs'
+import types$sorted_set from './types/sorted_set/module.f.cjs'
+import types$string from './types/string/module.f.cjs'
+import types$string_set from './types/string_set/module.f.cjs'
+export default {
+  com: com,
+  commonjs: commonjs,
+  dev: dev,
+  djs: djs,
+  fsc: fsc,
+  fsm: fsm,
+  html: html,
+  js: {
+    tokenizer: js$tokenizer,
+  },
+  json: json,
+  nodejs: nodejs,
+  prime_field: prime_field,
+  secp: secp,
+  sha2: sha2,
+  text: text,
+  types: {
+    array: types$array,
+    bigfloat: types$bigfloat,
+    bigint: types$bigint,
+    btree: types$btree,
+    byte_set: types$byte_set,
+    function: types$function,
+    list: types$list,
+    map: types$map,
+    nibble_set: types$nibble_set,
+    nullable: types$nullable,
+    number: types$number,
+    object: types$object,
+    range: types$range,
+    range_map: types$range_map,
+    result: types$result,
+    sorted_list: types$sorted_list,
+    sorted_set: types$sorted_set,
+    string: types$string,
+    string_set: types$string_set,
+  },
+}

package/jsr.json

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

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "functionalscript",
-  "version": "0.0.591",
+  "version": "0.0.592",
   "description": "FunctionalScript is a functional subset of JavaScript",
-  "main": "index.f.cjs",
+  "main": "index.f.mjs",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",

package/index.f.cjs

@@ -1,40 +0,0 @@
-// Generated file.
-module.exports = {
-  com: require("./com/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"),
-  },
-}