@astryxdesign/cli 0.6.3-canary.ea2f048 → 0.6.3-canary.ebaebc4

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 (188) hide show
  1. package/README.md +2 -1
  2. package/api/build/build.type.d.mts +2 -2
  3. package/api/build/build.type.mjs +2 -2
  4. package/api/component/component.type.d.mts +6 -6
  5. package/api/component/component.type.mjs +19 -19
  6. package/api/discover/discover.type.d.mts +4 -4
  7. package/api/discover/discover.type.mjs +10 -10
  8. package/api/docs/_adapter.d.mts +37 -24
  9. package/api/docs/_adapter.mjs +169 -83
  10. package/api/docs/compiled-topics.test.mjs +78 -0
  11. package/api/docs/detail/detail.mjs +14 -63
  12. package/api/docs/detail/section/section.d.mts +1 -1
  13. package/api/docs/detail/section/section.mjs +44 -20
  14. package/api/docs/detail/section/section.test.mjs +41 -0
  15. package/api/docs/docs.d.mts +7 -2
  16. package/api/docs/docs.doc.mjs +27 -10
  17. package/api/docs/docs.mjs +16 -9
  18. package/api/docs/docs.test.mjs +6 -0
  19. package/api/docs/docs.type.d.mts +40 -3
  20. package/api/docs/docs.type.mjs +36 -8
  21. package/api/docs/index/index.d.mts +18 -0
  22. package/api/docs/index/index.mjs +32 -0
  23. package/api/docs/index/index.test.mjs +62 -0
  24. package/api/docs/integrationDocs.test.mjs +106 -0
  25. package/api/doctor/doctor.d.mts +48 -0
  26. package/api/doctor/doctor.mjs +232 -0
  27. package/api/doctor/doctor.test.mjs +196 -0
  28. package/api/hook/hook.type.d.mts +3 -3
  29. package/api/hook/hook.type.mjs +11 -11
  30. package/api/hook/list/list.d.mts +1 -1
  31. package/api/integration/add-contribution.mjs +5 -3
  32. package/api/integration/add-contribution.test.mjs +4 -4
  33. package/api/integration/integration-authoring.type.d.mts +1 -1
  34. package/api/integration/pack-check.mjs +49 -7
  35. package/api/integration/pack-check.test.mjs +249 -0
  36. package/api/search/search.d.mts +1 -1
  37. package/api/search/search.mjs +5 -5
  38. package/api/search/search.type.d.mts +2 -2
  39. package/api/search/search.type.mjs +1 -1
  40. package/api/swizzle/swizzle.type.d.mts +2 -2
  41. package/api/swizzle/swizzle.type.mjs +2 -2
  42. package/api/template/template.d.mts +1 -1
  43. package/api/template/template.type.d.mts +6 -6
  44. package/api/template/template.type.mjs +12 -12
  45. package/api/theme/build/build.mjs +20 -6
  46. package/api/theme/build/build.test.mjs +127 -0
  47. package/api/theme/palette/generate/generate.mjs +1 -1
  48. package/api/theme/palette/generate/generator.d.mts +10 -13
  49. package/api/theme/palette/generate/generator.mjs +7 -3
  50. package/api/theme/theme.type.d.mts +170 -11
  51. package/api/theme/theme.type.mjs +94 -27
  52. package/api/upgrade/_adapter.mjs +71 -5
  53. package/api/upgrade/project-context.test.mjs +272 -0
  54. package/api/upgrade/upgrade.doc.mjs +4 -3
  55. package/api/upgrade/upgrade.type.d.mts +5 -5
  56. package/api/upgrade/upgrade.type.mjs +11 -11
  57. package/assets/codemods/integration-discovery.mjs +40 -2
  58. package/assets/codemods/integration-discovery.test.mjs +58 -0
  59. package/assets/codemods/transforms/v0.3.0/__tests__/unwrap-authoring-factories.test.mjs +27 -5
  60. package/assets/codemods/transforms/v0.3.0/unwrap-authoring-factories.mjs +20 -5
  61. package/assets/docs/README.md +9 -0
  62. package/assets/docs/authoring.doc.mjs +14 -0
  63. package/assets/docs/cli-integrations.doc.mjs +86 -15
  64. package/assets/docs/styling-libraries.doc.mjs +1 -1
  65. package/assets/docs/working-with-ai.doc.mjs +1 -1
  66. package/authoring/_shared/contract.ts +22 -0
  67. package/authoring/codemod/codemod.doc.mjs +6 -1
  68. package/authoring/codemod/parse.d.mts +8 -8
  69. package/authoring/codemod/parse.mjs +8 -6
  70. package/authoring/config/parse.d.mts +13 -13
  71. package/authoring/config/parse.mjs +8 -8
  72. package/authoring/config/type.ts +3 -3
  73. package/authoring/debug/parse.d.mts +5 -5
  74. package/authoring/debug/parse.mjs +3 -3
  75. package/authoring/doctypes/_schema.d.mts +788 -23
  76. package/authoring/doctypes/_schema.mjs +492 -39
  77. package/authoring/doctypes/base/graph-fields.doc.d.mts +9 -0
  78. package/authoring/doctypes/base/graph-fields.doc.mjs +62 -0
  79. package/authoring/doctypes/base/type.ts +40 -0
  80. package/authoring/doctypes/command/command.doc.mjs +3 -2
  81. package/authoring/doctypes/command/parse.d.mts +2 -2
  82. package/authoring/doctypes/command/parse.mjs +1 -1
  83. package/authoring/doctypes/command/type.ts +3 -2
  84. package/authoring/doctypes/component/component.doc.mjs +6 -3
  85. package/authoring/doctypes/component/parse.d.mts +2 -2
  86. package/authoring/doctypes/component/parse.mjs +1 -1
  87. package/authoring/doctypes/component/type.ts +4 -3
  88. package/authoring/doctypes/enum/parse.d.mts +2 -2
  89. package/authoring/doctypes/enum/parse.mjs +1 -1
  90. package/authoring/doctypes/enum/type.ts +3 -1
  91. package/authoring/doctypes/function/function.doc.mjs +4 -0
  92. package/authoring/doctypes/function/parse.d.mts +2 -2
  93. package/authoring/doctypes/function/parse.mjs +1 -1
  94. package/authoring/doctypes/function/type.ts +6 -2
  95. package/authoring/doctypes/hook/hook.doc.mjs +4 -0
  96. package/authoring/doctypes/hook/parse.d.mts +2 -2
  97. package/authoring/doctypes/hook/parse.mjs +1 -1
  98. package/authoring/doctypes/hook/type.ts +3 -2
  99. package/authoring/doctypes/legacy.d.mts +8 -6
  100. package/authoring/doctypes/legacy.mjs +5 -4
  101. package/authoring/doctypes/load-contract.test.mjs +207 -0
  102. package/authoring/doctypes/namespace/namespace.doc.d.mts +9 -0
  103. package/authoring/doctypes/namespace/namespace.doc.mjs +132 -0
  104. package/authoring/doctypes/namespace/parse.d.mts +12 -0
  105. package/authoring/doctypes/namespace/parse.mjs +25 -0
  106. package/authoring/doctypes/namespace/parse.test.mjs +165 -0
  107. package/authoring/doctypes/namespace/type.ts +71 -0
  108. package/authoring/doctypes/parse.d.mts +20 -18
  109. package/authoring/doctypes/parse.mjs +16 -10
  110. package/authoring/doctypes/parse.test.mjs +77 -3
  111. package/authoring/doctypes/reference/parse.d.mts +2 -2
  112. package/authoring/doctypes/reference/parse.mjs +8 -5
  113. package/authoring/doctypes/reference/reference.doc.mjs +17 -4
  114. package/authoring/doctypes/reference/type.ts +51 -5
  115. package/authoring/doctypes/schema/parse.d.mts +2 -2
  116. package/authoring/doctypes/schema/parse.mjs +1 -1
  117. package/authoring/doctypes/schema/type.ts +3 -2
  118. package/authoring/doctypes/template/parse.d.mts +92 -1
  119. package/authoring/doctypes/template/parse.mjs +36 -2
  120. package/authoring/doctypes/template/parse.test.mjs +8 -2
  121. package/authoring/doctypes/template/template.doc.mjs +4 -0
  122. package/authoring/doctypes/template/type.ts +5 -2
  123. package/authoring/doctypes/types.ts +10 -9
  124. package/authoring/gap-report/parse.d.mts +10 -10
  125. package/authoring/gap-report/parse.mjs +6 -6
  126. package/authoring/gap-report/type.ts +1 -1
  127. package/authoring/identity/identity.doc.d.mts +9 -0
  128. package/authoring/identity/identity.doc.mjs +61 -0
  129. package/authoring/identity/type.ts +132 -0
  130. package/authoring/index.d.mts +1 -0
  131. package/authoring/index.d.ts +49 -17
  132. package/authoring/index.mjs +1 -0
  133. package/authoring/integration/integration.doc.mjs +13 -6
  134. package/authoring/integration/parse.d.mts +2 -2
  135. package/authoring/integration/parse.mjs +1 -1
  136. package/authoring/integration/parse.test.mjs +10 -1
  137. package/authoring/integration/schema.d.mts +6 -4
  138. package/authoring/integration/schema.mjs +9 -3
  139. package/authoring/integration/type.ts +23 -6
  140. package/authoring/shadcn/receipt.d.mts +6 -6
  141. package/clients/cli/commands/docs.doc.mjs +13 -3
  142. package/clients/cli/commands/docs.mjs +121 -21
  143. package/clients/cli/commands/docs.test.mjs +88 -0
  144. package/clients/cli/commands/integration-authoring.test.mjs +13 -9
  145. package/clients/cli/commands/theme-palette-generate.doc.mjs +8 -4
  146. package/clients/cli/commands/upgrade.doc.mjs +2 -2
  147. package/clients/cli/formatters/index.mjs +162 -1
  148. package/clients/cli/formatters/index.test.mjs +91 -0
  149. package/clients/cli/lib/manifest.mjs +7 -2
  150. package/foundation/config/project.mjs +21 -6
  151. package/foundation/discovery/authoring-self-docs.d.mts +69 -0
  152. package/foundation/discovery/authoring-self-docs.mjs +214 -0
  153. package/foundation/discovery/authoring-self-docs.test.mjs +154 -0
  154. package/foundation/discovery/component-discovery.d.mts +1 -1
  155. package/foundation/discovery/component-discovery.mjs +2 -1
  156. package/foundation/discovery/docs-discovery.d.mts +11 -4
  157. package/foundation/discovery/docs-discovery.mjs +208 -88
  158. package/foundation/discovery/docs-discovery.test.mjs +279 -13
  159. package/foundation/discovery/docs-output-budget.d.mts +28 -0
  160. package/foundation/discovery/docs-output-budget.mjs +50 -0
  161. package/foundation/discovery/docs-section-key.d.mts +98 -0
  162. package/foundation/discovery/docs-section-key.mjs +221 -0
  163. package/foundation/discovery/docs-section-key.test.mjs +224 -0
  164. package/foundation/discovery/template-adapter.mjs +2 -1
  165. package/foundation/discovery/theming-targets.test.mjs +4 -0
  166. package/foundation/doc-compiler/compile.d.mts +162 -0
  167. package/foundation/doc-compiler/compile.mjs +262 -0
  168. package/foundation/doc-compiler/doc-compiler.test.mjs +687 -0
  169. package/foundation/doc-compiler/ir.d.mts +9 -0
  170. package/foundation/doc-compiler/ir.mjs +287 -0
  171. package/foundation/doc-compiler/lenses.d.mts +33 -0
  172. package/foundation/doc-compiler/lenses.mjs +127 -0
  173. package/foundation/identity/provider-identity.d.mts +90 -0
  174. package/foundation/identity/provider-identity.mjs +320 -0
  175. package/foundation/identity/provider-identity.test.mjs +254 -0
  176. package/foundation/identity/providers.d.mts +7 -0
  177. package/foundation/identity/providers.mjs +16 -0
  178. package/foundation/integrations/autolink.mjs +12 -5
  179. package/foundation/integrations/integration-warnings.mjs +6 -0
  180. package/foundation/integrations/integrations.d.mts +46 -2
  181. package/foundation/integrations/integrations.mjs +167 -8
  182. package/foundation/integrations/integrations.test.mjs +384 -1
  183. package/foundation/integrations/provider-conflicts.test.mjs +125 -0
  184. package/foundation/integrations/validate-contributions.d.mts +2 -0
  185. package/foundation/integrations/validate-contributions.mjs +10 -0
  186. package/foundation/response/json-contract.test.mjs +46 -17
  187. package/foundation/response/response-types.doc.mjs +6 -1
  188. package/package.json +9 -11
