rawsql-ts 0.11.36-beta → 0.11.38-beta

package/dist/src/parsers/SelectClauseParser.js

@@ -62,8 +62,6 @@ class SelectClauseParser {
         }
         else {
             const clause = new Clause_1.SelectClause(items, distinct, hints);
-            // Set comments from the SELECT token to the clause
-            clause.comments = selectTokenComments;
             return { value: clause, newIndex: idx };
         }
     }
@@ -93,22 +91,24 @@ class SelectItemParser {
      */
     static parseItem(lexemes, index) {
         let idx = index;
+        // Extract positioned comments from the value token directly
+        const valueTokenComments = this.extractValueTokenComments(lexemes, idx);
         const parsedValue = ValueParser_1.ValueParser.parseFromLexeme(lexemes, idx);
         const value = parsedValue.value;
         idx = parsedValue.newIndex;
-        if (idx < lexemes.length && lexemes[idx].value === 'as') {
-            // Skip 'AS' keyword
-            idx++;
-        }
+        // Parse optional AS keyword and extract comments directly
+        const { asComments, newIndex: asIndex } = this.parseAsKeyword(lexemes, idx);
+        idx = asIndex;
         if (idx < lexemes.length && (lexemes[idx].type & Lexeme_1.TokenType.Identifier)) {
             const alias = lexemes[idx].value;
             const aliasComments = lexemes[idx].comments; // Capture comments from alias token
+            const aliasPositionedComments = lexemes[idx].positionedComments; // Capture positioned comments from alias token
             idx++;
             const selectItem = new Clause_1.SelectItem(value, alias);
-            // Set comments from the alias token to the SelectItem
-            if (aliasComments && aliasComments.length > 0) {
-                selectItem.comments = aliasComments;
-            }
+            // Apply all comments directly to selectItem (no collection then assignment)
+            this.applyValueTokenComments(selectItem, valueTokenComments);
+            this.applyAsKeywordComments(selectItem, asComments);
+            this.applyAliasComments(selectItem, aliasComments, aliasPositionedComments);
             return {
                 value: selectItem,
                 newIndex: idx,
@@ -116,17 +116,129 @@ class SelectItemParser {
         }
         else if (value instanceof ValueComponent_1.ColumnReference && value.column.name !== "*") {
             // nameless select item
+            const selectItem = new Clause_1.SelectItem(value, value.column.name);
+            // Apply value token and AS keyword comments directly
+            this.applyValueTokenComments(selectItem, valueTokenComments);
+            this.applyAsKeywordComments(selectItem, asComments);
             return {
-                value: new Clause_1.SelectItem(value, value.column.name),
+                value: selectItem,
                 newIndex: idx,
             };
         }
         // nameless select item
+        const selectItem = new Clause_1.SelectItem(value);
+        // Apply comments directly
+        this.applyValueTokenComments(selectItem, valueTokenComments);
+        this.applyAsKeywordComments(selectItem, asComments);
         return {
-            value: new Clause_1.SelectItem(value),
+            value: selectItem,
             newIndex: idx,
         };
     }
+    /**
+     * Recursively clear positioned comments from all nested components to prevent duplication
+     */
+    static clearPositionedCommentsRecursively(component) {
+        if (!component || typeof component !== 'object') {
+            return;
+        }
+        // Clear positioned comments from this component
+        if ('positionedComments' in component) {
+            component.positionedComments = null;
+        }
+        // Recursively clear from common nested properties
+        if (component.left) {
+            this.clearPositionedCommentsRecursively(component.left);
+        }
+        if (component.right) {
+            this.clearPositionedCommentsRecursively(component.right);
+        }
+        if (component.qualifiedName) {
+            this.clearPositionedCommentsRecursively(component.qualifiedName);
+        }
+        if (component.table) {
+            this.clearPositionedCommentsRecursively(component.table);
+        }
+        if (component.name) {
+            this.clearPositionedCommentsRecursively(component.name);
+        }
+        if (component.args && Array.isArray(component.args)) {
+            component.args.forEach((arg) => {
+                this.clearPositionedCommentsRecursively(arg);
+            });
+        }
+        if (component.value) {
+            this.clearPositionedCommentsRecursively(component.value);
+        }
+    }
+    // Extract positioned comments from value token (no collection arrays)
+    static extractValueTokenComments(lexemes, index) {
+        if (index >= lexemes.length) {
+            return { positioned: null, legacy: null };
+        }
+        const token = lexemes[index];
+        return {
+            positioned: token.positionedComments && token.positionedComments.length > 0 ? token.positionedComments : null,
+            legacy: null // Value token legacy comments are not typically used
+        };
+    }
+    // Parse AS keyword and extract its comments directly
+    static parseAsKeyword(lexemes, index) {
+        if (index >= lexemes.length || lexemes[index].value !== 'as') {
+            return { asComments: { positioned: null, legacy: null }, newIndex: index };
+        }
+        const asToken = lexemes[index];
+        const asComments = {
+            positioned: asToken.positionedComments && asToken.positionedComments.length > 0 ? asToken.positionedComments : null,
+            legacy: asToken.comments && asToken.comments.length > 0 ? asToken.comments : null
+        };
+        return { asComments, newIndex: index + 1 };
+    }
+    // Apply value token comments directly to selectItem
+    static applyValueTokenComments(selectItem, valueTokenComments) {
+        if (valueTokenComments.positioned) {
+            for (const posComment of valueTokenComments.positioned) {
+                selectItem.addPositionedComments(posComment.position, posComment.comments);
+            }
+            this.clearValueTokenComments(selectItem);
+        }
+    }
+    // Apply AS keyword comments directly to selectItem
+    static applyAsKeywordComments(selectItem, asComments) {
+        if (asComments.positioned) {
+            selectItem.asKeywordPositionedComments = asComments.positioned;
+        }
+        else if (asComments.legacy) {
+            selectItem.asKeywordComments = asComments.legacy;
+        }
+    }
+    // Apply alias comments directly to selectItem
+    static applyAliasComments(selectItem, aliasComments, aliasPositionedComments) {
+        if (aliasPositionedComments && aliasPositionedComments.length > 0) {
+            selectItem.aliasPositionedComments = aliasPositionedComments;
+        }
+        else if (aliasComments && aliasComments.length > 0) {
+            selectItem.aliasComments = aliasComments;
+        }
+    }
+    // Clear positioned comments from value to avoid duplication
+    static clearValueTokenComments(selectItem) {
+        // Clear both positioned and legacy comments from the value to avoid duplication
+        if ('positionedComments' in selectItem.value) {
+            selectItem.value.positionedComments = null;
+        }
+        // Also clear positioned comments from nested IdentifierString (in QualifiedName)
+        if (selectItem.value.constructor.name === 'ColumnReference') {
+            const columnRef = selectItem.value;
+            if (columnRef.qualifiedName && columnRef.qualifiedName.name) {
+                columnRef.qualifiedName.name.positionedComments = null;
+            }
+        }
+        // Clear positioned comments from BinaryExpression children only to avoid duplication
+        if (selectItem.value.constructor.name === 'BinaryExpression') {
+            this.clearPositionedCommentsRecursively(selectItem.value);
+        }
+    }
 }
 exports.SelectItemParser = SelectItemParser;
 //# sourceMappingURL=SelectClauseParser.js.map

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

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

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

@@ -37,11 +37,23 @@ export declare class SelectQueryParser {
      * @param target Target query to receive headerComments
      */
     private static transferHeaderComments;
+    private static extractUnionTokenComments;
     static parseFromLexeme(lexemes: Lexeme[], index: number): {
         value: SelectQuery;
         newIndex: number;
     };
     private static parseSimpleSelectQuery;
+    private static parseWithClauseAndComments;
+    private static parseAllClauses;
+    private static parseOptionalClause;
+    private static collectHeaderComments;
+    private static collectWithTokenHeaderComments;
+    private static collectMainSelectPrefixComments;
+    private static collectBetweenClauseComments;
+    private static findMainSelectIndex;
+    private static findMainSelectToken;
+    private static collectSelectTokenComments;
+    private static applyCommentsToQuery;
     private static parseValuesQuery;
     /**
      * Get the CTE name at the specified cursor position.