aontu 0.14.1 → 0.14.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aontu.min.js +1 -1
- package/dist/lib/op/unite.js +6 -1
- package/dist/lib/op/unite.js.map +1 -1
- package/dist/lib/val/ConjunctVal.js +23 -3
- package/dist/lib/val/ConjunctVal.js.map +1 -1
- package/dist/lib/val/ListVal.js +14 -6
- package/dist/lib/val/ListVal.js.map +1 -1
- package/dist/lib/val/MapVal.js +18 -9
- package/dist/lib/val/MapVal.js.map +1 -1
- package/lib/op/unite.ts +6 -1
- package/lib/val/ConjunctVal.ts +31 -3
- package/lib/val/ListVal.ts +16 -7
- package/lib/val/MapVal.ts +18 -9
- package/package.json +2 -2
package/dist/lib/op/unite.js
CHANGED
|
@@ -18,6 +18,7 @@ const unite = (ctx, a, b, whence) => {
|
|
|
18
18
|
// console.log('AA OP unite IN', a?.canon, b?.canon,
|
|
19
19
|
// 'W', whence,
|
|
20
20
|
// 'E', 0 < ctx?.err?.length ? ctx.err.map((e: Val) => e.canon) : '')
|
|
21
|
+
let unified = false;
|
|
21
22
|
if (b && (val_1.TOP === a || !a)) {
|
|
22
23
|
//console.log('Utb', b.canon)
|
|
23
24
|
out = b;
|
|
@@ -40,6 +41,7 @@ const unite = (ctx, a, b, whence) => {
|
|
|
40
41
|
else if (a instanceof ConjunctVal_1.ConjunctVal) {
|
|
41
42
|
// console.log('Q', a.canon, b.canon)
|
|
42
43
|
out = a.unify(b, ctx);
|
|
44
|
+
unified = true;
|
|
43
45
|
why = 'acj';
|
|
44
46
|
}
|
|
45
47
|
else if (b instanceof ConjunctVal_1.ConjunctVal ||
|
|
@@ -49,6 +51,7 @@ const unite = (ctx, a, b, whence) => {
|
|
|
49
51
|
// console.log('U', a.canon, b.canon)
|
|
50
52
|
// return b.unify(a, ctx)
|
|
51
53
|
out = b.unify(a, ctx);
|
|
54
|
+
unified = true;
|
|
52
55
|
// console.log('UO', out.canon)
|
|
53
56
|
why = 'bv';
|
|
54
57
|
}
|
|
@@ -58,7 +61,9 @@ const unite = (ctx, a, b, whence) => {
|
|
|
58
61
|
why = 'up';
|
|
59
62
|
}
|
|
60
63
|
else {
|
|
64
|
+
// console.log('QQQ')
|
|
61
65
|
out = a.unify(b, ctx);
|
|
66
|
+
unified = true;
|
|
62
67
|
why = 'ab';
|
|
63
68
|
}
|
|
64
69
|
}
|
|
@@ -66,7 +71,7 @@ const unite = (ctx, a, b, whence) => {
|
|
|
66
71
|
out = Nil_1.Nil.make(ctx, 'unite', a, b);
|
|
67
72
|
why += 'N';
|
|
68
73
|
}
|
|
69
|
-
if (type_1.DONE !== out.done) {
|
|
74
|
+
if (type_1.DONE !== out.done && !unified) {
|
|
70
75
|
out = out.unify(val_1.TOP, ctx);
|
|
71
76
|
why += 'T';
|
|
72
77
|
}
|
package/dist/lib/op/unite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unite.js","sourceRoot":"","sources":["../../../lib/op/unite.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAMzD,kCAA8B;AAI9B,oDAAgD;AAChD,oDAAgD;AAGhD,oCAAgC;AAChC,4CAAwC;AACxC,0CAAsC;AAItC,gCAEe;AAMf,IAAI,EAAE,GAAG,CAAC,CAAA;AAGV,kFAAkF;AAClF,oEAAoE;AACpE,MAAM,KAAK,GAAc,CAAC,GAAY,EAAE,CAAO,EAAE,CAAO,EAAE,MAAe,EAAE,EAAE;IAC3E,IAAI,GAAG,GAAG,CAAC,CAAA;IACX,IAAI,GAAG,GAAG,GAAG,CAAA;IACb,qDAAqD;IACrD,iBAAiB;IACjB,uEAAuE;
|
|
1
|
+
{"version":3,"file":"unite.js","sourceRoot":"","sources":["../../../lib/op/unite.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const type_1 = require("../type");
|
|
|
6
6
|
const err_1 = require("../err");
|
|
7
7
|
const op_1 = require("../op/op");
|
|
8
8
|
const val_1 = require("../val");
|
|
9
|
+
const ListVal_1 = require("../val/ListVal");
|
|
9
10
|
const MapVal_1 = require("../val/MapVal");
|
|
10
11
|
const Nil_1 = require("../val/Nil");
|
|
11
12
|
const RefVal_1 = require("../val/RefVal");
|
|
@@ -14,6 +15,8 @@ const ValBase_1 = require("../val/ValBase");
|
|
|
14
15
|
class ConjunctVal extends ValBase_1.ValBase {
|
|
15
16
|
constructor(spec, ctx) {
|
|
16
17
|
super(spec, ctx);
|
|
18
|
+
// console.log('NEWCJ')
|
|
19
|
+
// console.trace()
|
|
17
20
|
}
|
|
18
21
|
// NOTE: mutation!
|
|
19
22
|
append(peer) {
|
|
@@ -40,15 +43,25 @@ class ConjunctVal extends ValBase_1.ValBase {
|
|
|
40
43
|
}
|
|
41
44
|
}
|
|
42
45
|
upeer = norm(upeer);
|
|
43
|
-
// console.log('CONJUNCT upeer', mark, done, upeer.map(p => p.canon))
|
|
46
|
+
// console.log('CONJUNCT upeer', this.id, mark, this.done, done, upeer.map(p => p.canon))
|
|
47
|
+
upeer.sort((a, b) => {
|
|
48
|
+
return (a.constructor.name === b.constructor.name) ? 0 :
|
|
49
|
+
(a.constructor.name < b.constructor.name ? -1 : 1);
|
|
50
|
+
});
|
|
51
|
+
// console.log('CONJUNCT upeer sort', this.id, mark, this.done, done, upeer.map(p => p.canon))
|
|
44
52
|
// Unify terms against each other
|
|
45
53
|
let outvals = [];
|
|
46
54
|
let val;
|
|
47
|
-
// let
|
|
55
|
+
// for (let pI = 0; pI < upeer.length; pI++) {
|
|
56
|
+
// let pt = upeer[pI]
|
|
57
|
+
// for (let qI = pI; qI < upeer.length; qI++) {
|
|
58
|
+
// let qt = upeer[pI]
|
|
59
|
+
// let pq = unite(ctx, pt, qt, 'cj-pq')
|
|
60
|
+
// }
|
|
61
|
+
// }
|
|
48
62
|
// console.log('CJ upeer', mark, upeer.map(v => v.canon))
|
|
49
63
|
let t0 = upeer[0];
|
|
50
64
|
next_term: for (let pI = 0; pI < upeer.length; pI++) {
|
|
51
|
-
// let t0 = upeer[pI]
|
|
52
65
|
// console.log('CJ TERM t0', pI, t0.done, t0.canon)
|
|
53
66
|
if (type_1.DONE !== t0.done) {
|
|
54
67
|
let u0 = (0, op_1.unite)(ctx, t0, val_1.TOP, 'cj-peer-t0');
|
|
@@ -56,6 +69,7 @@ class ConjunctVal extends ValBase_1.ValBase {
|
|
|
56
69
|
// Maps and Lists are still unified so that path refs will work
|
|
57
70
|
// TODO: || ListVal - test!
|
|
58
71
|
&& !(u0 instanceof MapVal_1.MapVal
|
|
72
|
+
|| u0 instanceof ListVal_1.ListVal
|
|
59
73
|
|| u0 instanceof RefVal_1.RefVal)) {
|
|
60
74
|
// console.log('CONJUNCT PUSH A', u0.id, u0.canon)
|
|
61
75
|
outvals.push(u0);
|
|
@@ -80,6 +94,12 @@ class ConjunctVal extends ValBase_1.ValBase {
|
|
|
80
94
|
t0 = t1;
|
|
81
95
|
// console.log('CJ outvals C', outvals.map(v => v.canon))
|
|
82
96
|
}
|
|
97
|
+
else if (t1 instanceof RefVal_1.RefVal && !(t0 instanceof RefVal_1.RefVal)) {
|
|
98
|
+
// console.log('CONJUNCT PUSH D', t0.canon)
|
|
99
|
+
outvals.push(t0);
|
|
100
|
+
t0 = t1;
|
|
101
|
+
// console.log('CJ outvals C', outvals.map(v => v.canon))
|
|
102
|
+
}
|
|
83
103
|
else {
|
|
84
104
|
val = (0, op_1.unite)(ctx, t0, t1, 'cj-peer-t0t1');
|
|
85
105
|
done = done && type_1.DONE === val.done;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConjunctVal.js","sourceRoot":"","sources":["../../../lib/val/ConjunctVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAQzD,kCAEgB;AAEhB,gCAEe;AAQf,iCAEiB;AAGjB,gCAA4B;
|
|
1
|
+
{"version":3,"file":"ConjunctVal.js","sourceRoot":"","sources":["../../../lib/val/ConjunctVal.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/val/ListVal.js
CHANGED
|
@@ -22,8 +22,14 @@ class ListVal extends ValBase_1.ValBase {
|
|
|
22
22
|
if (spread) {
|
|
23
23
|
if ('&' === spread.o) {
|
|
24
24
|
// TODO: handle existing spread!
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
this.spread.cj =
|
|
26
|
+
Array.isArray(spread.v) ?
|
|
27
|
+
1 < spread.v.length ?
|
|
28
|
+
new ConjunctVal_1.ConjunctVal({ peg: spread.v }, ctx) :
|
|
29
|
+
spread.v :
|
|
30
|
+
spread.v;
|
|
31
|
+
// let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
|
|
32
|
+
// this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
|
|
27
33
|
}
|
|
28
34
|
}
|
|
29
35
|
}
|
|
@@ -35,7 +41,8 @@ class ListVal extends ValBase_1.ValBase {
|
|
|
35
41
|
out.spread.cj = this.spread.cj;
|
|
36
42
|
if (peer instanceof ListVal) {
|
|
37
43
|
out.spread.cj = null == out.spread.cj ? peer.spread.cj : (null == peer.spread.cj ? out.spread.cj : (out.spread.cj =
|
|
38
|
-
new
|
|
44
|
+
// new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
45
|
+
(0, op_1.unite)(ctx, out.spread.cj, peer.spread.cj)));
|
|
39
46
|
}
|
|
40
47
|
out.done = this.done + 1;
|
|
41
48
|
// if (this.spread.cj) {
|
|
@@ -66,9 +73,10 @@ class ListVal extends ValBase_1.ValBase {
|
|
|
66
73
|
let key_ctx = ctx.descend(peerkey);
|
|
67
74
|
let key_spread_cj = spread_cj.clone(null, key_ctx);
|
|
68
75
|
// out.peg[peerkey] = unite(ctx, out.peg[peerkey], spread_cj)
|
|
69
|
-
out.peg[peerkey] =
|
|
70
|
-
new
|
|
71
|
-
|
|
76
|
+
oval = out.peg[peerkey] =
|
|
77
|
+
// new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
|
|
78
|
+
// done = false
|
|
79
|
+
(0, op_1.unite)(key_ctx, out.peg[peerkey], key_spread_cj);
|
|
72
80
|
}
|
|
73
81
|
done = (done && type_1.DONE === oval.done);
|
|
74
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ListVal.js","sourceRoot":"","sources":["../../../lib/val/ListVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AASzD,kCAEgB;AAYhB,iCAEiB;AAKjB,gCAA4B;AAC5B,oDAAgD;AAGhD,oCAAgC;AAGhC,4CAAwC;AAMxC,MAAM,OAAQ,SAAQ,iBAAO;IAO3B,YACE,IAEC,EACD,GAAa;QAEb,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAVlB,WAAM,GAAG;YACP,EAAE,EAAG,SAA6B;SACnC,CAAA;QAUC,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAC9C;QAED,IAAI,MAAM,GAAI,IAAI,CAAC,GAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9C,OAAQ,IAAI,CAAC,GAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAExC,IAAI,MAAM,EAAE;YACV,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"ListVal.js","sourceRoot":"","sources":["../../../lib/val/ListVal.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/val/MapVal.js
CHANGED
|
@@ -22,8 +22,15 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
22
22
|
// console.log('MC', this.id, peg, spread)
|
|
23
23
|
if (spread) {
|
|
24
24
|
if ('&' === spread.o) {
|
|
25
|
-
|
|
26
|
-
this.spread.cj =
|
|
25
|
+
// TODO: handle existing spread!
|
|
26
|
+
this.spread.cj =
|
|
27
|
+
Array.isArray(spread.v) ?
|
|
28
|
+
1 < spread.v.length ?
|
|
29
|
+
new ConjunctVal_1.ConjunctVal({ peg: spread.v }, ctx) :
|
|
30
|
+
spread.v[0] :
|
|
31
|
+
spread.v;
|
|
32
|
+
// let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
|
|
33
|
+
// this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
|
|
27
34
|
}
|
|
28
35
|
}
|
|
29
36
|
}
|
|
@@ -36,7 +43,8 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
36
43
|
out.spread.cj = this.spread.cj;
|
|
37
44
|
if (peer instanceof MapVal) {
|
|
38
45
|
out.spread.cj = null == out.spread.cj ? peer.spread.cj : (null == peer.spread.cj ? out.spread.cj : (out.spread.cj =
|
|
39
|
-
new
|
|
46
|
+
// new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
47
|
+
(0, op_1.unite)(ctx, out.spread.cj, peer.spread.cj)));
|
|
40
48
|
}
|
|
41
49
|
out.done = this.done + 1;
|
|
42
50
|
let spread_cj = out.spread.cj || val_1.TOP;
|
|
@@ -72,13 +80,14 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
72
80
|
if (this.spread.cj) {
|
|
73
81
|
let key_ctx = ctx.descend(peerkey);
|
|
74
82
|
let key_spread_cj = spread_cj.clone(null, key_ctx);
|
|
75
|
-
out.peg[peerkey] =
|
|
76
|
-
new
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
else {
|
|
80
|
-
done = (done && type_1.DONE === oval.done);
|
|
83
|
+
oval = out.peg[peerkey] =
|
|
84
|
+
// new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
|
|
85
|
+
// done = false
|
|
86
|
+
(0, op_1.unite)(key_ctx, out.peg[peerkey], key_spread_cj);
|
|
81
87
|
}
|
|
88
|
+
// else {
|
|
89
|
+
done = (done && type_1.DONE === oval.done);
|
|
90
|
+
// }
|
|
82
91
|
}
|
|
83
92
|
}
|
|
84
93
|
else if (val_1.TOP !== peer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapVal.js","sourceRoot":"","sources":["../../../lib/val/MapVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAUzD,kCAEgB;AAQhB,iCAEiB;AAIjB,gCAA4B;AAC5B,oDAAgD;AAGhD,oCAAgC;AAGhC,4CAAwC;AAGxC,MAAM,MAAO,SAAQ,iBAAO;IAO1B,YACE,IAEC,EACD,GAAa;QAEb,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAVlB,WAAM,GAAG;YACP,EAAE,EAAG,SAA6B;SACnC,CAAA;QAUC,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAGD,IAAI,MAAM,GAAI,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC7C,OAAQ,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEvC,0CAA0C;QAE1C,IAAI,MAAM,EAAE;YACV,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE;gBACpB,IAAI,
|
|
1
|
+
{"version":3,"file":"MapVal.js","sourceRoot":"","sources":["../../../lib/val/MapVal.ts"],"names":[],"mappings":"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"}
|
package/lib/op/unite.ts
CHANGED
|
@@ -38,6 +38,7 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
|
|
|
38
38
|
// 'W', whence,
|
|
39
39
|
// 'E', 0 < ctx?.err?.length ? ctx.err.map((e: Val) => e.canon) : '')
|
|
40
40
|
|
|
41
|
+
let unified = false
|
|
41
42
|
|
|
42
43
|
if (b && (TOP === a || !a)) {
|
|
43
44
|
//console.log('Utb', b.canon)
|
|
@@ -63,6 +64,7 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
|
|
|
63
64
|
else if (a instanceof ConjunctVal) {
|
|
64
65
|
// console.log('Q', a.canon, b.canon)
|
|
65
66
|
out = a.unify(b, ctx)
|
|
67
|
+
unified = true
|
|
66
68
|
why = 'acj'
|
|
67
69
|
}
|
|
68
70
|
else if (
|
|
@@ -75,6 +77,7 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
|
|
|
75
77
|
// console.log('U', a.canon, b.canon)
|
|
76
78
|
// return b.unify(a, ctx)
|
|
77
79
|
out = b.unify(a, ctx)
|
|
80
|
+
unified = true
|
|
78
81
|
// console.log('UO', out.canon)
|
|
79
82
|
why = 'bv'
|
|
80
83
|
}
|
|
@@ -86,7 +89,9 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
|
|
|
86
89
|
}
|
|
87
90
|
|
|
88
91
|
else {
|
|
92
|
+
// console.log('QQQ')
|
|
89
93
|
out = a.unify(b, ctx)
|
|
94
|
+
unified = true
|
|
90
95
|
why = 'ab'
|
|
91
96
|
}
|
|
92
97
|
}
|
|
@@ -96,7 +101,7 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
|
|
|
96
101
|
why += 'N'
|
|
97
102
|
}
|
|
98
103
|
|
|
99
|
-
if (DONE !== out.done) {
|
|
104
|
+
if (DONE !== out.done && !unified) {
|
|
100
105
|
out = out.unify(TOP, ctx)
|
|
101
106
|
why += 'T'
|
|
102
107
|
}
|
package/lib/val/ConjunctVal.ts
CHANGED
|
@@ -45,6 +45,8 @@ class ConjunctVal extends ValBase {
|
|
|
45
45
|
ctx?: Context
|
|
46
46
|
) {
|
|
47
47
|
super(spec, ctx)
|
|
48
|
+
// console.log('NEWCJ')
|
|
49
|
+
// console.trace()
|
|
48
50
|
}
|
|
49
51
|
|
|
50
52
|
// NOTE: mutation!
|
|
@@ -88,14 +90,32 @@ class ConjunctVal extends ValBase {
|
|
|
88
90
|
}
|
|
89
91
|
|
|
90
92
|
upeer = norm(upeer)
|
|
91
|
-
|
|
93
|
+
|
|
94
|
+
// console.log('CONJUNCT upeer', this.id, mark, this.done, done, upeer.map(p => p.canon))
|
|
95
|
+
|
|
96
|
+
upeer.sort((a: Val, b: Val) => {
|
|
97
|
+
return (a.constructor.name === b.constructor.name) ? 0 :
|
|
98
|
+
(a.constructor.name < b.constructor.name ? -1 : 1)
|
|
99
|
+
})
|
|
100
|
+
|
|
101
|
+
// console.log('CONJUNCT upeer sort', this.id, mark, this.done, done, upeer.map(p => p.canon))
|
|
92
102
|
|
|
93
103
|
// Unify terms against each other
|
|
94
104
|
|
|
95
105
|
let outvals: Val[] = []
|
|
96
106
|
let val: Val
|
|
97
107
|
|
|
98
|
-
|
|
108
|
+
|
|
109
|
+
// for (let pI = 0; pI < upeer.length; pI++) {
|
|
110
|
+
// let pt = upeer[pI]
|
|
111
|
+
// for (let qI = pI; qI < upeer.length; qI++) {
|
|
112
|
+
// let qt = upeer[pI]
|
|
113
|
+
|
|
114
|
+
// let pq = unite(ctx, pt, qt, 'cj-pq')
|
|
115
|
+
|
|
116
|
+
// }
|
|
117
|
+
// }
|
|
118
|
+
|
|
99
119
|
|
|
100
120
|
// console.log('CJ upeer', mark, upeer.map(v => v.canon))
|
|
101
121
|
|
|
@@ -103,7 +123,6 @@ class ConjunctVal extends ValBase {
|
|
|
103
123
|
|
|
104
124
|
next_term:
|
|
105
125
|
for (let pI = 0; pI < upeer.length; pI++) {
|
|
106
|
-
// let t0 = upeer[pI]
|
|
107
126
|
// console.log('CJ TERM t0', pI, t0.done, t0.canon)
|
|
108
127
|
|
|
109
128
|
if (DONE !== t0.done) {
|
|
@@ -116,6 +135,7 @@ class ConjunctVal extends ValBase {
|
|
|
116
135
|
// TODO: || ListVal - test!
|
|
117
136
|
&& !(
|
|
118
137
|
u0 instanceof MapVal
|
|
138
|
+
|| u0 instanceof ListVal
|
|
119
139
|
|| u0 instanceof RefVal
|
|
120
140
|
)
|
|
121
141
|
) {
|
|
@@ -147,6 +167,14 @@ class ConjunctVal extends ValBase {
|
|
|
147
167
|
// console.log('CJ outvals C', outvals.map(v => v.canon))
|
|
148
168
|
}
|
|
149
169
|
|
|
170
|
+
else if (t1 instanceof RefVal && !(t0 instanceof RefVal)) {
|
|
171
|
+
// console.log('CONJUNCT PUSH D', t0.canon)
|
|
172
|
+
outvals.push(t0)
|
|
173
|
+
t0 = t1
|
|
174
|
+
// console.log('CJ outvals C', outvals.map(v => v.canon))
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
|
|
150
178
|
else {
|
|
151
179
|
val = unite(ctx, t0, t1, 'cj-peer-t0t1')
|
|
152
180
|
done = done && DONE === val.done
|
package/lib/val/ListVal.ts
CHANGED
|
@@ -65,9 +65,17 @@ class ListVal extends ValBase {
|
|
|
65
65
|
|
|
66
66
|
if (spread) {
|
|
67
67
|
if ('&' === spread.o) {
|
|
68
|
+
|
|
68
69
|
// TODO: handle existing spread!
|
|
69
|
-
|
|
70
|
-
|
|
70
|
+
this.spread.cj =
|
|
71
|
+
Array.isArray(spread.v) ?
|
|
72
|
+
1 < spread.v.length ?
|
|
73
|
+
new ConjunctVal({ peg: spread.v }, ctx) :
|
|
74
|
+
spread.v :
|
|
75
|
+
spread.v
|
|
76
|
+
|
|
77
|
+
// let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
|
|
78
|
+
// this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
|
|
71
79
|
}
|
|
72
80
|
}
|
|
73
81
|
}
|
|
@@ -85,7 +93,8 @@ class ListVal extends ValBase {
|
|
|
85
93
|
out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
|
|
86
94
|
null == peer.spread.cj ? out.spread.cj : (
|
|
87
95
|
out.spread.cj =
|
|
88
|
-
new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
96
|
+
// new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
97
|
+
unite(ctx, out.spread.cj, peer.spread.cj)
|
|
89
98
|
)
|
|
90
99
|
)
|
|
91
100
|
}
|
|
@@ -130,10 +139,10 @@ class ListVal extends ValBase {
|
|
|
130
139
|
let key_spread_cj = spread_cj.clone(null, key_ctx)
|
|
131
140
|
|
|
132
141
|
// out.peg[peerkey] = unite(ctx, out.peg[peerkey], spread_cj)
|
|
133
|
-
out.peg[peerkey] =
|
|
134
|
-
new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
|
|
135
|
-
|
|
136
|
-
|
|
142
|
+
oval = out.peg[peerkey] =
|
|
143
|
+
// new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
|
|
144
|
+
// done = false
|
|
145
|
+
unite(key_ctx, out.peg[peerkey], key_spread_cj)
|
|
137
146
|
}
|
|
138
147
|
|
|
139
148
|
done = (done && DONE === oval.done)
|
package/lib/val/MapVal.ts
CHANGED
|
@@ -61,8 +61,15 @@ class MapVal extends ValBase {
|
|
|
61
61
|
|
|
62
62
|
if (spread) {
|
|
63
63
|
if ('&' === spread.o) {
|
|
64
|
-
|
|
65
|
-
this.spread.cj =
|
|
64
|
+
// TODO: handle existing spread!
|
|
65
|
+
this.spread.cj =
|
|
66
|
+
Array.isArray(spread.v) ?
|
|
67
|
+
1 < spread.v.length ?
|
|
68
|
+
new ConjunctVal({ peg: spread.v }, ctx) :
|
|
69
|
+
spread.v[0] :
|
|
70
|
+
spread.v
|
|
71
|
+
// let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
|
|
72
|
+
// this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
|
|
66
73
|
}
|
|
67
74
|
}
|
|
68
75
|
}
|
|
@@ -82,7 +89,8 @@ class MapVal extends ValBase {
|
|
|
82
89
|
out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
|
|
83
90
|
null == peer.spread.cj ? out.spread.cj : (
|
|
84
91
|
out.spread.cj =
|
|
85
|
-
new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
92
|
+
// new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
93
|
+
unite(ctx, out.spread.cj, peer.spread.cj)
|
|
86
94
|
)
|
|
87
95
|
)
|
|
88
96
|
}
|
|
@@ -134,13 +142,14 @@ class MapVal extends ValBase {
|
|
|
134
142
|
let key_ctx = ctx.descend(peerkey)
|
|
135
143
|
let key_spread_cj = spread_cj.clone(null, key_ctx)
|
|
136
144
|
|
|
137
|
-
out.peg[peerkey] =
|
|
138
|
-
new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
else {
|
|
142
|
-
done = (done && DONE === oval.done)
|
|
145
|
+
oval = out.peg[peerkey] =
|
|
146
|
+
// new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
|
|
147
|
+
// done = false
|
|
148
|
+
unite(key_ctx, out.peg[peerkey], key_spread_cj)
|
|
143
149
|
}
|
|
150
|
+
// else {
|
|
151
|
+
done = (done && DONE === oval.done)
|
|
152
|
+
// }
|
|
144
153
|
}
|
|
145
154
|
}
|
|
146
155
|
else if (TOP !== peer) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aontu",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.3",
|
|
4
4
|
"main": "dist/aontu.js",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"browser": "dist/aontu.min.js",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@types/jest": "^29.5.2",
|
|
54
54
|
"browserify": "^17.0.0",
|
|
55
|
-
"esbuild": "^0.18.
|
|
55
|
+
"esbuild": "^0.18.9",
|
|
56
56
|
"es-jest": "^2.1.0",
|
|
57
57
|
"jest": "^29.5.0",
|
|
58
58
|
"prettier": "^2.8.8",
|