@wdprlib/parser 1.1.1 → 1.1.4

package/dist/index.cjs

@@ -31,7 +31,7 @@ var __export = (target, all) => {
 var exports_src = {};
 __export(exports_src, {
   tokenize: () => tokenize,
-  text: () => import_ast3.text,
+  text: () => import_ast5.text,
   resolveModules: () => resolveModules,
   resolveListUsers: () => resolveListUsers,
   resolveIncludes: () => resolveIncludes,
@@ -42,34 +42,35 @@ __export(exports_src, {
   parseDateSelector: () => parseDateSelector,
   parseCategory: () => parseCategory,
   parse: () => parse,
-  paragraph: () => import_ast3.paragraph,
+  paragraph: () => import_ast5.paragraph,
   normalizeQuery: () => normalizeQuery,
-  listItemSubList: () => import_ast3.listItemSubList,
-  listItemElements: () => import_ast3.listItemElements,
-  list: () => import_ast3.list,
-  link: () => import_ast3.link,
-  lineBreak: () => import_ast3.lineBreak,
-  italics: () => import_ast3.italics,
+  listItemSubList: () => import_ast5.listItemSubList,
+  listItemElements: () => import_ast5.listItemElements,
+  list: () => import_ast5.list,
+  link: () => import_ast5.link,
+  lineBreak: () => import_ast5.lineBreak,
+  italics: () => import_ast5.italics,
   isListUsersModule: () => isListUsersModule2,
-  horizontalRule: () => import_ast3.horizontalRule,
-  heading: () => import_ast3.heading,
+  horizontalRule: () => import_ast5.horizontalRule,
+  heading: () => import_ast5.heading,
   extractListUsersVariables: () => extractListUsersVariables,
   extractDataRequirements: () => extractDataRequirements,
   createToken: () => createToken,
-  createSettings: () => import_ast4.createSettings,
-  createPosition: () => import_ast3.createPosition,
-  createPoint: () => import_ast3.createPoint,
-  container: () => import_ast3.container,
+  createSettings: () => import_ast6.createSettings,
+  createPosition: () => import_ast5.createPosition,
+  createPoint: () => import_ast5.createPoint,
+  container: () => import_ast5.container,
   compileTemplate: () => compileTemplate,
   compileListUsersTemplate: () => compileListUsersTemplate,
-  bold: () => import_ast3.bold,
+  bold: () => import_ast5.bold,
+  STYLE_SLOT_PREFIX: () => import_ast4.STYLE_SLOT_PREFIX,
   Parser: () => Parser,
   Lexer: () => Lexer,
-  DEFAULT_SETTINGS: () => import_ast4.DEFAULT_SETTINGS
+  DEFAULT_SETTINGS: () => import_ast6.DEFAULT_SETTINGS
 });
 module.exports = __toCommonJS(exports_src);
-var import_ast3 = require("@wdprlib/ast");
-var import_ast4 = require("@wdprlib/ast");
+var import_ast5 = require("@wdprlib/ast");
+var import_ast6 = require("@wdprlib/ast");
 
 // packages/parser/src/lexer/tokens.ts
 function createToken(type, value, position, lineStart = false) {
@@ -5113,6 +5114,10 @@ function parseBibliographyEntry(ctx, startPos) {
         consumed++;
         break;
       }
+      contentNodes.push({ element: "line-break" });
+      pos++;
+      consumed++;
+      continue;
     }
     const inlineCtx = { ...ctx, pos };
     const result = parseInlineUntil(inlineCtx, "NEWLINE");
@@ -5610,6 +5615,11 @@ var linkTripleRule = {
         break;
       }
       if (token.type === "NEWLINE") {
+        if (foundPipe) {
+          labelText += " ";
+        } else {
+          target += " ";
+        }
         consumed++;
         pos++;
         continue;
@@ -6716,7 +6726,15 @@ var footnoteRule = {
       if (token.type === "NEWLINE") {
         pos++;
         consumed++;
-        if (ctx.tokens[pos]?.type === "NEWLINE") {
+        let peekPos = pos;
+        let peekConsumed = 0;
+        while (ctx.tokens[peekPos]?.type === "WHITESPACE") {
+          peekPos++;
+          peekConsumed++;
+        }
+        if (ctx.tokens[peekPos]?.type === "NEWLINE") {
+          pos = peekPos;
+          consumed += peekConsumed;
           while (ctx.tokens[pos]?.type === "NEWLINE") {
             pos++;
             consumed++;
@@ -7213,7 +7231,7 @@ var anchorRule = {
             consumed++;
           }
           foundClose = true;
-          while (paragraphStrip && ctx.tokens[pos]?.type === "NEWLINE") {
+          if (paragraphStrip && ctx.tokens[pos]?.type === "NEWLINE" && ctx.tokens[pos + 1]?.type !== "NEWLINE") {
             pos++;
             consumed++;
           }
@@ -9563,6 +9581,7 @@ function resolveAndNormalizeQuery(requirement, urlParams) {
 function parseTagCondition(condition) {
   const required = [];
   const forbidden = [];
+  const optional = [];
   const parts = condition.trim().split(/\s+/);
   for (const part of parts) {
     if (!part)
@@ -9576,12 +9595,15 @@ function parseTagCondition(condition) {
       if (tag)
         forbidden.push(tag);
     } else {
-      required.push(part);
+      optional.push(part);
     }
   }
-  return { required, forbidden };
+  return { required, forbidden, optional };
 }
 function evaluateTagCondition(condition, pageTags) {
+  if (condition.required.length === 0 && condition.forbidden.length === 0 && condition.optional.length === 0) {
+    return false;
+  }
   const tagSet = new Set(pageTags);
   for (const tag of condition.required) {
     if (!tagSet.has(tag)) {
@@ -9593,6 +9615,11 @@ function evaluateTagCondition(condition, pageTags) {
       return false;
     }
   }
+  if (condition.optional.length > 0) {
+    if (!condition.optional.some((tag) => tagSet.has(tag))) {
+      return false;
+    }
+  }
   return true;
 }
 // packages/parser/src/parser/rules/block/module/iftags/resolve.ts
@@ -9728,6 +9755,7 @@ function resolveListUsers(_module, data, compiledTemplate, parse2) {
   return itemAst.elements;
 }
 // packages/parser/src/parser/rules/block/module/resolve.ts
+var import_ast3 = require("@wdprlib/ast");
 async function resolveModules(ast, dataProvider, options) {
   let listPagesCtx = null;
   const listPagesReqs = options.requirements.listPages ?? [];
@@ -9892,18 +9920,31 @@ function countModulesInElements(elements) {
 }
 function collectStyles(elements) {
   const styles = [];
-  const filtered = collectStylesFromElements(elements, styles);
+  const ctx = { nextSlotId: 0 };
+  const filtered = collectStylesFromElements(elements, styles, ctx);
   return { elements: filtered, styles };
 }
-function collectStylesFromElements(elements, styles) {
+function collectStylesFromElements(elements, styles, ctx) {
   const result = [];
   for (const element of elements) {
     if (element.element === "style") {
       styles.push(element.data);
       continue;
     }
-    const mapped = mapElementChildren(element, (children) => collectStylesFromElements(children, styles));
+    if (element.element === "if-tags") {
+      const slotId = ctx.nextSlotId++;
+      styles.push(`${import_ast3.STYLE_SLOT_PREFIX}${slotId}`);
+      result.push({
+        element: "if-tags",
+        data: { ...element.data, _styleSlot: slotId }
+      });
+      continue;
+    }
+    const mapped = mapElementChildren(element, (children) => collectStylesFromElements(children, styles, ctx));
     result.push(mapped);
   }
   return result;
 }
+
+// packages/parser/src/parser/rules/block/module/index.ts
+var import_ast4 = require("@wdprlib/ast");

package/dist/index.d.cts

@@ -964,4 +964,5 @@ interface ResolveOptions {
 * @param options - Resolution options including requirements
 */
 declare function resolveModules(ast: SyntaxTree3, dataProvider: DataProvider, options: ResolveOptions): Promise<SyntaxTree3>;
-export { tokenize, text, resolveModules, resolveListUsers, 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, SyntaxTree4 as SyntaxTree, SiteContext, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, 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, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AnchorTarget, Alignment, AlignType };
+import { STYLE_SLOT_PREFIX } from "@wdprlib/ast";
+export { tokenize, text, resolveModules, resolveListUsers, 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, SyntaxTree4 as SyntaxTree, SiteContext, STYLE_SLOT_PREFIX, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, 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, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AnchorTarget, Alignment, AlignType };

package/dist/index.d.ts

@@ -964,4 +964,5 @@ interface ResolveOptions {
 * @param options - Resolution options including requirements
 */
 declare function resolveModules(ast: SyntaxTree3, dataProvider: DataProvider, options: ResolveOptions): Promise<SyntaxTree3>;
-export { tokenize, text, resolveModules, resolveListUsers, 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, SyntaxTree4 as SyntaxTree, SiteContext, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, 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, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AnchorTarget, Alignment, AlignType };
+import { STYLE_SLOT_PREFIX } from "@wdprlib/ast";
+export { tokenize, text, resolveModules, resolveListUsers, 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, SyntaxTree4 as SyntaxTree, SiteContext, STYLE_SLOT_PREFIX, ResolveOptions, ResolveIncludesOptions, Position2 as Position, Point, ParserOptions, Parser, 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, DefinitionListItem, DateItem, DataRequirements, DataProvider, DEFAULT_SETTINGS, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AnchorTarget, Alignment, AlignType };

package/dist/index.js

@@ -5059,6 +5059,10 @@ function parseBibliographyEntry(ctx, startPos) {
         consumed++;
         break;
       }
+      contentNodes.push({ element: "line-break" });
+      pos++;
+      consumed++;
+      continue;
     }
     const inlineCtx = { ...ctx, pos };
     const result = parseInlineUntil(inlineCtx, "NEWLINE");
@@ -5556,6 +5560,11 @@ var linkTripleRule = {
         break;
       }
       if (token.type === "NEWLINE") {
+        if (foundPipe) {
+          labelText += " ";
+        } else {
+          target += " ";
+        }
         consumed++;
         pos++;
         continue;
@@ -6662,7 +6671,15 @@ var footnoteRule = {
       if (token.type === "NEWLINE") {
         pos++;
         consumed++;
-        if (ctx.tokens[pos]?.type === "NEWLINE") {
+        let peekPos = pos;
+        let peekConsumed = 0;
+        while (ctx.tokens[peekPos]?.type === "WHITESPACE") {
+          peekPos++;
+          peekConsumed++;
+        }
+        if (ctx.tokens[peekPos]?.type === "NEWLINE") {
+          pos = peekPos;
+          consumed += peekConsumed;
           while (ctx.tokens[pos]?.type === "NEWLINE") {
             pos++;
             consumed++;
@@ -7159,7 +7176,7 @@ var anchorRule = {
             consumed++;
           }
           foundClose = true;
-          while (paragraphStrip && ctx.tokens[pos]?.type === "NEWLINE") {
+          if (paragraphStrip && ctx.tokens[pos]?.type === "NEWLINE" && ctx.tokens[pos + 1]?.type !== "NEWLINE") {
             pos++;
             consumed++;
           }
@@ -9509,6 +9526,7 @@ function resolveAndNormalizeQuery(requirement, urlParams) {
 function parseTagCondition(condition) {
   const required = [];
   const forbidden = [];
+  const optional = [];
   const parts = condition.trim().split(/\s+/);
   for (const part of parts) {
     if (!part)
@@ -9522,12 +9540,15 @@ function parseTagCondition(condition) {
       if (tag)
         forbidden.push(tag);
     } else {
-      required.push(part);
+      optional.push(part);
     }
   }
-  return { required, forbidden };
+  return { required, forbidden, optional };
 }
 function evaluateTagCondition(condition, pageTags) {
+  if (condition.required.length === 0 && condition.forbidden.length === 0 && condition.optional.length === 0) {
+    return false;
+  }
   const tagSet = new Set(pageTags);
   for (const tag of condition.required) {
     if (!tagSet.has(tag)) {
@@ -9539,6 +9560,11 @@ function evaluateTagCondition(condition, pageTags) {
       return false;
     }
   }
+  if (condition.optional.length > 0) {
+    if (!condition.optional.some((tag) => tagSet.has(tag))) {
+      return false;
+    }
+  }
   return true;
 }
 // packages/parser/src/parser/rules/block/module/iftags/resolve.ts
@@ -9674,6 +9700,7 @@ function resolveListUsers(_module, data, compiledTemplate, parse2) {
   return itemAst.elements;
 }
 // packages/parser/src/parser/rules/block/module/resolve.ts
+import { STYLE_SLOT_PREFIX } from "@wdprlib/ast";
 async function resolveModules(ast, dataProvider, options) {
   let listPagesCtx = null;
   const listPagesReqs = options.requirements.listPages ?? [];
@@ -9838,21 +9865,34 @@ function countModulesInElements(elements) {
 }
 function collectStyles(elements) {
   const styles = [];
-  const filtered = collectStylesFromElements(elements, styles);
+  const ctx = { nextSlotId: 0 };
+  const filtered = collectStylesFromElements(elements, styles, ctx);
   return { elements: filtered, styles };
 }
-function collectStylesFromElements(elements, styles) {
+function collectStylesFromElements(elements, styles, ctx) {
   const result = [];
   for (const element of elements) {
     if (element.element === "style") {
       styles.push(element.data);
       continue;
     }
-    const mapped = mapElementChildren(element, (children) => collectStylesFromElements(children, styles));
+    if (element.element === "if-tags") {
+      const slotId = ctx.nextSlotId++;
+      styles.push(`${STYLE_SLOT_PREFIX}${slotId}`);
+      result.push({
+        element: "if-tags",
+        data: { ...element.data, _styleSlot: slotId }
+      });
+      continue;
+    }
+    const mapped = mapElementChildren(element, (children) => collectStylesFromElements(children, styles, ctx));
     result.push(mapped);
   }
   return result;
 }
+
+// packages/parser/src/parser/rules/block/module/index.ts
+import { STYLE_SLOT_PREFIX as STYLE_SLOT_PREFIX2 } from "@wdprlib/ast";
 export {
   tokenize,
   text,
@@ -9887,6 +9927,7 @@ export {
   compileTemplate,
   compileListUsersTemplate,
   bold,
+  STYLE_SLOT_PREFIX2 as STYLE_SLOT_PREFIX,
   Parser,
   Lexer,
   DEFAULT_SETTINGS2 as DEFAULT_SETTINGS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdprlib/parser",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "Parser for Wikidot markup",
   "keywords": [
     "ast",
@@ -39,6 +39,6 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "^7.1.1",
-    "@wdprlib/ast": "1.1.0"
+    "@wdprlib/ast": "1.1.1"
   }
 }