rawsql-ts 0.12.0 → 0.13.0

package/dist/utils/CommentEditor.js

@@ -0,0 +1,345 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentEditor = void 0;
+const SqlComponent_1 = require("../models/SqlComponent");
+/**
+ * Utility class for editing comments on SQL components.
+ * Provides functions to add, edit, delete, and search comments in SQL AST.
+ */
+class CommentEditor {
+    /**
+     * Add a comment to a SQL component using positioned comments system
+     * For SelectQuery components, adds to headerComments for query-level comments
+     * For other components, adds as 'before' positioned comment
+     * @param component The SQL component to add comment to
+     * @param comment The comment text to add
+     * @param position Optional position for comment ('before' | 'after'), defaults to 'before'
+     */
+    static addComment(component, comment, position = 'before') {
+        // Check if this is a SelectQuery component - add to headerComments for query-level comments
+        if (this.isSelectQuery(component)) {
+            const selectQuery = component;
+            if (!selectQuery.headerComments) {
+                selectQuery.headerComments = [];
+            }
+            selectQuery.headerComments.push(comment);
+        }
+        else {
+            // For other components, add to positioned comments
+            component.addPositionedComments(position, [comment]);
+        }
+    }
+    /**
+     * Check if a component implements SelectQuery interface
+     * Uses discriminator property for robust type detection
+     * @param component The component to check
+     * @returns true if the component is a SelectQuery
+     */
+    static isSelectQuery(component) {
+        // Use discriminator property for robust type detection
+        return '__selectQueryType' in component &&
+            component.__selectQueryType === 'SelectQuery';
+    }
+    /**
+     * Edit an existing comment by index
+     * For SelectQuery components, edits headerComments
+     * For other components, edits positioned comments
+     * @param component The SQL component containing the comment
+     * @param index The index of the comment to edit (0-based)
+     * @param newComment The new comment text
+     * @param position Position to edit ('before' | 'after'), defaults to 'before' for non-SelectQuery components
+     * @throws Error if index is invalid
+     */
+    static editComment(component, index, newComment, position = 'before') {
+        var _a, _b;
+        if (this.isSelectQuery(component)) {
+            const selectQuery = component;
+            if (!selectQuery.headerComments || index < 0 || index >= selectQuery.headerComments.length) {
+                throw new Error(`Invalid comment index: ${index}. Component has ${((_a = selectQuery.headerComments) === null || _a === void 0 ? void 0 : _a.length) || 0} comments.`);
+            }
+            selectQuery.headerComments[index] = newComment;
+        }
+        else {
+            const positionedComments = component.getPositionedComments(position);
+            if (!positionedComments || index < 0 || index >= positionedComments.length) {
+                throw new Error(`Invalid comment index: ${index}. Component has ${(positionedComments === null || positionedComments === void 0 ? void 0 : positionedComments.length) || 0} ${position} positioned comments.`);
+            }
+            // Update the comment in the positioned comments
+            const positioned = (_b = component.positionedComments) === null || _b === void 0 ? void 0 : _b.find(pc => pc.position === position);
+            if (positioned) {
+                positioned.comments[index] = newComment;
+            }
+        }
+    }
+    /**
+     * Delete a comment by index
+     * For SelectQuery components, deletes from headerComments
+     * For other components, deletes from positioned comments
+     * @param component The SQL component containing the comment
+     * @param index The index of the comment to delete (0-based)
+     * @param position Position to delete from ('before' | 'after'), defaults to 'before' for non-SelectQuery components
+     * @throws Error if index is invalid
+     */
+    static deleteComment(component, index, position = 'before') {
+        var _a, _b, _c, _d;
+        if (this.isSelectQuery(component)) {
+            const selectQuery = component;
+            if (!selectQuery.headerComments || index < 0 || index >= selectQuery.headerComments.length) {
+                throw new Error(`Invalid comment index: ${index}. Component has ${((_a = selectQuery.headerComments) === null || _a === void 0 ? void 0 : _a.length) || 0} comments.`);
+            }
+            selectQuery.headerComments.splice(index, 1);
+            if (selectQuery.headerComments.length === 0) {
+                selectQuery.headerComments = null;
+            }
+        }
+        else {
+            const positionedComments = component.getPositionedComments(position);
+            if (!positionedComments || index < 0 || index >= positionedComments.length) {
+                throw new Error(`Invalid comment index: ${index}. Component has ${(positionedComments === null || positionedComments === void 0 ? void 0 : positionedComments.length) || 0} ${position} positioned comments.`);
+            }
+            // Delete the comment from positioned comments
+            const positioned = (_b = component.positionedComments) === null || _b === void 0 ? void 0 : _b.find(pc => pc.position === position);
+            if (positioned) {
+                positioned.comments.splice(index, 1);
+                // Clean up empty positioned comment groups
+                if (positioned.comments.length === 0) {
+                    component.positionedComments = ((_c = component.positionedComments) === null || _c === void 0 ? void 0 : _c.filter(pc => pc.position !== position)) || null;
+                    if (((_d = component.positionedComments) === null || _d === void 0 ? void 0 : _d.length) === 0) {
+                        component.positionedComments = null;
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * Delete all comments from a component
+     * @param component The SQL component to clear comments from
+     */
+    static deleteAllComments(component) {
+        if (this.isSelectQuery(component)) {
+            const selectQuery = component;
+            selectQuery.headerComments = null;
+        }
+        else {
+            component.positionedComments = null;
+        }
+    }
+    /**
+     * Get all comments from a component
+     * For SelectQuery components, returns headerComments
+     * For other components, returns all positioned comments as a flat array
+     * @param component The SQL component to get comments from
+     * @returns Array of comment strings (empty array if no comments)
+     */
+    static getComments(component) {
+        if (this.isSelectQuery(component)) {
+            const selectQuery = component;
+            return selectQuery.headerComments || [];
+        }
+        return component.getAllPositionedComments();
+    }
+    /**
+     * Find all components in the AST that have comments containing the search text
+     * @param root The root SQL component to search from
+     * @param searchText The text to search for in comments
+     * @param caseSensitive Whether the search should be case-sensitive (default: false)
+     * @returns Array of components that have matching comments
+     */
+    static findComponentsWithComment(root, searchText, caseSensitive = false) {
+        const results = [];
+        const searchTerm = caseSensitive ? searchText : searchText.toLowerCase();
+        const traverse = (component) => {
+            if (component && component instanceof SqlComponent_1.SqlComponent) {
+                let hasMatchingComment = false;
+                // Check positioned comments
+                const allPositionedComments = component.getAllPositionedComments();
+                if (allPositionedComments && allPositionedComments.some(c => {
+                    const commentText = caseSensitive ? c : c.toLowerCase();
+                    return commentText.includes(searchTerm);
+                })) {
+                    hasMatchingComment = true;
+                }
+                // Check headerComments for SelectQuery components
+                if (this.isSelectQuery(component)) {
+                    const selectQuery = component;
+                    if (selectQuery.headerComments && selectQuery.headerComments.some(c => {
+                        const commentText = caseSensitive ? c : c.toLowerCase();
+                        return commentText.includes(searchTerm);
+                    })) {
+                        hasMatchingComment = true;
+                    }
+                }
+                if (hasMatchingComment) {
+                    results.push(component);
+                }
+            }
+            // Traverse all properties recursively
+            for (const key in component) {
+                if (component[key] && typeof component[key] === 'object') {
+                    if (Array.isArray(component[key])) {
+                        component[key].forEach(traverse);
+                    }
+                    else {
+                        traverse(component[key]);
+                    }
+                }
+            }
+        };
+        traverse(root);
+        return results;
+    }
+    /**
+     * Replace all occurrences of a text in comments across the entire AST
+     * @param root The root SQL component to search and replace in
+     * @param searchText The text to search for
+     * @param replaceText The text to replace with
+     * @param caseSensitive Whether the search should be case-sensitive (default: false)
+     * @returns Number of replacements made
+     */
+    static replaceInComments(root, searchText, replaceText, caseSensitive = false) {
+        let replacementCount = 0;
+        const traverse = (component) => {
+            if (component && component instanceof SqlComponent_1.SqlComponent) {
+                // Handle regular comments
+                if (component.comments) {
+                    for (let i = 0; i < component.comments.length; i++) {
+                        const originalComment = component.comments[i];
+                        const flags = caseSensitive ? 'g' : 'gi';
+                        const regex = new RegExp(searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), flags);
+                        const newComment = originalComment.replace(regex, replaceText);
+                        if (newComment !== originalComment) {
+                            component.comments[i] = newComment;
+                            replacementCount++;
+                        }
+                    }
+                }
+                // Handle positioned comments
+                if (component.positionedComments) {
+                    for (const posComment of component.positionedComments) {
+                        if (posComment.comments) {
+                            for (let i = 0; i < posComment.comments.length; i++) {
+                                const originalComment = posComment.comments[i];
+                                const flags = caseSensitive ? 'g' : 'gi';
+                                const regex = new RegExp(searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), flags);
+                                const newComment = originalComment.replace(regex, replaceText);
+                                if (newComment !== originalComment) {
+                                    posComment.comments[i] = newComment;
+                                    replacementCount++;
+                                }
+                            }
+                        }
+                    }
+                }
+                // Handle headerComments for SelectQuery components
+                if (this.isSelectQuery(component)) {
+                    const selectQuery = component;
+                    if (selectQuery.headerComments) {
+                        for (let i = 0; i < selectQuery.headerComments.length; i++) {
+                            const originalComment = selectQuery.headerComments[i];
+                            const flags = caseSensitive ? 'g' : 'gi';
+                            const regex = new RegExp(searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), flags);
+                            const newComment = originalComment.replace(regex, replaceText);
+                            if (newComment !== originalComment) {
+                                selectQuery.headerComments[i] = newComment;
+                                replacementCount++;
+                            }
+                        }
+                    }
+                }
+            }
+            // Traverse all properties recursively
+            for (const key in component) {
+                if (component[key] && typeof component[key] === 'object') {
+                    if (Array.isArray(component[key])) {
+                        component[key].forEach(traverse);
+                    }
+                    else {
+                        traverse(component[key]);
+                    }
+                }
+            }
+        };
+        traverse(root);
+        return replacementCount;
+    }
+    /**
+     * Count total number of comments in the AST
+     * @param root The root SQL component to count comments in
+     * @returns Total number of comments
+     */
+    static countComments(root) {
+        let count = 0;
+        const traverse = (component) => {
+            if (component && component instanceof SqlComponent_1.SqlComponent) {
+                // Count positioned comments
+                const positionedComments = component.getAllPositionedComments();
+                if (positionedComments) {
+                    count += positionedComments.length;
+                }
+                // Count headerComments for SelectQuery components
+                if (this.isSelectQuery(component)) {
+                    const selectQuery = component;
+                    if (selectQuery.headerComments) {
+                        count += selectQuery.headerComments.length;
+                    }
+                }
+            }
+            // Traverse all properties recursively
+            for (const key in component) {
+                if (component[key] && typeof component[key] === 'object') {
+                    if (Array.isArray(component[key])) {
+                        component[key].forEach(traverse);
+                    }
+                    else {
+                        traverse(component[key]);
+                    }
+                }
+            }
+        };
+        traverse(root);
+        return count;
+    }
+    /**
+     * Get all comments from the entire AST as a flat array with their source components
+     * @param root The root SQL component to extract comments from
+     * @returns Array of objects containing comment text and the component they belong to
+     */
+    static getAllComments(root) {
+        const results = [];
+        const traverse = (component) => {
+            if (component && component instanceof SqlComponent_1.SqlComponent) {
+                // Add positioned comments
+                const positionedComments = component.getAllPositionedComments();
+                if (positionedComments) {
+                    positionedComments.forEach((comment, index) => {
+                        results.push({ comment, component, index });
+                    });
+                }
+                // Add headerComments for SelectQuery components
+                if (this.isSelectQuery(component)) {
+                    const selectQuery = component;
+                    if (selectQuery.headerComments) {
+                        selectQuery.headerComments.forEach((comment, index) => {
+                            results.push({ comment, component, index });
+                        });
+                    }
+                }
+            }
+            // Traverse all properties recursively
+            for (const key in component) {
+                if (component[key] && typeof component[key] === 'object') {
+                    if (Array.isArray(component[key])) {
+                        component[key].forEach(traverse);
+                    }
+                    else {
+                        traverse(component[key]);
+                    }
+                }
+            }
+        };
+        traverse(root);
+        return results;
+    }
+}
+exports.CommentEditor = CommentEditor;
+//# sourceMappingURL=CommentEditor.js.map

package/dist/utils/CommentEditor.js.map

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

package/dist/utils/CommentUtils.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentUtils = void 0;
+/**
+ * Utility functions for handling comments in parsers
+ */
+class CommentUtils {
+    /**
+     * Collects comments from preceding tokens that are associated with a specific keyword.
+     * This function looks for comments in tokens before the current position that might
+     * be related to the current clause.
+     *
+     * @param lexemes Array of lexemes
+     * @param currentIndex Index of the current keyword token
+     * @param keywordValue Expected keyword value (e.g., 'from', 'where')
+     * @returns Array of comments associated with this clause
+     */
+    static collectClauseComments(lexemes, currentIndex, keywordValue) {
+        if (currentIndex >= lexemes.length || lexemes[currentIndex].value.toLowerCase() !== keywordValue.toLowerCase()) {
+            return null;
+        }
+        const comments = [];
+        // Collect comments from the keyword token itself
+        if (lexemes[currentIndex].comments) {
+            comments.push(...lexemes[currentIndex].comments);
+        }
+        // Look backwards for comments that might be associated with this clause
+        // We'll look at the previous token to see if it has comments that should belong to this clause
+        let checkIndex = currentIndex - 1;
+        while (checkIndex >= 0) {
+            const prevToken = lexemes[checkIndex];
+            // If the previous token has comments and it's not a significant SQL token,
+            // those comments might belong to the current clause
+            if (prevToken.comments && prevToken.comments.length > 0) {
+                // Check if the comments contain keywords that suggest they belong to the current clause
+                const clauseSpecificComments = prevToken.comments.filter(comment => {
+                    const lowerComment = comment.toLowerCase();
+                    return lowerComment.includes(keywordValue.toLowerCase()) ||
+                        lowerComment.includes('の') || // Japanese possessive particle
+                        lowerComment.includes('コメント'); // "comment" in Japanese
+                });
+                if (clauseSpecificComments.length > 0) {
+                    comments.unshift(...clauseSpecificComments);
+                    // Remove these comments from the previous token to avoid duplication
+                    prevToken.comments = prevToken.comments.filter(c => !clauseSpecificComments.includes(c));
+                    if (prevToken.comments.length === 0) {
+                        prevToken.comments = null;
+                    }
+                }
+                break; // Stop after checking one token with comments
+            }
+            // Stop if we encounter another significant SQL keyword
+            if (this.isSignificantSqlKeyword(prevToken.value)) {
+                break;
+            }
+            checkIndex--;
+        }
+        return comments.length > 0 ? comments : null;
+    }
+    /**
+     * Checks if a token value is a significant SQL keyword that would separate clauses
+     */
+    static isSignificantSqlKeyword(value) {
+        const keywords = new Set(['select', 'from', 'where', 'group by', 'having', 'order by', 'limit', 'offset']);
+        return keywords.has(value.toLowerCase());
+    }
+}
+exports.CommentUtils = CommentUtils;
+//# sourceMappingURL=CommentUtils.js.map

package/dist/utils/CommentUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CommentUtils.js","sourceRoot":"","sources":["../../src/utils/CommentUtils.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,YAAY;IACrB;;;;;;;;;OASG;IACI,MAAM,CAAC,qBAAqB,CAAC,OAAiB,EAAE,YAAoB,EAAE,YAAoB;QAC7F,IAAI,YAAY,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7G,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,iDAAiD;QACjD,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC;QAED,wEAAwE;QACxE,+FAA+F;QAC/F,IAAI,UAAU,GAAG,YAAY,GAAG,CAAC,CAAC;QAClC,OAAO,UAAU,IAAI,CAAC,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YAEtC,2EAA2E;YAC3E,oDAAoD;YACpD,IAAI,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtD,wFAAwF;gBACxF,MAAM,sBAAsB,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;oBAC/D,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;oBAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;wBACjD,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,+BAA+B;wBAC7D,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,wBAAwB;gBAClE,CAAC,CAAC,CAAC;gBAEH,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpC,QAAQ,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,CAAC;oBAC5C,qEAAqE;oBACrE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzF,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAClC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC9B,CAAC;gBACL,CAAC;gBACD,MAAM,CAAC,8CAA8C;YACzD,CAAC;YAED,uDAAuD;YACvD,IAAI,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,MAAM;YACV,CAAC;YAED,UAAU,EAAE,CAAC;QACjB,CAAC;QAED,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IACjD,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,uBAAuB,CAAC,KAAa;QAChD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC3G,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7C,CAAC;CACJ;AArED,oCAqEC"}