@markuplint/parser-utils 4.8.11 → 5.0.0-alpha.0

package/ARCHITECTURE.ja.md

@@ -57,7 +57,7 @@ flowchart TD
         mlAst["@markuplint/ml-ast\n型定義"]
         mlSpec["@markuplint/ml-spec\nvoid 要素"]
         espree["espree\nJS トークナイザ"]
-        uuidLib["uuid\nノード ID"]
+        cryptoLib["node:crypto\nノード ID"]
     end
 
     parser --> attrTokenizer
@@ -79,7 +79,7 @@ flowchart TD
 
     parser --> mlAst
     parser --> mlSpec
-    parser --> uuidLib
+    parser --> cryptoLib
     decision --> mlAst
 ```
 
@@ -95,12 +95,12 @@ flowchart TD
 | `ignore-block.ts`        | テンプレート式のマスキングと復元           | `ignoreBlock`, `restoreNode`                                                                                                              |
 | `ignore-front-matter.ts` | YAML フロントマター処理                    | `ignoreFrontMatter`                                                                                                                       |
 | `detect-element-type.ts` | 要素の分類                                 | `detectElementType`                                                                                                                       |
-| `idl-attributes.ts`      | IDL ↔ コンテンツ属性名マッピング          | `searchIDLAttribute`                                                                                                                      |
+| `idl-attributes.ts`      | IDL ↔ コンテンツ属性名マッピング           | `searchIDLAttribute`                                                                                                                      |
 | `debugger.ts`            | テスト・デバッグユーティリティ             | `nodeListToDebugMaps`, `attributesToDebugMaps`, `nodeTreeDebugView`                                                                       |
 | `parser-error.ts`        | エラークラス                               | `ParserError`, `TargetParserError`, `ConfigParserError`                                                                                   |
 | `sort-nodes.ts`          | ノードの位置ソート                         | `sortNodes`                                                                                                                               |
 | `const.ts`               | 定数                                       | `MASK_CHAR`, `svgElementList`, `defaultSpaces`                                                                                            |
-| `get-location.ts`        | 位置計算                                   | `getPosition`, `getEndLine`, `getEndCol`, `getOffsetsFromCode`                                                                            |
+| `get-location.ts`        | 位置計算                                   | `getPosition`, `getEndLine`, `getEndCol`, `getEndPosition`, `getOffsetsFromCode`                                                          |
 | `decision.ts`            | カスタム要素名判定                         | `isPotentialCustomElementName`, `isSVGElement`                                                                                            |
 
 ## パースパイプライン概要
@@ -148,7 +148,7 @@ ParserError (基底クラス)
 
 ## IDL 属性マッピング
 
-`searchIDLAttribute` は React スタイルの IDL 属性名と HTML コンテンツ属性名の双方向マッピングを提供します（例: `className` → `class`、`htmlFor` → `for`）。JSX パーサーが属性の `potentialName` を解決する際に使用されます。
+`searchIDLAttribute` は React スタイルの IDL 属性名と HTML コンテンツ属性名の双方向マッピングを提供します（例: `className` → `class`、`htmlFor` → `for`）。spec が `useIDLAttributeNames: true` を設定している場合に、`@markuplint/ml-core` の `MLAttr` コンストラクタから呼び出されます。
 
 ## 外部依存
 
@@ -157,7 +157,7 @@ ParserError (基底クラス)
 | `@markuplint/ml-ast`  | AST 型定義                         |
 | `@markuplint/ml-spec` | void 要素判定                      |
 | `@markuplint/types`   | カスタム要素名検証                 |
-| `uuid`                | AST ノード UUID 生成               |
+| `node:crypto`         | AST ノード UUID 生成               |
 | `debug`               | パフォーマンスタイミング・ロギング |
 | `espree`              | JavaScript トークン化・パース      |
 | `type-fest`           | TypeScript ユーティリティ型        |

package/ARCHITECTURE.md

@@ -67,7 +67,7 @@ flowchart TD
         mlSpec["@markuplint/ml-spec\n(void element detection)"]
         mlTypes["@markuplint/types\n(custom element validation)"]
         espree["espree\n(JS tokenization)"]
-        uuidLib["uuid\n(node ID generation)"]
+        cryptoLib["node:crypto\n(node ID generation)"]
         debugLib["debug\n(logging)"]
     end
 
@@ -90,7 +90,7 @@ flowchart TD
     decision --> mlTypes
     parser --> mlAst
     parser --> mlSpec
-    parser --> uuidLib
+    parser --> cryptoLib
     scriptParser --> espree
     debugMod --> debugLib
 ```
