rawsql-ts 0.11.36-beta → 0.11.38-beta

package/dist/src/index.d.ts

@@ -16,6 +16,7 @@ export * from './transformers/CTEDisabler';
 export * from './transformers/CTEDependencyAnalyzer';
 export * from './transformers/CTETableReferenceCollector';
 export * from './transformers/CTEQueryDecomposer';
+export type { CTERestorationResult } from './transformers/CTEQueryDecomposer';
 export * from './transformers/CTEComposer';
 export * from './transformers/CTERenamer';
 export * from './transformers/AliasRenamer';

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oCAAoC;AACpC,8DAA4C;AAE5C,8DAA4C;AAC5C,6DAA2C;AAE3C,6DAA2C;AAC3C,uDAAqC;AACrC,wDAAsC;AACtC,0DAAwC;AACxC,uDAAqC;AACrC,oDAAkC;AAClC,kDAAgC;AAChC,4DAA0C;AAE1C,8DAA4C;AAC5C,+DAA6C;AAC7C,6DAA2C;AAC3C,uEAAqD;AACrD,4EAA0D;AAC1D,oEAAkD;AAClD,6DAA2C;AAC3C,4DAA0C;AAC1C,8DAA4C;AAC5C,8DAA4C;AAC5C,sEAAoD;AACpD,sEAAoD;AAEpD,0EAAwD;AACxD,2DAAyC;AACzC,8DAA4C;AAC5C,0EAAwD;AACxD,8DAA4C,CAAC,0BAA0B;AACvE,sEAAoD;AACpD,2EAAyD;AACzD,sFAAkF;AAAzE,mIAAA,sBAAsB,OAAA;AAC/B,yEAAuD;AACvD,qEAAmD;AACnD,qEAAmD;AACnD,sEAAoD;AACpD,sEAAoD;AACpD,qEAAmD;AACnD,gFAQ+C;AAN3C,mIAAA,yBAAyB,OAAA;AACzB,oIAAA,0BAA0B,OAAA;AAM9B,wEAM2C;AALvC,6DAA6D;AAC7D,wHAAA,kBAAkB,OAAA;AAClB,yHAAA,mBAAmB,OAAA;AACnB,qHAAA,eAAe,OAAA;AACf,oHAAA,cAAc,OAAA;AAGlB,qEAAqE;AACrE,wEAAqE;AAA5D,sHAAA,gBAAgB,OAAA;AACzB,2EAAyD;AACzD,iFAA+D;AAE/D,iEAA+C;AAC/C,kEAAmF;AAA1E,8GAAA,WAAW,OAAA;AACpB,yEAAuD;AACvD,kFAAwG;AAA/F,yHAAA,cAAc,OAAA;AACvB,2EAAyD;AACzD,kEAAgD;AAChD,iEAA+C;AAC/C,uEAAqD;AACrD,qEAAmD;AAEnD,6DAA2C;AAC3C,8DAA4C;AAC5C,wDAAsC;AACtC,wDAAsC;AACtC,uDAAqC;AAErC,4DAA0C;AAG1C,kDAAkD;AAClD,gEAA8C;AAE9C,wDAAsC;AAOtC,8DAA4C;AAK5C,6DAA2C;AAG3C,qDAAqD;AACrD,2DAaiC;AAZ7B,0DAA0D;AAC1D,kHAAA,eAAe,OAAA;AACf,8CAA8C;AAC9C,mHAAA,gBAAgB,OAAA;AAChB,mDAAmD;AACnD,+GAAA,YAAY,OAAA;AACZ,yDAAyD;AACzD,+GAAA,YAAY,OAAA;AACZ,2DAA2D;AAC3D,sHAAA,mBAAmB,OAAA;AACnB,yDAAyD;AACzD,2HAAA,wBAAwB,OAAA;AAI5B,oEAAoE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oCAAoC;AACpC,8DAA4C;AAE5C,8DAA4C;AAC5C,6DAA2C;AAE3C,6DAA2C;AAC3C,uDAAqC;AACrC,wDAAsC;AACtC,0DAAwC;AACxC,uDAAqC;AACrC,oDAAkC;AAClC,kDAAgC;AAChC,4DAA0C;AAE1C,8DAA4C;AAC5C,+DAA6C;AAC7C,6DAA2C;AAC3C,uEAAqD;AACrD,4EAA0D;AAC1D,oEAAkD;AAElD,6DAA2C;AAC3C,4DAA0C;AAC1C,8DAA4C;AAC5C,8DAA4C;AAC5C,sEAAoD;AACpD,sEAAoD;AAEpD,0EAAwD;AACxD,2DAAyC;AACzC,8DAA4C;AAC5C,0EAAwD;AACxD,8DAA4C,CAAC,0BAA0B;AACvE,sEAAoD;AACpD,2EAAyD;AACzD,sFAAkF;AAAzE,mIAAA,sBAAsB,OAAA;AAC/B,yEAAuD;AACvD,qEAAmD;AACnD,qEAAmD;AACnD,sEAAoD;AACpD,sEAAoD;AACpD,qEAAmD;AACnD,gFAQ+C;AAN3C,mIAAA,yBAAyB,OAAA;AACzB,oIAAA,0BAA0B,OAAA;AAM9B,wEAM2C;AALvC,6DAA6D;AAC7D,wHAAA,kBAAkB,OAAA;AAClB,yHAAA,mBAAmB,OAAA;AACnB,qHAAA,eAAe,OAAA;AACf,oHAAA,cAAc,OAAA;AAGlB,qEAAqE;AACrE,wEAAqE;AAA5D,sHAAA,gBAAgB,OAAA;AACzB,2EAAyD;AACzD,iFAA+D;AAE/D,iEAA+C;AAC/C,kEAAmF;AAA1E,8GAAA,WAAW,OAAA;AACpB,yEAAuD;AACvD,kFAAwG;AAA/F,yHAAA,cAAc,OAAA;AACvB,2EAAyD;AACzD,kEAAgD;AAChD,iEAA+C;AAC/C,uEAAqD;AACrD,qEAAmD;AAEnD,6DAA2C;AAC3C,8DAA4C;AAC5C,wDAAsC;AACtC,wDAAsC;AACtC,uDAAqC;AAErC,4DAA0C;AAG1C,kDAAkD;AAClD,gEAA8C;AAE9C,wDAAsC;AAOtC,8DAA4C;AAK5C,6DAA2C;AAG3C,qDAAqD;AACrD,2DAaiC;AAZ7B,0DAA0D;AAC1D,kHAAA,eAAe,OAAA;AACf,8CAA8C;AAC9C,mHAAA,gBAAgB,OAAA;AAChB,mDAAmD;AACnD,+GAAA,YAAY,OAAA;AACZ,yDAAyD;AACzD,+GAAA,YAAY,OAAA;AACZ,2DAA2D;AAC3D,sHAAA,mBAAmB,OAAA;AACnB,yDAAyD;AACzD,2HAAA,wBAAwB,OAAA;AAI5B,oEAAoE"}

