umple-lsp-server 0.2.2 → 0.2.4

package/out/formatRules.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Formatting rule definitions for the syntax-aware formatter.
+ *
+ * Node-type classification for indentation and skip regions.
+ * All node names are verified against the actual tree-sitter grammar.
+ */
+declare const TreeSitter: any;
+type Tree = InstanceType<typeof TreeSitter.Tree>;
+/** Node types whose body content gets +1 indent level. */
+export declare const INDENT_NODES: Set<string>;
+/** Top-level declaration node types that should be separated by blank lines. */
+export declare const TOP_LEVEL_DECL_NODES: Set<string>;
+/** Node types whose content is verbatim (embedded code — do not reindent). */
+export declare const SKIP_NODES: Set<string>;
+/**
+ * Check if a line falls strictly inside a verbatim/skip node.
+ * Boundary lines (the line with opening `{` and closing `}`) are NOT skipped —
+ * they're Umple-structural and should be formatted normally.
+ */
+export declare function isVerbatimLine(tree: Tree, line: number): boolean;
+/**
+ * Compute the structural indent depth for a line from its AST ancestors.
+ * Only counts indent-contributing ancestors whose body starts ABOVE this line
+ * (so the opening line of `class A {` doesn't get +1 from its own node).
+ */
+export declare function computeStructuralDepth(tree: Tree, line: number, column: number): number;
+export {};

package/out/formatRules.js

