@baiyibai-antora/extensions 1.24.0 → 1.25.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.
@@ -1,59 +1,78 @@
1
1
  /**
2
2
  * Suppresses unsatisfied `ifdef::`/`ifndef::` conditional blocks in raw
3
- * AsciiDoc source, using Asciidoctor's real preprocessing reader rather than
4
- * a hand-rolled directive parser. See
5
- * agent-memory/autoterm-trademark-it-api-rewrite-scope.md (Phase 2) for why:
6
- * real nesting, multi-line vs. inline forms, and `+`/`,` combinator
7
- * semantics are exactly the class of edge case a regex-based evaluator gets
8
- * wrong under pressure, and Asciidoctor already implements all of it
9
- * correctly.
3
+ * AsciiDoc source by letting Asciidoctor itself read the document, rather
4
+ * than a hand-rolled directive or block parser. See
5
+ * agent-memory/autoterm-trademark-it-api-rewrite-scope.md (Phase 2) for why.
10
6
  *
11
- * The real reader evaluates more than this function is meant to touch, so
12
- * three things are deliberately protected before handing text to it:
7
+ * `evaluateDocument` runs a full `Asciidoctor.load()` parse. Asciidoctor's
8
+ * parser applies every attribute entry where it sits, with its own rules for
9
+ * the document header, block boundaries, and verbatim blocks, and its
10
+ * preprocessing reader evaluates each conditional directive lazily against
11
+ * the attribute state at that line. Include directives go to an
12
+ * IncludeProcessor registered through the public extension API, so an
13
+ * include inside a suppressed block is never resolved, an included file is
14
+ * read with the attribute state at its include line, and entries inside it
15
+ * apply to everything after it. A block comment is skipped by the parser
16
+ * itself, so directives inside one are never evaluated.
17
+ *
18
+ * Which source lines survive is observed, not inferred: before every source
19
+ * line the document text carries a probe `include::` line, which the same
20
+ * IncludeProcessor answers with no content. A probe reaches the processor
21
+ * only when the reader processes that position, so a line survives exactly
22
+ * when its probe fires. An empty include leaves no line behind, so the
23
+ * probes do not change how the document parses.
24
+ *
25
+ * Directive lines are recognized with Asciidoctor's own
26
+ * `ConditionalDirectiveRx`. Two rewrites happen before the parse:
13
27
  *
14
- * - `include::` lines: the reader's own filesystem-based include
15
- * resolution runs unconditionally otherwise, and it knows nothing of
16
- * Antora's content catalog. `collectIncludeText` resolves includes
17
- * afterward, against the real catalog. Hidden here, restored after.
18
28
  * - `ifeval::` blocks: intentionally not evaluated, matching this
19
- * function's documented contract (an expression evaluator is out of
29
+ * module's documented contract (an expression evaluator is out of
20
30
  * scope). The opening line and its matching `endif::` are blanked so the
21
31
  * body passes through as ordinary content; nested `ifdef::`/`ifndef::`
22
- * inside an `ifeval::` block still evaluates normally, since only the
23
- * `ifeval::` markers themselves are hidden.
32
+ * inside an `ifeval::` block still evaluates normally.
24
33
  * - `scan_ignore_conditionals`-forced attributes: force-suppression only
25
- * ever applies to `ifdef::`, never `ifndef::`. A single Asciidoctor
26
- * attributes hash cannot make one attribute simultaneously "defined" for
27
- * `ifndef::` and "undefined" for `ifdef::`, so a forced `ifdef::`
34
+ * ever applies to `ifdef::`, never `ifndef::`, so a forced `ifdef::`
28
35
  * expression is rewritten to reference a synthetic attribute name that
29
- * is never defined, guaranteeing suppression regardless of its real
30
- * value; the matching `ifndef::` (same real attribute name, if present)
31
- * is left untouched.
36
+ * is never defined; the matching `ifndef::` is left untouched.
32
37
  *
33
- * LIMITATION, found while wiring trademark-it onto this function (see
34
- * agent-memory/trademark-it-project.md), not caught when this function
35
- * first shipped: it does not strip `////` block comments. Verified
36
- * empirically that Asciidoctor's raw preprocessor reader — `parse: false`,
37
- * what this function uses — does not recognize a `////` block comment as a
38
- * unit at all; comment-BLOCK recognition turned out to be a parser-level
39
- * concern, only correctly handled during a full parse (autoterm's indexterm
40
- * scanner, which does a full `.convert()`, is unaffected by this). A
41
- * directive-like line sitting inside an unstripped block comment is still
42
- * evaluated for real by this function, which can suppress or reveal content
43
- * that is supposed to be entirely inert. Callers that need comment-stripping
44
- * too must do it themselves, before calling this function — trademark-it's
45
- * `stripNonContent` is the reference for how.
38
+ * The single-line form `ifdef::name[content]` is expanded to the block form
39
+ * with `content` on its own line, so that line carries its own probe.
46
40
  */