@@ -7,25 +7,27 @@
7
7
  * packages/cli/assets/docs/{topic}.doc.mjs plus every topic the configured
8
8
  * integrations contribute — and, when a --dense/--zh overlay is requested,
9
9
  * the sibling {topic}.doc.dense.mjs / {topic}.doc.zh.mjs.
10
- * @output Catalog access, overlay- and extension-merged reference-doc data,
11
- * and a combined resolve step ({catalog, docsData}) that the detail and
12
- * section leaves share.
13
- * @position Sits beside docs.mjs (api/docs/). Owns everything ≥2 leaves need so
14
- * no leaf re-implements resolution, overlay merging, or unknown-topic
15
- * handling. Discovery itself lives in foundation/discovery/docs-discovery,
16
- * which api/search and the agent-docs block read through the same catalog.
10
+ * @output Catalog access, the compiler input for a topic, and the compiled
11
+ * node for it: lowered (overlaid, extensions merged, keys stamped) or linked
12
+ * (token references resolved too), memoized per catalog.
13
+ * @position Sits beside docs.mjs (api/docs/). Loads authored files and hands
14
+ * them to foundation/doc-compiler, so no leaf, doctor check or search loads,
15
+ * merges, or resolves docs on its own. Discovery itself lives in
16
+ * foundation/discovery/docs-discovery, which the catalog comes from.
17
17
  */
