rawsql-ts 0.24.3 → 0.24.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/README.md +10 -1
  2. package/dist/esm/index.min.js +8 -8
  3. package/dist/esm/index.min.js.map +2 -2
  4. package/dist/esm/models/ValueComponent.d.ts +2 -1
  5. package/dist/esm/models/ValueComponent.js +2 -1
  6. package/dist/esm/models/ValueComponent.js.map +1 -1
  7. package/dist/esm/parsers/ParameterDecorator.d.ts +2 -2
  8. package/dist/esm/parsers/ParameterDecorator.js +1 -1
  9. package/dist/esm/parsers/ParameterDecorator.js.map +1 -1
  10. package/dist/esm/parsers/ParameterExpressionParser.js +2 -1
  11. package/dist/esm/parsers/ParameterExpressionParser.js.map +1 -1
  12. package/dist/esm/parsers/SqlPrintTokenParser.d.ts +15 -4
  13. package/dist/esm/parsers/SqlPrintTokenParser.js +65 -12
  14. package/dist/esm/parsers/SqlPrintTokenParser.js.map +1 -1
  15. package/dist/esm/transformers/FormatOptionResolver.js +1 -0
  16. package/dist/esm/transformers/FormatOptionResolver.js.map +1 -1
  17. package/dist/esm/transformers/LinePrinter.d.ts +1 -1
  18. package/dist/esm/transformers/OnelineFormattingHelper.d.ts +1 -0
  19. package/dist/esm/transformers/OnelineFormattingHelper.js.map +1 -1
  20. package/dist/esm/transformers/SqlFormatter.d.ts +9 -5
  21. package/dist/esm/transformers/SqlFormatter.js +4 -4
  22. package/dist/esm/transformers/SqlFormatter.js.map +1 -1
  23. package/dist/esm/transformers/SqlPrinter.d.ts +17 -2
  24. package/dist/esm/transformers/SqlPrinter.js +182 -21
  25. package/dist/esm/transformers/SqlPrinter.js.map +1 -1
  26. package/dist/index.min.js +8 -8
  27. package/dist/index.min.js.map +2 -2
  28. package/dist/models/ValueComponent.js +2 -1
  29. package/dist/models/ValueComponent.js.map +1 -1
  30. package/dist/parsers/ParameterDecorator.js +1 -1
  31. package/dist/parsers/ParameterDecorator.js.map +1 -1
  32. package/dist/parsers/ParameterExpressionParser.js +2 -1
  33. package/dist/parsers/ParameterExpressionParser.js.map +1 -1
  34. package/dist/parsers/SqlPrintTokenParser.js +65 -12
  35. package/dist/parsers/SqlPrintTokenParser.js.map +1 -1
  36. package/dist/src/models/ValueComponent.d.ts +2 -1
  37. package/dist/src/parsers/ParameterDecorator.d.ts +2 -2
  38. package/dist/src/parsers/SqlPrintTokenParser.d.ts +15 -4
  39. package/dist/src/transformers/LinePrinter.d.ts +1 -1
  40. package/dist/src/transformers/OnelineFormattingHelper.d.ts +1 -0
  41. package/dist/src/transformers/SqlFormatter.d.ts +9 -5
  42. package/dist/src/transformers/SqlPrinter.d.ts +17 -2
  43. package/dist/transformers/FormatOptionResolver.js +1 -0
  44. package/dist/transformers/FormatOptionResolver.js.map +1 -1
  45. package/dist/transformers/OnelineFormattingHelper.js.map +1 -1
  46. package/dist/transformers/SqlFormatter.js +5 -3
  47. package/dist/transformers/SqlFormatter.js.map +1 -1
  48. package/dist/transformers/SqlPrinter.js +182 -21
  49. package/dist/transformers/SqlPrinter.js.map +1 -1
  50. package/dist/tsconfig.browser.tsbuildinfo +1 -1
  51. package/package.json +2 -2
