rawsql-ts 0.24.1 → 0.24.2

package/dist/src/transformers/SqlFormatter.d.ts

@@ -1,5 +1,5 @@
 import { CastStyle, ConstraintStyle, SourceAliasStyle, OrderByDefaultDirectionStyle } from '../parsers/SqlPrintTokenParser';
-import { CommaBreakStyle, AndBreakStyle, OrBreakStyle } from './SqlPrinter';
+import { CommaBreakStyle, AndBreakStyle, OrBreakStyle, JoinOnBreakStyle } from './SqlPrinter';
 import { CommentExportMode } from '../types/Formatting';
 import { IndentCharOption, NewlineOption } from './LinePrinter';
 import { IdentifierEscapeOption, IdentifierEscapeTarget } from './FormatOptionResolver';
@@ -49,6 +49,8 @@ export interface BaseFormattingOptions {
     andBreak?: AndBreakStyle;
     /** Style for OR line breaks */
     orBreak?: OrBreakStyle;
+    /** Style for JOIN ON line breaks */
+    joinOnBreak?: JoinOnBreakStyle;
     /** Whether to export comments in formatted output */
     exportComment?: boolean | CommentExportMode;
     /** Comment formatting style */
@@ -73,6 +75,10 @@ export interface BaseFormattingOptions {
     insertColumnsOneLine?: boolean;
     /** Keep MERGE WHEN clause predicates on one line regardless of AND break settings */
     whenOneLine?: boolean;
+    /** Maximum rendered width for opt-in one-line constructs. Omit to keep legacy unlimited one-line behavior. */
+    oneLineMaxLength?: number;
+    /** Indent AND/OR continuation lines inside JOIN ON predicates */
+    joinConditionContinuationIndent?: boolean;
     /** Reorder JOIN ON column comparisons to follow table declaration order */
     joinConditionOrderByDeclaration?: boolean;
 }

package/dist/src/transformers/SqlPrinter.d.ts

@@ -24,6 +24,12 @@ export type AndBreakStyle = 'none' | 'before' | 'after';
  * - 'after': Line break after OR
  */
 export type OrBreakStyle = 'none' | 'before' | 'after';
+/**
+ * JoinOnBreakStyle determines whether JOIN ON starts on the JOIN line or its own indented line.
+ * - 'none': Keep ON inline with the JOIN target
+ * - 'before': Break before ON and indent the join condition
+ */
+export type JoinOnBreakStyle = 'none' | 'before';
 /**
  * Options for configuring SqlPrinter formatting behavior
  */
@@ -68,6 +74,8 @@ export declare class SqlPrinter {
     andBreak: AndBreakStyle;
     /** OR break style: 'none', 'before', or 'after' */
     orBreak: OrBreakStyle;
+    /** JOIN ON break style: 'none' or 'before' */
+    joinOnBreak: JoinOnBreakStyle;
     /** Keyword case style: 'none', 'upper' | 'lower' */
     keywordCase: 'none' | 'upper' | 'lower';
     /** Comment export mode controlling how comments are emitted */
@@ -98,10 +106,18 @@ export declare class SqlPrinter {
     private insertColumnsOneLine;
     /** Whether to keep MERGE WHEN predicates on a single line */
     private whenOneLine;
+    /** Optional maximum width for opt-in one-line constructs */
+    private oneLineMaxLength?;
+    /** Whether to indent AND/OR continuation lines inside JOIN ON predicates */
+    private joinConditionContinuationIndent;
     /** Tracks nesting depth while formatting MERGE WHEN predicate segments */
     private mergeWhenPredicateDepth;
+    /** Tracks nesting depth while formatting JOIN ON condition segments */
+    private joinOnClauseDepth;
     /** Shared helper for oneline-specific formatting decisions */
     private onelineHelper;
+    /** Containers whose one-line rendering was rejected by oneLineMaxLength */
+    private expandedOneLineFallbackTokens;
     /** Pending line comment that needs a forced newline before next token */
     private pendingLineCommentBreak;
     /** Accumulates lines when reconstructing multi-line block comments inside CommentBlocks */
@@ -144,6 +160,7 @@ export declare class SqlPrinter {
     private handleAndOperatorToken;
     private handleParenthesisToken;
     private handleOrOperatorToken;
+    private getJoinConditionContinuationLevel;
     /**
      * 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.
@@ -209,11 +226,13 @@ export declare class SqlPrinter {
      * Oneliner mode uses single spaces instead of actual newlines.
      */
     private isOnelineMode;
+    private normalizeOneLineMaxLength;
+    private fitsOneLineMaxLength;
     /**
      * Handles CTE tokens with one-liner formatting.
      * Creates a nested SqlPrinter instance for proper CTE oneline formatting.
      */
-    private handleCteOnelineToken;
+    private tryHandleCteOnelineToken;
     /**
      * Creates a SqlPrinter instance configured for CTE oneline formatting.
      */
@@ -222,7 +241,9 @@ export declare 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.
      */
-    private handleOnelineToken;
+    private tryHandleOnelineToken;
+    private isBooleanParenExpression;
+    private containsLogicalOperator;
     private getClauseBreakIndentLevel;
     private isMergeActionContainer;
     private shouldBreakAfterOpeningParen;

package/dist/transformers/SqlFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlFormatter.js","sourceRoot":"","sources":["../../src/transformers/SqlFormatter.ts"],"names":[],"mappings":";;;AAAA,wEAA2K;AAC3K,6CAAwF;AAGxF,iEAAuH;AAIvH,4CAA4C;AAC/B,QAAA,aAAa,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAU,CAAC;AA4GnF;;;;;;;;;;GAUG;AACH,MAAa,YAAY;IAIrB,YAAY,UAA+B,EAAE;;QAEzC,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,6BAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,iCAAiC;QAC3F,CAAC;QAED,+FAA+F;QAC/F,MAAM,wBAAwB,GAAG,IAAA,oDAA6B,EAC1D,MAAA,OAAO,CAAC,gBAAgB,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,EAC1D,MAAA,OAAO,CAAC,sBAAsB,mCAAI,KAAK,CAC1C,CAAC;QAEF,MAAM,aAAa,GAAG;YAClB,GAAG,YAAY,EAAE,6BAA6B;YAC9C,gBAAgB,EAAE,wBAAwB,aAAxB,wBAAwB,cAAxB,wBAAwB,GAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB;YAC5E,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,eAAe;YACzE,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAc;YACtE,SAAS,EAAE,MAAA,OAAO,CAAC,SAAS,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS;YACvD,gBAAgB,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB;YAC5E,4BAA4B,EAAE,MAAA,OAAO,CAAC,4BAA4B,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,4BAA4B;YAChH,+BAA+B,EAAE,OAAO,CAAC,+BAA+B;SAC3E,CAAC;QAEF,MAAM,eAAe,GACjB,MAAA,MAAA,OAAO,CAAC,eAAe,mCACvB,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,eAAe,mCAC7B,UAAU,CAAC;QAEf,MAAM,YAAY,GAAG;YACjB,GAAG,aAAa;YAChB,eAAe;SAClB,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,yCAAmB,CAAC;YAClC,GAAG,YAAY;SAClB,CAAC,CAAC;QAEH,gFAAgF;QAChF,MAAM,uBAAuB,GACzB,OAAO,CAAC,aAAa,KAAK,IAAI;YAC1B,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,OAAO,CAAC,aAAa,KAAK,KAAK;gBACjC,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QAEhC,MAAM,cAAc,GAA0B;YAC1C,GAAG,OAAO;YACV,aAAa,EAAE,uBAAuB;YACtC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;SAC3D,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,CAAC,cAAc,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,GAAiB;QACpB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC;CACJ;AA9ED,oCA8EC"}
+{"version":3,"file":"SqlFormatter.js","sourceRoot":"","sources":["../../src/transformers/SqlFormatter.ts"],"names":[],"mappings":"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"}

package/dist/transformers/SqlPrinter.js

@@ -33,11 +33,15 @@ 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 */
@@ -55,19 +59,22 @@ 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,
@@ -81,7 +88,7 @@ class SqlPrinter {
         this.onelineHelper = new OnelineFormattingHelper_1.OnelineFormattingHelper(onelineOptions);
         this.linePrinter = new LinePrinter_1.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 : [
             SqlPrintToken_1.SqlPrintTokenContainerType.SelectClause,
             SqlPrintToken_1.SqlPrintTokenContainerType.ReturningClause,
             SqlPrintToken_1.SqlPrintTokenContainerType.FromClause,
@@ -127,8 +134,10 @@ class SqlPrinter {
         // initialize
         this.linePrinter = new LinePrinter_1.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();
         if (this.linePrinter.lines.length > 0 && level !== this.linePrinter.lines[0].level) {
             this.linePrinter.lines[0].level = level;
         }
@@ -247,7 +256,7 @@ class SqlPrinter {
         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 === SqlPrintToken_1.SqlPrintTokenType.keyword) {
             this.handleKeywordToken(token, level, parentContainerType, caseContextDepth);
@@ -284,16 +293,25 @@ class SqlPrinter {
             this.handleCommentNewlineToken(token, commentLevel);
         }
         else if (token.containerType === SqlPrintToken_1.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 === SqlPrintToken_1.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++) {
@@ -307,6 +325,9 @@ class SqlPrinter {
         const delayIndentNewline = shouldIndentNested && token.containerType === SqlPrintToken_1.SqlPrintTokenContainerType.ParenExpression;
         const isAlterTableStatement = token.containerType === SqlPrintToken_1.SqlPrintTokenContainerType.AlterTableStatement;
         let deferAlterTableIndent = false;
+        if (token.containerType === SqlPrintToken_1.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.
@@ -359,6 +380,10 @@ class SqlPrinter {
         let mergePredicateActive = isMergeWhenClause;
         let alterTableTableRendered = false;
         let alterTableIndentInserted = false;
+        const enteredJoinOnClause = token.containerType === SqlPrintToken_1.SqlPrintTokenContainerType.JoinOnClause;
+        if (enteredJoinOnClause) {
+            this.joinOnClauseDepth++;
+        }
         for (let i = leadingCommentCount; i < token.innerTokens.length; i++) {
             const child = token.innerTokens[i];
             const nextChild = token.innerTokens[i + 1];
@@ -420,6 +445,9 @@ class SqlPrinter {
         if (this.smartCommentBlockBuilder && this.smartCommentBlockBuilder.mode === 'line') {
             this.flushSmartCommentBlockBuilder();
         }
+        if (enteredJoinOnClause) {
+            this.joinOnClauseDepth--;
+        }
         // Exit WITH clause context when we finish processing WithClause container
         if (token.containerType === SqlPrintToken_1.SqlPrintTokenContainerType.WithClause && this.withClauseStyle === 'full-oneline') {
             this.insideWithClause = false;
@@ -620,7 +648,7 @@ 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);
         }
@@ -628,7 +656,7 @@ 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 {
@@ -647,7 +675,9 @@ class SqlPrinter {
                 if (this.shouldBreakAfterOpeningParen(parentContainerType)) {
                     this.linePrinter.appendNewline(level + 1);
                 }
-                else if (indentParentActive && !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
+                else if (indentParentActive &&
+                    parentContainerType === SqlPrintToken_1.SqlPrintTokenContainerType.ParenExpression &&
+                    !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
                     this.linePrinter.appendNewline(level);
                 }
             }
@@ -659,7 +689,9 @@ class SqlPrinter {
                 this.linePrinter.appendText(token.text);
                 return;
             }
-            if (indentParentActive && !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
+            if (indentParentActive &&
+                parentContainerType === SqlPrintToken_1.SqlPrintTokenContainerType.ParenExpression &&
+                !(this.insideWithClause && this.withClauseStyle === 'full-oneline')) {
                 const closingLevel = Math.max(level - 1, 0);
                 this.linePrinter.appendNewline(closingLevel);
             }
@@ -681,7 +713,7 @@ 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);
         }
@@ -689,13 +721,22 @@ 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.
@@ -707,6 +748,9 @@ class SqlPrinter {
         if (token.containerType !== SqlPrintToken_1.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));
     }
@@ -1290,16 +1334,36 @@ 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.
@@ -1325,11 +1389,31 @@ 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 !== SqlPrintToken_1.SqlPrintTokenContainerType.ParenExpression) {
+            return false;
+        }
+        return this.containsLogicalOperator(token);
+    }
+    containsLogicalOperator(token) {
+        if ((token.type === SqlPrintToken_1.SqlPrintTokenType.operator || token.type === SqlPrintToken_1.SqlPrintTokenType.keyword) &&
+            ['and', 'or'].includes(token.text.toLowerCase())) {
+            return true;
+        }
+        return token.innerTokens.some((child) => this.containsLogicalOperator(child));
     }
     getClauseBreakIndentLevel(parentType, level) {
         if (!parentType) {