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

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

@@ -138,8 +138,6 @@ 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";
@@ -358,7 +356,6 @@ 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";
@@ -1323,18 +1320,6 @@ 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
@@ -2784,12 +2769,6 @@ 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

@@ -7,7 +7,7 @@ import { ErrorListener, ParseError } from './parseErrorListener';
 import SemanticContextCollector from './semanticContextCollector';
 import type { SplitListener } from './splitListener';
 import { TextSlice } from './textAndWord';
-import { CaretPosition, LOCALE_TYPE, SemanticCollectOptions, Suggestions } from './types';
+import { CaretPosition, LOCALE_TYPE, SemanticCollectOptions, SuggestionOptions, Suggestions } from './types';
 export declare const SQL_SPLIT_SYMBOL_TEXT = ";";
 /**
  * Basic SQL class, every sql needs extends it.
@@ -21,6 +21,7 @@ export declare abstract class BasicSQL<L extends Lexer = Lexer, PRC extends Pars
     protected _parseTree: PRC | null;
     protected _parsedInput: string;
     protected _parseErrors: ParseError[];
+    private _statementStartTokenTypes;
     /** members for cache end */
     private _errorListener;
     /**
@@ -166,13 +167,22 @@ export declare abstract class BasicSQL<L extends Lexer = Lexer, PRC extends Pars
         tokenIndexOffset: number;
         newTokenIndex: number;
     } | null;
+    /**
+     * Get the minimum statement tree for collecting completion candidates
+     */
+    private getSuggestionParseTree;
+    /**
+     * Collect candidates for the current statement and remove new-statement-only keywords
+     */
+    private collectSuggestionCandidates;
     /**
      * Get suggestions of syntax and token at caretPosition
      * @param input source string
      * @param caretPosition caret position, such as cursor position
+     * @param options suggestion options
      * @returns suggestion
      */
-    getSuggestionAtCaretPosition(input: string, caretPosition: CaretPosition): Suggestions | null;
+    getSuggestionAtCaretPosition(input: string, caretPosition: CaretPosition, options?: SuggestionOptions): Suggestions | null;
     getAllEntities(input: string, caretPosition?: CaretPosition): EntityContext[] | null;
     /**
      * Get semantic context infos

package/dist/parser/common/basicSQL.js

@@ -1,5 +1,5 @@
 import { CodeCompletionCore } from 'antlr4-c3';
-import { CharStreams, CommonTokenStream, ParseTreeWalker, PredictionMode, } from 'antlr4ng';
+import { CharStreams, CommonTokenStream, ParserRuleContext, ParseTreeWalker, PredictionMode, } from 'antlr4ng';
 import { ErrorStrategy } from './errorStrategy';
 import { findCaretTokenIndex } from './findCaretTokenIndex';
 import { ctxToText, tokenToWord } from './textAndWord';
@@ -10,6 +10,7 @@ export const SQL_SPLIT_SYMBOL_TEXT = ';';
 export class BasicSQL {
     constructor() {
         this._parseErrors = [];
+        this._statementStartTokenTypes = null;
         /** members for cache end */
         this._errorListener = (error) => {
             this._parseErrors.push(error);
@@ -384,13 +385,74 @@ export class BasicSQL {
             newTokenIndex: caretTokenIndex,
         };
     }
+    /**
+     * Get the minimum statement tree for collecting completion candidates
+     */
+    getSuggestionParseTree(parseTree, caretTokenIndex) {
+        var _a, _b, _c;
+        const children = parseTree.children;
+        if (!(children === null || children === void 0 ? void 0 : children.length))
+            return parseTree;
+        for (let index = children.length - 1; index >= 0; index--) {
+            const child = children[index];
+            if (!(child instanceof ParserRuleContext))
+                continue;
+            const startTokenIndex = (_a = child.start) === null || _a === void 0 ? void 0 : _a.tokenIndex;
+            const stopTokenIndex = (_b = child.stop) === null || _b === void 0 ? void 0 : _b.tokenIndex;
+            if (startTokenIndex === undefined ||
+                stopTokenIndex === undefined ||
+                startTokenIndex > caretTokenIndex)
+                continue;
+            // Use the current statement tree when the caret is inside it
+            if (stopTokenIndex >= caretTokenIndex)
+                return child;
+            // Keep using the current statement until it ends with a semicolon
+            return ((_c = child.stop) === null || _c === void 0 ? void 0 : _c.text) === SQL_SPLIT_SYMBOL_TEXT ? parseTree : child;
+        }
+        return parseTree;
+    }
+    /**
+     * Collect candidates for the current statement and remove new-statement-only keywords
+     */
+    collectSuggestionCandidates(parser, parseTree, caretTokenIndex) {
+        const core = new CodeCompletionCore(parser);
+        core.preferredRules = this.preferredRules;
+        const candidates = core.collectCandidates(caretTokenIndex, parseTree);
+        const suggestionParseTree = this.getSuggestionParseTree(parseTree, caretTokenIndex);
+        if (suggestionParseTree === parseTree)
+            return candidates;
+        const statementCore = new CodeCompletionCore(parser);
+        statementCore.preferredRules = this.preferredRules;
+        const statementCandidates = statementCore.collectCandidates(caretTokenIndex, suggestionParseTree);
+        if (this._statementStartTokenTypes === null) {
+            const statementStartCore = new CodeCompletionCore(parser);
+            statementStartCore.preferredRules = this.preferredRules;
+            const statementStartCandidates = statementStartCore.collectCandidates(0, parseTree);
+            this._statementStartTokenTypes = new Set(statementStartCandidates.tokens.keys());
+        }
+        const tokens = new Map(candidates.tokens);
+        for (const tokenType of this._statementStartTokenTypes) {
+            if (!statementCandidates.tokens.has(tokenType)) {
+                tokens.delete(tokenType);
+            }
+            else if (tokens.has(tokenType)) {
+                // Use the current statement follow-list to preserve valid combined keywords
+                tokens.set(tokenType, statementCandidates.tokens.get(tokenType));
+            }
+        }
+        return {
+            rules: candidates.rules,
+            tokens,
+        };
+    }
     /**
      * Get suggestions of syntax and token at caretPosition
      * @param input source string
      * @param caretPosition caret position, such as cursor position
+     * @param options suggestion options
      * @returns suggestion
      */