@@ -108,12 +108,13 @@ export declare class ParameterExpression extends SqlComponent {
108
108
  static kind: symbol;
109
109
  name: RawString;
110
110
  value: SqlParameterValue;
111
+ sourceText: string | null;
111
112
  /**
112
113
  * The index assigned by the formatter when generating parameterized queries.
113
114
  * Used for naming parameters like $1, $2, etc.
114
115
  */
115
116
  index: number | null;
116
- constructor(name: string, value?: SqlParameterValue);
117
+ constructor(name: string, value?: SqlParameterValue, sourceText?: string | null);
117
118
  }
118
119
  export declare class SwitchCaseArgument extends SqlComponent {
119
120
  static kind: symbol;
@@ -147,10 +147,11 @@ export class LiteralValue extends SqlComponent {
147
147
  }
148
148
  LiteralValue.kind = Symbol("LiteralExpression");
149
149
  export class ParameterExpression extends SqlComponent {
150
- constructor(name, value = null) {
150
+ constructor(name, value = null, sourceText = null) {
151
151
  super();
152
152
  this.name = new RawString(name);
153
153
  this.value = value; // Value is now accepted as a second argument (optional)
154
+ this.sourceText = sourceText;
154
155
  this.index = null;
155
156
  }
156
157
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ValueComponent.js","sourceRoot":"","sources":["../../../src/models/ValueComponent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ValueComponent.js","sourceRoot":"","sources":["../../../src/models/ValueComponent.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,11 @@
5
5
  export declare class ParameterDecorator {
6
6
  prefix: string;
7
7
  suffix: string;
8
- style: 'named' | 'indexed' | 'anonymous';
8
+ style: 'named' | 'indexed' | 'anonymous' | 'original';
9
9
  constructor(options?: {
10
10
  prefix?: string;
11
11
  suffix?: string;
12
- style?: 'named' | 'indexed' | 'anonymous';
12
+ style?: 'named' | 'indexed' | 'anonymous' | 'original';
13
13
  });
14
14
  /**
15
15
  * Decorate a parameter token with DBMS-specific format.
@@ -24,7 +24,7 @@ export class ParameterDecorator {
24
24
  // e.g. $1, ?1, :1
25
25
  paramText = this.prefix + index;
26
26
  }
27
- else if (this.style === 'named') {
27
+ else if (this.style === 'named' || this.style === 'original') {
28
28
  // e.g. :name, @name, ${name}
29
29
  paramText = this.prefix + text + this.suffix;
30
30
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ParameterDecorator.js","sourceRoot":"","sources":["../../../src/parsers/ParameterDecorator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAK3B,YAAY,OAAyF;;QACjG,IAAI,CAAC,MAAM,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,GAAG,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,OAAO,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,IAAY,EAAE,KAAa;QAChC,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;YAC7B,SAAS;YACT,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAClC,kBAAkB;YAClB,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpC,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YAChC,6BAA6B;YAC7B,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QACjD,CAAC;QAED,YAAY;QACZ,IAAI,GAAG,SAAS,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
1
+ {"version":3,"file":"ParameterDecorator.js","sourceRoot":"","sources":["../../../src/parsers/ParameterDecorator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAK3B,YAAY,OAAsG;;QAC9G,IAAI,CAAC,MAAM,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,GAAG,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,OAAO,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,IAAY,EAAE,KAAa;QAChC,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;YAC7B,SAAS;YACT,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAClC,kBAAkB;YAClB,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpC,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAC7D,6BAA6B;YAC7B,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QACjD,CAAC;QAED,YAAY;QACZ,IAAI,GAAG,SAAS,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
@@ -3,6 +3,7 @@ export class ParameterExpressionParser {
3
3
  static parseFromLexeme(lexemes, index) {
4
4
  let idx = index;
5
5
  let paramName = lexemes[idx].value;
6
+ const sourceText = paramName;
6
7
  // Normalize parameter: Remove the parameter symbol and extract the parameter name.
7
8
  if (paramName.startsWith('${') && paramName.endsWith('}')) {
8
9
  // ${name} → name
@@ -12,7 +13,7 @@ export class ParameterExpressionParser {
12
13
  // :name → name
13
14
  paramName = paramName.slice(1);
14
15
  }
15
- const value = new ParameterExpression(paramName);
16
+ const value = new ParameterExpression(paramName, null, sourceText);
16
17
  idx++;
17
18
  return { value, newIndex: idx };
18
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ParameterExpressionParser.js","sourceRoot":"","sources":["../../../src/parsers/ParameterExpressionParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAkB,MAAM,0BAA0B,CAAC;AAE/E,MAAM,OAAO,yBAAyB;IAC3B,MAAM,CAAC,eAAe,CAAC,OAAiB,EAAE,KAAa;QAC1D,IAAI,GAAG,GAAG,KAAK,CAAC;QAChB,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;QAEnC,mFAAmF;QACnF,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxD,iBAAiB;YACjB,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACJ,eAAe;YACf,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACjD,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;IACpC,CAAC;CACJ"}
1
+ {"version":3,"file":"ParameterExpressionParser.js","sourceRoot":"","sources":["../../../src/parsers/ParameterExpressionParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAkB,MAAM,0BAA0B,CAAC;AAE/E,MAAM,OAAO,yBAAyB;IAC3B,MAAM,CAAC,eAAe,CAAC,OAAiB,EAAE,KAAa;QAC1D,IAAI,GAAG,GAAG,KAAK,CAAC;QAChB,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;QACnC,MAAM,UAAU,GAAG,SAAS,CAAC;QAE7B,mFAAmF;QACnF,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxD,iBAAiB;YACjB,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACJ,eAAe;YACf,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACnE,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;IACpC,CAAC;CACJ"}
@@ -9,11 +9,14 @@ import { CreateTableQuery } from "../models/CreateTableQuery";
9
9
  export declare enum ParameterStyle {
10
10
  Anonymous = "anonymous",
11
11
  Indexed = "indexed",
12
- Named = "named"
12
+ Named = "named",
13
+ Original = "original"
13
14
  }
14
15
  export type CastStyle = 'postgres' | 'standard';
15
16
  export type ConstraintStyle = 'postgres' | 'mysql';
16
- export type SourceAliasStyle = 'as' | 'implicit';
17
+ export type AliasKeywordStyle = 'explicit' | 'omit' | 'as' | 'implicit';
18
+ export type SourceAliasStyle = AliasKeywordStyle;
19
+ export type ColumnAliasStyle = AliasKeywordStyle;
17
20
  export type OrderByDefaultDirectionStyle = 'omit' | 'explicit';
18
21
  export interface FormatterConfig {
19
22
  identifierEscape?: {
@@ -26,7 +29,7 @@ export interface FormatterConfig {
26
29
  end: string;
27
30
  };
28
31
  /**
29
- * Parameter style: anonymous (?), indexed ($1), or named (:name)
32
+ * Parameter style: anonymous (?), indexed ($1), named (:name), or original parsed spelling.
30
33
  */
31
34
  parameterStyle?: ParameterStyle;
32
35
  /** Controls how CAST expressions are rendered */
@@ -35,6 +38,8 @@ export interface FormatterConfig {
35
38
  constraintStyle?: ConstraintStyle;
36
39
  /** Controls whether source aliases are rendered with an explicit AS keyword */
37
40
  sourceAliasStyle?: SourceAliasStyle;
41
+ /** Controls whether column aliases are rendered with an explicit AS keyword */
42
+ columnAliasStyle?: ColumnAliasStyle;
38
43
  /** Controls whether the default ASC direction is omitted or rendered explicitly */
39
44
  orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
40
45
  }
@@ -55,6 +60,7 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
55
60
  private castStyle;
56
61
  private constraintStyle;
57
62
  private sourceAliasStyle;
63
+ private columnAliasStyle;
58
64
  private orderByDefaultDirectionStyle;
59
65
  private readonly normalizeJoinConditionOrder;
60
66
  private readonly listContinuationCommentComponents;
@@ -70,10 +76,11 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
70
76
  start: string;
71
77
  end: string;
72
78
  };
73
- parameterStyle?: 'anonymous' | 'indexed' | 'named';
79
+ parameterStyle?: 'anonymous' | 'indexed' | 'named' | 'original';
74
80
  castStyle?: CastStyle;
75
81
  constraintStyle?: ConstraintStyle;
76
82
  sourceAliasStyle?: SourceAliasStyle;
83
+ columnAliasStyle?: ColumnAliasStyle;
77
84
  orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
78
85
  joinConditionOrderByDeclaration?: boolean;
79
86
  });
@@ -219,6 +226,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
219
226
  private visitParenExpression;
220
227
  private visitCastExpression;
221
228
  private visitCaseExpression;
229
+ private removeCaseAfterCommentsDuplicatedOnFirstWhen;
230
+ private normalizeCommentSignature;
222
231
  private extractSwitchAfterComments;
223
232
  private collectCaseLeadingCommentsFromSwitch;
224
233
  private findCaseKeyToken;
@@ -260,6 +269,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
260
269
  private visitTableSource;
261
270
  private visitSourceExpression;
262
271
  private appendSourceAliasKeyword;
272
+ private shouldPrintColumnAliasKeyword;
273
+ private normalizeAliasKeywordStyle;
263
274
  visitFromClause(arg: FromClause): SqlPrintToken;
264
275
  visitJoinClause(arg: JoinClause): SqlPrintToken;
265
276
  visitJoinOnClause(arg: JoinOnClause): SqlPrintToken;
@@ -18,6 +18,7 @@ export var ParameterStyle;
18
18
  ParameterStyle["Anonymous"] = "anonymous";
19
19
  ParameterStyle["Indexed"] = "indexed";
20
20
  ParameterStyle["Named"] = "named";
21
+ ParameterStyle["Original"] = "original";
21
22
  })(ParameterStyle || (ParameterStyle = {}));
