aontu 0.61.0 → 0.63.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.
Files changed (371) hide show
  1. package/README.md +4 -4
  2. package/dist/agentsmd.d.ts +1 -0
  3. package/dist/agentsmd.js +7 -28
  4. package/dist/agentsmd.js.map +1 -1
  5. package/dist/alias.js.map +1 -1
  6. package/dist/allow.d.ts +23 -0
  7. package/dist/allow.js +138 -0
  8. package/dist/allow.js.map +1 -0
  9. package/dist/aontu.d.ts +4 -2
  10. package/dist/aontu.js +4 -80
  11. package/dist/aontu.js.map +1 -1
  12. package/dist/aontumodel.d.ts +4 -0
  13. package/dist/aontumodel.js +33 -0
  14. package/dist/aontumodel.js.map +1 -0
  15. package/dist/cli.d.ts +10 -1
  16. package/dist/cli.js +877 -479
  17. package/dist/cli.js.map +1 -1
  18. package/dist/ctx.js +0 -48
  19. package/dist/ctx.js.map +1 -1
  20. package/dist/diff.js +0 -32
  21. package/dist/diff.js.map +1 -1
  22. package/dist/err.js +0 -40
  23. package/dist/err.js.map +1 -1
  24. package/dist/escape.js +0 -45
  25. package/dist/escape.js.map +1 -1
  26. package/dist/exactjson.d.ts +0 -35
  27. package/dist/exactjson.js +0 -131
  28. package/dist/exactjson.js.map +1 -1
  29. package/dist/format.js +55 -189
  30. package/dist/format.js.map +1 -1
  31. package/dist/grammar.d.ts +9 -0
  32. package/dist/grammar.js +54 -0
  33. package/dist/grammar.js.map +1 -0
  34. package/dist/graph.js +0 -26
  35. package/dist/graph.js.map +1 -1
  36. package/dist/hcanon.js +0 -82
  37. package/dist/hcanon.js.map +1 -1
  38. package/dist/helpdoc.d.ts +16 -0
  39. package/dist/helpdoc.js +59 -0
  40. package/dist/helpdoc.js.map +1 -0
  41. package/dist/hints.d.ts +0 -6
  42. package/dist/hints.js +59 -47
  43. package/dist/hints.js.map +1 -1
  44. package/dist/jsonschema.js +0 -114
  45. package/dist/jsonschema.js.map +1 -1
  46. package/dist/keyorder.d.ts +0 -7
  47. package/dist/keyorder.js +0 -41
  48. package/dist/keyorder.js.map +1 -1
  49. package/dist/lang.js +32 -877
  50. package/dist/lang.js.map +1 -1
  51. package/dist/lower.d.ts +3 -0
  52. package/dist/lower.js +14 -61
  53. package/dist/lower.js.map +1 -1
  54. package/dist/lsp-server.js +0 -16
  55. package/dist/lsp-server.js.map +1 -1
  56. package/dist/lsp.d.ts +1 -1
  57. package/dist/lsp.js +12 -159
  58. package/dist/lsp.js.map +1 -1
  59. package/dist/mcp-server.js +0 -26
  60. package/dist/mcp-server.js.map +1 -1
  61. package/dist/mcp.js +0 -113
  62. package/dist/mcp.js.map +1 -1
  63. package/dist/mod-tool.js +0 -130
  64. package/dist/mod-tool.js.map +1 -1
  65. package/dist/mod.js +0 -162
  66. package/dist/mod.js.map +1 -1
  67. package/dist/patch.js +0 -217
  68. package/dist/patch.js.map +1 -1
  69. package/dist/provenance.js +0 -140
  70. package/dist/provenance.js.map +1 -1
  71. package/dist/query.js +0 -75
  72. package/dist/query.js.map +1 -1
  73. package/dist/reach.js +0 -43
  74. package/dist/reach.js.map +1 -1
  75. package/dist/relation.d.ts +2 -0
  76. package/dist/relation.js +3 -58
  77. package/dist/relation.js.map +1 -1
  78. package/dist/render.js +33 -143
  79. package/dist/render.js.map +1 -1
  80. package/dist/report-sarif.d.ts +0 -11
  81. package/dist/report-sarif.js +0 -28
  82. package/dist/report-sarif.js.map +1 -1
  83. package/dist/sig.js +0 -35
  84. package/dist/sig.js.map +1 -1
  85. package/dist/sigdecl.js +1 -1
  86. package/dist/sigdecl.js.map +1 -1
  87. package/dist/siggate.js +0 -4
  88. package/dist/siggate.js.map +1 -1
  89. package/dist/site.js +3 -29
  90. package/dist/site.js.map +1 -1
  91. package/dist/subsume.d.ts +0 -10
  92. package/dist/subsume.js +0 -137
  93. package/dist/subsume.js.map +1 -1
  94. package/dist/template.d.ts +2 -1
  95. package/dist/template.js +58 -138
  96. package/dist/template.js.map +1 -1
  97. package/dist/trim.js +0 -41
  98. package/dist/trim.js.map +1 -1
  99. package/dist/tsconfig.tsbuildinfo +1 -1
  100. package/dist/type.js.map +1 -1
  101. package/dist/unify.js +12 -242
  102. package/dist/unify.js.map +1 -1
  103. package/dist/utility.js +0 -22
  104. package/dist/utility.js.map +1 -1
  105. package/dist/val/AbnfFuncVal.d.ts +18 -0
  106. package/dist/val/AbnfFuncVal.js +132 -0
  107. package/dist/val/AbnfFuncVal.js.map +1 -0
  108. package/dist/val/AbsentVal.d.ts +11 -0
  109. package/dist/val/AbsentVal.js +30 -0
  110. package/dist/val/AbsentVal.js.map +1 -0
  111. package/dist/val/AggFuncVal.d.ts +10 -1
  112. package/dist/val/AggFuncVal.js +104 -116
  113. package/dist/val/AggFuncVal.js.map +1 -1
  114. package/dist/val/ArithFuncVal.js +0 -12
  115. package/dist/val/ArithFuncVal.js.map +1 -1
  116. package/dist/val/BagVal.js +1 -78
  117. package/dist/val/BagVal.js.map +1 -1
  118. package/dist/val/BigDecimalVal.js +0 -16
  119. package/dist/val/BigDecimalVal.js.map +1 -1
  120. package/dist/val/BigIntegerVal.js +0 -16
  121. package/dist/val/BigIntegerVal.js.map +1 -1
  122. package/dist/val/CloseFuncVal.js +0 -9
  123. package/dist/val/CloseFuncVal.js.map +1 -1
  124. package/dist/val/CmpFuncVal.d.ts +20 -0
  125. package/dist/val/CmpFuncVal.js +188 -0
  126. package/dist/val/CmpFuncVal.js.map +1 -0
  127. package/dist/val/ConjunctVal.js +0 -29
  128. package/dist/val/ConjunctVal.js.map +1 -1
  129. package/dist/val/ConstraintVal.js +0 -500
  130. package/dist/val/ConstraintVal.js.map +1 -1
  131. package/dist/val/ContainerKindVal.js +0 -2
  132. package/dist/val/ContainerKindVal.js.map +1 -1
  133. package/dist/val/CopyFuncVal.js +0 -3
  134. package/dist/val/CopyFuncVal.js.map +1 -1
  135. package/dist/val/Decimal.js +0 -179
  136. package/dist/val/Decimal.js.map +1 -1
  137. package/dist/val/DeprecateFuncVal.js.map +1 -1
  138. package/dist/val/DisjunctVal.js +0 -152
  139. package/dist/val/DisjunctVal.js.map +1 -1
  140. package/dist/val/EachFuncVal.d.ts +1 -2
  141. package/dist/val/EachFuncVal.js +12 -29
  142. package/dist/val/EachFuncVal.js.map +1 -1
  143. package/dist/val/EmitFuncVal.d.ts +1 -1
  144. package/dist/val/EmitFuncVal.js +6 -119
  145. package/dist/val/EmitFuncVal.js.map +1 -1
  146. package/dist/val/ExpectVal.js +0 -62
  147. package/dist/val/ExpectVal.js.map +1 -1
  148. package/dist/val/FilterFuncVal.js +0 -25
  149. package/dist/val/FilterFuncVal.js.map +1 -1
  150. package/dist/val/FuncBaseVal.d.ts +1 -0
  151. package/dist/val/FuncBaseVal.js +7 -127
  152. package/dist/val/FuncBaseVal.js.map +1 -1
  153. package/dist/val/GraphAtomVal.js +0 -15
  154. package/dist/val/GraphAtomVal.js.map +1 -1
  155. package/dist/val/HideFuncVal.js +0 -13
  156. package/dist/val/HideFuncVal.js.map +1 -1
  157. package/dist/val/IntegerVal.js +0 -61
  158. package/dist/val/IntegerVal.js.map +1 -1
  159. package/dist/val/JunctionVal.js +0 -20
  160. package/dist/val/JunctionVal.js.map +1 -1
  161. package/dist/val/KeyFuncVal.js +0 -46
  162. package/dist/val/KeyFuncVal.js.map +1 -1
  163. package/dist/val/ListVal.js +0 -57
  164. package/dist/val/ListVal.js.map +1 -1
  165. package/dist/val/LowerFuncVal.js +11 -6
  166. package/dist/val/LowerFuncVal.js.map +1 -1
  167. package/dist/val/MapVal.js +0 -151
  168. package/dist/val/MapVal.js.map +1 -1
  169. package/dist/val/MatchFuncVal.js +0 -27
  170. package/dist/val/MatchFuncVal.js.map +1 -1
  171. package/dist/val/{FormFuncVal.d.ts → MaybeFuncVal.d.ts} +5 -5
  172. package/dist/val/MaybeFuncVal.js +50 -0
  173. package/dist/val/MaybeFuncVal.js.map +1 -0
  174. package/dist/val/MoveFuncVal.js +0 -18
  175. package/dist/val/MoveFuncVal.js.map +1 -1
  176. package/dist/val/NilVal.js +2 -36
  177. package/dist/val/NilVal.js.map +1 -1
  178. package/dist/val/NomFuncVal.d.ts +12 -0
  179. package/dist/val/NomFuncVal.js +153 -0
  180. package/dist/val/NomFuncVal.js.map +1 -0
  181. package/dist/val/NumberVal.js +0 -15
  182. package/dist/val/NumberVal.js.map +1 -1
  183. package/dist/val/OpBaseVal.d.ts +1 -0
  184. package/dist/val/OpBaseVal.js +3 -15
  185. package/dist/val/OpBaseVal.js.map +1 -1
  186. package/dist/val/PackFuncVal.js +0 -34
  187. package/dist/val/PackFuncVal.js.map +1 -1
  188. package/dist/val/PathFuncVal.js +0 -6
  189. package/dist/val/PathFuncVal.js.map +1 -1
  190. package/dist/val/PathVal.js +0 -41
  191. package/dist/val/PathVal.js.map +1 -1
  192. package/dist/val/PlaceVal.js +0 -25
  193. package/dist/val/PlaceVal.js.map +1 -1
  194. package/dist/val/PlusOpVal.d.ts +1 -7
  195. package/dist/val/PlusOpVal.js +13 -74
  196. package/dist/val/PlusOpVal.js.map +1 -1
  197. package/dist/val/PrefFuncVal.js +0 -1
  198. package/dist/val/PrefFuncVal.js.map +1 -1
  199. package/dist/val/PrefVal.js +0 -167
  200. package/dist/val/PrefVal.js.map +1 -1
  201. package/dist/val/RecurseVal.js +0 -55
  202. package/dist/val/RecurseVal.js.map +1 -1
  203. package/dist/val/RefVal.js +0 -282
  204. package/dist/val/RefVal.js.map +1 -1
  205. package/dist/val/ReferFuncVal.js +0 -232
  206. package/dist/val/ReferFuncVal.js.map +1 -1
  207. package/dist/val/ScalarKindVal.js +0 -49
  208. package/dist/val/ScalarKindVal.js.map +1 -1
  209. package/dist/val/ScalarVal.js +0 -11
  210. package/dist/val/ScalarVal.js.map +1 -1
  211. package/dist/val/StrFuncVal.js +0 -18
  212. package/dist/val/StrFuncVal.js.map +1 -1
  213. package/dist/val/SuperFuncVal.js +0 -32
  214. package/dist/val/SuperFuncVal.js.map +1 -1
  215. package/dist/val/TopVal.js +0 -1
  216. package/dist/val/TopVal.js.map +1 -1
  217. package/dist/val/TranslateFuncVal.d.ts +12 -0
  218. package/dist/val/TranslateFuncVal.js +99 -0
  219. package/dist/val/TranslateFuncVal.js.map +1 -0
  220. package/dist/val/UpperFuncVal.js +11 -6
  221. package/dist/val/UpperFuncVal.js.map +1 -1
  222. package/dist/val/Val.d.ts +1 -0
  223. package/dist/val/Val.js +2 -133
  224. package/dist/val/Val.js.map +1 -1
  225. package/dist/val/VarVal.js +0 -12
  226. package/dist/val/VarVal.js.map +1 -1
  227. package/dist/val/arith.js +0 -37
  228. package/dist/val/arith.js.map +1 -1
  229. package/dist/val/caserange.d.ts +3 -0
  230. package/dist/val/caserange.js +49 -0
  231. package/dist/val/caserange.js.map +1 -0
  232. package/dist/val/members.js +0 -6
  233. package/dist/val/members.js.map +1 -1
  234. package/dist/val/numcmp.js +0 -11
  235. package/dist/val/numcmp.js.map +1 -1
  236. package/dist/val/numkind.js +0 -145
  237. package/dist/val/numkind.js.map +1 -1
  238. package/dist/val/valutil.js +0 -16
  239. package/dist/val/valutil.js.map +1 -1
  240. package/dist/vet.d.ts +12 -0
  241. package/dist/vet.js +159 -412
  242. package/dist/vet.js.map +1 -1
  243. package/dist/view.js +0 -414
  244. package/dist/view.js.map +1 -1
  245. package/dist/walk.js +0 -41
  246. package/dist/walk.js.map +1 -1
  247. package/grammar/aontu.abnf +9 -7
  248. package/grammar/aontu.gbnf +5 -5
  249. package/grammar/aontu.lark +5 -5
  250. package/grammar/aontu.tmLanguage.json +1 -1
  251. package/package.json +4 -2
  252. package/skill/SKILL.md +8 -0
  253. package/skill/init/check.sh +28 -0
  254. package/skill/init/data.aon +12 -0
  255. package/skill/init/model.aon +19 -0
  256. package/skill/tasks.md +151 -0
  257. package/src/agentsmd.ts +8 -32
  258. package/src/alias.ts +0 -39
  259. package/src/allow.ts +221 -0
  260. package/src/aontu.ts +10 -108
  261. package/src/aontumodel.ts +32 -0
  262. package/src/cli.ts +1009 -540
  263. package/src/ctx.ts +0 -103
  264. package/src/diff.ts +0 -40
  265. package/src/err.ts +0 -40
  266. package/src/escape.ts +0 -46
  267. package/src/exactjson.ts +0 -131
  268. package/src/format.ts +63 -234
  269. package/src/grammar.ts +72 -0
  270. package/src/graph.ts +0 -61
  271. package/src/hcanon.ts +0 -82
  272. package/src/helpdoc.ts +77 -0
  273. package/src/hints.ts +72 -49
  274. package/src/jsonschema.ts +0 -123
  275. package/src/keyorder.ts +0 -42
  276. package/src/lang.ts +39 -895
  277. package/src/lower.ts +15 -65
  278. package/src/lsp-server.ts +0 -16
  279. package/src/lsp.ts +12 -180
  280. package/src/mcp-server.ts +0 -31
  281. package/src/mcp.ts +0 -130
  282. package/src/mod-tool.ts +0 -158
  283. package/src/mod.ts +0 -178
  284. package/src/patch.ts +0 -232
  285. package/src/provenance.ts +0 -183
  286. package/src/query.ts +0 -84
  287. package/src/reach.ts +0 -53
  288. package/src/relation.ts +7 -71
  289. package/src/render.ts +33 -180
  290. package/src/report-sarif.ts +0 -48
  291. package/src/sig.ts +0 -35
  292. package/src/sigdecl.ts +1 -1
  293. package/src/siggate.ts +0 -30
  294. package/src/site.ts +3 -29
  295. package/src/subsume.ts +1 -161
  296. package/src/template.ts +69 -140
  297. package/src/trim.ts +0 -53
  298. package/src/type.ts +2 -45
  299. package/src/unify.ts +13 -251
  300. package/src/utility.ts +0 -31
  301. package/src/val/AbnfFuncVal.ts +181 -0
  302. package/src/val/AbsentVal.ts +54 -0
  303. package/src/val/AggFuncVal.ts +152 -188
  304. package/src/val/ArithFuncVal.ts +0 -20
  305. package/src/val/BagVal.ts +1 -78
  306. package/src/val/BigDecimalVal.ts +0 -16
  307. package/src/val/BigIntegerVal.ts +0 -16
  308. package/src/val/CloseFuncVal.ts +0 -9
  309. package/src/val/CmpFuncVal.ts +249 -0
  310. package/src/val/ConjunctVal.ts +0 -33
  311. package/src/val/ConstraintVal.ts +2 -537
  312. package/src/val/ContainerKindVal.ts +0 -18
  313. package/src/val/CopyFuncVal.ts +0 -5
  314. package/src/val/Decimal.ts +1 -185
  315. package/src/val/DeprecateFuncVal.ts +0 -10
  316. package/src/val/DisjunctVal.ts +0 -157
  317. package/src/val/EachFuncVal.ts +12 -53
  318. package/src/val/EmitFuncVal.ts +8 -208
  319. package/src/val/ExpectVal.ts +0 -62
  320. package/src/val/FilterFuncVal.ts +0 -55
  321. package/src/val/FuncBaseVal.ts +9 -130
  322. package/src/val/GraphAtomVal.ts +0 -42
  323. package/src/val/HideFuncVal.ts +0 -15
  324. package/src/val/IntegerVal.ts +0 -61
  325. package/src/val/JunctionVal.ts +0 -20
  326. package/src/val/KeyFuncVal.ts +0 -48
  327. package/src/val/ListVal.ts +0 -59
  328. package/src/val/LowerFuncVal.ts +12 -7
  329. package/src/val/MapVal.ts +0 -151
  330. package/src/val/MatchFuncVal.ts +0 -59
  331. package/src/val/MaybeFuncVal.ts +86 -0
  332. package/src/val/MoveFuncVal.ts +0 -20
  333. package/src/val/NilVal.ts +2 -36
  334. package/src/val/NomFuncVal.ts +200 -0
  335. package/src/val/NumberVal.ts +0 -16
  336. package/src/val/OpBaseVal.ts +4 -17
  337. package/src/val/PackFuncVal.ts +0 -63
  338. package/src/val/PathFuncVal.ts +0 -32
  339. package/src/val/PathVal.ts +0 -66
  340. package/src/val/PlaceVal.ts +0 -45
  341. package/src/val/PlusOpVal.ts +18 -75
  342. package/src/val/PrefFuncVal.ts +0 -1
  343. package/src/val/PrefVal.ts +0 -179
  344. package/src/val/RecurseVal.ts +0 -81
  345. package/src/val/RefVal.ts +1 -285
  346. package/src/val/ReferFuncVal.ts +0 -255
  347. package/src/val/ScalarKindVal.ts +0 -50
  348. package/src/val/ScalarVal.ts +0 -12
  349. package/src/val/StrFuncVal.ts +0 -44
  350. package/src/val/SuperFuncVal.ts +0 -42
  351. package/src/val/TopVal.ts +0 -1
  352. package/src/val/TranslateFuncVal.ts +132 -0
  353. package/src/val/UpperFuncVal.ts +12 -7
  354. package/src/val/Val.ts +3 -192
  355. package/src/val/VarVal.ts +0 -15
  356. package/src/val/arith.ts +0 -92
  357. package/src/val/caserange.ts +53 -0
  358. package/src/val/members.ts +0 -23
  359. package/src/val/numcmp.ts +1 -27
  360. package/src/val/numkind.ts +0 -149
  361. package/src/val/valutil.ts +0 -16
  362. package/src/vet.ts +209 -504
  363. package/src/view.ts +0 -507
  364. package/src/walk.ts +0 -41
  365. package/dist/std.d.ts +0 -3
  366. package/dist/std.js +0 -637
  367. package/dist/std.js.map +0 -1
  368. package/dist/val/FormFuncVal.js +0 -55
  369. package/dist/val/FormFuncVal.js.map +0 -1
  370. package/src/std.ts +0 -648
  371. package/src/val/FormFuncVal.ts +0 -119