-    getSuggestionAtCaretPosition(input, caretPosition) {
+    getSuggestionAtCaretPosition(input, caretPosition, options) {
         this.parseWithCache(input);
         if (!this._parseTree)
             return null;
@@ -428,11 +490,7 @@ export class BasicSQL {
             sqlParserIns = this.createParser(inputSlice);
             parseTree = sqlParserIns.program();
         }
-        const core = new CodeCompletionCore(sqlParserIns);
-        core.preferredRules = this.preferredRules;
-        // core.showRuleStack = true;
-        // core.showResult = true;
-        const candidates = core.collectCandidates(caretTokenIndex, parseTree);
+        const candidates = this.collectSuggestionCandidates(sqlParserIns, parseTree, caretTokenIndex);
         const originalSuggestions = this.processCandidates(candidates, allTokens, caretTokenIndex);
         const syntaxSuggestions = originalSuggestions.syntax.map((syntaxCtx) => {
             const wordRanges = syntaxCtx.wordRanges.map((token) => {
@@ -443,9 +501,13 @@ export class BasicSQL {
                 wordRanges,
             };
         });
+        const keywordFilter = options === null || options === void 0 ? void 0 : options.keywordFilter;
+        const keywords = keywordFilter
+            ? originalSuggestions.keywords.filter((keyword) => keywordFilter(keyword))
+            : originalSuggestions.keywords;
         return {
             syntax: syntaxSuggestions,
-            keywords: originalSuggestions.keywords,
+            keywords,
         };
     }
     getAllEntities(input, caretPosition) {

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

@@ -69,6 +69,15 @@ export interface Suggestions<T = WordRange> {
      */
     readonly keywords: string[];
 }
+/**
+ * Suggested information options
+ */
+export interface SuggestionOptions {
+    /**
+     * Return true to keep the keyword, otherwise remove it
+     */
+    keywordFilter?: (keyword: string) => boolean;
+}
 export type LOCALE_TYPE = 'zh_CN' | 'en_US';
 export interface SemanticContext {
     isStatementBeginning: boolean;

package/dist/parser/mysql/index.js

@@ -26,7 +26,6 @@ export class MySQL extends BasicSQL {
             MySqlParser.RULE_functionNameCreate,
             MySqlParser.RULE_columnName,
             MySqlParser.RULE_columnNamePath,
-            MySqlParser.RULE_columnNamePathAllowEmpty,
             MySqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -95,16 +94,6 @@ export class MySQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN;
                     break;
                 }
-                case MySqlParser.RULE_columnNamePathAllowEmpty: {
-                    if (candidateRule.ruleList.includes(MySqlParser.RULE_joinSpec) ||
-                        candidateRule.ruleList.includes(MySqlParser.RULE_fromClause) ||
-                        candidateRule.ruleList.includes(MySqlParser.RULE_orderByExpression) ||
-                        candidateRule.ruleList.includes(MySqlParser.RULE_groupByItem) ||
-                        candidateRule.ruleList.includes(MySqlParser.RULE_havingClause)) {
-                        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, ColumnNamePath_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 } 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,7 +19,6 @@ 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,11 +98,6 @@ 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

@@ -130,8 +130,7 @@ 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_joinQual)) {
+                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_triggerWhen)) {
                         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, ColumnNamePath_dot_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, 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,7 +18,6 @@ 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,11 +105,6 @@ 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/trino/index.js

@@ -115,11 +115,9 @@ 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_joinCriteria)) {
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_relation)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
-                    break;
                 }
                 default:
                     break;

package/package.json

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