functionalscript 0.0.197 → 0.0.202

package/btree/index.js

@@ -1,4 +1,5 @@
-const { index3, index5 } = require('../cmp')
+const cmp = require('../cmp')
+const { index3, index5 } = cmp
 const seq = require('../sequence')
 
 /**
@@ -8,29 +9,29 @@ const seq = require('../sequence')
 
 /**
  * @template T
- * @typedef {import('../cmp').Cmp<T>} Cmp
+ * @typedef {cmp.Cmp<T>} Cmp
  */
 
 /**
  * @template T
- * @typedef {import('../sequence/array').Array1<T>} Array1
+ * @typedef {readonly[T]} Array1
  */
 
 /**
  * @template T
- * @typedef {import('../sequence/array').Array2<T>} Array2
+ * @typedef {readonly[T,T]} Array2
  */
 
 /**
  * @template T
- * @typedef {import('../sequence/array').Array3<T>} Array3
+ * @typedef {readonly[T,T,T]} Array3
  */
 
-/** @typedef {import('../sequence/array').Index2} Index2 */
+/** @typedef {0|1} Index2 */
 
-/** @typedef {import('../sequence/array').Index3} Index3 */
+/** @typedef {0|1|2} Index3 */
 
-/** @typedef {import('../sequence/array').Index5} Index5 */
+/** @typedef {0|1|2|3|4} Index5 */
 
 //
 
@@ -59,14 +60,11 @@ const seq = require('../sequence')
  * @typedef { Leaf1<T> | Leaf2<T> | Branch3<T> | Branch5<T>} Node
  */
 
-/** @typedef {{ readonly done: false }} NotFoundDone */
+/** @typedef {readonly['done']} NotFoundDone */
 
 /** 
  * @template T
- * @typedef {{ 
- *  readonly done: true 
- *  readonly value: T 
- * }} FoundDone 
+ * @typedef {readonly['done', T]} FoundDone 
  */
 
 /**
@@ -76,12 +74,12 @@ const seq = require('../sequence')
 
 /**
  * @template T
- * @typedef {{ readonly replace: Node<T> }} Replace
+ * @typedef {readonly['replace', Node<T>]} Replace
  */
 
 /**
  * @template T
- * @typedef {{ readonly overflow: Branch3<T> }} Overflow
+ * @typedef {readonly['overflow', Branch3<T>]} Overflow
  */
 
 /**
@@ -137,9 +135,11 @@ const split = ([n0, v1, n2, v3, n4, v5, n6]) => [[n0, v1, n2], v3, [n4, v5, n6]]
  *  Result<T>} 
  */
 const merge = overflow => replace => result => {
-    if ('done' in result) { return result }
-    if ('replace' in result) { return { replace: replace(result.replace) } }
-    return overflow(result.overflow)
+    switch (result[0]) {
+        case 'done': { return result }
+        case 'replace': { return ['replace', replace(result[1])] }
+        default: { return overflow(result[1]) }
+    }
 }
 
 /** 
@@ -148,7 +148,7 @@ const merge = overflow => replace => result => {
  *  (result: Result<T>) => 
  *  Result<T>} 
  */
-const merge2 = overflow => merge(o => ({ replace: overflow(o) }))
+const merge2 = overflow => merge(o => ['replace', overflow(o)])
 
 /** 
  * @type {<T>(overflow: (o: Branch3<T>) => Branch7<T>) => 
@@ -156,7 +156,7 @@ const merge2 = overflow => merge(o => ({ replace: overflow(o) }))
  *  (result: Result<T>) => 
  *  Result<T>} 
  */
