fix: remove _ctx and add tokenIndex into position

Author: JackWang032

src/parser/common/entityCollector.ts

@@ -35,7 +35,6 @@ export interface StmtContext {
     readonly parentStmt: StmtContext | null;
     readonly isContainCaret?: boolean;
     readonly scopeDepth: number;
-    readonly _ctx: ParserRuleContext;
     readonly text: string;
 }
 
@@ -58,7 +57,6 @@ export function toStmtContext(
         isContainCaret,
         text: stmtText,
         scopeDepth: type === StmtContextType.COMMON_STMT ? 0 : (parentStmt?.scopeDepth ?? 0) + 1,
-        _ctx: ctx,
     };
 }
 
@@ -106,8 +104,6 @@ export interface BaseEntityContext {
     isAccessible: boolean;
     /** Entities related to this entity */
     relatedEntities: EntityContext[] | null;
-    /** The parser rule context for this entity, it will be deleted after the entity is collected because of json serialization */
-    _ctx?: ParserRuleContext;
     /** Comment attribute for this entity */
     [AttrName.comment]: WordRange | null;
     /** Alias attribute for this entity */
@@ -225,7 +221,6 @@ export function toEntityContext(
         position,
         belongStmt,
         declareType: metaInfo?.declareType,
-        _ctx: ctx,
         [AttrName.comment]: null,
     };
     switch (entityInfo.entityContextType) {
@@ -328,10 +323,10 @@ function findAttributeChildren(
  * @returns true if entity is contained within rangeEntity's range
  */
 function isEntityInScope(entity: EntityContext, rangeEntity: EntityContext): boolean {
-    const entityStart = entity._ctx?.start?.tokenIndex;
-    const entityStop = entity._ctx?.stop?.tokenIndex;
-    const rangeStart = rangeEntity._ctx?.start?.tokenIndex;
-    const rangeStop = rangeEntity._ctx?.stop?.tokenIndex;
+    const entityStart = entity.position.startTokenIndex;
+    const entityStop = entity.position.endTokenIndex;
+    const rangeStart = rangeEntity.position.startTokenIndex;
+    const rangeStop = rangeEntity.position.endTokenIndex;
 
     return (
         entityStart != null &&
@@ -408,55 +403,12 @@ export abstract class EntityCollector {
 
     exitProgram() {
         const entities = Array.from(this._entitiesSet);
-        this.removeCtxAttr();
         if (this._caretTokenIndex !== -1) {
             this.attachAccessibleToEntities(entities);
         }
         this._entityStack.clear();
     }
 
-    /**
-     * Remove _ctx property to avoid circular references during JSON serialization
-     */
-    private removeCtxAttr() {
-        const entities = Array.from(this._entitiesSet);
-        // Use WeakSet to track processed objects and avoid infinite recursion from circular references
-        const processed = new WeakSet();
-
-        const removeCtx = (obj: any) => {
-            if (!obj || typeof obj !== 'object' || processed.has(obj)) {
-                return;
-            }
-            processed.add(obj);
-
-            if ('_ctx' in obj) {
-                obj._ctx = undefined;
-            }
-
-            if (obj.belongStmt) {
-                removeCtx(obj.belongStmt);
-            }
-
-            if (obj.rootStmt) {
-                removeCtx(obj.rootStmt);
-            }
-
-            if (obj.parentStmt) {
-                removeCtx(obj.parentStmt);
-            }
-
-            if (obj.relatedEntities && Array.isArray(obj.relatedEntities)) {
-                obj.relatedEntities.forEach(removeCtx);
-            }
-
-            if (obj.columns && Array.isArray(obj.columns)) {
-                obj.columns.forEach(removeCtx);
-            }
-        };
-
-        entities.forEach(removeCtx);
-    }
-
     /**
      * Determines if the caret is inside a derived table subquery
      * For example, in: SELECT id FROM t1, (SELECT name from t2) as t3

src/parser/common/textAndWord.ts

@@ -11,9 +11,13 @@ export interface WordPosition {
     readonly startColumn: number;
     /** end at ..n + 1 */
     readonly endColumn: number;
+    /** start at 0 */
+    readonly startTokenIndex: number;
+    /** end at ..n-1 */
+    readonly endTokenIndex: number;
 }
 
-export interface WordRange extends WordPosition {
+export interface WordRange extends Omit<WordPosition, 'startTokenIndex' | 'endTokenIndex'> {
     /** content of word */
     readonly text: string;
 }
@@ -31,6 +35,10 @@ export interface TextPosition {
     readonly startColumn: number;
     /** end at ..n + 1 */
     readonly endColumn: number;
+    /** start at 0 */
+    readonly startTokenIndex: number;
+    /** end at ..n-1 */
+    readonly endTokenIndex: number;
 }
 
 export interface TextSlice extends TextPosition {
@@ -75,6 +83,8 @@ export function ctxToText(
         endIndex,
         startColumn: ctx.start.column + 1,
         endColumn: ctx.stop.column + 1 + (ctx.stop.text?.length ?? 0),
+        startTokenIndex: ctx.start.tokenIndex,
+        endTokenIndex: ctx.stop.tokenIndex,
     };
 }
 

src/parser/postgresql/postgreEntityCollector.ts

@@ -31,6 +31,9 @@ import {
     type ViewNameCreateContext,
     TargetListContext,
     SelectNoParensContext,
+    XmlTableContext,
+    FuncTableContext,
+    SelectWithParensContext,
 } from '../../lib/postgresql/PostgreSqlParser';
 import type { PostgreSqlParserListener } from '../../lib/postgresql/PostgreSqlParserListener';
 import {
@@ -69,7 +72,40 @@ export class PostgreSqlEntityCollector extends EntityCollector implements Postgr
         );
     }
 
-    exitExpressionTable(ctx: ExpressionTableContext) {
+    exitXmlTable(ctx: XmlTableContext) {
+        this.pushEntity(
+            ctx,
+            EntityContextType.TABLE,
+            [
+                {
+                    attrName: AttrName.alias,
+                    endContextList: [ExpressionTableContext.name],
+                },
+            ],
+            {
+                declareType: TableDeclareType.EXPRESSION,
+            }
+        );
+    }
+
+    exitFuncTable(ctx: FuncTableContext) {
+        this.pushEntity(
+            ctx,
+            EntityContextType.TABLE,
+            [
+                {
+                    attrName: AttrName.alias,
+                    endContextList: [ExpressionTableContext.name],
+                },
+            ],
+            {
+                declareType: TableDeclareType.EXPRESSION,
+            }
+        );
+    }
+
+    exitSelectWithParens(ctx: SelectWithParensContext) {
+        if (!isChildContextOf(ctx, PostgreSqlParser.RULE_expressionTable)) return;
         this.pushEntity(
             ctx,
             EntityContextType.TABLE,
@@ -119,7 +155,7 @@ export class PostgreSqlEntityCollector extends EntityCollector implements Postgr
         ]);
     }
 
-    exitTarget_list(ctx: TargetListContext) {
+    exitTargetList(ctx: TargetListContext) {
         if (!isChildContextOf(ctx, PostgreSqlParser.RULE_simpleSelect)) return;
         this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
     }