@@ -11,9 +11,7 @@ const top_1 = require("./top");
11
11
  const NilVal_1 = require("../val/NilVal");
12
12
  const PrefVal_1 = require("../val/PrefVal");
13
13
  const JunctionVal_1 = require("../val/JunctionVal");
14
- // TODO: move main logic to op/disjunct
15
14
  class DisjunctVal extends JunctionVal_1.JunctionVal {
16
- // TODO: sites from normalization of orginal Disjuncts, as well as child pegs
17
15
  constructor(spec, ctx, _sites) {
18
16
  super(spec, ctx);
19
17
  this.isDisjunct = true;
@@ -38,61 +36,14 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
38
36
  return ranked;
39
37
  }
40
38
  }
41
- // // // console.log('DISJUNCT-unify-A', this.id, this.canon)
42
39
  let done = true;
43
40
  let oval = [];
44
- // Conjunction (&) distributes over disjunction (|).
45
- //
46
- // Each member is tried against peer in isolation: if that trial
47
- // produces any errors, the member fails and is marked with a NilVal.
48
- // Previously this used `ctx?.clone({err: []})` per member - a
49
- // per-iteration context clone (two Object.creates) just to hold a
50
- // throwaway error array. For schemas with many disjunctions
51
- // (e.g. `*true | boolean`, `method: GET | PUT | ...`) this was the
52
- // single largest source of clones in the unify hot path.
53
- //
54
- // Swap-and-restore avoids the clone: the existing ctx's err array
55
- // is saved, replaced with a fresh array for each trial, then
56
- // restored. ctx mutation is scoped to this loop and fully undone
57
- // before return.
58
41
  const savedErr = ctx.err;
