@wdprlib/parser 2.2.0 → 3.1.0

package/dist/index.d.cts

@@ -80,6 +80,15 @@ declare class Lexer {
 	private state;
 	private options;
 	private splitBlockClosePositions;
+	/**
+	* Nesting depth of block-opener context (between `[[` / `[[/` and the
+	* matching `]]`). Used to scope `QUOTED_STRING` recognition so that
+	* `"` after `=` only becomes a quoted attribute value while we are
+	* actually parsing block attributes — otherwise inline `=` followed by
+	* `"` (e.g. inside `[[footnote]]="[[/footnote]]`) would erroneously
+	* consume content up to the next `"` or newline.
+	*/
+	private blockOpenerDepth;
 	constructor(source: string, options?: LexerOptions);
 	/**
 	* Tokenize the entire source
@@ -160,6 +169,25 @@ interface ParserOptions {
 	* Defaults to {@link DEFAULT_SETTINGS} (full page mode).
 	*/
 	settings?: WikitextSettings;
+	/**
+	* Page tags consulted when expanding `[[iftags]]` directives that are
+	* embedded inside another block's opener — e.g.
+	* `[[div_ class="x" [[iftags +foo]]style="..."[[/iftags]]]]`. Such
+	* iftags must be collapsed at text level *before* tokenization;
+	* otherwise the outer opener loses its well-formed structure and the
+	* whole `[[div_ ... ]]` line is emitted as raw text.
+	*
+	* Values:
+	* - omitted / `undefined`: no preprocess pass. Existing behaviour;
+	*   opener-embedded iftags will still break the surrounding opener.
+	* - `null`: opener-embedded iftags only, evaluated as if the page has
+	*   no tags (lossy fallback that keeps tokenization working when real
+	*   tags are unknown). Block-level iftags remain in the AST for
+	*   `resolveModules` to evaluate later via `getPageTags`.
+	* - `string[]`: every iftags block is evaluated against the given
+	*   tags eagerly; no `if-tags` nodes survive in the AST.
+	*/
+	pageTags?: string[] | null;
 }
 /**
 * Converts a token stream into a Wikidot {@link SyntaxTree}.
@@ -848,6 +876,27 @@ declare function parseNumericSelector(value: string): NormalizedNumericSelector
 * @returns Normalized query with structured types
 */
 declare function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery;
+/**
+* Expand `[[iftags ...]]X[[/iftags]]` directives in `source` against the
+* current page's tags.
+*
+* Behaviour:
+* - Raw regions (`[[code]]`, `[[html]]`, `@@...@@`, `@<...>@`) are
+*   protected: literal `[[iftags]]` tokens inside them are not expanded.
+* - Nested `[[iftags]]` are processed innermost-first, so an outer
+*   block can re-process the now-flattened inner body uniformly.
+* - `pageTags === null`: only `[[iftags]]` blocks embedded inside
+*   another block's opener are collapsed (using an empty-tag fallback
+*   so `+tag` conditions fail and `-tag` conditions pass). Block-level
+*   iftags are left intact for the AST-level resolver.
+*
+* @param source   Raw wikitext (typically after include expansion).
+* @param pageTags Tags of the page being rendered, or `null` for the
+*                 opener-embedded-only fallback mode.
+* @returns Source with matching iftags replaced by their bodies and
+*          unmatched iftags removed entirely.
+*/
+declare function preprocessIftags(source: string, pageTags: string[] | null): string;
 import { PageRef, WikitextSettings as WikitextSettings3 } from "@wdprlib/ast";
 /**
 * Callback to fetch page content for include resolution.
@@ -1011,4 +1060,4 @@ interface ResolveOptions {
 */
 declare function resolveModules(ast: SyntaxTree2, dataProvider: DataProvider, options: ResolveOptions): Promise<SyntaxTree2>;
 import { STYLE_SLOT_PREFIX } from "@wdprlib/ast";