22
23
  export const PRESETS = {
23
24
  mysql: {
@@ -155,7 +156,7 @@ export class SqlPrintTokenParser {
155
156
  return this._selfHandlingComponentTypes;
156
157
  }
157
158
  constructor(options) {
158
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
159
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
159
160
  this.handlers = new Map();
160
161
  this.index = 1;
161
162
  this.listContinuationCommentComponents = new WeakSet();
@@ -176,9 +177,10 @@ export class SqlPrintTokenParser {
176
177
  });
177
178
  this.castStyle = (_j = options === null || options === void 0 ? void 0 : options.castStyle) !== null && _j !== void 0 ? _j : 'standard';
178
179
  this.constraintStyle = (_k = options === null || options === void 0 ? void 0 : options.constraintStyle) !== null && _k !== void 0 ? _k : 'postgres';
179
- this.sourceAliasStyle = (_l = options === null || options === void 0 ? void 0 : options.sourceAliasStyle) !== null && _l !== void 0 ? _l : 'as';
180
- this.orderByDefaultDirectionStyle = (_m = options === null || options === void 0 ? void 0 : options.orderByDefaultDirectionStyle) !== null && _m !== void 0 ? _m : 'omit';
181
- this.normalizeJoinConditionOrder = (_o = options === null || options === void 0 ? void 0 : options.joinConditionOrderByDeclaration) !== null && _o !== void 0 ? _o : false;
180
+ this.sourceAliasStyle = this.normalizeAliasKeywordStyle(options === null || options === void 0 ? void 0 : options.sourceAliasStyle);
181
+ this.columnAliasStyle = this.normalizeAliasKeywordStyle(options === null || options === void 0 ? void 0 : options.columnAliasStyle);
182
+ this.orderByDefaultDirectionStyle = (_l = options === null || options === void 0 ? void 0 : options.orderByDefaultDirectionStyle) !== null && _l !== void 0 ? _l : 'omit';
183
+ this.normalizeJoinConditionOrder = (_m = options === null || options === void 0 ? void 0 : options.joinConditionOrderByDeclaration) !== null && _m !== void 0 ? _m : false;
182
184
  this.handlers.set(ValueList.kind, (expr) => this.visitValueList(expr));
183
185
  this.handlers.set(ColumnReference.kind, (expr) => this.visitColumnReference(expr));
184
186
  this.handlers.set(QualifiedName.kind, (expr) => this.visitQualifiedName(expr));
@@ -390,7 +392,13 @@ export class SqlPrintTokenParser {
390
392
  for (let i = 0; i < arg.order.length; i++) {
391
393
  if (i > 0)
392
394
  token.innerTokens.push(...SqlPrintTokenParser.commaSpaceTokens());
393
- token.innerTokens.push(this.visit(arg.order[i]));
395
+ const item = arg.order[i];
396
+ token.innerTokens.push(this.visit(item));
397
+ if (!(item instanceof OrderByItem) &&
398
+ this.orderByDefaultDirectionStyle === 'explicit') {
399
+ token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
400
+ token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'asc'));
401
+ }
394
402
  }
395
403
  return token;
396
404
  }