59
42
  const savedTrialMode = ctx._trialMode;
60
- // THE SANDBOX MUST NOT OUTLIVE THE TRIAL AS AN OWN PROPERTY.
61
- // Contexts are made with Object.create(parent) and CACHED per
62
- // (parent, key) by AontuContext.descend, so `err` and `_trialMode`
63
- // are normally INHERITED -- and assigning them here, the restore
64
- // included, creates own properties that shadow the ancestor on
65
- // every later pass. A child that has run a trial of its own then
66
- // cannot see the trial its PARENT is running: makeNilErr allocates
67
- // a real NilVal instead of TRIAL_NIL, the refusal lands on the
68
- // meet's real error list, and the losing member is kept as though
69
- // it had survived -- with the nil inside it. A vet run then
70
- // reported the conflicts of arms that should have dropped out, and
71
- // called the document invalid where it is incomplete.
72
- //
73
- // So the restore DELETES what was inherited rather than writing it
74
- // back. Both arms of both guards are live: the root meet context
75
- // has an own `err`, a descended child does not, and `_trialMode`
76
- // is own exactly when a disjunction is tried inside another
77
- // disjunction's trial on the same context.
78
43
  const ownErr = Object.prototype.hasOwnProperty.call(ctx, 'err');
79
44
  const ownTrialMode = Object.prototype.hasOwnProperty.call(ctx, '_trialMode');
