functionalscript 0.0.423 → 0.0.426

package/nodejs/version/test.f.cjs

@@ -77,7 +77,7 @@ const buffer = s => ({
     toString: () => s
 })
 
-{
+module.exports = () => {
     /** @type {_.Node<string>} */
     const node = {
         child_process: { execSync: () => buffer("123\n456\n") },
@@ -89,5 +89,3 @@ const buffer = s => ({
     const v = _.version(node)
     if (v !== e) { throw [v, e] }
 }
-
-module.exports = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.423",
+  "version": "0.0.426",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/sha2/test.f.cjs

@@ -32,45 +32,42 @@ const stringify = a => json.stringify(sort)(a)
 //     console.log(result.map(toHexString))
 // }
 
-{
-    const hash = _.computeSha256([])(0)
-    const result = stringify(hash.map(toHexString))
-    if (result !== '["e3b0c442","98fc1c14","9afbf4c8","996fb924","27ae41e4","649b934c","a495991b","7852b855"]') { throw result }
-}
-
-{
-    const hash = _.computeSha224([])(0)
-    const result = stringify(hash.map(toHexString))
-    if (result !== '["d14a028c","2a3a2bc9","476102bb","288234c4","15a2b01f","828ea62a","c5b3e42f","bdd387cb"]') { throw result }
-}
-
-{
-    //[0x68656C6C, 0x6F20776F, 0x726C6400] represents phrase 'hello world'
-    const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C6400])(88)
-    const result = stringify(hash.map(toHexString))
-    if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
-}
-
-{
-    //[0x68656C6C, 0x6F20776F, 0x726C6488] represents phrase 'hello world' with 1's at the end
-    const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C64FF])(88)
-    const result = stringify(hash.map(toHexString))
-    if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
-}
-
-{
-    const input = Array(8).fill(0x31313131)
-    const result = _.computeSha256(input)(256)
-    if (toU32(result[0]) !== 0x8a83665f) { throw result[0] }
-}
-
-{
-    const input = Array(16).fill(0x31313131)
-    const hash = _.computeSha256(input)(512)
-    const result = stringify(hash.map(toHexString))
-    if (result !== '["3138bb9b","c78df27c","473ecfd1","410f7bd4","5ebac1f5","9cf3ff9c","fe4db77a","ab7aedd3"]') { throw result }
-}
-
 module.exports = {
-
+    empty: {
+        sha256: () => {
+            const hash = _.computeSha256([])(0)
+            const result = stringify(hash.map(toHexString))
+            if (result !== '["e3b0c442","98fc1c14","9afbf4c8","996fb924","27ae41e4","649b934c","a495991b","7852b855"]') { throw result }
+        },
+        sha224: () => {
+            const hash = _.computeSha224([])(0)
+            const result = stringify(hash.map(toHexString))
+            if (result !== '["d14a028c","2a3a2bc9","476102bb","288234c4","15a2b01f","828ea62a","c5b3e42f","bdd387cb"]') { throw result }
+        }
+    },
+    sha256: [
+        () => {
+            //[0x68656C6C, 0x6F20776F, 0x726C6400] represents phrase 'hello world'
+            const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C6400])(88)
+            const result = stringify(hash.map(toHexString))
+            if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
+        },
+        () => {
+            //[0x68656C6C, 0x6F20776F, 0x726C6488] represents phrase 'hello world' with 1's at the end
+            const hash = _.computeSha256([0x68656C6C, 0x6F20776F, 0x726C64FF])(88)
+            const result = stringify(hash.map(toHexString))
+            if (result !== '["b94d27b9","934d3e08","a52e52d7","da7dabfa","c484efe3","7a5380ee","9088f7ac","e2efcde9"]') { throw result }
+        },
+        () => {
+            const input = Array(8).fill(0x31313131)
+            const result = _.computeSha256(input)(256)
+            if (toU32(result[0]) !== 0x8a83665f) { throw result[0] }
+        },
+        () => {
+            const input = Array(16).fill(0x31313131)
+            const hash = _.computeSha256(input)(512)
+            const result = stringify(hash.map(toHexString))
+            if (result !== '["3138bb9b","c78df27c","473ecfd1","410f7bd4","5ebac1f5","9cf3ff9c","fe4db77a","ab7aedd3"]') { throw result }
+        }
+    ]
 }

package/test.f.cjs

@@ -1,95 +1,58 @@
 const i = require('./module.f.cjs')
 
