aontu 0.28.0 → 0.29.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 +40 -29
- package/dist/aontu.d.ts +9 -6
- package/dist/aontu.js +29 -22
- package/dist/aontu.js.map +1 -1
- package/dist/lib/err.d.ts +2 -1
- package/dist/lib/err.js +9 -39
- package/dist/lib/err.js.map +1 -1
- package/dist/lib/lang.d.ts +1 -1
- package/dist/lib/lang.js +1 -1
- package/dist/lib/lang.js.map +1 -1
- package/dist/lib/op/disjunct.js.map +1 -1
- package/dist/lib/op/op.js.map +1 -1
- package/dist/lib/type.d.ts +10 -1
- package/dist/lib/type.js.map +1 -1
- package/dist/lib/unify.d.ts +3 -0
- package/dist/lib/unify.js +0 -5
- package/dist/lib/unify.js.map +1 -1
- package/dist/lib/utility.js.map +1 -1
- package/dist/lib/val/ConjunctVal.js +0 -25
- package/dist/lib/val/ConjunctVal.js.map +1 -1
- package/dist/lib/val/DisjunctVal.js +0 -5
- package/dist/lib/val/DisjunctVal.js.map +1 -1
- package/dist/lib/val/MapVal.js +0 -27
- package/dist/lib/val/MapVal.js.map +1 -1
- package/dist/lib/val/NullVal.js +0 -1
- package/dist/lib/val/NullVal.js.map +1 -1
- package/dist/lib/val/RefVal.js +0 -9
- package/dist/lib/val/RefVal.js.map +1 -1
- package/dist/lib/val/VarVal.js.map +1 -1
- package/dist/lib/val.js.map +1 -1
- package/lib/err.ts +12 -40
- package/lib/lang.ts +2 -3
- package/lib/op/disjunct.ts +0 -1
- package/lib/op/op.ts +0 -1
- package/lib/type.ts +13 -1
- package/lib/unify.ts +3 -19
- package/lib/utility.ts +1 -0
- package/lib/val/ConjunctVal.ts +0 -35
- package/lib/val/DisjunctVal.ts +0 -10
- package/lib/val/MapVal.ts +0 -36
- package/lib/val/NullVal.ts +0 -2
- package/lib/val/RefVal.ts +0 -18
- package/lib/val/VarVal.ts +1 -0
- package/lib/val.ts +1 -0
- package/package.json +8 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConjunctVal.js","sourceRoot":"","sources":["../../../lib/val/ConjunctVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;
|
|
1
|
+
{"version":3,"file":"ConjunctVal.js","sourceRoot":"","sources":["../../../lib/val/ConjunctVal.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,15 +28,12 @@ class DisjunctVal extends ValBase_1.ValBase {
|
|
|
28
28
|
unify(peer, ctx) {
|
|
29
29
|
let done = true;
|
|
30
30
|
let oval = [];
|
|
31
|
-
// console.log('oval', this.canon, peer.canon)
|
|
32
31
|
// Conjunction (&) distributes over disjunction (|)
|
|
33
32
|
for (let vI = 0; vI < this.peg.length; vI++) {
|
|
34
33
|
//oval[vI] = this.peg[vI].unify(peer, ctx)
|
|
35
34
|
oval[vI] = (0, op_1.unite)(ctx, this.peg[vI], peer);
|
|
36
|
-
// console.log('ovalA', vI, this.peg[vI].canon, peer.canon, oval[vI].canon)
|
|
37
35
|
done = done && type_1.DONE === oval[vI].done;
|
|
38
36
|
}
|
|
39
|
-
// console.log('ovalB', oval.map(v => v.canon))
|
|
40
37
|
// Remove duplicates, and normalize
|
|
41
38
|
if (1 < oval.length) {
|
|
42
39
|
for (let vI = 0; vI < oval.length; vI++) {
|
|
@@ -44,7 +41,6 @@ class DisjunctVal extends ValBase_1.ValBase {
|
|
|
44
41
|
oval.splice(vI, 1, ...oval[vI].peg);
|
|
45
42
|
}
|
|
46
43
|
}
|
|
47
|
-
//console.log('ovalC', oval.map(v => v.canon))
|
|
48
44
|
// TODO: not an error Nil!
|
|
49
45
|
let remove = new Nil_1.Nil();
|
|
50
46
|
for (let vI = 0; vI < oval.length; vI++) {
|
|
@@ -54,7 +50,6 @@ class DisjunctVal extends ValBase_1.ValBase {
|
|
|
54
50
|
}
|
|
55
51
|
}
|
|
56
52
|
}
|
|
57
|
-
//console.log('ovalD', oval.map(v => v.canon))
|
|
58
53
|
oval = oval.filter(v => !(v instanceof Nil_1.Nil));
|
|
59
54
|
}
|
|
60
55
|
let out;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisjunctVal.js","sourceRoot":"","sources":["../../../lib/val/DisjunctVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AASzD,kCAEgB;AAYhB,iCAEiB;AAKjB,+BAA+B;AAC/B,mDAAmD;AACnD,2CAA2C;AAC3C,yCAAyC;AACzC,oCAAgC;AAChC,4CAAwC;AACxC,yCAAyC;AACzC,4CAAwC;AAKxC,uCAAuC;AACvC,MAAM,WAAY,SAAQ,iBAAO;IAI/B,6EAA6E;IAC7E,YACE,IAEC,EACD,GAAa,EACb,MAAe;QAEf,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAXlB,kBAAa,GAAG,IAAI,CAAA;QACpB,eAAU,GAAG,IAAI,CAAA;IAWjB,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,IAAS;QACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,IAAI,GAAG,IAAI,CAAA;QAEf,IAAI,IAAI,GAAU,EAAE,CAAA;QAEpB,
|
|
1
|
+
{"version":3,"file":"DisjunctVal.js","sourceRoot":"","sources":["../../../lib/val/DisjunctVal.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/val/MapVal.js
CHANGED
|
@@ -26,8 +26,6 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
26
26
|
delete this.peg[MapVal.SPREAD];
|
|
27
27
|
if (spread) {
|
|
28
28
|
if ('&' === spread.o) {
|
|
29
|
-
// console.log('MapVal.ctor', this.id, this.path.join('.'),
|
|
30
|
-
// 'SPREAD', spread.v[0] && spread.v[0].id)
|
|
31
29
|
// TODO: handle existing spread!
|
|
32
30
|
this.spread.cj =
|
|
33
31
|
Array.isArray(spread.v) ?
|
|
@@ -42,12 +40,6 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
42
40
|
// not possible in any case - consider {a,b} unify {b,a}
|
|
43
41
|
unify(peer, ctx) {
|
|
44
42
|
// let mark = Math.random()
|
|
45
|
-
// console.log(
|
|
46
|
-
// 'MapVal.unify',
|
|
47
|
-
// this.id, '=' + this.uh, this.path.join('.'),
|
|
48
|
-
// (this.spread.cj ?
|
|
49
|
-
// 'spread:' + this.spread.cj.id + ':' + this.spread.cj.path.join('.') : ''),
|
|
50
|
-
// peer.constructor.name, peer.id, peer.path.join('.'))
|
|
51
43
|
let done = true;
|
|
52
44
|
let out = val_1.TOP === peer ? this : new MapVal({ peg: {} }, ctx);
|
|
53
45
|
out.spread.cj = this.spread.cj;
|
|
@@ -62,16 +54,6 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
62
54
|
for (let key in this.peg) {
|
|
63
55
|
let keyctx = ctx.descend(key);
|
|
64
56
|
let key_spread_cj = spread_cj.clone(null, keyctx);
|
|
65
|
-
// console.log('M0', this.id, mark, Object.keys(this.peg).join('~'),
|
|
66
|
-
// 'p=', this.path.join('.'),
|
|
67
|
-
// 'k=', key, peer.top || peer.constructor.name,
|
|
68
|
-
// 'pp=', this.peg[key].path.join('.'),
|
|
69
|
-
// this.peg[key].canon,
|
|
70
|
-
// 'sp=', key_spread_cj.path.join('.'),
|
|
71
|
-
// key_spread_cj.canon)
|
|
72
|
-
// if (1000000000 === this.id) {
|
|
73
|
-
// console.dir(key_spread_cj, { depth: null })
|
|
74
|
-
// }
|
|
75
57
|
out.peg[key] = (0, op_1.unite)(keyctx, this.peg[key], key_spread_cj, 'map-own');
|
|
76
58
|
done = (done && type_1.DONE === out.peg[key].done);
|
|
77
59
|
}
|
|
@@ -87,18 +69,9 @@ class MapVal extends ValBase_1.ValBase {
|
|
|
87
69
|
(0, op_1.unite)(ctx.descend(peerkey), child, peerchild, 'map-peer');
|
|
88
70
|
if (this.spread.cj) {
|
|
89
71
|
let key_ctx = ctx.descend(peerkey);
|
|
90
|
-
// console.log('KEY_CTX', peerkey, key_ctx)
|
|
91
72
|
let key_spread_cj = spread_cj.clone(null, key_ctx);
|
|
92
|
-
// console.log('MapVal.unify.spread', this.id, '=' + this.uh, this.path.join('.'),
|
|
93
|
-
// key_spread_cj.id, key_spread_cj.path.join('.'))
|
|
94
|
-
// console.log('ORIG')
|
|
95
|
-
// console.dir(out.peg[peerkey], { depth: null })
|
|
96
|
-
// console.log('SPREAD')
|
|
97
|
-
// console.dir(this.spread.cj, { depth: null })
|
|
98
73
|
oval = out.peg[peerkey] =
|
|
99
74
|
(0, op_1.unite)(key_ctx, out.peg[peerkey], key_spread_cj);
|
|
100
|
-
// console.log('OVAL')
|
|
101
|
-
// console.dir(oval, { depth: null })
|
|
102
75
|
}
|
|
103
76
|
done = (done && type_1.DONE === oval.done);
|
|
104
77
|
}
|
|
@@ -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;AAChD,mDAAmD;AACnD,2CAA2C;AAC3C,oCAAgC;AAChC,2CAA2C;AAC3C,yCAAyC;AACzC,4CAAwC;AAGxC,MAAM,MAAO,SAAQ,iBAAO;IAS1B,YACE,IAEC,EACD,GAAa;QAEb,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAdlB,aAAQ,GAAG,IAAI,CAAA;QAIf,WAAM,GAAG;YACP,EAAE,EAAG,SAA6B;SACnC,CAAA;QAUC,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;QAC9C,CAAC;QAED,IAAI,MAAM,GAAI,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC7C,OAAQ,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEvC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC;gBACrB,
|
|
1
|
+
{"version":3,"file":"MapVal.js","sourceRoot":"","sources":["../../../lib/val/MapVal.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/val/NullVal.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NullVal.js","sourceRoot":"","sources":["../../../lib/val/NullVal.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAepD,oCAAgC;AAChC,4CAAwC;AAGxC,MAAM,OAAQ,SAAQ,iBAAO;IAG3B,YACE,IAEC,EACD,GAAa;QAEb,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QARlB,cAAS,GAAG,IAAI,CAAA;QASd,IAAI,CAAC,GAAG,GAAG,IAAI,CAAA;IACjB,CAAC;IAGD,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,GAAQ,CAAA;QAEZ,
|
|
1
|
+
{"version":3,"file":"NullVal.js","sourceRoot":"","sources":["../../../lib/val/NullVal.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAepD,oCAAgC;AAChC,4CAAwC;AAGxC,MAAM,OAAQ,SAAQ,iBAAO;IAG3B,YACE,IAEC,EACD,GAAa;QAEb,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QARlB,cAAS,GAAG,IAAI,CAAA;QASd,IAAI,CAAC,GAAG,GAAG,IAAI,CAAA;IACjB,CAAC;IAGD,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,GAAQ,CAAA;QAEZ,IAAK,IAAY,CAAC,KAAK,IAAK,IAAgB,CAAC,SAAS,EAAE,CAAC;YACvD,GAAG,GAAG,IAAI,CAAA;QACZ,CAAC;aACI,CAAC;YACJ,GAAG,GAAG,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QACzC,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,YAAY,OAAO,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAA;IAChF,CAAC;IAGD,KAAK,CAAC,IAAc,EAAE,GAAa;QACjC,IAAI,GAAG,GAAI,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAa,CAAA;QAC7C,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,KAAK;QACP,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAA;IACtB,CAAC;IAGD,GAAG,CAAC,IAAc;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAIC,0BAAO"}
|
package/dist/lib/val/RefVal.js
CHANGED
|
@@ -26,7 +26,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
append(part) {
|
|
29
|
-
// console.log('APPEND', part, this)
|
|
30
29
|
let partval;
|
|
31
30
|
if ('string' === typeof part) {
|
|
32
31
|
partval = part;
|
|
@@ -70,7 +69,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
70
69
|
// as path cannot be found
|
|
71
70
|
// let resolved: Val | undefined = null == ctx ? this : ctx.find(this)
|
|
72
71
|
let resolved = null == ctx ? this : this.find(ctx);
|
|
73
|
-
// console.log('UR', this.peg, resolved)
|
|
74
72
|
resolved = resolved || this;
|
|
75
73
|
if (null == resolved && this.canon === peer.canon) {
|
|
76
74
|
out = this;
|
|
@@ -103,7 +101,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
103
101
|
}
|
|
104
102
|
out.done = type_1.DONE === out.done ? type_1.DONE : this.done + 1;
|
|
105
103
|
}
|
|
106
|
-
// console.log('RV', why, this.id, this.canon, '&', peer.canon, '->', out.canon)
|
|
107
104
|
return out;
|
|
108
105
|
}
|
|
109
106
|
find(ctx) {
|
|
@@ -113,8 +110,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
113
110
|
let fullpath = this.path;
|
|
114
111
|
let parts = [];
|
|
115
112
|
let modes = [];
|
|
116
|
-
// console.log('REF', this.id, this.path, this.done, 'PEG', this.peg.map((p: any) => p.canon))
|
|
117
|
-
// console.dir(this.peg, { depth: null })
|
|
118
113
|
for (let pI = 0; pI < this.peg.length; pI++) {
|
|
119
114
|
let part = this.peg[pI];
|
|
120
115
|
if (part instanceof VarVal_1.VarVal) {
|
|
@@ -162,7 +157,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
162
157
|
parts.push(part);
|
|
163
158
|
}
|
|
164
159
|
}
|
|
165
|
-
// console.log('modes', modes)
|
|
166
160
|
if (this.absolute) {
|
|
167
161
|
fullpath = parts;
|
|
168
162
|
}
|
|
@@ -175,7 +169,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
175
169
|
let sep = '.';
|
|
176
170
|
fullpath = fullpath
|
|
177
171
|
.reduce(((a, p) => (p === sep ? a.length = a.length - 1 : a.push(p), a)), []);
|
|
178
|
-
// console.log('REF', this.id, this.path, this.done, 'FULLPATH', fullpath)
|
|
179
172
|
if (modes.includes('KEY')) {
|
|
180
173
|
let key = this.path[this.path.length - 2];
|
|
181
174
|
let sv = new val_1.StringVal({ peg: null == key ? '' : key }, ctx);
|
|
@@ -187,7 +180,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
187
180
|
let node = ctx.root;
|
|
188
181
|
let pI = 0;
|
|
189
182
|
for (; pI < fullpath.length; pI++) {
|
|
190
|
-
// console.log('RefVal DESCEND', pI, node)
|
|
191
183
|
let part = fullpath[pI];
|
|
192
184
|
if (node instanceof MapVal_1.MapVal) {
|
|
193
185
|
node = node.peg[part];
|
|
@@ -196,7 +188,6 @@ class RefVal extends ValBase_1.ValBase {
|
|
|
196
188
|
break;
|
|
197
189
|
}
|
|
198
190
|
}
|
|
199
|
-
// console.log('RefVal KEY', modes, pI, fullpath)
|
|
200
191
|
if (pI === fullpath.length) {
|
|
201
192
|
// if (this.attr && 'KEY' === this.attr.kind) {
|
|
202
193
|
// if (modes.includes('KEY')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefVal.js","sourceRoot":"","sources":["../../../lib/val/RefVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAoBzD,kCAEgB;AAEhB,gCAEe;AAMf,iCAEiB;AAEjB,gCAGe;AAGf,oDAAgD;AAChD,0CAAsC;AACtC,oCAAgC;AAChC,0CAAsC;AACtC,4CAAwC;AAMxC,MAAM,MAAO,SAAQ,iBAAO;IAM1B,YACE,IAIC,EACD,GAAa;QAEb,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAblB,aAAQ,GAAG,IAAI,CAAA;QAEf,aAAQ,GAAY,KAAK,CAAA;QACzB,WAAM,GAAY,KAAK,CAAA;QAWrB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;QAEb,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB;YAChE,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;QAEvC,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC,MAAM,CAAA;QAElC,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAGD,MAAM,CAAC,IAAS;QACd,
|
|
1
|
+
{"version":3,"file":"RefVal.js","sourceRoot":"","sources":["../../../lib/val/RefVal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../../lib/val/VarVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;
|
|
1
|
+
{"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../../lib/val/VarVal.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/val.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"val.js","sourceRoot":"","sources":["../../lib/val.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AA6BzD,iCAEe;AAEf,mCAEgB;AAGhB,iCAEe;
|
|
1
|
+
{"version":3,"file":"val.js","sourceRoot":"","sources":["../../lib/val.ts"],"names":[],"mappings":"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"}
|
package/lib/err.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
/* Copyright (c) 2021-
|
|
1
|
+
/* Copyright (c) 2021-2025 Richard Rodger, MIT License */
|
|
2
2
|
|
|
3
|
-
import Fs from 'node:fs'
|
|
4
3
|
|
|
5
4
|
import { util } from 'jsonic'
|
|
6
5
|
|
|
7
|
-
import { Val } from './type'
|
|
6
|
+
import { Val, ErrContext } from './type'
|
|
8
7
|
import { Nil } from './val/Nil'
|
|
9
8
|
|
|
10
9
|
|
|
@@ -12,7 +11,10 @@ const { errmsg } = util
|
|
|
12
11
|
|
|
13
12
|
|
|
14
13
|
// TODO: move to utility?
|
|
15
|
-
function descErr<NILS extends Nil | Nil[]>(
|
|
14
|
+
function descErr<NILS extends Nil | Nil[]>(
|
|
15
|
+
err: NILS | any,
|
|
16
|
+
errctx?: ErrContext,
|
|
17
|
+
): any {
|
|
16
18
|
if (err?.isNil) {
|
|
17
19
|
// console.trace()
|
|
18
20
|
|
|
@@ -20,38 +22,8 @@ function descErr<NILS extends Nil | Nil[]>(err: NILS | any, ctx?: any): any {
|
|
|
20
22
|
let v1: any = err.primary
|
|
21
23
|
let v2: any = err.secondary
|
|
22
24
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
'Cannot ' +
|
|
26
|
-
(null == v2 ? 'resolve' : 'unify') +
|
|
27
|
-
|
|
28
|
-
(0 < err.path?.length ? ' path ' + err.path.join('.') : '') +
|
|
29
|
-
' ' + (err.url ? 'in ' + err.url : '') + ':\n' +
|
|
30
|
-
|
|
31
|
-
(null == v1 ? '' :
|
|
32
|
-
'LHS: ' +
|
|
33
|
-
(0 < v1.path?.length ? v1.path.join('.') + ':' : '') +
|
|
34
|
-
`<${v1.canon}>:${v1.row}:${v1.col}` + ' ' +
|
|
35
|
-
((v1.url && v1.url !== err.url) ? ' in ' + v1.url : '') + '\n'
|
|
36
|
-
) +
|
|
37
|
-
|
|
38
|
-
(null == v2 ? '' :
|
|
39
|
-
'RHS: ' +
|
|
40
|
-
(0 < v2.path?.length ? v2.path.join('.') + ':' : '') +
|
|
41
|
-
`<${v2.canon}>:${v2.row}:${v2.col}` + ' ' +
|
|
42
|
-
((v2.url && v2.url !== err.url) ? ' in ' + v2.url : '') + '\n'
|
|
43
|
-
) +
|
|
44
|
-
''
|
|
45
|
-
*/
|
|
46
|
-
|
|
47
|
-
// console.log(v1)
|
|
48
|
-
|
|
49
|
-
// TODO: src should come from @jsonic/multisource
|
|
50
|
-
// let v1src = null == v1 || null == v1.url ? ctx?.src : Fs.readFileSync(v1.url, 'utf8')
|
|
51
|
-
// let v2src = null == v2 || null == v2.url ? ctx?.src : Fs.readFileSync(v2.url, 'utf8')
|
|
52
|
-
|
|
53
|
-
let v1src = resolveSrc(v1, ctx)
|
|
54
|
-
let v2src = resolveSrc(v2, ctx)
|
|
25
|
+
let v1src = resolveSrc(v1, errctx)
|
|
26
|
+
let v2src = resolveSrc(v2, errctx)
|
|
55
27
|
|
|
56
28
|
let valpath = (0 < err.path?.length ? err.path.join('.') : '')
|
|
57
29
|
let attempt = (null == v2 ? 'resolve' : 'unify')
|
|
@@ -94,14 +66,14 @@ function descErr<NILS extends Nil | Nil[]>(err: NILS | any, ctx?: any): any {
|
|
|
94
66
|
return err
|
|
95
67
|
}
|
|
96
68
|
else {
|
|
97
|
-
return err.map((n: any) => descErr(n,
|
|
69
|
+
return err.map((n: any) => descErr(n, errctx))
|
|
98
70
|
}
|
|
99
71
|
}
|
|
100
72
|
|
|
101
73
|
|
|
102
|
-
function resolveSrc(v: Val,
|
|
103
|
-
let src = null == v || null == v.url ?
|
|
104
|
-
|
|
74
|
+
function resolveSrc(v: Val, errctx?: ErrContext) {
|
|
75
|
+
let src = null == v || null == v.url ? errctx?.src :
|
|
76
|
+
errctx?.fs?.existsSync(v.url) ? errctx.fs.readFileSync(v.url, 'utf8') : ''
|
|
105
77
|
return src
|
|
106
78
|
}
|
|
107
79
|
|
package/lib/lang.ts
CHANGED
|
@@ -101,8 +101,6 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
|
|
|
101
101
|
v.url = ctx.meta.multisource ? ctx.meta.multisource.path : ''
|
|
102
102
|
v.path = r.k ? [...(r.k.path || [])] : []
|
|
103
103
|
|
|
104
|
-
// console.log('ADDSITE', v)
|
|
105
|
-
|
|
106
104
|
return v
|
|
107
105
|
}
|
|
108
106
|
|
|
@@ -538,9 +536,10 @@ class Lang {
|
|
|
538
536
|
}
|
|
539
537
|
|
|
540
538
|
|
|
541
|
-
parse(src: string, opts?:
|
|
539
|
+
parse(src: string, opts?: Partial<Options>): Val {
|
|
542
540
|
// JSONIC-UPDATE - check meta
|
|
543
541
|
let jm: any = {
|
|
542
|
+
fs: opts?.fs,
|
|
544
543
|
fileName: this.options.path,
|
|
545
544
|
multisource: {
|
|
546
545
|
path: this.options.path,
|
package/lib/op/disjunct.ts
CHANGED
package/lib/op/op.ts
CHANGED
package/lib/type.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/* Copyright (c) 2022-2023 Richard Rodger, MIT License */
|
|
2
2
|
|
|
3
|
+
import * as Fs from 'node:fs'
|
|
3
4
|
|
|
4
5
|
// TODO: refactor these out
|
|
5
6
|
|
|
@@ -13,6 +14,8 @@ import {
|
|
|
13
14
|
|
|
14
15
|
|
|
15
16
|
|
|
17
|
+
type FST = typeof Fs
|
|
18
|
+
|
|
16
19
|
type Options = {
|
|
17
20
|
src: string // Source text.
|
|
18
21
|
print: number // Print debug verbosity
|
|
@@ -21,11 +24,13 @@ type Options = {
|
|
|
21
24
|
path?: string // Path of entry file
|
|
22
25
|
debug?: boolean
|
|
23
26
|
trace?: boolean
|
|
27
|
+
fs?: FST
|
|
28
|
+
deps?: any
|
|
29
|
+
log?: any
|
|
24
30
|
}
|
|
25
31
|
|
|
26
32
|
|
|
27
33
|
|
|
28
|
-
|
|
29
34
|
interface Val {
|
|
30
35
|
isVal: boolean
|
|
31
36
|
|
|
@@ -68,12 +73,19 @@ type ValList = Val[]
|
|
|
68
73
|
const DONE = -1
|
|
69
74
|
|
|
70
75
|
|
|
76
|
+
type ErrContext = {
|
|
77
|
+
src?: string,
|
|
78
|
+
fs?: FST
|
|
79
|
+
}
|
|
80
|
+
|
|
71
81
|
export type {
|
|
72
82
|
Val,
|
|
73
83
|
ValSpec,
|
|
74
84
|
ValMap,
|
|
75
85
|
ValList,
|
|
76
86
|
Options,
|
|
87
|
+
ErrContext,
|
|
88
|
+
FST,
|
|
77
89
|
}
|
|
78
90
|
|
|
79
91
|
export {
|
package/lib/unify.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
import type { Val } from './type'
|
|
5
5
|
|
|
6
|
-
import { DONE, } from './type'
|
|
6
|
+
import { DONE, FST } from './type'
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
import {
|
|
@@ -19,18 +19,12 @@ import {
|
|
|
19
19
|
} from './op/op'
|
|
20
20
|
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
// import { MapVal } from '../lib/val/MapVal'
|
|
26
|
-
// import { RefVal } from '../lib/val/RefVal'
|
|
27
22
|
import { Nil } from '../lib/val/Nil'
|
|
28
23
|
|
|
29
24
|
|
|
30
25
|
type Path = string[]
|
|
31
26
|
|
|
32
27
|
|
|
33
|
-
|
|
34
28
|
class Context {
|
|
35
29
|
root: Val // Starting Val, root of paths.
|
|
36
30
|
path: Path // Path to current Val.
|
|
@@ -38,6 +32,8 @@ class Context {
|
|
|
38
32
|
vc: number // Val counter to create unique val ids.
|
|
39
33
|
cc: number = -1
|
|
40
34
|
var: Record<string, Val> = {}
|
|
35
|
+
src?: string
|
|
36
|
+
fs?: FST
|
|
41
37
|
|
|
42
38
|
constructor(cfg: {
|
|
43
39
|
root: Val,
|
|
@@ -93,15 +89,11 @@ class Unify {
|
|
|
93
89
|
lang: Lang
|
|
94
90
|
|
|
95
91
|
constructor(root: Val | string, lang?: Lang, ctx?: Context) {
|
|
96
|
-
// console.log('ROOT-A', root)
|
|
97
|
-
|
|
98
92
|
this.lang = lang || new Lang()
|
|
99
93
|
if ('string' === typeof root) {
|
|
100
94
|
root = this.lang.parse(root)
|
|
101
95
|
}
|
|
102
96
|
|
|
103
|
-
// console.log('ROOT-B', root)
|
|
104
|
-
|
|
105
97
|
this.cc = 0
|
|
106
98
|
this.root = root
|
|
107
99
|
this.res = root
|
|
@@ -116,22 +108,14 @@ class Unify {
|
|
|
116
108
|
err: this.err,
|
|
117
109
|
})
|
|
118
110
|
|
|
119
|
-
|
|
120
|
-
// TODO: derive maxdc from res deterministically
|
|
121
|
-
// perhaps parse should count intial vals, paths, etc?
|
|
122
|
-
|
|
123
|
-
|
|
124
111
|
let maxdc = 9 // 99
|
|
125
112
|
for (; this.cc < maxdc && DONE !== res.done; this.cc++) {
|
|
126
113
|
ctx.cc = this.cc
|
|
127
114
|
res = unite(ctx, res, TOP)
|
|
128
115
|
ctx = ctx.clone({ root: res })
|
|
129
|
-
|
|
130
|
-
// console.log('==============', this.cc)
|
|
131
116
|
}
|
|
132
117
|
}
|
|
133
118
|
|
|
134
|
-
|
|
135
119
|
this.res = res
|
|
136
120
|
}
|
|
137
121
|
}
|