aontu 0.52.1 → 0.54.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/README.md +88 -0
- package/bin/aontu-mcp.js +4 -0
- package/dist/agentsmd.d.ts +16 -0
- package/dist/agentsmd.js +107 -0
- package/dist/agentsmd.js.map +1 -0
- package/dist/aontu.d.ts +15 -3
- package/dist/aontu.js +126 -5
- package/dist/aontu.js.map +1 -1
- package/dist/cli.d.ts +45 -1
- package/dist/cli.js +2845 -69
- package/dist/cli.js.map +1 -1
- package/dist/ctx.d.ts +18 -0
- package/dist/ctx.js +44 -0
- package/dist/ctx.js.map +1 -1
- package/dist/diff.d.ts +22 -0
- package/dist/diff.js +141 -0
- package/dist/diff.js.map +1 -0
- package/dist/err.d.ts +3 -1
- package/dist/err.js +45 -8
- package/dist/err.js.map +1 -1
- package/dist/graph.d.ts +13 -0
- package/dist/graph.js +110 -0
- package/dist/graph.js.map +1 -0
- package/dist/hcanon.d.ts +3 -0
- package/dist/hcanon.js +145 -0
- package/dist/hcanon.js.map +1 -0
- package/dist/hints.js +235 -8
- package/dist/hints.js.map +1 -1
- package/dist/jsonschema.d.ts +20 -0
- package/dist/jsonschema.js +425 -0
- package/dist/jsonschema.js.map +1 -0
- package/dist/lang.js +955 -110
- package/dist/lang.js.map +1 -1
- package/dist/lsp.d.ts +9 -2
- package/dist/lsp.js +343 -48
- package/dist/lsp.js.map +1 -1
- package/dist/mcp-server.d.ts +20 -0
- package/dist/mcp-server.js +147 -0
- package/dist/mcp-server.js.map +1 -0
- package/dist/mcp.d.ts +42 -0
- package/dist/mcp.js +941 -0
- package/dist/mcp.js.map +1 -0
- package/dist/mod-tool.d.ts +58 -0
- package/dist/mod-tool.js +532 -0
- package/dist/mod-tool.js.map +1 -0
- package/dist/mod.d.ts +35 -0
- package/dist/mod.js +345 -0
- package/dist/mod.js.map +1 -0
- package/dist/patch.d.ts +49 -0
- package/dist/patch.js +506 -0
- package/dist/patch.js.map +1 -0
- package/dist/provenance.d.ts +41 -0
- package/dist/provenance.js +336 -0
- package/dist/provenance.js.map +1 -0
- package/dist/query.d.ts +27 -0
- package/dist/query.js +294 -0
- package/dist/query.js.map +1 -0
- package/dist/reach.d.ts +15 -0
- package/dist/reach.js +168 -0
- package/dist/reach.js.map +1 -0
- package/dist/relation.d.ts +23 -0
- package/dist/relation.js +230 -0
- package/dist/relation.js.map +1 -0
- package/dist/report-sarif.d.ts +14 -0
- package/dist/report-sarif.js +102 -0
- package/dist/report-sarif.js.map +1 -0
- package/dist/sig.d.ts +25 -0
- package/dist/sig.js +277 -0
- package/dist/sig.js.map +1 -0
- package/dist/sigdecl.d.ts +2 -0
- package/dist/sigdecl.js +11 -0
- package/dist/sigdecl.js.map +1 -0
- package/dist/siggate.d.ts +4 -0
- package/dist/siggate.js +90 -0
- package/dist/siggate.js.map +1 -0
- package/dist/site.d.ts +4 -0
- package/dist/site.js +31 -0
- package/dist/site.js.map +1 -1
- package/dist/std.d.ts +1 -0
- package/dist/std.js +129 -0
- package/dist/std.js.map +1 -0
- package/dist/subsume.d.ts +39 -0
- package/dist/subsume.js +573 -0
- package/dist/subsume.js.map +1 -0
- package/dist/trim.d.ts +19 -0
- package/dist/trim.js +155 -0
- package/dist/trim.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/type.d.ts +17 -1
- package/dist/type.js.map +1 -1
- package/dist/unify.d.ts +2 -1
- package/dist/unify.js +234 -38
- package/dist/unify.js.map +1 -1
- package/dist/utility.d.ts +8 -1
- package/dist/utility.js +68 -1
- package/dist/utility.js.map +1 -1
- package/dist/val/AggFuncVal.d.ts +44 -0
- package/dist/val/AggFuncVal.js +364 -0
- package/dist/val/AggFuncVal.js.map +1 -0
- package/dist/val/ArithFuncVal.d.ts +31 -0
- package/dist/val/ArithFuncVal.js +62 -0
- package/dist/val/ArithFuncVal.js.map +1 -0
- package/dist/val/BagVal.d.ts +7 -0
- package/dist/val/BagVal.js +150 -11
- package/dist/val/BagVal.js.map +1 -1
- package/dist/val/CloseFuncVal.js +9 -1
- package/dist/val/CloseFuncVal.js.map +1 -1
- package/dist/val/ConjunctVal.d.ts +1 -1
- package/dist/val/ConjunctVal.js +19 -0
- package/dist/val/ConjunctVal.js.map +1 -1
- package/dist/val/ConstraintVal.d.ts +7 -1
- package/dist/val/ConstraintVal.js +523 -45
- package/dist/val/ConstraintVal.js.map +1 -1
- package/dist/val/ContainerKindVal.d.ts +35 -0
- package/dist/val/ContainerKindVal.js +99 -0
- package/dist/val/ContainerKindVal.js.map +1 -0
- package/dist/val/CopyFuncVal.d.ts +1 -2
- package/dist/val/CopyFuncVal.js.map +1 -1
- package/dist/val/Decimal.d.ts +1 -0
- package/dist/val/Decimal.js +13 -0
- package/dist/val/Decimal.js.map +1 -1
- package/dist/val/DeprecateFuncVal.d.ts +11 -0
- package/dist/val/DeprecateFuncVal.js +47 -0
- package/dist/val/DeprecateFuncVal.js.map +1 -0
- package/dist/val/DisjunctVal.d.ts +1 -2
- package/dist/val/DisjunctVal.js +269 -53
- package/dist/val/DisjunctVal.js.map +1 -1
- package/dist/val/EachFuncVal.d.ts +15 -0
- package/dist/val/EachFuncVal.js +75 -0
- package/dist/val/EachFuncVal.js.map +1 -0
- package/dist/val/ExpectVal.js +62 -4
- package/dist/val/ExpectVal.js.map +1 -1
- package/dist/val/FeatureVal.js +1 -1
- package/dist/val/FeatureVal.js.map +1 -1
- package/dist/val/FilterFuncVal.d.ts +15 -0
- package/dist/val/FilterFuncVal.js +91 -0
- package/dist/val/FilterFuncVal.js.map +1 -0
- package/dist/val/FuncBaseVal.d.ts +7 -1
- package/dist/val/FuncBaseVal.js +183 -2
- package/dist/val/FuncBaseVal.js.map +1 -1
- package/dist/val/GraphAtomVal.d.ts +39 -0
- package/dist/val/GraphAtomVal.js +184 -0
- package/dist/val/GraphAtomVal.js.map +1 -0
- package/dist/val/HideFuncVal.js.map +1 -1
- package/dist/val/JunctionVal.js +24 -1
- package/dist/val/JunctionVal.js.map +1 -1
- package/dist/val/KeyFuncVal.d.ts +1 -1
- package/dist/val/KeyFuncVal.js +38 -30
- package/dist/val/KeyFuncVal.js.map +1 -1
- package/dist/val/ListVal.js +94 -14
- package/dist/val/ListVal.js.map +1 -1
- package/dist/val/LowerFuncVal.js.map +1 -1
- package/dist/val/MapVal.d.ts +1 -0
- package/dist/val/MapVal.js +146 -14
- package/dist/val/MapVal.js.map +1 -1
- package/dist/val/MatchFuncVal.d.ts +15 -0
- package/dist/val/MatchFuncVal.js +107 -0
- package/dist/val/MatchFuncVal.js.map +1 -0
- package/dist/val/MoveFuncVal.js.map +1 -1
- package/dist/val/NilVal.js +24 -0
- package/dist/val/NilVal.js.map +1 -1
- package/dist/val/OpBaseVal.d.ts +1 -1
- package/dist/val/OpBaseVal.js +19 -1
- package/dist/val/OpBaseVal.js.map +1 -1
- package/dist/val/OpenFuncVal.js +4 -1
- package/dist/val/OpenFuncVal.js.map +1 -1
- package/dist/val/PackFuncVal.d.ts +15 -0
- package/dist/val/PackFuncVal.js +108 -0
- package/dist/val/PackFuncVal.js.map +1 -0
- package/dist/val/PathFuncVal.d.ts +2 -2
- package/dist/val/PathFuncVal.js +75 -16
- package/dist/val/PathFuncVal.js.map +1 -1
- package/dist/val/PathVal.d.ts +25 -0
- package/dist/val/PathVal.js +150 -0
- package/dist/val/PathVal.js.map +1 -0
- package/dist/val/PlaceVal.d.ts +13 -0
- package/dist/val/PlaceVal.js +131 -0
- package/dist/val/PlaceVal.js.map +1 -0
- package/dist/val/PlusOpVal.d.ts +2 -1
- package/dist/val/PlusOpVal.js +61 -37
- package/dist/val/PlusOpVal.js.map +1 -1
- package/dist/val/PrefFuncVal.js.map +1 -1
- package/dist/val/PrefVal.d.ts +4 -2
- package/dist/val/PrefVal.js +223 -41
- package/dist/val/PrefVal.js.map +1 -1
- package/dist/val/RecurseVal.d.ts +19 -0
- package/dist/val/RecurseVal.js +217 -0
- package/dist/val/RecurseVal.js.map +1 -0
- package/dist/val/RefVal.d.ts +3 -2
- package/dist/val/RefVal.js +181 -66
- package/dist/val/RefVal.js.map +1 -1
- package/dist/val/ReferFuncVal.d.ts +59 -0
- package/dist/val/ReferFuncVal.js +604 -0
- package/dist/val/ReferFuncVal.js.map +1 -0
- package/dist/val/ScalarKindVal.d.ts +4 -3
- package/dist/val/ScalarKindVal.js +12 -12
- package/dist/val/ScalarKindVal.js.map +1 -1
- package/dist/val/SuperFuncVal.d.ts +4 -2
- package/dist/val/SuperFuncVal.js +118 -14
- package/dist/val/SuperFuncVal.js.map +1 -1
- package/dist/val/TopVal.d.ts +1 -1
- package/dist/val/TopVal.js.map +1 -1
- package/dist/val/TypeFuncVal.js.map +1 -1
- package/dist/val/UpperFuncVal.js.map +1 -1
- package/dist/val/Val.d.ts +7 -1
- package/dist/val/Val.js +170 -2
- package/dist/val/Val.js.map +1 -1
- package/dist/val/VarVal.js.map +1 -1
- package/dist/val/arith.d.ts +6 -0
- package/dist/val/arith.js +173 -0
- package/dist/val/arith.js.map +1 -0
- package/dist/vet.d.ts +45 -0
- package/dist/vet.js +802 -0
- package/dist/vet.js.map +1 -0
- package/dist/view.d.ts +85 -0
- package/dist/view.js +1948 -0
- package/dist/view.js.map +1 -0
- package/dist/walk.d.ts +2 -0
- package/dist/walk.js +91 -0
- package/dist/walk.js.map +1 -0
- package/grammar/aontu.gbnf +138 -0
- package/grammar/aontu.lark +118 -0
- package/grammar/aontu.tmLanguage.json +184 -0
- package/package.json +30 -8
- package/skill/SKILL.md +37 -0
- package/skill/error-codes.md +62 -0
- package/skill/examples.md +99 -0
- package/skill/grammar-card.md +56 -0
- package/src/agentsmd.ts +135 -0
- package/src/aontu.ts +166 -5
- package/src/cli.ts +3324 -72
- package/src/ctx.ts +93 -1
- package/src/diff.ts +198 -0
- package/src/err.ts +50 -8
- package/src/graph.ts +185 -0
- package/src/hcanon.ts +167 -0
- package/src/hints.ts +291 -8
- package/src/jsonschema.ts +552 -0
- package/src/lang.ts +1049 -110
- package/src/lsp.ts +351 -49
- package/src/mcp-server.ts +187 -0
- package/src/mcp.ts +1130 -0
- package/src/mod-tool.ts +718 -0
- package/src/mod.ts +453 -0
- package/src/patch.ts +628 -0
- package/src/provenance.ts +437 -0
- package/src/query.ts +381 -0
- package/src/reach.ts +213 -0
- package/src/relation.ts +298 -0
- package/src/report-sarif.ts +137 -0
- package/src/sig.ts +345 -0
- package/src/sigdecl.ts +11 -0
- package/src/siggate.ts +144 -0
- package/src/site.ts +36 -1
- package/src/std.ts +131 -0
- package/src/subsume.ts +739 -0
- package/src/trim.ts +195 -0
- package/src/tsconfig.json +10 -4
- package/src/type.ts +51 -2
- package/src/unify.ts +253 -38
- package/src/utility.ts +79 -1
- package/src/val/AggFuncVal.ts +546 -0
- package/src/val/ArithFuncVal.ts +108 -0
- package/src/val/BagVal.ts +158 -12
- package/src/val/CloseFuncVal.ts +9 -1
- package/src/val/ConjunctVal.ts +20 -0
- package/src/val/ConstraintVal.ts +576 -48
- package/src/val/ContainerKindVal.ts +158 -0
- package/src/val/CopyFuncVal.ts +0 -1
- package/src/val/Decimal.ts +15 -0
- package/src/val/DeprecateFuncVal.ts +84 -0
- package/src/val/DisjunctVal.ts +282 -59
- package/src/val/EachFuncVal.ts +133 -0
- package/src/val/ExpectVal.ts +65 -8
- package/src/val/FeatureVal.ts +1 -1
- package/src/val/FilterFuncVal.ts +154 -0
- package/src/val/FuncBaseVal.ts +206 -2
- package/src/val/GraphAtomVal.ts +264 -0
- package/src/val/HideFuncVal.ts +0 -2
- package/src/val/JunctionVal.ts +24 -1
- package/src/val/KeyFuncVal.ts +39 -35
- package/src/val/ListVal.ts +101 -15
- package/src/val/LowerFuncVal.ts +0 -1
- package/src/val/MapVal.ts +153 -14
- package/src/val/MatchFuncVal.ts +176 -0
- package/src/val/MoveFuncVal.ts +0 -2
- package/src/val/NilVal.ts +25 -0
- package/src/val/OpBaseVal.ts +20 -1
- package/src/val/OpenFuncVal.ts +4 -2
- package/src/val/PackFuncVal.ts +175 -0
- package/src/val/PathFuncVal.ts +107 -20
- package/src/val/PathVal.ts +221 -0
- package/src/val/PlaceVal.ts +193 -0
- package/src/val/PlusOpVal.ts +67 -39
- package/src/val/PrefFuncVal.ts +0 -1
- package/src/val/PrefVal.ts +251 -60
- package/src/val/RecurseVal.ts +285 -0
- package/src/val/RefVal.ts +183 -78
- package/src/val/ReferFuncVal.ts +732 -0
- package/src/val/ScalarKindVal.ts +12 -13
- package/src/val/SuperFuncVal.ts +137 -13
- package/src/val/TopVal.ts +1 -2
- package/src/val/TypeFuncVal.ts +0 -2
- package/src/val/UpperFuncVal.ts +0 -1
- package/src/val/Val.ts +216 -4
- package/src/val/VarVal.ts +0 -1
- package/src/val/arith.ts +319 -0
- package/src/vet.ts +1025 -0
- package/src/view.ts +2563 -0
- package/src/walk.ts +99 -0
package/dist/val/PrefVal.js
CHANGED
|
@@ -2,59 +2,130 @@
|
|
|
2
2
|
/* Copyright (c) 2021-2025 Richard Rodger, MIT License */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.PrefVal = void 0;
|
|
5
|
+
exports.prefInnerPeg = prefInnerPeg;
|
|
5
6
|
const type_1 = require("../type");
|
|
6
7
|
const unify_1 = require("../unify");
|
|
7
8
|
const err_1 = require("../err");
|
|
8
9
|
const utility_1 = require("../utility");
|
|
9
10
|
const top_1 = require("./top");
|
|
10
11
|
const FeatureVal_1 = require("./FeatureVal");
|
|
11
|
-
const
|
|
12
|
+
const FuncBaseVal_1 = require("./FuncBaseVal");
|
|
13
|
+
const SuperFuncVal_1 = require("./SuperFuncVal");
|
|
14
|
+
// The innermost preferred value under every pref layer: the value a
|
|
15
|
+
// preference of ANY rank ultimately defends, and the one generation
|
|
16
|
+
// emits for it. Shared by the disjunct admission gate (DisjunctVal),
|
|
17
|
+
// the defaulted-scrutinee rule (MatchFuncVal) and the effective-default
|
|
18
|
+
// walk (subsume.ts) so "the default's value" cannot mean three things.
|
|
19
|
+
function prefInnerPeg(v) {
|
|
20
|
+
let out = v;
|
|
21
|
+
while (true === out?.isPref) {
|
|
22
|
+
out = out.peg;
|
|
23
|
+
}
|
|
24
|
+
return out;
|
|
25
|
+
}
|
|
26
|
+
// A CONTAINER DEFAULT IS LEAFWISE (ADR-011 R3,
|
|
27
|
+
// docs/design/DEFAULTS.0.md): `*{p:1}` MEANS `{p: *1}` and `*[1]`
|
|
28
|
+
// means `[*1]`, so there is no such thing as a preference whose
|
|
29
|
+
// preferred value is a bag. Shape is not a value and takes no star --
|
|
30
|
+
// key optionality, closedness and a `&:` spread template ride through
|
|
31
|
+
// untouched; only the values a reader could override are defaulted.
|
|
32
|
+
//
|
|
33
|
+
// This is the rule `pref()` already had (its resolve walked and
|
|
34
|
+
// wrapped every scalar child) and the star prefix did not, so the two
|
|
35
|
+
// spellings of one operator disagreed: `pref({p:1}) & {q:2}` kept the
|
|
36
|
+
// `p` default and `*{p:1} & {q:2}` dropped it. Both spellings and the
|
|
37
|
+
// resolve-time case (`*$.shape`) come through here now, so they
|
|
38
|
+
// cannot drift apart again. Wrapping the non-bag arm rather than
|
|
39
|
+
// walking for scalars also closes the other half of that gap:
|
|
40
|
+
// `pref(integer)` and `pref(min(3))` used to answer the bare value,
|
|
41
|
+
// losing the preference outright.
|
|
12
42
|
class PrefVal extends FeatureVal_1.FeatureVal {
|
|
13
43
|
constructor(spec, ctx) {
|
|
14
44
|
super(spec, ctx);
|
|
15
45
|
this.isPref = true;
|
|
16
46
|
this.isGenable = true;
|
|
17
47
|
this.cjo = 30000;
|
|
48
|
+
// THE GATE AN OVERRIDING PEER MUST PASS IS `superpeg` ITSELF — the
|
|
49
|
+
// preferred value's own KIND, not its family.
|
|
50
|
+
//
|
|
51
|
+
// A preference is a DEFAULT, so a concrete peer replaces it, but only
|
|
52
|
+
// where the peer is the same kind of thing: `*lower(1.1) & a` is a
|
|
53
|
+
// conflict, not an override. The number tower made `integer` and
|
|
54
|
+
// `float` disjoint siblings under `number`, and this gate used to
|
|
55
|
+
// widen to that family — so `*2.2 & 3` worked, and so did
|
|
56
|
+
// `*8080 & 3.5`. Those are ONE rule in two directions; no kind-based
|
|
57
|
+
// gate can keep the first and refuse the second.
|
|
58
|
+
//
|
|
59
|
+
// Refusing both is the choice, because the second is the documented
|
|
60
|
+
// default idiom: `port: *8080 | integer` accepted 3.5 in both ports,
|
|
61
|
+
// silently widening every key written that way from integer to
|
|
62
|
+
// number — the finding §6 of the 2026-08-21 status report calls the
|
|
63
|
+
// most consequential, precisely because docs/skill/examples.md
|
|
64
|
+
// teaches the idiom to agents.
|
|
65
|
+
//
|
|
66
|
+
// What the tightening costs is named rather than hidden: mixing the
|
|
67
|
+
// numeric leaves around a preference is now an error instead of a
|
|
68
|
+
// silent widening. `*1.5 & integer` used to answer `integer` and
|
|
69
|
+
// DISCARD a default that could never apply; it now says so.
|
|
18
70
|
this.rank = 0;
|
|
19
71
|
// this.pref = spec.pref || spec.peg
|
|
20
72
|
// this.superpeg = makeSuper(spec.peg)
|
|
21
73
|
if (spec.peg instanceof PrefVal) {
|
|
22
74
|
this.rank = 1 + spec.peg.rank;
|
|
23
75
|
}
|
|
24
|
-
this.resuper();
|
|
76
|
+
this.resuper(ctx);
|
|
25
77
|
// console.log('PVC', this.peg.canon, this.superpeg.canon)
|
|
26
78
|
}
|
|
27
79
|
// Recompute the type yardstick and the override gate from the current
|
|
28
80
|
// peg. Called again whenever the peg resolves (e.g. a ref).
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
//
|
|
44
|
-
//
|
|
45
|
-
//
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
81
|
+
//
|
|
82
|
+
// THE GATE IS super() (ADR-011 R4, docs/design/DEFAULTS.0.md). `*x`
|
|
83
|
+
// is sugar for `*x | super(x)`, so the type an overriding peer must
|
|
84
|
+
// pass is the one the long form spells out loud -- one function, not
|
|
85
|
+
// a second implementation that agrees with it on the common case.
|
|
86
|
+
// Two special cases retired with the switch: a KIND peg gated
|
|
87
|
+
// nothing (`*integer` was overridden by `"s"`) and a CONSTRAINT peg
|
|
88
|
+
// had no gate at all, both written when a kind's superior was top.
|
|
89
|
+
// `super(integer)` is `number`, so `7` still wins and `"s"` refuses.
|
|
90
|
+
resuper(ctx) {
|
|
91
|
+
// THE RANK-UNIFORM MEET (ADR-004). The yardstick is the INNERMOST
|
|
92
|
+
// preferred value's kind, whatever the preference's rank: `**1.5`
|
|
93
|
+
// defends `float` exactly as `*1.5` does. The old rule read the
|
|
94
|
+
// immediate peg, and a rank>=2 peg is itself a PrefVal whose
|
|
95
|
+
// superior is top -- so ANY conjunct overrode a ranked default
|
|
96
|
+
// (`**1.5 & float` dropped the default and died as mapval_no_gen;
|
|
97
|
+
// `**2|integer` met by a bare `integer` lost the default the
|
|
98
|
+
// spelling exists to carry -- use-cases/BUGS.md §3), while the
|
|
99
|
+
// rank-1 spelling of the same document kept it. One rule, every
|
|
100
|
+
// rank. Pinned by test/spec/pref.tsv (pref-rank2-* rows, and the
|
|
101
|
+
// flipped pref-nested-concrete-wins).
|
|
102
|
+
// THE RANK-UNIFORM MEET (ADR-004) is unchanged: the yardstick is
|
|
103
|
+
// the INNERMOST preferred value, whatever the rank, so `**1.5`
|
|
104
|
+
// defends `float` exactly as `*1.5` does.
|
|
105
|
+
let peg = this.peg;
|
|
106
|
+
while (true === peg?.isPref) {
|
|
107
|
+
peg = peg.peg;
|
|
54
108
|
}
|
|
55
|
-
|
|
56
|
-
|
|
109
|
+
const base = (0, SuperFuncVal_1.superOf)(ctx, peg);
|
|
110
|
+
// A gate that a meet has already narrowed stays narrowed: the
|
|
111
|
+
// override space only ever shrinks.
|
|
112
|
+
this.superpeg = null == this.narrowed ? base
|
|
113
|
+
: (0, unify_1.unite)(ctx, base, this.narrowed, 'pref-narrow/' + this.id);
|
|
114
|
+
}
|
|
115
|
+
// The default, standing but NARROWED: `*integer & 7` is `*7`, which
|
|
116
|
+
// is what the long form answers (`(integer&7) | (number&7)` keeps
|
|
117
|
+
// the star on the arm that survived). The rank rides across -- a
|
|
118
|
+
// ladder rung that narrows is still that rung.
|
|
119
|
+
// The rank is REBUILT as nesting rather than stamped: canon renders
|
|
120
|
+
// one star per layer (`'*' + peg.canon`), so a rank set directly on
|
|
121
|
+
// a single layer would print `*x` for a rank-2 default and the
|
|
122
|
+
// document would no longer round-trip.
|
|
123
|
+
restand(met, ctx) {
|
|
124
|
+
let out = met;
|
|
125
|
+
for (let rI = 0; rI <= this.rank; rI++) {
|
|
126
|
+
out = new PrefVal({ peg: out }, ctx);
|
|
57
127
|
}
|
|
128
|
+
return this.place(out);
|
|
58
129
|
}
|
|
59
130
|
// PrefVal unify always returns a PrefVal
|
|
60
131
|
// PrefVals can only be removed by becoming Nil in a Disjunct
|
|
@@ -67,8 +138,25 @@ class PrefVal extends FeatureVal_1.FeatureVal {
|
|
|
67
138
|
const resolved = (0, unify_1.unite)(te ? ctx.clone({ explain: (0, utility_1.ec)(te, 'RES') }) : ctx, this.peg, (0, top_1.top)(), 'pref/resolve');
|
|
68
139
|
// console.log('PREF-RESOLVED', this.peg.canon, '->', resolved)
|
|
69
140
|
this.peg = resolved;
|
|
70
|
-
this.resuper();
|
|
141
|
+
this.resuper(ctx);
|
|
71
142
|
}
|
|
143
|
+
// A CONTAINER DEFAULT IS LEAFWISE IN EFFECT (ADR-011 R3), and it
|
|
144
|
+
// gets there through the meet above rather than through a rewrite.
|
|
145
|
+
// `*{p:1}` keeps its written shape -- canon prints `*{"p":1}` and
|
|
146
|
+
// reparses to itself, which a rewrite to `{p:*1}` would break, and
|
|
147
|
+
// an alternative still has a star for a disjunction to choose by.
|
|
148
|
+
// What makes it leafwise is that the two arms decide:
|
|
149
|
+
//
|
|
150
|
+
// `& {q:2}` the preferred value ITSELF admits the peer (maps
|
|
151
|
+
// merge), so the default stands as `*{p:1,q:2}` and
|
|
152
|
+
// `p` survives -- it used to be REPLACED outright.
|
|
153
|
+
// `& {p:2}` the preferred value refuses, so the gate answers:
|
|
154
|
+
// `super({p:1})` is `{p:integer}`, which admits it.
|
|
155
|
+
// `& "s"` both arms are empty, so the whole default is --
|
|
156
|
+
// a string used to override a map default silently.
|
|
157
|
+
//
|
|
158
|
+
// Which is every rule R3 asks for, with no bag ever standing where
|
|
159
|
+
// the author wrote a scalar and no canon that fails to round-trip.
|
|
72
160
|
if (peer instanceof PrefVal) {
|
|
73
161
|
why += 'pref-';
|
|
74
162
|
if (this.id === peer.id) {
|
|
@@ -93,22 +181,93 @@ class PrefVal extends FeatureVal_1.FeatureVal {
|
|
|
93
181
|
// this.peg.id, this.peg, this.peg.done,
|
|
94
182
|
// peer.peg.id, peer.peg, peer.peg.done,
|
|
95
183
|
// )
|
|
96
|
-
|
|
97
|
-
|
|
184
|
+
const peg = (0, FuncBaseVal_1.trialUnify)(ctx, prefInnerPeg(this).clone(ctx), prefInnerPeg(peer));
|
|
185
|
+
// TWO DEFAULTS OF EQUAL RANK THAT CANNOT AGREE (ADR-011 R2):
|
|
186
|
+
// the refusal is about the DEFAULTS, not about the values they
|
|
187
|
+
// happen to hold, and its hint names the fix -- rank one of
|
|
188
|
+
// them. Compatible pegs still fold (`*1 & *integer` is `*1`),
|
|
189
|
+
// and identical ones collapse, so only a real disagreement
|
|
190
|
+
// reaches this arm. The three spellings of it -- `*1 & *7`,
|
|
191
|
+
// `(*1|integer) & *7` and `*1|*7` -- used to answer a value
|
|
192
|
+
// conflict, the newcomer, and the newcomer again.
|
|
193
|
+
out = undefined === peg
|
|
194
|
+
? (0, err_1.makeNilErr)(ctx, 'pref_rank_clash', this, peer, 'unify')
|
|
195
|
+
: this.restand(peg, ctx);
|
|
98
196
|
// console.log('PREF-RANK-SAME-OUT', peg, peg.done, out, out.done)
|
|
99
197
|
why += 'rank-same';
|
|
100
198
|
}
|
|
101
199
|
}
|
|
102
200
|
else if (!peer.isTop) {
|
|
103
201
|
why += 'super-';
|
|
104
|
-
|
|
105
|
-
//
|
|
106
|
-
//
|
|
107
|
-
//
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
202
|
+
// THE MEET IS THE DESUGARING, DISTRIBUTED (ADR-011 R1,
|
|
203
|
+
// docs/design/DEFAULTS.0.md). `*x` stands for `*x | super(x)`,
|
|
204
|
+
// and a peer meets a disjunction arm by arm:
|
|
205
|
+
//
|
|
206
|
+
// (x & peer) | (super(x) & peer)
|
|
207
|
+
//
|
|
208
|
+
// THE FIRST ARM DECIDES. When the preferred value itself still
|
|
209
|
+
// satisfies the peer the default STANDS -- `*1 & integer`,
|
|
210
|
+
// `*8080 & min(1024)`, `**2 & neq(1)`: the peer narrowed the
|
|
211
|
+
// type without ruling the default out, which is the whole point
|
|
212
|
+
// of writing one. Only when that arm is empty does the second
|
|
213
|
+
// answer, and that is the override. When BOTH are empty nothing
|
|
214
|
+
// remains of the disjunction the star stands for -- `empty`,
|
|
215
|
+
// the same refusal the written-out long form gives.
|
|
216
|
+
//
|
|
217
|
+
// The old rule asked instead whether the peer resolved to
|
|
218
|
+
// exactly `super(x)`, so any narrowing at all counted as an
|
|
219
|
+
// override: `*1 & integer` stood (the peer WAS the gate) but
|
|
220
|
+
// `*8080 & min(1024)` silently dropped the default and answered
|
|
221
|
+
// the bare constraint, and a rank ladder lost its weaker arm to
|
|
222
|
+
// the same rule the moment anything narrowed it.
|
|
223
|
+
//
|
|
224
|
+
// Trialled against a CLONE, on the innermost value (the
|
|
225
|
+
// rank-uniform meet): the preferred value must stay pristine for
|
|
226
|
+
// the arm that stands, and a failed trial must not leave its
|
|
227
|
+
// errors on the context -- the DisjunctVal admission gate's own
|
|
228
|
+
// precedent, and its mechanism.
|
|
229
|
+
const met = (0, FuncBaseVal_1.trialUnify)(ctx, prefInnerPeg(this).clone(ctx), peer);
|
|
230
|
+
if (undefined !== met) {
|
|
231
|
+
// THE SECOND ARM IS CARRIED FORWARD, not discarded. It is the
|
|
232
|
+
// override space -- everything the peer would still admit
|
|
233
|
+
// INSTEAD of the default -- and meeting a peer narrows it just
|
|
234
|
+
// as it narrows the default: two successive meets compose to
|
|
235
|
+
// `(x & p1 & p2) | (super(x) & p1 & p2)`, which is the
|
|
236
|
+
// distribution over both. Dropping it let a constraint that
|
|
237
|
+
// arrived beside a default vanish: `r:*2` with `r:max(20)`
|
|
238
|
+
// stood as a bare `*2`, and `r:40` then overrode it through a
|
|
239
|
+
// gate that no longer remembered the bound.
|
|
240
|
+
//
|
|
241
|
+
// It cannot fail: the first arm succeeded, so `x & peer` has a
|
|
242
|
+
// value, and that value satisfies `super(x)` and `peer` both.
|
|
243
|
+
const gate = (0, unify_1.unite)(te ? ctx.clone({ explain: (0, utility_1.ec)(te, 'GATE') }) : ctx, this.superpeg.clone(ctx), peer, 'pref-gate/' + this.id);
|
|
244
|
+
// Unchanged on both counts is the SAME preference, returned as
|
|
245
|
+
// itself: minting a new one every pass would keep the fixpoint
|
|
246
|
+
// moving for ever.
|
|
247
|
+
if (met.same(prefInnerPeg(this)) && gate.same(this.superpeg)) {
|
|
248
|
+
out = this;
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
const stood = this.restand(met, ctx);
|
|
252
|
+
stood.narrowed = gate;
|
|
253
|
+
stood.superpeg = gate;
|
|
254
|
+
out = stood;
|
|
255
|
+
}
|
|
256
|
+
why += 'stands';
|
|
257
|
+
(0, utility_1.explainClose)(te, out);
|
|
258
|
+
out.dc = type_1.DONE;
|
|
259
|
+
return out;
|
|
111
260
|
}
|
|
261
|
+
// The override arm is trialled too: its failure is not the
|
|
262
|
+
// answer, it is half of the reason the answer is `empty`, and a
|
|
263
|
+
// recorded `no_scalar_unify` would be the code the reader sees
|
|
264
|
+
// however the refusal is relabelled afterwards.
|
|
265
|
+
const over = (0, FuncBaseVal_1.trialUnify)(ctx, this.superpeg.clone(ctx), peer);
|
|
266
|
+
out = undefined !== over ? over
|
|
267
|
+
// A peer that arrived already failed keeps its own refusal:
|
|
268
|
+
// that is its failure, not the default's.
|
|
269
|
+
: peer.isNil ? peer
|
|
270
|
+
: (0, err_1.makeNilErr)(ctx, 'empty', this, peer, 'unify');
|
|
112
271
|
// }
|
|
113
272
|
}
|
|
114
273
|
else {
|
|
@@ -131,7 +290,30 @@ class PrefVal extends FeatureVal_1.FeatureVal {
|
|
|
131
290
|
}
|
|
132
291
|
clone(ctx, spec) {
|
|
133
292
|
let out = super.clone(ctx, spec);
|
|
134
|
-
//
|
|
293
|
+
// THE NARROWED OVERRIDE SPACE TRAVELS WITH THE COPY (ADR-011 R1).
|
|
294
|
+
// A default a meet has pinned stays pinned through a reference:
|
|
295
|
+
// without this, `T:{e:***false & false}` copied by `f:$.T` handed
|
|
296
|
+
// back a default whose gate had widened again to `boolean`, and
|
|
297
|
+
// `f:{e:true}` overrode a value the author had pinned. The Go
|
|
298
|
+
// twin carries the same two fields explicitly (clone.go).
|
|
299
|
+
if (null != this.narrowed) {
|
|
300
|
+
out.narrowed = this.narrowed;
|
|
301
|
+
out.superpeg = this.superpeg;
|
|
302
|
+
}
|
|
303
|
+
// THE PER-DESTINATION INSTANTIATION RULE (ADR-005). The default
|
|
304
|
+
// clone shares the preferred value (`peg: this.peg` in Val.clone)
|
|
305
|
+
// — a cloned pref spread template resolves its inner value at the
|
|
306
|
+
// template's own location, pinned behaviour. But a template
|
|
307
|
+
// INSTANCE must own it: with the peg shared, a rank-2 default
|
|
308
|
+
// (`**key(1) | string`) in a pack template resolved its one
|
|
309
|
+
// shared inner key() at the first destination and every child got
|
|
310
|
+
// the first child's key (use-cases/BUGS.md §9 — rank 1 escaped
|
|
311
|
+
// only because its unify builds a fresh PrefVal per meet). The
|
|
312
|
+
// superpeg yardstick from the shared peg still holds: the clone's
|
|
313
|
+
// innermost value is the same kind.
|
|
314
|
+
if (true === spec?.dup && true === this.peg?.isVal) {
|
|
315
|
+
out.peg = this.peg.clone(ctx, { dup: true });
|
|
316
|
+
}
|
|
135
317
|
return out;
|
|
136
318
|
}
|
|
137
319
|
get canon() {
|
|
@@ -147,6 +329,6 @@ class PrefVal extends FeatureVal_1.FeatureVal {
|
|
|
147
329
|
}
|
|
148
330
|
return val.gen(ctx);
|
|
149
331
|
}
|
|
150
|
-
} /* node:coverage ignore next
|
|
332
|
+
} /* node:coverage ignore next 7 */
|
|
151
333
|
exports.PrefVal = PrefVal;
|
|
152
334
|
//# sourceMappingURL=PrefVal.js.map
|
package/dist/val/PrefVal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrefVal.js","sourceRoot":"","sources":["../../src/val/PrefVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;
|
|
1
|
+
{"version":3,"file":"PrefVal.js","sourceRoot":"","sources":["../../src/val/PrefVal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { Val, ValSpec } from '../type';
|
|
2
|
+
import { AontuContext } from '../ctx';
|
|
3
|
+
import { FeatureVal } from './FeatureVal';
|
|
4
|
+
declare class RecurseVal extends FeatureVal {
|
|
5
|
+
isRecurse: boolean;
|
|
6
|
+
isGenable: boolean;
|
|
7
|
+
cjo: number;
|
|
8
|
+
target: string[];
|
|
9
|
+
xc: number;
|
|
10
|
+
constructor(spec: ValSpec, ctx?: AontuContext);
|
|
11
|
+
clone(ctx: AontuContext, spec?: ValSpec): Val;
|
|
12
|
+
private body;
|
|
13
|
+
unify(peer: Val, ctx: AontuContext): Val;
|
|
14
|
+
get canon(): string;
|
|
15
|
+
gen(ctx: AontuContext): undefined;
|
|
16
|
+
}
|
|
17
|
+
declare function bumpRecurse(v: any, xc: number): void;
|
|
18
|
+
declare function containsRecurseOf(v: any, target: string[], depth?: number): boolean;
|
|
19
|
+
export { RecurseVal, bumpRecurse, containsRecurseOf, };
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/* Copyright (c) 2025 Richard Rodger, MIT License */
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.RecurseVal = void 0;
|
|
5
|
+
exports.bumpRecurse = bumpRecurse;
|
|
6
|
+
exports.containsRecurseOf = containsRecurseOf;
|
|
7
|
+
const type_1 = require("../type");
|
|
8
|
+
const err_1 = require("../err");
|
|
9
|
+
const FeatureVal_1 = require("./FeatureVal");
|
|
10
|
+
const ConjunctVal_1 = require("./ConjunctVal");
|
|
11
|
+
const unify_1 = require("../unify");
|
|
12
|
+
const utility_1 = require("../utility");
|
|
13
|
+
class RecurseVal extends FeatureVal_1.FeatureVal {
|
|
14
|
+
constructor(spec, ctx) {
|
|
15
|
+
super(spec, ctx);
|
|
16
|
+
this.isRecurse = true;
|
|
17
|
+
this.isGenable = true;
|
|
18
|
+
// LAST in a conjunct fold, after even the graph atoms: the residual
|
|
19
|
+
// wants to see the assembled concrete structure it expands against.
|
|
20
|
+
this.cjo = 47000;
|
|
21
|
+
this.target = spec.target ?? [];
|
|
22
|
+
this.xc = spec.xc ?? 0;
|
|
23
|
+
// A settled residual: a type() body carrying one must settle, and
|
|
24
|
+
// an unmet recursion is its own value until data arrives.
|
|
25
|
+
this.dc = type_1.DONE;
|
|
26
|
+
}
|
|
27
|
+
clone(ctx, spec) {
|
|
28
|
+
const out = super.clone(ctx, spec);
|
|
29
|
+
out.target = this.target;
|
|
30
|
+
out.xc = this.xc;
|
|
31
|
+
return out;
|
|
32
|
+
}
|
|
33
|
+
// The schema body the target names, from the ROOT: the fixpoint is
|
|
34
|
+
// over the finished definition, and the definition's own residual
|
|
35
|
+
// keeps it finite. When the root does not contain the target -- the
|
|
36
|
+
// residual was LIFTED out of its defining tree, as vet's anchored
|
|
37
|
+
// meet does -- fall back to ctx._fixroot, the settled tree the
|
|
38
|
+
// lifter kept for exactly this walk.
|
|
39
|
+
body(ctx) {
|
|
40
|
+
return walkTarget(ctx.root, this.target)
|
|
41
|
+
?? walkTarget(ctx._fixroot, this.target);
|
|
42
|
+
}
|
|
43
|
+
unify(peer, ctx) {
|
|
44
|
+
const p = peer;
|
|
45
|
+
// The self-drive: nothing to advance -- the residual waits for
|
|
46
|
+
// structure. (A null/nil peer never arrives; unite's ladder
|
|
47
|
+
// absorbs both.)
|
|
48
|
+
if (null == peer || true === p.isTop) {
|
|
49
|
+
return this;
|
|
50
|
+
}
|
|
51
|
+
// The same fixpoint twice is one fixpoint.
|
|
52
|
+
if (true === p.isRecurse) {
|
|
53
|
+
if (this.target.length === p.target.length
|
|
54
|
+
&& this.target.every((s, i) => s === p.target[i])) {
|
|
55
|
+
return this;
|
|
56
|
+
}
|
|
57
|
+
// Different targets -- mutual recursion meeting -- are BOTH
|
|
58
|
+
// held: each expands as data arrives, through the fold that
|
|
59
|
+
// keeps a conjunct's members separate.
|
|
60
|
+
const out = new ConjunctVal_1.ConjunctVal({ peg: [this, peer] }, ctx);
|
|
61
|
+
(0, utility_1.propagateMarks)(this, out);
|
|
62
|
+
out.path = this.path;
|
|
63
|
+
return out;
|
|
64
|
+
}
|
|
65
|
+
// CONCRETE STRUCTURE: expand one level against it.
|
|
66
|
+
if (true === p.isMap || true === p.isList || true === p.isScalar) {
|
|
67
|
+
if (ctx.budget.depth <= this.xc) {
|
|
68
|
+
return (0, err_1.makeNilErr)(ctx, 'recursion_budget', this, peer, 'recurse', { target: '$.' + this.target.join('.') });
|
|
69
|
+
}
|
|
70
|
+
const body = this.body(ctx);
|
|
71
|
+
if (undefined === body) {
|
|
72
|
+
// The definition has not assembled yet (an early pass): hold
|
|
73
|
+
// the peer beside the residual and try again when it has.
|
|
74
|
+
const out = new ConjunctVal_1.ConjunctVal({ peg: [this, peer] }, ctx);
|
|
75
|
+
(0, utility_1.propagateMarks)(this, out);
|
|
76
|
+
out.path = this.path;
|
|
77
|
+
return out;
|
|
78
|
+
}
|
|
79
|
+
// ADR-005's clone discipline: the expansion is a per-destination
|
|
80
|
+
// instantiation, so the definition itself is never written
|
|
81
|
+
// into. The clone's type/hide marks are CLEARED at every depth,
|
|
82
|
+
// exactly as a plain reference copy clears them (concreteFlow's
|
|
83
|
+
// rule): the schema is hidden, the instances it expands into
|
|
84
|
+
// are the output.
|
|
85
|
+
// The clone is REBASED to the DRIVE path explicitly (spec.path;
|
|
86
|
+
// the Go twin passes cp(r.path), whose stored paths its clone
|
|
87
|
+
// arms keep clean): the default rebase slices the definition's
|
|
88
|
+
// path by the destination's length, which leaks definition
|
|
89
|
+
// segments into instance paths whenever the destination is
|
|
90
|
+
// shallower -- a residual carried inside a copied definition
|
|
91
|
+
// body (`chain: $.spec.Step` inside Policy, copied to a slot
|
|
92
|
+
// shallower than the definition) reported
|
|
93
|
+
// `$.payments_policy.Policy.chain.then.approver` for the
|
|
94
|
+
// finding Go placed at `$.payments_policy.chain.then.approver`.
|
|
95
|
+
// The drive path is also right under vet's anchored meet, which
|
|
96
|
+
// drives AT the anchor's own path (see vet.ts), so anchored
|
|
97
|
+
// findings land in the schema's namespace in both ports.
|
|
98
|
+
const level = body.clone(ctx, {
|
|
99
|
+
dup: true, path: [...ctx.path],
|
|
100
|
+
});
|
|
101
|
+
(0, utility_1.walk)(level, (_key, v) => {
|
|
102
|
+
v.mark.type = false;
|
|
103
|
+
v.mark.hide = false;
|
|
104
|
+
return v;
|
|
105
|
+
});
|
|
106
|
+
bumpRecurse(level, this.xc + 1);
|
|
107
|
+
return (0, unify_1.unite)(ctx, level, peer, 'recurse-expand');
|
|
108
|
+
}
|
|
109
|
+
// Anything else -- a func still resolving, a reference, a
|
|
110
|
+
// constraint -- waits beside the residual.
|
|
111
|
+
const out = new ConjunctVal_1.ConjunctVal({ peg: [this, peer] }, ctx);
|
|
112
|
+
(0, utility_1.propagateMarks)(this, out);
|
|
113
|
+
out.path = this.path;
|
|
114
|
+
return out;
|
|
115
|
+
}
|
|
116
|
+
get canon() {
|
|
117
|
+
return '$.' + this.target.join('.');
|
|
118
|
+
}
|
|
119
|
+
gen(ctx) {
|
|
120
|
+
// An unexpanded residual in a demanded position refuses;
|
|
121
|
+
// guardedness is emergent -- under an optional key the bag's
|
|
122
|
+
// isolated context swallows this and drops the key.
|
|
123
|
+
(0, err_1.makeNilErr)(ctx, 'recursion_unexpanded', this, undefined, 'recurse', { target: '$.' + this.target.join('.') });
|
|
124
|
+
return undefined;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
exports.RecurseVal = RecurseVal;
|
|
128
|
+
// walkTarget descends a tree by the residual's absolute target path,
|
|
129
|
+
// answering the definition node or undefined.
|
|
130
|
+
function walkTarget(root, target) {
|
|
131
|
+
let node = root;
|
|
132
|
+
for (const seg of target) {
|
|
133
|
+
node = node?.peg?.[seg];
|
|
134
|
+
}
|
|
135
|
+
return null != node && true === node.isVal ? node : undefined;
|
|
136
|
+
}
|
|
137
|
+
// bumpRecurse stamps the expansion depth onto every residual inside a
|
|
138
|
+
// freshly cloned level, so descent is charged along the chain.
|
|
139
|
+
function bumpRecurse(v, xc) {
|
|
140
|
+
if (null == v || true !== v.isVal) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
if (true === v.isRecurse) {
|
|
144
|
+
v.xc = Math.max(v.xc, xc);
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
const peg = v.peg;
|
|
148
|
+
if (true === v.isMap && null != peg) {
|
|
149
|
+
for (const k of Object.keys(peg)) {
|
|
150
|
+
bumpRecurse(peg[k], xc);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
else if (true === v.isList && Array.isArray(peg)) {
|
|
154
|
+
for (const e of peg) {
|
|
155
|
+
bumpRecurse(e, xc);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
else if (true === v.isConjunct && Array.isArray(peg)) {
|
|
159
|
+
for (const e of peg) {
|
|
160
|
+
bumpRecurse(e, xc);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (null != v.spread?.cj) {
|
|
164
|
+
bumpRecurse(v.spread.cj, xc);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
// containsRecurseOf answers whether a definition holds a residual of
|
|
168
|
+
// the given target -- i.e. the definition is (transitively) the
|
|
169
|
+
// fixpoint that target names. A reference RESOLVING to such a
|
|
170
|
+
// definition must itself answer the residual: cloned instead, every
|
|
171
|
+
// reparse of a canon unrolled the schema one more level and canon
|
|
172
|
+
// never converged.
|
|
173
|
+
function containsRecurseOf(v, target, depth) {
|
|
174
|
+
const d = depth ?? 0;
|
|
175
|
+
if (null == v || true !== v.isVal || 8 < d) {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
if (true === v.isRecurse) {
|
|
179
|
+
return v.target.length === target.length
|
|
180
|
+
&& v.target.every((s, i) => s === target[i]);
|
|
181
|
+
}
|
|
182
|
+
// A RAW REFERENCE to the target IS the recursion, minted or not:
|
|
183
|
+
// the answer must not depend on whether the definition's own
|
|
184
|
+
// prefix position has been visited yet. Without this arm the
|
|
185
|
+
// answer was ORDER-DEPENDENT -- reparsing a generated canon puts
|
|
186
|
+
// the instance before the definition, its trailing `$.spec.Step`
|
|
187
|
+
// leaves resolved before `Step.then` had minted, and each resolve
|
|
188
|
+
// cloned one more unrolled level until the unify depth guard
|
|
189
|
+
// (unify_cycle) killed the document.
|
|
190
|
+
if (true === v.isRef && Array.isArray(v.peg)) {
|
|
191
|
+
if (v.peg.length === target.length
|
|
192
|
+
&& v.peg.every((s, i) => s === target[i])) {
|
|
193
|
+
return true;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
const peg = v.peg;
|
|
197
|
+
if (true === v.isMap && null != peg) {
|
|
198
|
+
for (const k of Object.keys(peg)) {
|
|
199
|
+
if (containsRecurseOf(peg[k], target, d + 1)) {
|
|
200
|
+
return true;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
else if ((true === v.isList || true === v.isConjunct || true === v.isDisjunct)
|
|
205
|
+
&& Array.isArray(peg)) {
|
|
206
|
+
for (const e of peg) {
|
|
207
|
+
if (containsRecurseOf(e, target, d + 1)) {
|
|
208
|
+
return true;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
if (null != v.spread?.cj && containsRecurseOf(v.spread.cj, target, d + 1)) {
|
|
213
|
+
return true;
|
|
214
|
+
}
|
|
215
|
+
return false;
|
|
216
|
+
} /* node:coverage ignore next 7 */
|
|
217
|
+
//# sourceMappingURL=RecurseVal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RecurseVal.js","sourceRoot":"","sources":["../../src/val/RecurseVal.ts"],"names":[],"mappings":"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"}
|