-require('./types/list/test.f.cjs')
-require('./types/number/test.f.cjs')
-require('./types/bigint/module.f.cjs')
-require('./types/array/test.f.cjs')
-require('./types/btree/test.f.cjs')
-require('./types/byteSet/test.f.cjs')
-require('./types/nibbleSet/test.f.cjs')
-require('./sha2/test.f.cjs')
-require('./types/map/test.f.cjs')
-require('./json/test.f.cjs')
-require('./types/string/test.f.cjs')
-require('./json/tokenizer/test.f.cjs')
-require('./types/object/test.f.cjs')
-// require('./commonjs/test.cjs')
-require('./commonjs/package/dependencies/test.f.cjs')
-require('./commonjs/package/test.f.cjs')
-require('./commonjs/path/test.f.cjs')
-require('./types/function/test.f.cjs')
-require('./types/function/compare/test.f.cjs')
-require('./types/stringset/test.f.cjs')
-require('./types/option/test.f.cjs')
-require('./commonjs/build/test.f.cjs')
-require('./types/range/test.f.cjs')
-require('./html/test.f.cjs')
-require('./text/test.f.cjs')
-require('./text/utf8/test.f.cjs')
-require('./text/utf16/test.f.cjs')
-require('./com/cs/test.f.cjs')
-require('./com/cpp/test.f.cjs')
-require('./nodejs/version/test.f.cjs')
-require('./com/rust/test.f.cjs')
-
 /** @type {() => never} */
 const assert = () => { throw 'assert' }
 
 /** @type {(_: boolean) => void} */
 const assert_if = c => { if (c) { throw 'assert_if' } }
 
