aontu 0.14.2 → 0.15.0
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/aontu.ts +1 -1
- package/dist/aontu.min.js +1 -1
- package/dist/lib/lang.js +23 -23
- package/dist/lib/lang.js.map +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 +6 -4
- package/dist/lib/val/ListVal.js.map +1 -1
- package/dist/lib/val/MapVal.js +9 -7
- package/dist/lib/val/MapVal.js.map +1 -1
- package/lib/lang.ts +23 -23
- package/lib/op/unite.ts +6 -1
- package/lib/val/ConjunctVal.ts +31 -3
- package/lib/val/ListVal.ts +6 -5
- package/lib/val/MapVal.ts +9 -7
- package/package.json +12 -12
package/dist/lib/lang.js
CHANGED
|
@@ -45,19 +45,19 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
45
45
|
// (except for functions).
|
|
46
46
|
// TODO: jsonic should be able to pass context into these
|
|
47
47
|
'string': {
|
|
48
|
-
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: String }), r.
|
|
48
|
+
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: String }), r.k.path)
|
|
49
49
|
},
|
|
50
50
|
'number': {
|
|
51
|
-
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: Number }), r.
|
|
51
|
+
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: Number }), r.k.path)
|
|
52
52
|
},
|
|
53
53
|
'integer': {
|
|
54
|
-
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: val_1.Integer }), r.
|
|
54
|
+
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: val_1.Integer }), r.k.path)
|
|
55
55
|
},
|
|
56
56
|
'boolean': {
|
|
57
|
-
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: Boolean }), r.
|
|
57
|
+
val: (r) => addpath(new val_1.ScalarTypeVal({ peg: Boolean }), r.k.path)
|
|
58
58
|
},
|
|
59
59
|
'nil': {
|
|
60
|
-
val: (r) => addpath(new Nil_1.Nil('literal'), r.
|
|
60
|
+
val: (r) => addpath(new Nil_1.Nil('literal'), r.k.path)
|
|
61
61
|
},
|
|
62
62
|
// TODO: FIX: need a TOP instance to hold path
|
|
63
63
|
'top': { val: () => val_1.TOP },
|
|
@@ -96,22 +96,22 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
98
|
let opmap = {
|
|
99
|
-
'conjunct-infix': (r, _op, terms) => addpath(new ConjunctVal_1.ConjunctVal({ peg: terms }), r.
|
|
100
|
-
'disjunct-infix': (r, _op, terms) => addpath(new DisjunctVal_1.DisjunctVal({ peg: terms }), r.
|
|
99
|
+
'conjunct-infix': (r, _op, terms) => addpath(new ConjunctVal_1.ConjunctVal({ peg: terms }), r.k.path),
|
|
100
|
+
'disjunct-infix': (r, _op, terms) => addpath(new DisjunctVal_1.DisjunctVal({ peg: terms }), r.k.path),
|
|
101
101
|
'dot-prefix': (r, _op, terms) => {
|
|
102
|
-
return addpath(new RefVal_1.RefVal({ peg: terms, prefix: true }), r.
|
|
102
|
+
return addpath(new RefVal_1.RefVal({ peg: terms, prefix: true }), r.k.path);
|
|
103
103
|
},
|
|
104
104
|
'dot-infix': (r, _op, terms) => {
|
|
105
|
-
return addpath(new RefVal_1.RefVal({ peg: terms }), r.
|
|
105
|
+
return addpath(new RefVal_1.RefVal({ peg: terms }), r.k.path);
|
|
106
106
|
},
|
|
107
|
-
'star-prefix': (r, _op, terms) => addpath(new PrefVal_1.PrefVal({ peg: terms[0] }), r.
|
|
107
|
+
'star-prefix': (r, _op, terms) => addpath(new PrefVal_1.PrefVal({ peg: terms[0] }), r.k.path),
|
|
108
108
|
'dollar-prefix': (r, _op, terms) => {
|
|
109
109
|
// $.a.b absolute path
|
|
110
110
|
if (terms[0] instanceof RefVal_1.RefVal) {
|
|
111
111
|
terms[0].absolute = true;
|
|
112
112
|
return terms[0];
|
|
113
113
|
}
|
|
114
|
-
return addpath(new VarVal_1.VarVal({ peg: terms[0] }), r.
|
|
114
|
+
return addpath(new VarVal_1.VarVal({ peg: terms[0] }), r.k.path);
|
|
115
115
|
},
|
|
116
116
|
};
|
|
117
117
|
jsonic
|
|
@@ -160,18 +160,18 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
160
160
|
let valnode = r.node;
|
|
161
161
|
let valtype = typeof valnode;
|
|
162
162
|
if ('string' === valtype) {
|
|
163
|
-
valnode = addpath(new val_1.StringVal({ peg: r.node }), r.
|
|
163
|
+
valnode = addpath(new val_1.StringVal({ peg: r.node }), r.k.path);
|
|
164
164
|
}
|
|
165
165
|
else if ('number' === valtype) {
|
|
166
166
|
if (Number.isInteger(r.node)) {
|
|
167
|
-
valnode = addpath(new val_1.IntegerVal({ peg: r.node }), r.
|
|
167
|
+
valnode = addpath(new val_1.IntegerVal({ peg: r.node }), r.k.path);
|
|
168
168
|
}
|
|
169
169
|
else {
|
|
170
|
-
valnode = addpath(new val_1.NumberVal({ peg: r.node }), r.
|
|
170
|
+
valnode = addpath(new val_1.NumberVal({ peg: r.node }), r.k.path);
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
173
|
else if ('boolean' === valtype) {
|
|
174
|
-
valnode = addpath(new val_1.BooleanVal({ peg: r.node }), r.
|
|
174
|
+
valnode = addpath(new val_1.BooleanVal({ peg: r.node }), r.k.path);
|
|
175
175
|
}
|
|
176
176
|
let st = r.o0;
|
|
177
177
|
valnode.row = st.rI;
|
|
@@ -199,10 +199,10 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
199
199
|
// TODO: needs addpath?
|
|
200
200
|
let mopv = new MapVal_1.MapVal({ peg: mop });
|
|
201
201
|
r.node =
|
|
202
|
-
addpath(new ConjunctVal_1.ConjunctVal({ peg: [mopv, ...mo.___merge] }), r.
|
|
202
|
+
addpath(new ConjunctVal_1.ConjunctVal({ peg: [mopv, ...mo.___merge] }), r.k.path);
|
|
203
203
|
}
|
|
204
204
|
else {
|
|
205
|
-
r.node = addpath(new MapVal_1.MapVal({ peg: mo }), r.
|
|
205
|
+
r.node = addpath(new MapVal_1.MapVal({ peg: mo }), r.k.path);
|
|
206
206
|
}
|
|
207
207
|
// return out
|
|
208
208
|
return undefined;
|
|
@@ -214,7 +214,7 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
214
214
|
// rs.def.bc = function(rule: Rule, ctx: Context) {
|
|
215
215
|
// let out = orig_bc ? orig_bc.call(this, rule, ctx) : undefined
|
|
216
216
|
rs.bc((r) => {
|
|
217
|
-
r.node = addpath(new ListVal_1.ListVal({ peg: r.node }), r.
|
|
217
|
+
r.node = addpath(new ListVal_1.ListVal({ peg: r.node }), r.k.path);
|
|
218
218
|
// return out
|
|
219
219
|
return undefined;
|
|
220
220
|
});
|
|
@@ -230,14 +230,14 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
230
230
|
}])
|
|
231
231
|
// NOTE: manually adjust path - @jsonic/path ignores as not pair:true
|
|
232
232
|
.ao((r) => {
|
|
233
|
-
if (0 < r.d && r.
|
|
234
|
-
r.child.
|
|
235
|
-
r.child.
|
|
233
|
+
if (0 < r.d && r.u.spread) {
|
|
234
|
+
r.child.k.path = [...r.k.path, '&'];
|
|
235
|
+
r.child.k.key = '&';
|
|
236
236
|
}
|
|
237
237
|
})
|
|
238
238
|
.bc((rule) => {
|
|
239
239
|
// TRAVERSE PARENTS TO GET PATH
|
|
240
|
-
if (rule.
|
|
240
|
+
if (rule.u.spread) {
|
|
241
241
|
rule.node[MapVal_1.MapVal.SPREAD] =
|
|
242
242
|
(rule.node[MapVal_1.MapVal.SPREAD] || { o: rule.o0.src, v: [] });
|
|
243
243
|
rule.node[MapVal_1.MapVal.SPREAD].v.push(rule.child.node);
|
|
@@ -251,7 +251,7 @@ let AontuJsonic = function aontu(jsonic) {
|
|
|
251
251
|
.open([{ s: [CJ, CL], p: 'val', u: { spread: true }, g: 'spread' }])
|
|
252
252
|
.bc((rule) => {
|
|
253
253
|
// TRAVERSE PARENTS TO GET PATH
|
|
254
|
-
if (rule.
|
|
254
|
+
if (rule.u.spread) {
|
|
255
255
|
rule.node[ListVal_1.ListVal.SPREAD] =
|
|
256
256
|
(rule.node[ListVal_1.ListVal.SPREAD] || { o: rule.o0.src, v: [] });
|
|
257
257
|
rule.node[ListVal_1.ListVal.SPREAD].v.push(rule.child.node);
|
package/dist/lib/lang.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lang.js","sourceRoot":"","sources":["../../lib/lang.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lang.js","sourceRoot":"","sources":["../../lib/lang.ts"],"names":[],"mappings":"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"}
|
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
|
@@ -41,7 +41,8 @@ class ListVal extends ValBase_1.ValBase {
|
|
|
41
41
|
out.spread.cj = this.spread.cj;
|
|
42
42
|
if (peer instanceof ListVal) {
|
|
43
43
|
out.spread.cj = null == out.spread.cj ? peer.spread.cj : (null == peer.spread.cj ? out.spread.cj : (out.spread.cj =
|
|
44
|
-
new
|
|
44
|
+
// new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
45
|
+
(0, op_1.unite)(ctx, out.spread.cj, peer.spread.cj)));
|
|
45
46
|
}
|
|
46
47
|
out.done = this.done + 1;
|
|
47
48
|
// if (this.spread.cj) {
|
|
@@ -72,9 +73,10 @@ class ListVal extends ValBase_1.ValBase {
|
|
|
72
73
|
let key_ctx = ctx.descend(peerkey);
|
|
73
74
|
let key_spread_cj = spread_cj.clone(null, key_ctx);
|
|
74
75
|
// out.peg[peerkey] = unite(ctx, out.peg[peerkey], spread_cj)
|
|
75
|
-
out.peg[peerkey] =
|
|
76
|
-
new
|
|
77
|
-
|
|
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);
|
|
78
80
|
}
|
|
79
81
|
done = (done && type_1.DONE === oval.done);
|
|
80
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;gBAEpB,gCAAgC;gBAChC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACZ,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;wBACvB,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;4BACnB,IAAI,yBAAW,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;4BACzC,MAAM,CAAC,CAAC,CAAC,CAAC;wBACZ,MAAM,CAAC,CAAC,CAAA;gBAEZ,4DAA4D;gBAC5D,sDAAsD;aACvD;SACF;IACH,CAAC;IAGD,wCAAwC;IACxC,wDAAwD;IACxD,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,IAAI,GAAY,IAAI,CAAA;QACxB,IAAI,GAAG,GAAY,SAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAEtE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;QAE9B,IAAI,IAAI,YAAY,OAAO,EAAE;YAC3B,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CACvD,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CACvC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACb,
|
|
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
|
@@ -43,7 +43,8 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
43
43
|
out.spread.cj = this.spread.cj;
|
|
44
44
|
if (peer instanceof MapVal) {
|
|
45
45
|
out.spread.cj = null == out.spread.cj ? peer.spread.cj : (null == peer.spread.cj ? out.spread.cj : (out.spread.cj =
|
|
46
|
-
new
|
|
46
|
+
// new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
|
|
47
|
+
(0, op_1.unite)(ctx, out.spread.cj, peer.spread.cj)));
|
|
47
48
|
}
|
|
48
49
|
out.done = this.done + 1;
|
|
49
50
|
let spread_cj = out.spread.cj || val_1.TOP;
|
|
@@ -79,13 +80,14 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
79
80
|
if (this.spread.cj) {
|
|
80
81
|
let key_ctx = ctx.descend(peerkey);
|
|
81
82
|
let key_spread_cj = spread_cj.clone(null, key_ctx);
|
|
82
|
-
out.peg[peerkey] =
|
|
83
|
-
new
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
else {
|
|
87
|
-
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);
|
|
88
87
|
}
|
|
88
|
+
// else {
|
|
89
|
+
done = (done && type_1.DONE === oval.done);
|
|
90
|
+
// }
|
|
89
91
|
}
|
|
90
92
|
}
|
|
91
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,gCAAgC;gBAChC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACZ,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;wBACvB,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;4BACnB,IAAI,yBAAW,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;4BACzC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACf,MAAM,CAAC,CAAC,CAAA;gBACZ,4DAA4D;gBAC5D,sDAAsD;aACvD;SACF;IACH,CAAC;IAGD,wCAAwC;IACxC,wDAAwD;IACxD,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,2BAA2B;QAE3B,IAAI,IAAI,GAAY,IAAI,CAAA;QACxB,IAAI,GAAG,GAAW,SAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAEpE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;QAE9B,IAAI,IAAI,YAAY,MAAM,EAAE;YAC1B,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CACvD,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CACvC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACb,
|
|
1
|
+
{"version":3,"file":"MapVal.js","sourceRoot":"","sources":["../../../lib/val/MapVal.ts"],"names":[],"mappings":"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"}
|
package/lib/lang.ts
CHANGED
|
@@ -103,23 +103,23 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
103
103
|
// TODO: jsonic should be able to pass context into these
|
|
104
104
|
'string': {
|
|
105
105
|
val: (r: Rule) =>
|
|
106
|
-
addpath(new ScalarTypeVal({ peg: String }), r.
|
|
106
|
+
addpath(new ScalarTypeVal({ peg: String }), r.k.path)
|
|
107
107
|
},
|
|
108
108
|
'number': {
|
|
109
109
|
val: (r: Rule) =>
|
|
110
|
-
addpath(new ScalarTypeVal({ peg: Number }), r.
|
|
110
|
+
addpath(new ScalarTypeVal({ peg: Number }), r.k.path)
|
|
111
111
|
},
|
|
112
112
|
'integer': {
|
|
113
113
|
val: (r: Rule) =>
|
|
114
|
-
addpath(new ScalarTypeVal({ peg: Integer }), r.
|
|
114
|
+
addpath(new ScalarTypeVal({ peg: Integer }), r.k.path)
|
|
115
115
|
},
|
|
116
116
|
'boolean': {
|
|
117
117
|
val: (r: Rule) =>
|
|
118
|
-
addpath(new ScalarTypeVal({ peg: Boolean }), r.
|
|
118
|
+
addpath(new ScalarTypeVal({ peg: Boolean }), r.k.path)
|
|
119
119
|
},
|
|
120
120
|
'nil': {
|
|
121
121
|
val: (r: Rule) =>
|
|
122
|
-
addpath(new Nil('literal'), r.
|
|
122
|
+
addpath(new Nil('literal'), r.k.path)
|
|
123
123
|
},
|
|
124
124
|
|
|
125
125
|
// TODO: FIX: need a TOP instance to hold path
|
|
@@ -166,20 +166,20 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
166
166
|
|
|
167
167
|
let opmap: any = {
|
|
168
168
|
'conjunct-infix': (r: Rule, _op: Op, terms: any) =>
|
|
169
|
-
addpath(new ConjunctVal({ peg: terms }), r.
|
|
169
|
+
addpath(new ConjunctVal({ peg: terms }), r.k.path),
|
|
170
170
|
'disjunct-infix': (r: Rule, _op: Op, terms: any) =>
|
|
171
|
-
addpath(new DisjunctVal({ peg: terms }), r.
|
|
171
|
+
addpath(new DisjunctVal({ peg: terms }), r.k.path),
|
|
172
172
|
|
|
173
173
|
'dot-prefix': (r: Rule, _op: Op, terms: any) => {
|
|
174
|
-
return addpath(new RefVal({ peg: terms, prefix: true }), r.
|
|
174
|
+
return addpath(new RefVal({ peg: terms, prefix: true }), r.k.path)
|
|
175
175
|
},
|
|
176
176
|
|
|
177
177
|
'dot-infix': (r: Rule, _op: Op, terms: any) => {
|
|
178
|
-
return addpath(new RefVal({ peg: terms }), r.
|
|
178
|
+
return addpath(new RefVal({ peg: terms }), r.k.path)
|
|
179
179
|
},
|
|
180
180
|
|
|
181
181
|
'star-prefix': (r: Rule, _op: Op, terms: any) =>
|
|
182
|
-
addpath(new PrefVal({ peg: terms[0] }), r.
|
|
182
|
+
addpath(new PrefVal({ peg: terms[0] }), r.k.path),
|
|
183
183
|
|
|
184
184
|
'dollar-prefix': (r: Rule, _op: Op, terms: any) => {
|
|
185
185
|
// $.a.b absolute path
|
|
@@ -187,7 +187,7 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
187
187
|
terms[0].absolute = true
|
|
188
188
|
return terms[0]
|
|
189
189
|
}
|
|
190
|
-
return addpath(new VarVal({ peg: terms[0] }), r.
|
|
190
|
+
return addpath(new VarVal({ peg: terms[0] }), r.k.path)
|
|
191
191
|
},
|
|
192
192
|
}
|
|
193
193
|
|
|
@@ -249,18 +249,18 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
249
249
|
let valtype = typeof valnode
|
|
250
250
|
|
|
251
251
|
if ('string' === valtype) {
|
|
252
|
-
valnode = addpath(new StringVal({ peg: r.node }), r.
|
|
252
|
+
valnode = addpath(new StringVal({ peg: r.node }), r.k.path)
|
|
253
253
|
}
|
|
254
254
|
else if ('number' === valtype) {
|
|
255
255
|
if (Number.isInteger(r.node)) {
|
|
256
|
-
valnode = addpath(new IntegerVal({ peg: r.node }), r.
|
|
256
|
+
valnode = addpath(new IntegerVal({ peg: r.node }), r.k.path)
|
|
257
257
|
}
|
|
258
258
|
else {
|
|
259
|
-
valnode = addpath(new NumberVal({ peg: r.node }), r.
|
|
259
|
+
valnode = addpath(new NumberVal({ peg: r.node }), r.k.path)
|
|
260
260
|
}
|
|
261
261
|
}
|
|
262
262
|
else if ('boolean' === valtype) {
|
|
263
|
-
valnode = addpath(new BooleanVal({ peg: r.node }), r.
|
|
263
|
+
valnode = addpath(new BooleanVal({ peg: r.node }), r.k.path)
|
|
264
264
|
}
|
|
265
265
|
|
|
266
266
|
let st = r.o0
|
|
@@ -301,10 +301,10 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
301
301
|
let mopv = new MapVal({ peg: mop })
|
|
302
302
|
|
|
303
303
|
r.node =
|
|
304
|
-
addpath(new ConjunctVal({ peg: [mopv, ...mo.___merge] }), r.
|
|
304
|
+
addpath(new ConjunctVal({ peg: [mopv, ...mo.___merge] }), r.k.path)
|
|
305
305
|
}
|
|
306
306
|
else {
|
|
307
|
-
r.node = addpath(new MapVal({ peg: mo }), r.
|
|
307
|
+
r.node = addpath(new MapVal({ peg: mo }), r.k.path)
|
|
308
308
|
}
|
|
309
309
|
|
|
310
310
|
// return out
|
|
@@ -321,7 +321,7 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
321
321
|
// let out = orig_bc ? orig_bc.call(this, rule, ctx) : undefined
|
|
322
322
|
|
|
323
323
|
rs.bc((r: Rule) => {
|
|
324
|
-
r.node = addpath(new ListVal({ peg: r.node }), r.
|
|
324
|
+
r.node = addpath(new ListVal({ peg: r.node }), r.k.path)
|
|
325
325
|
|
|
326
326
|
// return out
|
|
327
327
|
return undefined
|
|
@@ -342,16 +342,16 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
342
342
|
|
|
343
343
|
// NOTE: manually adjust path - @jsonic/path ignores as not pair:true
|
|
344
344
|
.ao((r) => {
|
|
345
|
-
if (0 < r.d && r.
|
|
346
|
-
r.child.
|
|
347
|
-
r.child.
|
|
345
|
+
if (0 < r.d && r.u.spread) {
|
|
346
|
+
r.child.k.path = [...r.k.path, '&']
|
|
347
|
+
r.child.k.key = '&'
|
|
348
348
|
}
|
|
349
349
|
})
|
|
350
350
|
|
|
351
351
|
.bc((rule: Rule) => {
|
|
352
352
|
// TRAVERSE PARENTS TO GET PATH
|
|
353
353
|
|
|
354
|
-
if (rule.
|
|
354
|
+
if (rule.u.spread) {
|
|
355
355
|
rule.node[MapVal.SPREAD] =
|
|
356
356
|
(rule.node[MapVal.SPREAD] || { o: rule.o0.src, v: [] })
|
|
357
357
|
|
|
@@ -372,7 +372,7 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
372
372
|
.bc((rule: Rule) => {
|
|
373
373
|
// TRAVERSE PARENTS TO GET PATH
|
|
374
374
|
|
|
375
|
-
if (rule.
|
|
375
|
+
if (rule.u.spread) {
|
|
376
376
|
rule.node[ListVal.SPREAD] =
|
|
377
377
|
(rule.node[ListVal.SPREAD] || { o: rule.o0.src, v: [] })
|
|
378
378
|
rule.node[ListVal.SPREAD].v.push(rule.child.node)
|
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
|
}
|