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

package/dist/parser/generic/index.js

@@ -0,0 +1,109 @@
+import { processTokenCandidates } from '../common/tokenUtils';
+import { GenericSqlLexer } from '../../lib/generic/GenericSqlLexer';
+import { GenericSqlParser } from '../../lib/generic/GenericSqlParser';
+import { BasicSQL } from '../common/basicSQL';
+import { EntityContextType, } from '../common/types';
+import { GenericEntityCollector } from './genericEntityCollector';
+import { GenericErrorListener } from './genericErrorListener';
+import { GenericSplitListener } from './genericSplitListener';
+import { GenericSemanticContextCollector } from './genericSemanticContextCollector';
+export { GenericEntityCollector, GenericSplitListener };
+export class GenericSQL extends BasicSQL {
+    constructor(options) {
+        super();
+        /**
+         * The rules that keywords you don't want to be suggested.
+         */
+        this.excludeKeywordRules = new Set([GenericSqlParser.RULE_nonReserved]);
+        this.preferredRules = new Set([
+            GenericSqlParser.RULE_tableName,
+            GenericSqlParser.RULE_tableNameCreate,
+            GenericSqlParser.RULE_columnRef,
+            GenericSqlParser.RULE_columnRefCreate,
+            GenericSqlParser.RULE_columnName,
+            GenericSqlParser.RULE_functionName,
+            ...this.excludeKeywordRules,
+        ]);
+        this._diagnostics = (options === null || options === void 0 ? void 0 : options.diagnostics) !== false;
+    }
+    createLexerFromCharStream(charStreams) {
+        return new GenericSqlLexer(charStreams);
+    }
+    validate(input) {
+        if (!this._diagnostics) {
+            return [];
+        }
+        return super.validate(input);
+    }
+    createParserFromTokenStream(tokenStream) {
+        return new GenericSqlParser(tokenStream);
+    }
+    get splitListener() {
+        return new GenericSplitListener();
+    }
+    createErrorListener(_errorListener) {
+        const parserContext = this;
+        return new GenericErrorListener(_errorListener, parserContext, this.preferredRules);
+    }
+    createEntityCollector(input, allTokens, caretTokenIndex) {
+        return new GenericEntityCollector(input, allTokens, caretTokenIndex);
+    }
+    createSemanticContextCollector(input, caretPosition, allTokens, options) {
+        return new GenericSemanticContextCollector(input, caretPosition, allTokens, options);
+    }
+    processCandidates(candidates, allTokens, caretTokenIndex) {
+        const originalSyntaxSuggestions = [];
+        const keywords = [];
+        for (const candidate of candidates.rules) {
+            const [ruleType, candidateRule] = candidate;
+            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            let syntaxContextType = void 0;
+            switch (ruleType) {
+                case GenericSqlParser.RULE_tableName: {
+                    syntaxContextType = EntityContextType.TABLE;
+                    break;
+                }
+                case GenericSqlParser.RULE_tableNameCreate: {
+                    syntaxContextType = EntityContextType.TABLE_CREATE;
+                    break;
+                }
+                case GenericSqlParser.RULE_columnRef: {
+                    syntaxContextType = EntityContextType.COLUMN;
+                    break;
+                }
+                case GenericSqlParser.RULE_columnRefCreate: {
+                    syntaxContextType = EntityContextType.COLUMN_CREATE;
+                    break;
+                }
+                case GenericSqlParser.RULE_columnName: {
+                    syntaxContextType = EntityContextType.COLUMN;
+                    break;
+                }
+                case GenericSqlParser.RULE_functionName: {
+                    syntaxContextType = EntityContextType.FUNCTION;
+                    break;
+                }
+                default:
+                    break;
+            }
+            if (syntaxContextType &&
+                !originalSyntaxSuggestions.some((syn) => {
+                    var _a, _b;
+                    return syn.syntaxContextType === syntaxContextType &&
+                        ((_a = syn.wordRanges.map((wordRange) => wordRange.text)) === null || _a === void 0 ? void 0 : _a.join(',')) ===
+                            ((_b = tokenRanges.map((tokenRange) => tokenRange.text)) === null || _b === void 0 ? void 0 : _b.join(','));
+                })) {
+                originalSyntaxSuggestions.push({
+                    syntaxContextType,
+                    wordRanges: tokenRanges,
+                });
+            }
+        }
+        const processedKeywords = processTokenCandidates(this._parser, candidates.tokens);
+        keywords.push(...processedKeywords);
+        return {
+            syntax: originalSyntaxSuggestions,
+            keywords,
+        };
+    }
+}