@@ -431,7 +439,7 @@ export class SqlPrintTokenParser {
431
439
  const token = this.visit(arg);
432
440
  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); });
433
441
  const style = this.parameterDecorator.style;
434
- if (style === ParameterStyle.Named) {
442
+ if (style === ParameterStyle.Named || style === ParameterStyle.Original) {
435
443
  // Named: { name: value, ... }
436
444
  const paramsObj = {};
437
445
  for (const p of paramsRaw) {
@@ -1078,7 +1086,9 @@ export class SqlPrintTokenParser {
1078
1086
  visitParameterExpression(arg) {
1079
1087
  // Create a parameter token and decorate it using the parameterDecorator
1080
1088
  arg.index = this.index;
1081
- const text = this.parameterDecorator.decorate(arg.name.value, arg.index);
1089
+ const text = this.parameterDecorator.style === ParameterStyle.Original && arg.sourceText
1090
+ ? arg.sourceText
1091
+ : this.parameterDecorator.decorate(arg.name.value, arg.index);
1082
1092
  const token = new SqlPrintToken(SqlPrintTokenType.parameter, text);
1083
1093
  this.addComponentComments(token, arg);
1084
1094
  this.index++;
@@ -1255,6 +1265,7 @@ export class SqlPrintTokenParser {
1255
1265
  const token = new SqlPrintToken(SqlPrintTokenType.container, '', SqlPrintTokenContainerType.CaseExpression);
1256
1266
  // Handle positioned comments for CaseExpression (unified spec: positioned comments only)
1257
1267
  if (arg.positionedComments && arg.positionedComments.length > 0) {
1268
+ this.removeCaseAfterCommentsDuplicatedOnFirstWhen(arg);
1258
1269
  this.addPositionedCommentsToToken(token, arg);
1259
1270
  // Clear positioned comments to prevent duplicate processing
1260
1271
  arg.positionedComments = null;
@@ -1289,6 +1300,32 @@ export class SqlPrintTokenParser {
1289
1300
  }
1290
1301
  return token;
1291
1302
  }
1303
+ removeCaseAfterCommentsDuplicatedOnFirstWhen(arg) {
1304
+ var _a, _b;
1305
+ if (!arg.positionedComments || arg.positionedComments.length === 0) {
1306
+ return;
1307
+ }
1308
+ const firstWhenComments = new Set(((_b = (_a = arg.switchCase.cases[0]) === null || _a === void 0 ? void 0 : _a.getPositionedComments('before')) !== null && _b !== void 0 ? _b : [])
1309
+ .map(comment => this.normalizeCommentSignature(comment)));
1310
+ if (firstWhenComments.size === 0) {
1311
+ return;
1312
+ }
1313
+ const retained = [];
1314
+ for (const entry of arg.positionedComments) {
1315
+ if (entry.position !== 'after') {
1316
+ retained.push(entry);
1317
+ continue;
1318
+ }
1319
+ const comments = entry.comments.filter(comment => !firstWhenComments.has(this.normalizeCommentSignature(comment)));
1320
+ if (comments.length > 0) {
1321
+ retained.push(Object.assign(Object.assign({}, entry), { comments }));
1322
+ }
1323
+ }
1324
+ arg.positionedComments = retained.length > 0 ? retained : null;
1325
+ }
1326
+ normalizeCommentSignature(comment) {
1327
+ return comment.replace(/\s+/g, ' ').trim();
1328
+ }
1292
1329
  extractSwitchAfterComments(arg) {
1293
1330
  if (!arg.positionedComments || arg.positionedComments.length === 0) {
1294
1331
  return [];
@@ -1650,6 +1687,8 @@ export class SqlPrintTokenParser {
1650
1687
  token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
1651
1688
  // Handle AS keyword positioned comments (before AS)
1652
1689
  const asKeywordPositionedComments = 'asKeywordPositionedComments' in arg ? arg.asKeywordPositionedComments : null;
1690
+ const asKeywordComments = 'asKeywordComments' in arg ? arg.asKeywordComments : null;
1691
+ const shouldPrintAsKeyword = this.shouldPrintColumnAliasKeyword(asKeywordPositionedComments, asKeywordComments);
1653
1692
  if (asKeywordPositionedComments) {
1654
1693
  const beforeComments = asKeywordPositionedComments.filter((pc) => pc.position === 'before');
1655
1694
  if (beforeComments.length > 0) {
@@ -1660,9 +1699,11 @@ export class SqlPrintTokenParser {
1660
1699
  }
1661
1700
  }
1662
1701
  }
1663
- token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
1702
+ if (shouldPrintAsKeyword) {
1703
+ token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
1704
+ }
1664
1705
  // Handle AS keyword positioned comments (after AS)
1665
- if (asKeywordPositionedComments) {
1706
+ if (shouldPrintAsKeyword && asKeywordPositionedComments) {
1666
1707
  const afterComments = asKeywordPositionedComments.filter((pc) => pc.position === 'after');
1667
1708
  if (afterComments.length > 0) {
1668
1709
  token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
@@ -1673,13 +1714,14 @@ export class SqlPrintTokenParser {
1673
1714
  }
1674
1715
  }
1675
1716
  // Fallback: Add AS keyword legacy comments if present
1676
- const asKeywordComments = 'asKeywordComments' in arg ? arg.asKeywordComments : null;
1677
1717
  if (asKeywordComments && asKeywordComments.length > 0) {
1678
1718
  token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
1679
1719
  const commentTokens = this.createInlineCommentSequence(asKeywordComments);
1680
1720
  token.innerTokens.push(...commentTokens);
1681
1721
  }
1682
- token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
1722
+ if (shouldPrintAsKeyword) {
1723
+ token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
1724
+ }
1683
1725
  // Visit identifier to get alias with proper spacing
1684
1726
  const identifierToken = this.visit(arg.identifier);
1685
1727
  token.innerTokens.push(identifierToken);
@@ -1854,12 +1896,23 @@ export class SqlPrintTokenParser {
1854
1896
  }
1855
1897
  }
1856
1898
  appendSourceAliasKeyword(token) {
1857
- if (this.sourceAliasStyle === 'implicit') {
1899
+ if (this.sourceAliasStyle === 'omit') {
1858
1900
  return;
1859
1901
  }
1860
1902
  token.innerTokens.push(new SqlPrintToken(SqlPrintTokenType.keyword, 'as'));
1861
1903
  token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
1862
1904
  }
1905
+ shouldPrintColumnAliasKeyword(asKeywordPositionedComments, asKeywordComments) {
1906
+ if (this.columnAliasStyle === 'explicit') {
1907
+ return true;
1908
+ }
1909
+ const hasPositionedComments = Array.isArray(asKeywordPositionedComments) && asKeywordPositionedComments.length > 0;
1910
+ const hasLegacyComments = Array.isArray(asKeywordComments) && asKeywordComments.length > 0;
1911
+ return hasPositionedComments || hasLegacyComments;
1912
+ }
1913
+ normalizeAliasKeywordStyle(style) {
1914
+ return style === 'implicit' || style === 'omit' ? 'omit' : 'explicit';
1915
+ }
1863
1916
  visitFromClause(arg) {
1864
1917
  // Build a declaration order map so JOIN ON operands can be normalized later.
1865
1918
  let contextPushed = false;