dt-sql-parser 4.1.0-beta.1 → 4.1.0-beta.2

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

@@ -110,6 +110,12 @@ export declare abstract class BasicSQL<L extends Lexer = Lexer, PRC extends Pars
      * @param input source string
      */
     splitSQLByStatement(input: string): TextSlice[] | null;
+    /**
+     * Get the smaller range of input
+     * @param input string
+     * @param caretTokenIndex tokenIndex of caretPosition
+     * @returns inputSlice: string, caretTokenIndex: number, allTokens: Token[]
+     */
     private splitInputBySeparator;
     /**
      * Get suggestions of syntax and token at caretPosition

package/dist/parser/common/basicSQL.js

@@ -149,9 +149,15 @@ export class BasicSQL {
             .filter(Boolean);
         return res;
     }
-    // 通过分隔符进一步切分语句
-    splitInputBySeparator(inputSlice, caretTokenIndex) {
-        const allTokens = this.getAllTokens(inputSlice);
+    /**
+     * Get the smaller range of input
+     * @param input string
+     * @param caretTokenIndex tokenIndex of caretPosition
+     * @returns inputSlice: string, caretTokenIndex: number, allTokens: Token[]
+     */
+    splitInputBySeparator(input, caretTokenIndex) {
+        var _a, _b, _c;
+        const allTokens = this.getAllTokens(input);
         /**
          * set startToken
          */
@@ -180,7 +186,20 @@ export class BasicSQL {
         if (stopToken === null) {
             stopToken = allTokens[allTokens.length - 1];
         }
-        return { startToken, stopToken };
+        let startIndex = (_a = startToken === null || startToken === void 0 ? void 0 : startToken.start) !== null && _a !== void 0 ? _a : 0;
+        let stopIndex = (_b = (stopToken === null || stopToken === void 0 ? void 0 : stopToken.stop) + 1) !== null && _b !== void 0 ? _b : input.length;
+        /**
+         * Save offset of the tokenIndex in the range of input
+         * compared to the tokenIndex in the whole input
+         */
+        const tokenIndexOffset = (_c = startToken === null || startToken === void 0 ? void 0 : startToken.tokenIndex) !== null && _c !== void 0 ? _c : 0;
+        const _caretTokenIndex = caretTokenIndex - tokenIndexOffset;
+        /**
+         * Get the smaller range of _input
+         */
+        const _input = input.slice(startIndex, stopIndex);
+        const _allTokens = this.getAllTokens(_input);
+        return { inputSlice: _input, caretTokenIndex: _caretTokenIndex, allTokens: _allTokens };
     }
     /**
      * Get suggestions of syntax and token at caretPosition
@@ -189,13 +208,14 @@ export class BasicSQL {
      * @returns suggestion
      */
     getSuggestionAtCaretPosition(input, caretPosition) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const splitListener = this.splitListener;
-        this.parseWithCache(input);
+        let inputSlice = input;
+        this.parseWithCache(inputSlice);
         if (!this._parseTree)
             return null;
         let sqlParserIns = this._parser;
-        let allTokens = this.getAllTokens(input);
+        let allTokens = this.getAllTokens(inputSlice);
         let caretTokenIndex = findCaretTokenIndex(caretPosition, allTokens);
         let c3Context = this._parseTree;
         let tokenIndexOffset = 0;
@@ -241,37 +261,28 @@ export class BasicSQL {
             }
             // A boundary consisting of the index of the input.
             let startIndex = (_e = (_d = startStatement === null || startStatement === void 0 ? void 0 : startStatement.start) === null || _d === void 0 ? void 0 : _d.start) !== null && _e !== void 0 ? _e : 0;
-            let stopIndex = (_g = (_f = stopStatement === null || stopStatement === void 0 ? void 0 : stopStatement.stop) === null || _f === void 0 ? void 0 : _f.stop) !== null && _g !== void 0 ? _g : input.length - 1;
+            let stopIndex = (_g = (_f = stopStatement === null || stopStatement === void 0 ? void 0 : stopStatement.stop) === null || _f === void 0 ? void 0 : _f.stop) !== null && _g !== void 0 ? _g : inputSlice.length - 1;
             /**
              * Save offset of the tokenIndex in the range of input
              * compared to the tokenIndex in the whole input
              */
             tokenIndexOffset = (_j = (_h = startStatement === null || startStatement === void 0 ? void 0 : startStatement.start) === null || _h === void 0 ? void 0 : _h.tokenIndex) !== null && _j !== void 0 ? _j : 0;
             caretTokenIndex = caretTokenIndex - tokenIndexOffset;
-            /**
-             * Reparse the input fragment，
-             * and c3 will collect candidates in the newly generated parseTree.
-             */
-            let inputSlice = input.slice(startIndex, stopIndex);
-            /**
-             * Split the inputSlice by separator.
-             */
-            if (inputSlice.includes(SEPARATOR)) {
-                const { startToken, stopToken } = this.splitInputBySeparator(inputSlice, caretTokenIndex);
-                startIndex = (_k = startToken === null || startToken === void 0 ? void 0 : startToken.start) !== null && _k !== void 0 ? _k : 0;
-                stopIndex = (_l = (stopToken === null || stopToken === void 0 ? void 0 : stopToken.stop) + 1) !== null && _l !== void 0 ? _l : input.length;
-                /**
-                 * Save offset of the tokenIndex in the range of input
-                 * compared to the tokenIndex in the whole input
-                 */
-                tokenIndexOffset = (_m = startToken === null || startToken === void 0 ? void 0 : startToken.tokenIndex) !== null && _m !== void 0 ? _m : 0;
-                caretTokenIndex = caretTokenIndex - tokenIndexOffset;
-                /**
-                 * Get the smaller range of inputSlice
-                 */
-                inputSlice = inputSlice.slice(startIndex, stopIndex);
-                allTokens = this.getAllTokens(inputSlice);
-            }
+            inputSlice = inputSlice.slice(startIndex, stopIndex);
+        }
+        /**
+         * Split the inputSlice by separator to get the smaller range of inputSlice.
+         */
+        if (inputSlice.includes(SEPARATOR)) {
+            const { inputSlice: _input, caretTokenIndex: _caretTokenIndex, allTokens: _allTokens, } = this.splitInputBySeparator(inputSlice, caretTokenIndex);
+            caretTokenIndex = _caretTokenIndex;
+            inputSlice = _input;
+            allTokens = _allTokens;
+        }
+        /**
+         * Reparse the input fragment, and c3 will collect candidates in the newly generated parseTree when input changed.
+         */
+        if (inputSlice !== input) {
             const lexer = this.createLexer(inputSlice);
             lexer.removeErrorListeners();
             const tokenStream = new CommonTokenStream(lexer);

package/package.json

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