package/dist/parser/index.d.ts

@@ -5,3 +5,4 @@ export { SparkSQL } from './spark';
 export { PostgreSQL } from './postgresql';
 export { TrinoSQL } from './trino';
 export { ImpalaSQL } from './impala';
+export { GenericSQL } from './generic';

package/dist/parser/index.js

@@ -5,3 +5,4 @@ export { SparkSQL } from './spark';
 export { PostgreSQL } from './postgresql';
 export { TrinoSQL } from './trino';
 export { ImpalaSQL } from './impala';
+export { GenericSQL } from './generic';

package/dist/parser/mysql/index.js

@@ -25,6 +25,7 @@ export class MySQL extends BasicSQL {
             MySqlParser.RULE_functionName,
             MySqlParser.RULE_functionNameCreate,
             MySqlParser.RULE_columnName,
+            MySqlParser.RULE_columnNamePath,
             MySqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -88,7 +89,8 @@ export class MySQL extends BasicSQL {
                     syntaxContextType = EntityContextType.FUNCTION_CREATE;
                     break;
                 }
-                case MySqlParser.RULE_columnName: {
+                case MySqlParser.RULE_columnName:
+                case MySqlParser.RULE_columnNamePath: {
                     syntaxContextType = EntityContextType.COLUMN;
                     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, SelectExpressionElementContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext, TableAllColumnsContext, SelectLiteralColumnNameContext, AtomSubQueryTableSourceContext, SelectElementsContext, PureAllColumnsContext } 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 {
@@ -18,6 +18,7 @@ export declare class MySqlEntityCollector extends EntityCollector implements MyS
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
     exitPureAllColumns(ctx: PureAllColumnsContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectElement_dot_empty(ctx: SelectElement_dot_emptyContext): void;
     exitSelectExpressionElement(ctx: SelectExpressionElementContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/mysql/mysqlEntityCollector.js

@@ -1,4 +1,4 @@
-import { ColumnCreateTableContext, CreateDefinitionContext, CreateFunctionContext, SelectElementContext, TableSourceItemContext, AtomTableItemContext, SubqueryTableItemContext, } from '../../lib/mysql/MySqlParser';
+import { ColumnCreateTableContext, CreateDefinitionContext, CreateFunctionContext, TableSourceItemContext, AtomTableItemContext, SubqueryTableItemContext, SelectElement_labelContext, SelectElement_exprContext, } from '../../lib/mysql/MySqlParser';
 import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class MySqlEntityCollector extends EntityCollector {
@@ -79,20 +79,30 @@ export class MySqlEntityCollector extends EntityCollector {
         });
     }
     exitSelectLiteralColumnName(ctx) {
+        // Handle empty column case (e.g., "select  from")
+        // When emptyColumn matches, the context has no actual tokens
+        if (!ctx.start || !ctx.stop || ctx.start.start > ctx.stop.stop) {
+            return;
+        }
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {
                 attrName: AttrName.alias,
-                endContextList: [SelectElementContext.name],
+                endContextList: [SelectElement_labelContext.name],
             },
         ], {
             declareType: ColumnDeclareType.LITERAL,
         });
     }
+    exitSelectElement_dot_empty(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionElement(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {
                 attrName: AttrName.alias,
-                endContextList: [SelectElementContext.name],
+                endContextList: [SelectElement_exprContext.name],
             },
         ], {
             declareType: ColumnDeclareType.EXPRESSION,

package/dist/parser/mysql/mysqlErrorListener.js

@@ -14,6 +14,7 @@ export class MysqlErrorListener extends ParseErrorListener {
             [MySqlParser.RULE_functionName, 'function'],
             [MySqlParser.RULE_functionNameCreate, 'function'],
             [MySqlParser.RULE_columnName, 'column'],
+            [MySqlParser.RULE_columnNamePath, 'column'],
             [MySqlParser.RULE_columnNameCreate, 'column'],
         ]);
     }
@@ -48,6 +49,7 @@ export class MysqlErrorListener extends ParseErrorListener {
                     case MySqlParser.RULE_tableName:
                     case MySqlParser.RULE_functionName:
                     case MySqlParser.RULE_viewName:
+                    case MySqlParser.RULE_columnNamePath:
                     case MySqlParser.RULE_columnName: {
                         if (!result.includes(`{existing}${name}`)) {
                             result.push(`{existing}${name}`);

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, type FunctionNameCreateContext, type InsertStatementContext, type ProcedureNameContext, type ProcedureNameCreateContext, type QueryCreateTableContext, SelectExpressionColumnNameContext, SelectLiteralColumnNameContext, type SelectStatementContext, type SingleStmtContext, TableAllColumnsContext, type TableNameContext, type TableNameCreateContext, type ViewNameContext, type ViewNameCreateContext, TargetListContext, SelectNoParensContext, XmlTableContext, FuncTableContext, SelectWithParensContext } 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 {
@@ -16,6 +16,8 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
     exitTargetList(ctx: TargetListContext): void;
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
+    exitTarget_empty(ctx: Target_emptyContext): void;
+    exitTarget_dot_empty(ctx: Target_dot_emptyContext): void;
     exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitProcedureName(ctx: ProcedureNameContext): void;

package/dist/parser/postgresql/postgreEntityCollector.js

@@ -81,6 +81,7 @@ export class PostgreSqlEntityCollector extends EntityCollector {
         ]);
     }
     exitTargetList(ctx) {
+        // Only create QUERY_RESULT for targetList that is direct child of simpleSelect
         if (!isChildContextOf(ctx, PostgreSqlParser.RULE_simpleSelect))
             return;
         this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
@@ -92,6 +93,18 @@ export class PostgreSqlEntityCollector extends EntityCollector {
             declareType: ColumnDeclareType.ALL,
         });
     }
+    exitTarget_empty(ctx) {
+        // Don't create entity for empty column here
+        // The targetList will create QUERY_RESULT entity
+        // Empty targetEl means the QUERY_RESULT has no columns
+    }
+    exitTarget_dot_empty(ctx) {
+        // Create COLUMN entity for incomplete column reference (e.g., "tb.|")
+        // This allows completion to suggest columns from table "tb"
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionColumnName(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {

package/dist/parser/spark/index.js

@@ -30,6 +30,7 @@ export class SparkSQL extends BasicSQL {
             SparkSqlParser.RULE_functionNameCreate,
             SparkSqlParser.RULE_columnName,
             SparkSqlParser.RULE_columnNamePath,
+            SparkSqlParser.RULE_columnNamePathAllowEmpty,
             SparkSqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -101,7 +102,8 @@ export class SparkSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;
                 }
-                case SparkSqlParser.RULE_columnNamePath: {
+                case SparkSqlParser.RULE_columnNamePath:
+                case SparkSqlParser.RULE_columnNamePathAllowEmpty: {
                     if (candidateRule.ruleList.includes(SparkSqlParser.RULE_whenClause) ||
                         candidateRule.ruleList.includes(SparkSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(SparkSqlParser.RULE_joinRelation) ||

package/package.json

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