-export { tokenize, text, resolveModules, resolveListUsers, resolveIncludesAsync, resolveIncludes, parseTags, parseParent, parseOrder, parseNumericSelector, parseDateSelector, parseCategory, parse, paragraph, normalizeQuery, listItemSubList, listItemElements, list, link, lineBreak, italics, isListUsersModule, horizontalRule, heading, extractListUsersVariables, extractDataRequirements, createToken, createSettings, createPosition, createPoint, container, compileTemplate, compileListUsersTemplate, bold, WikitextSettings4 as WikitextSettings, WikitextMode, Version2 as Version, VariableMap, VariableContext, UserInfo, TokenType, Token, TocEntry2 as TocEntry, TableRow, TableData, TableCell, TabData, SyntaxTree3 as SyntaxTree, SiteContext, STYLE_SLOT_PREFIX, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, ParseResult2 as ParseResult, ParseFunction, PageRef2 as PageRef, PageData, NormalizedTags, NormalizedParent, NormalizedOrder, NormalizedNumericSelector, NormalizedListPagesQuery, NormalizedDateSelector, NormalizedCategory, Module4 as Module, ListUsersVariableContext, ListUsersVariable, ListUsersUserData, ListUsersExternalData, ListUsersDataRequirement, ListUsersDataFetcher, ListUsersCompiledTemplate, ListType, ListPagesVariable, ListPagesQuery, ListPagesExternalData, ListPagesDataRequirement, ListPagesDataFetcher, ListItem, ListData, LinkType, LinkLocation, LinkLabel, LexerOptions, Lexer, IncludeFetcher, ImageSource, HeadingLevel, Heading, HeaderType, FloatAlignment, ExtractionResult, Embed, Element6 as Element, DiagnosticSeverity, Diagnostic2 as Diagnostic, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AsyncIncludeFetcher, AnchorTarget, Alignment, AlignType };
+export { tokenize, text, resolveModules, resolveListUsers, resolveIncludesAsync, resolveIncludes, preprocessIftags, parseTags, parseParent, parseOrder, parseNumericSelector, parseDateSelector, parseCategory, parse, paragraph, normalizeQuery, listItemSubList, listItemElements, list, link, lineBreak, italics, isListUsersModule, horizontalRule, heading, extractListUsersVariables, extractDataRequirements, createToken, createSettings, createPosition, createPoint, container, compileTemplate, compileListUsersTemplate, bold, WikitextSettings4 as WikitextSettings, WikitextMode, Version2 as Version, VariableMap, VariableContext, UserInfo, TokenType, Token, TocEntry2 as TocEntry, TableRow, TableData, TableCell, TabData, SyntaxTree3 as SyntaxTree, SiteContext, STYLE_SLOT_PREFIX, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, ParseResult2 as ParseResult, ParseFunction, PageRef2 as PageRef, PageData, NormalizedTags, NormalizedParent, NormalizedOrder, NormalizedNumericSelector, NormalizedListPagesQuery, NormalizedDateSelector, NormalizedCategory, Module4 as Module, ListUsersVariableContext, ListUsersVariable, ListUsersUserData, ListUsersExternalData, ListUsersDataRequirement, ListUsersDataFetcher, ListUsersCompiledTemplate, ListType, ListPagesVariable, ListPagesQuery, ListPagesExternalData, ListPagesDataRequirement, ListPagesDataFetcher, ListItem, ListData, LinkType, LinkLocation, LinkLabel, LexerOptions, Lexer, IncludeFetcher, ImageSource, HeadingLevel, Heading, HeaderType, FloatAlignment, ExtractionResult, Embed, Element6 as Element, DiagnosticSeverity, Diagnostic2 as Diagnostic, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AsyncIncludeFetcher, AnchorTarget, Alignment, AlignType };

package/dist/index.d.ts

@@ -80,6 +80,15 @@ declare class Lexer {
 	private state;
 	private options;
 	private splitBlockClosePositions;
+	/**
+	* Nesting depth of block-opener context (between `[[` / `[[/` and the
+	* matching `]]`). Used to scope `QUOTED_STRING` recognition so that
+	* `"` after `=` only becomes a quoted attribute value while we are
+	* actually parsing block attributes — otherwise inline `=` followed by
+	* `"` (e.g. inside `[[footnote]]="[[/footnote]]`) would erroneously
+	* consume content up to the next `"` or newline.
+	*/
+	private blockOpenerDepth;
 	constructor(source: string, options?: LexerOptions);
 	/**
 	* Tokenize the entire source
@@ -160,6 +169,25 @@ interface ParserOptions {
 	* Defaults to {@link DEFAULT_SETTINGS} (full page mode).
 	*/
 	settings?: WikitextSettings;
+	/**
+	* Page tags consulted when expanding `[[iftags]]` directives that are
+	* embedded inside another block's opener — e.g.
+	* `[[div_ class="x" [[iftags +foo]]style="..."[[/iftags]]]]`. Such
+	* iftags must be collapsed at text level *before* tokenization;
+	* otherwise the outer opener loses its well-formed structure and the
+	* whole `[[div_ ... ]]` line is emitted as raw text.
+	*
+	* Values:
+	* - omitted / `undefined`: no preprocess pass. Existing behaviour;
+	*   opener-embedded iftags will still break the surrounding opener.
+	* - `null`: opener-embedded iftags only, evaluated as if the page has
+	*   no tags (lossy fallback that keeps tokenization working when real
+	*   tags are unknown). Block-level iftags remain in the AST for
+	*   `resolveModules` to evaluate later via `getPageTags`.
+	* - `string[]`: every iftags block is evaluated against the given
+	*   tags eagerly; no `if-tags` nodes survive in the AST.
+	*/
+	pageTags?: string[] | null;
 }
 /**
 * Converts a token stream into a Wikidot {@link SyntaxTree}.
@@ -848,6 +876,27 @@ declare function parseNumericSelector(value: string): NormalizedNumericSelector
 * @returns Normalized query with structured types
 */
 declare function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery;
