rawsql-ts 0.11.42-beta → 0.11.44-beta

package/dist/src/transformers/SqlFormatter.js

@@ -19,7 +19,7 @@ exports.VALID_PRESETS = ['mysql', 'postgres', 'sqlserver', 'sqlite'];
  */
 class SqlFormatter {
     constructor(options = {}) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const presetConfig = options.preset ? SqlPrintTokenParser_1.PRESETS[options.preset] : undefined;
         if (options.preset && !presetConfig) {
             throw new Error(`Invalid preset: ${options.preset}`); // Throw error for invalid preset
@@ -31,21 +31,35 @@ class SqlFormatter {
             identifierEscape: resolvedIdentifierEscape !== null && resolvedIdentifierEscape !== void 0 ? resolvedIdentifierEscape : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.identifierEscape,
             parameterSymbol: (_b = options.parameterSymbol) !== null && _b !== void 0 ? _b : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterSymbol,
             parameterStyle: (_c = options.parameterStyle) !== null && _c !== void 0 ? _c : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterStyle,
+            castStyle: (_d = options.castStyle) !== null && _d !== void 0 ? _d : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.castStyle,
+            joinConditionOrderByDeclaration: options.joinConditionOrderByDeclaration,
         };
-        this.parser = new SqlPrintTokenParser_1.SqlPrintTokenParser({
+        const constraintStyle = (_f = (_e = options.constraintStyle) !== null && _e !== void 0 ? _e : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.constraintStyle) !== null && _f !== void 0 ? _f : 'postgres';
+        const parserConfig = {
             ...parserOptions,
-            commentStyle: options.commentStyle
+            constraintStyle,
+        };
+        this.parser = new SqlPrintTokenParser_1.SqlPrintTokenParser({
+            ...parserConfig,
         });
-        this.printer = new SqlPrinter_1.SqlPrinter({
+        // Normalize legacy boolean comment export flags before configuring the printer.
+        const normalizedExportComment = options.exportComment === true
+            ? 'full'
+            : options.exportComment === false
+                ? 'none'
+                : options.exportComment;
+        const printerOptions = {
             ...options,
+            exportComment: normalizedExportComment,
             parenthesesOneLine: options.parenthesesOneLine,
             betweenOneLine: options.betweenOneLine,
             valuesOneLine: options.valuesOneLine,
             joinOneLine: options.joinOneLine,
             caseOneLine: options.caseOneLine,
             subqueryOneLine: options.subqueryOneLine,
-            indentNestedParentheses: options.indentNestedParentheses
-        });
+            indentNestedParentheses: options.indentNestedParentheses,
+        };
+        this.printer = new SqlPrinter_1.SqlPrinter(printerOptions);
     }
     /**
      * Formats a SQL query string with the given parameters.

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

@@ -1 +1 @@
-{"version":3,"file":"SqlFormatter.js","sourceRoot":"","sources":["../../../src/transformers/SqlFormatter.ts"],"names":[],"mappings":";;;AAAA,wEAA+F;AAC/F,6CAAwF;AAExF,iEAA+F;AAI/F,4CAA4C;AAC/B,QAAA,aAAa,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAU,CAAC;AA8FnF;;;;;;;;;;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,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,CAAC,CAAC;QAE3H,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;SACzE,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,yCAAmB,CAAC;YAClC,GAAG,aAAa;YAChB,YAAY,EAAE,OAAO,CAAC,YAAY;SACrC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,CAAC;YAC1B,GAAG,OAAO;YACV,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,CAAC;IACP,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;AAlDD,oCAkDC"}
+{"version":3,"file":"SqlFormatter.js","sourceRoot":"","sources":["../../../src/transformers/SqlFormatter.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,15 @@
 import { SqlPrintToken, SqlPrintTokenContainerType } from "../models/SqlPrintToken";
 import { IndentCharOption, NewlineOption } from "./LinePrinter";
 import { BaseFormattingOptions, WithClauseStyle, CommentStyle } from "./SqlFormatter";
+import { CommaBreakStyle as HelperCommaBreakStyle } from "./OnelineFormattingHelper";
+import { CommentExportMode } from "../types/Formatting";
 /**
  * CommaBreakStyle determines how commas are placed in formatted SQL output.
  * - 'none': No line break for commas
  * - 'before': Line break before comma
  * - 'after': Line break after comma
  */
-export type CommaBreakStyle = 'none' | 'before' | 'after';
+export type CommaBreakStyle = HelperCommaBreakStyle;
 /**
  * AndBreakStyle determines how AND operators are placed in formatted SQL output.
  * - 'none': No line break for AND
@@ -68,10 +70,8 @@ export declare class SqlPrinter {
     orBreak: OrBreakStyle;
     /** Keyword case style: 'none', 'upper' | 'lower' */
     keywordCase: 'none' | 'upper' | 'lower';
-    /** Whether to export comments in the output (default: false for compatibility) */
-    exportComment: boolean;
-    /** Whether to use strict comment placement (only clause-level comments, default: false) */
-    strictCommentPlacement: boolean;
+    /** Comment export mode controlling how comments are emitted */
+    commentExportMode: CommentExportMode;
     /** WITH clause formatting style (default: 'standard') */
     withClauseStyle: WithClauseStyle;
     /** Comment formatting style (default: 'block') */
@@ -94,6 +94,18 @@ export declare class SqlPrinter {
     private subqueryOneLine;
     /** Whether to indent nested parentheses when boolean groups get expanded */
     private indentNestedParentheses;
+    /** Whether to keep INSERT column lists on one line */
+    private insertColumnsOneLine;
+    /** Whether to keep MERGE WHEN predicates on a single line */
+    private whenOneLine;
+    /** Tracks nesting depth while formatting MERGE WHEN predicate segments */
+    private mergeWhenPredicateDepth;
+    /** Shared helper for oneline-specific formatting decisions */
+    private onelineHelper;
+    /** Pending line comment that needs a forced newline before next token */
+    private pendingLineCommentBreak;
+    /** Accumulates lines when reconstructing multi-line block comments inside CommentBlocks */
+    private smartCommentBlockBuilder;
     /**
      * @param options Optional style settings for pretty printing
      */
@@ -108,6 +120,9 @@ export declare class SqlPrinter {
      * const formatted = printer.print(sqlToken);
      */
     print(token: SqlPrintToken, level?: number): string;
+    private resolveCommentExportMode;
+    private rendersInlineComments;
+    private shouldRenderComment;
     private appendToken;
     private isCaseContext;
     /**
@@ -118,6 +133,12 @@ export declare class SqlPrinter {
     private shouldSkipToken;
     private applyKeywordCase;
     private handleKeywordToken;
+    private ensureSpaceBeforeKeyword;
+    private ensureTrailingSpace;
+    /**
+     * Normalizes INSERT column list token text when one-line formatting is active.
+     */
+    private tryAppendInsertClauseTokenText;
     private handleCommaToken;
     private handleAndOperatorToken;
     private handleParenthesisToken;
@@ -133,16 +154,41 @@ export declare class SqlPrinter {
      */
     private containsParenExpression;
     private handleJoinClauseToken;
+    /**
+     * Decides whether the current container should collapse into a single line.
+     */
+    private shouldFormatContainerAsOneline;
+    /**
+     * Detects an INSERT column list that must stay on a single line.
+     */
+    private isInsertClauseOneline;
     /**
      * Handles space tokens with context-aware filtering.
      * Skips spaces in CommentBlocks when in specific CTE modes to prevent duplication.
      */
     private handleSpaceToken;
-    /**
-     * Determines whether to skip space tokens in CommentBlocks.
-     * Prevents duplicate spacing in CTE full-oneline mode only.
-     */
-    private shouldSkipCommentBlockSpace;
+    private findPreviousSignificantToken;
+    private shouldSkipSpaceBeforeParenthesis;
+    private shouldAlignCreateTableSelect;
+    private isCreateTableSpacingContext;
+    private isCreateTableNameToken;
+    private isCreateTableConstraintKeyword;
+    private isIdentifierAttachedToConstraint;
+    private printCommentToken;
+    private handleSmartCommentBlockToken;
+    private handleCommentBlockContainer;
+    private normalizeSmartBlockLine;
+    private extractLineCommentContent;
+    private flushSmartCommentBlockBuilder;
+    private collectCommentBlockLines;
+    private extractRawCommentBlockLines;
+    private normalizeCommentForSmart;
+    private buildBlockComment;
+    private getIndentString;
+    private sanitizeCommentLine;
+    private escapeCommentDelimiters;
+    private getCommentBaseIndentLevel;
+    private resolveCommentIndentLevel;
     /**
      * Handles commentNewline tokens with conditional newline behavior.
      * In multiline mode (newline !== ' '), adds a newline after comments.
@@ -155,6 +201,8 @@ export declare class SqlPrinter {
      * Skips in CTE modes to maintain one-line formatting.
      */
     private shouldSkipCommentNewline;
+    private shouldAddNewlineBeforeLeadingComments;
+    private getLeadingCommentIndentLevel;
     /**
      * Determines if the printer is in oneliner mode.
      * Oneliner mode uses single spaces instead of actual newlines.
@@ -174,6 +222,11 @@ export declare class SqlPrinter {
      * Creates a unified oneline printer that formats everything as one line regardless of content type.
      */
     private handleOnelineToken;
+    private getClauseBreakIndentLevel;
+    private isMergeActionContainer;
+    private shouldBreakAfterOpeningParen;
+    private shouldBreakBeforeClosingParen;
+    private shouldConvertSpaceToClauseBreak;
     /**
      * Creates a unified SqlPrinter instance configured for oneline formatting.
      * Works for all oneline options: parentheses, BETWEEN, VALUES, JOIN, CASE, subqueries.