functionalscript 0.0.489 → 0.0.491

package/.github/workflows/deno.yml

@@ -16,4 +16,4 @@ jobs:
     - uses: denoland/setup-deno@v1
       with:
         deno-version: v1.x
-    - run: deno run --allow-read --allow-env --allow-net ./dev/test.mjs
+    - run: deno run --allow-read --allow-env --allow-net --allow-hrtime ./dev/test.mjs

package/dev/test/module.f.cjs

@@ -26,11 +26,17 @@ const { reset, fgGreen } = require('../../text/sgr/module.f.cjs')
  * @typedef {(v: string) => (state: T) => T} Log
  */
 
+/**
+ * @template T
+ * @typedef {(state: T) => readonly[number, T]} PerformanceNow
+ */
+
 /**
  * @template T
  * @typedef {{
  *  readonly moduleMap: ModuleMap,
  *  readonly log: Log<T>,
+ *  readonly performanceNow: PerformanceNow<T>,
  *  readonly state: T,
  * }} Input
  */
@@ -38,49 +44,66 @@ const { reset, fgGreen } = require('../../text/sgr/module.f.cjs')
 /** @type {(s: string) => boolean} */
 const isTest = s => s.endsWith('test.f.cjs')
 
+/**
+ * @template T
+ * @typedef {readonly[number, T]} State
+ */
+
 /** @type {<T>(input: Input<T>) => T} */
-const main = ({moduleMap, log, state}) => {
-    /** @typedef {log extends Log<infer T> ? T : never} T */
-    /** @type {(i: string) => (v: unknown) => (state: T) => T} */
-    const test = i => v => state => {
+const main = input => {
+    let { moduleMap, log, performanceNow, state } = input
+    /** @typedef {input extends Input<infer T> ? T : never} T */
+    /** @type {(i: string) => (v: unknown) => (state: State<T>) => State<T>} */
+    const test = i => v => ([time, state]) => {
         const next = test(`${i}| `)
         switch (typeof v) {
             case 'function': {
                 if (v.length === 0) {
+                    let b = 0;
+                    [b, state] = performanceNow(state)
                     const r = v()
-                    state = log(`${i}() ${fgGreen}ok${reset}`)(state)
-                    state = next(r)(state)
+                    let e = 0;
+                    [e, state] = performanceNow(state)
+                    const delta = e - b
+                    time += delta
+                    state = log(`${i}() ${fgGreen}ok${reset}, ${delta} ms`)(state);
+                    [time, state] = next(r)([time, state])
                 }
                 break
             }
             case 'object': {
-                /** @type {(k: readonly[string|number, unknown]) => (state: T) => T} */
-                const f = ([k, v]) => state => {
-                    state = log(`${i}${k}:`)(state)
-                    state = next(v)(state)
-                    return state
+                /** @type {(k: readonly[string|number, unknown]) => (state: State<T>) => State<T>} */
+                const f = ([k, v]) => ([time, state]) => {
+                    state = log(`${i}${k}:`)(state);
+                    [time, state] = next(v)([time, state])
+                    return [time, state]
                 }
-                const foldF = fold(f)(state)
+                const foldF = fold(f)([time, state])
                 if (v instanceof Array) {
-                    state = foldF(list.entries(v))
+                    [time, state] = foldF(list.entries(v))
                 } else if (v !== null) {
-                    state = foldF(Object.entries(v))
+                    [time, state] = foldF(Object.entries(v))
                 }
                 break
             }
         }
-        return state
+        return [time, state]
     }
     const next = test('| ')
-    /** @type {(k: readonly[string, Module]) => (state: T) => T} */
-    const f = ([k, v]) => state => {
+    /** @type {(k: readonly[string, Module]) => (fs: State<T>) => State<T>} */
+    const f = ([k, v]) => ([time, state]) => {
         if (isTest(k)) {
-            state = log(`testing ${k}`)(state)
-            state = next(v.exports)(state)
+            state = log(`testing ${k}`)(state);
+            [time, state] = next(v.exports)([time, state])
         }
-        return state
+        return [time, state]
     }
-    return fold(f)(state)(Object.entries(moduleMap))
+    /** @type {State<T>} */
+    const init = [0, state]
+    let time = 0;
+    [time, state] = fold(f)(init)(Object.entries(moduleMap))
+    state = log(`total ${time} ms`)(state);
+    return state
 }
 
 module.exports = main

package/dev/test.mjs

@@ -1,20 +1,24 @@
 import { loadModuleMap } from './module.mjs'
 
+/** @type {(s: string) => <T>(_: T) => T} */
+const log = s => state => {
+    console.log(s)
+    return state
+}
+
+/** @type {<T>(_: T) => readonly[number, T]} */
+const performanceNow = state => [performance.now(), state]
+
 // test runner.
 const main = async() => {
     const moduleMap = await loadModuleMap()
 
-    /** @type {(s: string) => <T>(_: T) => T} */
-    const log = s => state => {
-        console.log(s)
-        return state
-    }
-
     /** @type {any} */
     const f = moduleMap['./dev/test/module.f.cjs'].exports
     f({
         moduleMap,
         log,
+        performanceNow,
     })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.489",
+  "version": "0.0.491",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^18.11.9",
-    "typescript": "^4.9.3"
+    "@types/node": "^18.11.15",
+    "typescript": "^4.9.4"
   }
 }