rawsql-ts 0.24.0 → 0.24.1

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

@@ -13,6 +13,8 @@ export declare enum ParameterStyle {
 }
 export type CastStyle = 'postgres' | 'standard';
 export type ConstraintStyle = 'postgres' | 'mysql';
+export type SourceAliasStyle = 'as' | 'implicit';
+export type OrderByDefaultDirectionStyle = 'omit' | 'explicit';
 export interface FormatterConfig {
     identifierEscape?: {
         start: string;
@@ -31,6 +33,10 @@ export interface FormatterConfig {
     castStyle?: CastStyle;
     /** Controls how table/column constraints are rendered */
     constraintStyle?: ConstraintStyle;
+    /** Controls whether source aliases are rendered with an explicit AS keyword */
+    sourceAliasStyle?: SourceAliasStyle;
+    /** Controls whether the default ASC direction is omitted or rendered explicitly */
+    orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
 }
 export declare const PRESETS: Record<string, FormatterConfig>;
 export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrintToken> {
@@ -48,6 +54,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     index: number;
     private castStyle;
     private constraintStyle;
+    private sourceAliasStyle;
+    private orderByDefaultDirectionStyle;
     private readonly normalizeJoinConditionOrder;
     private joinConditionContexts;
     constructor(options?: {
@@ -64,6 +72,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
         parameterStyle?: 'anonymous' | 'indexed' | 'named';
         castStyle?: CastStyle;
         constraintStyle?: ConstraintStyle;
+        sourceAliasStyle?: SourceAliasStyle;
+        orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
         joinConditionOrderByDeclaration?: boolean;
     });
     /**
@@ -246,6 +256,7 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     private visitDistinctOn;
     private visitTableSource;
     private visitSourceExpression;
+    private appendSourceAliasKeyword;
     visitFromClause(arg: FromClause): SqlPrintToken;
     visitJoinClause(arg: JoinClause): SqlPrintToken;
     visitJoinOnClause(arg: JoinOnClause): SqlPrintToken;

package/dist/esm/parsers/SqlPrintTokenParser.js

@@ -154,7 +154,7 @@ export class SqlPrintTokenParser {
         return this._selfHandlingComponentTypes;
     }
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         this.handlers = new Map();
         this.index = 1;
         this.joinConditionContexts = [];
@@ -174,7 +174,9 @@ 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.normalizeJoinConditionOrder = (_l = options === null || options === void 0 ? void 0 : options.joinConditionOrderByDeclaration) !== null && _l !== void 0 ? _l : false;
+        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.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));
@@ -400,6 +402,10 @@ export class SqlPrintTokenParser {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'desc'));
         }
+        else if (this.orderByDefaultDirectionStyle === 'explicit') {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'asc'));
+        }
         if (arg.nullsPosition) {
             if (arg.nullsPosition === NullsSortDirection.First) {
                 token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
@@ -1769,8 +1775,7 @@ export class SqlPrintTokenParser {
                 return token;
             }
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
-            token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
-            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            this.appendSourceAliasKeyword(token);
             // exclude column aliases
             token.innerTokens.push(arg.aliasExpression.accept(this));
             return token;
@@ -1778,13 +1783,19 @@ export class SqlPrintTokenParser {
         else {
             // For other source types, just print the alias
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
-            token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
-            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            this.appendSourceAliasKeyword(token);
             // included column aliases
             token.innerTokens.push(arg.aliasExpression.accept(this));
             return token;
         }
     }
+    appendSourceAliasKeyword(token) {
+        if (this.sourceAliasStyle === 'implicit') {
+            return;
+        }
+        token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
+        token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+    }
     visitFromClause(arg) {
         // Build a declaration order map so JOIN ON operands can be normalized later.
         let contextPushed = false;