80
- // A MEMBER'S TYPE FLOW IS PART OF THAT MEMBER. `refer(t)`/`rel(t)`
81
- // assert `t` on ANOTHER node, and the assertion may only take
82
- // effect if the member that makes it survives: committing every
83
- // member's flow puts `t_A & t_B` on the target, which no reading
84
- // of `A | B` licenses and which leaves the target MORE constrained
85
- // than either alternative. The flow record is therefore staged per
86
- // trial, like `ctx.err`, and only the survivors' records are
87
- // merged into the real one below.
88
45
  const savedFlows = ctx.referflows;
89
46
  const staged = [];
90
- // C1-inner: tell `makeNilErr` to return TRIAL_NIL in this scope
91
- // instead of allocating per-failure NilVals. Save/restore so
92
- // nested DisjunctVal trials (and the outer non-trial code) are
93
- // not affected. The restore lives in `finally`: if a trial throws,
94
- // leaving ctx._trialMode=true would collapse every subsequent real
95
- // error in this ctx to the shared TRIAL_NIL sentinel.
96
47
  ctx._trialMode = true;
97
48
  let gate = undefined;
98
49
  try {
@@ -106,10 +57,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
106
57
  }
107
58
  oval[vI] = (0, unify_1.unite)(te ? ctx.clone({ explain: (0, utility_1.ec)(te, 'DIST:' + vI) }) : ctx, v, peer, 'dj-peer');
