@wdprlib/parser 1.0.0 → 1.1.0

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 };
@@ -8288,6 +8306,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 +9606,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) => {

package/dist/index.d.cts

@@ -1,5 +1,7 @@
 import { Position as Position2, Point, Version as Version2, Element as Element6, SyntaxTree as SyntaxTree4, ContainerType, ContainerData, AttributeMap, VariableMap, Alignment, LinkType, LinkLocation, LinkLabel, PageRef as PageRef2, ImageSource, FloatAlignment, ListType, ListItem, ListData, CodeBlockData as CodeBlockData2, TabData, TableCell, TableRow, TableData, DefinitionListItem, Module as Module4, CollapsibleData, ClearFloat, AnchorTarget, HeaderType, AlignType, HeadingLevel, Heading, DateItem, Embed, TocEntry as TocEntry2 } from "@wdprlib/ast";
 import { createPoint, createPosition, text, container, paragraph, bold, italics, heading, lineBreak, horizontalRule, link, list, listItemElements, listItemSubList } from "@wdprlib/ast";
+import { WikitextMode, WikitextSettings as WikitextSettings4 } from "@wdprlib/ast";
+import { createSettings, DEFAULT_SETTINGS } from "@wdprlib/ast";
 import { Position } from "@wdprlib/ast";
 /**
 * Token types for Wikidot markup
@@ -79,7 +81,7 @@ declare class Lexer {
 * Tokenize source string
 */
 declare function tokenize(source: string, options?: LexerOptions): Token[];
-import { SyntaxTree } from "@wdprlib/ast";
+import { SyntaxTree, WikitextSettings } from "@wdprlib/ast";
 /**
 * Parser options
 */
@@ -88,6 +90,8 @@ interface ParserOptions {
 	version?: "wikidot";
 	/** Track position information */
 	trackPositions?: boolean;
+	/** Wikitext settings controlling syntax availability */
+	settings?: WikitextSettings;
 }
 /**
 * Wikidot markup parser
@@ -655,7 +659,7 @@ declare function parseNumericSelector(value: string): NormalizedNumericSelector
 * @returns Normalized query with structured types
 */
 declare function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery;
-import { PageRef } from "@wdprlib/ast";
+import { PageRef, WikitextSettings as WikitextSettings3 } from "@wdprlib/ast";
 /**
 * Callback to fetch page content for include resolution.
 * Returns the wikitext source of the page, or null if the page does not exist.
@@ -671,6 +675,8 @@ type IncludeFetcher = (pageRef: PageRef) => string | null;
 interface ResolveIncludesOptions {
 	/** Maximum recursion depth for nested includes (default: 5) */
 	maxDepth?: number;
+	/** Wikitext settings. If enablePageSyntax is false, includes are not expanded. */
+	settings?: WikitextSettings3;
 }
 /**
 * Expand all [[include]] directives in the source text.
@@ -749,4 +755,4 @@ 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, createPosition, createPoint, container, compileTemplate, compileListUsersTemplate, bold, 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, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AnchorTarget, Alignment, AlignType };
+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 };

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { Position as Position2, Point, Version as Version2, Element as Element6, SyntaxTree as SyntaxTree4, ContainerType, ContainerData, AttributeMap, VariableMap, Alignment, LinkType, LinkLocation, LinkLabel, PageRef as PageRef2, ImageSource, FloatAlignment, ListType, ListItem, ListData, CodeBlockData as CodeBlockData2, TabData, TableCell, TableRow, TableData, DefinitionListItem, Module as Module4, CollapsibleData, ClearFloat, AnchorTarget, HeaderType, AlignType, HeadingLevel, Heading, DateItem, Embed, TocEntry as TocEntry2 } from "@wdprlib/ast";
 import { createPoint, createPosition, text, container, paragraph, bold, italics, heading, lineBreak, horizontalRule, link, list, listItemElements, listItemSubList } from "@wdprlib/ast";
+import { WikitextMode, WikitextSettings as WikitextSettings4 } from "@wdprlib/ast";
+import { createSettings, DEFAULT_SETTINGS } from "@wdprlib/ast";
 import { Position } from "@wdprlib/ast";
 /**
 * Token types for Wikidot markup
@@ -79,7 +81,7 @@ declare class Lexer {
 * Tokenize source string
 */
 declare function tokenize(source: string, options?: LexerOptions): Token[];
-import { SyntaxTree } from "@wdprlib/ast";
+import { SyntaxTree, WikitextSettings } from "@wdprlib/ast";
 /**
 * Parser options
 */
@@ -88,6 +90,8 @@ interface ParserOptions {
 	version?: "wikidot";
 	/** Track position information */
 	trackPositions?: boolean;
+	/** Wikitext settings controlling syntax availability */
+	settings?: WikitextSettings;
 }
 /**
 * Wikidot markup parser
@@ -655,7 +659,7 @@ declare function parseNumericSelector(value: string): NormalizedNumericSelector
 * @returns Normalized query with structured types
 */
 declare function normalizeQuery(query: ListPagesQuery): NormalizedListPagesQuery;
-import { PageRef } from "@wdprlib/ast";
+import { PageRef, WikitextSettings as WikitextSettings3 } from "@wdprlib/ast";
 /**
 * Callback to fetch page content for include resolution.
 * Returns the wikitext source of the page, or null if the page does not exist.
@@ -671,6 +675,8 @@ type IncludeFetcher = (pageRef: PageRef) => string | null;
 interface ResolveIncludesOptions {
 	/** Maximum recursion depth for nested includes (default: 5) */
 	maxDepth?: number;
+	/** Wikitext settings. If enablePageSyntax is false, includes are not expanded. */
+	settings?: WikitextSettings3;
 }
 /**
 * Expand all [[include]] directives in the source text.
@@ -749,4 +755,4 @@ 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, createPosition, createPoint, container, compileTemplate, compileListUsersTemplate, bold, 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, ContainerType, ContainerData, CompiledTemplate, CollapsibleData, CodeBlockData2 as CodeBlockData, ClearFloat, AttributeMap, AnchorTarget, Alignment, AlignType };
+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 };

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 };
@@ -8236,6 +8252,7 @@ class Parser {
       pos: 0,
       version: options.version ?? "wikidot",
       trackPositions: options.trackPositions ?? true,
+      settings: options.settings ?? DEFAULT_SETTINGS,
       footnotes: [],
       tocEntries: [],
       codeBlocks: [],
@@ -9535,6 +9552,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) => {
@@ -9842,6 +9862,7 @@ export {
   extractListUsersVariables,
   extractDataRequirements,
   createToken,
+  createSettings,
   createPosition2 as createPosition,
   createPoint2 as createPoint,
   container,
@@ -9849,5 +9870,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.0",
   "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"
   }
 }