functionalscript 0.0.197 → 0.0.198

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/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.198",
+   "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/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))