18
18
 
19
19
  import * as fs from 'node:fs';
20
20
  import * as path from 'node:path';
21
21
  import {pathToFileURL} from 'node:url';
22
22
  import {Project} from '../../foundation/config/project.mjs';
23
+ import {DocsCatalog} from '../../foundation/discovery/docs-discovery.mjs';
23
24
  import {
24
- DocsCatalog,
25
- mergeTopic,
26
- } from '../../foundation/discovery/docs-discovery.mjs';
25
+ linkReferenceTopic,
26
+ lowerReferenceTopic,
27
+ } from '../../foundation/doc-compiler/compile.mjs';
27
28
  import {AstryxError} from '../error.mjs';
28
29
  import {ERROR_CODES} from '../../foundation/response/error-codes.mjs';
30
+ import {parseDoc} from '../../authoring/doctypes/parse.mjs';
29
31
 
30
32
  /**
31
33
  * The project's topics: the built-in ones plus whatever the configured
@@ -49,93 +51,176 @@ export async function loadDocsCatalog(cwd = process.cwd()) {
49
51
  }
50
52
  }
51
53
 
54
+ /** The localized overlays a docs read can apply. */
55
+ export const OVERLAY_LANGUAGES = ['zh', 'dense'];
56
+
52
57
  /**
58
+ * Where the `lang` overlay of a doc file lives: `{topic}.doc.{lang}.mjs`.
53
59
  * @param {string} docPath
54
- * @param {{lang?: string|null}} [opts]
55
- * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
60
+ * @param {string} lang
61
+ * @returns {string}
62
+ */
63
+ function overlayPath(docPath, lang) {
64
+ return path.join(
65
+ path.dirname(docPath),
66
+ `${path.basename(docPath, '.doc.mjs')}.doc.${lang}.mjs`,
67
+ );
68
+ }
69
+
70
+ /**
71
+ * The overlay languages a topic ships for its own file or any extension.
72
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
73
+ * @returns {string[]}
56
74
  */
