functionalscript 0.0.423 → 0.0.424

package/package.json

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

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,28 @@
 /** @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 {{ 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,27 +56,18 @@ 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
@@ -96,3 +106,37 @@ const build = async () => {
 }
 
 const modules = await build()
+
+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)) {
+                    const i2 = `${i}| `
+                    console.log(`${i}${k}:`)
+                    test(i2)(v2)
+                }
+            }
+            return;
+        }
+    }
+}
+
+for (const [k, v] of Object.entries(modules)) {
+    if (k.endsWith('test.f.cjs')) {
+        console.log(`testing ${k}`)
+        test('| ')(v)
+    }
+}

package/types/array/test.f.cjs

@@ -89,6 +89,4 @@ const stringify = a => json.stringify(sort)(a)
     if (result !== undefined) {throw result}
 }
 
-module.exports = {
-
-}
+module.exports = {}

package/types/bigint/test.f.cjs

@@ -1,8 +1,8 @@
 const { sum } = require('./module.f.cjs')
 
-{
-    const result = sum([2n, 3n, 4n, 5n])
-    if (result !== 14n) { throw result }
-}
-
-module.exports = {}
+module.exports = {
+    sum: () => {
+        const result = sum([2n, 3n, 4n, 5n])
+        if (result !== 14n) { throw result }
+    }
+}

package/types/string/test.f.cjs

@@ -1,44 +1,41 @@
 const { join, concat, repeat, cmp } = require('./module.f.cjs')
 const { repeat: repeatList } = require('../list/module.f.cjs')
 
-{
-    const result = join('/')([])
-    if (result !== '') { throw result }
+module.exports = {
+    join: {
+        0: () => {
+            const result = join('/')([])
+            if (result !== '') { throw result }
+        },
+        1: () => {
+            const result = join('/')([''])
+            if (result !== '') { throw result }
+        },
+        3: () => {
+            const result = join(' ')(['hello', 'world', '!'])
+            if (result !== 'hello world !') { throw result }
+        }
+    },
+    concat: () => {
+        const result = concat(['hello', 'world'])
+        if (result !== 'helloworld') { throw result }
+    },
+    repeatList: {
+        0: () => {
+            const s = join('.')(repeatList('x')(0))
+            if (s != '') { throw s }
+        },
+        5: () => {
+            const s = join('.')(repeatList('x')(5))
+            if (s != 'x.x.x.x.x') { throw s }
+        }
+    },
+    repeat: () => {
+        const s = repeat('x')(5)
+        if(s != 'xxxxx') { throw s }
+    },
+    cmp: () => {
+        const result = cmp('3')('4')
+        if (result !== -1) { throw result }
+    }
 }
-
-{
-    const result = join('/')([''])
-    if (result !== '') { throw result }
-}
-
-{
-    const result = join(' ')(['hello', 'world', '!'])
-    if (result !== 'hello world !') { throw result }
-}
-
-{
-    const result = concat(['hello', 'world'])
-    if (result !== 'helloworld') { throw result }
-}
-
-{
-    const s = join('.')(repeatList('x')(0))
-    if (s != '') { throw s }
-}
-
-{
-    const s = join('.')(repeatList('x')(5))
-    if (s != 'x.x.x.x.x') { throw s }
-}
-
-{
-    const s = repeat('x')(5)
-    if (s != 'xxxxx') { throw s }
-}
-
-{
-    const result = cmp('3')('4')
-    if (result !== -1) { throw result }
-}
-
-module.exports = {}

package/types/stringset/test.f.cjs

@@ -1,35 +1,34 @@
 const _ = require('./module.f.cjs')
 
-{
-    const r = _.set('hello')(undefined)
-    if (!_.contains('hello')(r)) { throw r }
-    if (_.contains('hello1')(r)) { throw r }
-}
-
-{
-    let r = _.set('hello')(undefined)
-    r = _.set('world')(r)
-    r = _.set('HELLO')(r)
-    r = _.set('WORLD!')(r)
-    if (!_.contains('hello')(r)) { throw r }
-    if (_.contains('hello1')(r)) { throw r }
-    if (!_.contains('HELLO')(r)) { throw r }
-    if (_.contains('WORLD')(r)) { throw r }
-    if (!_.contains('world')(r)) { throw r }
-    if (_.contains('world!')(r)) { throw r }
-    if (!_.contains('WORLD!')(r)) { throw r }
-    //
-    r = _.remove('hello')(r)
-    if (_.contains('hello')(r)) { throw r }
-    if (!_.contains('world')(r)) { throw r }
-    r = _.remove('world')(r)
-    if (_.contains('world')(r)) { throw r }
-    if (!_.contains('HELLO')(r)) { throw r }
-    r = _.remove('HELLO')(r)
-    if (_.contains('HELLO')(r)) { throw r }
-    if (!_.contains('WORLD!')(r)) { throw r }
-    r = _.remove('WORLD!')(r)
-    if (r !== undefined) { throw r }
-}
-
-module.exports = {}
+module.exports = {
+    contains: () => {
+        const r = _.set('hello')(undefined)
+        if (!_.contains('hello')(r)) { throw r }
+        if (_.contains('hello1')(r)) { throw r }
+    },
+    remove: () => {
+        let r = _.set('hello')(undefined)
+        r = _.set('world')(r)
+        r = _.set('HELLO')(r)
+        r = _.set('WORLD!')(r)
+        if (!_.contains('hello')(r)) { throw r }
+        if (_.contains('hello1')(r)) { throw r }
+        if (!_.contains('HELLO')(r)) { throw r }
+        if (_.contains('WORLD')(r)) { throw r }
+        if (!_.contains('world')(r)) { throw r }
+        if (_.contains('world!')(r)) { throw r }
+        if (!_.contains('WORLD!')(r)) { throw r }
+        //
+        r = _.remove('hello')(r)
+        if (_.contains('hello')(r)) { throw r }
+        if (!_.contains('world')(r)) { throw r }
+        r = _.remove('world')(r)
+        if (_.contains('world')(r)) { throw r }
+        if (!_.contains('HELLO')(r)) { throw r }
+        r = _.remove('HELLO')(r)
+        if (_.contains('HELLO')(r)) { throw r }
+        if (!_.contains('WORLD!')(r)) { throw r }
+        r = _.remove('WORLD!')(r)
+        if (r !== undefined) { throw r }
+    }
+}