-{
-    const c = (()=>{})['constructor']
-    const f = c('return 5')
-    const result = f()
-    if (result !== 5) { throw 'function' }
-}
-
-{
-    /** @type {any} */
-    const o = {}
-    const c = o['constructor']
-    // console.log(c)
-    // console.log(c(()=>{}))
-}
-
-{
-    /** @type {any} */
-    const o = {
-        constructor: undefined
+module.exports = {
+    ctor: () => {
+        const c = (() => { })['constructor']
+        const f = c('return 5')
+        const result = f()
+        if (result !== 5) { throw 'function' }
+    },
+    ctorEmpty: () => {
+        /** @type {any} */
+        const o = {}
+        const c = o['constructor']
+        // console.log(c)
+        // console.log(c(()=>{}))
+    },
+    ctorUndefined: () => {
+        /** @type {any} */
+        const o = {
+            constructor: undefined
+        }
+        const c = o['constructor']
+        //console.log(c)
+    },
+    number: () => {
+        /** @type {any} */
+        const b = '42'
+        const r = Number(b)
+        //console.log(r)
+    },
+    properties: () => {
+        /** @type {any} */
+        const o = {}
+        //const c = o['constructor']
+        //const c = o['__proto__']
+        //const c = o['__defineGetter__']
+        //const c = o['__defineSetter__']
+        //const c = o['__lookupGetter__']
+        //const c = o['__lookupSetter__']
+        //const c = o['hasOwnProperty']
+        //const c = o['isPrototypeOf']
+        //const c = o['propertyIsEnumerable']
+        //const c = o['toString']
+        const c = o['valueOf']
+        //console.log(c)
+    },
+    getOwnPropertyDescriptor: () => {
+        const x = { 'a': 12 }
+        const c = Object.getOwnPropertyDescriptor(x, 'constructor')
+        const a = Object.getOwnPropertyDescriptor(x, 'a')
     }
-    const c = o['constructor']
-    //console.log(c)
-}
-
-{
-    /** @type {any} */
-    const b = '42'
-    const r = Number(b)
-    //console.log(r)
-}
-
-{
-    /** @type {any} */
-    const o = {}
-    //const c = o['constructor']
-    //const c = o['__proto__']
-    //const c = o['__defineGetter__']
-    //const c = o['__defineSetter__']
-    //const c = o['__lookupGetter__']
-    //const c = o['__lookupSetter__']
-    //const c = o['hasOwnProperty']
-    //const c = o['isPrototypeOf']
-    //const c = o['propertyIsEnumerable']
-    //const c = o['toString']
-    const c = o['valueOf']
-    //console.log(c)
-}
-
-{
-    const x = { 'a': 12 }
-    const c = Object.getOwnPropertyDescriptor(x, 'constructor')
-    const a = Object.getOwnPropertyDescriptor(x, 'a')
-}
-
-module.exports = {}
+}

package/test.mjs

@@ -21,9 +21,39 @@
 /** @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 = {}
+/**
+ * @typedef {{
+ *  [k: in string]?: Module
+ * }} Dependencies
+ */
+
+/**
+ * @typedef {{
+ *  dependencies: Dependencies
+ *  exports?: unknown
+ * }} Module
+ */
+
+/** @typedef {(name: string) => unknown} Require */
+
+/**
+ * @typedef {{
+ *  readonly[k in string]: Function
+ * }} FunctionMap
+ */
+
+/**
+ * @template T
+ * @typedef {readonly[string, T]} Entry
+ */
+
+/** @type {(a: Entry<Function>, b: Entry<Function>) => number} */
+const cmp = ([a], [b]) => a < b ? -1 : a > b ? 1 : 0
+
+/** @type {() => Promise<FunctionMap>} */
+const load = async () => {
+    /** @type {(readonly[string, Function])[]} */
+    const map = []
     /** @type {(path: string) => Promise<void>} */
     const f = async p => {
         for (const i of await readdir(p, { withFileTypes: true })) {
@@ -37,55 +67,56 @@ const load = async() => {
                 } else if (name.endsWith('.f.cjs')) {
                     console.log(`loading ${file}`)
                     const source = await readFile(file, 'utf8')
-                    map[file] = Function('module', 'require', `"use strict";${source}`)
+                    map.push([file, Function('module', 'require', `"use strict";${source}`)])
                 }
             }
         }
     }
     await f('.')
-    return map
+    map.sort(cmp)
+    return Object.fromEntries(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
+ *  [k in string]: Module
  * }} ModuleMap
  */
 
 const build = async () => {
     /** @type {ModuleMap} */
     const d = {}
-    /** @type {(base: readonly string[]) => (i: string) => (k: string) => unknown} */
-    const req = p => i => k => {
+    /** @type {(base: readonly string[]) => (i: string) => (k: string) => readonly[string, Module]} */
+    const req = base => i => k => {
         const relativePath = k.split('/')
         const dif = relativePath.filter(v => v === '..').length
-        const path = [p.slice(0, p.length - dif), relativePath.filter(v => !['..', '.'].includes(v))]
+        const path = [base.slice(0, base.length - dif), relativePath.filter(v => !['..', '.'].includes(v))]
             .flat()
         const pathStr = path.join('/')
         const newBase = path.slice(0, path.length - 1)
-        const result = d[pathStr]
-        if (result === undefined) {
+        {
+            const module = d[pathStr]
+            if (module !== undefined) {
+                return [pathStr, module]
+            }
+        }
+        {
             /** @type {Module} */
-            const me = {}
+            const module = {
+                dependencies: {}
+            }
             console.log(`${i}building ${pathStr}`)
-            map[pathStr](me, req(newBase)(`${i}| `))
-            const newResult = me.exports
-            d[pathStr] = newResult
-            return newResult
-        } else {
-            return result
+            const getModule = req(newBase)(`${i}| `)
+            const newReq = s => {
+                const [p, result] = getModule(s)
+                module.dependencies[p] = result
+                return result.exports
+            }
+            map[pathStr](module, newReq)
+            d[pathStr] = module
+            return [pathStr, module]
         }
     }
     const r = req(['.'])('')
@@ -96,3 +127,46 @@ const build = async () => {
 }
 
 const modules = await build()
+
+// graph
+
+for (const [k, v] of Object.entries(modules)) {
+    console.log(`: ${k}`)
+    console.log(Object.keys(v.dependencies))
+}
+
+// test runner.
+
+/** @type {(i: string) => (v: unknown) => void} */
+const test = i => v => {
+    switch (typeof v) {
+        case 'function': {
+            if (v.length === 0) {
+                const r = v()
+                console.log(`${i}() passed`)
+                test(`${i}| `)(r)
+            }
+            return;
+        }
+        case 'object': {
+            if (v instanceof Array) {
+                for (const v2 of v) {
+                    test(`${i}| `)(v2)
+                }
+            } else {
+                for (const [k, v2] of Object.entries(v)) {
+                    console.log(`${i}${k}:`)
+                    test(`${i}| `)(v2)
+                }
+            }
+            return;
+        }
+    }
+}
+
+for (const [k, v] of Object.entries(modules)) {
+    if (k.endsWith('test.f.cjs')) {
+        console.log(`testing ${k}`)
+        test('| ')(v.exports)
+    }
+}

package/text/test.f.cjs

@@ -1,7 +1,7 @@
 const _ = require('./module.f.cjs')
 const { string: { join } } = require('../types/module.f.cjs')
 
-{
+module.exports = () => {
     /** @type {_.Block} */
     const text = [
         'a',
@@ -15,5 +15,3 @@ const { string: { join } } = require('../types/module.f.cjs')
     const result = join('\n')(_.flat(':')(text))
     if (result !== 'a\nb\n:c\n::d\ne') { throw result }
 }
-
-module.exports = {}

package/text/utf16/test.f.cjs

@@ -6,113 +6,100 @@ const { list } = require('../../types/module.f.cjs')
 /** @type {(a: readonly json.Unknown[]) => string} */
 const stringify = a => json.stringify(sort)(a)
 
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([-1, 65536])))
-    if (result !== '[4294967295,4294967295]') { throw result }
+module.exports = {
+    toCodePointList: [
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([-1, 65536])))
+            if (result !== '[4294967295,4294967295]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([0, 36, 8364, 55295, 57344, 65535])))
+            if (result !== '[0,36,8364,55295,57344,65535]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([56320, 57343])))
+            if (result !== '[-2147427328,-2147426305]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([55296, 56320, 55297, 56375, 55378, 57186, 56319, 57343])))
+            if (result !== '[65536,66615,150370,1114111]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([55296, 55296])))
+            if (result !== '[-2147428352,-2147428352]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([55296, 0])))
+            if (result !== '[-2147428352,0]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([56320])))
+            if (result !== '[-2147427328]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.toCodePointList([56320, 0])))
+            if (result !== '[-2147427328,0]') { throw result }
+        }
+    ],
+    fromCodePointList: [
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0])))
+            if (result !== '[0]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0x24])))
+            if (result !== '[36]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0x20AC])))
+            if (result !== '[8364]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0xd7ff])))
+            if (result !== '[55295]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0xe000])))
+            if (result !== '[57344]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0xffff])))
+            if (result !== '[65535]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0x10000])))
+            if (result !== '[55296,56320]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0x10437])))
+            if (result !== '[55297,56375]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0x24B62])))
+            if (result !== '[55378,57186]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([0x10ffff])))
+            if (result !== '[56319,57343]') { throw result }
+        },
+        () => {
+            const result = stringify(list.toArray(encoding.fromCodePointList([-1, 0xd800, 0xdfff, 0x110000])))
+            if (result !== '[65535,55296,57343,0]') { throw result }
+        }
+    ],
+    string: [
+        () => {
+            const utf16List = encoding.stringToList("Hello world!😂🚜🚲")
+            const result = encoding.listToString(utf16List)
+            if (result !== "Hello world!😂🚜🚲") { throw result }
+        },
+        () => {
+            const a = encoding.stringToList("Hello world!😂🚜🚲")
+            const b = encoding.toCodePointList(a)
+            const c = encoding.fromCodePointList(b)
+            const result = encoding.listToString(c)
+            if (result !== "Hello world!😂🚜🚲") { throw result }
+
+        }
+    ]
 }
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([0, 36, 8364, 55295, 57344, 65535])))
-    if (result !== '[0,36,8364,55295,57344,65535]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([56320, 57343])))
-    if (result !== '[-2147427328,-2147426305]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([55296, 56320, 55297, 56375, 55378, 57186, 56319, 57343])))
-    if (result !== '[65536,66615,150370,1114111]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([55296, 55296])))
-    if (result !== '[-2147428352,-2147428352]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([55296, 0])))
-    if (result !== '[-2147428352,0]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([56320])))
-    if (result !== '[-2147427328]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.toCodePointList([56320, 0])))
-    if (result !== '[-2147427328,0]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0])))
-    if (result !== '[0]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0x24])))
-    if (result !== '[36]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0x20AC])))
-    if (result !== '[8364]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0xd7ff])))
-    if (result !== '[55295]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0xe000])))
-    if (result !== '[57344]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0xffff])))
-    if (result !== '[65535]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0x10000])))
-    if (result !== '[55296,56320]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0x10437])))
-    if (result !== '[55297,56375]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0x24B62])))
-    if (result !== '[55378,57186]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([0x10ffff])))
-    if (result !== '[56319,57343]') { throw result }
-}
-
-{
-    const result = stringify(list.toArray(encoding.fromCodePointList([-1, 0xd800, 0xdfff, 0x110000])))
-    if (result !== '[65535,55296,57343,0]') { throw result }
-}
-
-{
-    const utf16List = encoding.stringToList("Hello world!😂🚜🚲")
-    const result = encoding.listToString(utf16List)
-    if (result !== "Hello world!😂🚜🚲") { throw result }
-}
-
-{
-    const a = encoding.stringToList("Hello world!😂🚜🚲")
-    const b = encoding.toCodePointList(a)
-    const c = encoding.fromCodePointList(b)
-    const result = encoding.listToString(c)
-    if (result !== "Hello world!😂🚜🚲") { throw result }
-}
-
-module.exports = {}