57
- export async function loadReferenceDocs(docPath, {lang} = {}) {
58
- const mod = await import(pathToFileURL(docPath).href);
59
- const docs = mod.docs ?? mod.default;
60
- if (!lang || lang === 'en') return docs;
61
-
62
- const dir = path.dirname(docPath);
63
- const base = path.basename(docPath, '.doc.mjs');
64
- const locale = lang === 'dense' ? 'dense' : lang;
65
- const translationPath = path.join(dir, `${base}.doc.${locale}.mjs`);
66
- if (!fs.existsSync(translationPath)) return docs;
67
-
68
- const translationMod = await import(pathToFileURL(translationPath).href);
69
- const translation = translationMod.docsZh || translationMod.docsDense;
70
- if (!translation) return docs;
71
-
72
- // Overlays are keyed to a base section by title (`section`), not by array
73
- // position. Position-keying silently grafted each overlay title onto whatever
74
- // base section happened to share its index, so an overlay that omitted or
75
- // reordered a section corrupted every section after it — `docs tokens --dense`
76
- // printed the colour table under a "Spacing" heading (#2182). An overlay may
77
- // now cover any subset of sections, in any order; sections it does not name
78
- // keep their base content.
79
- /** @type {Map<string, any>} */
80
- const bySection = new Map();
81
- for (const ts of translation.sections ?? []) {
82
- if (ts?.section != null) bySection.set(ts.section, ts);
75
+ export function overlayLanguages(entry) {
76
+ const files = [entry.path, ...entry.extensions.map(ext => ext.path)];
77
+ return OVERLAY_LANGUAGES.filter(lang =>
78
+ files.some(file => fs.existsSync(overlayPath(file, lang))),
79
+ );
80
+ }
81
+
82
+ /**
83
+ * The overlay a read applies: none for the authored language.
84
+ * @param {string | null | undefined} lang
85
+ * @returns {string | null}
86
+ */
87
+ function overlayLanguage(lang) {
88
+ return lang && lang !== 'en' ? lang : null;
89
+ }
90
+
91
+ /**
92
+ * Load one authored file and the overlay for `lang`. A failure is recorded on
93
+ * the result, not thrown, so the compiler reports it in reading order.
94
+ * @param {string} docPath
95
+ * @param {string | null} lang
96
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').AuthoredFile>}
97
+ */
98
+ async function loadAuthoredFile(docPath, lang) {
99
+ const file = path.basename(docPath);
100
+ let doc;
101
+ try {
102
+ const mod = await import(pathToFileURL(docPath).href);
103
+ doc = parseDoc(mod.docs ?? mod.default, file);
104
+ } catch (error) {
105
+ return {file, error};
106
+ }
107
+ if (!lang) return {file, doc};
108
+ const translationPath = overlayPath(docPath, lang);
109
+ if (!fs.existsSync(translationPath)) return {file, doc};
110
+ try {
111
+ const translationMod = await import(pathToFileURL(translationPath).href);
112
+ return {
113
+ file,
114
+ doc,
115
+ overlay: translationMod.docsZh || translationMod.docsDense || null,
116
+ };
117
+ } catch (overlayError) {
118
+ return {file, doc, overlayError};
83
119
  }
120
+ }
84
121
 
122
+ /**
123
+ * Everything the compiler needs for one topic, read from disk.
124
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
125
+ * @param {string | null} lang
126
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').ReferenceTopicInput>}
127
+ */
128
+ async function loadCompilerInput(entry, lang) {
129
+ const extensions = [];
130
+ for (const extension of entry.extensions) {
131
+ extensions.push({
132
+ ...(await loadAuthoredFile(extension.path, lang)),
133
+ provider: extension.package,
134
+ });
135
+ }
85
136
  return {
86
- ...docs,
87
- description: translation.description || docs.description,
88
- sections: docs.sections.map(
89
- (/** @type {import('@astryxdesign/cli/authoring').ReferenceSection} */ section) => {
90
- const ts = bySection.get(section.title);
91
- if (!ts) return section;
92
- return {
93
- ...section,
94
- title: ts.title || section.title,
95
- content: section.content.map(
96
- (
97
- /** @type {import('@astryxdesign/cli/authoring').ReferenceContentBlock} */ block,
98
- /** @type {number} */ bi,
99
- ) => {
100
- const tb = ts.content?.[bi];
101
- if (!tb) return block;
102
- if (tb.type === 'prose' && block.type === 'prose') return {...block, text: tb.text};
103
- if (tb.type === 'list' && block.type === 'list') return {...block, items: tb.items};
104
- return block;
105
- },
106
- ),
107
- };
108
- },
109
- ),
137
+ id: entry.name,
138
+ provider: entry.package,
139
+ replaces: entry.replaces ?? null,
140
+ lang,
141
+ base: await loadAuthoredFile(entry.path, lang),
142
+ extensions,
110
143
  };
111
144
  }
112
145
 
146
+ /** @type {WeakMap<DocsCatalog, Map<string, Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>>>} */
147
+ const loweredByCatalog = new WeakMap();
148
+
113
149
  /**
114
- * Load one catalog entry: its own doc, plus any extension an integration
115
- * merged onto it, in configuration order.
116
- *
117
- * A localization overlay applies to each file before the extensions are
118
- * merged, so an extension written in the base language stays readable under
119
- * `--dense`/`--zh` (it replaces its own sections and leaves the rest
120
- * translated) rather than being dropped.
121
- *
150
+ * One topic, lowered for `lang`: overlaid, extensions merged, keys stamped.
151
+ * Memoized per catalog, so a read that references a topic twice loads it once.
152
+ * Every read of the catalog shares the memoized node, so it is frozen; the
153
+ * lenses hand readers copies.
154
+ * @param {DocsCatalog} catalog
122
155
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
123
- * @param {{lang?: string|null}} [opts]
124
- * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
156
+ * @param {string | null} [lang]
157
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
125
158
  */
126
- export async function loadTopicDoc(entry, {lang} = {}) {
127
- let doc = await loadReferenceDocs(entry.path, {lang});
128
- for (const extension of entry.extensions) {
129
- doc = mergeTopic(doc, await loadReferenceDocs(extension.path, {lang}));
159
+ export function lowerTopic(catalog, entry, lang = null) {
160
+ const overlay = overlayLanguage(lang);
161
+ let cache = loweredByCatalog.get(catalog);
162
+ if (!cache) {
163
+ cache = new Map();
164
+ loweredByCatalog.set(catalog, cache);
165
+ }
166
+ const key = `${entry.name.toLowerCase()}\u0000${overlay ?? ''}`;
167
+ let lowered = cache.get(key);
168
+ if (!lowered) {
169
+ lowered = loadCompilerInput(entry, overlay).then(input =>
170
+ deepFreeze(lowerReferenceTopic(input)),
171
+ );
172
+ cache.set(key, lowered);
173
+ }
174
+ return lowered;
175
+ }
176
+
177
+ /**
178
+ * Freeze a value and everything in it.
179
+ * @template T
180
+ * @param {T} value
181
+ * @returns {T}
182
+ */
183
+ function deepFreeze(value) {
184
+ if (value !== null && typeof value === 'object' && !Object.isFrozen(value)) {
185
+ Object.freeze(value);
186
+ for (const child of Object.values(value)) deepFreeze(child);
130
187
  }
131
- return doc;
188
+ return value;
189
+ }
190
+
191
+ /**
192
+ * How a token reference finds its target: the topic it names in `catalog`,
193
+ * lowered for the same language.
194
+ * @param {DocsCatalog} catalog
195
+ * @param {string | null} lang
196
+ * @returns {(topic: string) => Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode | null>}
197
+ */
198
+ export function referenceTargets(catalog, lang) {
199
+ return async topic => {
200
+ const target = catalog.resolve(topic);
201
+ return target ? lowerTopic(catalog, target, lang) : null;
202
+ };
203
+ }
204
+
205
+ /**
206
+ * One topic, compiled for `lang`: lowered, then every token reference linked.
207
+ * @param {DocsCatalog} catalog
208
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
209
+ * @param {string | null} [lang]
210
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
211
+ */
212
+ export async function compileTopic(catalog, entry, lang = null) {
213
+ return linkReferenceTopic(
214
+ await lowerTopic(catalog, entry, lang),
215
+ referenceTargets(catalog, lang),
216
+ );
132
217
  }
133
218
 
134
219
  /**
135
220
  * Resolve `topic` against the project's catalog (throwing `ERR_UNKNOWN_TOPIC`
136
- * when unmatched), and load it with any --dense/--zh overlay and any
137
- * integration extension applied. Shared by the detail and section leaves so
138
- * topic normalization and unknown-topic handling live in exactly one place.
221
+ * when unmatched) and lower it with any --dense/--zh overlay and any
222
+ * integration extension applied. Shared by the leaves so topic normalization
223
+ * and unknown-topic handling live in exactly one place.
139
224
  *
140
225
  * @param {string} topic
141
226
  * @param {object} [options]
@@ -145,7 +230,8 @@ export async function loadTopicDoc(entry, {lang} = {}) {
145
230
  * @param {string} [options.cwd]
146
231
  * @returns {Promise<{
147
232
  * catalog: DocsCatalog,
148
- * docsData: import('./docs.type.mjs').DocsDetailResponse['data'],
233
+ * node: import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode,
234
+ * lang: string | null,
149
235
  * }>}
150
236
  */
151
237
  export async function resolveTopicDocs(topic, options = {}) {
@@ -165,6 +251,6 @@ export async function resolveTopicDocs(topic, options = {}) {
165
251
  );
166
252
  }
167
253
 
168
- const docsData = await loadTopicDoc(entry, {lang: effectiveLang});
169
- return {catalog, docsData};
254
+ const node = await lowerTopic(catalog, entry, effectiveLang);
255
+ return {catalog, node, lang: effectiveLang};
170
256
  }
@@ -0,0 +1,78 @@
1
+ // Copyright (c) Meta Platforms, Inc. and affiliates.
2
+
3
+ /**
4
+ * @file Every shipped topic compiles to a plain-JSON node that answers every
5
+ * docs read exactly as the live one does, and no read can change another read
6
+ * of the same catalog.
7
+ */
8
+
9
+ import {describe, expect, it} from 'vitest';
10
+ import {parseCompiledReferenceNode} from '../../foundation/doc-compiler/ir.mjs';
11
+ import {detailView, indexView} from '../../foundation/doc-compiler/lenses.mjs';
12
+ import {
13
+ compileTopic,
14
+ loadDocsCatalog,
15
+ lowerTopic,
16
+ overlayLanguages,
17
+ } from './_adapter.mjs';
18
+
19
+ const SLOW = 60_000;
20
+
21
+ describe('every shipped topic compiles to plain JSON', () => {
22
+ it(
23
+ 'survives a JSON round trip with identical responses in every language',
24
+ async () => {
25
+ const catalog = await loadDocsCatalog();
26
+ let compiled = 0;
27
+ for (const entry of catalog.entries()) {
28
+ for (const lang of [null, ...overlayLanguages(entry)]) {
29
+ const lowered = await lowerTopic(catalog, entry, lang);
30
+ expect(parseCompiledReferenceNode(lowered)).toBe(lowered);
31
+ const node = await compileTopic(catalog, entry, lang);
32
+ expect(parseCompiledReferenceNode(node)).toBe(node);
33
+ const copy = parseCompiledReferenceNode(
34
+ JSON.parse(JSON.stringify(node)),
35
+ );
36
+ expect(JSON.stringify(detailView(copy))).toBe(
37
+ JSON.stringify(detailView(node)),
38
+ );
39
+ expect(JSON.stringify(indexView(copy))).toBe(
40
+ JSON.stringify(indexView(node)),
41
+ );
42
+ compiled += 1;
43
+ }
44
+ }
45
+ expect(compiled).toBeGreaterThan(catalog.entries().length);
46
+ },
47
+ SLOW,
48
+ );
49
+ });
50
+
51
+ describe('reads that share a catalog', () => {
52
+ it(
53
+ 'never let one read change another',
54
+ async () => {
55
+ const catalog = await loadDocsCatalog();
56
+ const tokens = catalog.resolve('tokens');
57
+ const first = detailView(await compileTopic(catalog, tokens));
58
+ for (const section of first.sections) {
59
+ section.title = 'EDITED';
60
+ for (const block of section.content) {
61
+ if (typeof block.text === 'string') block.text = 'EDITED';
62
+ if (Array.isArray(block.rows)) block.rows.push(['EDITED']);
63
+ }
64
+ }
65
+ const again = detailView(await compileTopic(catalog, tokens));
66
+ const index = indexView(await lowerTopic(catalog, tokens));
67
+ const spacing = detailView(
68
+ await compileTopic(catalog, catalog.resolve('spacing')),
69
+ );
70
+ for (const read of [again, index, spacing]) {
71
+ expect(JSON.stringify(read)).not.toContain('EDITED');
72
+ }
73
+ const lowered = await lowerTopic(catalog, tokens);
74
+ expect(Object.isFrozen(lowered.doc.sections[0].content)).toBe(true);
75
+ },
76
+ SLOW,
77
+ );
78
+ });
@@ -3,69 +3,17 @@
3
3
  /**
4
4
  * @file docs.detail leaf — load one topic's full reference doc.
5
5
  *
6
- * @input A topic name plus optional {lang, zh, dense}. Resolves and loads the
7
- * topic via the shared adapter, then inlines any token-ref blocks.
6
+ * @input A topic name plus optional {lang, zh, dense, cwd}. Resolves the topic
7
+ * via the shared adapter and compiles it with its token references linked.
8
8
  * @output { type: 'docs.detail', data: ReferenceDoc } — the full doc with
9
- * token-refs resolved, matching `xds --json docs <topic>`.
10
- * @position Leaf under api/docs. Owns resolveTokenRefs (used only here); shares
11
- * discovery/loading/topic-resolution with the section leaf via _adapter.mjs.
9
+ * token-refs inlined, matching `astryx --json docs <topic>`.
10
+ * @position Leaf under api/docs. Reads the compiled node through the detail
11
+ * lens; resolution, overlays and extensions happen in the compiler.
12
12
  */
13
13
 
14
- import {loadTopicDoc, resolveTopicDocs} from '../_adapter.mjs';
15
-
16
- /**
17
- * Resolve token-ref blocks by inlining the referenced section's table.
18
- * This allows section docs to reference token tables without duplicating data.
19
- *
20
- * The reference is resolved through the catalog, so a topic may point at one
21
- * an integration contributed (or replaced) rather than only at a built-in.
22
- * @param {import('../docs.type.mjs').DocsDetailResponse['data']} docsData
23
- * @param {import('../../../foundation/discovery/docs-discovery.mjs').DocsCatalog} catalog
24
- * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse['data']>}
25
- */
26
- async function resolveTokenRefs(docsData, catalog) {
27
- const resolved = {...docsData, sections: [...docsData.sections]};
28
- for (let si = 0; si < resolved.sections.length; si++) {
29
- const section = resolved.sections[si];
30
- /** @type {import('@astryxdesign/cli/authoring').ReferenceContentBlock[]} */
31
- const newContent = [];
32
- for (const block of section.content) {
33
- if (block.type === 'token-ref') {
34
- const refEntry = catalog.resolve(block.topic);
35
- if (!refEntry) {
36
- newContent.push({type: 'prose', text: `[token-ref: unknown topic "${block.topic}"]`});
37
- continue;
38
- }
39
- const refDocs = await loadTopicDoc(refEntry);
40
- const refSection = refDocs.sections.find(
41
- (/** @type {import('@astryxdesign/cli/authoring').ReferenceSection} */ s) =>
42
- s.title.toLowerCase() === block.section.toLowerCase(),
43
- );
44
- if (!refSection) {
45
- newContent.push({type: 'prose', text: `[token-ref: section "${block.section}" not found in "${block.topic}"]`});
46
- continue;
47
- }
48
- // Inline the referenced section's content blocks (tables, prose, etc.)
49
- // and carry over the previewType
50
- for (const refBlock of refSection.content) {
51
- newContent.push(refBlock);
52
- }
53
- // If the referenced section has a previewType, attach it to our section
54
- if (refSection.previewType && !section.previewType) {
55
- resolved.sections[si] = {...section, previewType: refSection.previewType, content: newContent};
56
- }
57
- } else {
58
- newContent.push(block);
59
- }
60
- }
61
- if (resolved.sections[si] === section) {
62
- resolved.sections[si] = {...section, content: newContent};
63
- } else {
64
- resolved.sections[si].content = newContent;
65
- }
66
- }
67
- return resolved;
68
- }
14
+ import {linkReferenceTopic} from '../../../foundation/doc-compiler/compile.mjs';
15
+ import {detailView} from '../../../foundation/doc-compiler/lenses.mjs';
16
+ import {referenceTargets, resolveTopicDocs} from '../_adapter.mjs';
69
17
 
70
18
  /**
71
19
  * @param {string} topic
@@ -77,7 +25,10 @@ async function resolveTokenRefs(docsData, catalog) {
77
25
  * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse>}
78
26
  */
79
27
  export async function detail(topic, options = {}) {
80
- const {catalog, docsData} = await resolveTopicDocs(topic, options);
81
- const resolved = await resolveTokenRefs(docsData, catalog);
82
- return {type: 'docs.detail', data: resolved};
28
+ const {catalog, node, lang} = await resolveTopicDocs(topic, options);
29
+ const linked = await linkReferenceTopic(
30
+ node,
31
+ referenceTargets(catalog, lang),
32
+ );
33
+ return {type: 'docs.detail', data: detailView(linked)};
83
34
  }
@@ -3,7 +3,7 @@
3
3
 
4
4
  /**
5
5
  * @param {string} topic
6
- * @param {string} sectionName
6
+ * @param {string} sectionName a section key, or a title (or part of one)
7
7
  * @param {object} [options]
8
8
  * @param {string} [options.lang]
9
9
  * @param {boolean} [options.zh]
@@ -1,25 +1,36 @@
1
1
  // Copyright (c) Meta Platforms, Inc. and affiliates.
2
2
 
3
3
  /**
4
- * @file docs.detail.section leaf — load a single named section of a topic.
4
+ * @file docs.detail.section leaf — load a single section of a topic.
5
5
  *
6
6
  * @input A topic name, a section query, and optional {lang, zh, dense}. Resolves
7
- * and loads the topic via the shared adapter, then finds the first section
8
- * whose title contains the (case-insensitive) query.
9
- * @output { type: 'docs.detail.section', data: ReferenceSection } — matching
10
- * `xds --json docs <topic> <section>`. Throws ERR_UNKNOWN_SECTION when no
11
- * section title matches.
12
- * @position Leaf nested under api/docs/detail. Shares discovery/loading/
13
- * topic-resolution with the detail leaf via _adapter.mjs.
7
+ * the topic via the shared adapter, finds the section in its lowered compiled
8
+ * node by its stable key, then by exact title, then by a title that contains
9
+ * the query, and links only that section.
10
+ * @output { type: 'docs.detail.section', data: ReferenceSection } with any
11
+ * token-ref blocks inlined — matching `astryx --json docs <topic> <section>`.
12
+ * Throws ERR_UNKNOWN_SECTION when nothing matches, or when the query matches
13
+ * more than one section (the candidates come back as suggestions).
14
+ * @position Leaf nested under api/docs/detail. Shares topic resolution with the
15
+ * detail leaf via _adapter.mjs and reads through the compiler's lenses.
14
16
  */
15
17
 
16
18
  import {AstryxError} from '../../../error.mjs';
17
19
  import {ERROR_CODES} from '../../../../foundation/response/error-codes.mjs';
18
- import {resolveTopicDocs} from '../../_adapter.mjs';
20
+ import {
21
+ findDocSection,
22
+ sectionKey,
23
+ } from '../../../../foundation/discovery/docs-section-key.mjs';
24
+ import {linkReferenceSection} from '../../../../foundation/doc-compiler/compile.mjs';
25
+ import {
26
+ readerSections,
27
+ sectionView,
28
+ } from '../../../../foundation/doc-compiler/lenses.mjs';
29
+ import {referenceTargets, resolveTopicDocs} from '../../_adapter.mjs';
19
30
 
20
31
  /**
21
32
  * @param {string} topic
22
- * @param {string} sectionName
33
+ * @param {string} sectionName a section key, or a title (or part of one)
23
34
  * @param {object} [options]
24
35
  * @param {string} [options.lang]
25
36
  * @param {boolean} [options.zh]
@@ -28,10 +39,9 @@ import {resolveTopicDocs} from '../../_adapter.mjs';
28
39
  * @returns {Promise<import('../../docs.type.mjs').DocsDetailSectionResponse>}
29
40
  */
30
41
  export async function section(topic, sectionName, options = {}) {
31
- // An empty section name must error, not resolve to the first section via
32
- // `.includes('')`. The docs() dispatcher routes a falsy section to detail, but
33
- // the leaf must be safe on its own. A non-string would also throw a raw
34
- // TypeError below (`.toLowerCase()`) → downgrades to ERR_UNKNOWN.
42
+ // An empty section name must error, not resolve to the first section. The
43
+ // docs() dispatcher routes a falsy section to the topic, but the leaf must be
44
+ // safe on its own; a non-string would otherwise throw a raw TypeError.
35
45
  if (typeof sectionName !== 'string' || !sectionName.trim()) {
36
46
  throw new AstryxError(
37
47
  'A section name is required',
@@ -39,16 +49,30 @@ export async function section(topic, sectionName, options = {}) {
39
49
  ERROR_CODES.ERR_UNKNOWN_SECTION,
40
50
  );
41
51
  }
42
- const {docsData} = await resolveTopicDocs(topic, options);
43
52
 
44
- const normalizedSection = sectionName.toLowerCase();
45
- const match = docsData.sections.find(s => s.title.toLowerCase().includes(normalizedSection));
53
+ const {catalog, node, lang} = await resolveTopicDocs(topic, options);
54
+ const sections = readerSections(node);
55
+ const {section: match, candidates} = findDocSection(sections, sectionName);
46
56
  if (!match) {
57
+ const ambiguous = candidates.length > 1;
47
58
  throw new AstryxError(
48
- `Section "${sectionName}" not found in "${topic}"`,
49
- docsData.sections.map(s => ({name: s.title, reason: 'available section'})),
59
+ ambiguous
60
+ ? `Section "${sectionName}" matches ${candidates.length} sections in "${topic}". Read one by its key.`
61
+ : `Section "${sectionName}" not found in "${topic}"`,
62
+ (ambiguous ? candidates : sections).map(s => ({
63
+ name: sectionKey(s),
64
+ reason: s.title,
65
+ })),
50
66
  ERROR_CODES.ERR_UNKNOWN_SECTION,
51
67
  );
52
68
  }
53
- return {type: 'docs.detail.section', data: match};
69
+
70
+ // A section read on its own inlines its token refs, as the whole topic does;
71
+ // otherwise a section that is only a token-ref prints blank. Only this
72
+ // section is linked, so a broken reference elsewhere cannot fail the read.
73
+ const linked = await linkReferenceSection(
74
+ match,
75
+ referenceTargets(catalog, lang),
76
+ );
77
+ return {type: 'docs.detail.section', data: sectionView(node, linked)};
54
78
  }
@@ -10,6 +10,7 @@
10
10
  import {describe, it, expect} from 'vitest';
11
11
  import {section} from './section.mjs';
12
12
  import {AstryxError} from '../../../error.mjs';
13
+ import {loadDocsCatalog, lowerTopic} from '../../_adapter.mjs';
13
14
 
14
15
  const SLOW = 30_000;
15
16
 
@@ -39,4 +40,44 @@ describe('docs.detail.section leaf', () => {
39
40
  code: 'ERR_UNKNOWN_SECTION',
40
41
  });
41
42
  }, SLOW);
43
+
44
+ it('reads a section by its stable key', async () => {
45
+ const catalog = await loadDocsCatalog();
46
+ const {doc} = await lowerTopic(catalog, catalog.resolve('theme'));
47
+ const target = doc.sections[doc.sections.length - 1];
48
+ const res = await section('theme', target.id);
49
+ expect(res.data.title).toBe(target.title);
50
+ expect(res.data.id).toBe(target.id);
51
+ }, SLOW);
52
+
53
+ it('refuses a query that matches more than one section', async () => {
54
+ const err = await section('theme', 'e').catch(e => e);
55
+ expect(err).toBeInstanceOf(AstryxError);
56
+ expect(err.code).toBe('ERR_UNKNOWN_SECTION');
57
+ expect(err.message).toMatch(/matches \d+ sections/);
58
+ expect(err.suggestions.length).toBeGreaterThan(1);
59
+ }, SLOW);
60
+
61
+ it.each([null, 'zh', 'dense'])(
62
+ 'inlines token refs when a section is read on its own (lang %s)',
63
+ async lang => {
64
+ const catalog = await loadDocsCatalog();
65
+ let checked = 0;
66
+ for (const entry of catalog.entries()) {
67
+ const {doc} = await lowerTopic(catalog, entry);
68
+ for (const own of doc.sections) {
69
+ if (!own.content.some(block => block.type === 'token-ref')) continue;
70
+ const res = await section(entry.name, own.id, lang ? {lang} : {});
71
+ expect(res.data.content.length).toBeGreaterThan(0);
72
+ expect(res.data.content.some(block => block.type === 'token-ref')).toBe(
73
+ false,
74
+ );
75
+ expect(JSON.stringify(res.data.content)).not.toContain('[token-ref:');
76
+ checked += 1;
77
+ }
78
+ }
79
+ expect(checked).toBeGreaterThan(0);
80
+ },
81
+ SLOW,
82
+ );
42
83
  });