functionalscript 0.0.376 → 0.0.379

package/nodejs/version/main.cjs

@@ -1,15 +1,6 @@
-const cp = require('child_process')
-const fs = require('fs')
-const package_json = require('../../package.json')
+const { version } = require('./module.f.cjs')
+    
+const child_process = require('node:child_process')
+const fs = require('node:fs') 
 
-const b =cp.execSync('git log --oneline')
-
-const r = b.toString().split('\n').length
-
-const v = `0.0.${r}`
-
-console.log(`version: ${v}`)
-
-const x = { ...package_json, version: v }
-
-fs.writeFileSync('package.json', JSON.stringify(x, null, 2))
+version({ child_process, fs })

package/nodejs/version/module.f.cjs

@@ -0,0 +1,40 @@
+const pack = require('../../commonjs/package/module.f.cjs')
+
+/** 
+ * @typedef {{
+ *  readonly execSync: (cmd: string) => Buffer
+ * }} ChildProcess
+ */
+
+/**
+ * @template T
+ * @typedef {{
+ *  readonly readFileSync: (name: string) => Buffer
+ *  readonly writeFileSync: (name: string, content: string) => T
+ * }} Fs
+ */
+
+/**
+ * @template T
+ * @typedef {{
+ *  readonly child_process: ChildProcess
+ *  readonly fs: Fs<T>
+ * }} Node
+ */
+
+/** @type {<T>(node: Node<T>) => T} */
+const version = ({ child_process, fs }) =>
+    fs.writeFileSync(
+        'package.json',
+        JSON.stringify(
+            {
+                ...JSON.parse(fs.readFileSync('package.json').toString()), 
+                version: `0.0.${child_process.execSync('git log --oneline').toString().split('\n').length - 1}` 
+            }, 
+            null, 
+            2))
+
+module.exports = {
+    /** @readonly */
+    version,
+}

package/nodejs/version/test.f.cjs

@@ -0,0 +1,88 @@
+const _ = require('./module.f.cjs')
+
+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"
+    },
+    "homepage": "https://github.com/functionalscript/functionalscript#readme",
+    "devDependencies": {
+        "@types/node": "^18.6.2",
+        "typescript": "^4.7.4"
+    }
+}
+
+const e = '{\n' +
+    '  "name": "functionalscript",\n' +
+    '  "version": "0.0.2",\n' +
+    '  "description": "FunctionalScript is a functional subset of JavaScript",\n' +
+    '  "main": "module.f.cjs",\n' +
+    '  "scripts": {\n' +
+    '    "tsc": "tsc",\n' +
+    '    "test": "tsc && npm run test-only",\n' +
+    '    "version": "node ./nodejs/version/main.cjs",\n' +
+    '    "test-only": "node --trace-uncaught ./test.f.cjs"\n' +
+    '  },\n' +
+    '  "repository": {\n' +
+    '    "type": "git",\n' +
+    '    "url": "git+https://github.com/functionalscript/functionalscript.git"\n' +
+    '  },\n' +
+    '  "author": "NatFoam",\n' +
+    '  "license": "MIT",\n' +
+    '  "keywords": [\n' +
+    '    "lambda",\n' +
+    '    "functional-programming",\n' +
+    '    "closure",\n' +
+    '    "pure-functional",\n' +
+    '    "typescript",\n' +
+    '    "programming-language",\n' +
+    '    "lazy-evaluation"\n' +
+    '  ],\n' +
+    '  "bugs": {\n' +
+    '    "url": "https://github.com/functionalscript/functionalscript/issues"\n' +
+    '  },\n' +
+    '  "homepage": "https://github.com/functionalscript/functionalscript#readme",\n' +
+    '  "devDependencies": {\n' +
+    '    "@types/node": "^18.6.2",\n' +
+    '    "typescript": "^4.7.4"\n' +
+    '  }\n' +
+    '}'
+
+{
+    /** @type {_.Node<string>} */
+    const node = {
+        child_process: { execSync: () => Buffer.from("123\n456\n") },
+        fs: {
+            readFileSync: () => Buffer.from(JSON.stringify(x)),
+            writeFileSync: (_, content) => content
+        }
+    }
+    const v = _.version(node)
+    if (v !== e) { throw [v, e] }
+}
+
+module.exports = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.376",
+  "version": "0.0.379",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^18.6.2",
+    "@types/node": "^18.6.3",
     "typescript": "^4.7.4"
   }
 }

package/test.f.cjs

@@ -21,6 +21,7 @@ require('./text/test.f.cjs')
 require('./text/encoding/test.f.cjs')
 require('./com/cs/test.f.cjs')
 require('./com/cpp/test.f.cjs')
+require('./nodejs/version/test.f.cjs')
 
 /** @type {() => never} */
 const assert = () => { throw 'assert' }

package/text/encoding/README.md

@@ -20,7 +20,7 @@ Requirement: no loss for UTF8 => codepoint => UTF8
 |[c,b,]    |1110_xxxx 10xx_xxxx          |10 bit|
 |[d,]      |1111_0xxx                    |3 bit |
 |[d,c,]    |1111_0xxx 10xx_xxxx          |9 bit |
-|[d,c,b]   |1111_0xxx 10xx_xxxx 10xx_xxxx|15 bit|
+|[d,c,b,]  |1111_0xxx 10xx_xxxx 10xx_xxxx|15 bit|
 
 Total error states:
 
@@ -37,10 +37,10 @@ Total error states:
 |[d,]      |1111_0xxx                    | 3 bit|                   |
 |[c,]      |1110_xxxx                    | 4 bit|                   |
 |[b,]      |110x_xxxx                    | 5 bit|                   |
-|[e]       |10xx_xxxx                    | 6 bit|1111_1111 1xxx_xxxx|
-|[d,c,]    |1111_0xxx 10xx_xxxx          | 9 bit|1111_0xxx 10xx_xxxx|
-|[c,b,]    |1110_xxxx 10xx_xxxx          |10 bit|1110_xxxx 10xx_xxxx|
-|[d,c,b]   |1111_0xxx 10xx_xxxx 10xx_xxxx|15 bit|0xxx_xxxx xxxx_xxxx|
+|[e]       |10xx_xxxx                    | 6 bit|0000_0000 0xxx_xxxx|
+|[d,c,]    |1111_0xxx 10xx_xxxx          | 9 bit|0000_001x xxxx_xxxx|
+|[c,b,]    |1110_xxxx 10xx_xxxx          |10 bit|0000_01xx xxxx_xxxx|
+|[d,c,b,]  |1111_0xxx 10xx_xxxx 10xx_xxxx|15 bit|1xxx_xxxx xxxx_xxxx|
 
 ```js
 /** @type {(input: List<u8|undefined>) => List<i32>} */
@@ -77,14 +77,14 @@ Total error states: 11 bit
 
 ```js
 /** @type {(input: List<u16|undefined>) => List<i32>} */
-const utf16ToCodePoint
+const utf16ListToCodePointList
 
 /** @type {(input: List<i32>) => List<u16>} */
-const codePointToUtf16
+const codePointListToUtf16List
 
 /** @type {(input: string) => List<u16> */
-const stringToUtf16
+const stringToUtf16List
 
 /** @type {(input: List<u16>) => string} */
-const utf16ToString
+const utf16ListToString
 ```