rawsql-ts 0.24.1 → 0.24.3

package/dist/esm/transformers/SqlPrinter.js

@@ -30,15 +30,21 @@ 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         /** 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 */
         this.mergeWhenPredicateDepth = 0;
+        /** Tracks nesting depth while formatting JOIN ON condition segments */
+        this.joinOnClauseDepth = 0;
+        /** Containers whose one-line rendering was rejected by oneLineMaxLength */
+        this.expandedOneLineFallbackTokens = new WeakSet();
         /** Pending line comment that needs a forced newline before next token */
         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);
@@ -52,19 +58,22 @@ 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.keywordCase = (_g = options === null || options === void 0 ? void 0 : options.keywordCase) !== null && _g !== void 0 ? _g : '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.commentExportMode = this.resolveCommentExportMode(options === null || options === void 0 ? void 0 : options.exportComment);
-        this.withClauseStyle = (_h = options === null || options === void 0 ? void 0 : options.withClauseStyle) !== null && _h !== void 0 ? _h : 'standard';
-        this.commentStyle = (_j = options === null || options === void 0 ? void 0 : options.commentStyle) !== null && _j !== void 0 ? _j : 'block';
-        this.parenthesesOneLine = (_k = options === null || options === void 0 ? void 0 : options.parenthesesOneLine) !== null && _k !== void 0 ? _k : false;
-        this.betweenOneLine = (_l = options === null || options === void 0 ? void 0 : options.betweenOneLine) !== null && _l !== void 0 ? _l : false;
-        this.valuesOneLine = (_m = options === null || options === void 0 ? void 0 : options.valuesOneLine) !== 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.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.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;
         const onelineOptions = {
             parenthesesOneLine: this.parenthesesOneLine,
             betweenOneLine: this.betweenOneLine,
@@ -78,7 +87,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((_u = options === null || options === void 0 ? void 0 : options.indentIncrementContainerTypes) !== null && _u !== void 0 ? _u : [
+        this.indentIncrementContainers = new Set((_w = options === null || options === void 0 ? void 0 : options.indentIncrementContainerTypes) !== null && _w !== void 0 ? _w : [
             SqlPrintTokenContainerType.SelectClause,
             SqlPrintTokenContainerType.ReturningClause,
             SqlPrintTokenContainerType.FromClause,
@@ -124,8 +133,11 @@ export class SqlPrinter {
         // initialize
         this.linePrinter = new LinePrinter(this.indentChar, this.indentSize, this.newline, this.commaBreak);
         this.insideWithClause = false; // Reset WITH clause context
+        this.joinOnClauseDepth = 0;
         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;
         }
@@ -168,6 +180,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') {
@@ -196,12 +209,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.
@@ -214,13 +231,26 @@ 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 (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;
@@ -237,14 +267,22 @@ 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;
         }
         const current = this.linePrinter.getCurrentLine();
         const isCaseContext = this.isCaseContext(token.containerType);
         const nextCaseContextDepth = isCaseContext ? caseContextDepth + 1 : caseContextDepth;
-        const shouldIndentNested = this.shouldIndentNestedParentheses(token, previousSiblingWasOpenParen);
+        let shouldIndentNested = this.shouldIndentNestedParentheses(token, previousSiblingWasOpenParen);
         // Handle different token types
         if (token.type === SqlPrintTokenType.keyword) {
             this.handleKeywordToken(token, level, parentContainerType, caseContextDepth);
@@ -252,6 +290,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);
         }
@@ -281,16 +322,25 @@ export class SqlPrinter {
             this.handleCommentNewlineToken(token, commentLevel);
         }
         else if (token.containerType === SqlPrintTokenContainerType.CommonTable && this.withClauseStyle === 'cte-oneline') {
-            this.handleCteOnelineToken(token, level);
-            return; // Return early to avoid processing innerTokens
+            if (this.tryHandleCteOnelineToken(token, level)) {
+                return; // Return early to avoid processing innerTokens
+            }
         }
-        else if (this.shouldFormatContainerAsOneline(token, shouldIndentNested)) {
-            this.handleOnelineToken(token, level);
+        else if (this.shouldFormatContainerAsOneline(token, shouldIndentNested) && this.tryHandleOnelineToken(token, level)) {
             return; // Return early to avoid processing innerTokens
         }
         else if (!this.tryAppendInsertClauseTokenText(token.text, parentContainerType)) {
             this.linePrinter.appendText(token.text);
         }
+        if (token.containerType === SqlPrintTokenContainerType.JoinOnClause &&
+            this.joinOnBreak === 'before' &&
+            !this.isOnelineMode() &&
+            this.linePrinter.getCurrentLine().text.trim().length > 0) {
+            this.linePrinter.appendNewline(level + 1);
+        }
+        if (this.expandedOneLineFallbackTokens.has(token)) {
+            shouldIndentNested = true;
+        }
         // append keyword tokens(not indented)
         if (token.keywordTokens && token.keywordTokens.length > 0) {
             for (let i = 0; i < token.keywordTokens.length; i++) {
@@ -304,6 +354,9 @@ export class SqlPrinter {
         const delayIndentNewline = shouldIndentNested && token.containerType === SqlPrintTokenContainerType.ParenExpression;
         const isAlterTableStatement = token.containerType === SqlPrintTokenContainerType.AlterTableStatement;
         let deferAlterTableIndent = false;
+        if (token.containerType === SqlPrintTokenContainerType.JoinOnClause && this.joinOnBreak === 'before' && !this.isOnelineMode()) {
+            innerLevel = level + 1;
+        }
         const alignExplainChild = this.shouldAlignExplainStatementChild(parentContainerType, token.containerType);
         if (alignExplainChild) {
             // Keep EXPLAIN target statements flush left so they render like standalone statements.
@@ -356,6 +409,15 @@ export class SqlPrinter {
         let mergePredicateActive = isMergeWhenClause;
         let alterTableTableRendered = false;
         let alterTableIndentInserted = false;
+        const enteredJoinOnClause = token.containerType === SqlPrintTokenContainerType.JoinOnClause;
+        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];
@@ -406,7 +468,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--;
             }
@@ -414,9 +479,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;
@@ -444,6 +524,27 @@ 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));
+    }
+    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:
@@ -603,6 +704,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) {
@@ -617,7 +726,7 @@ export class SqlPrinter {
         if (this.andBreak === 'before') {
             // Skip newline when inside WITH clause with full-oneline style
             if (!(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
-                this.linePrinter.appendNewline(level);
+                this.linePrinter.appendNewline(this.getJoinConditionContinuationLevel(level));
             }
             this.linePrinter.appendText(text);
         }
@@ -625,7 +734,7 @@ export class SqlPrinter {
             this.linePrinter.appendText(text);
             // Skip newline when inside WITH clause with full-oneline style
             if (!(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
-                this.linePrinter.appendNewline(level);
+                this.linePrinter.appendNewline(this.getJoinConditionContinuationLevel(level));
             }
         }
         else {
@@ -635,6 +744,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) {
@@ -644,19 +759,29 @@ export class SqlPrinter {
                 if (this.shouldBreakAfterOpeningParen(parentContainerType)) {
                     this.linePrinter.appendNewline(level + 1);
                 }
-                else if (indentParentActive && !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
+                else if (indentParentActive &&
+                    parentContainerType === SqlPrintTokenContainerType.ParenExpression &&
+                    !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
                     this.linePrinter.appendNewline(level);
                 }
             }
             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);
                 return;
             }
-            if (indentParentActive && !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
+            if (indentParentActive &&
+                parentContainerType === SqlPrintTokenContainerType.ParenExpression &&
+                !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
                 const closingLevel = Math.max(level - 1, 0);
                 this.linePrinter.appendNewline(closingLevel);
             }
@@ -678,7 +803,7 @@ export class SqlPrinter {
         if (this.orBreak === 'before') {
             // Insert a newline before OR unless WITH full-oneline mode suppresses breaks.
             if (!(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
-                this.linePrinter.appendNewline(level);
+                this.linePrinter.appendNewline(this.getJoinConditionContinuationLevel(level));
             }
             this.linePrinter.appendText(text);
         }
@@ -686,13 +811,22 @@ export class SqlPrinter {
             this.linePrinter.appendText(text);
             // Break after OR when multi-line formatting is active.
             if (!(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
-                this.linePrinter.appendNewline(level);
+                this.linePrinter.appendNewline(this.getJoinConditionContinuationLevel(level));
             }
         }
         else {
             this.linePrinter.appendText(text);
         }
     }
+    getJoinConditionContinuationLevel(level) {
+        if (this.joinOnClauseDepth === 0) {
+            return level;
+        }
+        if (this.joinOnBreak === 'before') {
+            return level;
+        }
+        return this.joinConditionContinuationIndent ? level + 1 : level;
+    }
     /**
      * Decide whether a parentheses group should increase indentation when inside nested structures.
      * We only expand groups that contain further parentheses so simple comparisons stay compact.
@@ -704,6 +838,9 @@ export class SqlPrinter {
         if (token.containerType !== SqlPrintTokenContainerType.ParenExpression) {
             return false;
         }
+        if (this.expandedOneLineFallbackTokens.has(token)) {
+            return true;
+        }
         // Look for nested parentheses containers. If present, indent to highlight grouping.
         return previousSiblingWasOpenParen || token.innerTokens.some((child) => this.containsParenExpression(child));
     }
@@ -750,6 +887,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;
@@ -974,6 +1117,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
@@ -995,6 +1143,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, '');
@@ -1070,7 +1230,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);
+                    }
                 }
             }
         }
@@ -1256,6 +1421,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;
@@ -1266,6 +1435,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;
         }
@@ -1280,6 +1456,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.
@@ -1287,16 +1469,36 @@ export class SqlPrinter {
     isOnelineMode() {
         return this.newline === ' ';
     }
+    normalizeOneLineMaxLength(value) {
+        if (value === undefined || !Number.isFinite(value) || value <= 0) {
+            return undefined;
+        }
+        const normalized = Math.floor(value);
+        return normalized > 0 ? normalized : undefined;
+    }
+    fitsOneLineMaxLength(text) {
+        if (this.oneLineMaxLength === undefined) {
+            return true;
+        }
+        const currentLine = this.linePrinter.getCurrentLine();
+        const indentWidth = currentLine.level * this.indentSize * String(this.indentChar).length;
+        return indentWidth + currentLine.text.length + text.length <= this.oneLineMaxLength;
+    }
     /**
      * Handles CTE tokens with one-liner formatting.
      * Creates a nested SqlPrinter instance for proper CTE oneline formatting.
      */
-    handleCteOnelineToken(token, level) {
+    tryHandleCteOnelineToken(token, level) {
         const onelinePrinter = this.createCteOnelinePrinter();
         const onelineResult = onelinePrinter.print(token, level);
         let cleanedResult = this.cleanDuplicateSpaces(onelineResult);
         cleanedResult = cleanedResult.replace(/\(\s+/g, '(').replace(/\s+\)/g, ' )');
-        this.linePrinter.appendText(cleanedResult.trim());
+        const trimmedResult = cleanedResult.trim();
+        if (!this.fitsOneLineMaxLength(trimmedResult)) {
+            return false;
+        }
+        this.linePrinter.appendText(trimmedResult);
+        return true;
     }
     /**
      * Creates a SqlPrinter instance configured for CTE oneline formatting.
@@ -1322,11 +1524,31 @@ export class SqlPrinter {
      * Handles tokens with oneline formatting (parentheses, BETWEEN, VALUES, JOIN, CASE, subqueries).
      * Creates a unified oneline printer that formats everything as one line regardless of content type.
      */
-    handleOnelineToken(token, level) {
+    tryHandleOnelineToken(token, level) {
         const onelinePrinter = this.createOnelinePrinter();
         const onelineResult = onelinePrinter.print(token, level);
         const cleanedResult = this.cleanDuplicateSpaces(onelineResult);
+        if (!this.fitsOneLineMaxLength(cleanedResult)) {
+            if (this.isBooleanParenExpression(token)) {
+                this.expandedOneLineFallbackTokens.add(token);
+            }
+            return false;
+        }
         this.linePrinter.appendText(cleanedResult);
+        return true;
+    }
+    isBooleanParenExpression(token) {
+        if (token.containerType !== SqlPrintTokenContainerType.ParenExpression) {
+            return false;
+        }
+        return this.containsLogicalOperator(token);
+    }
+    containsLogicalOperator(token) {
+        if ((token.type === SqlPrintTokenType.operator || token.type === SqlPrintTokenType.keyword) &&
+            ['and', 'or'].includes(token.text.toLowerCase())) {
+            return true;
+        }
+        return token.innerTokens.some((child) => this.containsLogicalOperator(child));
     }
     getClauseBreakIndentLevel(parentType, level) {
         if (!parentType) {