@angelmsger/fx 0.11.0 → 0.12.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 (548) hide show
  1. package/CHANGELOG.md +110 -0
  2. package/README.md +9 -42
  3. package/defaults/tools.yaml +6 -1
  4. package/dist/adapters/agent-host/toml-mcp.js +1 -3
  5. package/dist/adapters/agent-host/toml-mcp.js.map +1 -1
  6. package/dist/adapters/calendar/wecom-calendar-cli/provider.js +42 -0
  7. package/dist/adapters/calendar/wecom-calendar-cli/provider.js.map +1 -0
  8. package/dist/adapters/ci/github-actions/ci.js +9 -7
  9. package/dist/adapters/ci/github-actions/ci.js.map +1 -1
  10. package/dist/adapters/ci/github-actions/provider.js +2 -2
  11. package/dist/adapters/ci/github-actions/provider.js.map +1 -1
  12. package/dist/adapters/ci/jenkins-cli/ci.js +6 -1
  13. package/dist/adapters/ci/jenkins-cli/ci.js.map +1 -1
  14. package/dist/adapters/cluster/kubectl/provider.js +2 -3
  15. package/dist/adapters/cluster/kubectl/provider.js.map +1 -1
  16. package/dist/adapters/code-host/bitbucket-cli/contribution-call.js +5 -27
  17. package/dist/adapters/code-host/bitbucket-cli/contribution-call.js.map +1 -1
  18. package/dist/adapters/code-host/bitbucket-cli/provider.js.map +1 -1
  19. package/dist/adapters/code-host/bitbucket-cli/pull-request-reference.js +1 -19
  20. package/dist/adapters/code-host/bitbucket-cli/pull-request-reference.js.map +1 -1
  21. package/dist/adapters/code-host/bitbucket-cli/pull-request.js +3 -17
  22. package/dist/adapters/code-host/bitbucket-cli/pull-request.js.map +1 -1
  23. package/dist/adapters/code-host/bitbucket-cli/repository-identity.js +1 -4
  24. package/dist/adapters/code-host/bitbucket-cli/repository-identity.js.map +1 -1
  25. package/dist/adapters/code-host/github/contribution.js +179 -0
  26. package/dist/adapters/code-host/github/contribution.js.map +1 -0
  27. package/dist/adapters/code-host/github/import.js +27 -0
  28. package/dist/adapters/code-host/github/import.js.map +1 -0
  29. package/dist/adapters/code-host/github/provider.js +12 -14
  30. package/dist/adapters/code-host/github/provider.js.map +1 -1
  31. package/dist/adapters/code-host/local-git/import.js +2 -2
  32. package/dist/adapters/code-host/local-git/import.js.map +1 -1
  33. package/dist/adapters/code-host/local-git/provider.js +3 -3
  34. package/dist/adapters/code-host/local-git/provider.js.map +1 -1
  35. package/dist/adapters/error-tracker/sentry/client.js +1 -1
  36. package/dist/adapters/error-tracker/sentry/client.js.map +1 -1
  37. package/dist/adapters/family/cli.js +15 -17
  38. package/dist/adapters/family/cli.js.map +1 -1
  39. package/dist/adapters/family/contribution.js +65 -0
  40. package/dist/adapters/family/contribution.js.map +1 -0
  41. package/dist/adapters/family/service-protocol.js +1 -0
  42. package/dist/adapters/family/service-protocol.js.map +1 -1
  43. package/dist/adapters/fs/node-fs.js +5 -8
  44. package/dist/adapters/fs/node-fs.js.map +1 -1
  45. package/dist/adapters/git/run.js +17 -0
  46. package/dist/adapters/git/run.js.map +1 -0
  47. package/dist/adapters/git/system-git.js +36 -16
  48. package/dist/adapters/git/system-git.js.map +1 -1
  49. package/dist/adapters/github/gh.js +1 -1
  50. package/dist/adapters/github/gh.js.map +1 -1
  51. package/dist/adapters/manifest-source/git-repo.js +38 -18
  52. package/dist/adapters/manifest-source/git-repo.js.map +1 -1
  53. package/dist/adapters/manifest-source/stdin.js +4 -6
  54. package/dist/adapters/manifest-source/stdin.js.map +1 -1
  55. package/dist/adapters/metrics/prometheus-cli/service.js +9 -1
  56. package/dist/adapters/metrics/prometheus-cli/service.js.map +1 -1
  57. package/dist/adapters/process/deadline-process.js +7 -3
  58. package/dist/adapters/process/deadline-process.js.map +1 -1
  59. package/dist/adapters/process/diagnostic-process.js +2 -3
  60. package/dist/adapters/process/diagnostic-process.js.map +1 -1
  61. package/dist/adapters/registry/registry-policy.js +4 -14
  62. package/dist/adapters/registry/registry-policy.js.map +1 -1
  63. package/dist/application/agent/list.js +12 -0
  64. package/dist/application/agent/list.js.map +1 -1
  65. package/dist/application/agent/pick.js +12 -30
  66. package/dist/application/agent/pick.js.map +1 -1
  67. package/dist/application/agent/workspace-cleanup.js +4 -1
  68. package/dist/application/agent/workspace-cleanup.js.map +1 -1
  69. package/dist/application/config/export.js +3 -2
  70. package/dist/application/config/export.js.map +1 -1
  71. package/dist/application/config/import-registry.js +3 -3
  72. package/dist/application/config/import-registry.js.map +1 -1
  73. package/dist/application/config/import.js +12 -4
  74. package/dist/application/config/import.js.map +1 -1
  75. package/dist/application/config/resolve.js +2 -4
  76. package/dist/application/config/resolve.js.map +1 -1
  77. package/dist/application/contribution/identity.js +3 -3
  78. package/dist/application/contribution/identity.js.map +1 -1
  79. package/dist/application/contribution/push-registered.js +77 -0
  80. package/dist/application/contribution/push-registered.js.map +1 -0
  81. package/dist/application/contribution/push.js +12 -19
  82. package/dist/application/contribution/push.js.map +1 -1
  83. package/dist/application/contribution/validate.js +12 -13
  84. package/dist/application/contribution/validate.js.map +1 -1
  85. package/dist/application/docs/rendered.js +2 -1
  86. package/dist/application/docs/rendered.js.map +1 -1
  87. package/dist/application/doctor/index.js +43 -27
  88. package/dist/application/doctor/index.js.map +1 -1
  89. package/dist/application/doctor/manifest.js +5 -1
  90. package/dist/application/doctor/manifest.js.map +1 -1
  91. package/dist/application/doctor/repos.js +1 -1
  92. package/dist/application/doctor/repos.js.map +1 -1
  93. package/dist/application/doctor/tools.js +20 -31
  94. package/dist/application/doctor/tools.js.map +1 -1
  95. package/dist/application/doctor/types.js +0 -8
  96. package/dist/application/doctor/types.js.map +1 -1
  97. package/dist/application/env/names.js.map +1 -1
  98. package/dist/application/harness/apply.js +4 -3
  99. package/dist/application/harness/apply.js.map +1 -1
  100. package/dist/application/harness/cleanup.js +5 -14
  101. package/dist/application/harness/cleanup.js.map +1 -1
  102. package/dist/application/harness/mcp-readiness.js +3 -1
  103. package/dist/application/harness/mcp-readiness.js.map +1 -1
  104. package/dist/application/harness/names.js +2 -4
  105. package/dist/application/harness/names.js.map +1 -1
  106. package/dist/application/harness/plan.js +12 -10
  107. package/dist/application/harness/plan.js.map +1 -1
  108. package/dist/application/harness/reconcile.js +4 -14
  109. package/dist/application/harness/reconcile.js.map +1 -1
  110. package/dist/application/harness/session.js +2 -13
  111. package/dist/application/harness/session.js.map +1 -1
  112. package/dist/application/harness/stages.js +8 -18
  113. package/dist/application/harness/stages.js.map +1 -1
  114. package/dist/application/harness/types.js +1 -8
  115. package/dist/application/harness/types.js.map +1 -1
  116. package/dist/application/hook/apply.js +5 -4
  117. package/dist/application/hook/apply.js.map +1 -1
  118. package/dist/application/hook/automatic-sync.js +8 -3
  119. package/dist/application/hook/automatic-sync.js.map +1 -1
  120. package/dist/application/hook/cleanup.js +5 -14
  121. package/dist/application/hook/cleanup.js.map +1 -1
  122. package/dist/application/hook/dispatch.js +24 -3
  123. package/dist/application/hook/dispatch.js.map +1 -1
  124. package/dist/application/hook/observe.js +11 -9
  125. package/dist/application/hook/observe.js.map +1 -1
  126. package/dist/application/hook/plan.js.map +1 -1
  127. package/dist/application/hook/reconcile.js +2 -9
  128. package/dist/application/hook/reconcile.js.map +1 -1
  129. package/dist/application/hook/session.js +5 -12
  130. package/dist/application/hook/session.js.map +1 -1
  131. package/dist/application/hook/supervisor-report.js +2 -1
  132. package/dist/application/hook/supervisor-report.js.map +1 -1
  133. package/dist/application/hook/types.js +8 -1
  134. package/dist/application/hook/types.js.map +1 -1
  135. package/dist/application/init/errors.js +19 -19
  136. package/dist/application/init/errors.js.map +1 -1
  137. package/dist/application/init/index.js +60 -42
  138. package/dist/application/init/index.js.map +1 -1
  139. package/dist/application/init/preview-initialization.js +40 -0
  140. package/dist/application/init/preview-initialization.js.map +1 -0
  141. package/dist/application/init/preview.js +37 -19
  142. package/dist/application/init/preview.js.map +1 -1
  143. package/dist/application/init/resume.js +30 -0
  144. package/dist/application/init/resume.js.map +1 -0
  145. package/dist/application/init/source.js +8 -0
  146. package/dist/application/init/source.js.map +1 -0
  147. package/dist/application/{doctor/login.js → login/check.js} +22 -43
  148. package/dist/application/login/check.js.map +1 -0
  149. package/dist/application/login/collect.js +2 -1
  150. package/dist/application/login/collect.js.map +1 -1
  151. package/dist/application/login/command-failure.js +2 -0
  152. package/dist/application/login/command-failure.js.map +1 -1
  153. package/dist/application/login/deps.js +2 -3
  154. package/dist/application/login/deps.js.map +1 -1
  155. package/dist/application/login/run.js +149 -54
  156. package/dist/application/login/run.js.map +1 -1
  157. package/dist/application/login/stage.js +146 -0
  158. package/dist/application/login/stage.js.map +1 -0
  159. package/dist/application/login/verify.js +45 -34
  160. package/dist/application/login/verify.js.map +1 -1
  161. package/dist/application/manifest/context.js +5 -1
  162. package/dist/application/manifest/context.js.map +1 -1
  163. package/dist/application/{import.js → manifest/import.js} +34 -27
  164. package/dist/application/manifest/import.js.map +1 -0
  165. package/dist/application/manifest/lint.js +15 -23
  166. package/dist/application/manifest/lint.js.map +1 -1
  167. package/dist/application/manifest/load.js +7 -11
  168. package/dist/application/manifest/load.js.map +1 -1
  169. package/dist/application/manifest/prepare.js +3 -2
  170. package/dist/application/manifest/prepare.js.map +1 -1
  171. package/dist/application/manifest/providers.js +4 -1
  172. package/dist/application/manifest/providers.js.map +1 -1
  173. package/dist/application/{refresh-manifest.js → manifest/refresh.js} +26 -2
  174. package/dist/application/manifest/refresh.js.map +1 -0
  175. package/dist/application/manifest/set.js +2 -1
  176. package/dist/application/manifest/set.js.map +1 -1
  177. package/dist/application/member/list.js +2 -4
  178. package/dist/application/member/list.js.map +1 -1
  179. package/dist/application/member/show.js +2 -3
  180. package/dist/application/member/show.js.map +1 -1
  181. package/dist/application/preparation.js +92 -25
  182. package/dist/application/preparation.js.map +1 -1
  183. package/dist/application/probe-record/index.js +19 -18
  184. package/dist/application/probe-record/index.js.map +1 -1
  185. package/dist/application/probe-record/plan.js +6 -4
  186. package/dist/application/probe-record/plan.js.map +1 -1
  187. package/dist/application/{can.js → readiness/can.js} +23 -11
  188. package/dist/application/readiness/can.js.map +1 -0
  189. package/dist/application/readiness/index.js +22 -35
  190. package/dist/application/readiness/index.js.map +1 -1
  191. package/dist/application/readiness/resolve.js +13 -15
  192. package/dist/application/readiness/resolve.js.map +1 -1
  193. package/dist/application/readiness/verdicts.js +2 -7
  194. package/dist/application/readiness/verdicts.js.map +1 -1
  195. package/dist/application/{where.js → readiness/where.js} +19 -21
  196. package/dist/application/readiness/where.js.map +1 -0
  197. package/dist/application/release/ci.js +1 -1
  198. package/dist/application/release/ci.js.map +1 -1
  199. package/dist/application/release/index.js +12 -17
  200. package/dist/application/release/index.js.map +1 -1
  201. package/dist/application/safety/trust.js +12 -14
  202. package/dist/application/safety/trust.js.map +1 -1
  203. package/dist/application/self/update.js +23 -13
  204. package/dist/application/self/update.js.map +1 -1
  205. package/dist/application/services/command.js +6 -8
  206. package/dist/application/services/command.js.map +1 -1
  207. package/dist/application/services/operation.js +12 -19
  208. package/dist/application/services/operation.js.map +1 -1
  209. package/dist/application/services/recipes.js +7 -2
  210. package/dist/application/services/recipes.js.map +1 -1
  211. package/dist/application/services/stage.js +6 -4
  212. package/dist/application/services/stage.js.map +1 -1
  213. package/dist/application/services/types.js +7 -1
  214. package/dist/application/services/types.js.map +1 -1
  215. package/dist/application/skill/copies.js +13 -22
  216. package/dist/application/skill/copies.js.map +1 -1
  217. package/dist/application/skill/fx-copies.js +1 -1
  218. package/dist/application/skill/fx-copies.js.map +1 -1
  219. package/dist/application/skill/stage.js +24 -26
  220. package/dist/application/skill/stage.js.map +1 -1
  221. package/dist/application/skill/standalone.js +1 -1
  222. package/dist/application/skill/standalone.js.map +1 -1
  223. package/dist/application/skill/targets.js +2 -16
  224. package/dist/application/skill/targets.js.map +1 -1
  225. package/dist/application/skill/tool-skills.js +20 -10
  226. package/dist/application/skill/tool-skills.js.map +1 -1
  227. package/dist/application/sync/checks.js +7 -45
  228. package/dist/application/sync/checks.js.map +1 -1
  229. package/dist/application/sync/index.js +76 -26
  230. package/dist/application/sync/index.js.map +1 -1
  231. package/dist/application/sync/stages.js +33 -26
  232. package/dist/application/sync/stages.js.map +1 -1
  233. package/dist/application/sync/types.js +6 -1
  234. package/dist/application/sync/types.js.map +1 -1
  235. package/dist/application/tool/check.js +8 -0
  236. package/dist/application/tool/check.js.map +1 -1
  237. package/dist/application/tool/history.js +16 -0
  238. package/dist/application/tool/history.js.map +1 -0
  239. package/dist/application/tool/initialize.js +2 -1
  240. package/dist/application/tool/initialize.js.map +1 -1
  241. package/dist/application/tool/install.js +15 -18
  242. package/dist/application/tool/install.js.map +1 -1
  243. package/dist/application/tool/installed.js +1 -1
  244. package/dist/application/tool/installed.js.map +1 -1
  245. package/dist/application/tool/list.js.map +1 -1
  246. package/dist/application/tool/scope.js +8 -7
  247. package/dist/application/tool/scope.js.map +1 -1
  248. package/dist/application/tool/select.js +2 -4
  249. package/dist/application/tool/select.js.map +1 -1
  250. package/dist/application/tool/show.js.map +1 -1
  251. package/dist/application/tool/toolchain.js +19 -6
  252. package/dist/application/tool/toolchain.js.map +1 -1
  253. package/dist/application/update/check.js +2 -1
  254. package/dist/application/update/check.js.map +1 -1
  255. package/dist/application/workspace/command-operation.js +4 -3
  256. package/dist/application/workspace/command-operation.js.map +1 -1
  257. package/dist/application/{workspace-context.js → workspace/context.js} +26 -19
  258. package/dist/application/workspace/context.js.map +1 -0
  259. package/dist/application/workspace/deps.js +3 -3
  260. package/dist/application/workspace/deps.js.map +1 -1
  261. package/dist/application/workspace/guidance.js +2 -4
  262. package/dist/application/workspace/guidance.js.map +1 -1
  263. package/dist/application/workspace/health.js +4 -2
  264. package/dist/application/workspace/health.js.map +1 -1
  265. package/dist/application/workspace/inspect.js +1 -4
  266. package/dist/application/workspace/inspect.js.map +1 -1
  267. package/dist/application/workspace/manage.js +83 -97
  268. package/dist/application/workspace/manage.js.map +1 -1
  269. package/dist/application/workspace/operation.js +13 -14
  270. package/dist/application/workspace/operation.js.map +1 -1
  271. package/dist/application/workspace/plan.js +2 -1
  272. package/dist/application/workspace/plan.js.map +1 -1
  273. package/dist/application/workspace/registry.js +4 -3
  274. package/dist/application/workspace/registry.js.map +1 -1
  275. package/dist/application/workspace/resolve.js +10 -12
  276. package/dist/application/workspace/resolve.js.map +1 -1
  277. package/dist/application/workspace/resources.js +39 -32
  278. package/dist/application/workspace/resources.js.map +1 -1
  279. package/dist/application/workspace/source-preview.js +6 -3
  280. package/dist/application/workspace/source-preview.js.map +1 -1
  281. package/dist/application/{status.js → workspace/status.js} +51 -6
  282. package/dist/application/workspace/status.js.map +1 -0
  283. package/dist/cli/base.js +22 -28
  284. package/dist/cli/base.js.map +1 -1
  285. package/dist/cli/commands/agent/pick.js +4 -1
  286. package/dist/cli/commands/agent/pick.js.map +1 -1
  287. package/dist/cli/commands/agent/unpick.js +5 -1
  288. package/dist/cli/commands/agent/unpick.js.map +1 -1
  289. package/dist/cli/commands/can.js +5 -21
  290. package/dist/cli/commands/can.js.map +1 -1
  291. package/dist/cli/commands/config/import.js +1 -8
  292. package/dist/cli/commands/config/import.js.map +1 -1
  293. package/dist/cli/commands/doctor.js +2 -1
  294. package/dist/cli/commands/doctor.js.map +1 -1
  295. package/dist/cli/commands/env/pick.js +1 -0
  296. package/dist/cli/commands/env/pick.js.map +1 -1
  297. package/dist/cli/commands/env/select.js +1 -0
  298. package/dist/cli/commands/env/select.js.map +1 -1
  299. package/dist/cli/commands/env/unpick.js +1 -0
  300. package/dist/cli/commands/env/unpick.js.map +1 -1
  301. package/dist/cli/commands/hook/disable.js +1 -0
  302. package/dist/cli/commands/hook/disable.js.map +1 -1
  303. package/dist/cli/commands/hook/enable.js +1 -0
  304. package/dist/cli/commands/hook/enable.js.map +1 -1
  305. package/dist/cli/commands/init.js +14 -11
  306. package/dist/cli/commands/init.js.map +1 -1
  307. package/dist/cli/commands/login.js +13 -2
  308. package/dist/cli/commands/login.js.map +1 -1
  309. package/dist/cli/commands/manifest/import.js +6 -2
  310. package/dist/cli/commands/manifest/import.js.map +1 -1
  311. package/dist/cli/commands/manifest/lint.js +5 -1
  312. package/dist/cli/commands/manifest/lint.js.map +1 -1
  313. package/dist/cli/commands/manifest/record-probe.js +1 -0
  314. package/dist/cli/commands/manifest/record-probe.js.map +1 -1
  315. package/dist/cli/commands/manifest/render.js +1 -0
  316. package/dist/cli/commands/manifest/render.js.map +1 -1
  317. package/dist/cli/commands/manifest/repo-set.js +1 -0
  318. package/dist/cli/commands/manifest/repo-set.js.map +1 -1
  319. package/dist/cli/commands/repo/add.js +1 -0
  320. package/dist/cli/commands/repo/add.js.map +1 -1
  321. package/dist/cli/commands/repo/fork.js +1 -0
  322. package/dist/cli/commands/repo/fork.js.map +1 -1
  323. package/dist/cli/commands/repo/pick.js +1 -0
  324. package/dist/cli/commands/repo/pick.js.map +1 -1
  325. package/dist/cli/commands/repo/remove.js +1 -0
  326. package/dist/cli/commands/repo/remove.js.map +1 -1
  327. package/dist/cli/commands/repo/select.js +1 -0
  328. package/dist/cli/commands/repo/select.js.map +1 -1
  329. package/dist/cli/commands/repo/unpick.js +1 -0
  330. package/dist/cli/commands/repo/unpick.js.map +1 -1
  331. package/dist/cli/commands/selection.js +1 -2
  332. package/dist/cli/commands/selection.js.map +1 -1
  333. package/dist/cli/commands/self/update.js +11 -14
  334. package/dist/cli/commands/self/update.js.map +1 -1
  335. package/dist/cli/commands/source/push.js +14 -13
  336. package/dist/cli/commands/source/push.js.map +1 -1
  337. package/dist/cli/commands/status.js +6 -36
  338. package/dist/cli/commands/status.js.map +1 -1
  339. package/dist/cli/commands/sync.js +7 -5
  340. package/dist/cli/commands/sync.js.map +1 -1
  341. package/dist/cli/commands/tool/history.js +2 -2
  342. package/dist/cli/commands/tool/history.js.map +1 -1
  343. package/dist/cli/commands/where.js +2 -1
  344. package/dist/cli/commands/where.js.map +1 -1
  345. package/dist/cli/commands/workspace/rebind.js +1 -4
  346. package/dist/cli/commands/workspace/rebind.js.map +1 -1
  347. package/dist/cli/completion.js +2 -4
  348. package/dist/cli/completion.js.map +1 -1
  349. package/dist/cli/hook-command.js +2 -2
  350. package/dist/cli/hook-command.js.map +1 -1
  351. package/dist/cli/main.js +4 -3
  352. package/dist/cli/main.js.map +1 -1
  353. package/dist/cli/notices.js +26 -24
  354. package/dist/cli/notices.js.map +1 -1
  355. package/dist/cli/preparation-view.js +170 -52
  356. package/dist/cli/preparation-view.js.map +1 -1
  357. package/dist/cli/render/exceptional.js +11 -4
  358. package/dist/cli/render/exceptional.js.map +1 -1
  359. package/dist/cli/render/fields.js +1 -3
  360. package/dist/cli/render/fields.js.map +1 -1
  361. package/dist/cli/render/human.js +1 -3
  362. package/dist/cli/render/human.js.map +1 -1
  363. package/dist/cli/render/index.js +1 -1
  364. package/dist/cli/render/index.js.map +1 -1
  365. package/dist/cli/render/status-line.js +17 -3
  366. package/dist/cli/render/status-line.js.map +1 -1
  367. package/dist/cli/render/tone.js +29 -10
  368. package/dist/cli/render/tone.js.map +1 -1
  369. package/dist/cli/tool-command.js +4 -11
  370. package/dist/cli/tool-command.js.map +1 -1
  371. package/dist/cli/workspace-write-policy.js +8 -33
  372. package/dist/cli/workspace-write-policy.js.map +1 -1
  373. package/dist/composition/agent-cleanup.js +5 -1
  374. package/dist/composition/agent-cleanup.js.map +1 -1
  375. package/dist/composition/bundled.js +4 -1
  376. package/dist/composition/bundled.js.map +1 -1
  377. package/dist/composition/command-wiring.js +44 -99
  378. package/dist/composition/command-wiring.js.map +1 -1
  379. package/dist/composition/container.js +25 -20
  380. package/dist/composition/container.js.map +1 -1
  381. package/dist/composition/contributions.js +26 -71
  382. package/dist/composition/contributions.js.map +1 -1
  383. package/dist/composition/harness.js +3 -4
  384. package/dist/composition/harness.js.map +1 -1
  385. package/dist/composition/hook-entry.js +2 -1
  386. package/dist/composition/hook-entry.js.map +1 -1
  387. package/dist/composition/hook-wiring.js +8 -16
  388. package/dist/composition/hook-wiring.js.map +1 -1
  389. package/dist/composition/hook-worker.js +9 -11
  390. package/dist/composition/hook-worker.js.map +1 -1
  391. package/dist/composition/hooks.js +6 -3
  392. package/dist/composition/hooks.js.map +1 -1
  393. package/dist/composition/import.js +8 -6
  394. package/dist/composition/import.js.map +1 -1
  395. package/dist/composition/manifest-edit.js +1 -2
  396. package/dist/composition/manifest-edit.js.map +1 -1
  397. package/dist/composition/manifest-sources.js +3 -16
  398. package/dist/composition/manifest-sources.js.map +1 -1
  399. package/dist/composition/probe-record.js +1 -2
  400. package/dist/composition/probe-record.js.map +1 -1
  401. package/dist/composition/refresh.js +1 -1
  402. package/dist/composition/refresh.js.map +1 -1
  403. package/dist/composition/registry.js +8 -37
  404. package/dist/composition/registry.js.map +1 -1
  405. package/dist/composition/tool-install.js +5 -1
  406. package/dist/composition/tool-install.js.map +1 -1
  407. package/dist/composition/tool-inventory.js +10 -1
  408. package/dist/composition/tool-inventory.js.map +1 -1
  409. package/dist/composition/trace.js +3 -4
  410. package/dist/composition/trace.js.map +1 -1
  411. package/dist/composition/update.js +12 -1
  412. package/dist/composition/update.js.map +1 -1
  413. package/dist/composition/workspace-management.js +8 -2
  414. package/dist/composition/workspace-management.js.map +1 -1
  415. package/dist/domain/config/codec.js +2 -1
  416. package/dist/domain/config/codec.js.map +1 -1
  417. package/dist/domain/config/profile.js +0 -1
  418. package/dist/domain/config/profile.js.map +1 -1
  419. package/dist/domain/contribution/pull-request.js +12 -1
  420. package/dist/domain/contribution/pull-request.js.map +1 -1
  421. package/dist/domain/contribution/selection.js +4 -8
  422. package/dist/domain/contribution/selection.js.map +1 -1
  423. package/dist/domain/errors.js +10 -3
  424. package/dist/domain/errors.js.map +1 -1
  425. package/dist/domain/fuzzy.js +6 -1
  426. package/dist/domain/fuzzy.js.map +1 -1
  427. package/dist/domain/harness/actions.js +60 -0
  428. package/dist/domain/harness/actions.js.map +1 -0
  429. package/dist/domain/harness/deadlines.js +14 -0
  430. package/dist/domain/harness/deadlines.js.map +1 -0
  431. package/dist/domain/harness/hooks.js +8 -0
  432. package/dist/domain/harness/hooks.js.map +1 -1
  433. package/dist/domain/harness/session-start.js +2 -1
  434. package/dist/domain/harness/session-start.js.map +1 -1
  435. package/dist/domain/harness/state-recovery.js.map +1 -1
  436. package/dist/domain/import/infer.js +2 -9
  437. package/dist/domain/import/infer.js.map +1 -1
  438. package/dist/domain/lease.js +30 -0
  439. package/dist/domain/lease.js.map +1 -0
  440. package/dist/domain/manifest/decode.js +5 -8
  441. package/dist/domain/manifest/decode.js.map +1 -1
  442. package/dist/domain/manifest/document.js +3 -5
  443. package/dist/domain/manifest/document.js.map +1 -1
  444. package/dist/domain/manifest/editor.js +3 -7
  445. package/dist/domain/manifest/editor.js.map +1 -1
  446. package/dist/domain/manifest/explain.js +2 -4
  447. package/dist/domain/manifest/explain.js.map +1 -1
  448. package/dist/domain/manifest/issues.js +2 -2
  449. package/dist/domain/manifest/issues.js.map +1 -1
  450. package/dist/domain/manifest/loader.js +2 -1
  451. package/dist/domain/manifest/loader.js.map +1 -1
  452. package/dist/domain/manifest/overlay.js +6 -9
  453. package/dist/domain/manifest/overlay.js.map +1 -1
  454. package/dist/domain/manifest/providers.js +34 -2
  455. package/dist/domain/manifest/providers.js.map +1 -1
  456. package/dist/domain/manifest/quarantine.js +21 -1
  457. package/dist/domain/manifest/quarantine.js.map +1 -1
  458. package/dist/domain/manifest/reflect.js +2 -31
  459. package/dist/domain/manifest/reflect.js.map +1 -1
  460. package/dist/domain/manifest/rules/harness.js +2 -16
  461. package/dist/domain/manifest/rules/harness.js.map +1 -1
  462. package/dist/domain/manifest/service.schema.js +5 -14
  463. package/dist/domain/manifest/service.schema.js.map +1 -1
  464. package/dist/domain/manifest/skill-frontmatter.js +1 -1
  465. package/dist/domain/manifest/skill-frontmatter.js.map +1 -1
  466. package/dist/domain/manifest/types.js.map +1 -1
  467. package/dist/domain/outcome.js +5 -0
  468. package/dist/domain/outcome.js.map +1 -0
  469. package/dist/domain/path.js +9 -1
  470. package/dist/domain/path.js.map +1 -1
  471. package/dist/domain/preparation.js.map +1 -1
  472. package/dist/domain/projection.js +8 -0
  473. package/dist/domain/projection.js.map +1 -0
  474. package/dist/domain/public-url.js +22 -0
  475. package/dist/domain/public-url.js.map +1 -0
  476. package/dist/domain/release/ci.js +19 -8
  477. package/dist/domain/release/ci.js.map +1 -1
  478. package/dist/domain/report.js +1 -1
  479. package/dist/domain/report.js.map +1 -1
  480. package/dist/domain/setup/names.js +23 -0
  481. package/dist/domain/setup/names.js.map +1 -0
  482. package/dist/domain/setup/planner.js +19 -21
  483. package/dist/domain/setup/planner.js.map +1 -1
  484. package/dist/domain/setup/progress.js +57 -0
  485. package/dist/domain/setup/progress.js.map +1 -0
  486. package/dist/domain/setup/types.js +5 -0
  487. package/dist/domain/setup/types.js.map +1 -1
  488. package/dist/domain/shell.js +0 -7
  489. package/dist/domain/shell.js.map +1 -1
  490. package/dist/domain/skills/frontmatter.js +1 -1
  491. package/dist/domain/skills/frontmatter.js.map +1 -1
  492. package/dist/domain/skills/projection.js +2 -3
  493. package/dist/domain/skills/projection.js.map +1 -1
  494. package/dist/domain/sync-selection.js +2 -4
  495. package/dist/domain/sync-selection.js.map +1 -1
  496. package/dist/domain/toolchain/resolve.js +4 -0
  497. package/dist/domain/toolchain/resolve.js.map +1 -1
  498. package/dist/domain/toolchain/select.js +15 -9
  499. package/dist/domain/toolchain/select.js.map +1 -1
  500. package/dist/domain/toolchain/stderr.js +34 -14
  501. package/dist/domain/toolchain/stderr.js.map +1 -1
  502. package/dist/domain/values.js +18 -2
  503. package/dist/domain/values.js.map +1 -1
  504. package/dist/domain/workspace/commits.js +5 -0
  505. package/dist/domain/workspace/commits.js.map +1 -1
  506. package/dist/domain/workspace/operation-journal.js +93 -0
  507. package/dist/domain/workspace/operation-journal.js.map +1 -0
  508. package/dist/domain/workspace/plan.js +17 -1
  509. package/dist/domain/workspace/plan.js.map +1 -1
  510. package/dist/infra/config-store.js +8 -13
  511. package/dist/infra/config-store.js.map +1 -1
  512. package/dist/infra/contribution-store.js +21 -67
  513. package/dist/infra/contribution-store.js.map +1 -1
  514. package/dist/infra/harness-state.js +21 -49
  515. package/dist/infra/harness-state.js.map +1 -1
  516. package/dist/infra/local-store.js +8 -15
  517. package/dist/infra/local-store.js.map +1 -1
  518. package/dist/infra/owned-journal.js +57 -0
  519. package/dist/infra/owned-journal.js.map +1 -0
  520. package/dist/infra/projection-store.js +4 -3
  521. package/dist/infra/projection-store.js.map +1 -1
  522. package/dist/infra/tool-history.js +19 -49
  523. package/dist/infra/tool-history.js.map +1 -1
  524. package/dist/infra/trust-store.js +2 -9
  525. package/dist/infra/trust-store.js.map +1 -1
  526. package/dist/infra/workspace-home.js +7 -1
  527. package/dist/infra/workspace-home.js.map +1 -1
  528. package/dist/ports/ci.js +2 -1
  529. package/dist/ports/ci.js.map +1 -1
  530. package/package.json +1 -1
  531. package/skills/fx-workspace/SKILL.md +2 -3
  532. package/skills/fx-workspace/references/commands.md +35 -26
  533. package/skills/fx-workspace/references/workspace-tasks.md +6 -7
  534. package/dist/application/can.js.map +0 -1
  535. package/dist/application/doctor/login.js.map +0 -1
  536. package/dist/application/import.js.map +0 -1
  537. package/dist/application/init/setup.js +0 -125
  538. package/dist/application/init/setup.js.map +0 -1
  539. package/dist/application/preview-initialization.js +0 -41
  540. package/dist/application/preview-initialization.js.map +0 -1
  541. package/dist/application/refresh-manifest.js.map +0 -1
  542. package/dist/application/refresh-workspace-manifest.js +0 -27
  543. package/dist/application/refresh-workspace-manifest.js.map +0 -1
  544. package/dist/application/status.js.map +0 -1
  545. package/dist/application/where.js.map +0 -1
  546. package/dist/application/workspace-context.js.map +0 -1
  547. package/dist/domain/deadline.js +0 -17
  548. package/dist/domain/deadline.js.map +0 -1