108
59
  if (0 < trialErr.length) {
109
- // C1: failed-trial marker is never user-visible — it just
110
- // signals "this disjunct member doesn't match" and is
111
- // filtered out before the result is built. Use the shared
112
- // sentinel instead of allocating a fresh NilVal per trial.
113
60
  oval[vI] = NilVal_1.TRIAL_NIL;
114
61
  }
115
62
  else if (v instanceof PrefVal_1.PrefVal &&
@@ -123,23 +70,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
123
70
  }
124
71
  done = done && type_1.DONE === oval[vI].dc;
125
72
  }
126
- // THE ADMISSION GATE (ADR-004). A peer that meets a preference
127
- // INSIDE a disjunction must be admitted by the disjunction: by
128
- // some sibling alternative (whose own trial above already
129
- // answers that), or by the preferred value itself (the pref
130
- // branch's own admitted set). The pref's kind gate alone used to
131
- // decide, so a same-kind concrete peer replaced the default with
132
- // the alternatives never consulted -- `k:*'auto'|'literal'|'data'`
133
- // plus `k:'autoo'` answered "autoo", and `*8080|(integer&neq(80))`
134
- // admitted 80 (use-cases/BUGS.md §1-2). An inadmissible override
135
- // now fails the pref member's trial, and when every member is
136
- // gone the meet is the existing `empty` refusal.
137
- //
138
- // SCALAR preferred values only, exactly the kind gate's own
139
- // boundary (test/spec/pref.tsv, "THE GATE IS A SCALAR GATE"): a
140
- // structural or kind-peg default stays ungated. A deliberately
141
- // open default remains spellable as `*x|top` -- the top branch
142
- // admits every override (the apidef machine-emitted idiom).
143
73
  if (undefined !== gate) {
144
74
  for (const gI of gate) {
145
75
  let admitted = false;
@@ -181,20 +111,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
181
111
  ctx.referflows = savedFlows;
182
112
  }
183
113
  // // // console.log('DISJUNCT-unify-B', this.id, oval.map(v => v.canon))
184
- // A PREFERENCE CONJOINED WITH A DISJUNCTION IS A PREFERENCE ON THE
185
- // ALTERNATIVE IT NAMES: `(A|B) & *A` is `*A|B`, the same value the
186
- // direct spelling `*A|B` denotes. Distribution carries the peer to
187
- // each member, and a scalar preference meeting a concrete same-kind
188
- // member is replaced BY that member (the kind gate) -- so the
189
- // preference simply vanished, and `specversion: ("1.0"|"1.1") &
190
- // *"1.0"`, the enum-with-default written the other way round, held
191
- // no default at all. The old generation fold hid it by folding the
192
- // members together; ADR-007 does not, and a disjunction that has
193
- // lost its default is not the value the author wrote.
194
- //
195
- // A preference naming no alternative is dropped, as it is today: it
196
- // has nothing to prefer, and the default-validity lint is what
197
- // reports that shape.
198
114
  if (true === peer.isPref) {
199
115
  const want = (0, PrefVal_1.prefInnerPeg)(peer);
200
116
  for (let vI = 0; vI < oval.length; vI++) {
@@ -224,17 +140,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
224
140
  oval[kI] = NilVal_1.TRIAL_NIL;
225
141
  continue;
226
142
  }
227
- // TWO PREFERENCES OVER ONE VALUE ARE ONE PREFERENCE, and
228
- // the lower rank is the one that generates: `*1 | **1` is
229
- // `*1`. Ranking folds EQUAL ranks (R2); this folds the rest,
230
- // which R5 stopped discarding.
231
- //
232
- // A PLAIN arm holding that same value is NOT a duplicate of
233
- // it and must not be folded away: it is the sibling that
234
- // ADMITS an override under ADR-004's gate, which is the
235
- // whole point of writing `*x | x`. Folding it turned that
236
- // idiom's own default into a `pref_not_instance` finding,
237
- // and `*top | top` is pinned as its control.
238
143
  const a = oval[vI];
239
144
  const b = oval[kI];
240
145
  if (true === a.isPref && true === b.isPref
@@ -251,10 +156,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
251
156
  }
252
157
  // // // console.log('DISJUNCT-unify-D', this.id, oval.map(v => v.canon))
253
158
  }
254
- // THE SURVIVORS' FLOWS, AND ONLY THEIRS. Members knocked out by
255
- // the trial, by the admission gate or by the dedup above are all
256
- // nil here, so this runs after every one of those and before the
257
- // filter that drops them.
258
159
  if (undefined !== savedFlows) {
259
160
  for (let vI = 0; vI < staged.length; vI++) {
260
161
  const st = staged[vI];
@@ -282,13 +183,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
282
183
  }
283
184
  else {
284
185
  out = new DisjunctVal({ peg: oval }, ctx);
285
- // A NARROWED DISJUNCTION IS STILL THAT DISJUNCTION. The meet mints
286
- // a fresh value, which used to arrive unsited and file-less -- so
287
- // every finding naming a disjunction that had met anything
288
- // pointed at row -1 with no file, and an agent handed the report
289
- // had nowhere to go (the review's finding F). `place` copies the
290
- // whole site, position and url together, which is what tells the
291
- // report which document it came from.
292
186
  this.place(out);
293
187
  }
294
188
  out.dc = done ? type_1.DONE : this.dc + 1;
@@ -297,24 +191,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
297
191
  (0, utility_1.explainClose)(te, out);
298
192
  return out;
299
193
  }
300
- // RANK ORDERS THE SURVIVORS, IT DOES NOT DISCARD AT PARSE (ADR-011
301
- // R5, docs/design/DEFAULTS.0.md). Every rank is KEPT here, and
302
- // generation takes the lowest-rank preference still standing -- so
303
- // eliminating the lower arm PROMOTES the next instead of taking the
304
- // whole ladder with it. This ran once, before the member trials,
305
- // and discarded every arm but the lowest: `*1 | **2` met by
306
- // `neq(1)` lost the default entirely and refused, where the ladder
307
- // exists precisely to answer 2. Rank is a preference order over
308
- // WHAT SURVIVES, which is not knowable until the trials have run.
309
- //
310
- // Only EQUAL ranks fold, because two defaults at one rank are one
311
- // decision: compatible pegs merge, and a disagreement is the
312
- // `pref_rank_clash` refusal (R2), which belongs to the whole
313
- // disjunction -- there is no alternative to fall back to.
314
- //
315
- // Answers the sole surviving preference when the disjunction holds
316
- // exactly one -- which the RECURSIVE call below consumes to lift a
317
- // nested disjunct's winner into this one -- or the clash refusal.
318
194
  rankPrefs(ctx) {
319
195
  // The kept index per rank, so an equal-rank twin folds into the
320
196
  // arm already standing for that rank.
@@ -366,25 +242,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
366
242
  getJunctionSymbol() {
367
243
  return '|';
368
244
  }
369
- // AN UNRESOLVED DISJUNCTION IS NOT A VALUE (ADR-007).
370
- //
371
- // Generation used to FOLD the surviving members together with unify
372
- // and emit the result. That answer is in no branch of the
373
- // disjunction: `({x:1}|{y:2}) & {z:3}` generated `{x:1,y:2,z:3}`, a
374
- // map the model never admits, and `1|2` died as a scalar_value
375
- // CONFLICT -- the conflict of the fold, not of anything the author
376
- // wrote. The second half is what made vet decorative: vet's
377
- // incompleteness check keeps incomplete-class findings, so a missing
378
- // required enum field (`role: 'a'|'b'` with no data) arrived as a
379
- // conflict, was filtered out, and vetted VALID with zero findings
380
- // (use-cases/BUGS.md §13, the review's finding C).
381
- //
382
- // What remains after unification is what the model still admits, so
383
- // more than one surviving alternative means the truth is not yet
384
- // settled -- incomplete, the same class a bare `string` residue
385
- // answers, and the same answer CUE gives for a non-concrete export.
386
- // A preference resolves it (that is what `*` is for), and so does a
387
- // single surviving member.
388
245
  gen(ctx) {
389
246
  if (0 < this.peg.length) {
390
247
  // Ranking may not have run when gen is reached without a prior
@@ -394,12 +251,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
394
251
  this.rankPrefs(ctx);
395
252
  }
396
253
  const prefs = this.peg.filter((v) => v instanceof PrefVal_1.PrefVal);
397
- // ALTERNATIVES THAT GENERATE THE SAME VALUE ARE RESOLVED
398
- // (ADR-007's rule, asked at the moment it matters): `[] | [&:
399
- // T]` met by an empty list keeps both arms -- they differ as
400
- // SCHEMAS, which is what stops the dedup collapsing the
401
- // template away (BUGS.md §52 regime 4) -- but both generate
402
- // the empty list, and one generated value is one value.
403
254
  if (0 === prefs.length && 1 < this.peg.length) {
404
255
  const gctx = ctx.clone({ err: [], collect: true });
405
256
  let firstOut;
@@ -429,9 +280,6 @@ class DisjunctVal extends JunctionVal_1.JunctionVal {
429
280
  }
430
281
  return undefined;
431
282
  }
432
- // THE LOWEST-RANK SURVIVOR (R5). Ranking no longer discards the
433
- // weaker arms, so the choice is made here, over what is left:
434
- // `*1 | **2` answers 1, and answers 2 once `*1` is gone.
435
283
  let best = this.peg[0];
436
284
  if (0 < prefs.length) {
437
285
  best = prefs[0];
@@ -1 +1 @@
1
- {"version":3,"file":"DisjunctVal.js","sourceRoot":"","sources":["../../src/val/DisjunctVal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DisjunctVal.js","sourceRoot":"","sources":["../../src/val/DisjunctVal.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@ import type { Val, ValSpec } from '../type';
2
2
  import { AontuContext } from '../ctx';
3
3
  import { ListVal } from './ListVal';
4
4
  import { FuncBaseVal } from './FuncBaseVal';
5
- declare function dataValues(data: Val | undefined, ctx: AontuContext): Val[] | string;
6
5
  declare class EachFuncVal extends FuncBaseVal {
7
6
  isEachFunc: boolean;
8
7
  staged: boolean;
@@ -12,4 +11,4 @@ declare class EachFuncVal extends FuncBaseVal {
12
11
  unify(peer: Val, ctx: AontuContext): Val;
13
12
  resolve(ctx: AontuContext, args: Val[]): ListVal | import("./NilVal").NilVal;
14
13
  }
15
- export { dataValues, EachFuncVal, };
14
+ export { EachFuncVal, };
@@ -2,26 +2,18 @@
2
2
  /* Copyright (c) 2025 Richard Rodger, MIT License */
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.EachFuncVal = void 0;
5
- exports.dataValues = dataValues;
6
- const unify_1 = require("../unify");
7
5
  const err_1 = require("../err");
8
6
  const ListVal_1 = require("./ListVal");
9
7
  const FuncBaseVal_1 = require("./FuncBaseVal");
10
8
  const Val_1 = require("./Val");
11
9
  const PlaceVal_1 = require("./PlaceVal");
12
10
  const members_1 = require("./members");
13
- // The members a data bag holds, in the order the result must carry
14
- // them -- what generation would emit (./members.ts, BUGS.md §79) --
15
- // or the code naming what is wrong with the argument.
16
- function dataValues(data, ctx) {
17
- const vals = (0, members_1.memberVals)(data, ctx);
18
- return undefined === vals ? 'each_data' : vals;
19
- }
20
11
  class EachFuncVal extends FuncBaseVal_1.FuncBaseVal {
21
12
  constructor(spec, ctx) {
22
13
  super(spec, ctx);
23
14
  this.isEachFunc = true;
24
- // THE STAGING RULE, for the reason given in PackFuncVal.
15
+ // THE STAGING RULE, for the reason given in PackFuncVal: the data
16
+ // is not settled merely by being `done` once.
25
17
  this.staged = true;
26
18
  }
27
19
  funcname() {
@@ -33,37 +25,28 @@ class EachFuncVal extends FuncBaseVal_1.FuncBaseVal {
33
25
  }
34
26
  unify(peer, ctx) {
35
27
  // ONE argument is driven: the data. The template is not (see
36
- // prepare above), and driveStagedArgs answers whether the data has
37
- // settled -- the other half of "ready to fire".
28
+ // prepare above).
38
29
  if (!this.stagedReady(peer, ctx, 1)) {
39
30
  return this.residuate(peer, ctx);
40
31
  }
41
32
  return super.unify(peer, ctx);
42
33
  }
43
34
  resolve(ctx, args) {
44
- const vals = dataValues(args?.[0], ctx);
45
- if ('string' === typeof vals) {
46
- return (0, err_1.makeNilErr)(ctx, vals, this);
35
+ const vals = (0, members_1.memberVals)(args?.[0], ctx);
36
+ if (undefined === vals) {
37
+ return (0, err_1.makeNilErr)(ctx, 'each_data', this);
47
38
  }
48
- const tmpl = args?.[1];
39
+ // Arity is checked at parse (funcArity), so the template is here.
40
+ const tmpl = args[1];
49
41
  const peg = [];
50
42
  for (let i = 0; i < vals.length; i++) {
51
43
  const elctx = ctx.descend(String(i));
52
- const el = vals[i].clone(elctx);
53
- // The template is CLONED per element, never shared — a FULL
54
- // instance to the leaves (`dup`, ADR-005): see PackFuncVal.resolve.
55
- // `_` inside the template binds the source child (G8 phase 3),
56
- // which for `each` is the element itself.
57
- let inst = undefined;
58
- if (undefined !== tmpl) {
59
- inst = tmpl.clone(elctx, { dup: true });
60
- (0, Val_1.repathInstance)(inst, inst.path);
61
- }
62
- peg.push(undefined === inst ? el :
63
- (0, unify_1.unite)(elctx, el, (0, PlaceVal_1.fillPlace)(inst, vals[i], elctx), 'each'));
44
+ const inst = tmpl.clone(elctx, { dup: true });
45
+ (0, Val_1.repathInstance)(inst, inst.path);
46
+ peg.push((0, PlaceVal_1.fillPlace)(inst, vals[i], elctx));
64
47
  }
65
48
  return new ListVal_1.ListVal({ peg }, ctx);
66
49
  }
67
- } /* node:coverage ignore next 7 */
50
+ } /* node:coverage ignore next 6 */
68
51
  exports.EachFuncVal = EachFuncVal;
69
52
  //# sourceMappingURL=EachFuncVal.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"EachFuncVal.js","sourceRoot":"","sources":["../../src/val/EachFuncVal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EachFuncVal.js","sourceRoot":"","sources":["../../src/val/EachFuncVal.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAWpD,gCAAmC;AACnC,uCAAmC;AACnC,+CAA2C;AAC3C,+BAAsC;AACtC,yCAAsC;AACtC,uCAAsC;AAGtC,MAAM,WAAY,SAAQ,yBAAW;IAOnC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAVlB,eAAU,GAAG,IAAI,CAAA;QAEjB,kEAAkE;QAClE,8CAA8C;QAC9C,WAAM,GAAG,IAAI,CAAA;IAOb,CAAC;IAGD,QAAQ;QACN,OAAO,MAAM,CAAA;IACf,CAAC;IAGD,sEAAsE;IACtE,OAAO,CAAC,IAAkB,EAAE,KAAY;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAGD,KAAK,CAAC,IAAS,EAAE,GAAiB;QAChC,6DAA6D;QAC7D,kBAAkB;QAClB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAClC,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC/B,CAAC;IAGD,OAAO,CAAC,GAAiB,EAAE,IAAW;QACpC,MAAM,IAAI,GAAG,IAAA,oBAAU,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QACvC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,IAAA,gBAAU,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;QAC3C,CAAC;QAED,kEAAkE;QAClE,MAAM,IAAI,GAAQ,IAAI,CAAC,CAAC,CAAC,CAAA;QACzB,MAAM,GAAG,GAAU,EAAE,CAAA;QAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;YAC7C,IAAA,oBAAc,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/B,GAAG,CAAC,IAAI,CAAC,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;QAC3C,CAAC;QAED,OAAO,IAAI,iBAAO,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAA;IAClC,CAAC;CAEF,CAAC,iCAAiC;QAIjC,WAAW"}
@@ -12,7 +12,7 @@ type Template = {
12
12
  };
13
13
  type LitSpot = {
14
14
  i: number;
15
- of?: number;
15
+ n?: number;
16
16
  text?: boolean;
17
17
  s: string;
18
18
  };