rawsql-ts 0.24.3 → 0.25.0

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

@@ -1,4 +1,4 @@
-import { CastStyle, ConstraintStyle, SourceAliasStyle, OrderByDefaultDirectionStyle } from '../parsers/SqlPrintTokenParser';
+import { CastStyle, ConstraintStyle, SourceAliasStyle, ColumnAliasStyle, OrderByDefaultDirectionStyle } from '../parsers/SqlPrintTokenParser';
 import { CommaBreakStyle, AndBreakStyle, OrBreakStyle, JoinOnBreakStyle } from './SqlPrinter';
 import { CommentExportMode } from '../types/Formatting';
 import { IndentCharOption, NewlineOption } from './LinePrinter';
@@ -38,7 +38,7 @@ export interface BaseFormattingOptions {
     /** Newline character style (logical 'lf'/'crlf'/'cr' or literal newline string) */
     newline?: NewlineOption;
     /** Case transformation for SQL keywords */
-    keywordCase?: 'none' | 'upper' | 'lower';
+    keywordCase?: 'none' | 'upper' | 'lower' | 'preserve';
     /** Style for comma line breaks */
     commaBreak?: CommaBreakStyle;
     /** Style for comma line breaks inside WITH clause definitions */
@@ -63,6 +63,8 @@ export interface BaseFormattingOptions {
     betweenOneLine?: boolean;
     /** Keep VALUES clause on one line regardless of comma break settings */
     valuesOneLine?: boolean;
+    /** Keep IN value lists on one line until oneLineMaxLength forces expansion */
+    inOneLine?: boolean;
     /** Keep JOIN conditions on one line regardless of AND/OR break settings */
     joinOneLine?: boolean;
     /** Keep CASE expressions on one line regardless of formatting settings */
@@ -75,8 +77,8 @@ 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;
+    /** Maximum rendered width for opt-in one-line constructs. Use 0, null, or omit to disable the limit. */
+    oneLineMaxLength?: number | null;
     /** Indent AND/OR continuation lines inside JOIN ON predicates */
     joinConditionContinuationIndent?: boolean;
     /** Reorder JOIN ON column comparisons to follow table declaration order */
@@ -106,13 +108,15 @@ export interface SqlFormatterOptions extends BaseFormattingOptions {
         end: string;
     };
     /** Style for parameter formatting */
-    parameterStyle?: 'anonymous' | 'indexed' | 'named';
+    parameterStyle?: 'anonymous' | 'indexed' | 'named' | 'original';
     /** Preferred CAST rendering style */
     castStyle?: CastStyle;
     /** Constraint rendering style (affects CREATE TABLE constraint layout) */
     constraintStyle?: ConstraintStyle;
     /** Source alias rendering style for FROM/JOIN sources */
     sourceAliasStyle?: SourceAliasStyle;
+    /** Column alias rendering style for SELECT items */
+    columnAliasStyle?: ColumnAliasStyle;
     /** Default ORDER BY direction rendering style */
     orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
 }

package/dist/esm/transformers/SqlFormatter.js

@@ -16,15 +16,15 @@ export const VALID_PRESETS = ['mysql', 'postgres', 'sqlserver', 'sqlite'];
  */
 export class SqlFormatter {
     constructor(options = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const presetConfig = options.preset ? PRESETS[options.preset] : undefined;
         if (options.preset && !presetConfig) {
             throw new Error(`Invalid preset: ${options.preset}`); // Throw error for invalid preset
         }
         // Normalize identifier escape names into actual delimiter pairs before configuring the parser.
         const resolvedIdentifierEscape = resolveIdentifierEscapeOption((_a = options.identifierEscape) !== null && _a !== void 0 ? _a : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.identifierEscape, (_b = options.identifierEscapeTarget) !== null && _b !== void 0 ? _b : 'all');
-        const parserOptions = Object.assign(Object.assign({}, presetConfig), { identifierEscape: resolvedIdentifierEscape !== null && resolvedIdentifierEscape !== void 0 ? resolvedIdentifierEscape : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.identifierEscape, parameterSymbol: (_c = options.parameterSymbol) !== null && _c !== void 0 ? _c : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterSymbol, parameterStyle: (_d = options.parameterStyle) !== null && _d !== void 0 ? _d : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterStyle, castStyle: (_e = options.castStyle) !== null && _e !== void 0 ? _e : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.castStyle, sourceAliasStyle: (_f = options.sourceAliasStyle) !== null && _f !== void 0 ? _f : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.sourceAliasStyle, orderByDefaultDirectionStyle: (_g = options.orderByDefaultDirectionStyle) !== null && _g !== void 0 ? _g : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.orderByDefaultDirectionStyle, joinConditionOrderByDeclaration: options.joinConditionOrderByDeclaration });
-        const constraintStyle = (_j = (_h = options.constraintStyle) !== null && _h !== void 0 ? _h : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.constraintStyle) !== null && _j !== void 0 ? _j : 'postgres';
+        const parserOptions = Object.assign(Object.assign({}, presetConfig), { identifierEscape: resolvedIdentifierEscape !== null && resolvedIdentifierEscape !== void 0 ? resolvedIdentifierEscape : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.identifierEscape, parameterSymbol: (_c = options.parameterSymbol) !== null && _c !== void 0 ? _c : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterSymbol, parameterStyle: (_d = options.parameterStyle) !== null && _d !== void 0 ? _d : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterStyle, castStyle: (_e = options.castStyle) !== null && _e !== void 0 ? _e : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.castStyle, sourceAliasStyle: (_f = options.sourceAliasStyle) !== null && _f !== void 0 ? _f : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.sourceAliasStyle, columnAliasStyle: (_g = options.columnAliasStyle) !== null && _g !== void 0 ? _g : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.columnAliasStyle, orderByDefaultDirectionStyle: (_h = options.orderByDefaultDirectionStyle) !== null && _h !== void 0 ? _h : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.orderByDefaultDirectionStyle, joinConditionOrderByDeclaration: options.joinConditionOrderByDeclaration });
+        const constraintStyle = (_k = (_j = options.constraintStyle) !== null && _j !== void 0 ? _j : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.constraintStyle) !== null && _k !== void 0 ? _k : 'postgres';
         const parserConfig = Object.assign(Object.assign({}, parserOptions), { constraintStyle });
         this.parser = new SqlPrintTokenParser(Object.assign({}, parserConfig));
         // Normalize legacy boolean comment export flags before configuring the printer.
@@ -33,7 +33,7 @@ export class SqlFormatter {
             : options.exportComment === false
                 ? 'none'
                 : options.exportComment;
-        const printerOptions = Object.assign(Object.assign({}, options), { exportComment: normalizedExportComment, parenthesesOneLine: options.parenthesesOneLine, betweenOneLine: options.betweenOneLine, valuesOneLine: options.valuesOneLine, joinOneLine: options.joinOneLine, caseOneLine: options.caseOneLine, subqueryOneLine: options.subqueryOneLine, indentNestedParentheses: options.indentNestedParentheses });
+        const printerOptions = Object.assign(Object.assign({}, options), { exportComment: normalizedExportComment, parenthesesOneLine: options.parenthesesOneLine, betweenOneLine: options.betweenOneLine, valuesOneLine: options.valuesOneLine, inOneLine: options.inOneLine, joinOneLine: options.joinOneLine, caseOneLine: options.caseOneLine, subqueryOneLine: options.subqueryOneLine, indentNestedParentheses: options.indentNestedParentheses });
         this.printer = new SqlPrinter(printerOptions);
     }
     /**

package/dist/esm/transformers/SqlFormatter.js.map

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

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

@@ -28,8 +28,9 @@ 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
+ * - 'after': Legacy alias accepted as 'none'
  */
-export type JoinOnBreakStyle = 'none' | 'before';
+export type JoinOnBreakStyle = 'none' | 'before' | 'after';
 /**
  * Options for configuring SqlPrinter formatting behavior
  */
@@ -74,7 +75,7 @@ export declare class SqlPrinter {
     andBreak: AndBreakStyle;
     /** OR break style: 'none', 'before', or 'after' */
     orBreak: OrBreakStyle;
-    /** JOIN ON break style: 'none' or 'before' */
+    /** JOIN ON break style: 'none' or 'before' (legacy 'after' is treated as 'none') */
     joinOnBreak: JoinOnBreakStyle;
     /** Keyword case style: 'none', 'upper' | 'lower' */
     keywordCase: 'none' | 'upper' | 'lower';
@@ -94,6 +95,8 @@ export declare class SqlPrinter {
     private betweenOneLine;
     /** Whether to keep VALUES clause on one line */
     private valuesOneLine;
+    /** Whether to keep IN value lists on one line */
+    private inOneLine;
     /** Whether to keep JOIN conditions on one line */
     private joinOneLine;
     /** Whether to keep CASE expressions on one line */
@@ -145,6 +148,7 @@ export declare class SqlPrinter {
     private shouldAlignExplainStatementChild;
     private shouldExpandCommentedFunctionCall;
     private containsCommentBlock;
+    private containsRenderableCommentBlock;
     private isLogicalOperatorWithComment;
     private currentLineEndsWithLogicalOperator;
     private isCaseContext;
@@ -183,6 +187,8 @@ export declare class SqlPrinter {
      * Decides whether the current container should collapse into a single line.
      */
     private shouldFormatContainerAsOneline;
+    private isInValueListExpression;
+    private getInValueListParts;
     /**
      * Detects an INSERT column list that must stay on a single line.
      */
@@ -206,8 +212,11 @@ export declare class SqlPrinter {
     private normalizeSmartBlockLine;
     private extractLineCommentContent;
     private flushSmartCommentBlockBuilder;
+    private shouldFallbackSmartLineCommentToBlock;
+    private buildSmartLineComment;
     private collectCommentBlockLines;
     private extractRawCommentBlockLines;
+    private extractDirectBlockCommentTexts;
     private normalizeCommentForSmart;
     private buildBlockComment;
     private getIndentString;
@@ -236,12 +245,15 @@ export declare class SqlPrinter {
      */
     private isOnelineMode;
     private normalizeOneLineMaxLength;
+    private normalizeKeywordCase;
+    private normalizeJoinOnBreak;
     private fitsOneLineMaxLength;
     /**
      * Handles CTE tokens with one-liner formatting.
      * Creates a nested SqlPrinter instance for proper CTE oneline formatting.
      */
     private tryHandleCteOnelineToken;
+    private shouldPreserveCteComments;
     /**
      * Creates a SqlPrinter instance configured for CTE oneline formatting.
      */
@@ -251,6 +263,9 @@ export declare class SqlPrinter {
      * Creates a unified oneline printer that formats everything as one line regardless of content type.
      */
     private tryHandleOnelineToken;
+    private tryHandleInOneLineToken;
+    private appendExpandedInValueList;
+    private splitValueListItems;
     private isBooleanParenExpression;
     private containsLogicalOperator;
     private getClauseBreakIndentLevel;

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 */
@@ -58,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,
@@ -87,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,
@@ -235,6 +237,18 @@ export class SqlPrinter {
                 ((_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 &&
@@ -326,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
         }
@@ -536,6 +553,12 @@ export class SqlPrinter {
         }
         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 &&
@@ -873,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.
      */
@@ -1020,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);
@@ -1101,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 = {
@@ -1193,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);
@@ -1209,6 +1280,12 @@ export class SqlPrinter {
         }
         this.smartCommentBlockBuilder = null;
     }
+    shouldFallbackSmartLineCommentToBlock() {
+        return this.isOnelineMode();
+    }
+    buildSmartLineComment(content) {
+        return content ? `-- ${content}` : '--';
+    }
     collectCommentBlockLines(token) {
         var _a;
         const lines = [];
@@ -1267,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;
@@ -1470,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;
@@ -1489,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)) {
@@ -1500,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.
      */
@@ -1537,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;
@@ -1684,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)