rawsql-ts 0.11.41-beta → 0.11.43-beta

package/dist/src/parsers/KeywordParser.js

@@ -43,7 +43,7 @@ class KeywordParser {
         let lexeme = result.identifier;
         const commentResult = stringUtils_1.StringUtils.readWhiteSpaceAndComment(input, result.newPosition);
         position = commentResult.position;
-        const collectedComments = [...commentResult.lines]; // Cache comments during multi-word parsing
+        const collectedComments = commentResult.lines ? [...commentResult.lines] : []; // Cache comments during multi-word parsing
         // end of input
         if (this.isEndOfInput(input, position)) {
             if (matchResult === KeywordMatchResult.PartialOrFinal) {
@@ -74,7 +74,9 @@ class KeywordParser {
                 lexeme += ' ' + result.identifier;
                 const nextCommentResult = stringUtils_1.StringUtils.readWhiteSpaceAndComment(input, result.newPosition);
                 position = nextCommentResult.position;
-                collectedComments.push(...nextCommentResult.lines); // Collect comments between multi-word tokens
+                if (nextCommentResult.lines && nextCommentResult.lines.length > 0) {
+                    collectedComments.push(...nextCommentResult.lines); // Collect comments between multi-word tokens
+                }
                 if (matchResult === KeywordMatchResult.Final) {
                     break;
                 }

package/dist/src/parsers/KeywordParser.js.map

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

package/dist/src/parsers/SqlPrintTokenParser.d.ts

@@ -39,7 +39,6 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     parameterDecorator: ParameterDecorator;
     identifierDecorator: IdentifierDecorator;
     index: number;
-    private commentStyle;
     constructor(options?: {
         preset?: FormatterConfig;
         identifierEscape?: {
@@ -51,7 +50,6 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
             end: string;
         };
         parameterStyle?: 'anonymous' | 'indexed' | 'named';
-        commentStyle?: 'block' | 'smart';
     });
     /**
      * Pretty-prints a BinarySelectQuery (e.g., UNION, INTERSECT, EXCEPT).
@@ -111,10 +109,6 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
      * This structure supports both oneliner and multiline formatting modes.
      */
     private createCommentBlocks;
-    /**
-     * Creates smart comment blocks by merging consecutive block comments into multi-line format
-     */
-    private createSmartCommentBlocks;
     /**
      * Determines if a comment should be merged with consecutive comments
      */
@@ -123,12 +117,6 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
      * Creates a multi-line block comment structure from consecutive comments
      * Returns a CommentBlock containing multiple comment lines for proper LinePrinter integration
      */
-    private createMultiLineCommentBlock;
-    /**
-     * Creates a multi-line comment block specifically for headerComments
-     * headerComments come as pre-split lines, so we handle them differently
-     */
-    private createHeaderMultiLineCommentBlock;
     /**
      * Creates a single CommentBlock with the standard structure:
      * Comment -> CommentNewline -> Space
@@ -143,12 +131,6 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
      * and converting others to block format for safety
      */
     private formatComment;
-    /**
-     * Formats comments using smart style rules:
-     * - Only multi-line block comment merging is supported
-     * - Single-line comments remain as block comments (no dash conversion)
-     */
-    private formatCommentSmart;
     /**
      * Inserts comment blocks into a token and handles spacing logic.
      * Adds separator spaces for clause-level containers and manages duplicate space removal.
@@ -180,6 +162,17 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
      * Prevents SQL injection by removing dangerous comment sequences.
      */
     private formatBlockComment;
+    private shouldMergeHeaderComments;
+    private createHeaderMultiLineCommentBlock;
+    /**
+     * Formats text as a single-line comment while sanitizing unsafe sequences.
+     */
+    private formatLineComment;
+    /**
+     * Sanitizes content intended for a single-line comment.
+     */
+    private sanitizeLineCommentContent;
+    private escapeCommentDelimiters;
     private visitValueList;
     private visitColumnReference;
     private visitFunctionCall;

package/dist/src/parsers/SqlPrintTokenParser.js

@@ -142,10 +142,9 @@ class SqlPrintTokenParser {
         return this._selfHandlingComponentTypes;
     }
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         this.handlers = new Map();
         this.index = 1;
-        this.commentStyle = 'block';
         if (options === null || options === void 0 ? void 0 : options.preset) {
             const preset = options.preset;
             options = { ...preset, ...options };
@@ -159,7 +158,6 @@ class SqlPrintTokenParser {
             start: (_e = (_d = options === null || options === void 0 ? void 0 : options.identifierEscape) === null || _d === void 0 ? void 0 : _d.start) !== null && _e !== void 0 ? _e : '"',
             end: (_g = (_f = options === null || options === void 0 ? void 0 : options.identifierEscape) === null || _f === void 0 ? void 0 : _f.end) !== null && _g !== void 0 ? _g : '"'
         });
-        this.commentStyle = (_h = options === null || options === void 0 ? void 0 : options.commentStyle) !== null && _h !== void 0 ? _h : 'block';
         this.handlers.set(ValueComponent_1.ValueList.kind, (expr) => this.visitValueList(expr));
         this.handlers.set(ValueComponent_1.ColumnReference.kind, (expr) => this.visitColumnReference(expr));
         this.handlers.set(ValueComponent_1.QualifiedName.kind, (expr) => this.visitQualifiedName(expr));
@@ -250,9 +248,7 @@ class SqlPrintTokenParser {
             arg.positionedComments = null;
         }
         else if (arg.headerComments && arg.headerComments.length > 0) {
-            // Fallback to legacy headerComments if no positioned comments
-            // For smart comment style, treat headerComments as a single multi-line block
-            if (this.commentStyle === 'smart' && arg.headerComments.length > 1) {
+            if (this.shouldMergeHeaderComments(arg.headerComments)) {
                 const mergedHeaderComment = this.createHeaderMultiLineCommentBlock(arg.headerComments);
                 token.innerTokens.push(mergedHeaderComment);
             }
@@ -441,14 +437,9 @@ class SqlPrintTokenParser {
         const beforeComments = component.getPositionedComments('before');
         if (beforeComments.length > 0) {
             const commentBlocks = this.createCommentBlocks(beforeComments);
-            // Create a single inline sequence: /* comment */ content
-            const beforeTokens = [];
-            for (const commentBlock of commentBlocks) {
-                beforeTokens.push(commentBlock);
-                beforeTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.space, ' '));
+            for (let i = commentBlocks.length - 1; i >= 0; i--) {
+                token.innerTokens.unshift(commentBlocks[i]);
             }
-            // Insert before the existing content
-            token.innerTokens.unshift(...beforeTokens);
         }
         // Handle 'after' comments - add inline after the main content
         const afterComments = component.getPositionedComments('after');
@@ -456,7 +447,7 @@ class SqlPrintTokenParser {
             const commentBlocks = this.createCommentBlocks(afterComments);
             // Append after comments with spaces for inline formatting
             for (const commentBlock of commentBlocks) {
-                token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.space, ' '));
+                token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
                 token.innerTokens.push(commentBlock);
             }
         }
@@ -485,16 +476,8 @@ class SqlPrintTokenParser {
         if (!(comments === null || comments === void 0 ? void 0 : comments.length)) {
             return;
         }
-        // For multiple comments, create inline comment sequence instead of separate blocks
-        if (comments.length > 1) {
-            const inlineComments = this.createInlineCommentSequence(comments);
-            this.insertCommentBlocksWithSpacing(token, inlineComments);
-        }
-        else {
-            // Create CommentBlock containers for single comment
-            const commentBlocks = this.createCommentBlocks(comments);
-            this.insertCommentBlocksWithSpacing(token, commentBlocks);
-        }
+        const commentBlocks = this.createCommentBlocks(comments);
+        this.insertCommentBlocksWithSpacing(token, commentBlocks);
     }
     /**
      * Creates inline comment sequence for multiple comments without newlines
@@ -505,7 +488,7 @@ class SqlPrintTokenParser {
             const comment = comments[i];
             if (comment.trim()) {
                 // Add comment token directly
-                const commentToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, this.formatBlockComment(comment));
+                const commentToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, this.formatComment(comment));
                 commentTokens.push(commentToken);
                 // Add space between comments (except after last comment)
                 if (i < comments.length - 1) {
@@ -522,10 +505,7 @@ class SqlPrintTokenParser {
      * This structure supports both oneliner and multiline formatting modes.
      */
     createCommentBlocks(comments) {
-        if (this.commentStyle === 'smart') {
-            return this.createSmartCommentBlocks(comments);
-        }
-        // Block style (default) - each comment gets its own block
+        // Create individual comment blocks for each comment entry
         const commentBlocks = [];
         for (const comment of comments) {
             // Accept comments that have content after trim OR are separator lines OR are empty (for structure preservation)
@@ -537,46 +517,6 @@ class SqlPrintTokenParser {
         }
         return commentBlocks;
     }
-    /**
-     * Creates smart comment blocks by merging consecutive block comments into multi-line format
-     */
-    createSmartCommentBlocks(comments) {
-        const commentBlocks = [];
-        const blockComments = [];
-        const flushBlockComments = () => {
-            if (blockComments.length > 0) {
-                if (blockComments.length === 1) {
-                    // Single comment - keep as-is
-                    commentBlocks.push(this.createSingleCommentBlock(blockComments[0]));
-                }
-                else {
-                    // Multiple consecutive comments - create multi-line block
-                    commentBlocks.push(this.createMultiLineCommentBlock(blockComments));
-                }
-                blockComments.length = 0;
-            }
-        };
-        for (const comment of comments) {
-            const trimmed = comment.trim();
-            const isSeparatorLine = /^[-=_+*#]+$/.test(trimmed);
-            if (!trimmed && !isSeparatorLine && comment !== '') {
-                continue;
-            }
-            // Check if this is a block comment that should be merged
-            if (this.shouldMergeComment(trimmed)) {
-                blockComments.push(comment);
-            }
-            else {
-                // Flush any accumulated block comments first
-                flushBlockComments();
-                // Add this comment as-is
-                commentBlocks.push(this.createSingleCommentBlock(comment));
-            }
-        }
-        // Flush any remaining block comments
-        flushBlockComments();
-        return commentBlocks;
-    }
     /**
      * Determines if a comment should be merged with consecutive comments
      */
@@ -587,8 +527,14 @@ class SqlPrintTokenParser {
             return false;
         }
         // Don't merge if it's already a proper multi-line block comment
-        if (trimmed.startsWith('/*') && trimmed.endsWith('*/') && trimmed.includes('\n')) {
-            return false;
+        if (trimmed.startsWith('/*') && trimmed.endsWith('*/')) {
+            const inner = trimmed.slice(2, -2).trim();
+            if (!inner) {
+                return false;
+            }
+            if (trimmed.includes('\n')) {
+                return false;
+            }
         }
         // Merge all other content including separator lines, plain text, and single-line block comments
         // Separator lines within comment blocks should be merged together
@@ -598,98 +544,6 @@ class SqlPrintTokenParser {
      * Creates a multi-line block comment structure from consecutive comments
      * Returns a CommentBlock containing multiple comment lines for proper LinePrinter integration
      */
-    createMultiLineCommentBlock(comments) {
-        const lines = [];
-        for (const comment of comments) {
-            const trimmed = comment.trim();
-            // Remove existing /* */ markers if present and extract content
-            if (trimmed.startsWith('/*') && trimmed.endsWith('*/')) {
-                const content = trimmed.slice(2, -2);
-                if (content.trim()) {
-                    // Sanitize the content (only remove /* and */)
-                    const sanitized = content
-                        .replace(/\*\//g, '*') // Remove */ sequences
-                        .replace(/\/\*/g, '*'); // Remove /* sequences
-                    // Split multi-line content and add each line
-                    const contentLines = sanitized.split('\n').map(line => line.trim()).filter(line => line);
-                    lines.push(...contentLines);
-                }
-            }
-            else if (trimmed) {
-                // Sanitize plain text content
-                const sanitized = trimmed
-                    .replace(/\*\//g, '*') // Remove */ sequences
-                    .replace(/\/\*/g, '*'); // Remove /* sequences
-                // Split plain text content by lines
-                const contentLines = sanitized.split('\n').map(line => line.trim()).filter(line => line);
-                lines.push(...contentLines);
-            }
-        }
-        // Create multi-line comment block structure
-        const commentBlock = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.CommentBlock);
-        if (lines.length === 0) {
-            // Empty comment
-            const commentToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '/* */');
-            commentBlock.innerTokens.push(commentToken);
-        }
-        else {
-            // Opening /*
-            const openToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '/*');
-            commentBlock.innerTokens.push(openToken);
-            commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
-            // Content lines (each as separate comment token)
-            for (const line of lines) {
-                const lineToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, `  ${line}`);
-                commentBlock.innerTokens.push(lineToken);
-                commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
-            }
-            // Closing */
-            const closeToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '*/');
-            commentBlock.innerTokens.push(closeToken);
-        }
-        // Add final newline and space for standard structure
-        commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
-        commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.space, ' '));
-        return commentBlock;
-    }
-    /**
-     * Creates a multi-line comment block specifically for headerComments
-     * headerComments come as pre-split lines, so we handle them differently
-     */
-    createHeaderMultiLineCommentBlock(headerComments) {
-        // Keep all lines including empty ones to preserve structure
-        const lines = headerComments;
-        // Create multi-line comment block structure
-        const commentBlock = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.CommentBlock);
-        if (lines.length === 0) {
-            // Empty comment
-            const commentToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '/* */');
-            commentBlock.innerTokens.push(commentToken);
-        }
-        else {
-            // Opening /*
-            const openToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '/*');
-            commentBlock.innerTokens.push(openToken);
-            commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
-            // Content lines (each as separate comment token)
-            for (const line of lines) {
-                // Sanitize the line content
-                const sanitized = line
-                    .replace(/\*\//g, '*') // Remove */ sequences
-                    .replace(/\/\*/g, '*'); // Remove /* sequences
-                const lineToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, `  ${sanitized}`);
-                commentBlock.innerTokens.push(lineToken);
-                commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
-            }
-            // Closing */
-            const closeToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '*/');
-            commentBlock.innerTokens.push(closeToken);
-        }
-        // Add final newline and space for standard structure
-        commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
-        commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.space, ' '));
-        return commentBlock;
-    }
     /**
      * Creates a single CommentBlock with the standard structure:
      * Comment -> CommentNewline -> Space
@@ -717,42 +571,28 @@ class SqlPrintTokenParser {
      */
     formatComment(comment) {
         const trimmed = comment.trim();
-        // Smart style processing
-        if (this.commentStyle === 'smart') {
-            return this.formatCommentSmart(trimmed);
+        if (!trimmed) {
+            return '/* */';
+        }
+        const isSeparatorLine = /^[-=_+*#]+$/.test(trimmed);
+        if (isSeparatorLine) {
+            return this.formatBlockComment(trimmed);
         }
-        // Default block style processing
-        // If it's already a line comment, preserve it
-        // But exclude separator lines (lines with only dashes, equals, etc.)
-        if (trimmed.startsWith('--') && !/^--[-=_+*#]*$/.test(trimmed)) {
-            return trimmed;
+        if (trimmed.startsWith('--')) {
+            return this.formatLineComment(trimmed.slice(2));
         }
-        // If it's already a block comment, preserve it (but sanitize)
         if (trimmed.startsWith('/*') && trimmed.endsWith('*/')) {
-            // Pass the entire comment including /* and */ for proper sanitization
             return this.formatBlockComment(trimmed);
         }
-        // For plain text comments, convert to block format
         return this.formatBlockComment(trimmed);
     }
-    /**
-     * Formats comments using smart style rules:
-     * - Only multi-line block comment merging is supported
-     * - Single-line comments remain as block comments (no dash conversion)
-     */
-    formatCommentSmart(comment) {
-        // Smart style only affects multi-line comment merging at createSmartCommentBlocks level
-        // Individual comment formatting remains the same as block style
-        return this.formatBlockComment(comment);
-    }
     /**
      * Inserts comment blocks into a token and handles spacing logic.
      * Adds separator spaces for clause-level containers and manages duplicate space removal.
      */
     insertCommentBlocksWithSpacing(token, commentBlocks) {
-        // For SelectItem, append comments at the end with proper spacing
+        // For SelectItem, append comment blocks after ensuring spacing
         if (token.containerType === SqlPrintToken_1.SqlPrintTokenContainerType.SelectItem) {
-            // Add space before comment if not already present
             if (token.innerTokens.length > 0) {
                 const lastToken = token.innerTokens[token.innerTokens.length - 1];
                 if (lastToken.type !== SqlPrintToken_1.SqlPrintTokenType.space) {
@@ -772,7 +612,6 @@ class SqlPrintTokenParser {
         }
         // Special handling for IdentifierString to add space before comment
         if (token.containerType === SqlPrintToken_1.SqlPrintTokenContainerType.IdentifierString) {
-            // Add space before comment if not already present
             if (token.innerTokens.length > 0) {
                 const lastToken = token.innerTokens[token.innerTokens.length - 1];
                 if (lastToken.type !== SqlPrintToken_1.SqlPrintTokenType.space) {
@@ -875,27 +714,94 @@ class SqlPrintTokenParser {
      * Prevents SQL injection by removing dangerous comment sequences.
      */
     formatBlockComment(comment) {
-        // Sanitize dangerous comment sequences to prevent SQL injection
-        let sanitizedComment = comment
-            .replace(/\*\//g, '*') // Remove comment close sequences
-            .replace(/\/\*/g, '*'); // Remove comment open sequences
-        // Check if this is a separator line (like ----------) before processing
-        const trimmed = sanitizedComment.trim();
-        const isSeparatorLine = /^[-=_+*#]+$/.test(trimmed);
-        if (isSeparatorLine) {
-            // For separator lines, preserve as-is (already sanitized above)
-            return `/* ${trimmed} */`;
+        const hasDelimiters = comment.startsWith('/*') && comment.endsWith('*/');
+        const rawContent = hasDelimiters ? comment.slice(2, -2) : comment;
+        const escapedContent = this.escapeCommentDelimiters(rawContent);
+        const normalized = escapedContent.replace(/\r?\n/g, '\n');
+        const lines = normalized
+            .split('\n')
+            .map(line => line.replace(/\s+/g, ' ').trim())
+            .filter(line => line.length > 0);
+        if (lines.length === 0) {
+            return '/* */';
+        }
+        const isSeparatorLine = lines.length === 1 && /^[-=_+*#]+$/.test(lines[0]);
+        if (!hasDelimiters) {
+            // Flatten free-form comments to a single block to avoid leaking multi-line structures.
+            if (isSeparatorLine) {
+                return `/* ${lines[0]} */`;
+            }
+            const flattened = lines.join(' ');
+            return `/* ${flattened} */`;
+        }
+        if (isSeparatorLine || lines.length === 1) {
+            return `/* ${lines[0]} */`;
+        }
+        const body = lines.map(line => `  ${line}`).join('\n');
+        return `/*\n${body}\n*/`;
+    }
+    shouldMergeHeaderComments(comments) {
+        if (comments.length <= 1) {
+            return false;
+        }
+        return comments.some(comment => {
+            const trimmed = comment.trim();
+            return /^[-=_+*#]{3,}$/.test(trimmed) || trimmed.startsWith('- ') || trimmed.startsWith('* ');
+        });
+    }
+    createHeaderMultiLineCommentBlock(headerComments) {
+        const commentBlock = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.CommentBlock);
+        if (headerComments.length === 0) {
+            const commentToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '/* */');
+            commentBlock.innerTokens.push(commentToken);
         }
-        // For multiline comments: convert newlines to spaces (security requirement)
-        sanitizedComment = sanitizedComment
-            .replace(/\r?\n/g, ' ') // Replace newlines with spaces
-            .replace(/\s+/g, ' ') // Collapse multiple spaces into single space
-            .trim(); // Remove leading/trailing whitespace
-        // Return empty string if comment becomes empty after sanitization
-        if (!sanitizedComment) {
-            return '';
+        else {
+            const openToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '/*');
+            commentBlock.innerTokens.push(openToken);
+            commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
+            for (const line of headerComments) {
+                const sanitized = this.escapeCommentDelimiters(line);
+                const lineToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, `  ${sanitized}`);
+                commentBlock.innerTokens.push(lineToken);
+                commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
+            }
+            const closeToken = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.comment, '*/');
+            commentBlock.innerTokens.push(closeToken);
         }
-        return `/* ${sanitizedComment} */`;
+        commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.commentNewline, ''));
+        commentBlock.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.space, ' '));
+        return commentBlock;
+    }
+    /**
+     * Formats text as a single-line comment while sanitizing unsafe sequences.
+     */
+    formatLineComment(content) {
+        // Normalize content to a single line and remove dangerous sequences
+        const sanitized = this.sanitizeLineCommentContent(content);
+        if (!sanitized) {
+            return '--';
+        }
+        return `-- ${sanitized}`;
+    }
+    /**
+     * Sanitizes content intended for a single-line comment.
+     */
+    sanitizeLineCommentContent(content) {
+        // Replace comment delimiters to avoid nested comment injection
+        let sanitized = this.escapeCommentDelimiters(content)
+            .replace(/\r?\n/g, ' ')
+            .replace(/\u2028|\u2029/g, ' ')
+            .replace(/\s+/g, ' ')
+            .trim();
+        if (sanitized.startsWith('--')) {
+            sanitized = sanitized.slice(2).trimStart();
+        }
+        return sanitized;
+    }
+    escapeCommentDelimiters(content) {
+        return content
+            .replace(/\/\*/g, '\\/\\*')
+            .replace(/\*\//g, '*\\/');
     }
     visitValueList(arg) {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.ValueList);
@@ -1358,19 +1264,16 @@ class SqlPrintTokenParser {
         const originalValuePositionedComments = arg.value.positionedComments;
         // Clear positioned comments from the value to avoid duplication since SelectItem handles them
         arg.value.positionedComments = null;
-        // Add 'before' positioned comments
+        // Add positioned comments in recorded order
         const beforeComments = arg.getPositionedComments('before');
+        const afterComments = arg.getPositionedComments('after');
+        const isParenExpression = arg.value.constructor.name === 'ParenExpression';
         if (beforeComments.length > 0) {
             const commentTokens = this.createInlineCommentSequence(beforeComments);
             token.innerTokens.push(...commentTokens);
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
         }
-        // Add the value (column name)
         token.innerTokens.push(this.visit(arg.value));
-        // Add 'after' positioned comments for the value
-        // Skip after comments if the value is ParenExpression (already handled in ParenExpression processing)
-        const afterComments = arg.getPositionedComments('after');
-        const isParenExpression = arg.value.constructor.name === 'ParenExpression';
         if (afterComments.length > 0 && !isParenExpression) {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             const commentTokens = this.createInlineCommentSequence(afterComments);
@@ -1806,9 +1709,7 @@ class SqlPrintTokenParser {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.SimpleSelectQuery);
         // Handle positioned comments for SimpleSelectQuery (unified spec)
         if (arg.headerComments && arg.headerComments.length > 0) {
-            // Fallback to legacy headerComments if no positioned comments
-            // For smart comment style, treat headerComments as a single multi-line block
-            if (this.commentStyle === 'smart' && arg.headerComments.length > 1) {
+            if (this.shouldMergeHeaderComments(arg.headerComments)) {
                 const mergedHeaderComment = this.createHeaderMultiLineCommentBlock(arg.headerComments);
                 token.innerTokens.push(mergedHeaderComment);
             }
@@ -1894,11 +1795,18 @@ class SqlPrintTokenParser {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'values', SqlPrintToken_1.SqlPrintTokenContainerType.ValuesQuery);
         // Add headerComments before VALUES keyword
         if (arg.headerComments && arg.headerComments.length > 0) {
-            const headerCommentBlocks = this.createCommentBlocks(arg.headerComments);
-            for (const commentBlock of headerCommentBlocks) {
-                token.innerTokens.push(commentBlock);
+            if (this.shouldMergeHeaderComments(arg.headerComments)) {
+                const mergedHeaderComment = this.createHeaderMultiLineCommentBlock(arg.headerComments);
+                token.innerTokens.push(mergedHeaderComment);
                 token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             }
+            else {
+                const headerCommentBlocks = this.createCommentBlocks(arg.headerComments);
+                for (const commentBlock of headerCommentBlocks) {
+                    token.innerTokens.push(commentBlock);
+                    token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+                }
+            }
         }
         token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
         const values = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.Values);