@wdprlib/parser 3.0.0 → 3.1.1

package/dist/index.cjs

@@ -9129,6 +9129,237 @@ function mapElementChildrenWithState(element, state, transform) {
   return { element, state };
 }
 
+// packages/parser/src/parser/rules/block/module/iftags/condition.ts
+function parseTagCondition(condition) {
+  const required = [];
+  const forbidden = [];
+  const optional = [];
+  const parts = condition.trim().split(/\s+/);
+  for (const part of parts) {
+    if (!part)
+      continue;
+    if (part.startsWith("+")) {
+      const tag = part.slice(1);
+      if (tag)
+        required.push(tag);
+    } else if (part.startsWith("-")) {
+      const tag = part.slice(1);
+      if (tag)
+        forbidden.push(tag);
+    } else {
+      optional.push(part);
+    }
+  }
+  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)) {
+      return false;
+    }
+  }
+  for (const tag of condition.forbidden) {
+    if (tagSet.has(tag)) {
+      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/preprocess.ts
+var BASE_PLACEHOLDER_OPEN = "";
+var BASE_PLACEHOLDER_CLOSE = "";
+var INNERMOST_IFTAGS_PATTERN = /\[\[\s*iftags\b([^\]]*)\]\]((?:(?!\[\[\s*iftags\b|\[\[\/\s*iftags\s*\]\]).)*)\[\[\/\s*iftags\s*\]\]/gis;
+var RAW_BLOCK_OPEN_PATTERN = /\[\[\s*(code|html)\b[^\]]*\]\]/iy;
+function preprocessIftags(source, pageTags) {
+  if (!source.includes("[["))
+    return source;
+  const sentinels = makeUniqueSentinels(source);
+  const { masked, placeholders } = maskRawRegions(source, sentinels);
+  const reduced = reduceIftags(masked, pageTags);
+  return restorePlaceholders(reduced, placeholders, sentinels);
+}
+function makeUniqueSentinels(source) {
+  let open = BASE_PLACEHOLDER_OPEN;
+  let close = BASE_PLACEHOLDER_CLOSE;
+  while (source.includes(open) || source.includes(close)) {
+    open += BASE_PLACEHOLDER_OPEN;
+    close += BASE_PLACEHOLDER_CLOSE;
+  }
+  return { open, close };
+}
+function reduceIftags(source, pageTags) {
+  let current = source;
+  const maxIterations = source.length + 1;
+  const tagSet = pageTags ?? [];
+  for (let i = 0;i < maxIterations; i++) {
+    const depths = pageTags === null ? computeBracketDepths(current) : null;
+    let changed = false;
+    const next = current.replace(INNERMOST_IFTAGS_PATTERN, (match, cond, body, offset) => {
+      if (depths !== null && depths[offset] === 0) {
+        return match;
+      }
+      changed = true;
+      const condition = parseTagCondition(cond);
+      return evaluateTagCondition(condition, tagSet) ? body : "";
+    });
+    if (!changed)
+      return current;
+    current = next;
+  }
+  return current;
+}
+function computeBracketDepths(masked) {
+  const n = masked.length;
+  const depths = new Int32Array(n + 1);
+  let depth = 0;
+  let i = 0;
+  while (i < n) {
+    depths[i] = depth;
+    const c = masked.charCodeAt(i);
+    const c1 = i + 1 < n ? masked.charCodeAt(i + 1) : -1;
+    const c2 = i + 2 < n ? masked.charCodeAt(i + 2) : -1;
+    if (depth > 0 && c === 34 && precededByEqualsAttr(masked, i)) {
+      const end = findQuoteEnd(masked, i + 1);
+      for (let k = i;k <= end; k++)
+        depths[k] = depth;
+      i = end + 1;
+      continue;
+    }
+    if (c === 91 && c1 === 91 && c2 === 91) {
+      const end = findTripleLinkEnd(masked, i + 3);
+      for (let k = i;k <= end; k++)
+        depths[k] = depth;
+      i = end + 1;
+      continue;
+    }
+    if (c === 91 && c1 === 91) {
+      depth++;
+      depths[i + 1] = depth;
+      i += 2;
+      continue;
+    }
+    if (c === 93 && c1 === 93) {
+      depth = Math.max(0, depth - 1);
+      depths[i + 1] = depth;
+      i += 2;
+      continue;
+    }
+    if (c === 10) {
+      depth = 0;
+    }
+    i++;
+  }
+  depths[n] = depth;
+  return depths;
+}
+function precededByEqualsAttr(s, i) {
+  let j = i - 1;
+  while (j >= 0) {
+    const ch = s.charCodeAt(j);
+    if (ch === 32 || ch === 9) {
+      j--;
+      continue;
+    }
+    return ch === 61;
+  }
+  return false;
+}
+function findQuoteEnd(s, from) {
+  for (let i = from;i < s.length; i++) {
+    const ch = s.charCodeAt(i);
+    if (ch === 34 || ch === 10)
+      return i;
+  }
+  return s.length - 1;
+}
+function findTripleLinkEnd(s, from) {
+  for (let i = from;i < s.length; i++) {
+    if (s.charCodeAt(i) === 93 && i + 2 < s.length && s.charCodeAt(i + 1) === 93 && s.charCodeAt(i + 2) === 93) {
+      return i + 2;
+    }
+    if (s.charCodeAt(i) === 10 && i + 1 < s.length && s.charCodeAt(i + 1) === 10) {
+      return i;
+    }
+  }
+  return s.length - 1;
+}
+function maskRawRegions(source, sentinels) {
+  const placeholders = [];
+  let masked = "";
+  let i = 0;
+  while (i < source.length) {
+    if (source[i] === "[" && source[i + 1] === "[") {
+      RAW_BLOCK_OPEN_PATTERN.lastIndex = i;
+      const openMatch = RAW_BLOCK_OPEN_PATTERN.exec(source);
+      if (openMatch) {
+        const name = openMatch[1].toLowerCase();
+        const openLen = openMatch[0].length;
+        const closePattern = new RegExp(`\\[\\[\\/\\s*${name}\\s*\\]\\]`, "ig");
+        closePattern.lastIndex = i + openLen;
+        const closeMatch = closePattern.exec(source);
+        if (closeMatch) {
+          const regionEnd = closeMatch.index + closeMatch[0].length;
+          masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
+          i = regionEnd;
+          continue;
+        }
+        if (name === "code") {
+          masked += pushPlaceholder(placeholders, source.slice(i), sentinels);
+          i = source.length;
+          continue;
+        }
+      }
+    }
+    if (source[i] === "@" && source[i + 1] === "<") {
+      const close = source.indexOf(">@", i + 2);
+      const newline = source.indexOf(`
+`, i + 2);
+      if (close !== -1 && (newline === -1 || close < newline)) {
+        const regionEnd = close + 2;
+        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
+        i = regionEnd;
+        continue;
+      }
+    }
+    if (source[i] === "@" && source[i + 1] === "@") {
+      const close = source.indexOf("@@", i + 2);
+      const newline = source.indexOf(`
+`, i + 2);
+      if (close !== -1 && (newline === -1 || close < newline)) {
+        const regionEnd = close + 2;
+        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
+        i = regionEnd;
+        continue;
+      }
+    }
+    masked += source[i];
+    i++;
+  }
+  return { masked, placeholders };
+}
+function pushPlaceholder(placeholders, text, sentinels) {
+  const idx = placeholders.length;
+  placeholders.push(text);
+  return `${sentinels.open}${idx}${sentinels.close}`;
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function restorePlaceholders(source, placeholders, sentinels) {
+  const pattern = new RegExp(`${escapeRegex(sentinels.open)}(\\d+)${escapeRegex(sentinels.close)}`, "g");
+  return source.replace(pattern, (_, idx) => placeholders[Number(idx)] ?? "");
+}
+
 // packages/parser/src/parser/parse.ts
 class Parser {
   ctx;
@@ -9237,7 +9468,8 @@ class Parser {
   }
 }
 function parse(source, options) {
-  const preprocessed = preprocess(source);
+  const iftagsProcessed = options?.pageTags !== undefined ? preprocessIftags(source, options.pageTags) : source;
+  const preprocessed = preprocess(iftagsProcessed);
   const tokens = tokenize(preprocessed, { trackPositions: options?.trackPositions });
   return new Parser(tokens, options).parse();
 }
@@ -10150,51 +10382,6 @@ function resolveAndNormalizeQuery(requirement, urlParams) {
   const resolved = resolveQuery(requirement, urlParams);
   return normalizeQuery(resolved);
 }
-// packages/parser/src/parser/rules/block/module/iftags/condition.ts
-function parseTagCondition(condition) {
-  const required = [];
-  const forbidden = [];
-  const optional = [];
-  const parts = condition.trim().split(/\s+/);
-  for (const part of parts) {
-    if (!part)
-      continue;
-    if (part.startsWith("+")) {
-      const tag = part.slice(1);
-      if (tag)
-        required.push(tag);
-    } else if (part.startsWith("-")) {
-      const tag = part.slice(1);
-      if (tag)
-        forbidden.push(tag);
-    } else {
-      optional.push(part);
-    }
-  }
-  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)) {
-      return false;
-    }
-  }
-  for (const tag of condition.forbidden) {
-    if (tagSet.has(tag)) {
-      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
 function isIfTagsElement(element) {
   return element.element === "if-tags";
@@ -10207,110 +10394,6 @@ function resolveIfTags(data, pageTags) {
   const matched = evaluateTagCondition(condition, pageTags);
   return { evaluated: true, matched };
 }
-// packages/parser/src/parser/rules/block/module/iftags/preprocess.ts
-var BASE_PLACEHOLDER_OPEN = "";
-var BASE_PLACEHOLDER_CLOSE = "";
-var INNERMOST_IFTAGS_PATTERN = /\[\[\s*iftags\b([^\]]*)\]\]((?:(?!\[\[\s*iftags\b|\[\[\/\s*iftags\s*\]\]).)*)\[\[\/\s*iftags\s*\]\]/gis;
-var RAW_BLOCK_OPEN_PATTERN = /\[\[\s*(code|html)\b[^\]]*\]\]/iy;
-function preprocessIftags(source, pageTags) {
-  if (pageTags === null)
-    return source;
-  if (!source.includes("[["))
-    return source;
-  const sentinels = makeUniqueSentinels(source);
-  const { masked, placeholders } = maskRawRegions(source, sentinels);
-  const reduced = reduceIftags(masked, pageTags);
-  return restorePlaceholders(reduced, placeholders, sentinels);
-}
-function makeUniqueSentinels(source) {
-  let open = BASE_PLACEHOLDER_OPEN;
-  let close = BASE_PLACEHOLDER_CLOSE;
-  while (source.includes(open) || source.includes(close)) {
-    open += BASE_PLACEHOLDER_OPEN;
-    close += BASE_PLACEHOLDER_CLOSE;
-  }
-  return { open, close };
-}
-function reduceIftags(source, pageTags) {
-  let current = source;
-  const maxIterations = source.length + 1;
-  for (let i = 0;i < maxIterations; i++) {
-    const next = current.replace(INNERMOST_IFTAGS_PATTERN, (_, cond, body) => {
-      const condition = parseTagCondition(cond);
-      return evaluateTagCondition(condition, pageTags) ? body : "";
-    });
-    if (next === current)
-      return current;
-    current = next;
-  }
-  return current;
-}
-function maskRawRegions(source, sentinels) {
-  const placeholders = [];
-  let masked = "";
-  let i = 0;
-  while (i < source.length) {
-    if (source[i] === "[" && source[i + 1] === "[") {
-      RAW_BLOCK_OPEN_PATTERN.lastIndex = i;
-      const openMatch = RAW_BLOCK_OPEN_PATTERN.exec(source);
-      if (openMatch) {
-        const name = openMatch[1].toLowerCase();
-        const openLen = openMatch[0].length;
-        const closePattern = new RegExp(`\\[\\[\\/\\s*${name}\\s*\\]\\]`, "ig");
-        closePattern.lastIndex = i + openLen;
-        const closeMatch = closePattern.exec(source);
-        if (closeMatch) {
-          const regionEnd = closeMatch.index + closeMatch[0].length;
-          masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
-          i = regionEnd;
-          continue;
-        }
-        if (name === "code") {
-          masked += pushPlaceholder(placeholders, source.slice(i), sentinels);
-          i = source.length;
-          continue;
-        }
-      }
-    }
-    if (source[i] === "@" && source[i + 1] === "<") {
-      const close = source.indexOf(">@", i + 2);
-      const newline = source.indexOf(`
-`, i + 2);
-      if (close !== -1 && (newline === -1 || close < newline)) {
-        const regionEnd = close + 2;
-        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
-        i = regionEnd;
-        continue;
-      }
-    }
-    if (source[i] === "@" && source[i + 1] === "@") {
-      const close = source.indexOf("@@", i + 2);
-      const newline = source.indexOf(`
-`, i + 2);
-      if (close !== -1 && (newline === -1 || close < newline)) {
-        const regionEnd = close + 2;
-        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
-        i = regionEnd;
-        continue;
-      }
-    }
-    masked += source[i];
-    i++;
-  }
-  return { masked, placeholders };
-}
-function pushPlaceholder(placeholders, text, sentinels) {
-  const idx = placeholders.length;
-  placeholders.push(text);
-  return `${sentinels.open}${idx}${sentinels.close}`;
-}
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function restorePlaceholders(source, placeholders, sentinels) {
-  const pattern = new RegExp(`${escapeRegex(sentinels.open)}(\\d+)${escapeRegex(sentinels.close)}`, "g");
-  return source.replace(pattern, (_, idx) => placeholders[Number(idx)] ?? "");
-}
 // packages/parser/src/parser/rules/block/module/include/resolve.ts
 function resolveIncludes(source, fetcher, options) {
   if (options?.settings && !options.settings.enablePageSyntax) {
@@ -10363,8 +10446,9 @@ function isRestOfLineBlank(source, pos) {
     if (ch === `
 `)
       return true;
-    if (ch !== " " && ch !== "\t" && ch !== "\r")
-      return false;
+    if (ch === " " || ch === "\t" || ch === "\r" || ch === "]")
+      continue;
+    return false;
   }
   return true;
 }

package/dist/index.d.cts

@@ -169,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}.
@@ -861,19 +880,19 @@ declare function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery
 * Expand `[[iftags ...]]X[[/iftags]]` directives in `source` against the
 * current page's tags.
 *
-* Returns `source` unchanged when `pageTags` is `null`, which signals
-* that the caller could not resolve tag membership (e.g. rendering a
-* draft preview without a real page). In that case the AST-level
-* resolver remains responsible for evaluation later.
-*
 * 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` to skip.
+* @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.
 */

package/dist/index.d.ts

@@ -169,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}.
@@ -861,19 +880,19 @@ declare function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery
 * Expand `[[iftags ...]]X[[/iftags]]` directives in `source` against the
 * current page's tags.
 *
-* Returns `source` unchanged when `pageTags` is `null`, which signals
-* that the caller could not resolve tag membership (e.g. rendering a
-* draft preview without a real page). In that case the AST-level
-* resolver remains responsible for evaluation later.
-*
 * 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` to skip.
+* @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.
 */

package/dist/index.js

@@ -9072,6 +9072,237 @@ function mapElementChildrenWithState(element, state, transform) {
   return { element, state };
 }
 
+// packages/parser/src/parser/rules/block/module/iftags/condition.ts
+function parseTagCondition(condition) {
+  const required = [];
+  const forbidden = [];
+  const optional = [];
+  const parts = condition.trim().split(/\s+/);
+  for (const part of parts) {
+    if (!part)
+      continue;
+    if (part.startsWith("+")) {
+      const tag = part.slice(1);
+      if (tag)
+        required.push(tag);
+    } else if (part.startsWith("-")) {
+      const tag = part.slice(1);
+      if (tag)
+        forbidden.push(tag);
+    } else {
+      optional.push(part);
+    }
+  }
+  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)) {
+      return false;
+    }
+  }
+  for (const tag of condition.forbidden) {
+    if (tagSet.has(tag)) {
+      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/preprocess.ts
+var BASE_PLACEHOLDER_OPEN = "";
+var BASE_PLACEHOLDER_CLOSE = "";
+var INNERMOST_IFTAGS_PATTERN = /\[\[\s*iftags\b([^\]]*)\]\]((?:(?!\[\[\s*iftags\b|\[\[\/\s*iftags\s*\]\]).)*)\[\[\/\s*iftags\s*\]\]/gis;
+var RAW_BLOCK_OPEN_PATTERN = /\[\[\s*(code|html)\b[^\]]*\]\]/iy;
+function preprocessIftags(source, pageTags) {
+  if (!source.includes("[["))
+    return source;
+  const sentinels = makeUniqueSentinels(source);
+  const { masked, placeholders } = maskRawRegions(source, sentinels);
+  const reduced = reduceIftags(masked, pageTags);
+  return restorePlaceholders(reduced, placeholders, sentinels);
+}
+function makeUniqueSentinels(source) {
+  let open = BASE_PLACEHOLDER_OPEN;
+  let close = BASE_PLACEHOLDER_CLOSE;
+  while (source.includes(open) || source.includes(close)) {
+    open += BASE_PLACEHOLDER_OPEN;
+    close += BASE_PLACEHOLDER_CLOSE;
+  }
+  return { open, close };
+}
+function reduceIftags(source, pageTags) {
+  let current = source;
+  const maxIterations = source.length + 1;
+  const tagSet = pageTags ?? [];
+  for (let i = 0;i < maxIterations; i++) {
+    const depths = pageTags === null ? computeBracketDepths(current) : null;
+    let changed = false;
+    const next = current.replace(INNERMOST_IFTAGS_PATTERN, (match, cond, body, offset) => {
+      if (depths !== null && depths[offset] === 0) {
+        return match;
+      }
+      changed = true;
+      const condition = parseTagCondition(cond);
+      return evaluateTagCondition(condition, tagSet) ? body : "";
+    });
+    if (!changed)
+      return current;
+    current = next;
+  }
+  return current;
+}
+function computeBracketDepths(masked) {
+  const n = masked.length;
+  const depths = new Int32Array(n + 1);
+  let depth = 0;
+  let i = 0;
+  while (i < n) {
+    depths[i] = depth;
+    const c = masked.charCodeAt(i);
+    const c1 = i + 1 < n ? masked.charCodeAt(i + 1) : -1;
+    const c2 = i + 2 < n ? masked.charCodeAt(i + 2) : -1;
+    if (depth > 0 && c === 34 && precededByEqualsAttr(masked, i)) {
+      const end = findQuoteEnd(masked, i + 1);
+      for (let k = i;k <= end; k++)
+        depths[k] = depth;
+      i = end + 1;
+      continue;
+    }
+    if (c === 91 && c1 === 91 && c2 === 91) {
+      const end = findTripleLinkEnd(masked, i + 3);
+      for (let k = i;k <= end; k++)
+        depths[k] = depth;
+      i = end + 1;
+      continue;
+    }
+    if (c === 91 && c1 === 91) {
+      depth++;
+      depths[i + 1] = depth;
+      i += 2;
+      continue;
+    }
+    if (c === 93 && c1 === 93) {
+      depth = Math.max(0, depth - 1);
+      depths[i + 1] = depth;
+      i += 2;
+      continue;
+    }
+    if (c === 10) {
+      depth = 0;
+    }
+    i++;
+  }
+  depths[n] = depth;
+  return depths;
+}
+function precededByEqualsAttr(s, i) {
+  let j = i - 1;
+  while (j >= 0) {
+    const ch = s.charCodeAt(j);
+    if (ch === 32 || ch === 9) {
+      j--;
+      continue;
+    }
+    return ch === 61;
+  }
+  return false;
+}
+function findQuoteEnd(s, from) {
+  for (let i = from;i < s.length; i++) {
+    const ch = s.charCodeAt(i);
+    if (ch === 34 || ch === 10)
+      return i;
+  }
+  return s.length - 1;
+}
+function findTripleLinkEnd(s, from) {
+  for (let i = from;i < s.length; i++) {
+    if (s.charCodeAt(i) === 93 && i + 2 < s.length && s.charCodeAt(i + 1) === 93 && s.charCodeAt(i + 2) === 93) {
+      return i + 2;
+    }
+    if (s.charCodeAt(i) === 10 && i + 1 < s.length && s.charCodeAt(i + 1) === 10) {
+      return i;
+    }
+  }
+  return s.length - 1;
+}
+function maskRawRegions(source, sentinels) {
+  const placeholders = [];
+  let masked = "";
+  let i = 0;
+  while (i < source.length) {
+    if (source[i] === "[" && source[i + 1] === "[") {
+      RAW_BLOCK_OPEN_PATTERN.lastIndex = i;
+      const openMatch = RAW_BLOCK_OPEN_PATTERN.exec(source);
+      if (openMatch) {
+        const name = openMatch[1].toLowerCase();
+        const openLen = openMatch[0].length;
+        const closePattern = new RegExp(`\\[\\[\\/\\s*${name}\\s*\\]\\]`, "ig");
+        closePattern.lastIndex = i + openLen;
+        const closeMatch = closePattern.exec(source);
+        if (closeMatch) {
+          const regionEnd = closeMatch.index + closeMatch[0].length;
+          masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
+          i = regionEnd;
+          continue;
+        }
+        if (name === "code") {
+          masked += pushPlaceholder(placeholders, source.slice(i), sentinels);
+          i = source.length;
+          continue;
+        }
+      }
+    }
+    if (source[i] === "@" && source[i + 1] === "<") {
+      const close = source.indexOf(">@", i + 2);
+      const newline = source.indexOf(`
+`, i + 2);
+      if (close !== -1 && (newline === -1 || close < newline)) {
+        const regionEnd = close + 2;
+        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
+        i = regionEnd;
+        continue;
+      }
+    }
+    if (source[i] === "@" && source[i + 1] === "@") {
+      const close = source.indexOf("@@", i + 2);
+      const newline = source.indexOf(`
+`, i + 2);
+      if (close !== -1 && (newline === -1 || close < newline)) {
+        const regionEnd = close + 2;
+        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
+        i = regionEnd;
+        continue;
+      }
+    }
+    masked += source[i];
+    i++;
+  }
+  return { masked, placeholders };
+}
+function pushPlaceholder(placeholders, text, sentinels) {
+  const idx = placeholders.length;
+  placeholders.push(text);
+  return `${sentinels.open}${idx}${sentinels.close}`;
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function restorePlaceholders(source, placeholders, sentinels) {
+  const pattern = new RegExp(`${escapeRegex(sentinels.open)}(\\d+)${escapeRegex(sentinels.close)}`, "g");
+  return source.replace(pattern, (_, idx) => placeholders[Number(idx)] ?? "");
+}
+
 // packages/parser/src/parser/parse.ts
 class Parser {
   ctx;
@@ -9180,7 +9411,8 @@ class Parser {
   }
 }
 function parse(source, options) {
-  const preprocessed = preprocess(source);
+  const iftagsProcessed = options?.pageTags !== undefined ? preprocessIftags(source, options.pageTags) : source;
+  const preprocessed = preprocess(iftagsProcessed);
   const tokens = tokenize(preprocessed, { trackPositions: options?.trackPositions });
   return new Parser(tokens, options).parse();
 }
@@ -10093,51 +10325,6 @@ function resolveAndNormalizeQuery(requirement, urlParams) {
   const resolved = resolveQuery(requirement, urlParams);
   return normalizeQuery(resolved);
 }
-// packages/parser/src/parser/rules/block/module/iftags/condition.ts
-function parseTagCondition(condition) {
-  const required = [];
-  const forbidden = [];
-  const optional = [];
-  const parts = condition.trim().split(/\s+/);
-  for (const part of parts) {
-    if (!part)
-      continue;
-    if (part.startsWith("+")) {
-      const tag = part.slice(1);
-      if (tag)
-        required.push(tag);
-    } else if (part.startsWith("-")) {
-      const tag = part.slice(1);
-      if (tag)
-        forbidden.push(tag);
-    } else {
-      optional.push(part);
-    }
-  }
-  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)) {
-      return false;
-    }
-  }
-  for (const tag of condition.forbidden) {
-    if (tagSet.has(tag)) {
-      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
 function isIfTagsElement(element) {
   return element.element === "if-tags";
@@ -10150,110 +10337,6 @@ function resolveIfTags(data, pageTags) {
   const matched = evaluateTagCondition(condition, pageTags);
   return { evaluated: true, matched };
 }
-// packages/parser/src/parser/rules/block/module/iftags/preprocess.ts
-var BASE_PLACEHOLDER_OPEN = "";
-var BASE_PLACEHOLDER_CLOSE = "";
-var INNERMOST_IFTAGS_PATTERN = /\[\[\s*iftags\b([^\]]*)\]\]((?:(?!\[\[\s*iftags\b|\[\[\/\s*iftags\s*\]\]).)*)\[\[\/\s*iftags\s*\]\]/gis;
-var RAW_BLOCK_OPEN_PATTERN = /\[\[\s*(code|html)\b[^\]]*\]\]/iy;
-function preprocessIftags(source, pageTags) {
-  if (pageTags === null)
-    return source;
-  if (!source.includes("[["))
-    return source;
-  const sentinels = makeUniqueSentinels(source);
-  const { masked, placeholders } = maskRawRegions(source, sentinels);
-  const reduced = reduceIftags(masked, pageTags);
-  return restorePlaceholders(reduced, placeholders, sentinels);
-}
-function makeUniqueSentinels(source) {
-  let open = BASE_PLACEHOLDER_OPEN;
-  let close = BASE_PLACEHOLDER_CLOSE;
-  while (source.includes(open) || source.includes(close)) {
-    open += BASE_PLACEHOLDER_OPEN;
-    close += BASE_PLACEHOLDER_CLOSE;
-  }
-  return { open, close };
-}
-function reduceIftags(source, pageTags) {
-  let current = source;
-  const maxIterations = source.length + 1;
-  for (let i = 0;i < maxIterations; i++) {
-    const next = current.replace(INNERMOST_IFTAGS_PATTERN, (_, cond, body) => {
-      const condition = parseTagCondition(cond);
-      return evaluateTagCondition(condition, pageTags) ? body : "";
-    });
-    if (next === current)
-      return current;
-    current = next;
-  }
-  return current;
-}
-function maskRawRegions(source, sentinels) {
-  const placeholders = [];
-  let masked = "";
-  let i = 0;
-  while (i < source.length) {
-    if (source[i] === "[" && source[i + 1] === "[") {
-      RAW_BLOCK_OPEN_PATTERN.lastIndex = i;
-      const openMatch = RAW_BLOCK_OPEN_PATTERN.exec(source);
-      if (openMatch) {
-        const name = openMatch[1].toLowerCase();
-        const openLen = openMatch[0].length;
-        const closePattern = new RegExp(`\\[\\[\\/\\s*${name}\\s*\\]\\]`, "ig");
-        closePattern.lastIndex = i + openLen;
-        const closeMatch = closePattern.exec(source);
-        if (closeMatch) {
-          const regionEnd = closeMatch.index + closeMatch[0].length;
-          masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
-          i = regionEnd;
-          continue;
-        }
-        if (name === "code") {
-          masked += pushPlaceholder(placeholders, source.slice(i), sentinels);
-          i = source.length;
-          continue;
-        }
-      }
-    }
-    if (source[i] === "@" && source[i + 1] === "<") {
-      const close = source.indexOf(">@", i + 2);
-      const newline = source.indexOf(`
-`, i + 2);
-      if (close !== -1 && (newline === -1 || close < newline)) {
-        const regionEnd = close + 2;
-        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
-        i = regionEnd;
-        continue;
-      }
-    }
-    if (source[i] === "@" && source[i + 1] === "@") {
-      const close = source.indexOf("@@", i + 2);
-      const newline = source.indexOf(`
-`, i + 2);
-      if (close !== -1 && (newline === -1 || close < newline)) {
-        const regionEnd = close + 2;
-        masked += pushPlaceholder(placeholders, source.slice(i, regionEnd), sentinels);
-        i = regionEnd;
-        continue;
-      }
-    }
-    masked += source[i];
-    i++;
-  }
-  return { masked, placeholders };
-}
-function pushPlaceholder(placeholders, text, sentinels) {
-  const idx = placeholders.length;
-  placeholders.push(text);
-  return `${sentinels.open}${idx}${sentinels.close}`;
-}
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function restorePlaceholders(source, placeholders, sentinels) {
-  const pattern = new RegExp(`${escapeRegex(sentinels.open)}(\\d+)${escapeRegex(sentinels.close)}`, "g");
-  return source.replace(pattern, (_, idx) => placeholders[Number(idx)] ?? "");
-}
 // packages/parser/src/parser/rules/block/module/include/resolve.ts
 function resolveIncludes(source, fetcher, options) {
   if (options?.settings && !options.settings.enablePageSyntax) {
@@ -10306,8 +10389,9 @@ function isRestOfLineBlank(source, pos) {
     if (ch === `
 `)
       return true;
-    if (ch !== " " && ch !== "\t" && ch !== "\r")
-      return false;
+    if (ch === " " || ch === "\t" || ch === "\r" || ch === "]")
+      continue;
+    return false;
   }
   return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdprlib/parser",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "Parser for Wikidot markup",
   "keywords": [
     "ast",