-const merge3 = overflow => merge(o => ({ overflow: split(overflow(o)) }))
+const merge3 = overflow => merge(o => ['overflow', split(overflow(o))])
 
 /** @type {(visitor: Visitor) => <T>(cmp: Cmp<T>) => (init: Lazy<T>) => (node: Node<T>) => Result<T>} */
 const visit = ({ found, notFound }) => cmp => {
@@ -233,7 +233,7 @@ const visit = ({ found, notFound }) => cmp => {
 }
 
 /** @type { <T>(_: T) => Done<T> } */
-const found = value => ({ done: true, value })
+const found = value => ['done', value]
 
 /** @type {Found} */
 const foundGet = {
@@ -245,7 +245,7 @@ const foundGet = {
     branch5_right: () => ([, , , value]) => found(value),
 }
 /** @type { () => () => NotFoundDone } */
-const notFound = () => () => ({ done: false })
+const notFound = () => () => ['done']
 
 /** @type {NotFound} */
 const notFoundGet = {
@@ -257,7 +257,7 @@ const notFoundGet = {
 }
 
 /** @type { <T>(_: Node<T>) => Replace<T> } */
-const replace = node => ({ replace: node })
+const replace = node => ['replace', node]
 
 /** @type {Found} */
 const foundReplace = {
@@ -270,7 +270,7 @@ const foundReplace = {
 }
 
 /** @type {<T>(leaf3: Array3<T>) => Result<T>} */
-const overflow = ([v0, v1, v2]) => ({ overflow: [[v0], v1, [v2]] })
+const overflow = ([v0, v1, v2]) => ['overflow', [[v0], v1, [v2]]]
 
 /** @type {NotFound} */
 const notFoundInsert = {
@@ -339,8 +339,8 @@ module.exports = {
      * @type { <T>(cmp: Cmp<T>) => (node: Node<T>) => T|undefined }
      */
     getVisitor: cmp => node => {
-        const _0 = visit(getVisitor)(cmp)(() => { throw '' })(node)
-        if ('done' in _0 && _0.done) { return _0.value }
+        const result = visit(getVisitor)(cmp)(() => { throw '' })(node)
+        if (result[0] === 'done') { return result[1] }
         return undefined
     },
     /** @readonly */

package/btree/test.js

@@ -1,14 +1,15 @@
 const btree = require('.')
-const { setVisitor, values: valuesList } = btree
+const { setVisitor, values } = btree
 const { cmp } = require('../cmp') 
 const list = require('../sequence')
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => {
     const result = setVisitor(cmp(value))(() => value)(node)
-    if ('replace' in result) { return result.replace }
-    if ('overflow' in result) { return result.overflow }
-    return node
+    switch (result[0]) {
+        case 'replace': case 'overflow': { return result[1] }
+        default: { return node }
+    }
 }
 
 const test = () => {
@@ -22,7 +23,7 @@ const test = () => {
     //
     {
         /** @type {import('../sequence').Result<string>} */
-        let _item = list.next(valuesList(_map))
+        let _item = list.next(values(_map))
         while (_item !== undefined) {
             _item = list.next(_item[1])
         }

package/json/index.js

@@ -1,7 +1,7 @@
 const seq = require('../sequence')
 const map = require('../map')
 const op = require('../sequence/operator')
-const option = require('../option')
+const object = require('../object')
 const array = require('../sequence/array')
 
 /** 
@@ -27,12 +27,28 @@ const addProperty = value => {
     return path => f(array.sequence(path))
 }
 
+/** @type {(_: string) => seq.Sequence<string>} */
+const stringSerialize = input => seq.list(JSON.stringify(input))
+
+/** @type {(_: number) => seq.Sequence<string>} */
+const numberSerialize = input => seq.list(JSON.stringify(input))
+
+const nullSerialize = seq.list('null')
+
+const trueSerialize = seq.list('true')
+
+const falseSerialize = seq.list('false')
+
+/** @type {(_: boolean) => seq.Sequence<string>} */
+const boolSerialize = value => value ? trueSerialize : falseSerialize
+
 /** @type {(kv: readonly[string, Json]) => seq.Sequence<string>} */
-const property = ([k, v]) => seq.concat(
-    seq.list(JSON.stringify(k)), 
-    seq.list(':'), 
-    stringSequence(v))
+const propertySerialize = ([k, v]) => seq.concat(
+    stringSerialize(k), 
+    colon, 
+    serialize(v))
 
+const colon = seq.list(':')
 const comma = seq.list(',')
 
 /** @type {op.Scan<seq.Sequence<string>, seq.Sequence<string>>} */
@@ -59,48 +75,54 @@ const objectList = list('{')('}')
 const arrayList = list('[')(']')
 
 /** @type {(object: Object) => seq.Sequence<string>} */
-const objectStringify = object => {
-    const _0 = Object.entries(object)
-    const _1 = array.sequence(_0)
-    const _2 = map.fromEntries(_1)
-    const _3 = _2.entries
-    const _4 = seq.map(property)(_3)
-    return objectList(_4)
+const objectSerialize = input => {
+    const _0 = object.entries(input)
+    const _1 = map.fromEntries(_0).entries
+    const _2 = seq.map(propertySerialize)(_1)
+    return objectList(_2)
 }
 
 /** @type {(input: Array) => seq.Sequence<string>} */
-const arrayStringify = input => {
+const arraySerialize = input => {
     const _0 = array.sequence(input)
-    const _1 = seq.map(stringSequence)(_0)
+    const _1 = seq.map(serialize)(_0)
     return arrayList(_1)
 }
 
 /** @type {(value: Json) => seq.Sequence<string>} */
-const stringSequence = value => {
-    const x = typeof value
+const serialize = value => {
     switch (typeof value) {
-        case 'boolean': { return seq.list(value ? "true" : "false") }
-        // Note: we shouldn't use JSON.stringify since it has non determenistic behavior.
-        // In particular: property order could be different.
-        case 'number': case 'string': { return seq.list(JSON.stringify(value)) }
+        case 'boolean': { return boolSerialize(value) }
+        case 'number': { return numberSerialize(value) }
+        case 'string': { return stringSerialize(value) }
         default: {
-            if (value === null) { return seq.list("null") }
-            if (value instanceof Array) { return arrayStringify(value) }
-            return objectStringify(value)
+            if (value === null) { return nullSerialize }
+            if (value instanceof Array) { return arraySerialize(value) }
+            return objectSerialize(value)
         }
     }
 }
 
 /**
- * A deterministic version of `JSON.stringify`
+ * A version of `JSON.stringify` with an alphabeticly ordered `keys`.
+ * 
+ * The standard `JSON.stringify` rules determines by 
+ * https://262.ecma-international.org/6.0/#sec-ordinary-object-internal-methods-and-internal-slots-ownpropertykeys
  *  
  * @type {(value: Json) => string} 
  */
-const stringify = value => seq.join('')(stringSequence(value))
+const stringify = value => seq.join('')(serialize(value))
+
+/** @type {(value: string) => Json} */
+const parse = value => JSON.parse(value)
 
 module.exports = {
     /** @readonly */
     addProperty,
     /** @readonly */
     stringify,
+    /** @readonly */
+    serialize,
+    /** @readonly */
+    parse,
 }

package/map/index.js

@@ -43,10 +43,11 @@ const keyCmp = a => ([b]) => cmp(a)(b)
 const create = root => ({
     get: name => option.map(([,value]) => value)(getVisitor(keyCmp(name))(root)),
     set: name => value => {
-        const _0 = setVisitor(keyCmp(name))(() => [name, value])(root)
-        if ('replace' in _0) { return create(_0.replace) }
-        if ('overflow' in _0) { return create(_0.overflow) }
-        throw ''
+        const result = setVisitor(keyCmp(name))(() => [name, value])(root)
+        switch (result[0]) {
+            case 'replace': case 'overflow': { return create(result[1]) }
+            default: { throw '' }
+        }
     },
     entries: values(root),
     root,

package/module-manager/README.md

@@ -0,0 +1,14 @@
+# Module Manager
+
+## Interface
+
+```js
+/** @typedef {(packageName: string) => PackageMap|Package|undefined} PackageMap */
+
+/**
+ * @typedef {readonly[
+ *  PackageMap,
+ *  (fileName: string) => string|undefined,
+ * ]} Package
+ */
+```

package/module-manager/node/test.js

@@ -1,7 +1,7 @@
 const mm = require('..')
 const i = require('.')
 
-/** @type {{ [_ in string]: string}} */
+/** @type {{ readonly [_ in string]: string}} */
 const files = {
     'index.js': './index.js',
     'a/index.js': './a/index.js',

package/module-manager/test.js

@@ -31,7 +31,7 @@ if (cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('/') !== 'b/d') { thro
     const c = { 
         dependencies: () => undefined,
         file: path => {
-            /** @type {{ [_ in string]?: string}} */
+            /** @type {{ readonly [_ in string]?: string}} */
             const f = {
                 'index.js': 'b/c ./index.js',
                 'x/index.js': 'b/c ./x/index.js',
@@ -41,11 +41,11 @@ if (cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('/') !== 'b/d') { thro
         },
         id: ['c']
     }
-    /** @type {{ [_ in string]: i.Package|i.Dependencies}} */
+    /** @type {{ readonly [_ in string]: i.Package|i.Dependencies}} */
     const packages = {
         a,
         b: s => {
-            /** @type {{ [_ in string]: i.Package|i.Dependencies}} */
+            /** @type {{ readonly [_ in string]: i.Package|i.Dependencies}} */
             const p = { c }
             return p[s]
         }
@@ -54,7 +54,7 @@ if (cast(i.pathNorm('./a/../b/c/..//d/'.split('/'))).join('/') !== 'b/d') { thro
     const pack = {
         dependencies: s => packages[s],
         file: path => {
-            /** @type {{ [_ in string]?: string}} */
+            /** @type {{ readonly [_ in string]?: string}} */
             const f = {
                 'index.js': './index.js',
                 'index/index.js': './index/index.js',

package/object/index.js

@@ -0,0 +1,17 @@
+const array = require('../sequence/array')
+const seq = require('../sequence')
+
+/**
+ * @template T
+ * @typedef {{
+ *  readonly [k in string]: T
+ * }} Object_
+ */
+
+/** @type {<T>(object: Object_<T>) => seq.Sequence<readonly[string, T]>} */
+const entries = object => array.sequence(Object.entries(object))
+
+module.exports = {
+    /** @readonly */
+    entries,
+}

package/package.json

@@ -1,25 +1,25 @@
 {
-  "name": "functionalscript",
-  "version": "0.0.197",
-  "description": "FunctionalScript is a functional subset of JavaScript",
-  "main": "index.js",
-  "scripts": {
-    "tsc": "tsc",
-    "test": "tsc && npm run test-only",
-    "test-only": "node --trace-uncaught ./test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/functionalscript/functionalscript.git"
-  },
-  "author": "Natfoam",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/functionalscript/functionalscript/issues"
-  },
-  "homepage": "https://github.com/functionalscript/functionalscript#readme",
-  "devDependencies": {
-    "@types/node": "^16.11.9",
-    "typescript": "^4.5.2"
-  }
+   "name": "functionalscript",
+   "version": "0.0.202",
+   "description": "FunctionalScript is a functional subset of JavaScript",
+   "main": "index.js",
+   "scripts": {
+      "tsc": "tsc",
+      "test": "tsc && npm run test-only",
+      "test-only": "node --trace-uncaught ./test"
+   },
+   "repository": {
+      "type": "git",
+      "url": "git+https://github.com/functionalscript/functionalscript.git"
+   },
+   "author": "Natfoam",
+   "license": "Apache-2.0",
+   "bugs": {
+      "url": "https://github.com/functionalscript/functionalscript/issues"
+   },
+   "homepage": "https://github.com/functionalscript/functionalscript#readme",
+   "devDependencies": {
+      "@types/node": "^16.11.9",
+      "typescript": "^4.5.2"
+   }
 }

package/sequence/array/index.js

@@ -107,6 +107,9 @@ const sequence = a => {
     return seq(0)
 }
 
+/** @type {<T>(list: seq.Sequence<T>) => readonly T[]} */
+const fromSequence = input => Array.from(seq.iterable(input))
+
 module.exports = {
     /** @readonly */
     at,
@@ -124,4 +127,6 @@ module.exports = {
     splitLast,
     /** @readonly */
     sequence,
+    /** @readonly */
+    fromSequence,
 }

package/sequence/index.js

@@ -77,19 +77,23 @@ const first = input => {
  * @typedef {(list: Sequence<T>) => R} SequenceReduce
  */
 
-/** @type {<T>(...array: readonly T[]) => Sequence<T>} */
+/**
+ * Note: the operation is not lazy. It traverse the given array and creates a linked list.
+ *  
+ * @type {<T>(...array: readonly T[]) => Sequence<T>} 
+ */
 const list = (...array) => {
     /** @typedef {typeof array extends readonly(infer T)[] ? T : never} T */
     let i = array.length
     /** @type {Sequence<T>} */
-    let tail = empty
-    while (true) {
-        if (i === 0) { return tail }
+    let result = empty
+    while (i !== 0) {
         i = i - 1
         /** @type {FirstAndTail<T>} */
-        const result = [array[i], tail]
-        tail = () => result
+        const listResult = [array[i], result]
+        result = () => listResult
     }
+    return result
 }
 
 /** @type {<T>(...array: readonly Sequence<T>[]) => Sequence<T>} */
@@ -97,12 +101,12 @@ const concat = (...array) => {
     let i = array.length
     if (i == 0) { return empty }
     i = i - 1
-    let tail = array[i]
-    while (true) {        
-        if (i === 0) { return tail }
+    let result = array[i]
+    while (i !== 0) {
         i = i - 1
-        tail = [array[i], tail]
+        result = [array[i], result]
     }
+    return result
 }
 
 /** @type {(_: number) => Sequence<number>} */
@@ -261,9 +265,6 @@ const zip = a => b => () => {
     return [[resultA[0], resultB[0]], zip(resultA[1])(resultB[1])]
 }
 
-/** @type {<T>(list: Sequence<T>) => readonly T[]} */
-const toArray = input => Array.from(iterable(input))
-
 module.exports = {
     /** @readonly */
     next,
@@ -280,8 +281,6 @@ module.exports = {
     /** @readonly */
     first,
     /** @readonly */
-    toArray,
-    /** @readonly */
     iterable,
     /** @readonly */
     asyncIterable,

package/sequence/test.js

@@ -27,15 +27,18 @@ const print = input => {
     if (seq.some(x => x > 50)(big) !== true) { throw 'x' }
     if (seq.first(seq.drop(16)(big)) !== 42) { throw 'drop'}
     {
-        const a = seq.toArray(seq.generate(1_000_000))
-        let x = seq.concat(array.sequence(a), big)
+        const a = seq.map(seq.generate)(seq.generate(100_000))
+        const ar = array.fromSequence(a)
+        // This operation use a lot of stack because `...` 
+        // puts array items on a stack.
+        // Use `array.sequence` instead
+        const x = seq.concat(...ar)
         const r = seq.next(x)
         // print(x)
     }
     {
-        const a = seq.map(seq.generate)(seq.generate(100_000))
-        const array = seq.toArray(a)
-        const x = seq.concat(...array)
+        const a = array.fromSequence(seq.generate(1_000_000))
+        let x = seq.concat(array.sequence(a), big)
         const r = seq.next(x)
         // print(x)
     }

package/test.js

@@ -59,3 +59,51 @@ const assert_if = c => { if (c) { throw 'assert_if' } }
             v.commit !== '4b14a7a2b11cf53f037931eb7bef240f96dcea64'),
         assert)
 }
+
+{
+    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
+    }
+    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)
+}

package/version.js

@@ -1,5 +1,6 @@
 const cp = require('child_process')
 const fs = require('fs')
+const json = require('./json')
 
 const b =cp.execSync('git log --oneline')
 
@@ -9,8 +10,8 @@ const v = `0.0.${r}`
 
 console.log(`version: ${v}`)
 
-const package_json = JSON.parse(fs.readFileSync('package.json').toString())
+let package_json = json.parse(fs.readFileSync('package.json').toString())
 
-package_json.version = v
+package_json = json.addProperty(v)(['version'])(package_json)
 
-fs.writeFileSync('package.json', JSON.stringify(package_json, null, 2))
+fs.writeFileSync('package.json', JSON.stringify(package_json, null, 3))