functionalscript 0.0.422 → 0.0.425

package/types/nibbleSet/test.f.cjs

@@ -1,44 +1,41 @@
 const _ = require('./module.f.cjs')
 
-{
-    if (_.has(0)(_.empty)) { throw _.empty }
-    if (_.has(1)(_.empty)) { throw _.empty }
-    if (_.has(15)(_.empty)) { throw _.empty }
-}
-
-{
-    const s = _.set(0)(_.empty)
-    if (s !== 1) { throw s }
-    if (!_.has(0)(s)) { throw s }
-    if (_.has(1)(s)) { throw s }
-    if (_.has(15)(s)) { throw s }
-}
-
-{
-    const s = _.set(15)(_.empty)
-    if (s !== 32768) { throw s }
-    if (_.has(0)(s)) { throw s }
-    if (_.has(1)(s)) { throw s }
-    if (!_.has(15)(s)) { throw s }
-}
-
-{
-    const a = _.set(0)(_.empty)
-    const result = _.unset(0)(a)
-    if (result !== 0) { throw result }
-}
-
-{
-    const a = _.set(15)(_.empty)
-    const result = _.unset(15)(a)
-    if (result !== 0) { throw result }
-}
-
-{
-    const result = _.setRange([2, 5])(_.empty)
-    if (result !== 60) { throw result }
-}
-
 module.exports = {
-
+    has: () => {
+        if (_.has(0)(_.empty)) { throw _.empty }
+        if (_.has(1)(_.empty)) { throw _.empty }
+        if (_.has(15)(_.empty)) { throw _.empty }
+    },
+    set: [
+        () => {
+            const s = _.set(0)(_.empty)
+            if(s !== 1) { throw s }
+            if(!_.has(0)(s)) { throw s }
+            if (_.has(1)(s)) { throw s }
+            if (_.has(15)(s)) { throw s }
+        },
+        () => {
+            const s = _.set(15)(_.empty)
+            if (s !== 32768) { throw s }
+            if (_.has(0)(s)) { throw s }
+            if (_.has(1)(s)) { throw s }
+            if (!_.has(15)(s)) { throw s }
+        }
+    ],
+    unset: () => [
+        () => {
+            const a = _.set(0)(_.empty)
+            const result = _.unset(0)(a)
+            if (result !== 0) { throw result }
+        },
+        () => {
+            const a = _.set(15)(_.empty)
+            const result = _.unset(15)(a)
+            if (result !== 0) { throw result }
+        }
+    ],
+    setRange: () => {
+        const result = _.setRange([2, 5])(_.empty)
+        if (result !== 60) { throw result }
+    }
 }

package/types/number/test.f.cjs

@@ -1,28 +1,26 @@
 const { sum, min, max, cmp } = require('./module.f.cjs')
 
-{
-    const result = sum([2, 3, 4, 5])
-    if (result !== 14) { throw result }
-}
-
-{
-    const result = min([])
-    if (result !== undefined) { throw result }
-}
-
-{
-    const result = min([1, 2, 12, -4, 8])
-    if (result !== -4) { throw result }
-}
-
-{
-    const result = max([1, 2, 12, -4, 8])
-    if (result !== 12) { throw result }
-}
-
-{
-    const result = cmp(4)(5)
-    if (result !== -1) { throw result }
-}
-
-module.exports = {}
+module.exports = {
+    sum: () => {
+        const result = sum([2, 3, 4, 5])
+        if (result !== 14) { throw result }
+    },
+    min: {
+        empty: () => {
+            const result = min([])
+            if (result !== undefined) { throw result }
+        },
+        multi: () => {
+            const result = min([1, 2, 12, -4, 8])
+            if (result !== -4) { throw result }
+        }
+    },
+    max: () => {
+        const result = max([1, 2, 12, -4, 8])
+        if (result !== 12) { throw result }
+    },
+    cmp: () => {
+        const result = cmp(4)(5)
+        if (result !== -1) { throw result }
+    }
+}

package/types/object/test.f.cjs

@@ -1,15 +1,14 @@
 const _ = require('./module.f.cjs')
 
