functionalscript 0.1.599 → 0.1.600

package/issues/README.md

@@ -1,7 +1,7 @@
 # Issues
 
 1. [X] [test-debug](./test-debug.md).
-2. [ ] [esm](./esm.md)
+2. [X] [esm](./esm.md)
 3. [ ] [publish](publish.md)
 4. [ ] fix index generation by including sub modules `{ ...m, add: mAdd, remove: mRemove}`.
 5. [ ] Conventions:
@@ -10,7 +10,7 @@
     // list is for objects.
     // List is for types and should be ignored by FJS or errored if used in code.
     ```
-6. [ ] PoC: Replace `while` with recursive generators
+6. [X] PoC: Replace `while` with recursive generators. **Result:** doesn't work.
 7. Two sets of property filters:
    - usage `.b`:
      - `constructor`

package/jsr.json

@@ -1,5 +1,5 @@
 {
   "name": "@functionalscript/functionalscript",
-  "version": "0.1.599",
+  "version": "0.1.600",
   "exports": "./index.f.mjs"
 }

package/nodejs/version/main.mjs

@@ -1,5 +1,4 @@
 import _ from './module.f.mjs'
-import child_process from 'node:child_process'
 import fs from 'node:fs'
 
-_.version({ child_process, fs })
+_.updateVersion({ fs })

package/nodejs/version/module.f.d.mts

@@ -1,18 +1,17 @@
 declare namespace _default {
-    export { version };
+    export { getVersion };
+    export { updateVersion };
 }
 export default _default;
-export type ChildProcess = {
-    readonly execSync: (cmd: string) => Buffer;
-};
 export type Buffer = {};
 export type Fs<T> = {
     readonly readFileSync: (name: string) => Buffer;
     readonly writeFileSync: (name: string, content: string) => T;
 };
 export type Node<T> = {
-    readonly child_process: ChildProcess;
     readonly fs: Fs<T>;
 };
+/** @type {<T>(fs: Fs<T>) => string} */
+declare const getVersion: <T>(fs: Fs<T>) => string;
 /** @type {<T>(node: Node<T>) => readonly[T, T]} */
-declare const version: <T>(node: Node<T>) => readonly [T, T];
+declare const updateVersion: <T>(node: Node<T>) => readonly [T, T];

package/nodejs/version/module.f.mjs

@@ -1,9 +1,3 @@
-/**
- * @typedef {{
- *  readonly execSync: (cmd: string) => Buffer
- * }} ChildProcess
- */
-
 /** @typedef {{}} Buffer */
 
 /**
@@ -17,24 +11,29 @@
 /**
  * @template T
  * @typedef {{
- *  readonly child_process: ChildProcess
  *  readonly fs: Fs<T>
  * }} Node
  */
 
 const { stringify, parse } = JSON
 
+/** @type {<T>(fs: Fs<T>) => string} */
+const getVersion = fs => readJson(fs)('package').version
+
+const jsonFile = (/** @type {string} */jsonFile) => `${jsonFile}.json`
+
+/** @type {<T>(node: Fs<T>) => (name: string) => any} */
+const readJson = fs => name => parse(fs.readFileSync(jsonFile(name)).toString())
+
 /** @type {<T>(node: Node<T>) => readonly[T, T]} */
-const version = ({ child_process, fs }) => {
-    const version = `0.1.${child_process.execSync('git log --oneline').toString().split('\n').length - 1}`
-    const f = (/** @type {string} */jsonFile) => {
-        const file = `${jsonFile}.json`
+const updateVersion = ({ fs }) => {
+    const f = (/** @type {string} */name) => {
         return fs.writeFileSync(
-            file,
+            jsonFile(name),
             stringify(
                 {
-                    ...parse(fs.readFileSync(file).toString()),
-                    version
+                    ...readJson(fs)(name),
+                    version: getVersion(fs)
                 },
                 null,
                 2))
@@ -46,6 +45,6 @@ const version = ({ child_process, fs }) => {
 }
 
 export default {
-    /** @readonly */
-    version,
+    getVersion,
+    updateVersion,
 }

package/nodejs/version/test.f.mjs

@@ -1,44 +1,54 @@
 import _, * as T from './module.f.mjs'
 
+const version = '0.3.0'
+
+/**
+ * @type {{
+ *  readonly[k in string]: unknown
+ * }}
+ */
 const x = {
-    "name": "functionalscript",
-    "version": "0.1.0",
-    "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"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/functionalscript/functionalscript.git"
-    },
-    "author": "NatFoam",
-    "license": "MIT",
-    "keywords": [
-        "lambda",
-        "functional-programming",
-        "closure",
-        "pure-functional",
-        "typescript",
-        "programming-language",
-        "lazy-evaluation"
-    ],
-    "bugs": {
-        "url": "https://github.com/functionalscript/functionalscript/issues"
+    'package.json': {
+        "name": "functionalscript",
+        version,
+        "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"
+        },
+        "repository": {
+            "type": "git",
+            "url": "git+https://github.com/functionalscript/functionalscript.git"
+        },
+        "author": "NatFoam",
+        "license": "MIT",
+        "keywords": [
+            "lambda",
+            "functional-programming",
+            "closure",
+            "pure-functional",
+            "typescript",
+            "programming-language",
+            "lazy-evaluation"
+        ],
+        "bugs": {
+            "url": "https://github.com/functionalscript/functionalscript/issues"
+        },
+        "homepage": "https://github.com/functionalscript/functionalscript#readme",
+        "devDependencies": {
+            "@types/node": "^18.6.2",
+            "typescript": "^4.7.4"
+        }
     },
-    "homepage": "https://github.com/functionalscript/functionalscript#readme",
-    "devDependencies": {
-        "@types/node": "^18.6.2",
-        "typescript": "^4.7.4"
-    }
+    "jsr.json": {}
 }
 
 const e = '{\n' +
     '  "name": "functionalscript",\n' +
-    '  "version": "0.1.2",\n' +
+    `  "version": "${version}",\n` +
     '  "description": "FunctionalScript is a functional subset of JavaScript",\n' +
     '  "main": "module.f.cjs",\n' +
     '  "scripts": {\n' +
@@ -80,12 +90,11 @@ const buffer = s => ({
 export default () => {
     /** @type {T.Node<string>} */
     const node = {
-        child_process: { execSync: () => buffer("123\n456\n") },
         fs: {
-            readFileSync: () => buffer(JSON.stringify(x)),
+            readFileSync: n => buffer(JSON.stringify(x[n])),
             writeFileSync: (_, content) => content
         }
     }
-    const [n, d] = _.version(node)
+    const [n, d] = _.updateVersion(node)
     if (n !== e) { throw [n, e] }
 }

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "functionalscript",
-  "version": "0.1.599",
+  "version": "0.1.600",
+  "type": "module",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.f.mjs",
   "scripts": {

package/types/list/test.f.mjs

@@ -200,7 +200,8 @@ const stress = () => ({
         /** @type {T.List<number>} */
         let sequence = []
         // 20_000_000 is too much
-        for (let i = 0; i < 10_000_000; ++i) {
+        // 10_000_000 is too much for Deno 1
+        for (let i = 0; i < 5_000_000; ++i) {
             sequence = _.concat(sequence)([i])
         }
         const r = _.toArray(sequence)
@@ -316,5 +317,5 @@ export default {
         if (_.length(null) !== 0) { throw 0 }
         if (_.length(_.flat([[1, 3], null, () => [3], _.concat([12])([4, 89])])) !== 6) { throw 6 }
     },
-    //stress
+    // stress
 }