rawsql-ts 0.24.0 → 0.24.1

package/dist/parsers/SqlPrintTokenParser.js

@@ -157,7 +157,7 @@ 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 = [];
@@ -177,7 +177,9 @@ 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(ValueComponent_1.ValueList.kind, (expr) => this.visitValueList(expr));
         this.handlers.set(ValueComponent_1.ColumnReference.kind, (expr) => this.visitColumnReference(expr));
         this.handlers.set(ValueComponent_1.QualifiedName.kind, (expr) => this.visitQualifiedName(expr));
@@ -403,6 +405,10 @@ class SqlPrintTokenParser {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'desc'));
         }
+        else if (this.orderByDefaultDirectionStyle === 'explicit') {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'asc'));
+        }
         if (arg.nullsPosition) {
             if (arg.nullsPosition === Clause_1.NullsSortDirection.First) {
                 token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
@@ -1772,8 +1778,7 @@ class SqlPrintTokenParser {
                 return token;
             }
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
-            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'as'));
-            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            this.appendSourceAliasKeyword(token);
             // exclude column aliases
             token.innerTokens.push(arg.aliasExpression.accept(this));
             return token;
@@ -1781,13 +1786,19 @@ class SqlPrintTokenParser {
         else {
             // For other source types, just print the alias
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
-            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.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_1.SqlPrintToken(SqlPrintToken_1.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;