-{
-    const a = {}
-    const value = _.at('constructor')(a)
-    if (value !== undefined) { throw value }
-}
-
-{
-    const a = { constructor: 42}
-    const value = _.at('constructor')(a)
-    if (value !== 42) { throw value }
-}
-
-module.exports = {}
+module.exports = {
+    ctor: () => {
+        const a = {}
+        const value = _.at('constructor')(a)
+        if (value !== undefined) { throw value }
+    },
+    property: () => {
+        const a = { constructor: 42 }
+        const value = _.at('constructor')(a)
+        if (value !== 42) { throw value }
+    }
+}

package/types/option/test.f.cjs

@@ -1,11 +1,9 @@
 const _ = require('./module.f.cjs')
 
-{
+module.exports = () => {
     const optionSq = _.map(v => v * v)
     const sq3 = optionSq(3)
     if (sq3 !== 9) { throw sq3 }
     const sqUndefined = optionSq(undefined)
     if (sqUndefined !== undefined) { throw sqUndefined }
 }
-
-module.exports = {}

package/types/range/test.f.cjs

@@ -1,11 +1,9 @@
 const _ = require('./module.f.cjs')
 
-{
+module.exports = () => {
     if (!_.contains([0, 5])(1)) { throw 1 }
     if (!_.contains([0, 5])(0)) { throw 0 }
     if (!_.contains([0, 5])(5)) { throw 5 }
     if (_.contains([0, 5])(-1)) { throw -1 }
     if (_.contains([0, 5])(6)) { throw 6 }
 }
-
-module.exports = {}

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 }
+    }
+}

package/denotest.mjs

@@ -1,96 +0,0 @@
-// import * as fs from "https://deno.land/std/node/fs.ts"
-
-/**
- * @type {{
- *  readonly readDir: (path: string | URL) => AsyncIterable<DirEntry>,
- *  readonly readTextFile: (path: string | URL) => Promise<string>,
- * }}
- */
-const {
-    readDir,
-    readTextFile,
-} = Deno
-
-/**
- * @typedef {{
- *  readonly isDirectory: boolean
- *  readonly isFile: boolean
- *  readonly isSymlink: boolean
- *  readonly name: string
- * }} DirEntry
- */
-
-/** @typedef {{ exports?: unknown }} Module */
-
-/** @typedef {(name: string) => unknown} Require */
-
-/**
- * @typedef {{
- *  [k in string]: Function
- * }} FunctionMap
- */
-
-/** @type {(path: string) => Promise<FunctionMap>} */
-const dir = async p => {
-    /** @type {FunctionMap} */
-    const map = {}
-    /** @type {(path: string) => Promise<void>} */
-    const f = async p => {
-        for await (const i of readDir(p)) {
-            const { name } = i
-            if (!name.startsWith('.')) {
-                const file = `${p}/${name}`
-                if (i.isDirectory) {
-                    if (!['node_modules', 'target'].includes(name)) {
-                        await f(file)
-                    }
-                } else if (name.endsWith('.f.cjs')) {
-                    console.log(`loading ${file}`)
-                    const source = await readTextFile(file)
-                    map[file] = Function('module', 'require', `"use strict";${source}`)
-                }
-            }
-        }
-    }
-    await f(p)
-    return map
-}
-
-/**
- * @typedef {{
- *  [k in string]: unknown
- * }} ModuleMap
- */
-
-const run = async () => {
-    const m = await dir('.')
-    /** @type {ModuleMap} */
-    const d = {}
-    /** @type {(base: readonly string[]) => (i: string) => (k: string) => unknown} */
-    const req = p => 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))]
-            .flat()
-        const pathStr = path.join('/')
-        const newBase = path.slice(0, path.length - 1)
-        const result = d[pathStr]
-        if (result === undefined) {
-            /** @type {Module} */
-            const me = {}
-            console.log(`${i}building ${pathStr}`)
-            m[pathStr](me, req(newBase)(`${i}| `))
-            const newResult = me.exports
-            d[pathStr] = newResult
-            return newResult
-        } else {
-            return result
-        }
-    }
-    const r = req(['.'])('')
-    for (const k of Object.keys(m)) {
-        r(k)
-    }
-}
-
-run()