@@ -2,6 +2,7 @@
2
2
  // to follow, read off ladders because no single signal is right everywhere
3
3
  // (docs/design/import.md). Every rung below the first leaves a review note
4
4
  // on the entry, so the manifest carries its own uncertainty.
5
+ import { isPublicHttpUrl } from '../public-url.js';
5
6
  import { refFromUrl } from '../workspace/ref.js';
6
7
  // Bitbucket Data Center keeps personal repositories under `~user`.
7
8
  export function isPersonal(url) {
@@ -82,14 +83,6 @@ export function inferRepo(obs, seenProjects, probe) {
82
83
  };
83
84
  }
84
85
  function unsafeHttpRemote(remote) {
85
- if (!/^https?:\/\//i.test(remote))
86
- return false;
87
- try {
88
- const url = new URL(remote);
89
- return Boolean(url.username || url.password || url.search || url.hash);
90
- }
91
- catch {
92
- return true;
93
- }
86
+ return /^https?:\/\//i.test(remote) && !isPublicHttpUrl(remote);
94
87
  }
95
88
  //# sourceMappingURL=infer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"infer.js","sourceRoot":"","sources":["../../../src/domain/import/infer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"infer.js","sourceRoot":"","sources":["../../../src/domain/import/infer.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,2EAA2E;AAC3E,2EAA2E;AAC3E,6DAA6D;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAoCjD,mEAAmE;AACnE,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,OAAO,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAW;IAChC,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC;IAClC,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAoB,EACpB,YAA+B,EAC/B,KAAY;IAEZ,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAC9D,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACzD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,IAAI,OAAO,IAAI,GAAG,CAAC,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAC9F,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,GAAoB,EACpB,cAAsB;IAEtB,IAAI,GAAG,CAAC,gBAAgB,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACvF,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC7C,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACvD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACnE,OAAO,SAAS,CAAC;AACnB,CAAC;AAID,MAAM,UAAU,SAAS,CACvB,GAAoB,EACpB,YAA+B,EAC/B,KAAY;IAEZ,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnE,IAAI,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC;QACxD,OAAO;YACL,OAAO,EACL,iIAAiI;SACpI,CAAC;IACJ,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IACzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;YACL,OAAO,EACL,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,SAAS;gBACjC,CAAC,CAAC,yCAAyC;gBAC3C,CAAC,CAAC,8FAA8F;SACrG,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,GAAG,KAAK,SAAS;QACnB,OAAO,EAAE,OAAO,EAAE,YAAY,QAAQ,CAAC,GAAG,yCAAyC,EAAE,CAAC;IACxF,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC/F,IAAI,MAAM,KAAK,SAAS;QACtB,OAAO,EAAE,OAAO,EAAE,+DAA+D,EAAE,CAAC;IACtF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC;QACrB,MAAM,CAAC,IAAI,CACT,0GAA0G,CAC3G,CAAC;IACJ,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;IACrF,OAAO;QACL,IAAI,EAAE;YACJ,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,QAAQ,EAAE,QAAQ,CAAC,GAAG;YACtB,YAAY,EAAE,QAAQ,CAAC,IAAI;YAC3B,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,MAAM,EAAE,MAAM,CAAC,IAAI;YACnB,UAAU,EAAE,MAAM,CAAC,IAAI;YACvB,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,SAAS,IAAI,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACxF,MAAM;SACP;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc;IACtC,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AAClE,CAAC"}
@@ -0,0 +1,30 @@
1
+ // Lease vocabulary shared across layers. A key two modules must spell alike is
2
+ // built here: a mismatch loses mutual exclusion without any error, and the text
3
+ // is what an fx of another version already holds. withLease is the bracket for
4
+ // a caller that fails on contention; one that reports contention as a value
5
+ // acquires for itself.
6
+ import { pathKey } from './path.js';
7
+ // Writers of one workspace's manifest source, managed resources and registration.
8
+ export function workspaceLeaseKey(workspace) {
9
+ return `workspace:${workspace}`;
10
+ }
11
+ // Writers of one workspace's hook preference, receipts and observations.
12
+ export function hooksLeaseKey(workspace) {
13
+ return `hooks:${workspace}`;
14
+ }
15
+ // Writers of one projected file or directory.
16
+ export function projectionLeaseKey(file) {
17
+ return `projection:${pathKey(file)}`;
18
+ }
19
+ export async function withLease(lock, request, busy, work) {
20
+ const lease = await lock.acquire(request);
21
+ if (!lease)
22
+ throw busy();
23
+ try {
24
+ return await work();
25
+ }
26
+ finally {
27
+ await lease.release();
28
+ }
29
+ }
30
+ //# sourceMappingURL=lease.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lease.js","sourceRoot":"","sources":["../../src/domain/lease.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,+EAA+E;AAC/E,4EAA4E;AAC5E,uBAAuB;AAEvB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IACjD,OAAO,aAAa,SAAS,EAAE,CAAC;AAClC,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,OAAO,SAAS,SAAS,EAAE,CAAC;AAC9B,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,cAAc,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,IAAiB,EACjB,OAAqB,EACrB,IAAiB,EACjB,IAAsB;IAEtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,OAAO,MAAM,IAAI,EAAE,CAAC;IACtB,CAAC;YAAS,CAAC;QACT,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;AACH,CAAC"}
@@ -3,9 +3,10 @@
3
3
  // collection entries this fx release cannot use. A document whose remaining
4
4
  // problems are not an entry's own fault is invalid and raises.
5
5
  import { DevkitError } from '../errors.js';
6
- import { formatPath, isRaw, parseManifest } from './document.js';
6
+ import { isRecord } from '../values.js';
7
+ import { formatPath, parseManifest } from './document.js';
7
8
  import { remapIndexes, validateDocument } from './issues.js';
8
- import { partitionProblems } from './quarantine.js';
9
+ import { droppedEntry, partitionProblems } from './quarantine.js';
9
10
  import { stripUnknown } from './reflect.js';
10
11
  import { negotiate, negotiationError } from './versioning.js';
11
12
  const NONE = { schema: undefined, minCli: undefined, failure: undefined };
@@ -86,11 +87,7 @@ function finishValid(input) {
86
87
  }
87
88
  const key = spec.entries.key;
88
89
  const { entries, document } = partitionProblems(problems, key);
89
- const dropped = [...entries.entries()].map(([index, list]) => ({
90
- collection: key,
91
- name: entryName(value, key, index),
92
- reason: list.map((p) => `${p.path}: ${p.message}`).join('; '),
93
- }));
90
+ const dropped = [...entries.entries()].map(([index, list]) => droppedEntry(key, entryName(value, key, index), list));
94
91
  if (document.length > 0)
95
92
  throw invalid(spec, problems);
96
93
  const survivors = input.parsed[key];
@@ -106,7 +103,7 @@ function finishValid(input) {
106
103
  }
107
104
  function entryName(value, key, index) {
108
105
  const entry = value[key][index];
109
- const name = isRaw(entry) ? entry['name'] : undefined;
106
+ const name = isRecord(entry) ? entry['name'] : undefined;
110
107
  return typeof name === 'string' && name.length > 0 ? name : `${key}[${index}]`;
111
108
  }
112
109
  function invalid(spec, problems) {
@@ -1 +1 @@
1
- {"version":3,"file":"decode.js","sourceRoot":"","sources":["../../../src/domain/manifest/decode.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,2EAA2E;AAC3E,4EAA4E;AAC5E,+DAA+D;AAI/D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAyB,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAkC,MAAM,aAAa,CAAC;AAE7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAS5C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAyB9D,MAAM,IAAI,GAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAEvF,MAAM,UAAU,IAAI,CAAI,IAAY,EAAE,IAAoB,EAAE,IAAa;IACvE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1C,OAAO,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,KAAK,CAAI,IAAa,EAAE,IAAY;IAClD,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,UAAU,IAAI,MAAM;QAAE,MAAM,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,IAAa,EACb,GAAQ,EACR,IAAoB,EACpB,MAAc;IAEd,MAAM,YAAY,GAAG,cAAc,IAAI,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC;IACjE,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAW,EAAE;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,MAAM,WAAW,GACf,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACxF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3E,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY;YAAE,MAAM,QAAQ,CAAC;QAClC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE/D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAY,CAAC;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpF,IACE,IAAI,CAAC,OAAO,KAAK,SAAS;QAC1B,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,UAAU,CAAC,MAAM,KAAK,CAAC;QACvB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EACxB,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;IAC/F,CAAC;IACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACrE,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC;IAC7B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,QAAQ,CAAC,IAAI,CACX,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1F,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,MAAM,KAAK,SAAS;YACzB,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;YAC1E,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAChF,CAAC;IACD,OAAO,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;AACzF,CAAC;AAED,SAAS,eAAe,CAAC,OAA0B,EAAE,IAAoB;IACvE,wEAAwE;IACxE,gFAAgF;IAChF,MAAM,QAAQ,GAAG,OAAO;SACrB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACd,IAAI;QACJ,OAAO,EACL,8FAA8F;KACjG,CAAC,CAAC,CAAC;IACN,IAAI,IAAI,CAAC,MAAM;QACb,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC;IACrF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAYD,SAAS,WAAW,CAAI,KAA0B;IAChD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IACzE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACvD,OAAO;YACL,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,KAAK,CAAC,MAAW;YACtB,QAAQ;YACR,OAAO,EAAE,EAAE;YACX,OAAO;YACP,WAAW;SACZ,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IAC7B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAc,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,UAAU,EAAE,GAAG;QACf,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC;QAClC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;KAC9D,CAAC,CAAC,CAAC;IACJ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,SAAS,GAAI,KAAK,CAAC,MAAc,CAAC,GAAG,CAAc,CAAC;IAC1D,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,GAAG,GAAG,EAAE,GAAI,KAAK,CAAC,MAAc,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAO,CAAC;IAChE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,IAAI,CAAC,IAAI,4BAA4B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAC/F;YACE,IAAI,EAAE,6FAA6F;YACnG,SAAS,EAAE,CAAC,sBAAsB,EAAE,cAAc,CAAC;SACpD,CACF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AACvE,CAAC;AAED,SAAS,SAAS,CAAC,KAAU,EAAE,GAAW,EAAE,KAAa;IACvD,MAAM,KAAK,GAAI,KAAK,CAAC,GAAG,CAAe,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,KAAK,GAAG,CAAC;AACjF,CAAC;AAED,SAAS,OAAO,CAAI,IAAa,EAAE,QAA4B;IAC7D,MAAM,KAAK,GAAG,QAAQ;SACnB,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,OAAO,IAAI,WAAW,CACpB,QAAQ,EACR,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAC1B,GAAG,IAAI,CAAC,IAAI,yBAAyB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,EAC9D;QACE,IAAI,EAAE,uEAAuE;QAC7E,SAAS,EAAE;YACT,sBAAsB;YACtB,8BAA8B,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;SAC5E;QACD,WAAW,EAAE;YACX;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,sBAAsB;gBACzC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,QAAQ;gBACpC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACvE;SACF;KACF,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"decode.js","sourceRoot":"","sources":["../../../src/domain/manifest/decode.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  // problem can name the line its reader sees. Syntax errors are returned, not
3
3
  // thrown: which code a malformed document reports is the decoder's decision.
4
4
  import { LineCounter, parseDocument } from 'yaml';
5
+ import { isRecord } from '../values.js';
5
6
  export const NO_LINES = () => undefined;
6
7
  export function parseManifest(text) {
7
8
  const lines = new LineCounter();
@@ -14,7 +15,7 @@ export function parseManifest(text) {
14
15
  const raw = doc.toJS();
15
16
  if (syntax.length > 0)
16
17
  return { problems: syntax };
17
- if (!isRaw(raw))
18
+ if (!isRecord(raw))
18
19
  return { problems: [{ path: '(root)', message: 'document must be a mapping' }] };
19
20
  const lineOf = (path) => {
20
21
  const node = doc.getIn(toParts(path), true);
@@ -29,7 +30,7 @@ export function formatPath(parts) {
29
30
  return acc === '' ? part : `${acc}.${part}`;
30
31
  }, '');
31
32
  }
32
- export function toParts(path) {
33
+ function toParts(path) {
33
34
  const parts = [];
34
35
  for (const segment of path.split('.')) {
35
36
  const match = /^([^[]*)((?:\[\d+\])*)$/.exec(segment);
@@ -42,7 +43,4 @@ export function toParts(path) {
42
43
  }
43
44
  return parts;
44
45
  }
45
- export function isRaw(value) {
46
- return typeof value === 'object' && value !== null && !Array.isArray(value);
47
- }
48
46
  //# sourceMappingURL=document.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"document.js","sourceRoot":"","sources":["../../../src/domain/manifest/document.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"document.js","sourceRoot":"","sources":["../../../src/domain/manifest/document.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@
4
4
  // survive by construction rather than by a serializer's good will.
5
5
  import { isMap, isScalar, isSeq, parseDocument, } from 'yaml';
6
6
  import { DevkitError } from '../errors.js';
7
- import { nearest } from '../fuzzy.js';
7
+ import { nearest, suggestionHint } from '../fuzzy.js';
8
8
  import { shapeOf } from './reflect.js';
9
9
  import { repoSchema } from './workspace.schema.js';
10
10
  export const SETTABLE_REPO_FIELDS = [
@@ -44,9 +44,7 @@ function assertSettable(field) {
44
44
  }
45
45
  const suggestion = nearest(field, [...SETTABLE_REPO_FIELDS]);
46
46
  throw new DevkitError('usage', 'UNKNOWN_MANIFEST_FIELD', `A repository has no field "${field}"`, {
47
- hint: suggestion === undefined
48
- ? `Settable fields: ${SETTABLE_REPO_FIELDS.join(', ')}.`
49
- : `Did you mean "${suggestion}"?`,
47
+ hint: suggestionHint(suggestion, `Settable fields: ${SETTABLE_REPO_FIELDS.join(', ')}.`),
50
48
  nextSteps: ['fx manifest explain repos[]'],
51
49
  });
52
50
  }
@@ -61,9 +59,7 @@ function findRepo(text, repo) {
61
59
  return found;
62
60
  const suggestion = nearest(repo, names);
63
61
  throw new DevkitError('not_found', 'REPO_NOT_FOUND', `No repository named "${repo}" in the manifest`, {
64
- hint: suggestion === undefined
65
- ? 'fx repo list shows the known names.'
66
- : `Did you mean "${suggestion}"?`,
62
+ hint: suggestionHint(suggestion, 'fx repo list shows the known names.'),
67
63
  nextSteps: ['fx repo list'],
68
64
  });
69
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"editor.js","sourceRoot":"","sources":["../../../src/domain/manifest/editor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor.js","sourceRoot":"","sources":["../../../src/domain/manifest/editor.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,oEAAoE;AACpE,0EAA0E;AAC1E,mEAAmE;AAEnE,OAAO,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,aAAa,GAKd,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,MAAM;IACN,MAAM;IACN,QAAQ;IACR,SAAS;IACT,UAAU;IACV,KAAK;CACG,CAAC;AAUX,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,KAAa,EAAE,KAAa;IACnF,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC;IAClF,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GACV,IAAI,KAAK,SAAS;YAChB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;YAChD,CAAC,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,MAAM,GACV,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtF,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,IAAK,oBAA0C,CAAC,QAAQ,CAAC,KAAK,CAAC;QAC7D,OAAO,KAA0B,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;IACrD,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,0BAA0B,EAC1B,IAAI,KAAK,0DAA0D,EACnE;YACE,IAAI,EAAE,oDAAoD,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC5F,SAAS,EAAE,CAAC,uEAAuE,CAAC;SACrF,CACF,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC;IAC7D,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,wBAAwB,EAAE,8BAA8B,KAAK,GAAG,EAAE;QAC/F,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,oBAAoB,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACxF,SAAS,EAAE,CAAC,6BAA6B,CAAC;KAC3C,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,IAAY;IAC1C,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACtC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,gBAAgB,EAChB,wBAAwB,IAAI,mBAAmB,EAC/C;QACE,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,qCAAqC,CAAC;QACvE,SAAS,EAAE,CAAC,cAAc,CAAC;KAC5B,CACF,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,IAAY,EAAE,IAAU,EAAE,KAAa;IACtD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,0BAA0B,EAC1B,6DAA6D,EAC7D;YACE,SAAS,EAAE,CAAC,uEAAuE,CAAC;SACrF,CACF,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC9C,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QACvD,MAAM;QACN,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,UAAU;KACnB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,OAAgB,CAAC;IACrB,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,2EAA2E;QAC3E,OAAO,GAAG,SAAS,CAAC;IACtB,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACjD,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,wBAAwB,EACxB,2CAA2C,EAC3C;YACE,IAAI,EAAE,yEAAyE;YAC/E,SAAS,EAAE,CAAC,iCAAiC,CAAC;SAC/C,CACF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,IAAU,EAAE,QAAgB;IAChE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,0BAA0B,EAC1B,uDAAuD,EACvD;YACE,SAAS,EAAE,CAAC,uEAAuE,CAAC;SACrF,CACF,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAChE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACrC,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,UAAU;KACnB,CAAC;AACJ,CAAC;AAED,SAAS,GAAG,CACV,IAAY,EACZ,KAAc,EACd,KAAa,EACb,KAAa,EACb,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC;IAErC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACrC,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,0BAA0B,EAC1B,2DAA2D,EAC3D;YACE,SAAS,EAAE,CAAC,uEAAuE,CAAC;SACrF,CACF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACvB,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CACxE,CAAC;IACF,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,YAAY,GAAG,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;IACrD,MAAM,IAAI,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,KAAK,KAAK,QAAQ,IAAI,CAAC;IAC3E,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,OAAO;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAiB,IAAO;IACvC,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC;AACzD,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB,EAAE,KAAa;IAC1D,IAAI,KAAK,KAAK,cAAc;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,KAAK,KAAK,cAAc,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAC/F,OAAO,KAAK,CAAC;AACf,CAAC;AAED,8DAA8D;AAC9D,SAAS,WAAW,CAAC,KAAa;IAChC,IAAI,KAAK,KAAK,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,iCAAiC,CAAC,IAAI,CAAC,KAAK,CAAC;QACxF,OAAO,KAAK,CAAC;IACf,IAAI,wCAAwC,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvE,OAAO,CACL,CAAC,oDAAoD,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAC7F,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CACb,IAAY,EACZ,IAAY,EACZ,KAAa,EACb,KAAiC;IAEjC,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,IAAI,GAAY,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClG,IAAI,QAAiB,CAAC;IACtB,IAAI,QAAQ,CAAC,IAAI,CAAC;QAAE,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;SACrC,IAAI,KAAK,CAAC,IAAI,CAAC;QAAE,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC/C,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,4BAA4B,EAC5B,WAAW,IAAI,IAAI,KAAK,oDAAoD,EAC5E;YACE,SAAS,EAAE,CAAC,uDAAuD,CAAC;SACrE,CACF,CAAC;IACJ,CAAC;AACH,CAAC"}
@@ -3,7 +3,7 @@
3
3
  // prints it (repos[3].branch), the way docs write it (repos[].branch) or plainly
4
4
  // (repos.branch).
5
5
  import { DevkitError } from '../errors.js';
6
- import { nearest } from '../fuzzy.js';
6
+ import { nearest, suggestionHint } from '../fuzzy.js';
7
7
  import { environmentsSchema } from './environments.schema.js';
8
8
  import { harnessSchema } from './harness.schema.js';
9
9
  import { localSchema } from './local.schema.js';
@@ -86,9 +86,7 @@ function unknownField(kind, walked, segment, node) {
86
86
  const candidates = childNames(node);
87
87
  const suggestion = nearest(segment, candidates);
88
88
  const suggested = suggestion === undefined ? undefined : joinPath([...walked, canonical(node, suggestion)]);
89
- const hint = suggested === undefined
90
- ? `Known fields here: ${candidates.join(', ') || '(none)'}.`
91
- : `Did you mean "${suggested}"?`;
89
+ const hint = suggestionHint(suggested, `Known fields here: ${candidates.join(', ') || '(none)'}.`);
92
90
  return new DevkitError('usage', 'UNKNOWN_MANIFEST_FIELD', `${kind} manifest has no field "${attempted}"`, {
93
91
  hint,
94
92
  nextSteps: [
@@ -1 +1 @@
1
- {"version":3,"file":"explain.js","sourceRoot":"","sources":["../../../src/domain/manifest/explain.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"explain.js","sourceRoot":"","sources":["../../../src/domain/manifest/explain.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@
3
3
  // sees; the document is then validated with only the entries that passed, and
4
4
  // `kept` maps its indexes back.
5
5
  import { formatPath } from './document.js';
6
+ import { mapEntryIndex } from './quarantine.js';
6
7
  // Issues carry the offending input only on request; "required" is told apart by it.
7
8
  const REPORT_INPUT = { reportInput: true };
8
9
  export function validateDocument(schema, entries, value) {
@@ -32,8 +33,7 @@ export function validateDocument(schema, entries, value) {
32
33
  export function remapIndexes(problem, entries, kept) {
33
34
  if (entries === undefined)
34
35
  return problem;
35
- const pattern = new RegExp(`^${entries.key}\\[(\\d+)\\]`);
36
- const path = problem.path.replace(pattern, (_, i) => `${entries.key}[${kept[Number(i)] ?? i}]`);
36
+ const path = mapEntryIndex(problem.path, entries.key, (index) => kept[index] ?? index);
37
37
  return { ...problem, path };
38
38
  }
39
39
  function issuesToProblems(issues, prefix) {
@@ -1 +1 @@
1
- {"version":3,"file":"issues.js","sourceRoot":"","sources":["../../../src/domain/manifest/issues.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"issues.js","sourceRoot":"","sources":["../../../src/domain/manifest/issues.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ import { harnessSchema, mcpSchema } from './harness.schema.js';
8
8
  import { localSchema } from './local.schema.js';
9
9
  import { membersSchema } from './members.schema.js';
10
10
  import { mergeTools, splitNulls } from './overlay.js';
11
+ import { droppedEntryOf } from './quarantine.js';
11
12
  import { environmentsRules, obsReferenceRules, releaseReferenceRules, } from './rules/environments.js';
12
13
  import { harnessRules } from './rules/harness.js';
13
14
  import { membersRules } from './rules/members.js';
@@ -77,7 +78,7 @@ export function loadTools(bundledText, patchText, opts) {
77
78
  const merged = mergeTools(base.doc, patch.doc, { deletions });
78
79
  const result = finish(TOOLS, merged.toolchain, opts, NO_LINES);
79
80
  const retainedDrops = base.dropped.filter((entry) => !result.doc?.tools.some((tool) => tool.name === entry.name));
80
- const retainedProblems = base.problems.filter((problem) => retainedDrops.some((entry) => entry.reason.includes(`${problem.path}: ${problem.message}`)));
81
+ const retainedProblems = base.problems.filter((problem) => droppedEntryOf(problem, retainedDrops) !== undefined);
81
82
  return {
82
83
  ...result,
83
84
  problems: [...retainedProblems, ...patch.problems, ...result.problems],
@@ -1 +1 @@
1
- {"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/domain/manifest/loader.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,oEAAoE;AAEpE,OAAO,EACL,MAAM,EACN,IAAI,EACJ,KAAK,GAKN,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAY,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AACvE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAW5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAiBpE,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,IAAoB;IAC9D,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;QACtB,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,eAAe;QACvB,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;QAC7C,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;QACnD,WAAW,EAAE,GAAG,EAAE,CAAC,kBAAkB;KACtC,CAAC,CAAC;AACL,CAAC;AAYD,MAAM,UAAU,gBAAgB,CAC9B,IAAY,EACZ,IAAoB,EACpB,UAA0D,EAAE;IAE5D,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;QACtB,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,kBAAkB;QAC1B,SAAS,EAAE,SAAS,CAAC,YAAY;QACjC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;YACd,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS;gBACjC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,GAAG,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;oBAC5C,GAAG,qBAAqB,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;iBACjD,CAAC;SACP;QACD,WAAW,EAAE,GAAG,EAAE,CAAC,kBAAkB;KACtC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,KAAK,GAAoB;IAC7B,IAAI,EAAE,OAAO;IACb,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,SAAS,CAAC,KAAK;IAC1B,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;IAC7C,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,GAAG,EAAE,CAAC,kBAAkB;CACtC,CAAC;AAOF,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,IAAoB;IAEpB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC;AAID,MAAM,UAAU,sBAAsB,CACpC,IAAY,EACZ,IAAoB;IAEpB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC;AAeD,MAAM,UAAU,SAAS,CACvB,WAAmB,EACnB,SAA6B,EAC7B,IAAoB;IAEpB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAClE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,yFAAyF;QACzF,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC/C,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAClE,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;IACrF,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAA2B,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACjF,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CACvC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CACvE,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAC5F,CAAC;IACF,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,CAAC,GAAG,gBAAgB,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC;QACtE,OAAO,EAAE,CAAC,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9C,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5C,GAAG,SAAS,CAAC,MAAM,CAAC;KACrB,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,MAAqC;IACtD,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;AACtE,CAAC;AAID,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,IAAoB;IAC5D,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;QACtB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,aAAa;QACrB,SAAS,EAAE,SAAS,CAAC,OAAO;QAC5B,OAAO,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE;QAC5D,KAAK,EAAE,YAAY;QACnB,WAAW,EAAE,GAAG,EAAE,CAAC,kBAAkB;KACtC,CAAC,CAAC;AACL,CAAC;AAID,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,IAAoB;IAC5D,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;QACtB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,aAAa;QACrB,SAAS,EAAE,SAAS,CAAC,OAAO;QAC5B,KAAK,EAAE,YAAY;QACnB,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CACxB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,kBAAkB;KAC9F,CAAC,CAAC;AACL,CAAC;AAUD,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,OAA4C,EAAE;IAE9C,MAAM,WAAW,GACf,IAAI,CAAC,YAAY,KAAK,IAAI;QACxB,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;QACtD,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACvC,OAAO,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE;QAC7B,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE;QACf,WAAW,EAAE,GAAG,EAAE,CAAC,eAAe;KACnC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/domain/manifest/loader.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@
2
2
  // objects merge recursively, scalars override, keyed lists merge by their key, unkeyed
3
3
  // lists are replaced. Null deletes fields unless the schema accepts it as a value.
4
4
  // Provenance records each field's origin for `tool show`.
5
- import { isRaw } from './document.js';
5
+ import { isRecord } from '../values.js';
6
6
  import { acceptsNullAt } from './reflect.js';
7
7
  export const DEFAULTS_KEY = '(defaults)';
8
8
  const LIST_KEYS = {
@@ -44,7 +44,7 @@ function mergeValue(base, patch, record, path) {
44
44
  markBase(base, path, record);
45
45
  return base;
46
46
  }
47
- if (isPlain(base) && isPlain(patch)) {
47
+ if (isRecord(base) && isRecord(patch)) {
48
48
  const out = {};
49
49
  for (const key of new Set([...Object.keys(base), ...Object.keys(patch)])) {
50
50
  const merged = mergeValue(base[key], patch[key], record, join(path, key));
@@ -60,7 +60,7 @@ function mergeValue(base, patch, record, path) {
60
60
  return mergeKeyedList(base, patch, keyOf);
61
61
  }
62
62
  }
63
- if (isPlain(patch) && base === undefined) {
63
+ if (isRecord(patch) && base === undefined) {
64
64
  for (const key of Object.keys(patch))
65
65
  record(join(path, key), 'patch');
66
66
  return patch;
@@ -72,7 +72,7 @@ function mergeValue(base, patch, record, path) {
72
72
  function markBase(value, path, record) {
73
73
  if (value === undefined)
74
74
  return;
75
- if (isPlain(value)) {
75
+ if (isRecord(value)) {
76
76
  for (const [key, child] of Object.entries(value))
77
77
  markBase(child, join(path, key), record);
78
78
  return;
@@ -122,7 +122,7 @@ function removeAt(value, path) {
122
122
  out[head] = removeAt(out[head], tail);
123
123
  return out;
124
124
  }
125
- if (!isPlain(value) || typeof head !== 'string')
125
+ if (!isRecord(value) || typeof head !== 'string')
126
126
  return value;
127
127
  const out = { ...value };
128
128
  if (tail.length === 0)
@@ -136,9 +136,6 @@ function removeAt(value, path) {
136
136
  }
137
137
  return out;
138
138
  }
139
- function isPlain(value) {
140
- return typeof value === 'object' && value !== null && !Array.isArray(value);
141
- }
142
139
  function join(path, key) {
143
140
  return path === '' ? key : `${path}.${key}`;
144
141
  }
@@ -151,7 +148,7 @@ export function splitNulls(schema, raw) {
151
148
  const visit = (node, path) => {
152
149
  if (Array.isArray(node))
153
150
  return node.map((item, i) => visit(item, [...path, i]));
154
- if (!isRaw(node))
151
+ if (!isRecord(node))
155
152
  return node;
156
153
  const out = {};
157
154
  for (const [key, child] of Object.entries(node)) {
@@ -1 +1 @@
1
- {"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/domain/manifest/overlay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/domain/manifest/overlay.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  // Which provider fulfils each capability, read off the two documents that bind them and
2
2
  // the catalog this fx ships. A schema 1 document names no providers, so its git host and
3
- // its platform names imply one through what the providers themselves declare. Whether an
4
- // id names a real adapter is the registry's business.
3
+ // its platform names imply one through what the providers themselves declare. Whether a
4
+ // binding can be served is answered against the providers the registry hands in.
5
5
  import { capabilitiesInScope } from '../capability.js';
6
+ import { DevkitError } from '../errors.js';
7
+ import { nearest, suggestionHint } from '../fuzzy.js';
6
8
  import { serviceVars, } from './service.schema.js';
7
9
  // A binding names a provider by id, so the descriptor that id resolves to still has to be
8
10
  // the one registered under the capability being bound.
@@ -68,6 +70,10 @@ export function bindProviders(workspace, providers) {
68
70
  }
69
71
  return bindings;
70
72
  }
73
+ // The platform instance a binding belongs to; a workspace-wide binding has none.
74
+ export function platformOf(binding) {
75
+ return 'platform' in binding ? binding.platform : null;
76
+ }
71
77
  export function bindPlatforms(environments, providers) {
72
78
  if (environments === undefined)
73
79
  return [];
@@ -103,4 +109,30 @@ export function bindPlatforms(environments, providers) {
103
109
  };
104
110
  });
105
111
  }
112
+ // The registered provider a binding names, once it serves the bound capability and the
113
+ // binding supplies every variable it requires.
114
+ export function requireProvider(binding, registered) {
115
+ const { capability } = binding;
116
+ const ids = registered.filter((p) => p.capability === capability).map((p) => p.id);
117
+ const available = `Available: ${ids.join(', ') || '(none)'}.`;
118
+ if (binding.provider === null)
119
+ throw new DevkitError('config', 'PROVIDER_UNBOUND', `No provider is bound for ${capability}`, {
120
+ hint: `Add \`providers.${capability}\` to manifest/workspace.yaml. ${available}`,
121
+ nextSteps: ['fx manifest providers', 'fx manifest explain providers'],
122
+ });
123
+ const named = binding.provider;
124
+ const provider = registered.find((candidate) => candidate.id === named);
125
+ if (!servesCapability(provider, capability))
126
+ throw new DevkitError('config', 'PROVIDER_UNKNOWN', `"${named}" is not a ${capability} provider this fx knows`, {
127
+ hint: suggestionHint(nearest(named, ids), available),
128
+ nextSteps: ['fx manifest providers', 'fx --version'],
129
+ });
130
+ const missing = provider.vars.filter((v) => v.required && !binding.vars[v.name]?.trim());
131
+ if (missing.length > 0)
132
+ throw new DevkitError('config', 'PROVIDER_VAR_MISSING', `providers.${capability} (${provider.id}) is missing ${missing.map((v) => v.name).join(', ')}`, {
133
+ hint: missing.map((v) => `${v.name}: ${v.desc}`).join('; '),
134
+ nextSteps: ['fx manifest explain providers'],
135
+ });
136
+ return provider;
137
+ }
106
138
  //# sourceMappingURL=providers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../src/domain/manifest/providers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../src/domain/manifest/providers.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,12 @@
1
1
  // Which problems belong to one entry of a collection and which to the document. An
2
2
  // entry's problems only cost that entry; the document's problems cost the whole load.
3
+ // The path syntax that names an entry, and the tie between a dropped entry and the
4
+ // problems that dropped it, are decided here alone.
5
+ function entryHead(collection) {
6
+ return new RegExp(`^${collection}\\[(\\d+)\\]`);
7
+ }
3
8
  export function partitionProblems(problems, collection) {
4
- const pattern = new RegExp(`^${collection}\\[(\\d+)\\]`);
9
+ const pattern = entryHead(collection);
5
10
  const entries = new Map();
6
11
  const document = [];
7
12
  for (const problem of problems) {
@@ -15,4 +20,19 @@ export function partitionProblems(problems, collection) {
15
20
  }
16
21
  return { entries, document };
17
22
  }
23
+ // Rewrites the index a path names its entry by; any other path is returned as it is.
24
+ export function mapEntryIndex(path, collection, next) {
25
+ return path.replace(entryHead(collection), (_, i) => `${collection}[${next(Number(i))}]`);
26
+ }
27
+ function statement(problem) {
28
+ return `${problem.path}: ${problem.message}`;
29
+ }
30
+ export function droppedEntry(collection, name, problems) {
31
+ return { collection, name, reason: problems.map(statement).join('; ') };
32
+ }
33
+ // A dropped entry keeps its name, not its index, so the reason it was given is what
34
+ // ties a problem back to it.
35
+ export function droppedEntryOf(problem, dropped) {
36
+ return dropped.find((entry) => entry.reason.includes(statement(problem)));
37
+ }
18
38
  //# sourceMappingURL=quarantine.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"quarantine.js","sourceRoot":"","sources":["../../../src/domain/manifest/quarantine.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,sFAAsF;AAStF,MAAM,UAAU,iBAAiB,CAC/B,QAA4B,EAC5B,UAAqC;IAErC,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,UAAU,cAAc,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC7C,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC"}
1
+ {"version":3,"file":"quarantine.js","sourceRoot":"","sources":["../../../src/domain/manifest/quarantine.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,sFAAsF;AACtF,mFAAmF;AACnF,oDAAoD;AAWpD,SAAS,SAAS,CAAC,UAA2B;IAC5C,OAAO,IAAI,MAAM,CAAC,IAAI,UAAU,cAAc,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAA4B,EAC5B,UAA2B;IAE3B,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC7C,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,UAA2B,EAC3B,IAAwC;IAExC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,CAAS,EAAE,EAAE,CAAC,GAAG,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACpG,CAAC;AAED,SAAS,SAAS,CAAC,OAAgB;IACjC,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,UAA2B,EAC3B,IAAY,EACZ,QAA4B;IAE5B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAC1E,CAAC;AAED,oFAAoF;AACpF,6BAA6B;AAC7B,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,OAA2B;IAC1E,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC"}