@wdprlib/parser 1.0.0 → 1.1.1

package/dist/index.js

@@ -15,6 +15,7 @@ import {
   listItemElements,
   listItemSubList
 } from "@wdprlib/ast";
+import { createSettings, DEFAULT_SETTINGS as DEFAULT_SETTINGS2 } from "@wdprlib/ast";
 
 // packages/parser/src/lexer/tokens.ts
 function createToken(type, value, position, lineStart = false) {
@@ -503,6 +504,9 @@ function preprocess(text) {
   return result;
 }
 
+// packages/parser/src/parser/parse.ts
+import { DEFAULT_SETTINGS } from "@wdprlib/ast";
+
 // packages/parser/src/parser/rules/types.ts
 function currentToken(ctx) {
   return ctx.tokens[ctx.pos] ?? eofToken();
@@ -3507,6 +3511,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") {
@@ -4221,6 +4228,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") {
@@ -4828,6 +4838,9 @@ var tocRule = {
     }
     const firstValue = firstToken.value.toLowerCase();
     if (firstValue === "toc") {
+      if (!ctx.settings.enablePageSyntax) {
+        return { success: false };
+      }
       pos++;
     } else if (firstValue === "f") {
       pos++;
@@ -4851,6 +4864,9 @@ var tocRule = {
       if (tocToken.value.toLowerCase() !== "toc") {
         return { success: false };
       }
+      if (!ctx.settings.enablePageSyntax) {
+        return { success: false };
+      }
       pos++;
     } else {
       return { success: false };
@@ -5933,10 +5949,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;
@@ -7683,6 +7697,7 @@ var bibciteRule = {
       return { success: false };
     }
     let label = "";
+    let foundClose = false;
     while (pos < ctx.tokens.length) {
       const t = ctx.tokens[pos];
       if (!t)
@@ -7691,6 +7706,7 @@ var bibciteRule = {
         const nextT = ctx.tokens[pos + 1];
         if (nextT?.type === "TEXT" && nextT.value === ")") {
           consumed += 2;
+          foundClose = true;
           break;
         }
       }
@@ -7701,6 +7717,9 @@ var bibciteRule = {
       pos++;
       consumed++;
     }
+    if (!foundClose) {
+      return { success: false };
+    }
     label = label.trim();
     if (!label) {
       return { success: false };
@@ -8236,6 +8255,7 @@ class Parser {
       pos: 0,
       version: options.version ?? "wikidot",
       trackPositions: options.trackPositions ?? true,
+      settings: options.settings ?? DEFAULT_SETTINGS,
       footnotes: [],
       tocEntries: [],
       codeBlocks: [],
@@ -9535,6 +9555,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) => {
@@ -9553,16 +9576,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();
@@ -9842,6 +9880,7 @@ export {
   extractListUsersVariables,
   extractDataRequirements,
   createToken,
+  createSettings,
   createPosition2 as createPosition,
   createPoint2 as createPoint,
   container,
@@ -9849,5 +9888,6 @@ export {
   compileListUsersTemplate,
   bold,
   Parser,
-  Lexer
+  Lexer,
+  DEFAULT_SETTINGS2 as DEFAULT_SETTINGS
 };

package/package.json

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