+/**
+* Expand `[[iftags ...]]X[[/iftags]]` directives in `source` against the
+* current page's tags.
+*
+* Behaviour:
+* - Raw regions (`[[code]]`, `[[html]]`, `@@...@@`, `@<...>@`) are
+*   protected: literal `[[iftags]]` tokens inside them are not expanded.
+* - Nested `[[iftags]]` are processed innermost-first, so an outer
+*   block can re-process the now-flattened inner body uniformly.
+* - `pageTags === null`: only `[[iftags]]` blocks embedded inside
+*   another block's opener are collapsed (using an empty-tag fallback
+*   so `+tag` conditions fail and `-tag` conditions pass). Block-level
+*   iftags are left intact for the AST-level resolver.
+*
+* @param source   Raw wikitext (typically after include expansion).
+* @param pageTags Tags of the page being rendered, or `null` for the
+*                 opener-embedded-only fallback mode.
+* @returns Source with matching iftags replaced by their bodies and
+*          unmatched iftags removed entirely.
+*/
+declare function preprocessIftags(source: string, pageTags: string[] | null): string;
 import { PageRef, WikitextSettings as WikitextSettings3 } from "@wdprlib/ast";
 /**
 * Callback to fetch page content for include resolution.
@@ -1011,4 +1060,4 @@ interface ResolveOptions {
 */
 declare function resolveModules(ast: SyntaxTree2, dataProvider: DataProvider, options: ResolveOptions): Promise<SyntaxTree2>;
 import { STYLE_SLOT_PREFIX } from "@wdprlib/ast";
-export { tokenize, text, resolveModules, resolveListUsers, resolveIncludesAsync, resolveIncludes, parseTags, parseParent, parseOrder, parseNumericSelector, parseDateSelector, parseCategory, parse, paragraph, normalizeQuery, listItemSubList, listItemElements, list, link, lineBreak, italics, isListUsersModule, horizontalRule, heading, extractListUsersVariables, extractDataRequirements, createToken, createSettings, createPosition, createPoint, container, compileTemplate, compileListUsersTemplate, bold, WikitextSettings4 as WikitextSettings, WikitextMode, Version2 as Version, VariableMap, VariableContext, UserInfo, TokenType, Token, TocEntry2 as TocEntry, TableRow, TableData, TableCell, TabData, SyntaxTree3 as SyntaxTree, SiteContext, STYLE_SLOT_PREFIX, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, ParseResult2 as ParseResult, ParseFunction, PageRef2 as PageRef, PageData, NormalizedTags, NormalizedParent, NormalizedOrder, NormalizedNumericSelector, NormalizedListPagesQuery, NormalizedDateSelector, NormalizedCategory, Module4 as Module, ListUsersVariableContext, ListUsersVariable, ListUsersUserData, ListUsersExternalData, ListUsersDataRequirement, ListUsersDataFetcher, ListUsersCompiledTemplate, ListType, ListPagesVariable, ListPagesQuery, ListPagesExternalData, ListPagesDataRequirement, ListPagesDataFetcher, ListItem, ListData, LinkType, LinkLocation, LinkLabel, LexerOptions, Lexer, IncludeFetcher, ImageSource, HeadingLevel, Heading, HeaderType, FloatAlignment, ExtractionResult, Embed, Element6 as Element, DiagnosticSeverity, Diagnostic2 as Diagnostic, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AsyncIncludeFetcher, AnchorTarget, Alignment, AlignType };
+export { tokenize, text, resolveModules, resolveListUsers, resolveIncludesAsync, resolveIncludes, preprocessIftags, parseTags, parseParent, parseOrder, parseNumericSelector, parseDateSelector, parseCategory, parse, paragraph, normalizeQuery, listItemSubList, listItemElements, list, link, lineBreak, italics, isListUsersModule, horizontalRule, heading, extractListUsersVariables, extractDataRequirements, createToken, createSettings, createPosition, createPoint, container, compileTemplate, compileListUsersTemplate, bold, WikitextSettings4 as WikitextSettings, WikitextMode, Version2 as Version, VariableMap, VariableContext, UserInfo, TokenType, Token, TocEntry2 as TocEntry, TableRow, TableData, TableCell, TabData, SyntaxTree3 as SyntaxTree, SiteContext, STYLE_SLOT_PREFIX, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, ParseResult2 as ParseResult, ParseFunction, PageRef2 as PageRef, PageData, NormalizedTags, NormalizedParent, NormalizedOrder, NormalizedNumericSelector, NormalizedListPagesQuery, NormalizedDateSelector, NormalizedCategory, Module4 as Module, ListUsersVariableContext, ListUsersVariable, ListUsersUserData, ListUsersExternalData, ListUsersDataRequirement, ListUsersDataFetcher, ListUsersCompiledTemplate, ListType, ListPagesVariable, ListPagesQuery, ListPagesExternalData, ListPagesDataRequirement, ListPagesDataFetcher, ListItem, ListData, LinkType, LinkLocation, LinkLabel, LexerOptions, Lexer, IncludeFetcher, ImageSource, HeadingLevel, Heading, HeaderType, FloatAlignment, ExtractionResult, Embed, Element6 as Element, DiagnosticSeverity, Diagnostic2 as Diagnostic, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AsyncIncludeFetcher, AnchorTarget, Alignment, AlignType };