dt-sql-parser 4.5.1-beta.3 → 4.5.1

package/dist/lib/trino/TrinoSqlVisitor.d.ts

@@ -138,6 +138,8 @@ import { RelationDefaultContext } from "./TrinoSqlParser.js";
 import { JoinRelationContext } from "./TrinoSqlParser.js";
 import { JoinTypeContext } from "./TrinoSqlParser.js";
 import { JoinCriteriaContext } from "./TrinoSqlParser.js";
+import { JoinColumnEqualityContext } from "./TrinoSqlParser.js";
+import { JoinColumnReferenceContext } from "./TrinoSqlParser.js";
 import { SampledRelationContext } from "./TrinoSqlParser.js";
 import { SampleTypeContext } from "./TrinoSqlParser.js";
 import { TrimsSpecificationContext } from "./TrinoSqlParser.js";
@@ -356,6 +358,7 @@ import { CatalogNameCreateContext } from "./TrinoSqlParser.js";
 import { FunctionNameContext } from "./TrinoSqlParser.js";
 import { FunctionNameCreateContext } from "./TrinoSqlParser.js";
 import { ColumnRefContext } from "./TrinoSqlParser.js";
+import { EmptyColumnContext } from "./TrinoSqlParser.js";
 import { ColumnNameContext } from "./TrinoSqlParser.js";
 import { ColumnNameCreateContext } from "./TrinoSqlParser.js";
 import { QualifiedNameContext } from "./TrinoSqlParser.js";
@@ -1320,6 +1323,18 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitJoinCriteria?: (ctx: JoinCriteriaContext) => Result;
+    /**
+     * Visit a parse tree produced by `TrinoSqlParser.joinColumnEquality`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitJoinColumnEquality?: (ctx: JoinColumnEqualityContext) => Result;
+    /**
+     * Visit a parse tree produced by `TrinoSqlParser.joinColumnReference`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitJoinColumnReference?: (ctx: JoinColumnReferenceContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.sampledRelation`.
      * @param ctx the parse tree
@@ -2769,6 +2784,12 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitColumnRef?: (ctx: ColumnRefContext) => Result;
+    /**
+     * Visit a parse tree produced by `TrinoSqlParser.emptyColumn`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitEmptyColumn?: (ctx: EmptyColumnContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.columnName`.
      * @param ctx the parse tree

package/dist/parser/common/basicSQL.d.ts

@@ -45,6 +45,7 @@ export declare abstract class BasicSQL<L extends Lexer = Lexer, PRC extends Pars
      * @param caretTokenIndex tokenIndex of caretPosition
      */
     protected abstract processCandidates(candidates: CandidatesCollection, allTokens: Token[], caretTokenIndex: number): Suggestions<Token>;
+    protected getCandidateTokenRanges(candidates: CandidatesCollection, candidateStartTokenIndex: number, allTokens: Token[], caretTokenIndex: number): Token[];
     /**
      * Get a new splitListener instance.
      */
