rawsql-ts 0.24.2 → 0.24.4

package/dist/esm/transformers/SqlPrinter.js

@@ -30,7 +30,7 @@ export class SqlPrinter {
      * @param options Optional style settings for pretty printing
      */
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         /** Track whether we are currently inside a WITH clause for full-oneline formatting */
         this.insideWithClause = false;
         /** Tracks nesting depth while formatting MERGE WHEN predicate segments */
@@ -43,6 +43,8 @@ export class SqlPrinter {
         this.pendingLineCommentBreak = null;
         /** Accumulates lines when reconstructing multi-line block comments inside CommentBlocks */
         this.smartCommentBlockBuilder = null;
+        /** Tracks function calls whose arguments must expand because rendered comments are present */
+        this.commentedFunctionCallDepth = 0;
         // Resolve logical options to their control character representations before applying defaults.
         const resolvedIndentChar = resolveIndentCharOption(options === null || options === void 0 ? void 0 : options.indentChar);
         const resolvedNewline = resolveNewlineOption(options === null || options === void 0 ? void 0 : options.newline);
@@ -56,26 +58,28 @@ export class SqlPrinter {
         this.valuesCommaBreak = (_d = options === null || options === void 0 ? void 0 : options.valuesCommaBreak) !== null && _d !== void 0 ? _d : this.commaBreak;
         this.andBreak = (_e = options === null || options === void 0 ? void 0 : options.andBreak) !== null && _e !== void 0 ? _e : 'none';
         this.orBreak = (_f = options === null || options === void 0 ? void 0 : options.orBreak) !== null && _f !== void 0 ? _f : 'none';
-        this.joinOnBreak = (_g = options === null || options === void 0 ? void 0 : options.joinOnBreak) !== null && _g !== void 0 ? _g : 'none';
-        this.keywordCase = (_h = options === null || options === void 0 ? void 0 : options.keywordCase) !== null && _h !== void 0 ? _h : 'none';
+        this.joinOnBreak = this.normalizeJoinOnBreak(options === null || options === void 0 ? void 0 : options.joinOnBreak);
+        this.keywordCase = this.normalizeKeywordCase(options === null || options === void 0 ? void 0 : options.keywordCase);
         this.commentExportMode = this.resolveCommentExportMode(options === null || options === void 0 ? void 0 : options.exportComment);
-        this.withClauseStyle = (_j = options === null || options === void 0 ? void 0 : options.withClauseStyle) !== null && _j !== void 0 ? _j : 'standard';
-        this.commentStyle = (_k = options === null || options === void 0 ? void 0 : options.commentStyle) !== null && _k !== void 0 ? _k : 'block';
-        this.parenthesesOneLine = (_l = options === null || options === void 0 ? void 0 : options.parenthesesOneLine) !== null && _l !== void 0 ? _l : false;
-        this.betweenOneLine = (_m = options === null || options === void 0 ? void 0 : options.betweenOneLine) !== null && _m !== void 0 ? _m : false;
-        this.valuesOneLine = (_o = options === null || options === void 0 ? void 0 : options.valuesOneLine) !== null && _o !== void 0 ? _o : false;
-        this.joinOneLine = (_p = options === null || options === void 0 ? void 0 : options.joinOneLine) !== null && _p !== void 0 ? _p : false;
-        this.caseOneLine = (_q = options === null || options === void 0 ? void 0 : options.caseOneLine) !== null && _q !== void 0 ? _q : false;
-        this.subqueryOneLine = (_r = options === null || options === void 0 ? void 0 : options.subqueryOneLine) !== null && _r !== void 0 ? _r : false;
-        this.indentNestedParentheses = (_s = options === null || options === void 0 ? void 0 : options.indentNestedParentheses) !== null && _s !== void 0 ? _s : false;
-        this.insertColumnsOneLine = (_t = options === null || options === void 0 ? void 0 : options.insertColumnsOneLine) !== null && _t !== void 0 ? _t : false;
-        this.whenOneLine = (_u = options === null || options === void 0 ? void 0 : options.whenOneLine) !== null && _u !== void 0 ? _u : false;
+        this.withClauseStyle = (_g = options === null || options === void 0 ? void 0 : options.withClauseStyle) !== null && _g !== void 0 ? _g : 'standard';
+        this.commentStyle = (_h = options === null || options === void 0 ? void 0 : options.commentStyle) !== null && _h !== void 0 ? _h : 'block';
+        this.parenthesesOneLine = (_j = options === null || options === void 0 ? void 0 : options.parenthesesOneLine) !== null && _j !== void 0 ? _j : false;
+        this.betweenOneLine = (_k = options === null || options === void 0 ? void 0 : options.betweenOneLine) !== null && _k !== void 0 ? _k : false;
+        this.valuesOneLine = (_l = options === null || options === void 0 ? void 0 : options.valuesOneLine) !== null && _l !== void 0 ? _l : false;
+        this.inOneLine = (_m = options === null || options === void 0 ? void 0 : options.inOneLine) !== null && _m !== void 0 ? _m : false;
+        this.joinOneLine = (_o = options === null || options === void 0 ? void 0 : options.joinOneLine) !== null && _o !== void 0 ? _o : false;
+        this.caseOneLine = (_p = options === null || options === void 0 ? void 0 : options.caseOneLine) !== null && _p !== void 0 ? _p : false;
+        this.subqueryOneLine = (_q = options === null || options === void 0 ? void 0 : options.subqueryOneLine) !== null && _q !== void 0 ? _q : false;
+        this.indentNestedParentheses = (_r = options === null || options === void 0 ? void 0 : options.indentNestedParentheses) !== null && _r !== void 0 ? _r : false;
+        this.insertColumnsOneLine = (_s = options === null || options === void 0 ? void 0 : options.insertColumnsOneLine) !== null && _s !== void 0 ? _s : false;
+        this.whenOneLine = (_t = options === null || options === void 0 ? void 0 : options.whenOneLine) !== null && _t !== void 0 ? _t : false;
         this.oneLineMaxLength = this.normalizeOneLineMaxLength(options === null || options === void 0 ? void 0 : options.oneLineMaxLength);
-        this.joinConditionContinuationIndent = (_v = options === null || options === void 0 ? void 0 : options.joinConditionContinuationIndent) !== null && _v !== void 0 ? _v : false;
+        this.joinConditionContinuationIndent = (_u = options === null || options === void 0 ? void 0 : options.joinConditionContinuationIndent) !== null && _u !== void 0 ? _u : false;
         const onelineOptions = {
             parenthesesOneLine: this.parenthesesOneLine,
             betweenOneLine: this.betweenOneLine,
             valuesOneLine: this.valuesOneLine,
+            inOneLine: this.inOneLine,
             joinOneLine: this.joinOneLine,
             caseOneLine: this.caseOneLine,
             subqueryOneLine: this.subqueryOneLine,
@@ -85,7 +89,7 @@ export class SqlPrinter {
         this.onelineHelper = new OnelineFormattingHelper(onelineOptions);
         this.linePrinter = new LinePrinter(this.indentChar, this.indentSize, this.newline, this.commaBreak);
         // Initialize
-        this.indentIncrementContainers = new Set((_w = options === null || options === void 0 ? void 0 : options.indentIncrementContainerTypes) !== null && _w !== void 0 ? _w : [
+        this.indentIncrementContainers = new Set((_v = options === null || options === void 0 ? void 0 : options.indentIncrementContainerTypes) !== null && _v !== void 0 ? _v : [
             SqlPrintTokenContainerType.SelectClause,
             SqlPrintTokenContainerType.ReturningClause,
             SqlPrintTokenContainerType.FromClause,
@@ -135,6 +139,7 @@ export class SqlPrinter {
         this.pendingLineCommentBreak = null;
         this.smartCommentBlockBuilder = null;
         this.expandedOneLineFallbackTokens = new WeakSet();
+        this.commentedFunctionCallDepth = 0;
         if (this.linePrinter.lines.length > 0 && level !== this.linePrinter.lines[0].level) {
             this.linePrinter.lines[0].level = level;
         }
@@ -177,6 +182,7 @@ export class SqlPrinter {
         }
     }
     appendToken(token, level, parentContainerType, caseContextDepth = 0, indentParentActive = false, commentContext, previousSiblingWasOpenParen = false) {
+        var _a;
         // Track WITH clause context for full-oneline formatting
         const wasInsideWithClause = this.insideWithClause;
         if (token.containerType === SqlPrintTokenContainerType.WithClause && this.withClauseStyle === 'full-oneline') {
@@ -205,12 +211,16 @@ export class SqlPrinter {
             }
         }
         const hasRenderableLeadingComment = leadingCommentContexts.some(item => item.shouldRender);
+        const leadingCommentFollowsLogicalOperator = hasRenderableLeadingComment && this.currentLineEndsWithLogicalOperator();
         const leadingCommentIndentLevel = hasRenderableLeadingComment
-            ? this.getLeadingCommentIndentLevel(parentContainerType, level)
+            ? this.getLeadingCommentIndentLevel(token.containerType === SqlPrintTokenContainerType.SelectItem
+                ? token.containerType
+                : parentContainerType, level)
             : null;
         if (hasRenderableLeadingComment
             && !this.isOnelineMode()
-            && this.shouldAddNewlineBeforeLeadingComments(parentContainerType)) {
+            && this.shouldAddNewlineBeforeLeadingComments(parentContainerType)
+            && !this.shouldKeepLeadingCommentOnCommaLine()) {
             const currentLine = this.linePrinter.getCurrentLine();
             if (currentLine.text.trim().length > 0) {
                 // Align the newline before leading comments with the intended comment indentation.
@@ -223,13 +233,38 @@ export class SqlPrinter {
             }
             // Keep leading comment processing aligned with its computed indentation level.
             this.appendToken(leading.token, leadingCommentIndentLevel !== null && leadingCommentIndentLevel !== void 0 ? leadingCommentIndentLevel : level, token.containerType, caseContextDepth, indentParentActive, leading.context, false);
+            if (token.containerType === SqlPrintTokenContainerType.SelectItem &&
+                ((_a = this.smartCommentBlockBuilder) === null || _a === void 0 ? void 0 : _a.mode) === 'line') {
+                this.flushSmartCommentBlockBuilder();
+            }
+            if (containerIsTopLevel &&
+                !this.isOnelineMode() &&
+                this.pendingLineCommentBreak === null &&
+                this.linePrinter.getCurrentLine().text.trim() !== '') {
+                this.linePrinter.appendNewline(level);
+            }
+        }
+        if (hasRenderableLeadingComment &&
+            containerIsTopLevel &&
+            !this.isOnelineMode() &&
+            this.linePrinter.getCurrentLine().text.trim() !== '') {
+            this.linePrinter.appendNewline(level);
+        }
+        if (leadingCommentFollowsLogicalOperator &&
+            this.pendingLineCommentBreak === null &&
+            !this.isOnelineMode() &&
+            this.linePrinter.getCurrentLine().text.trim().endsWith('*/')) {
+            this.linePrinter.appendNewline(level + 1);
         }
         if (this.smartCommentBlockBuilder && token.containerType !== SqlPrintTokenContainerType.CommentBlock && token.type !== SqlPrintTokenType.commentNewline) {
             this.flushSmartCommentBlockBuilder();
         }
         if (this.pendingLineCommentBreak !== null) {
             if (!this.isOnelineMode()) {
-                this.linePrinter.appendNewline(this.pendingLineCommentBreak);
+                const pendingBreakLevel = leadingCommentFollowsLogicalOperator
+                    ? this.pendingLineCommentBreak + 1
+                    : this.pendingLineCommentBreak;
+                this.linePrinter.appendNewline(pendingBreakLevel);
             }
             const shouldSkipToken = token.type === SqlPrintTokenType.commentNewline;
             this.pendingLineCommentBreak = null;
@@ -246,7 +281,15 @@ export class SqlPrinter {
             if (!this.shouldRenderComment(token, effectiveCommentContext)) {
                 return;
             }
+            if (this.shouldKeepLeadingCommentOnCommaLine()) {
+                this.ensureTrailingSpace();
+            }
             const commentLevel = this.getCommentBaseIndentLevel(level, parentContainerType);
+            if (parentContainerType === SqlPrintTokenContainerType.SelectItem &&
+                effectiveCommentContext.position === 'leading' &&
+                this.linePrinter.getCurrentLine().text.trim() === '') {
+                this.linePrinter.getCurrentLine().level = commentLevel;
+            }
             this.handleCommentBlockContainer(token, commentLevel, effectiveCommentContext);
             return;
         }
@@ -261,6 +304,9 @@ export class SqlPrinter {
         else if (token.type === SqlPrintTokenType.comma) {
             this.handleCommaToken(token, level, parentContainerType);
         }
+        else if (token.type === SqlPrintTokenType.argumentSplitter) {
+            this.handleArgumentSplitterToken(token, level, parentContainerType);
+        }
         else if (token.type === SqlPrintTokenType.parenthesis) {
             this.handleParenthesisToken(token, level, indentParentActive, parentContainerType);
         }
@@ -294,6 +340,9 @@ export class SqlPrinter {
                 return; // Return early to avoid processing innerTokens
             }
         }
+        else if (this.inOneLine && this.isInValueListExpression(token) && this.tryHandleInOneLineToken(token, level)) {
+            return; // Return early to avoid processing innerTokens
+        }
         else if (this.shouldFormatContainerAsOneline(token, shouldIndentNested) && this.tryHandleOnelineToken(token, level)) {
             return; // Return early to avoid processing innerTokens
         }
@@ -381,6 +430,11 @@ export class SqlPrinter {
         if (enteredJoinOnClause) {
             this.joinOnClauseDepth++;
         }
+        const enteredCommentedFunctionCall = this.shouldExpandCommentedFunctionCall(token);
+        if (enteredCommentedFunctionCall) {
+            this.commentedFunctionCallDepth++;
+        }
+        const enteredLogicalOperatorWithComment = this.isLogicalOperatorWithComment(token);
         for (let i = leadingCommentCount; i < token.innerTokens.length; i++) {
             const child = token.innerTokens[i];
             const nextChild = token.innerTokens[i + 1];
@@ -431,7 +485,10 @@ export class SqlPrinter {
             const childCommentContext = child.containerType === SqlPrintTokenContainerType.CommentBlock
                 ? { position: 'inline', isTopLevelContainer: containerIsTopLevel }
                 : undefined;
-            this.appendToken(child, innerLevel, token.containerType, nextCaseContextDepth, childIndentParentActive, childCommentContext, previousChildWasOpenParen);
+            const childLevel = enteredCommentedFunctionCall && child.containerType === SqlPrintTokenContainerType.ValueList
+                ? innerLevel + 1
+                : innerLevel;
+            this.appendToken(child, childLevel, token.containerType, nextCaseContextDepth, childIndentParentActive, childCommentContext, previousChildWasOpenParen);
             if (inMergePredicate) {
                 this.mergeWhenPredicateDepth--;
             }
@@ -439,12 +496,24 @@ export class SqlPrinter {
                 mergePredicateActive = false;
             }
         }
+        if (enteredLogicalOperatorWithComment && !this.isOnelineMode()) {
+            const currentLine = this.linePrinter.getCurrentLine();
+            if (currentLine.text.trim() === '') {
+                currentLine.level = level + 1;
+            }
+            else {
+                this.linePrinter.appendNewline(level + 1);
+            }
+        }
         if (this.smartCommentBlockBuilder && this.smartCommentBlockBuilder.mode === 'line') {
             this.flushSmartCommentBlockBuilder();
         }
         if (enteredJoinOnClause) {
             this.joinOnClauseDepth--;
         }
+        if (enteredCommentedFunctionCall) {
+            this.commentedFunctionCallDepth--;
+        }
         // Exit WITH clause context when we finish processing WithClause container
         if (token.containerType === SqlPrintTokenContainerType.WithClause && this.withClauseStyle === 'full-oneline') {
             this.insideWithClause = false;
@@ -472,6 +541,33 @@ export class SqlPrinter {
                 return false;
         }
     }
+    shouldExpandCommentedFunctionCall(token) {
+        return this.commentExportMode !== 'none' &&
+            token.containerType === SqlPrintTokenContainerType.FunctionCall &&
+            token.innerTokens.some(child => child.containerType === SqlPrintTokenContainerType.ValueList &&
+                this.containsCommentBlock(child));
+    }
+    containsCommentBlock(token) {
+        if (token.containerType === SqlPrintTokenContainerType.CommentBlock) {
+            return true;
+        }
+        return token.innerTokens.some(child => this.containsCommentBlock(child));
+    }
+    containsRenderableCommentBlock(token, context) {
+        if (token.containerType === SqlPrintTokenContainerType.CommentBlock) {
+            return this.shouldRenderComment(token, context);
+        }
+        return token.innerTokens.some(child => this.containsRenderableCommentBlock(child, context));
+    }
+    isLogicalOperatorWithComment(token) {
+        return this.containsCommentBlock(token) &&
+            token.type === SqlPrintTokenType.operator &&
+            ['and', 'or'].includes(token.text.toLowerCase());
+    }
+    currentLineEndsWithLogicalOperator() {
+        const trimmed = this.linePrinter.getCurrentLine().text.trim().toLowerCase();
+        return trimmed === 'and' || trimmed === 'or';
+    }
     isCaseContext(containerType) {
         switch (containerType) {
             case SqlPrintTokenContainerType.CaseExpression:
@@ -631,6 +727,14 @@ export class SqlPrinter {
             this.linePrinter.appendText(text);
         }
     }
+    handleArgumentSplitterToken(token, level, parentContainerType) {
+        this.linePrinter.appendText(token.text);
+        if (this.commentedFunctionCallDepth > 0 &&
+            parentContainerType === SqlPrintTokenContainerType.ValueList &&
+            !this.isOnelineMode()) {
+            this.linePrinter.appendNewline(level);
+        }
+    }
     handleAndOperatorToken(token, level, parentContainerType, caseContextDepth = 0) {
         const text = this.applyKeywordCase(token.text);
         if (caseContextDepth > 0) {
@@ -663,6 +767,12 @@ export class SqlPrinter {
     handleParenthesisToken(token, level, indentParentActive, parentContainerType) {
         if (token.text === '(') {
             this.linePrinter.appendText(token.text);
+            if (this.commentedFunctionCallDepth > 0 &&
+                parentContainerType === SqlPrintTokenContainerType.FunctionCall &&
+                !this.isOnelineMode()) {
+                this.linePrinter.appendNewline(level + 1);
+                return;
+            }
             if ((parentContainerType === SqlPrintTokenContainerType.InsertClause ||
                 parentContainerType === SqlPrintTokenContainerType.MergeInsertAction) &&
                 this.insertColumnsOneLine) {
@@ -681,6 +791,12 @@ export class SqlPrinter {
             return;
         }
         if (token.text === ')' && !this.isOnelineMode()) {
+            if (this.commentedFunctionCallDepth > 0 &&
+                parentContainerType === SqlPrintTokenContainerType.FunctionCall) {
+                this.linePrinter.appendNewline(level);
+                this.linePrinter.appendText(token.text);
+                return;
+            }
             if (this.shouldBreakBeforeClosingParen(parentContainerType)) {
                 this.linePrinter.appendNewline(Math.max(level, 0));
                 this.linePrinter.appendText(token.text);
@@ -780,6 +896,32 @@ export class SqlPrinter {
     shouldFormatContainerAsOneline(token, shouldIndentNested) {
         return this.onelineHelper.shouldFormatContainer(token, shouldIndentNested);
     }
+    isInValueListExpression(token) {
+        const parts = this.getInValueListParts(token);
+        return parts !== null;
+    }
+    getInValueListParts(token) {
+        if (token.containerType !== SqlPrintTokenContainerType.BinaryExpression) {
+            return null;
+        }
+        const significant = token.innerTokens.filter(child => child.type !== SqlPrintTokenType.space);
+        if (significant.length !== 3) {
+            return null;
+        }
+        const [left, operator, right] = significant;
+        const operatorText = operator.text.trim().toLowerCase();
+        if (operatorText !== 'in' && operatorText !== 'not in') {
+            return null;
+        }
+        if (right.containerType !== SqlPrintTokenContainerType.ParenExpression) {
+            return null;
+        }
+        const valueList = right.innerTokens.find(child => child.containerType === SqlPrintTokenContainerType.ValueList);
+        if (!valueList) {
+            return null;
+        }
+        return { left, operator, valueList };
+    }
     /**
      * Detects an INSERT column list that must stay on a single line.
      */
@@ -794,6 +936,12 @@ export class SqlPrinter {
         if (this.smartCommentBlockBuilder && this.smartCommentBlockBuilder.mode === 'line') {
             this.flushSmartCommentBlockBuilder();
         }
+        if (this.commentedFunctionCallDepth > 0 &&
+            parentContainerType === SqlPrintTokenContainerType.ValueList &&
+            (previousToken === null || previousToken === void 0 ? void 0 : previousToken.type) === SqlPrintTokenType.argumentSplitter &&
+            !this.isOnelineMode()) {
+            return;
+        }
         const currentLineText = this.linePrinter.getCurrentLine().text;
         if (this.onelineHelper.shouldSkipInsertClauseSpace(parentContainerType, nextToken, currentLineText)) {
             return;
@@ -921,7 +1069,12 @@ export class SqlPrinter {
             }
             else {
                 const content = normalized.lines[0];
-                const lineText = content ? `-- ${content}` : '--';
+                if (this.shouldFallbackSmartLineCommentToBlock()) {
+                    this.linePrinter.appendText(this.buildBlockComment([content], level));
+                    this.ensureTrailingSpace();
+                    return;
+                }
+                const lineText = this.buildSmartLineComment(content);
                 if (parentContainerType === SqlPrintTokenContainerType.CommentBlock) {
                     this.linePrinter.appendText(lineText);
                     this.pendingLineCommentBreak = this.resolveCommentIndentLevel(level, parentContainerType);
@@ -1002,11 +1155,26 @@ export class SqlPrinter {
         if (this.commentStyle !== 'smart') {
             const rawLines = this.extractRawCommentBlockLines(token);
             if (rawLines.length > 0) {
+                if (context.position === 'leading' && context.isTopLevelContainer && !this.isOnelineMode()) {
+                    for (const line of rawLines) {
+                        this.linePrinter.appendText(`/* ${line} */`);
+                        this.linePrinter.appendNewline(level);
+                    }
+                    return;
+                }
                 const normalizedBlocks = rawLines.map(line => `/* ${line} */`).join(' ');
                 const hasTrailingSpace = (_a = token.innerTokens) === null || _a === void 0 ? void 0 : _a.some(child => child.type === SqlPrintTokenType.space && child.text.includes(' '));
                 this.linePrinter.appendText(hasTrailingSpace ? `${normalizedBlocks} ` : normalizedBlocks);
                 return;
             }
+            const directBlockComments = this.extractDirectBlockCommentTexts(token);
+            if (directBlockComments.length > 1 && context.position === 'leading' && context.isTopLevelContainer && !this.isOnelineMode()) {
+                for (const comment of directBlockComments) {
+                    this.linePrinter.appendText(comment);
+                    this.linePrinter.appendNewline(level);
+                }
+                return;
+            }
             for (const child of token.innerTokens) {
                 // Force inner comment tokens to render once the block is approved.
                 const childContext = {
@@ -1018,6 +1186,11 @@ export class SqlPrinter {
             }
             return;
         }
+        const emptyBlockCommentText = this.getEmptyBlockCommentText(token);
+        if (emptyBlockCommentText !== null) {
+            this.linePrinter.appendText(emptyBlockCommentText);
+            return;
+        }
         const lines = this.collectCommentBlockLines(token);
         if (lines.length === 0 && !this.smartCommentBlockBuilder) {
             // No meaningful content; treat as empty line comment to preserve spacing
@@ -1039,6 +1212,18 @@ export class SqlPrinter {
             this.smartCommentBlockBuilder.lines.push(...lines);
         }
     }
+    getEmptyBlockCommentText(token) {
+        var _a;
+        const commentTokens = ((_a = token.innerTokens) !== null && _a !== void 0 ? _a : []).filter(child => child.type === SqlPrintTokenType.comment);
+        if (commentTokens.length !== 1) {
+            return null;
+        }
+        const trimmed = commentTokens[0].text.trim();
+        if (!trimmed.startsWith('/*') || !trimmed.endsWith('*/')) {
+            return null;
+        }
+        return trimmed.slice(2, -2).trim() === '' ? trimmed : null;
+    }
     normalizeSmartBlockLine(raw) {
         // Remove trailing whitespace that only carries formatting artifacts
         let line = raw.replace(/\s+$/g, '');
@@ -1077,14 +1262,16 @@ export class SqlPrinter {
         const { lines, level, mode } = this.smartCommentBlockBuilder;
         if (mode === 'line') {
             const meaningfulLineCount = lines.filter(line => line.trim() !== '').length;
-            if (meaningfulLineCount > 1) {
+            if (meaningfulLineCount > 1 || this.shouldFallbackSmartLineCommentToBlock()) {
                 const blockText = this.buildBlockComment(lines, level);
                 this.linePrinter.appendText(blockText);
+                if (this.shouldFallbackSmartLineCommentToBlock()) {
+                    this.ensureTrailingSpace();
+                }
             }
             else {
                 const content = (_a = lines[0]) !== null && _a !== void 0 ? _a : '';
-                const lineText = content ? `-- ${content}` : '--';
-                this.linePrinter.appendText(lineText);
+                this.linePrinter.appendText(this.buildSmartLineComment(content));
             }
             if (!this.isOnelineMode()) {
                 this.linePrinter.appendNewline(level);
@@ -1093,6 +1280,12 @@ export class SqlPrinter {
         }
         this.smartCommentBlockBuilder = null;
     }
+    shouldFallbackSmartLineCommentToBlock() {
+        return this.isOnelineMode();
+    }
+    buildSmartLineComment(content) {
+        return content ? `-- ${content}` : '--';
+    }
     collectCommentBlockLines(token) {
         var _a;
         const lines = [];
@@ -1114,7 +1307,12 @@ export class SqlPrinter {
                 }
                 const content = this.extractLineCommentContent(trimmed);
                 if (content !== null) {
-                    lines.push(content);
+                    if (!content && trimmed.startsWith('/*') && trimmed.endsWith('*/')) {
+                        lines.push(this.sanitizeCommentLine(this.escapeCommentDelimiters(trimmed)));
+                    }
+                    else {
+                        lines.push(content);
+                    }
                 }
             }
         }
@@ -1146,6 +1344,20 @@ export class SqlPrinter {
         }
         return lines;
     }
+    extractDirectBlockCommentTexts(token) {
+        var _a;
+        const comments = [];
+        for (const child of (_a = token.innerTokens) !== null && _a !== void 0 ? _a : []) {
+            if (child.type !== SqlPrintTokenType.comment) {
+                continue;
+            }
+            const trimmed = child.text.trim();
+            if (trimmed.startsWith('/*') && trimmed.endsWith('*/')) {
+                comments.push(trimmed);
+            }
+        }
+        return comments;
+    }
     normalizeCommentForSmart(text) {
         const trimmed = text.trim();
         let source = trimmed;
@@ -1300,6 +1512,10 @@ export class SqlPrinter {
         if (parentType === SqlPrintTokenContainerType.SelectClause) {
             return true;
         }
+        if (parentType === SqlPrintTokenContainerType.OrderByItem ||
+            parentType === SqlPrintTokenContainerType.GroupByClause) {
+            return true;
+        }
         if (parentType === SqlPrintTokenContainerType.ExplainStatement) {
             // Ensure EXPLAIN targets print header comments on a dedicated line.
             return true;
@@ -1310,6 +1526,13 @@ export class SqlPrinter {
         return false;
     }
     getLeadingCommentIndentLevel(parentType, currentLevel) {
+        if (parentType === SqlPrintTokenContainerType.SelectItem) {
+            return currentLevel;
+        }
+        if (parentType === SqlPrintTokenContainerType.OrderByItem ||
+            parentType === SqlPrintTokenContainerType.GroupByClause) {
+            return currentLevel;
+        }
         if (parentType === SqlPrintTokenContainerType.TupleExpression) {
             return currentLevel + 1;
         }
@@ -1324,6 +1547,12 @@ export class SqlPrinter {
         }
         return currentLevel;
     }
+    shouldKeepLeadingCommentOnCommaLine() {
+        if (this.commaBreak !== 'before') {
+            return false;
+        }
+        return this.linePrinter.getCurrentLine().text.trim() === ',';
+    }
     /**
      * Determines if the printer is in oneliner mode.
      * Oneliner mode uses single spaces instead of actual newlines.
@@ -1332,12 +1561,18 @@ export class SqlPrinter {
         return this.newline === ' ';
     }
     normalizeOneLineMaxLength(value) {
-        if (value === undefined || !Number.isFinite(value) || value <= 0) {
+        if (value == null || !Number.isFinite(value) || value <= 0) {
             return undefined;
         }
         const normalized = Math.floor(value);
         return normalized > 0 ? normalized : undefined;
     }
+    normalizeKeywordCase(value) {
+        return value === 'preserve' ? 'none' : value !== null && value !== void 0 ? value : 'none';
+    }
+    normalizeJoinOnBreak(value) {
+        return value === 'before' ? 'before' : 'none';
+    }
     fitsOneLineMaxLength(text) {
         if (this.oneLineMaxLength === undefined) {
             return true;
@@ -1351,9 +1586,13 @@ export class SqlPrinter {
      * Creates a nested SqlPrinter instance for proper CTE oneline formatting.
      */
     tryHandleCteOnelineToken(token, level) {
+        if (this.shouldPreserveCteComments(token)) {
+            return false;
+        }
         const onelinePrinter = this.createCteOnelinePrinter();
         const onelineResult = onelinePrinter.print(token, level);
         let cleanedResult = this.cleanDuplicateSpaces(onelineResult);
+        // TODO(rawsql-ts#890): replace this CTE-oneline whitespace fallback with a token-level rewrite.
         cleanedResult = cleanedResult.replace(/\(\s+/g, '(').replace(/\s+\)/g, ' )');
         const trimmedResult = cleanedResult.trim();
         if (!this.fitsOneLineMaxLength(trimmedResult)) {
@@ -1362,6 +1601,12 @@ export class SqlPrinter {
         this.linePrinter.appendText(trimmedResult);
         return true;
     }
+    shouldPreserveCteComments(token) {
+        return this.containsRenderableCommentBlock(token, {
+            position: 'inline',
+            isTopLevelContainer: false,
+        });
+    }
     /**
      * Creates a SqlPrinter instance configured for CTE oneline formatting.
      */
@@ -1399,6 +1644,59 @@ export class SqlPrinter {
         this.linePrinter.appendText(cleanedResult);
         return true;
     }
+    tryHandleInOneLineToken(token, level) {
+        const parts = this.getInValueListParts(token);
+        if (!parts) {
+            return false;
+        }
+        if (this.containsRenderableCommentBlock(parts.valueList, { position: 'inline', isTopLevelContainer: false })) {
+            this.appendExpandedInValueList(parts, token, level);
+            return true;
+        }
+        const onelinePrinter = this.createOnelinePrinter();
+        const onelineResult = onelinePrinter.print(token, level);
+        const cleanedResult = this.cleanDuplicateSpaces(onelineResult);
+        if (this.fitsOneLineMaxLength(cleanedResult)) {
+            this.linePrinter.appendText(cleanedResult);
+            return true;
+        }
+        this.appendExpandedInValueList(parts, token, level);
+        return true;
+    }
+    appendExpandedInValueList(parts, token, level) {
+        this.appendToken(parts.left, level, token.containerType);
+        this.ensureTrailingSpace();
+        this.linePrinter.appendText(this.applyKeywordCase(parts.operator.text));
+        this.ensureTrailingSpace();
+        this.linePrinter.appendText('(');
+        const valueGroups = this.splitValueListItems(parts.valueList);
+        for (let i = 0; i < valueGroups.length; i++) {
+            this.linePrinter.appendNewline(level + 1);
+            if (i > 0) {
+                this.linePrinter.appendText(',');
+                this.ensureTrailingSpace();
+            }
+            for (const valueToken of valueGroups[i]) {
+                this.appendToken(valueToken, level + 1, SqlPrintTokenContainerType.ValueList);
+            }
+        }
+        this.linePrinter.appendNewline(level);
+        this.linePrinter.appendText(')');
+    }
+    splitValueListItems(valueList) {
+        const groups = [[]];
+        for (const child of valueList.innerTokens) {
+            if (child.type === SqlPrintTokenType.argumentSplitter) {
+                groups.push([]);
+                continue;
+            }
+            if (child.type === SqlPrintTokenType.space && groups[groups.length - 1].length === 0) {
+                continue;
+            }
+            groups[groups.length - 1].push(child);
+        }
+        return groups.filter(group => group.length > 0);
+    }
     isBooleanParenExpression(token) {
         if (token.containerType !== SqlPrintTokenContainerType.ParenExpression) {
             return false;
@@ -1546,6 +1844,7 @@ export class SqlPrinter {
             parenthesesOneLine: false, // Prevent recursive processing (avoid infinite loops)
             betweenOneLine: false, // Prevent recursive processing (avoid infinite loops)
             valuesOneLine: false, // Prevent recursive processing (avoid infinite loops)
+            inOneLine: false, // Prevent recursive processing (avoid infinite loops)
             joinOneLine: false, // Prevent recursive processing (avoid infinite loops)
             caseOneLine: false, // Prevent recursive processing (avoid infinite loops)
             subqueryOneLine: false, // Prevent recursive processing (avoid infinite loops)