@@ -113,7 +113,7 @@ flowchart TD
 | `parser-error.ts`        | Error classes with positional information                                       | `ParserError`, `TargetParserError`, `ConfigParserError`                                                                                   |
 | `sort-nodes.ts`          | Node position sorting by offset                                                 | `sortNodes`                                                                                                                               |
 | `const.ts`               | Constants used across the package                                               | `MASK_CHAR`, `svgElementList`, `defaultSpaces`                                                                                            |
-| `get-location.ts`        | Line/column/offset position calculations                                        | `getPosition`, `getEndLine`, `getEndCol`, `getOffsetsFromCode`                                                                            |
+| `get-location.ts`        | Line/column/offset position calculations                                        | `getPosition`, `getEndLine`, `getEndCol`, `getEndPosition`, `getOffsetsFromCode`                                                          |
 | `decision.ts`            | Custom element name detection and SVG element lookup                            | `isPotentialCustomElementName`, `isSVGElement`                                                                                            |
 
 ## Parse Pipeline Overview
@@ -174,7 +174,7 @@ Additionally, `debug.ts` provides `PerformanceTimer` for measuring parse phase d
 
 ## IDL Attribute Mapping
 
-`searchIDLAttribute` maps between React-style IDL attribute names and HTML content attribute names. It maintains a comprehensive mapping table derived from React's `possibleStandardNames.js`, covering:
+`searchIDLAttribute` maps between React-style IDL attribute names and HTML content attribute names. It is called by `@markuplint/ml-core`'s `MLAttr` constructor when the spec sets `useIDLAttributeNames: true`. It maintains a comprehensive mapping table derived from React's `possibleStandardNames.js`, covering:
 
 - HTML attributes (e.g., `className` -> `class`, `htmlFor` -> `for`, `tabIndex` -> `tabindex`)
 - SVG attributes (e.g., `strokeWidth` -> `stroke-width`, `clipPath` -> `clip-path`)
@@ -189,7 +189,7 @@ The lookup handles camelCase IDL names, lowercase content attribute names, and h
 | `@markuplint/ml-ast`  | AST type definitions (`MLASTDocument`, `MLASTElement`, `MLASTToken`, etc.) |
 | `@markuplint/ml-spec` | Void element detection (`isVoidElement`) for self-closing tag handling     |
 | `@markuplint/types`   | Custom element name validation (`isCustomElementName`)                     |
-| `uuid`                | AST node UUID generation for unique node identification                    |
+| `node:crypto`         | AST node UUID generation via `crypto.randomUUID()`                         |
 | `debug`               | Performance timing and structured logging                                  |
 | `espree`              | JavaScript tokenization and parsing for embedded script content            |
 | `type-fest`           | TypeScript utility types                                                   |