@@ -169,6 +170,8 @@ export declare abstract class BasicSQL<L extends Lexer = Lexer, PRC extends Pars
     } | null;
     /**
      * Get the minimum statement tree for collecting completion candidates
+     * Each supported grammar exposes one top-level statement per direct program child
+     * Keep the lookup shallow to avoid selecting nested statements or subqueries
      */
     private getSuggestionParseTree;
     /**

package/dist/parser/common/basicSQL.js

@@ -1,5 +1,5 @@
 import { CodeCompletionCore } from 'antlr4-c3';
-import { CharStreams, CommonTokenStream, ParserRuleContext, ParseTreeWalker, PredictionMode, } from 'antlr4ng';
+import { CharStreams, CommonTokenStream, ParserRuleContext, ParseTreeWalker, PredictionMode, Token, } from 'antlr4ng';
 import { ErrorStrategy } from './errorStrategy';
 import { findCaretTokenIndex } from './findCaretTokenIndex';
 import { ctxToText, tokenToWord } from './textAndWord';
@@ -17,6 +17,49 @@ export class BasicSQL {
         };
         this.locale = 'en_US';
     }
+    getCandidateTokenRanges(candidates, candidateStartTokenIndex, allTokens, caretTokenIndex) {
+        var _a;
+        // antlr4-c3 may return both entity and alias candidates; use the nearest candidate's start index as boundary
+        const endTokenIndex = Array.from(candidates.rules.values()).reduce((nearestStartTokenIndex, candidateRule) => {
+            if (candidateRule.startTokenIndex <= candidateStartTokenIndex) {
+                return nearestStartTokenIndex;
+            }
+            return Math.min(nearestStartTokenIndex, candidateRule.startTokenIndex);
+        }, caretTokenIndex + 1);
+        const previousVisibleToken = allTokens
+            .slice(candidateStartTokenIndex, endTokenIndex)
+            .reverse()
+            .find((token) => token.channel === Token.DEFAULT_CHANNEL);
+        const visibleTokenIndexes = allTokens
+            .slice(endTokenIndex, caretTokenIndex + 1)
+            .reduce((indexes, token, offset) => {
+            if (token.channel === Token.DEFAULT_CHANNEL) {
+                indexes.push(endTokenIndex + offset);
+            }
+            return indexes;
+        }, []);
+        const firstVisibleToken = allTokens[visibleTokenIndexes[0]];
+        let rangeEndTokenIndex = endTokenIndex;
+        // candidate boundary may fall inside a multi-level qualified name; extend along the identifier and dot chain
+        if ((previousVisibleToken === null || previousVisibleToken === void 0 ? void 0 : previousVisibleToken.text) === '.' || (firstVisibleToken === null || firstVisibleToken === void 0 ? void 0 : firstVisibleToken.text) === '.') {
+            let visibleTokenOffset = 0;
+            if ((previousVisibleToken === null || previousVisibleToken === void 0 ? void 0 : previousVisibleToken.text) === '.' && firstVisibleToken) {
+                rangeEndTokenIndex = visibleTokenIndexes[visibleTokenOffset] + 1;
+                visibleTokenOffset += 1;
+            }
+            while (((_a = allTokens[visibleTokenIndexes[visibleTokenOffset]]) === null || _a === void 0 ? void 0 : _a.text) === '.') {
+                rangeEndTokenIndex = visibleTokenIndexes[visibleTokenOffset] + 1;
+                visibleTokenOffset += 1;
+                if (visibleTokenOffset < visibleTokenIndexes.length) {
+                    rangeEndTokenIndex = visibleTokenIndexes[visibleTokenOffset] + 1;
+                    visibleTokenOffset += 1;
+                }
+            }
+        }
+        return allTokens
+            .slice(candidateStartTokenIndex, rangeEndTokenIndex)
+            .filter((token) => token.channel === Token.DEFAULT_CHANNEL);
+    }
     /**
      * Create an antlr4 lexer from input.
      * @param input string
@@ -387,6 +430,8 @@ export class BasicSQL {
     }
     /**
      * Get the minimum statement tree for collecting completion candidates
+     * Each supported grammar exposes one top-level statement per direct program child
+     * Keep the lookup shallow to avoid selecting nested statements or subqueries
      */
     getSuggestionParseTree(parseTree, caretTokenIndex) {
         var _a, _b, _c;
@@ -421,6 +466,7 @@ export class BasicSQL {
         const suggestionParseTree = this.getSuggestionParseTree(parseTree, caretTokenIndex);
         if (suggestionParseTree === parseTree)
             return candidates;
+        // Keep the program candidates for outer rule paths and use statement candidates for isolation
         const statementCore = new CodeCompletionCore(parser);
         statementCore.preferredRules = this.preferredRules;
         const statementCandidates = statementCore.collectCandidates(caretTokenIndex, suggestionParseTree);

package/dist/parser/flink/index.js

@@ -67,7 +67,7 @@ export class FlinkSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case FlinkSqlParser.RULE_catalogPath: {

package/dist/parser/generic/index.js

@@ -53,7 +53,7 @@ export class GenericSQL extends BasicSQL {
         const keywords = [];
         for (const candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case GenericSqlParser.RULE_tableName: {

package/dist/parser/hive/index.js

@@ -55,7 +55,7 @@ export class HiveSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case HiveSqlParser.RULE_dbSchemaName: {

package/dist/parser/impala/index.js

@@ -54,7 +54,7 @@ export class ImpalaSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case ImpalaSqlParser.RULE_functionNameCreate: {

package/dist/parser/mysql/index.js

@@ -8,6 +8,13 @@ import { MysqlErrorListener } from './mysqlErrorListener';
 import { MysqlSplitListener } from './mysqlSplitListener';
 import { MySqlSemanticContextCollector } from '../mysql/mysqlSemanticContextCollector';
 export { MySqlEntityCollector, MysqlSplitListener };
+const ALLOW_EMPTY_COLUMN_PARENT_RULES = new Set([
+    MySqlParser.RULE_joinSpec,
+    MySqlParser.RULE_fromClause,
+    MySqlParser.RULE_orderByExpression,
+    MySqlParser.RULE_groupByItem,
+    MySqlParser.RULE_havingClause,
+]);
 export class MySQL extends BasicSQL {
     constructor() {
         super(...arguments);
@@ -26,6 +33,7 @@ export class MySQL extends BasicSQL {
             MySqlParser.RULE_functionNameCreate,
             MySqlParser.RULE_columnName,
             MySqlParser.RULE_columnNamePath,
+            MySqlParser.RULE_columnNamePathAllowEmpty,
             MySqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -54,7 +62,7 @@ export class MySQL extends BasicSQL {
         const keywords = [];
         for (const candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case MySqlParser.RULE_databaseName: {
@@ -94,6 +102,12 @@ export class MySQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN;
                     break;
                 }
+                case MySqlParser.RULE_columnNamePathAllowEmpty: {
+                    if (candidateRule.ruleList.some((rule) => ALLOW_EMPTY_COLUMN_PARENT_RULES.has(rule))) {
+                        syntaxContextType = EntityContextType.COLUMN;
+                    }
+                    break;
+                }
                 case MySqlParser.RULE_columnNameCreate: {
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;

package/dist/parser/mysql/mysqlEntityCollector.d.ts

@@ -1,4 +1,4 @@
-import { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateFunctionLoadableContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectElementsContext, SelectExpressionElementContext, SelectLiteralColumnNameContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext, TableAllColumnsContext, AtomSubQueryTableSourceContext, PureAllColumnsContext, SelectElement_dot_emptyContext } from '../../lib/mysql/MySqlParser';
+import { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateFunctionLoadableContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectElementsContext, SelectExpressionElementContext, SelectLiteralColumnNameContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext, TableAllColumnsContext, AtomSubQueryTableSourceContext, PureAllColumnsContext, SelectElement_dot_emptyContext, ColumnNamePath_dot_emptyContext } from '../../lib/mysql/MySqlParser';
 import type { MySqlParserListener } from '../../lib/mysql/MySqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class MySqlEntityCollector extends EntityCollector implements MySqlParserListener {
@@ -19,6 +19,7 @@ export declare class MySqlEntityCollector extends EntityCollector implements MyS
     exitPureAllColumns(ctx: PureAllColumnsContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitSelectElement_dot_empty(ctx: SelectElement_dot_emptyContext): void;
+    exitColumnNamePath_dot_empty(ctx: ColumnNamePath_dot_emptyContext): void;
     exitSelectExpressionElement(ctx: SelectExpressionElementContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/mysql/mysqlEntityCollector.js

@@ -98,6 +98,11 @@ export class MySqlEntityCollector extends EntityCollector {
             declareType: ColumnDeclareType.LITERAL,
         });
     }
+    exitColumnNamePath_dot_empty(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionElement(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {

package/dist/parser/postgresql/index.js

@@ -64,7 +64,7 @@ export class PostgreSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case PostgreSqlParser.RULE_tableNameCreate: {
@@ -130,7 +130,8 @@ export class PostgreSQL extends BasicSQL {
                         candidateRule.ruleList.includes(PostgreSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(PostgreSqlParser.RULE_havingClause) ||
                         candidateRule.ruleList.includes(PostgreSqlParser.RULE_windowClause) ||
-                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_triggerWhen)) {
+                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_triggerWhen) ||
+                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_joinQual)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
                     break;

package/dist/parser/postgresql/postgreEntityCollector.d.ts

@@ -1,4 +1,4 @@
-import { type AlterTableStmtContext, type ColumnCreateTableContext, type ColumnNameCreateContext, type CreateDatabaseContext, type CreateForeignTableContext, type CreateFunctionStmtContext, type CreateMaterializedViewContext, type CreatePartitionForeignTableContext, type CreateViewContext, type DatabaseNameContext, type DatabaseNameCreateContext, FuncTableContext, type FunctionNameCreateContext, type InsertStatementContext, type ProcedureNameContext, type ProcedureNameCreateContext, type QueryCreateTableContext, SelectExpressionColumnNameContext, SelectLiteralColumnNameContext, SelectNoParensContext, type SelectStatementContext, SelectWithParensContext, type SingleStmtContext, TableAllColumnsContext, type TableNameContext, type TableNameCreateContext, Target_dot_emptyContext, Target_emptyContext, TargetListContext, type ViewNameContext, type ViewNameCreateContext, XmlTableContext } from '../../lib/postgresql/PostgreSqlParser';
+import { type AlterTableStmtContext, type ColumnCreateTableContext, type ColumnNameCreateContext, type CreateDatabaseContext, type CreateForeignTableContext, type CreateFunctionStmtContext, type CreateMaterializedViewContext, type CreatePartitionForeignTableContext, type CreateViewContext, type DatabaseNameContext, type DatabaseNameCreateContext, FuncTableContext, type FunctionNameCreateContext, type InsertStatementContext, type ProcedureNameContext, type ProcedureNameCreateContext, type QueryCreateTableContext, SelectExpressionColumnNameContext, SelectLiteralColumnNameContext, SelectNoParensContext, type SelectStatementContext, SelectWithParensContext, type SingleStmtContext, TableAllColumnsContext, type TableNameContext, type TableNameCreateContext, Target_dot_emptyContext, Target_emptyContext, ColumnNamePath_dot_emptyContext, TargetListContext, type ViewNameContext, type ViewNameCreateContext, XmlTableContext } from '../../lib/postgresql/PostgreSqlParser';
 import type { PostgreSqlParserListener } from '../../lib/postgresql/PostgreSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class PostgreSqlEntityCollector extends EntityCollector implements PostgreSqlParserListener {
@@ -18,6 +18,7 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
     exitTarget_empty(ctx: Target_emptyContext): void;
     exitTarget_dot_empty(ctx: Target_dot_emptyContext): void;
+    exitColumnNamePath_dot_empty(ctx: ColumnNamePath_dot_emptyContext): void;
     exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitProcedureName(ctx: ProcedureNameContext): void;

package/dist/parser/postgresql/postgreEntityCollector.js

@@ -105,6 +105,11 @@ export class PostgreSqlEntityCollector extends EntityCollector {
             declareType: ColumnDeclareType.LITERAL,
         });
     }
+    exitColumnNamePath_dot_empty(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionColumnName(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {

package/dist/parser/spark/index.js

@@ -59,7 +59,7 @@ export class SparkSQL extends BasicSQL {
         const keywords = [];
         for (const candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case SparkSqlParser.RULE_namespaceName: {

package/dist/parser/trino/index.js

@@ -56,7 +56,7 @@ export class TrinoSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case TrinoSqlParser.RULE_catalogRef: {
@@ -115,9 +115,11 @@ export class TrinoSQL extends BasicSQL {
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_havingClause) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_partitionBy) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_whenClause) ||
-                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_relation)) {
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_relation) ||
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_joinCriteria)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
+                    break;
                 }
                 default:
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-sql-parser",
-  "version": "4.5.1-beta.3",
+  "version": "4.5.1",
   "authors": "DTStack Corporation",
   "description": "SQL Parsers for BigData, built with antlr4",
   "keywords": [