dt-sql-parser 4.0.0-beta.2.2 → 4.0.0-beta.3.1

package/dist/lib/spark/SparkSqlVisitor.d.ts

@@ -1,6 +1,5 @@
-export var SparkSqlVisitor: typeof SparkSqlVisitor;
-declare function SparkSqlVisitor(): any;
-declare class SparkSqlVisitor {
+export function SparkSqlVisitor(): this;
+export class SparkSqlVisitor {
     constructor: typeof SparkSqlVisitor;
     visitProgram(ctx: any): any;
     visitSingleStatement(ctx: any): any;
@@ -274,4 +273,3 @@ declare class SparkSqlVisitor {
     visitStrictNonReserved(ctx: any): any;
     visitNonReserved(ctx: any): any;
 }
-export {};

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

@@ -15,7 +15,7 @@ export interface SyntaxError {
     msg: string;
     e: any;
 }
-export declare type ErrorHandler = (err: ParserError, errOption: SyntaxError) => void;
+export type ErrorHandler = (err: ParserError, errOption: SyntaxError) => void;
 export declare class ParserErrorCollector extends ErrorListener {
     private _errors;
     constructor(error: ParserError[]);

package/dist/parser/index.d.ts

@@ -3,3 +3,4 @@ export { default as PLSQL } from './plsql';
 export { default as HiveSQL } from './hive';
 export { default as FlinkSQL } from './flinksql';
 export { default as SparkSQL } from './spark';
+export { default as PostgresSQL } from './pgsql';

package/dist/parser/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PostgresSQL = exports.SparkSQL = exports.FlinkSQL = exports.HiveSQL = exports.PLSQL = exports.GenericSQL = void 0;
 var generic_1 = require("./generic");
 Object.defineProperty(exports, "GenericSQL", { enumerable: true, get: function () { return generic_1.default; } });
 var plsql_1 = require("./plsql");
@@ -10,4 +11,6 @@ var flinksql_1 = require("./flinksql");
 Object.defineProperty(exports, "FlinkSQL", { enumerable: true, get: function () { return flinksql_1.default; } });
 var spark_1 = require("./spark");
 Object.defineProperty(exports, "SparkSQL", { enumerable: true, get: function () { return spark_1.default; } });
+var pgsql_1 = require("./pgsql");
+Object.defineProperty(exports, "PostgresSQL", { enumerable: true, get: function () { return pgsql_1.default; } });
 //# sourceMappingURL=index.js.map

package/dist/parser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":";;AAAA,qCAAkD;AAAzC,qGAAA,OAAO,OAAc;AAC9B,iCAA2C;AAAlC,8FAAA,OAAO,OAAS;AACzB,+BAA4C;AAAnC,+FAAA,OAAO,OAAW;AAC3B,uCAAiD;AAAxC,oGAAA,OAAO,OAAY;AAC5B,iCAA8C;AAArC,iGAAA,OAAO,OAAY"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":";;;AAAA,qCAAkD;AAAzC,qGAAA,OAAO,OAAc;AAC9B,iCAA2C;AAAlC,8FAAA,OAAO,OAAS;AACzB,+BAA4C;AAAnC,+FAAA,OAAO,OAAW;AAC3B,uCAAiD;AAAxC,oGAAA,OAAO,OAAY;AAC5B,iCAA8C;AAArC,iGAAA,OAAO,OAAY;AAC5B,iCAAiD;AAAxC,oGAAA,OAAO,OAAe"}

package/dist/parser/pgsql.d.ts

@@ -0,0 +1,6 @@
+import { Lexer } from 'antlr4';
+import BasicParser from './common/basicParser';
+export default class PostgresSQL extends BasicParser {
+    createLexer(input: string): Lexer;
+    createParserFromLexer(lexer: Lexer): any;
+}

package/dist/parser/pgsql.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const antlr4_1 = require("antlr4");
+const PostgreSQLLexer_1 = require("../lib/pgsql/PostgreSQLLexer");
+const PostgreSQLParser_1 = require("../lib/pgsql/PostgreSQLParser");
+const basicParser_1 = require("./common/basicParser");
+class PostgresSQL extends basicParser_1.default {
+    createLexer(input) {
+        const chars = new antlr4_1.InputStream(input.toUpperCase());
+        const lexer = new PostgreSQLLexer_1.PostgreSQLLexer(chars);
+        return lexer;
+    }
+    createParserFromLexer(lexer) {
+        const tokenStream = new antlr4_1.CommonTokenStream(lexer);
+        return new PostgreSQLParser_1.PostgreSQLParser(tokenStream);
+    }
+}
+exports.default = PostgresSQL;
+//# sourceMappingURL=pgsql.js.map

package/dist/parser/pgsql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgsql.js","sourceRoot":"","sources":["../../src/parser/pgsql.ts"],"names":[],"mappings":";;AAAA,mCAA+D;AAC/D,kEAA+D;AAC/D,oEAAiE;AAEjE,sDAA+C;AAE/C,MAAqB,WAAY,SAAQ,qBAAW;IACzC,WAAW,CAAC,KAAa;QAC5B,MAAM,KAAK,GAAG,IAAI,oBAAW,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QACnD,MAAM,KAAK,GAAa,IAAI,iCAAe,CAAC,KAAK,CAAU,CAAC;QAC5D,OAAO,KAAK,CAAC;IACjB,CAAC;IACM,qBAAqB,CAAC,KAAY;QACrC,MAAM,WAAW,GAAG,IAAI,0BAAiB,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,IAAI,mCAAgB,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;CACJ;AAVD,8BAUC"}

package/dist/utils/index.js

@@ -34,24 +34,32 @@ function lexer(input) {
     /**
      * 过滤函数内容
      */
-    const matchFunction = (currentChar, validator) => {
-        let value = currentChar;
-        const start = current;
-        do {
+    const matchFunction = () => {
+        const bracketNum = [current];
+        for (let i = current + 1; i < input.length; i++) {
+            const currentChar = input[i];
             if (currentChar === '\n') {
                 line++;
             }
-            currentChar = input[++current];
-            value += currentChar;
-        } while (!validator.test(currentChar)); // 处理转义字符
-        tokens.push({
-            type: token_1.TokenType.FunctionArguments,
-            value,
-            start: start,
-            lineNumber: line,
-            end: current,
-        });
-        ++current;
+            if (token_1.TokenReg.LeftSmallBracket.test(currentChar)) {
+                bracketNum.push(i);
+            }
+            if (token_1.TokenReg.RightSmallBracket.test(currentChar)) {
+                const start = bracketNum.pop();
+                const end = i + 1;
+                if (bracketNum.length === 0) {
+                    current = end;
+                    tokens.push({
+                        type: token_1.TokenType.FunctionArguments,
+                        value: input.slice(start, end),
+                        start,
+                        lineNumber: line,
+                        end,
+                    });
+                    return;
+                }
+            }
+        }
     };
     /**
      * 过滤（提取） 引号中的内容
@@ -75,7 +83,7 @@ function lexer(input) {
             continue;
         }
         if (token_1.TokenReg.LeftSmallBracket.test(char)) {
-            matchFunction(char, token_1.TokenReg.RightSmallBracket);
+            matchFunction();
             continue;
         }
         if (token_1.TokenReg.BackQuotation.test(char)) {

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-sql-parser",
-  "version": "4.0.0-beta.2.2",
+  "version": "4.0.0-beta.3.1",
   "description": "SQL Parsers for BigData, built with antlr4",
   "keywords": [
     "sql",
@@ -32,7 +32,7 @@
     "eslint-config-google": "^0.14.0",
     "jest": "^24.8.0",
     "ts-jest": "^24.1.0",
-    "typescript": "^3.6.3",
+    "typescript": "^4.9.4",
     "standard-version": "^9.1.0"
   },
   "git repository": "https://github.com/DTStack/dt-sql-parser",

package/.vscode/launch.json

@@ -1,7 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": []
-}

package/.vscode/settings.json

@@ -1,14 +0,0 @@
-{
-    "eslint.alwaysShowStatus": true,
-    "eslint.format.enable": true,
-    // "editor.codeActionsOnSave": {
-    //     "source.fixAll": true,
-    //     "source.fixAll.eslint": true
-    // },
-    "antlr4.generation": {
-        "mode": "internal",
-        "language": "Java",
-        "visitors": true,
-        "outputDir": "./.antlr"
-    }
-}

package/build/antlr4.js

@@ -1,34 +0,0 @@
-const path = require('path');
-const exec = require('child_process').exec;
-
-const antlr4 = path.resolve(__dirname, 'antlr-4.8-complete.jar');
-const grammars = path.resolve(__dirname, '../src/grammar');
-const output = path.resolve(__dirname, '../src/lib');
-
-const entry = [
-    'generic',
-    'hive',
-    'plsql',
-    'spark',
-    'flinksql',
-];
-
-entry.forEach((language) => {
-    const cmd = `
-        java -jar ${antlr4}
-        -Dlanguage=JavaScript 
-        -visitor
-        -listener
-        -o ${output}/${language}
-        ${grammars}/${language}/*.g4 
-    `.replace(/\n/g, '');
-    console.log('cmd:', cmd);
-    exec(cmd, (err) => {
-        if (err) {
-            console.error('Antlr4 build error: ' + language, err);
-        } else {
-            console.log(`Build ${language} success.`);
-        }
-    });
-});
-