package/dist/src/models/Lexeme.d.ts

@@ -26,6 +26,13 @@ export interface LexemePosition {
     endLine?: number;
     endColumn?: number;
 }
+/**
+ * Positioned comment information for lexemes
+ */
+export interface LexemePositionedComment {
+    position: 'before' | 'after';
+    comments: string[];
+}
 /**
  * Represents a lexical token in SQL parsing
  */
@@ -33,5 +40,6 @@ export interface Lexeme {
     type: number;
     value: string;
     comments: string[] | null;
+    positionedComments?: LexemePositionedComment[];
     position?: LexemePosition;
 }

package/dist/src/models/SqlComponent.d.ts

@@ -1,9 +1,29 @@
+/**
+ * Represents a comment with its position relative to a token or component
+ */
+export interface PositionedComment {
+    position: 'before' | 'after';
+    comments: string[];
+}
 export declare abstract class SqlComponent {
     static kind: symbol;
     getKind(): symbol;
     accept<T>(visitor: SqlComponentVisitor<T>): T;
     toSqlString(formatter: SqlComponentVisitor<string>): string;
     comments: string[] | null;
+    positionedComments: PositionedComment[] | null;
+    /**
+     * Add comments at a specific position
+     */
+    addPositionedComments(position: 'before' | 'after', comments: string[]): void;
+    /**
+     * Get comments for a specific position
+     */
+    getPositionedComments(position: 'before' | 'after'): string[];
+    /**
+     * Get all positioned comments as a flat array in order (before, after)
+     */
+    getAllPositionedComments(): string[];
 }
 export interface SqlComponentVisitor<T> {
     visit(expr: SqlComponent): T;

package/dist/src/models/SqlComponent.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDialectConfiguration = exports.SqlComponent = void 0;
 class SqlComponent {
     constructor() {
+        // Legacy comment field for backward compatibility
+        // @deprecated Use positionedComments instead for better comment positioning
         this.comments = null;
+        // New position-based comment system
+        this.positionedComments = null;
     }
     getKind() {
         return this.constructor.kind;
@@ -14,6 +18,48 @@ class SqlComponent {
     toSqlString(formatter) {
         return this.accept(formatter);
     }
+    /**
+     * Add comments at a specific position
+     */
+    addPositionedComments(position, comments) {
+        if (!comments || comments.length === 0)
+            return;
+        if (!this.positionedComments) {
+            this.positionedComments = [];
+        }
+        // Find existing positioned comment for this position
+        const existing = this.positionedComments.find(pc => pc.position === position);
+        if (existing) {
+            existing.comments.push(...comments);
+        }
+        else {
+            this.positionedComments.push({ position, comments: [...comments] });
+        }
+    }
+    /**
+     * Get comments for a specific position
+     */
+    getPositionedComments(position) {
+        if (!this.positionedComments)
+            return [];
+        const positioned = this.positionedComments.find(pc => pc.position === position);
+        return positioned ? positioned.comments : [];
+    }
+    /**
+     * Get all positioned comments as a flat array in order (before, after)
+     */
+    getAllPositionedComments() {
+        if (!this.positionedComments)
+            return [];
+        const result = [];
+        // Add 'before' comments first
+        const beforeComments = this.getPositionedComments('before');
+        result.push(...beforeComments);
+        // Add 'after' comments second
+        const afterComments = this.getPositionedComments('after');
+        result.push(...afterComments);
+        return result;
+    }
 }
 exports.SqlComponent = SqlComponent;
 class SqlDialectConfiguration {

package/dist/src/models/SqlComponent.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlComponent.js","sourceRoot":"","sources":["../../../src/models/SqlComponent.ts"],"names":[],"mappings":";;;AAAA,MAAsB,YAAY;IAAlC;QAgBI,aAAQ,GAAoB,IAAI,CAAC;IACrC,CAAC;IAbG,OAAO;QACH,OAAQ,IAAI,CAAC,WAAmC,CAAC,IAAI,CAAC;IAC1D,CAAC;IAED,MAAM,CAAI,OAA+B;QACrC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,WAAW,CAAC,SAAsC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;CAGJ;AAjBD,oCAiBC;AAMD,MAAa,uBAAuB;IAApC;QACW,oBAAe,GAAW,GAAG,CAAC;QAC9B,qBAAgB,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAC5C,kBAAa,GAAY,IAAI,CAAC;IACzC,CAAC;CAAA;AAJD,0DAIC"}
+{"version":3,"file":"SqlComponent.js","sourceRoot":"","sources":["../../../src/models/SqlComponent.ts"],"names":[],"mappings":";;;AAQA,MAAsB,YAAY;IAAlC;QAgBI,kDAAkD;QAClD,4EAA4E;QAC5E,aAAQ,GAAoB,IAAI,CAAC;QAEjC,oCAAoC;QACpC,uBAAkB,GAA+B,IAAI,CAAC;IAiD1D,CAAC;IAlEG,OAAO;QACH,OAAQ,IAAI,CAAC,WAAmC,CAAC,IAAI,CAAC;IAC1D,CAAC;IAED,MAAM,CAAI,OAA+B;QACrC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,WAAW,CAAC,SAAsC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IASD;;OAEG;IACH,qBAAqB,CAAC,QAA4B,EAAE,QAAkB;QAClE,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE/C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC3B,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QACjC,CAAC;QAED,qDAAqD;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAC9E,IAAI,QAAQ,EAAE,CAAC;YACX,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;IAED;;OAEG;IACH,qBAAqB,CAAC,QAA4B;QAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAAE,OAAO,EAAE,CAAC;QAExC,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAChF,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,wBAAwB;QACpB,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAAE,OAAO,EAAE,CAAC;QAExC,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,8BAA8B;QAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;QAE/B,8BAA8B;QAC9B,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAE9B,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAtED,oCAsEC;AAMD,MAAa,uBAAuB;IAApC;QACW,oBAAe,GAAW,GAAG,CAAC;QAC9B,qBAAgB,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAC5C,kBAAa,GAAY,IAAI,CAAC;IACzC,CAAC;CAAA;AAJD,0DAIC"}

package/dist/src/parsers/CommandExpressionParser.d.ts

@@ -9,6 +9,15 @@ export declare class CommandExpressionParser {
     private static parseCaseExpression;
     private static parseCaseWhenExpression;
     private static parseSwitchCaseArgument;
+    private static parseAdditionalWhenClauses;
+    private static parseElseClause;
+    private static parseEndClause;
+    private static extractKeywordComments;
+    private static applySwitchCaseComments;
     private static isCommandWithValue;
     private static parseCaseConditionValuePair;
+    /**
+     * Convert legacy comments to positioned comments format
+     */
+    private static convertLegacyToPositioned;
 }

package/dist/src/parsers/CommandExpressionParser.js

@@ -9,12 +9,18 @@ class CommandExpressionParser {
         let idx = index;
         const current = lexemes[idx];
         if (current.value === "case") {
+            // Capture CASE keyword comments before consuming
+            const caseKeywordComments = current.comments;
+            const caseKeywordPositionedComments = current.positionedComments;
             idx++;
-            return this.parseCaseExpression(lexemes, idx);
+            return this.parseCaseExpression(lexemes, idx, caseKeywordComments, caseKeywordPositionedComments);
         }
         else if (current.value === "case when") {
+            // Capture CASE WHEN keyword comments before consuming
+            const caseWhenKeywordComments = current.comments;
+            const caseWhenKeywordPositionedComments = current.positionedComments;
             idx++;
-            return this.parseCaseWhenExpression(lexemes, idx);
+            return this.parseCaseWhenExpression(lexemes, idx, caseWhenKeywordComments, caseWhenKeywordPositionedComments);
         }
         return this.parseModifierUnaryExpression(lexemes, idx);
     }
@@ -29,7 +35,7 @@ class CommandExpressionParser {
         }
         throw new Error(`Invalid modifier unary expression at index ${idx}, Lexeme: ${lexemes[idx].value}`);
     }
-    static parseCaseExpression(lexemes, index) {
+    static parseCaseExpression(lexemes, index, caseKeywordComments, caseKeywordPositionedComments) {
         let idx = index;
         const condition = ValueParser_1.ValueParser.parseFromLexeme(lexemes, idx);
         idx = condition.newIndex;
@@ -37,9 +43,17 @@ class CommandExpressionParser {
         idx = switchCaseResult.newIndex;
         // Create CASE expression
         const result = new ValueComponent_1.CaseExpression(condition.value, switchCaseResult.value);
+        // Assign CASE keyword comments to the CaseExpression (positioned comments only for unified spec)
+        if (caseKeywordPositionedComments && caseKeywordPositionedComments.length > 0) {
+            result.positionedComments = caseKeywordPositionedComments;
+        }
+        else if (caseKeywordComments && caseKeywordComments.length > 0) {
+            // Convert legacy comments to positioned comments for unified spec
+            result.positionedComments = [CommandExpressionParser.convertLegacyToPositioned(caseKeywordComments, 'before')];
+        }
         return { value: result, newIndex: idx };
     }
-    static parseCaseWhenExpression(lexemes, index) {
+    static parseCaseWhenExpression(lexemes, index, caseWhenKeywordComments, caseWhenKeywordPositionedComments) {
         let idx = index;
         // Parse the first WHEN clause
         const casewhenResult = this.parseCaseConditionValuePair(lexemes, idx);
@@ -51,40 +65,108 @@ class CommandExpressionParser {
         idx = switchCaseResult.newIndex;
         // Create CASE expression with condition null (uses WHEN conditions instead of a simple CASE)
         const result = new ValueComponent_1.CaseExpression(null, switchCaseResult.value);
+        // Assign CASE WHEN keyword comments to the CaseExpression (positioned comments only for unified spec)
+        if (caseWhenKeywordPositionedComments && caseWhenKeywordPositionedComments.length > 0) {
+            result.positionedComments = caseWhenKeywordPositionedComments;
+        }
+        else if (caseWhenKeywordComments && caseWhenKeywordComments.length > 0) {
+            // Convert legacy comments to positioned comments for unified spec
+            result.positionedComments = [CommandExpressionParser.convertLegacyToPositioned(caseWhenKeywordComments, 'before')];
+        }
         return { value: result, newIndex: idx };
     }
     // parseSwitchCaseArgument method processes the WHEN, ELSE, and END clauses of a CASE expression.
     static parseSwitchCaseArgument(lexemes, index, initialWhenThenList) {
         let idx = index;
         const whenThenList = [...initialWhenThenList];
-        let elseValue = null;
-        // Process WHEN clauses
+        // Parse all WHEN clauses
+        idx = this.parseAdditionalWhenClauses(lexemes, idx, whenThenList);
+        // Parse optional ELSE clause
+        const { elseValue, elseComments, newIndex: elseIndex } = this.parseElseClause(lexemes, idx);
+        idx = elseIndex;
+        // Parse required END clause
+        const { endComments, newIndex: endIndex } = this.parseEndClause(lexemes, idx);
+        idx = endIndex;
+        if (whenThenList.length === 0) {
+            throw new Error(`The CASE expression requires at least one WHEN clause (index ${idx})`);
+        }
+        // Create SwitchCaseArgument and apply comments directly
+        const switchCaseArg = new ValueComponent_1.SwitchCaseArgument(whenThenList, elseValue);
+        this.applySwitchCaseComments(switchCaseArg, elseComments, endComments);
+        return { value: switchCaseArg, newIndex: idx };
+    }
+    // Parse additional WHEN clauses
+    static parseAdditionalWhenClauses(lexemes, index, whenThenList) {
+        let idx = index;
         while (idx < lexemes.length && this.isCommandWithValue(lexemes[idx], "when")) {
             idx++;
             const whenResult = this.parseCaseConditionValuePair(lexemes, idx);
             idx = whenResult.newIndex;
             whenThenList.push(whenResult.value);
         }
-        // Process ELSE
+        return idx;
+    }
+    // Parse optional ELSE clause
+    static parseElseClause(lexemes, index) {
+        let elseValue = null;
+        let elseComments = null;
+        let idx = index;
         if (idx < lexemes.length && this.isCommandWithValue(lexemes[idx], "else")) {
+            // Extract comments from ELSE keyword before consuming
+            elseComments = this.extractKeywordComments(lexemes[idx]);
             idx++;
             const elseResult = ValueParser_1.ValueParser.parseFromLexeme(lexemes, idx);
             elseValue = elseResult.value;
             idx = elseResult.newIndex;
         }
-        // Process END
+        return { elseValue, elseComments, newIndex: idx };
+    }
+    // Parse required END clause
+    static parseEndClause(lexemes, index) {
+        let idx = index;
+        let endComments = null;
         if (idx < lexemes.length && this.isCommandWithValue(lexemes[idx], "end")) {
+            // Extract comments from END keyword before consuming
+            endComments = this.extractKeywordComments(lexemes[idx]);
             idx++;
         }
         else {
             throw new Error(`The CASE expression requires 'end' keyword at the end (index ${idx})`);
         }
-        if (whenThenList.length === 0) {
-            throw new Error(`The CASE expression requires at least one WHEN clause (index ${idx})`);
+        return { endComments, newIndex: idx };
+    }
+    // Extract comments from a keyword token
+    static extractKeywordComments(token) {
+        return {
+            legacy: token.comments,
+            positioned: token.positionedComments
+        };
+    }
+    // Apply comments to SwitchCaseArgument directly (no collection then assignment)
+    static applySwitchCaseComments(switchCaseArg, elseComments, endComments) {
+        const allPositionedComments = [];
+        const allLegacyComments = [];
+        // Process ELSE comments directly
+        if ((elseComments === null || elseComments === void 0 ? void 0 : elseComments.positioned) && elseComments.positioned.length > 0) {
+            allPositionedComments.push(...elseComments.positioned);
+        }
+        if ((elseComments === null || elseComments === void 0 ? void 0 : elseComments.legacy) && elseComments.legacy.length > 0) {
+            allLegacyComments.push(...elseComments.legacy);
+        }
+        // Process END comments directly
+        if ((endComments === null || endComments === void 0 ? void 0 : endComments.positioned) && endComments.positioned.length > 0) {
+            allPositionedComments.push(...endComments.positioned);
+        }
+        if ((endComments === null || endComments === void 0 ? void 0 : endComments.legacy) && endComments.legacy.length > 0) {
+            allLegacyComments.push(...endComments.legacy);
+        }
+        // Apply positioned comments directly, or convert legacy comments
+        if (allPositionedComments.length > 0) {
+            switchCaseArg.positionedComments = allPositionedComments;
+        }
+        else if (allLegacyComments.length > 0) {
+            switchCaseArg.positionedComments = [CommandExpressionParser.convertLegacyToPositioned(allLegacyComments, 'after')];
         }
-        // Create SwitchCaseArgument
-        const value = new ValueComponent_1.SwitchCaseArgument(whenThenList, elseValue);
-        return { value, newIndex: idx };
     }
     // Helper method: Check if a lexeme is a Command token with the specified value
     static isCommandWithValue(lexeme, value) {
@@ -98,11 +180,33 @@ class CommandExpressionParser {
         if (idx >= lexemes.length || !(lexemes[idx].type & Lexeme_1.TokenType.Command) || lexemes[idx].value !== "then") {
             throw new Error(`Expected 'then' after WHEN condition at index ${idx}`);
         }
+        // Capture THEN keyword comments before consuming
+        const thenKeywordComments = lexemes[idx].comments;
+        const thenKeywordPositionedComments = lexemes[idx].positionedComments;
         idx++; // Skip the THEN keyword
         // Parse the value after THEN
         const value = ValueParser_1.ValueParser.parseFromLexeme(lexemes, idx);
         idx = value.newIndex;
-        return { value: new ValueComponent_1.CaseKeyValuePair(condition.value, value.value), newIndex: idx };
+        const keyValuePair = new ValueComponent_1.CaseKeyValuePair(condition.value, value.value);
+        // Store THEN keyword comments on the CaseKeyValuePair
+        // Store THEN keyword comments - unified spec: positioned comments only
+        if (thenKeywordPositionedComments && thenKeywordPositionedComments.length > 0) {
+            keyValuePair.positionedComments = thenKeywordPositionedComments;
+        }
+        else if (thenKeywordComments && thenKeywordComments.length > 0) {
+            // Convert legacy comments to positioned comments for unified spec
+            keyValuePair.positionedComments = [CommandExpressionParser.convertLegacyToPositioned(thenKeywordComments, 'after')];
+        }
+        return { value: keyValuePair, newIndex: idx };
+    }
+    /**
+     * Convert legacy comments to positioned comments format
+     */
+    static convertLegacyToPositioned(legacyComments, position = 'before') {
+        return {
+            position,
+            comments: legacyComments
+        };
     }
 }
 exports.CommandExpressionParser = CommandExpressionParser;

package/dist/src/parsers/CommandExpressionParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandExpressionParser.js","sourceRoot":"","sources":["../../../src/parsers/CommandExpressionParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommandExpressionParser.js","sourceRoot":"","sources":["../../../src/parsers/CommandExpressionParser.ts"],"names":[],"mappings":"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"}

package/dist/src/parsers/CommonTableParser.d.ts

@@ -7,4 +7,12 @@ export declare class CommonTableParser {
         newIndex: number;
         trailingComments: string[] | null;
     };
+    private static collectPrecedingComments;
+    private static collectWithTokenComments;
+    private static collectTokenComments;
+    private static addPositionedComment;
+    private static parseAsKeyword;
+    private static parseMaterializedFlag;
+    private static parseInnerSelectQuery;
+    private static extractComments;
 }

package/dist/src/parsers/CommonTableParser.js

@@ -22,64 +22,156 @@ class CommonTableParser {
     // Parse from lexeme array (was: parse)
     static parseFromLexeme(lexemes, index) {
         let idx = index;
-        // Capture comments from the CTE name token (before parsing alias)
-        const cteNameComments = idx < lexemes.length ? lexemes[idx].comments : null;
-        // Parse alias and optional column aliases
-        // SourceAliasExpressionParser already handles column aliases if present
+        // 1. Parse alias and optional column aliases
         const aliasResult = SourceAliasExpressionParser_1.SourceAliasExpressionParser.parseFromLexeme(lexemes, idx);
         idx = aliasResult.newIndex;
-        if (idx < lexemes.length && lexemes[idx].value !== "as") {
-            throw new Error(`Syntax error at position ${idx}: Expected 'AS' keyword after CTE name but found "${lexemes[idx].value}".`);
-        }
-        idx++; // Skip 'AS' keyword
-        // Materialized flag
-        let materialized = null;
-        // Parse optional MATERIALIZED or NOT MATERIALIZED keywords
-        if (idx < lexemes.length) {
-            const currentValue = lexemes[idx].value;
-            if (currentValue === "materialized") {
-                materialized = true;
-                idx++;
+        // 2. Collect preceding comments for this CTE
+        this.collectPrecedingComments(lexemes, index, aliasResult);
+        // 3. Parse AS keyword
+        idx = this.parseAsKeyword(lexemes, idx);
+        // 4. Parse optional MATERIALIZED flag
+        const { materialized, newIndex: materializedIndex } = this.parseMaterializedFlag(lexemes, idx);
+        idx = materializedIndex;
+        // 5. Parse inner SELECT query with parentheses
+        const { selectQuery, trailingComments, newIndex: selectIndex } = this.parseInnerSelectQuery(lexemes, idx);
+        idx = selectIndex;
+        // 6. Create CommonTable instance
+        const value = new Clause_1.CommonTable(selectQuery, aliasResult.value, materialized);
+        return {
+            value,
+            newIndex: idx,
+            trailingComments
+        };
+    }
+    // Collect comments from preceding tokens that should belong to this CTE
+    static collectPrecedingComments(lexemes, index, aliasResult) {
+        var _a;
+        if (!((_a = aliasResult.value) === null || _a === void 0 ? void 0 : _a.table))
+            return;
+        const cteTable = aliasResult.value.table;
+        for (let i = index - 1; i >= 0; i--) {
+            const token = lexemes[i];
+            // Handle WITH keyword specially - collect its "after" comments for the first CTE
+            if (token.value.toLowerCase() === 'with') {
+                this.collectWithTokenComments(token, cteTable);
+                break; // Stop at WITH keyword
+            }
+            // Stop looking if we hit a comma (indicates previous CTE) or RECURSIVE keyword
+            if (token.type & Lexeme_1.TokenType.Comma || token.value.toLowerCase() === 'recursive') {
+                break;
             }
-            else if (currentValue === "not materialized") {
-                materialized = false;
-                idx++;
+            // Collect comments from tokens before the CTE name
+            this.collectTokenComments(token, cteTable);
+        }
+    }
+    // Collect comments from WITH token
+    static collectWithTokenComments(token, cteTable) {
+        let hasPositionedComments = false;
+        if (token.positionedComments && token.positionedComments.length > 0) {
+            for (const posComment of token.positionedComments) {
+                if (posComment.position === 'after' && posComment.comments) {
+                    this.addPositionedComment(cteTable, 'before', posComment.comments);
+                    hasPositionedComments = true;
+                }
             }
         }
+        // Only use legacy comments if no positioned comments were found
+        if (!hasPositionedComments && token.comments && token.comments.length > 0) {
+            this.addPositionedComment(cteTable, 'before', token.comments);
+        }
+    }
+    // Collect comments from a token
+    static collectTokenComments(token, cteTable) {
+        if (token.comments && token.comments.length > 0) {
+            this.addPositionedComment(cteTable, 'before', token.comments);
+        }
+        if (token.positionedComments && token.positionedComments.length > 0) {
+            if (!cteTable.positionedComments) {
+                cteTable.positionedComments = [];
+            }
+            cteTable.positionedComments.unshift(...token.positionedComments);
+        }
+    }
+    // Helper to add positioned comment
+    static addPositionedComment(cteTable, position, comments) {
+        if (!cteTable.positionedComments) {
+            cteTable.positionedComments = [];
+        }
+        cteTable.positionedComments.unshift({
+            position,
+            comments: [...comments]
+        });
+    }
+    // Parse AS keyword
+    static parseAsKeyword(lexemes, index) {
+        if (index < lexemes.length && lexemes[index].value !== "as") {
+            throw new Error(`Syntax error at position ${index}: Expected 'AS' keyword after CTE name but found "${lexemes[index].value}".`);
+        }
+        return index + 1; // Skip 'AS' keyword
+    }
+    // Parse optional MATERIALIZED flag
+    static parseMaterializedFlag(lexemes, index) {
+        if (index >= lexemes.length) {
+            return { materialized: null, newIndex: index };
+        }
+        const currentValue = lexemes[index].value;
+        if (currentValue === "materialized") {
+            return { materialized: true, newIndex: index + 1 };
+        }
+        else if (currentValue === "not materialized") {
+            return { materialized: false, newIndex: index + 1 };
+        }
+        return { materialized: null, newIndex: index };
+    }
+    // Parse inner SELECT query with parentheses
+    static parseInnerSelectQuery(lexemes, index) {
+        let idx = index;
         if (idx < lexemes.length && lexemes[idx].type !== Lexeme_1.TokenType.OpenParen) {
             throw new Error(`Syntax error at position ${idx}: Expected '(' after CTE name but found "${lexemes[idx].value}".`);
         }
         // Capture comments from the opening parenthesis for the CTE inner query
-        const cteQueryComments = lexemes[idx].comments;
+        const cteQueryHeaderComments = this.extractComments(lexemes[idx]);
         idx++; // Skip opening parenthesis
         const queryResult = SelectQueryParser_1.SelectQueryParser.parseFromLexeme(lexemes, idx);
         idx = queryResult.newIndex;
-        // If there are comments from the opening parenthesis, add them to the inner query
-        if (cteQueryComments && cteQueryComments.length > 0) {
-            if (queryResult.value.comments) {
-                // Prepend the CTE query comments to existing comments
-                queryResult.value.comments = [...cteQueryComments, ...queryResult.value.comments];
+        // Add comments from the opening parenthesis as header comments for the inner query
+        if (cteQueryHeaderComments.length > 0) {
+            if (queryResult.value.headerComments) {
+                queryResult.value.headerComments = [...cteQueryHeaderComments, ...queryResult.value.headerComments];
             }
             else {
-                queryResult.value.comments = cteQueryComments;
+                queryResult.value.headerComments = cteQueryHeaderComments;
             }
         }
         if (idx < lexemes.length && lexemes[idx].type !== Lexeme_1.TokenType.CloseParen) {
             throw new Error(`Syntax error at position ${idx}: Expected ')' after CTE query but found "${lexemes[idx].value}".`);
         }
-        // Capture comments from the closing parenthesis - these might be meant for the subsequent query
-        const closingParenComments = lexemes[idx].comments;
+        // Capture comments from the closing parenthesis
+        const closingParenComments = this.extractComments(lexemes[idx]);
         idx++; // Skip closing parenthesis
-        const value = new Clause_1.CommonTable(queryResult.value, aliasResult.value, materialized);
-        // Set comments only from the CTE name token, not from closing parenthesis
-        // The closing parenthesis comments likely belong to the main query, not the CTE
-        value.comments = cteNameComments;
         return {
-            value,
-            newIndex: idx,
-            trailingComments: closingParenComments && closingParenComments.length > 0 ? closingParenComments : null
+            selectQuery: queryResult.value,
+            trailingComments: closingParenComments.length > 0 ? closingParenComments : null,
+            newIndex: idx
         };
     }
+    // Extract comments from a lexeme (both positioned and legacy)
+    static extractComments(lexeme) {
+        const comments = [];
+        // Check positioned comments
+        if (lexeme.positionedComments) {
+            for (const posComment of lexeme.positionedComments) {
+                if (posComment.comments) {
+                    comments.push(...posComment.comments);
+                }
+            }
+        }
+        // Check legacy comments for backward compatibility
+        if (lexeme.comments && lexeme.comments.length > 0) {
+            comments.push(...lexeme.comments);
+        }
+        return comments;
+    }
 }
 exports.CommonTableParser = CommonTableParser;
 //# sourceMappingURL=CommonTableParser.js.map

package/dist/src/parsers/CommonTableParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommonTableParser.js","sourceRoot":"","sources":["../../../src/parsers/CommonTableParser.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAC/C,6CAAqD;AACrD,iDAA8C;AAC9C,2DAAwD;AACxD,+EAA4E;AAE5E,MAAa,iBAAiB;IAC1B,uCAAuC;IAChC,MAAM,CAAC,KAAK,CAAC,KAAa;QAC7B,MAAM,SAAS,GAAG,IAAI,2BAAY,CAAC,KAAK,CAAC,CAAC,CAAC,uBAAuB;QAClE,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,aAAa;QAErD,QAAQ;QACR,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAEhD,sCAAsC;QACtC,IAAI,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,iBAAiB,MAAM,CAAC,QAAQ,2EAA2E,CAAC,CAAC;QAClM,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,uCAAuC;IAChC,MAAM,CAAC,eAAe,CAAC,OAAiB,EAAE,KAAa;QAC1D,IAAI,GAAG,GAAG,KAAK,CAAC;QAEhB,kEAAkE;QAClE,MAAM,eAAe,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QAE5E,0CAA0C;QAC1C,wEAAwE;QACxE,MAAM,WAAW,GAAG,yDAA2B,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC9E,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC;QAE3B,IAAI,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACtD,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,qDAAqD,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QAChI,CAAC;QACD,GAAG,EAAE,CAAC,CAAC,oBAAoB;QAE3B,oBAAoB;QACpB,IAAI,YAAY,GAAmB,IAAI,CAAC;QAExC,2DAA2D;QAC3D,IAAI,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;YACxC,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;gBAClC,YAAY,GAAG,IAAI,CAAC;gBACpB,GAAG,EAAE,CAAC;YACV,CAAC;iBAAM,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;gBAC7C,YAAY,GAAG,KAAK,CAAC;gBACrB,GAAG,EAAE,CAAC;YACV,CAAC;QACL,CAAC;QAED,IAAI,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,kBAAS,CAAC,SAAS,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,4CAA4C,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QACvH,CAAC;QAED,wEAAwE;QACxE,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC/C,GAAG,EAAE,CAAC,CAAC,2BAA2B;QAElC,MAAM,WAAW,GAAG,qCAAiB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACpE,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC;QAE3B,kFAAkF;QAClF,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,IAAI,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC7B,sDAAsD;gBACtD,WAAW,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACtF,CAAC;iBAAM,CAAC;gBACJ,WAAW,CAAC,KAAK,CAAC,QAAQ,GAAG,gBAAgB,CAAC;YAClD,CAAC;QACL,CAAC;QAED,IAAI,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,kBAAS,CAAC,UAAU,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,6CAA6C,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QACxH,CAAC;QAED,gGAAgG;QAChG,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QACnD,GAAG,EAAE,CAAC,CAAC,2BAA2B;QAElC,MAAM,KAAK,GAAG,IAAI,oBAAW,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAElF,0EAA0E;QAC1E,gFAAgF;QAChF,KAAK,CAAC,QAAQ,GAAG,eAAe,CAAC;QAEjC,OAAO;YACH,KAAK;YACL,QAAQ,EAAE,GAAG;YACb,gBAAgB,EAAE,oBAAoB,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI;SAC1G,CAAC;IACN,CAAC;CACJ;AA1FD,8CA0FC"}
+{"version":3,"file":"CommonTableParser.js","sourceRoot":"","sources":["../../../src/parsers/CommonTableParser.ts"],"names":[],"mappings":"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"}