@@ -0,0 +1,114 @@
+"use strict";
+/**
+ * Formatting rule definitions for the syntax-aware formatter.
+ *
+ * Node-type classification for indentation and skip regions.
+ * All node names are verified against the actual tree-sitter grammar.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SKIP_NODES = exports.TOP_LEVEL_DECL_NODES = exports.INDENT_NODES = void 0;
+exports.isVerbatimLine = isVerbatimLine;
+exports.computeStructuralDepth = computeStructuralDepth;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const TreeSitter = require("web-tree-sitter");
+/** Node types whose body content gets +1 indent level. */
+exports.INDENT_NODES = new Set([
+    "class_definition",
+    "interface_definition",
+    "trait_definition",
+    "association_class_definition",
+    "enum_definition",
+    "association_definition",
+    "mixset_definition",
+    "state_machine",
+    "statemachine_definition",
+    "state",
+    "before_after",
+    "toplevel_code_injection",
+    "filter_definition",
+    "method_declaration",
+]);
+/** Top-level declaration node types that should be separated by blank lines. */
+exports.TOP_LEVEL_DECL_NODES = new Set([
+    "class_definition",
+    "interface_definition",
+    "trait_definition",
+    "association_class_definition",
+    "enum_definition",
+    "association_definition",
+    "statemachine_definition",
+    "mixset_definition",
+    "toplevel_code_injection",
+    "namespace_declaration",
+    "use_statement",
+    "generate_statement",
+    "requirement_definition",
+    "external_definition",
+]);
+/** Node types whose content is verbatim (embedded code — do not reindent). */
+exports.SKIP_NODES = new Set([
+    "code_content",
+    "template_body",
+]);
+/**
+ * Check if a line falls strictly inside a verbatim/skip node.
+ * Boundary lines (the line with opening `{` and closing `}`) are NOT skipped —
+ * they're Umple-structural and should be formatted normally.
+ */
+function isVerbatimLine(tree, line) {
+    // Walk the tree to find skip nodes that contain this line
+    const cursor = tree.rootNode.walk();
+    let reachedEnd = false;
+    while (!reachedEnd) {
+        const node = cursor.currentNode;
+        if (exports.SKIP_NODES.has(node.type)) {
+            // Strictly between start and end rows (boundary lines are formatted)
+            if (node.startPosition.row < line && line < node.endPosition.row) {
+                return true;
+            }
+            // Don't descend into skip nodes
+            if (!cursor.gotoNextSibling()) {
+                while (!cursor.gotoNextSibling()) {
+                    if (!cursor.gotoParent()) {
+                        reachedEnd = true;
+                        break;
+                    }
+                }
+            }
+        }
+        else if (!cursor.gotoFirstChild()) {
+            if (!cursor.gotoNextSibling()) {
+                while (!cursor.gotoNextSibling()) {
+                    if (!cursor.gotoParent()) {
+                        reachedEnd = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Compute the structural indent depth for a line from its AST ancestors.
+ * Only counts indent-contributing ancestors whose body starts ABOVE this line
+ * (so the opening line of `class A {` doesn't get +1 from its own node).
+ */
+function computeStructuralDepth(tree, line, column) {
+    const node = tree.rootNode.descendantForPosition({ row: line, column });
+    if (!node)
+        return 0;
+    let depth = 0;
+    let current = node;
+    while (current) {
+        if (exports.INDENT_NODES.has(current.type)) {
+            // Only count if this line is INSIDE the body (not the header line)
+            if (current.startPosition.row < line) {
+                depth++;
+            }
+        }
+        current = current.parent;
+    }
+    return depth;
+}
+//# sourceMappingURL=formatRules.js.map

package/out/formatRules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatRules.js","sourceRoot":"","sources":["../src/formatRules.ts"],"names":[],"mappings":"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"}

package/out/formatter.d.ts

@@ -1,31 +1,53 @@
 /**
- * Document formatting logic.
+ * Syntax-aware document formatter.
  *
- * Pure text manipulation + tree walking for skip-range detection.
- * No dependency on LSP connection, documents, or SymbolIndex class.
+ * Uses tree-sitter AST to compute structural indentation instead of
+ * naive brace counting. Preserves embedded code regions (code_content,
+ * template_body) as verbatim islands.
  */
 import { TextEdit } from "vscode-languageserver/node";
+declare const TreeSitter: any;
+type Tree = InstanceType<typeof TreeSitter.Tree>;
 /**
- * Collect line ranges of code_content and template_body nodes (embedded code
- * that the formatter should not re-indent).
- *
- * @param tree Pre-parsed tree (caller handles tree acquisition)
+ * Expand eligible single-line compact state blocks into multi-line format.
+ * Returns the modified text (or the original if nothing changed).
  */
-export declare function getCodeContentRanges(tree: any): {
-    startLine: number;
-    endLine: number;
-}[];
+export declare function expandCompactStates(text: string, tree: Tree): string;
 /**
- * Compute indent edits for an Umple document.
+ * Compute indent edits for an Umple document using syntax-aware indentation.
  *
- * @param text Document text
+ * @param text    Document text
  * @param options Formatting options (tabSize, insertSpaces)
- * @param skipRanges Ranges to skip (embedded code content)
+ * @param tree    Pre-parsed tree-sitter tree
+ * @returns Array of TextEdits to apply for correct indentation
  */
 export declare function computeIndentEdits(text: string, options: {
     tabSize: number;
     insertSpaces: boolean;
-}, skipRanges: {
+}, tree: Tree): TextEdit[];
+/**
+ * Normalize whitespace around `->` in transition and standalone_transition nodes.
+ * Only handles single-line nodes. Leaves event, guard, action, and target text verbatim.
+ */
+export declare function fixTransitionSpacing(text: string, tree: Tree): TextEdit[];
+/**
+ * Normalize whitespace around the arrow in association_inline and association_member nodes.
+ * Only handles single-line nodes. Same child-walking approach as fixTransitionSpacing.
+ */
+export declare function fixAssociationSpacing(text: string, tree: Tree): TextEdit[];
+/**
+ * Normalize blank lines between top-level declarations in source_file.
+ * Ensures exactly 1 blank line between consecutive top-level named children.
+ * Does NOT touch interior body spacing.
+ */
+export declare function normalizeTopLevelBlankLines(text: string, tree: Tree): TextEdit[];
+/**
+ * Collect line ranges of code_content and template_body nodes.
+ * Kept for backward compatibility with existing callers; the new
+ * formatter uses isVerbatimLine() from formatRules instead.
+ */
+export declare function getCodeContentRanges(tree: any): {
     startLine: number;
     endLine: number;
-}[]): TextEdit[];
+}[];
+export {};

package/out/formatter.js

@@ -1,19 +1,348 @@
 "use strict";
 /**
- * Document formatting logic.
+ * Syntax-aware document formatter.
  *
- * Pure text manipulation + tree walking for skip-range detection.
- * No dependency on LSP connection, documents, or SymbolIndex class.
+ * Uses tree-sitter AST to compute structural indentation instead of
+ * naive brace counting. Preserves embedded code regions (code_content,
+ * template_body) as verbatim islands.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCodeContentRanges = getCodeContentRanges;
+exports.expandCompactStates = expandCompactStates;
 exports.computeIndentEdits = computeIndentEdits;
+exports.fixTransitionSpacing = fixTransitionSpacing;
+exports.fixAssociationSpacing = fixAssociationSpacing;
+exports.normalizeTopLevelBlankLines = normalizeTopLevelBlankLines;
+exports.getCodeContentRanges = getCodeContentRanges;
 const node_1 = require("vscode-languageserver/node");
+const formatRules_1 = require("./formatRules");
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const TreeSitter = require("web-tree-sitter");
+// ── Phase 0: Compact block expansion ────────────────────────────────────────
+/** Allowed child types inside a state body for expansion eligibility. */
+const EXPANSION_ALLOWED_CHILDREN = new Set([
+    "transition", "standalone_transition",
+    "{", "}", ";", "identifier",
+]);
+/** Node types that disqualify a state from expansion if found as descendants. */
+const EXPANSION_REJECT_DESCENDANTS = new Set([
+    "code_content", "template_body", "action_code", "more_code",
+    "line_comment", "block_comment",
+]);
+/**
+ * Check if a subtree contains any descendant of the given types.
+ */
+function hasDescendantOfType(node, types) {
+    for (let i = 0; i < node.childCount; i++) {
+        const child = node.child(i);
+        if (types.has(child.type))
+            return true;
+        if (hasDescendantOfType(child, types))
+            return true;
+    }
+    return false;
+}
+/**
+ * Check if a single-line state node is eligible for compact block expansion.
+ */
+function isEligibleForExpansion(stateNode) {
+    // Must be single-line
+    if (stateNode.startPosition.row !== stateNode.endPosition.row)
+        return false;
+    // Walk ALL children (including anonymous tokens)
+    let hasTransition = false;
+    for (let i = 0; i < stateNode.childCount; i++) {
+        const child = stateNode.child(i);
+        const type = child.type;
+        if (EXPANSION_ALLOWED_CHILDREN.has(type)) {
+            if (type === "transition" || type === "standalone_transition") {
+                hasTransition = true;
+            }
+            continue;
+        }
+        // Any other child (||, entry_exit_action, state, method, etc.) → reject
+        return false;
+    }
+    if (!hasTransition)
+        return false;
+    // Check for embedded-code or comment descendants anywhere in subtree
+    if (hasDescendantOfType(stateNode, EXPANSION_REJECT_DESCENDANTS)) {
+        return false;
+    }
+    // Check for ERROR nodes
+    if (stateNode.hasError)
+        return false;
+    return true;
+}
+/**
+ * Expand eligible single-line compact state blocks into multi-line format.
+ * Returns the modified text (or the original if nothing changed).
+ */
+function expandCompactStates(text, tree) {
+    const lines = text.split("\n");
+    // Collect eligible state nodes (process in reverse to preserve positions)
+    const eligible = [];
+    const visit = (node) => {
+        if (node.type === "state" && isEligibleForExpansion(node)) {
+            eligible.push(node);
+            return; // Don't descend — this is single-line
+        }
+        for (let i = 0; i < node.childCount; i++) {
+            visit(node.child(i));
+        }
+    };
+    visit(tree.rootNode);
+    if (eligible.length === 0)
+        return text;
+    // Sort in reverse document order (process from bottom to top)
+    eligible.sort((a, b) => b.startPosition.row - a.startPosition.row ||
+        b.startPosition.column - a.startPosition.column);
+    let result = text;
+    for (const stateNode of eligible) {
+        const row = stateNode.startPosition.row;
+        const startCol = stateNode.startPosition.column;
+        const endCol = stateNode.endPosition.column;
+        const line = result.split("\n")[row];
+        const nodeText = line.substring(startCol, endCol);
+        // Find the state name
+        const nameNode = stateNode.childForFieldName("name");
+        if (!nameNode)
+            continue;
+        const stateName = nameNode.text;
+        // Collect transition child texts
+        const transitionTexts = [];
+        for (let i = 0; i < stateNode.childCount; i++) {
+            const child = stateNode.child(i);
+            if (child.type === "transition" || child.type === "standalone_transition") {
+                transitionTexts.push(child.text);
+            }
+        }
+        // Compute the indent of the state itself (leading whitespace before it)
+        const stateIndent = line.substring(0, startCol);
+        const childIndent = stateIndent + "  "; // +1 level
+        // Build expanded text
+        const expandedLines = [`${stateName} {`];
+        for (const t of transitionTexts) {
+            expandedLines.push(`${childIndent}${t}`);
+        }
+        expandedLines.push(`${stateIndent}}`);
+        const expanded = expandedLines.join("\n");
+        // Replace in the result
+        const allLines = result.split("\n");
+        allLines[row] = line.substring(0, startCol) + expanded + line.substring(endCol);
+        result = allLines.join("\n");
+    }
+    return result;
+}
 /**
- * Collect line ranges of code_content and template_body nodes (embedded code
- * that the formatter should not re-indent).
+ * Compute indent edits for an Umple document using syntax-aware indentation.
  *
- * @param tree Pre-parsed tree (caller handles tree acquisition)
+ * @param text    Document text
+ * @param options Formatting options (tabSize, insertSpaces)
+ * @param tree    Pre-parsed tree-sitter tree
+ * @returns Array of TextEdits to apply for correct indentation
+ */
+function computeIndentEdits(text, options, tree) {
+    const lines = text.split("\n");
+    const edits = [];
+    const unit = options.insertSpaces ? " ".repeat(options.tabSize) : "\t";
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const trimmed = line.trim();
+        // Skip empty lines
+        if (!trimmed)
+            continue;
+        // Skip lines inside verbatim regions (embedded code)
+        if ((0, formatRules_1.isVerbatimLine)(tree, i))
+            continue;
+        // Find first non-whitespace column for AST lookup
+        const firstNonWs = line.length - line.trimStart().length;
+        // Compute structural depth from AST ancestors
+        let depth = (0, formatRules_1.computeStructuralDepth)(tree, i, firstNonWs);
+        // Handle leading closing braces: outdent before indenting this line
+        let leadingCloses = 0;
+        for (const ch of trimmed) {
+            if (ch === "}")
+                leadingCloses++;
+            else
+                break;
+        }
+        depth = Math.max(0, depth - leadingCloses);
+        // Compute expected indent
+        const expected = unit.repeat(depth);
+        const currentIndent = line.substring(0, firstNonWs);
+        // Only emit edit if indent differs
+        if (currentIndent !== expected) {
+            edits.push(node_1.TextEdit.replace(node_1.Range.create(node_1.Position.create(i, 0), node_1.Position.create(i, currentIndent.length)), expected));
+        }
+    }
+    return edits;
+}
+// ── Phase 2: Targeted fixups ────────────────────────────────────────────────
+/** Node types that contain a `->` arrow whose surrounding whitespace should be normalized. */
+const ARROW_NODES = new Set(["transition", "standalone_transition"]);
+/**
+ * Normalize whitespace around `->` in transition and standalone_transition nodes.
+ * Only handles single-line nodes. Leaves event, guard, action, and target text verbatim.
+ */
+function fixTransitionSpacing(text, tree) {
+    const lines = text.split("\n");
+    const edits = [];
+    const visit = (node) => {
+        if (ARROW_NODES.has(node.type)) {
+            const startRow = node.startPosition.row;
+            const endRow = node.endPosition.row;
+            // Only single-line transitions
+            if (startRow !== endRow)
+                return;
+            // Find the structural "->" token by walking children (not substring search,
+            // which would match "->" inside action_code like "foo->bar")
+            let arrowChild = null;
+            for (let c = 0; c < node.childCount; c++) {
+                const child = node.child(c);
+                if (child && child.type === "->") {
+                    arrowChild = child;
+                    break;
+                }
+            }
+            if (!arrowChild)
+                return;
+            const arrowCol = arrowChild.startPosition.column;
+            const arrowEndCol = arrowChild.endPosition.column;
+            const line = lines[startRow];
+            // Find whitespace region around the structural arrow
+            let wsStart = arrowCol;
+            while (wsStart > 0 && line[wsStart - 1] === " ") {
+                wsStart--;
+            }
+            let wsEnd = arrowEndCol;
+            while (wsEnd < line.length && line[wsEnd] === " ") {
+                wsEnd++;
+            }
+            const currentRegion = line.substring(wsStart, wsEnd);
+            const expectedRegion = " -> ";
+            if (currentRegion === expectedRegion)
+                return;
+            edits.push(node_1.TextEdit.replace(node_1.Range.create(node_1.Position.create(startRow, wsStart), node_1.Position.create(startRow, wsEnd)), expectedRegion));
+            return; // Don't descend into transition children
+        }
+        for (let i = 0; i < node.childCount; i++) {
+            visit(node.child(i));
+        }
+    };
+    visit(tree.rootNode);
+    return edits;
+}
+/** Node types that contain an `arrow` child whose surrounding whitespace should be normalized. */
+const ASSOC_NODES = new Set(["association_inline", "association_member"]);
+/**
+ * Normalize whitespace around the arrow in association_inline and association_member nodes.
+ * Only handles single-line nodes. Same child-walking approach as fixTransitionSpacing.
+ */
+function fixAssociationSpacing(text, tree) {
+    const lines = text.split("\n");
+    const edits = [];
+    const visit = (node) => {
+        if (ASSOC_NODES.has(node.type)) {
+            const startRow = node.startPosition.row;
+            const endRow = node.endPosition.row;
+            if (startRow !== endRow)
+                return;
+            // Find the "arrow" child node
+            let arrowChild = null;
+            for (let c = 0; c < node.childCount; c++) {
+                const child = node.child(c);
+                if (child && child.type === "arrow") {
+                    arrowChild = child;
+                    break;
+                }
+            }
+            if (!arrowChild)
+                return;
+            const arrowCol = arrowChild.startPosition.column;
+            const arrowEndCol = arrowChild.endPosition.column;
+            const line = lines[startRow];
+            // Find whitespace region around the arrow
+            let wsStart = arrowCol;
+            while (wsStart > 0 && line[wsStart - 1] === " ") {
+                wsStart--;
+            }
+            let wsEnd = arrowEndCol;
+            while (wsEnd < line.length && line[wsEnd] === " ") {
+                wsEnd++;
+            }
+            const currentRegion = line.substring(wsStart, wsEnd);
+            const arrowText = arrowChild.text;
+            const expectedRegion = " " + arrowText + " ";
+            if (currentRegion === expectedRegion)
+                return;
+            edits.push(node_1.TextEdit.replace(node_1.Range.create(node_1.Position.create(startRow, wsStart), node_1.Position.create(startRow, wsEnd)), expectedRegion));
+            return;
+        }
+        for (let i = 0; i < node.childCount; i++) {
+            visit(node.child(i));
+        }
+    };
+    visit(tree.rootNode);
+    return edits;
+}
+/**
+ * Normalize blank lines between top-level declarations in source_file.
+ * Ensures exactly 1 blank line between consecutive top-level named children.
+ * Does NOT touch interior body spacing.
+ */
+function normalizeTopLevelBlankLines(text, tree) {
+    const lines = text.split("\n");
+    const edits = [];
+    const root = tree.rootNode;
+    // Collect top-level named declaration children (skip comments and anonymous nodes)
+    const topDecls = [];
+    for (let i = 0; i < root.namedChildCount; i++) {
+        const child = root.namedChild(i);
+        if (child && formatRules_1.TOP_LEVEL_DECL_NODES.has(child.type)) {
+            topDecls.push({
+                startRow: child.startPosition.row,
+                endRow: child.endPosition.row,
+            });
+        }
+    }
+    // For each consecutive pair, ensure exactly 1 blank line between them
+    for (let i = 0; i < topDecls.length - 1; i++) {
+        const prevEnd = topDecls[i].endRow;
+        const nextStart = topDecls[i + 1].startRow;
+        const gap = nextStart - prevEnd - 1; // number of lines between them
+        if (gap === 1)
+            continue; // Already correct: exactly 1 blank line
+        // Safety: if any non-blank line exists in the gap (e.g., comments),
+        // skip this gap entirely to avoid deleting user content
+        if (gap > 1) {
+            let hasNonBlank = false;
+            for (let row = prevEnd + 1; row < nextStart; row++) {
+                if (lines[row].trim().length > 0) {
+                    hasNonBlank = true;
+                    break;
+                }
+            }
+            if (hasNonBlank)
+                continue;
+        }
+        if (gap < 1) {
+            // No blank line — insert at the END of the previous declaration's last line.
+            // This avoids conflicting with indent edits that target [nextStart, 0].
+            edits.push(node_1.TextEdit.insert(node_1.Position.create(prevEnd, lines[prevEnd].length), "\n"));
+        }
+        else {
+            // Too many blank lines (all blank) — remove extras (keep exactly 1)
+            const deleteStart = prevEnd + 2;
+            const deleteEnd = nextStart;
+            edits.push(node_1.TextEdit.del(node_1.Range.create(node_1.Position.create(deleteStart, 0), node_1.Position.create(deleteEnd, 0))));
+        }
+    }
+    return edits;
+}
+/**
+ * Collect line ranges of code_content and template_body nodes.
+ * Kept for backward compatibility with existing callers; the new
+ * formatter uses isVerbatimLine() from formatRules instead.
  */
 function getCodeContentRanges(tree) {
     const ranges = [];
@@ -48,49 +377,4 @@ function getCodeContentRanges(tree) {
     }
     return ranges;
 }
-function isInSkipRange(line, ranges) {
-    return ranges.some((r) => line > r.startLine && line < r.endLine);
-}
-/**
- * Compute indent edits for an Umple document.
- *
- * @param text Document text
- * @param options Formatting options (tabSize, insertSpaces)
- * @param skipRanges Ranges to skip (embedded code content)
- */
-function computeIndentEdits(text, options, skipRanges) {
-    const lines = text.split("\n");
-    const edits = [];
-    const unit = options.insertSpaces ? " ".repeat(options.tabSize) : "\t";
-    let depth = 0;
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        const trimmed = line.trim();
-        if (!trimmed || isInSkipRange(i, skipRanges))
-            continue;
-        let leadingCloses = 0;
-        for (const ch of trimmed) {
-            if (ch === "}")
-                leadingCloses++;
-            else
-                break;
-        }
-        depth = Math.max(0, depth - leadingCloses);
-        const expected = unit.repeat(depth);
-        const currentIndent = line.substring(0, line.length - line.trimStart().length);
-        if (currentIndent !== expected) {
-            edits.push(node_1.TextEdit.replace(node_1.Range.create(node_1.Position.create(i, 0), node_1.Position.create(i, currentIndent.length)), expected));
-        }
-        let opens = 0;
-        let closes = 0;
-        for (const ch of trimmed) {
-            if (ch === "{")
-                opens++;
-            else if (ch === "}")
-                closes++;
-        }
-        depth = Math.max(0, depth + opens - (closes - leadingCloses));
-    }
-    return edits;
-}
 //# sourceMappingURL=formatter.js.map

package/out/formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAcH,oDAmCC;AAgBD,gDAmDC;AAlHD,qDAIoC;AAEpC;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,IAAoB;IAEpB,MAAM,MAAM,GAA6C,EAAE,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEpC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,OAAO,CAAC,UAAU,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;QAChC,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAClE,MAAM,CAAC,IAAI,CAAC;gBACV,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG;gBACjC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG;aAC9B,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;wBACzB,UAAU,GAAG,IAAI,CAAC;wBAClB,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;wBACzB,UAAU,GAAG,IAAI,CAAC;wBAClB,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CACpB,IAAY,EACZ,MAAgD;IAEhD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,SAAS,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;AACpE,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,IAAY,EACZ,OAAmD,EACnD,UAAoD;IAEpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAE5B,IAAI,CAAC,OAAO,IAAI,aAAa,CAAC,CAAC,EAAE,UAAU,CAAC;YAAE,SAAS;QAEvD,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,IAAI,EAAE,KAAK,GAAG;gBAAE,aAAa,EAAE,CAAC;;gBAC3B,MAAM;QACb,CAAC;QACD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,CAAC;QAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAClC,CAAC,EACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CACtC,CAAC;QAEF,IAAI,aAAa,KAAK,QAAQ,EAAE,CAAC;YAC/B,KAAK,CAAC,IAAI,CACR,eAAQ,CAAC,OAAO,CACd,YAAK,CAAC,MAAM,CACV,eAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EACrB,eAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CACzC,EACD,QAAQ,CACT,CACF,CAAC;QACJ,CAAC;QAED,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,IAAI,EAAE,KAAK,GAAG;gBAAE,KAAK,EAAE,CAAC;iBACnB,IAAI,EAAE,KAAK,GAAG;gBAAE,MAAM,EAAE,CAAC;QAChC,CAAC;QACD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"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"}