package/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.0](https://github.com/markuplint/markuplint/compare/v4.14.1...v5.0.0-alpha.0) (2026-02-20)
+
+### Bug Fixes
+
+- **ml-core:** improve detection of namespace ([5b507ad](https://github.com/markuplint/markuplint/commit/5b507ad7c19c5015b8ce587845d901e31dfa6518))
+- resolve additional eslint-plugin-unicorn v63 errors ([e58a72c](https://github.com/markuplint/markuplint/commit/e58a72c17c97bbec522f9513b99777fac6904d64))
+- use explicit `export type` for type-only re-exports ([7c77c05](https://github.com/markuplint/markuplint/commit/7c77c05619518c8d18a183132040f5b2cd0ab6ec))
+
+- feat(parser-utils)!: adapt to simplified MLASTToken properties ([5cbbc9c](https://github.com/markuplint/markuplint/commit/5cbbc9ca8f77a71d99bffa14b193c79b26c1c415))
+
+### BREAKING CHANGES
+
+- Update Token type and parser internals for
+  simplified AST token properties.
+
+Token type property renames:
+
+- startOffset -> offset
+- startLine -> line
+- startCol -> col
+
+Parser changes:
+
+- createToken() no longer produces endOffset/endLine/endCol
+- visitPsBlock() parameter: conditionalType -> blockBehavior
+- visitElement() accepts blockBehavior option
+- Remove selfClosingSolidus token generation
+- Add getEndPosition() helper to get-location.ts
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+
 ## [4.8.11](https://github.com/markuplint/markuplint/compare/@markuplint/parser-utils@4.8.10...@markuplint/parser-utils@4.8.11) (2026-02-10)
 
 **Note:** Version bump only for package @markuplint/parser-utils

package/docs/parser-class.ja.md

@@ -255,12 +255,12 @@ doctype 名、パブリック ID、システム ID を含むトークンから d
 visitPsBlock(
   token: ChildToken & { nodeName: string; isFragment: boolean },
   childNodes?: readonly Node[],
-  conditionalType?: MLASTPreprocessorSpecificBlockConditionalType,
+  blockBehavior?: MLASTBlockBehavior | null,
   originBlockNode?: Node
 ): readonly MLASTNodeTreeItem[]
 ```
 
-プリプロセッサ固有のブロックノードを作成します。`nodeName` には自動的に `#ps:` プレフィックスが付加されます（例: `#ps:if`、`#ps:each`、`#ps:front-matter`）。`visitChildren()` を通じて子ノードを再帰的にトラバースします。
+プリプロセッサ固有のブロックノードを作成します。`nodeName` には自動的に `#ps:` プレフィックスが付加されます（例: `#ps:if`、`#ps:each`、`#ps:front-matter`）。`blockBehavior` パラメータはブロックの制御フロー（型と式）を記述します。`visitChildren()` を通じて子ノードを再帰的にトラバースします。
 
 ### visitAttr()
 
@@ -347,10 +347,10 @@ stateDiagram-v2
 
 ```ts
 createToken(token: Token): MLASTToken;
-createToken(token: string, startOffset: number, startLine: number, startCol: number): MLASTToken;
+createToken(token: string, offset: number, line: number, col: number): MLASTToken;
 ```
 
-生成された UUID（8 文字）と計算された終了位置を持つ新しい `MLASTToken` を作成します。`Token` オブジェクトまたは明示的な座標を持つ生の文字列を受け取ります。
+生成された UUID（8 文字）を持つ新しい `MLASTToken` を作成します。`Token` オブジェクトまたは明示的な座標を持つ生の文字列を受け取ります。
 
 ### sliceFragment()
 
@@ -412,11 +412,11 @@ walk<Node extends MLASTNodeTreeItem>(
 ```ts
 updateLocation(
   node: MLASTNodeTreeItem,
-  props: Partial<Pick<MLASTNodeTreeItem, 'startOffset' | 'startLine' | 'startCol' | 'depth'>>
+  props: Partial<Pick<MLASTNodeTreeItem, 'offset' | 'line' | 'col' | 'depth'>>
 ): void
 ```
 
-AST ノードの位置と深さのプロパティを更新し、新しい開始値から終了オフセット/行/列を再計算します。
+AST ノードの位置と深さのプロパティを更新します。
 
 ### updateRaw()
 

package/docs/parser-class.md

@@ -255,12 +255,12 @@ Creates a doctype node from a token containing the doctype name, public ID, and
 visitPsBlock(
   token: ChildToken & { nodeName: string; isFragment: boolean },
   childNodes?: readonly Node[],
-  conditionalType?: MLASTPreprocessorSpecificBlockConditionalType,
+  blockBehavior?: MLASTBlockBehavior | null,
   originBlockNode?: Node
 ): readonly MLASTNodeTreeItem[]
 ```
 
-Creates a preprocessor-specific block node. The `nodeName` is automatically prefixed with `#ps:` (e.g., `#ps:if`, `#ps:each`, `#ps:front-matter`). Recursively traverses child nodes via `visitChildren()`.
+Creates a preprocessor-specific block node. The `nodeName` is automatically prefixed with `#ps:` (e.g., `#ps:if`, `#ps:each`, `#ps:front-matter`). The `blockBehavior` parameter describes the control-flow semantics (type and expression) of the block. Recursively traverses child nodes via `visitChildren()`.
 
 ### visitAttr()
 
@@ -347,10 +347,10 @@ stateDiagram-v2
 
 ```ts
 createToken(token: Token): MLASTToken;
-createToken(token: string, startOffset: number, startLine: number, startCol: number): MLASTToken;
+createToken(token: string, offset: number, line: number, col: number): MLASTToken;
 ```
 
-Creates a new `MLASTToken` with a generated UUID (8 chars) and computed end position. Accepts either a `Token` object or a raw string with explicit coordinates.
+Creates a new `MLASTToken` with a generated UUID (8 chars). Accepts either a `Token` object or a raw string with explicit coordinates.
 
 ### sliceFragment()
 
@@ -412,11 +412,11 @@ Walks a node list depth-first, invoking the walker callback for each node. The w
 ```ts
 updateLocation(
   node: MLASTNodeTreeItem,
-  props: Partial<Pick<MLASTNodeTreeItem, 'startOffset' | 'startLine' | 'startCol' | 'depth'>>
+  props: Partial<Pick<MLASTNodeTreeItem, 'offset' | 'line' | 'col' | 'depth'>>
 ): void
 ```
 
-Updates position and depth properties of an AST node, recalculating end offsets/lines/columns from the new start values.
+Updates position and depth properties of an AST node.
 
 ### updateRaw()
 

package/lib/debug.js

@@ -1,15 +1,3 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _PerformanceTimer_logs, _PerformanceTimer_counter;
 import debug from 'debug';
 import { nodeListToDebugMaps } from './debugger.js';
 export const log = debug('ml-parser');
@@ -17,32 +5,29 @@ export function domLog(nodeList) {
     log('Parse result: %O', nodeListToDebugMaps(nodeList, true));
 }
 export class PerformanceTimer {
-    constructor() {
-        _PerformanceTimer_logs.set(this, []);
-        _PerformanceTimer_counter.set(this, -1);
-    }
+    #logs = [];
+    #counter = -1;
     push(name) {
-        var _a;
         if (!log.enabled) {
             return '';
         }
-        __classPrivateFieldSet(this, _PerformanceTimer_counter, (_a = __classPrivateFieldGet(this, _PerformanceTimer_counter, "f"), _a++, _a), "f");
+        this.#counter++;
         const now = performance.now();
-        const last = __classPrivateFieldGet(this, _PerformanceTimer_logs, "f").at(-1);
+        const last = this.#logs.at(-1);
         if (last && Number.isNaN(last[2])) {
             last[2] = now;
         }
-        name = name || `#${__classPrivateFieldGet(this, _PerformanceTimer_counter, "f")}`;
-        __classPrivateFieldGet(this, _PerformanceTimer_logs, "f").push([name, now, Number.NaN]);
+        name = name || `#${this.#counter}`;
+        this.#logs.push([name, now, Number.NaN]);
     }
     log() {
         if (!log.enabled) {
             return;
         }
         this.push('end');
-        __classPrivateFieldGet(this, _PerformanceTimer_logs, "f").pop();
+        this.#logs.pop();
         const map = new Map();
-        for (const content of __classPrivateFieldGet(this, _PerformanceTimer_logs, "f")) {
+        for (const content of this.#logs) {
             const diff = content[2] - content[1];
             const name = content[0];
             if (map.has(name)) {
@@ -59,4 +44,3 @@ export class PerformanceTimer {
         }
     }
 }
-_PerformanceTimer_logs = new WeakMap(), _PerformanceTimer_counter = new WeakMap();

package/lib/debugger.js

@@ -1,3 +1,4 @@
+import { getEndCol, getEndLine } from './get-location.js';
 /**
  * Converts a list of AST nodes into human-readable debug strings showing
  * each node's position, type, and raw content. Useful for snapshot testing.
@@ -8,8 +9,7 @@
  */
 export function nodeListToDebugMaps(nodeList, withAttr = false) {
     return nodeList.flatMap(n => {
-        const r = [];
-        r.push(tokenDebug(n));
+        const r = [tokenDebug(n)];
         if (withAttr && n && n.type === 'starttag') {
             r.push(...attributesToDebugMaps(n.attributes).flat());
         }
@@ -86,9 +86,14 @@ function tokenDebug(n, type = '') {
     if (!n) {
         return 'NULL';
     }
-    return `[${n.startLine}:${n.startCol}]>[${n.endLine}:${n.endCol}](${n.startOffset},${n.endOffset})${
+    const endOffset = n.offset + n.raw.length;
+    const endLine = getEndLine(n.raw, n.line);
+    const endCol = getEndCol(n.raw, n.col);
+    return `[${n.line}:${n.col}]>[${endLine}:${endCol}](${n.offset},${endOffset})${
     // @ts-ignore
-    n.potentialName ?? n.nodeName ?? n.name ?? n.type ?? type}${'isGhost' in n && n.isGhost ? '(👻)' : ''}${'isBogus' in n && n.isBogus ? '(👿)' : ''}${'conditionalType' in n && n.conditionalType ? ` (${n.conditionalType})` : ''}: ${visibleWhiteSpace(n.raw)}`;
+    n.potentialName ?? n.nodeName ?? n.name ?? n.type ?? type}${'isGhost' in n && n.isGhost ? '(👻)' : ''}${'isBogus' in n && n.isBogus ? '(👿)' : ''}${
+    // @ts-ignore
+    n.blockBehavior?.type ? ` (${n.blockBehavior.type})` : ''}: ${visibleWhiteSpace(n.raw)}`;
 }
 function visibleWhiteSpace(chars) {
     return chars.replaceAll('\n', '⏎').replaceAll('\t', '→').replaceAll(/\s/g, '␣');

package/lib/get-location.d.ts

@@ -6,12 +6,43 @@ export declare function getLine(rawCodeFragment: string, startOffset: number): n
  * @deprecated Use {@link getPosition} instead. Will be removed in v5.0.0.
  */
 export declare function getCol(rawCodeFragment: string, startOffset: number): number;
+/**
+ * Computes the line and column of a position within a code fragment.
+ *
+ * @param rawCodeFragment - The full raw source text
+ * @param startOffset - The zero-based byte offset to compute the position of
+ * @returns An object containing one-based `line` and `column`
+ */
 export declare function getPosition(rawCodeFragment: string, startOffset: number): {
     readonly line: number;
     readonly column: number;
 };
 export declare function getEndLine(rawCodeFragment: string, startLine: number): number;
 export declare function getEndCol(rawCodeFragment: string, startCol: number): number;
+/**
+ * Computes the end position of a code fragment given its start position.
+ *
+ * @param rawCodeFragment - The raw source text of the fragment
+ * @param startOffset - The zero-based byte offset where the fragment starts
+ * @param startLine - The one-based line number where the fragment starts
+ * @param startCol - The one-based column number where the fragment starts
+ * @returns An object containing `endOffset`, `endLine`, and `endCol`
+ */
+export declare function getEndPosition(rawCodeFragment: string, startOffset: number, startLine: number, startCol: number): {
+    endOffset: number;
+    endLine: number;
+    endCol: number;
+};
+/**
+ * Converts line/column ranges to byte offsets within a code string.
+ *
+ * @param rawCode - The full raw source text
+ * @param startLine - The one-based start line number
+ * @param startCol - The one-based start column number
+ * @param endLine - The one-based end line number
+ * @param endCol - The one-based end column number
+ * @returns An object containing zero-based `offset` and `endOffset`
+ */
 export declare function getOffsetsFromCode(rawCode: string, startLine: number, startCol: number, endLine: number, endCol: number): {
     offset: number;
     endOffset: number;

package/lib/get-location.js

@@ -12,6 +12,13 @@ export function getCol(rawCodeFragment, startOffset) {
     const lines = rawCodeFragment.slice(0, startOffset).split(LINE_BREAK);
     return (lines.at(-1) ?? '').length + 1;
 }
+/**
+ * Computes the line and column of a position within a code fragment.
+ *
+ * @param rawCodeFragment - The full raw source text
+ * @param startOffset - The zero-based byte offset to compute the position of
+ * @returns An object containing one-based `line` and `column`
+ */
 export function getPosition(rawCodeFragment, startOffset) {
     const lines = rawCodeFragment.slice(0, startOffset).split(LINE_BREAK);
     const line = lines.length;
@@ -27,6 +34,32 @@ export function getEndCol(rawCodeFragment, startCol) {
     const lastLine = lines.pop();
     return lineCount > 1 ? lastLine.length + 1 : startCol + rawCodeFragment.length;
 }
+/**
+ * Computes the end position of a code fragment given its start position.
+ *
+ * @param rawCodeFragment - The raw source text of the fragment
+ * @param startOffset - The zero-based byte offset where the fragment starts
+ * @param startLine - The one-based line number where the fragment starts
+ * @param startCol - The one-based column number where the fragment starts
+ * @returns An object containing `endOffset`, `endLine`, and `endCol`
+ */
+export function getEndPosition(rawCodeFragment, startOffset, startLine, startCol) {
+    return {
+        endOffset: startOffset + rawCodeFragment.length,
+        endLine: getEndLine(rawCodeFragment, startLine),
+        endCol: getEndCol(rawCodeFragment, startCol),
+    };
+}
+/**
+ * Converts line/column ranges to byte offsets within a code string.
+ *
+ * @param rawCode - The full raw source text
+ * @param startLine - The one-based start line number
+ * @param startCol - The one-based start column number
+ * @param endLine - The one-based end line number
+ * @param endCol - The one-based end column number
+ * @returns An object containing zero-based `offset` and `endOffset`
+ */
 export function getOffsetsFromCode(rawCode, startLine, startCol, endLine, endCol) {
     const lines = rawCode.split('\n');
     let offset = 0;

package/lib/get-namespace.d.ts

@@ -1,2 +1,11 @@
 import type { MLASTParentNode, NamespaceURI } from '@markuplint/ml-ast';
+/**
+ * Determines the namespace URI for a node based on its tag name and parent node context.
+ * Handles namespace transitions between HTML, SVG, and MathML
+ * (e.g., entering `<svg>` switches to SVG namespace, `<foreignObject>` switches back to HTML).
+ *
+ * @param currentNodeName - The tag name of the current node, or null for anonymous nodes
+ * @param parentNode - The parent node in the AST, or null for root-level nodes
+ * @returns The resolved namespace URI for the node
+ */
 export declare function getNamespace(currentNodeName: string | null, parentNode: MLASTParentNode | null): NamespaceURI;

package/lib/get-namespace.js

@@ -1,3 +1,12 @@
+/**
+ * Determines the namespace URI for a node based on its tag name and parent node context.
+ * Handles namespace transitions between HTML, SVG, and MathML
+ * (e.g., entering `<svg>` switches to SVG namespace, `<foreignObject>` switches back to HTML).
+ *
+ * @param currentNodeName - The tag name of the current node, or null for anonymous nodes
+ * @param parentNode - The parent node in the AST, or null for root-level nodes
+ * @returns The resolved namespace URI for the node
+ */
 export function getNamespace(currentNodeName, parentNode) {
     const parentNS = getParentNamespace(parentNode);
     if (parentNS === 'http://www.w3.org/1999/xhtml' && currentNodeName?.toLowerCase() === 'svg') {

package/lib/ignore-block.js

@@ -15,11 +15,10 @@ export function ignoreBlock(source, tags, maskChar = MASK_CHAR) {
         replaced = text.replaced;
         stack.push(...text.stack.map(res => ({ ...res, type: tag.type })));
     }
-    stack.sort((a, b) => a.index - b.index);
     return {
         source,
         replaced,
-        stack,
+        stack: stack.toSorted((a, b) => a.index - b.index),
         maskChar,
     };
 }
@@ -63,33 +62,34 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
     for (const tag of stack) {
         const raw = `${tag.startTag}${tag.taggedCode}${tag.endTag ?? ''}`;
         const tagIndexEnd = tag.index + raw.length;
-        const node = newNodeList.find(node => node.startOffset <= tag.index && node.endOffset >= tagIndexEnd);
+        const nodeEndOffset = (n) => n.offset + n.raw.length;
+        const node = newNodeList.find(node => node.offset <= tag.index && nodeEndOffset(node) >= tagIndexEnd);
         if (!node) {
             continue;
         }
         const replacementChildNodes = [];
-        if (node.startOffset === tag.index && node.endOffset === tagIndexEnd) {
-            const token = parser.createToken(raw, node.startOffset, node.startLine, node.startCol);
+        if (node.offset === tag.index && nodeEndOffset(node) === tagIndexEnd) {
+            const token = parser.createToken(raw, node.offset, node.line, node.col);
             const psNode = {
                 ...token,
                 type: 'psblock',
-                conditionalType: null,
                 depth: node.depth,
                 nodeName: `#ps:${tag.type}`,
                 parentNode: node.parentNode,
                 childNodes: [],
+                blockBehavior: null,
                 isBogus: false,
                 isFragment: false, // TODO: Case by case
             };
             replacementChildNodes.push(psNode);
         }
         else if (node.type === 'text') {
-            const offset = tag.index - node.startOffset;
+            const offset = tag.index - node.offset;
             const above = node.raw.slice(0, offset);
             const below = node.raw.slice(offset + raw.length);
             if (above) {
                 const { line, column } = getPosition(node.raw, 0);
-                const token = parser.createToken(above, node.startOffset, node.startLine + line - 1, node.startCol + column - 1);
+                const token = parser.createToken(above, node.offset, node.line + line - 1, node.col + column - 1);
                 const aboveNode = {
                     ...token,
                     nodeName: '#text',
@@ -100,22 +100,22 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
                 replacementChildNodes.push(aboveNode);
             }
             const { line, column } = getPosition(raw, offset);
-            const token = parser.createToken(raw, node.startOffset + offset, node.startLine + line - 1, node.startCol + column - 1);
+            const token = parser.createToken(raw, node.offset + offset, node.line + line - 1, node.col + column - 1);
             const psNode = {
                 ...token,
                 type: 'psblock',
-                conditionalType: null,
                 depth: node.depth,
                 nodeName: `#ps:${tag.type}`,
                 parentNode: node.parentNode,
                 childNodes: [],
+                blockBehavior: null,
                 isBogus: false,
                 isFragment: false, // TODO: Case by case
             };
             replacementChildNodes.push(psNode);
             if (below) {
                 const { line, column } = getPosition(node.raw, offset + raw.length);
-                const token = parser.createToken(below, node.startOffset + offset + raw.length, node.startLine + line - 1, node.startCol + column - 1);
+                const token = parser.createToken(below, node.offset + offset + raw.length, node.line + line - 1, node.col + column - 1);
                 const aboveNode = {
                     ...token,
                     nodeName: '#text',
@@ -144,8 +144,9 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
                 for (const tag of stack) {
                     const raw = tag.startTag + tag.taggedCode + tag.endTag;
                     const length = raw.length;
-                    if (attr.value.startOffset <= tag.index && tag.index + length <= attr.value.endOffset) {
-                        const offset = tag.index - attr.value.startOffset;
+                    if (attr.value.offset <= tag.index &&
+                        tag.index + length <= attr.value.offset + attr.value.raw.length) {
+                        const offset = tag.index - attr.value.offset;
                         const above = attr.value.raw.slice(0, offset);
                         const below = attr.value.raw.slice(offset + length);
                         parser.updateRaw(attr.value, above + raw + below);
@@ -162,7 +163,7 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
                 }
                 // Update node raw
                 const length = attr.raw.length;
-                const offset = attr.startOffset - node.startOffset;
+                const offset = attr.offset - node.offset;
                 const above = node.raw.slice(0, offset);
                 const below = node.raw.slice(offset + length);
                 parser.updateRaw(node, above + attr.raw + below);

package/lib/index.d.ts

@@ -1,7 +1,8 @@
 export * from './debugger.js';
 export * from './enums.js';
+export * from './get-namespace.js';
 export * from './idl-attributes.js';
 export * from './parser-error.js';
 export * from './parser.js';
 export * from './script-parser.js';
-export * from './types.js';
+export type * from './types.js';

package/lib/index.js

@@ -1,7 +1,7 @@
 export * from './debugger.js';
 export * from './enums.js';
+export * from './get-namespace.js';
 export * from './idl-attributes.js';
 export * from './parser-error.js';
 export * from './parser.js';
 export * from './script-parser.js';
-export * from './types.js';

package/lib/parser-error.js

@@ -3,9 +3,12 @@
  * and raw text where the error was encountered.
  */
 export class ParserError extends Error {
+    col;
+    line;
+    name = 'ParserError';
+    raw;
     constructor(message, info) {
         super(message);
-        this.name = 'ParserError';
         this.line = info.line ?? 1;
         this.col = info.col ?? 0;
         this.raw = info.raw ?? '';
@@ -17,12 +20,13 @@ export class ParserError extends Error {
  * the node name of the element that caused the error in the message.
  */
 export class TargetParserError extends ParserError {
+    name = 'TargetParserError';
+    nodeName;
     constructor(message, info) {
         const errMsg = info.nodeName
             ? `The ${info.nodeName} is invalid element (${info.line}:${info.col}): ${message}`
             : message;
         super(errMsg, info);
-        this.name = 'TargetParserError';
         this.nodeName = info.nodeName ?? null;
     }
 }
@@ -31,12 +35,13 @@ export class TargetParserError extends ParserError {
  * including the file path in the error message for easier debugging.
  */
 export class ConfigParserError extends ParserError {
+    filePath;
+    name = 'ConfigParserError';
     constructor(message, info) {
         const pos = info.line != null && info.line != null ? `(${info.line}:${info.col})` : '';
         const file = ` in ${info.filePath}${pos}`;
         const errMsg = `${message}${file}`;
         super(errMsg, info);
-        this.name = 'ConfigParserError';
         this.filePath = info.filePath;
     }
 }