functionalscript 0.0.187 → 0.0.190

package/json/index.js

@@ -1,7 +1,6 @@
 const seq = require('../sequence')
 const map = require('../map')
 const op = require('../sequence/operator')
-const { todo } = require('../dev')
 
 /** 
  * @typedef {{
@@ -27,20 +26,27 @@ const addProperty = value => {
 }
 
 /** @type {(kv: readonly[string, seq.Sequence<string>]) => seq.Sequence<string>} */
-const property = ([k, v]) => {
-    let r = seq.one(JSON.stringify(k))
-    r = seq.concat(r)(seq.one(':'))
-    return seq.concat(r)(v)
-}
+const property = ([k, v]) => seq.concat(seq.one(JSON.stringify(k)), seq.one(':'), v)
 
 /** @type {op.Scan<seq.Sequence<string>, seq.Sequence<string>>} */
-const commaValue = a => [seq.concat(seq.one(','))(a), commaValue]
+const commaValue = a => [seq.concat(seq.one(','), a), commaValue]
 
 /** @type {op.Scan<seq.Sequence<string>, seq.Sequence<string>>} */
 const joinScan = value => [value, commaValue]
 
-/** @type {seq.SequenceMap<seq.Sequence<string>, seq.Sequence<string>>} */
-const join = seq.scan(joinScan)
+/** @type {seq.SequenceMap<seq.Sequence<string>, string>} */
+const join = input => seq.flat(seq.scan(joinScan)(input))
+
+/** @type {(open: string) => (close: string) => (input: seq.Sequence<seq.Sequence<string>>) => seq.Sequence<string>} */
+const list = open => close => {
+    const seqOpen = seq.one(open)
+    const seqClose = seq.one(close)
+    return input => seq.concat(seqOpen, join(input), seqClose)
+}
+
+const objectList = list('{')('}')
+
+const arrayList = list('[')(']')
 
 /** @type {(object: Object) => seq.Sequence<string>} */
 const objectStringify = object => {
@@ -49,17 +55,11 @@ const objectStringify = object => {
     for (const [k, v] of Object.entries(object)) {
         m = m.set(k)(stringSeq(v))
     }
-    const properties = join(seq.map(property)(m.entries))
-    const result = seq.concat(seq.one('{'))(seq.flat(properties))
-    return seq.concat(result)(seq.one('}'))
+    return objectList(seq.map(property)(m.entries))
 }
 
 /** @type {(array: Array) => seq.Sequence<string>} */
-const arrayStringify = array => {
-    let a = seq.flat(join(seq.map(stringSeq)(seq.fromArray(array))))
-    const s = seq.concat(seq.one('['))(a)    
-    return seq.concat(s)(seq.one(']'))
-}
+const arrayStringify = array => arrayList(seq.map(stringSeq)(seq.fromArray(array)))
 
 /** @type {(value: Json) => seq.Sequence<string>} */
 const stringSeq = value => {
@@ -77,7 +77,11 @@ const stringSeq = value => {
     }
 }
 
-/** @type {(value: Json) => string} */
+/**
+ * A deterministic version of `JSON.stringify`
+ *  
+ * @type {(value: Json) => string} 
+ */
 const stringify = value => seq.join('')(stringSeq(value))
 
 module.exports = {

package/json/test.js

@@ -11,3 +11,8 @@ if (json.addProperty("Hello")([])({}) !== "Hello") { throw 'error' }
     const x = json.stringify(json.addProperty("Hello")(['a'])({c:[],b:12}))
     if (x !== '{"a":"Hello","b":12,"c":[]}') { throw x }
 }
+
+{
+    const x = json.stringify(json.addProperty("Hello")(['a', 'x'])({ a: { y: [24] }, c: [], b: 12 }))
+    if (x !== '{"a":{"x":"Hello","y":[24]},"b":12,"c":[]}') { throw x }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.187",
+  "version": "0.0.190",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {

package/sequence/index.js

@@ -93,7 +93,10 @@ const fromArray = a => {
 }
 
 /** @type {<T>(a: Sequence<T>) => SequenceMap<T, T>} */
-const concat = a => b => [a, b]
+const concat2 = a => b => [a, b]
+
+/** @type {<T>(...array: readonly Sequence<T>[]) => Sequence<T>} */
+const concat = (...a) => flat(fromArray(a))
 
 /** @type {<T, R>(f: (value: T) => Sequence<R>) => SequenceMap<T, R>} */
 const flatMap = f => input => () => {
@@ -252,6 +255,8 @@ module.exports = {
     /** @readonly */
     concat,
     /** @readonly */
+    concat2,
+    /** @readonly */
     first,
     /** @readonly */
     fromArray,

package/sequence/test.js

@@ -17,7 +17,7 @@ const print = input => {
     const big = seq.fromArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 42, 60])
     const list0 = seq.fromArray([0, 1, 2, 3])
     const list1 = seq.flatMap(x => seq.fromArray([x, x * 2, x * 3]))(list0)
-    const list2 = seq.concat(list0)(list0)
+    const list2 = seq.concat(list0, list0)
     const list3 = seq.exclusiveScan(sum)(list0)
     const r = seq.find(x => x === 42)(big)
     if (seq.every(x => x > 0)(big) !== true) { throw 'x'}
@@ -28,7 +28,8 @@ const print = input => {
     {
         let x = big
         for (let i = 0; i < 1_000_000; ++i) {
-            x = seq.concat(seq.empty)(x)
+            // concat() still causes a stack overflow
+            x = seq.concat2(seq.empty)(x)
         }
         const r = seq.next(x)
         // print(x)
@@ -36,7 +37,8 @@ const print = input => {
     {
         let x = big
         for (let i = 0; i < 1_000_000; ++i) {
-            x = seq.concat(x)(seq.one(i))
+            // concat() still causes a stack overflow
+            x = seq.concat2(x)(seq.one(i))
         }
         const r = seq.next(x)
         // print(x)