@wdprlib/parser 1.0.0 → 1.1.1

package/dist/index.cjs

@@ -31,7 +31,7 @@ var __export = (target, all) => {
 var exports_src = {};
 __export(exports_src, {
   tokenize: () => tokenize,
-  text: () => import_ast2.text,
+  text: () => import_ast3.text,
   resolveModules: () => resolveModules,
   resolveListUsers: () => resolveListUsers,
   resolveIncludes: () => resolveIncludes,
@@ -42,31 +42,34 @@ __export(exports_src, {
   parseDateSelector: () => parseDateSelector,
   parseCategory: () => parseCategory,
   parse: () => parse,
-  paragraph: () => import_ast2.paragraph,
+  paragraph: () => import_ast3.paragraph,
   normalizeQuery: () => normalizeQuery,
-  listItemSubList: () => import_ast2.listItemSubList,
-  listItemElements: () => import_ast2.listItemElements,
-  list: () => import_ast2.list,
-  link: () => import_ast2.link,
-  lineBreak: () => import_ast2.lineBreak,
-  italics: () => import_ast2.italics,
+  listItemSubList: () => import_ast3.listItemSubList,
+  listItemElements: () => import_ast3.listItemElements,
+  list: () => import_ast3.list,
+  link: () => import_ast3.link,
+  lineBreak: () => import_ast3.lineBreak,
+  italics: () => import_ast3.italics,
   isListUsersModule: () => isListUsersModule2,
-  horizontalRule: () => import_ast2.horizontalRule,
-  heading: () => import_ast2.heading,
+  horizontalRule: () => import_ast3.horizontalRule,
+  heading: () => import_ast3.heading,
   extractListUsersVariables: () => extractListUsersVariables,
   extractDataRequirements: () => extractDataRequirements,
   createToken: () => createToken,
-  createPosition: () => import_ast2.createPosition,
-  createPoint: () => import_ast2.createPoint,
-  container: () => import_ast2.container,
+  createSettings: () => import_ast4.createSettings,
+  createPosition: () => import_ast3.createPosition,
+  createPoint: () => import_ast3.createPoint,
+  container: () => import_ast3.container,
   compileTemplate: () => compileTemplate,
   compileListUsersTemplate: () => compileListUsersTemplate,
-  bold: () => import_ast2.bold,
+  bold: () => import_ast3.bold,
   Parser: () => Parser,
-  Lexer: () => Lexer
+  Lexer: () => Lexer,
+  DEFAULT_SETTINGS: () => import_ast4.DEFAULT_SETTINGS
 });
 module.exports = __toCommonJS(exports_src);
-var import_ast2 = require("@wdprlib/ast");
+var import_ast3 = require("@wdprlib/ast");
+var import_ast4 = require("@wdprlib/ast");
 
 // packages/parser/src/lexer/tokens.ts
 function createToken(type, value, position, lineStart = false) {
@@ -555,6 +558,9 @@ function preprocess(text) {
   return result;
 }
 
+// packages/parser/src/parser/parse.ts
+var import_ast2 = require("@wdprlib/ast");
+
 // packages/parser/src/parser/rules/types.ts
 function currentToken(ctx) {
   return ctx.tokens[ctx.pos] ?? eofToken();
@@ -3559,6 +3565,9 @@ var moduleRule = {
     if (!nameResult || nameResult.name !== "module" && nameResult.name !== "module654") {
       return { success: false };
     }
+    if (!ctx.settings.enablePageSyntax) {
+      return { success: false };
+    }
     pos += nameResult.consumed;
     consumed += nameResult.consumed;
     while (ctx.tokens[pos]?.type === "WHITESPACE") {
@@ -4273,6 +4282,9 @@ var includeRule = {
     if (!nameResult || nameResult.name.toLowerCase() !== "include") {
       return { success: false };
     }
+    if (!ctx.settings.enablePageSyntax) {
+      return { success: false };
+    }
     pos += nameResult.consumed;
     consumed += nameResult.consumed;
     while (ctx.tokens[pos]?.type === "WHITESPACE") {
@@ -4880,6 +4892,9 @@ var tocRule = {
     }
     const firstValue = firstToken.value.toLowerCase();
     if (firstValue === "toc") {
+      if (!ctx.settings.enablePageSyntax) {
+        return { success: false };
+      }
       pos++;
     } else if (firstValue === "f") {
       pos++;
@@ -4903,6 +4918,9 @@ var tocRule = {
       if (tocToken.value.toLowerCase() !== "toc") {
         return { success: false };
       }
+      if (!ctx.settings.enablePageSyntax) {
+        return { success: false };
+      }
       pos++;
     } else {
       return { success: false };
@@ -5985,10 +6003,8 @@ var newlineLineBreakRule = {
     }
     const nextMeaningfulToken = ctx.tokens[ctx.pos + lookAhead];
     let isValidBlock = isBlockStartToken(nextMeaningfulToken?.type);
-    if (isValidBlock && (nextMeaningfulToken?.type === "LIST_BULLET" || nextMeaningfulToken?.type === "LIST_NUMBER")) {
-      if (!nextMeaningfulToken.lineStart) {
-        isValidBlock = false;
-      }
+    if (isValidBlock && !nextMeaningfulToken?.lineStart) {
+      isValidBlock = false;
     }
     if (isValidBlock && nextMeaningfulToken?.type === "HEADING_MARKER") {
       const markerLen = nextMeaningfulToken.value.length;
@@ -7735,6 +7751,7 @@ var bibciteRule = {
       return { success: false };
     }
     let label = "";
+    let foundClose = false;
     while (pos < ctx.tokens.length) {
       const t = ctx.tokens[pos];
       if (!t)
@@ -7743,6 +7760,7 @@ var bibciteRule = {
         const nextT = ctx.tokens[pos + 1];
         if (nextT?.type === "TEXT" && nextT.value === ")") {
           consumed += 2;
+          foundClose = true;
           break;
         }
       }
@@ -7753,6 +7771,9 @@ var bibciteRule = {
       pos++;
       consumed++;
     }
+    if (!foundClose) {
+      return { success: false };
+    }
     label = label.trim();
     if (!label) {
       return { success: false };
@@ -8288,6 +8309,7 @@ class Parser {
       pos: 0,
       version: options.version ?? "wikidot",
       trackPositions: options.trackPositions ?? true,
+      settings: options.settings ?? import_ast2.DEFAULT_SETTINGS,
       footnotes: [],
       tocEntries: [],
       codeBlocks: [],
@@ -9587,6 +9609,9 @@ function resolveIfTags(data, pageTags) {
 }
 // packages/parser/src/parser/rules/block/module/include/resolve.ts
 function resolveIncludes(source, fetcher, options) {
+  if (options?.settings && !options.settings.enablePageSyntax) {
+    return source;
+  }
   const maxDepth = options?.maxDepth ?? 5;
   const cache = new Map;
   const cachedFetcher = (pageRef) => {
@@ -9605,16 +9630,31 @@ function resolveIncludes(source, fetcher, options) {
   };
   return expandText(source, cachedFetcher, 0, maxDepth, []);
 }
-var INCLUDE_PATTERN = /\[\[include\s+([\s\S]*?)\]\]/gi;
+var INCLUDE_PATTERN = /\[\[include\s([^\]]*(?:\](?!\])[^\]]*)*)\]\]/gi;
 function parseIncludeDirective(inner) {
   const normalized = inner.replace(/\n/g, " ");
   const parts = normalized.split("|");
-  const target = parts[0].trim();
-  const variables = {};
+  const firstSegment = parts[0].trim();
+  const spaceIndex = firstSegment.indexOf(" ");
+  let target;
+  const varSegments = [];
+  if (spaceIndex !== -1) {
+    target = firstSegment.slice(0, spaceIndex);
+    const rest = firstSegment.slice(spaceIndex + 1).trim();
+    if (rest) {
+      varSegments.push(rest);
+    }
+  } else {
+    target = firstSegment;
+  }
   for (let i = 1;i < parts.length; i++) {
     const segment = parts[i].trim();
-    if (!segment)
-      continue;
+    if (segment) {
+      varSegments.push(segment);
+    }
+  }
+  const variables = {};
+  for (const segment of varSegments) {
     const eqIndex = segment.indexOf("=");
     if (eqIndex !== -1) {
       const key = segment.slice(0, eqIndex).trim();