47
- export declare function suppressUnsetConditionals(text: string, isDefined: (attr: string) => boolean, forceIgnore?: string[]): string;
41
+ /** An included file's text and caller-defined context, from an IncludeResolver. */
42
+ export interface ResolvedInclude<C> {
43
+ text: string;
44
+ context: C;
45
+ }
46
+ /**
47
+ * Resolves an include:: target met while reading the file with context
48
+ * `including`. `attrlist` carries the directive's tag, tags, and lines
49
+ * attributes in `name=value` form. Returns undefined to leave the include
50
+ * unresolved.
51
+ */
52
+ export type IncludeResolver<C> = (target: string, attrlist: string, including: C) => ResolvedInclude<C> | undefined;
53
+ /** A file read by evaluateDocument: its context and its surviving text. */
54
+ export interface EvaluatedFile<C> {
55
+ context: C;
56
+ text: string;
57
+ }
48
58
  /**
49
- * Attributes defined in a raw page header: `:name: value` entries define,
50
- * `:!name:` and `:name!:` entries unset. Scanning stops at the first
51
- * non-empty line that is neither a title nor an attribute entry.
59
+ * Read `text` as Asciidoctor reads it and return, for the file itself and
60
+ * every file it includes, the text that survives conditional evaluation.
61
+ * Every other line is blanked, so each file keeps its line count. A
62
+ * surviving include:: line stays in its file's text.
52
63
  *
53
- * Moved here from autoterm's own module so trademark-it can share it too,
54
- * without either module importing from the other (autoterm already imports
55
- * `collectIncludeText` from trademark-it; the reverse import would be
56
- * circular).
64
+ * `attributes` seeds the document the way Antora seeds it with a
65
+ * component-version's compiled attributes: a value ending in `@` is soft
66
+ * set, so an attribute entry in the document overrides it; any other value
67
+ * is locked. Included files follow the root file in the order the reader
68
+ * first reaches them, each ahead of the files it includes itself.
69
+ */
70
+ export declare function evaluateDocument<C>(text: string, rootContext: C, attributes: Record<string, unknown>, forceIgnore?: string[], resolveInclude?: IncludeResolver<C>): EvaluatedFile<C>[];
71
+ /**
72
+ * Suppress unsatisfied conditional blocks in `text` without resolving
73
+ * includes. Each attribute a directive references is soft set when
74
+ * `isDefined` answers true for it, so attribute entries in `text` override
75
+ * it from their position on.
57
76
  */
58
- export declare function pageHeaderAttributes(sourceText: string): Map<string, boolean>;
77
+ export declare function suppressUnsetConditionals(text: string, isDefined: (attr: string) => boolean, forceIgnore?: string[]): string;
59
78
  //# sourceMappingURL=asciidoc-conditionals.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"asciidoc-conditionals.d.ts","sourceRoot":"","sources":["../../src/lib/asciidoc-conditionals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAmFH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EACpC,WAAW,GAAE,MAAM,EAAO,GACzB,MAAM,CAwBR;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAU7E"}
1
+ {"version":3,"file":"asciidoc-conditionals.d.ts","sourceRoot":"","sources":["../../src/lib/asciidoc-conditionals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAuEH,mFAAmF;AACnF,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,CAAC;CACZ;AAED;;;;;GAKG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;AAEpH,2EAA2E;AAC3E,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,CAAC,EACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,WAAW,GAAE,MAAM,EAAO,EAC1B,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAClC,aAAa,CAAC,CAAC,CAAC,EAAE,CA6DpB;AAiBD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EACpC,WAAW,GAAE,MAAM,EAAO,GACzB,MAAM,CAMR"}
Binary file
@@ -1 +1 @@
1
- {"version":3,"file":"asciidoc-conditionals.js","sourceRoot":"","sources":["../../src/lib/asciidoc-conditionals.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"asciidoc-conditionals.js","sourceRoot":"","sources":["../../src/lib/asciidoc-conditionals.ts"],"names":[],"mappings":"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"}
@@ -129,7 +129,7 @@ const MD_HEADING_RE = /^#{1,6}\s+\S/;
129
129
  * including page wraps in a `[source,...]`/`----` delimited block never
130
130
  * reaches a real reader as bare text at all, since Asciidoctor treats
131
131
  * delimited-block content as literal, never heading-parsed. But
132
- * collectIncludeText resolves the include TARGET's raw content directly,
132
+ * stripWithIncludes resolves the include TARGET's raw content directly,
133
133
  * with no awareness of the delimited-block wrapper the including page
134
134
  * puts around it, so a Python or shell `#` comment line lands in the scan
135
135
  * buffer as bare top-level text. Confirmed live: reproduces with nothing
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@baiyibai-antora/extensions",
3
- "version": "1.24.0",
3
+ "version": "1.25.0",
4
4
  "description": "Antora extensions and AsciiDoc macros for Baiyibai documentation",
5
5
  "keywords": [
6
6
  "antora",