rawsql-ts 0.24.2 → 0.24.4

package/dist/esm/parsers/SqlPrintTokenParser.d.ts

@@ -9,11 +9,14 @@ import { CreateTableQuery } from "../models/CreateTableQuery";
 export declare enum ParameterStyle {
     Anonymous = "anonymous",
     Indexed = "indexed",
-    Named = "named"
+    Named = "named",
+    Original = "original"
 }
 export type CastStyle = 'postgres' | 'standard';
 export type ConstraintStyle = 'postgres' | 'mysql';
-export type SourceAliasStyle = 'as' | 'implicit';
+export type AliasKeywordStyle = 'explicit' | 'omit' | 'as' | 'implicit';
+export type SourceAliasStyle = AliasKeywordStyle;
+export type ColumnAliasStyle = AliasKeywordStyle;
 export type OrderByDefaultDirectionStyle = 'omit' | 'explicit';
 export interface FormatterConfig {
     identifierEscape?: {
@@ -26,7 +29,7 @@ export interface FormatterConfig {
         end: string;
     };
     /**
-     * Parameter style: anonymous (?), indexed ($1), or named (:name)
+     * Parameter style: anonymous (?), indexed ($1), named (:name), or original parsed spelling.
      */
     parameterStyle?: ParameterStyle;
     /** Controls how CAST expressions are rendered */
@@ -35,6 +38,8 @@ export interface FormatterConfig {
     constraintStyle?: ConstraintStyle;
     /** Controls whether source aliases are rendered with an explicit AS keyword */
     sourceAliasStyle?: SourceAliasStyle;
+    /** Controls whether column aliases are rendered with an explicit AS keyword */
+    columnAliasStyle?: ColumnAliasStyle;
     /** Controls whether the default ASC direction is omitted or rendered explicitly */
     orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
 }
@@ -55,8 +60,10 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     private castStyle;
     private constraintStyle;
     private sourceAliasStyle;
+    private columnAliasStyle;
     private orderByDefaultDirectionStyle;
     private readonly normalizeJoinConditionOrder;
+    private readonly listContinuationCommentComponents;
     private joinConditionContexts;
     constructor(options?: {
         preset?: FormatterConfig;
@@ -69,10 +76,11 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
             start: string;
             end: string;
         };
-        parameterStyle?: 'anonymous' | 'indexed' | 'named';
+        parameterStyle?: 'anonymous' | 'indexed' | 'named' | 'original';
         castStyle?: CastStyle;
         constraintStyle?: ConstraintStyle;
         sourceAliasStyle?: SourceAliasStyle;
+        columnAliasStyle?: ColumnAliasStyle;
         orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
         joinConditionOrderByDeclaration?: boolean;
     });
@@ -218,6 +226,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     private visitParenExpression;
     private visitCastExpression;
     private visitCaseExpression;
+    private removeCaseAfterCommentsDuplicatedOnFirstWhen;
+    private normalizeCommentSignature;
     private extractSwitchAfterComments;
     private collectCaseLeadingCommentsFromSwitch;
     private findCaseKeyToken;
@@ -249,6 +259,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
      */
     private visitWindowFrameBoundStatic;
     private visitSelectItem;
+    private collectCaseSelectItemDuplicateAfterComments;
+    private filterCaseSelectItemDuplicateAfterComments;
     private visitSelectClause;
     private flattenTokenText;
     private visitHintClause;
@@ -257,6 +269,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     private visitTableSource;
     private visitSourceExpression;
     private appendSourceAliasKeyword;
+    private shouldPrintColumnAliasKeyword;
+    private normalizeAliasKeywordStyle;
     visitFromClause(arg: FromClause): SqlPrintToken;
     visitJoinClause(arg: JoinClause): SqlPrintToken;
     visitJoinOnClause(arg: JoinOnClause): SqlPrintToken;

package/dist/esm/parsers/SqlPrintTokenParser.js

@@ -18,6 +18,7 @@ export var ParameterStyle;
     ParameterStyle["Anonymous"] = "anonymous";
     ParameterStyle["Indexed"] = "indexed";
     ParameterStyle["Named"] = "named";
+    ParameterStyle["Original"] = "original";
 })(ParameterStyle || (ParameterStyle = {}));
 export const PRESETS = {
     mysql: {
@@ -138,6 +139,7 @@ export class SqlPrintTokenParser {
             this._selfHandlingComponentTypes = new Set([
                 SimpleSelectQuery.kind,
                 SelectItem.kind,
+                OrderByItem.kind,
                 CaseKeyValuePair.kind,
                 SwitchCaseArgument.kind,
                 ColumnReference.kind,
@@ -154,9 +156,10 @@ export class SqlPrintTokenParser {
         return this._selfHandlingComponentTypes;
     }
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         this.handlers = new Map();
         this.index = 1;
+        this.listContinuationCommentComponents = new WeakSet();
         this.joinConditionContexts = [];
         if (options === null || options === void 0 ? void 0 : options.preset) {
             const preset = options.preset;
@@ -174,9 +177,10 @@ export class SqlPrintTokenParser {
         });
         this.castStyle = (_j = options === null || options === void 0 ? void 0 : options.castStyle) !== null && _j !== void 0 ? _j : 'standard';
         this.constraintStyle = (_k = options === null || options === void 0 ? void 0 : options.constraintStyle) !== null && _k !== void 0 ? _k : 'postgres';
-        this.sourceAliasStyle = (_l = options === null || options === void 0 ? void 0 : options.sourceAliasStyle) !== null && _l !== void 0 ? _l : 'as';
-        this.orderByDefaultDirectionStyle = (_m = options === null || options === void 0 ? void 0 : options.orderByDefaultDirectionStyle) !== null && _m !== void 0 ? _m : 'omit';
-        this.normalizeJoinConditionOrder = (_o = options === null || options === void 0 ? void 0 : options.joinConditionOrderByDeclaration) !== null && _o !== void 0 ? _o : false;
+        this.sourceAliasStyle = this.normalizeAliasKeywordStyle(options === null || options === void 0 ? void 0 : options.sourceAliasStyle);
+        this.columnAliasStyle = this.normalizeAliasKeywordStyle(options === null || options === void 0 ? void 0 : options.columnAliasStyle);
+        this.orderByDefaultDirectionStyle = (_l = options === null || options === void 0 ? void 0 : options.orderByDefaultDirectionStyle) !== null && _l !== void 0 ? _l : 'omit';
+        this.normalizeJoinConditionOrder = (_m = options === null || options === void 0 ? void 0 : options.joinConditionOrderByDeclaration) !== null && _m !== void 0 ? _m : false;
         this.handlers.set(ValueList.kind, (expr) => this.visitValueList(expr));
         this.handlers.set(ColumnReference.kind, (expr) => this.visitColumnReference(expr));
         this.handlers.set(QualifiedName.kind, (expr) => this.visitQualifiedName(expr));
@@ -346,6 +350,7 @@ export class SqlPrintTokenParser {
     }
     visitQualifiedName(arg) {
         const token = new SqlPrintToken(SqlPrintTokenType.container, '', SqlPrintTokenContainerType.QualifiedName);
+        const hasOwnComments = this.hasPositionedComments(arg) || this.hasLegacyComments(arg);
         if (arg.namespaces) {
             for (let i = 0; i < arg.namespaces.length; i++) {
                 token.innerTokens.push(arg.namespaces[i].accept(this));
@@ -366,7 +371,7 @@ export class SqlPrintTokenParser {
         arg.name.positionedComments = originalNameComments;
         arg.name.comments = originalNameLegacyComments;
         // Apply the name's comments to the qualified name token
-        if (this.hasPositionedComments(arg.name) || this.hasLegacyComments(arg.name)) {
+        if (!hasOwnComments && (this.hasPositionedComments(arg.name) || this.hasLegacyComments(arg.name))) {
             this.addComponentComments(token, arg.name);
         }
         // Also handle any comments directly on the QualifiedName itself
@@ -387,7 +392,13 @@ export class SqlPrintTokenParser {
         for (let i = 0; i < arg.order.length; i++) {
             if (i > 0)
                 token.innerTokens.push(...SqlPrintTokenParser.commaSpaceTokens());
-            token.innerTokens.push(this.visit(arg.order[i]));
+            const item = arg.order[i];
+            token.innerTokens.push(this.visit(item));
+            if (!(item instanceof OrderByItem) &&
+                this.orderByDefaultDirectionStyle === 'explicit') {
+                token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+                token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'asc'));
+            }
         }
         return token;
     }
@@ -416,6 +427,10 @@ export class SqlPrintTokenParser {
                 token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'nulls last'));
             }
         }
+        if (arg.comments && arg.comments.length > 0) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(...this.createInlineCommentSequence(arg.comments));
+        }
         return token;
     }
     parse(arg) {
@@ -424,7 +439,7 @@ export class SqlPrintTokenParser {
         const token = this.visit(arg);
         const paramsRaw = ParameterCollector.collect(arg).sort((a, b) => { var _a, _b; return ((_a = a.index) !== null && _a !== void 0 ? _a : 0) - ((_b = b.index) !== null && _b !== void 0 ? _b : 0); });
         const style = this.parameterDecorator.style;
-        if (style === ParameterStyle.Named) {
+        if (style === ParameterStyle.Named || style === ParameterStyle.Original) {
             // Named: { name: value, ... }
             const paramsObj = {};
             for (const p of paramsRaw) {
@@ -894,7 +909,18 @@ export class SqlPrintTokenParser {
     }
     visitColumnReference(arg) {
         const token = new SqlPrintToken(SqlPrintTokenType.container, '', SqlPrintTokenContainerType.ColumnReference);
+        const hasOwnComments = this.hasPositionedComments(arg) || this.hasLegacyComments(arg);
+        const originalNamePositionedComments = arg.qualifiedName.name.positionedComments;
+        const originalNameComments = arg.qualifiedName.name.comments;
+        if (hasOwnComments) {
+            arg.qualifiedName.name.positionedComments = null;
+            arg.qualifiedName.name.comments = null;
+        }
         token.innerTokens.push(arg.qualifiedName.accept(this));
+        if (hasOwnComments) {
+            arg.qualifiedName.name.positionedComments = originalNamePositionedComments;
+            arg.qualifiedName.name.comments = originalNameComments;
+        }
         this.addComponentComments(token, arg);
         return token;
     }
@@ -1060,7 +1086,9 @@ export class SqlPrintTokenParser {
     visitParameterExpression(arg) {
         // Create a parameter token and decorate it using the parameterDecorator
         arg.index = this.index;
-        const text = this.parameterDecorator.decorate(arg.name.value, arg.index);
+        const text = this.parameterDecorator.style === ParameterStyle.Original && arg.sourceText
+            ? arg.sourceText
+            : this.parameterDecorator.decorate(arg.name.value, arg.index);
         const token = new SqlPrintToken(SqlPrintTokenType.parameter, text);
         this.addComponentComments(token, arg);
         this.index++;
@@ -1166,6 +1194,7 @@ export class SqlPrintTokenParser {
         return token;
     }
     visitParenExpression(arg) {
+        var _a, _b;
         const token = new SqlPrintToken(SqlPrintTokenType.container, '', SqlPrintTokenContainerType.ParenExpression);
         // Handle positioned comments for ParenExpression - check both self and inner expression
         const hasOwnComments = arg.positionedComments && arg.positionedComments.length > 0;
@@ -1178,6 +1207,11 @@ export class SqlPrintTokenParser {
             innerAfterComments = arg.expression.getPositionedComments('after');
             arg.expression.positionedComments = null;
         }
+        if (hasOwnComments && innerBeforeComments.length > 0) {
+            const innerBeforeSet = new Set(innerBeforeComments);
+            arg.positionedComments = (_b = (_a = arg.positionedComments) === null || _a === void 0 ? void 0 : _a.map(comment => comment.position === 'after'
+                ? Object.assign(Object.assign({}, comment), { comments: comment.comments.filter(value => !innerBeforeSet.has(value)) }) : comment).filter(comment => comment.comments.length > 0)) !== null && _b !== void 0 ? _b : null;
+        }
         // Build basic structure first
         token.innerTokens.push(SqlPrintTokenParser.PAREN_OPEN_TOKEN);
         token.innerTokens.push(this.visit(arg.expression));
@@ -1231,6 +1265,7 @@ export class SqlPrintTokenParser {
         const token = new SqlPrintToken(SqlPrintTokenType.container, '', SqlPrintTokenContainerType.CaseExpression);
         // Handle positioned comments for CaseExpression (unified spec: positioned comments only)
         if (arg.positionedComments && arg.positionedComments.length > 0) {
+            this.removeCaseAfterCommentsDuplicatedOnFirstWhen(arg);
             this.addPositionedCommentsToToken(token, arg);
             // Clear positioned comments to prevent duplicate processing
             arg.positionedComments = null;
@@ -1243,7 +1278,6 @@ export class SqlPrintTokenParser {
             promotedComments.push(...this.collectCaseLeadingCommentBlocks(conditionToken));
         }
         const switchToken = this.visit(arg.switchCase);
-        promotedComments.push(...this.collectCaseLeadingCommentsFromSwitch(switchToken));
         if (promotedComments.length > 0) {
             token.innerTokens.push(...promotedComments);
         }
@@ -1266,6 +1300,32 @@ export class SqlPrintTokenParser {
         }
         return token;
     }
+    removeCaseAfterCommentsDuplicatedOnFirstWhen(arg) {
+        var _a, _b;
+        if (!arg.positionedComments || arg.positionedComments.length === 0) {
+            return;
+        }
+        const firstWhenComments = new Set(((_b = (_a = arg.switchCase.cases[0]) === null || _a === void 0 ? void 0 : _a.getPositionedComments('before')) !== null && _b !== void 0 ? _b : [])
+            .map(comment => this.normalizeCommentSignature(comment)));
+        if (firstWhenComments.size === 0) {
+            return;
+        }
+        const retained = [];
+        for (const entry of arg.positionedComments) {
+            if (entry.position !== 'after') {
+                retained.push(entry);
+                continue;
+            }
+            const comments = entry.comments.filter(comment => !firstWhenComments.has(this.normalizeCommentSignature(comment)));
+            if (comments.length > 0) {
+                retained.push(Object.assign(Object.assign({}, entry), { comments }));
+            }
+        }
+        arg.positionedComments = retained.length > 0 ? retained : null;
+    }
+    normalizeCommentSignature(comment) {
+        return comment.replace(/\s+/g, ' ').trim();
+    }
     extractSwitchAfterComments(arg) {
         if (!arg.positionedComments || arg.positionedComments.length === 0) {
             return [];
@@ -1587,11 +1647,13 @@ export class SqlPrintTokenParser {
         // Add positioned comments in recorded order
         const beforeComments = arg.getPositionedComments('before');
         const afterComments = arg.getPositionedComments('after');
+        const duplicateCaseAfterComments = arg.value instanceof CaseExpression
+            ? this.collectCaseSelectItemDuplicateAfterComments(arg.value)
+            : new Set();
         if (beforeComments.length > 0) {
-            if (arg.value instanceof CaseExpression) {
+            if (arg.value instanceof CaseExpression || this.listContinuationCommentComponents.has(arg)) {
                 const commentBlocks = this.createCommentBlocks(beforeComments);
                 token.innerTokens.push(...commentBlocks);
-                token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.commentNewline, ''));
             }
             else {
                 const commentTokens = this.createInlineCommentSequence(beforeComments);
@@ -1600,9 +1662,12 @@ export class SqlPrintTokenParser {
             }
         }
         token.innerTokens.push(this.visit(arg.value));
-        if (afterComments.length > 0 && !isParenExpression) {
+        const visibleAfterComments = arg.value instanceof CaseExpression
+            ? this.filterCaseSelectItemDuplicateAfterComments(afterComments, duplicateCaseAfterComments)
+            : afterComments;
+        if (visibleAfterComments.length > 0 && !isParenExpression) {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
-            const commentTokens = this.createInlineCommentSequence(afterComments);
+            const commentTokens = this.createInlineCommentSequence(visibleAfterComments);
             token.innerTokens.push(...commentTokens);
         }
         // Restore original positioned comments to avoid side effects
@@ -1622,6 +1687,8 @@ export class SqlPrintTokenParser {
         token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
         // Handle AS keyword positioned comments (before AS)
         const asKeywordPositionedComments = 'asKeywordPositionedComments' in arg ? arg.asKeywordPositionedComments : null;
+        const asKeywordComments = 'asKeywordComments' in arg ? arg.asKeywordComments : null;
+        const shouldPrintAsKeyword = this.shouldPrintColumnAliasKeyword(asKeywordPositionedComments, asKeywordComments);
         if (asKeywordPositionedComments) {
             const beforeComments = asKeywordPositionedComments.filter((pc) => pc.position === 'before');
             if (beforeComments.length > 0) {
@@ -1632,9 +1699,11 @@ export class SqlPrintTokenParser {
                 }
             }
         }
-        token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
+        if (shouldPrintAsKeyword) {
+            token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
+        }
         // Handle AS keyword positioned comments (after AS)
-        if (asKeywordPositionedComments) {
+        if (shouldPrintAsKeyword && asKeywordPositionedComments) {
             const afterComments = asKeywordPositionedComments.filter((pc) => pc.position === 'after');
             if (afterComments.length > 0) {
                 token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
@@ -1645,13 +1714,14 @@ export class SqlPrintTokenParser {
             }
         }
         // Fallback: Add AS keyword legacy comments if present
-        const asKeywordComments = 'asKeywordComments' in arg ? arg.asKeywordComments : null;
         if (asKeywordComments && asKeywordComments.length > 0) {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             const commentTokens = this.createInlineCommentSequence(asKeywordComments);
             token.innerTokens.push(...commentTokens);
         }
-        token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        if (shouldPrintAsKeyword) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        }
         // Visit identifier to get alias with proper spacing
         const identifierToken = this.visit(arg.identifier);
         token.innerTokens.push(identifierToken);
@@ -1676,6 +1746,34 @@ export class SqlPrintTokenParser {
         }
         return token;
     }
+    collectCaseSelectItemDuplicateAfterComments(value) {
+        const promoted = new Set();
+        if (value.comments) {
+            for (const comment of value.comments) {
+                promoted.add(comment);
+            }
+        }
+        const firstCase = value.switchCase.cases[0];
+        if (firstCase === null || firstCase === void 0 ? void 0 : firstCase.positionedComments) {
+            for (const positionedComment of firstCase.positionedComments) {
+                if (positionedComment.position === 'before') {
+                    for (const comment of positionedComment.comments) {
+                        promoted.add(comment);
+                    }
+                }
+            }
+        }
+        return promoted;
+    }
+    filterCaseSelectItemDuplicateAfterComments(afterComments, promoted) {
+        if (afterComments.length === 0) {
+            return afterComments;
+        }
+        if (promoted.size === 0) {
+            return afterComments;
+        }
+        return afterComments.filter(comment => !promoted.has(comment));
+    }
     visitSelectClause(arg) {
         const token = new SqlPrintToken(SqlPrintTokenType.keyword, 'select', SqlPrintTokenContainerType.SelectClause);
         // Handle positioned comments for SelectClause (unified spec)
@@ -1711,6 +1809,14 @@ export class SqlPrintTokenParser {
         for (let i = 0; i < arg.items.length; i++) {
             if (i > 0) {
                 token.innerTokens.push(...SqlPrintTokenParser.commaSpaceTokens());
+                this.listContinuationCommentComponents.add(arg.items[i]);
+                try {
+                    token.innerTokens.push(this.visit(arg.items[i]));
+                }
+                finally {
+                    this.listContinuationCommentComponents.delete(arg.items[i]);
+                }
+                continue;
             }
             token.innerTokens.push(this.visit(arg.items[i]));
         }
@@ -1790,12 +1896,23 @@ export class SqlPrintTokenParser {
         }
     }
     appendSourceAliasKeyword(token) {
-        if (this.sourceAliasStyle === 'implicit') {
+        if (this.sourceAliasStyle === 'omit') {
             return;
         }
         token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
         token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
     }
+    shouldPrintColumnAliasKeyword(asKeywordPositionedComments, asKeywordComments) {
+        if (this.columnAliasStyle === 'explicit') {
+            return true;
+        }
+        const hasPositionedComments = Array.isArray(asKeywordPositionedComments) && asKeywordPositionedComments.length > 0;
+        const hasLegacyComments = Array.isArray(asKeywordComments) && asKeywordComments.length > 0;
+        return hasPositionedComments || hasLegacyComments;
+    }
+    normalizeAliasKeywordStyle(style) {
+        return style === 'implicit' || style === 'omit' ? 'omit' : 'explicit';
+    }
     visitFromClause(arg) {
         // Build a declaration order map so JOIN ON operands can be normalized later.
         let contextPushed = false;