@cubejs-backend/schema-compiler 1.3.55 → 1.3.57

package/dist/src/parser/PythonParser.js

@@ -22,13 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PythonParser = void 0;
 /* eslint-disable no-underscore-dangle,camelcase */
-const antlr4ts_1 = require("antlr4ts");
+const antlr4_1 = require("antlr4");
 const t = __importStar(require("@babel/types"));
-const Python3Lexer_1 = require("./Python3Lexer");
-const Python3Parser_1 = require("./Python3Parser");
+const Python3Lexer_1 = __importDefault(require("./Python3Lexer"));
+const Python3Parser_1 = __importStar(require("./Python3Parser"));
 const UserError_1 = require("../compiler/UserError");
 const nodeVisitor = (visitor) => ({
     // TODO null -- note used?
@@ -40,10 +43,12 @@ const nodeVisitor = (visitor) => ({
             return null;
         }
         const result = [];
-        for (let i = 0; i < node.childCount; i++) {
-            const child = node.getChild(i);
-            if (child?.childCount) {
-                result.push(child.accept(this));
+        if (node.children) {
+            for (let i = 0; i < node.children.length; i++) {
+                const child = node.children[i];
+                if (child && child.children && child.children.length > 0) {
+                    result.push(child.accept(this));
+                }
             }
         }
         return visitor.visitNode(node, result);
@@ -60,10 +65,8 @@ class PythonParser {
     }
     parse() {
         const { codeString } = this;
-        const chars = antlr4ts_1.CharStreams.fromString(codeString);
-        chars.getText = (interval) => {
-            const start = interval.a;
-            let stop = interval.b;
+        const chars = new antlr4_1.CharStream(codeString);
+        chars.getText = (start, stop) => {
             if (stop >= chars.size) {
                 stop = chars.size - 1;
             }
@@ -81,13 +84,22 @@ class PythonParser {
                     msg, column, err, line, recognizer, offendingSymbol
                 });
             }
+            reportAmbiguity(recognizer, dfa, startIndex, stopIndex, exact, ambigAlts, configs) {
+                // Optional: log ambiguity warnings if needed
+            }
+            reportAttemptingFullContext(recognizer, dfa, startIndex, stopIndex, conflictingAlts, configs) {
+                // Optional: log full context attempts if needed
+            }
+            reportContextSensitivity(recognizer, dfa, startIndex, stopIndex, prediction, configs) {
+                // Optional: log context sensitivity if needed
+            }
         }
-        const lexer = new Python3Lexer_1.Python3Lexer(chars);
+        const lexer = new Python3Lexer_1.default(chars);
         lexer.removeErrorListeners();
         lexer.addErrorListener(new ExprErrorListener());
-        const commonTokenStream = new antlr4ts_1.CommonTokenStream(lexer);
-        const parser = new Python3Parser_1.Python3Parser(commonTokenStream);
-        parser.buildParseTree = true;
+        const commonTokenStream = new antlr4_1.CommonTokenStream(lexer);
+        const parser = new Python3Parser_1.default(commonTokenStream);
+        parser.buildParseTrees = true;
         parser.removeErrorListeners();
         parser.addErrorListener(new ExprErrorListener());
         return parser.file_input();
@@ -100,7 +112,7 @@ class PythonParser {
                         return children[0];
                     }
                     else {
-                        throw new UserError_1.UserError(`Unsupported Python multiple children node: ${node.constructor.name}: ${node.text}`);
+                        throw new UserError_1.UserError(`Unsupported Python multiple children node: ${node.constructor.name}: ${node.getText()}`);
                     }
                 };
                 if (node instanceof Python3Parser_1.File_inputContext) {
@@ -111,7 +123,7 @@ class PythonParser {
                         return t.expressionStatement(children[0]);
                     }
                     else {
-                        throw new UserError_1.UserError(`Unsupported Python multiple children node: ${node.constructor.name}: ${node.text}`);
+                        throw new UserError_1.UserError(`Unsupported Python multiple children node: ${node.constructor.name}: ${node.getText()}`);
                     }
                 }
                 else if (node instanceof Python3Parser_1.Double_string_template_atomContext ||
@@ -119,7 +131,7 @@ class PythonParser {
                     if ((node.test() || node.star_expr()) && children.length === 1) {
                         return children[0];
                     }
-                    return t.templateElement({ raw: node.text, cooked: node.text });
+                    return t.templateElement({ raw: node.getText(), cooked: node.getText() });
                 }
                 else if (node instanceof Python3Parser_1.String_templateContext) {
                     if (children[children.length - 1].type === 'TemplateElement') {
@@ -153,17 +165,23 @@ class PythonParser {
                         return expr;
                     }
                     else {
-                        throw new UserError_1.UserError(`Empty Python atom_expr node: ${node.constructor.name}: ${node.text}`);
+                        throw new UserError_1.UserError(`Empty Python atom_expr node: ${node.constructor.name}: ${node.getText()}`);
                     }
                 }
                 else if (node instanceof Python3Parser_1.AtomContext) {
                     const name = node.NAME();
-                    const string = node.STRING();
+                    const stringList = node.STRING_list();
+                    const number = node.NUMBER();
                     if (name) {
-                        return t.identifier(name.text);
+                        return t.identifier(name.getText());
+                    }
+                    else if (stringList && stringList.length) {
+                        return t.stringLiteral(stringList.map(s => this.stripQuotes(s.getText())).join(''));
                     }
-                    else if (string?.length) {
-                        return t.stringLiteral(string.map(s => this.stripQuotes(s.text)).join(''));
+                    else if (number) {
+                        const numText = number.getText();
+                        const numValue = parseFloat(numText);
+                        return t.numericLiteral(numValue);
                     }
                     else {
                         return singleNodeReturn();
@@ -189,19 +207,19 @@ class PythonParser {
                         return children[0];
                     }
                     else if (name) {
-                        return { identifier: t.identifier(name.text) };
+                        return { identifier: t.identifier(name.getText()) };
                     }
                     else {
-                        throw new UserError_1.UserError(`Unsupported Python Trailer children node: ${node.constructor.name}: ${node.text}`);
+                        throw new UserError_1.UserError(`Unsupported Python Trailer children node: ${node.constructor.name}: ${node.getText()}`);
                     }
                 }
                 else if (node instanceof Python3Parser_1.VfpdefContext) {
                     const name = node.NAME();
                     if (name) {
-                        return t.identifier(name.text);
+                        return t.identifier(name.getText());
                     }
                     else {
-                        throw new UserError_1.UserError(`Unsupported Python vfpdef children node: ${node.constructor.name}: ${node.text}`);
+                        throw new UserError_1.UserError(`Unsupported Python vfpdef children node: ${node.constructor.name}: ${node.getText()}`);
                     }
                 }
                 else if (node instanceof Python3Parser_1.VarargslistContext) {

package/dist/src/parser/PythonParser.js.map

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

package/dist/src/parser/SqlParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqlParser.d.ts","sourceRoot":"","sources":["../../../src/parser/SqlParser.ts"],"names":[],"mappings":"AAMA,OAAO,EAML,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AA8B5B,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,eAAe,EAAE,GAAG,CAAC;CACtB;AAED,qBAAa,SAAS;IAMlB,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IALhC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAEzC,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,CAAM;gBAGhB,GAAG,EAAE,MAAM;IAKhC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAA;IA4BjC,SAAS,CAAC,KAAK;IA2CR,QAAQ;IAIR,gBAAgB;IAQhB,qBAAqB,IAAI,OAAO;IAqBhC,sBAAsB,CAAC,UAAU,KAAA,GAAG,MAAM;IAuD1C,gBAAgB,IAAI,MAAM,GAAG,IAAI;CAgBzC"}
+{"version":3,"file":"SqlParser.d.ts","sourceRoot":"","sources":["../../../src/parser/SqlParser.ts"],"names":[],"mappings":"AAKA,OAAyB,EAKvB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAgC5B,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,eAAe,EAAE,GAAG,CAAC;CACtB;AAED,qBAAa,SAAS;IAMlB,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IALhC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAEzC,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,CAAM;gBAGhB,GAAG,EAAE,MAAM;IAKhC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,KAAA;IA4BjC,SAAS,CAAC,KAAK;IAoDR,QAAQ;IAIR,gBAAgB;IAQhB,qBAAqB,IAAI,OAAO;IAqBhC,sBAAsB,CAAC,UAAU,KAAA,GAAG,MAAM;IAwD1C,gBAAgB,IAAI,MAAM,GAAG,IAAI;CAgBzC"}

package/dist/src/parser/SqlParser.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,9 +29,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlParser = void 0;
 /* eslint-disable no-underscore-dangle */
 const ramda_1 = __importDefault(require("ramda"));
-const antlr4ts_1 = require("antlr4ts");
-const GenericSqlLexer_1 = require("./GenericSqlLexer");
-const GenericSqlParser_1 = require("./GenericSqlParser");
+const antlr4_1 = require("antlr4");
+const GenericSqlLexer_1 = __importDefault(require("./GenericSqlLexer"));
+const GenericSqlParser_1 = __importStar(require("./GenericSqlParser"));
 const UserError_1 = require("../compiler/UserError");
 const nodeVisitor = (visitor) => ({
     visit: () => {
@@ -25,10 +48,12 @@ const nodeVisitor = (visitor) => ({
             return;
         }
         visitor.visitNode(node);
-        for (let i = 0; i < node.childCount; i++) {
-            const child = node.getChild(i);
-            if (child && child.childCount) {
-                child.accept(this);
+        if (node.children) {
+            for (let i = 0; i < node.children.length; i++) {
+                const child = node.children[i];
+                if (child && child.children && child.children.length > 0) {
+                    child.accept(this);
+                }
             }
         }
     }
@@ -69,10 +94,8 @@ class SqlParser {
     }
     parse() {
         const { sql } = this;
-        const chars = antlr4ts_1.CharStreams.fromString(SqlParser.sqlUpperCase(sql));
-        chars.getText = (interval) => {
-            const start = interval.a;
-            let stop = interval.b;
+        const chars = new antlr4_1.CharStream(SqlParser.sqlUpperCase(sql));
+        chars.getText = (start, stop) => {
             if (stop >= chars.size) {
                 stop = chars.size - 1;
             }
@@ -90,12 +113,21 @@ class SqlParser {
                     msg, column, err, line, recognizer, offendingSymbol
                 });
             }
+            reportAmbiguity(recognizer, dfa, startIndex, stopIndex, exact, ambigAlts, configs) {
+                // Optional: log ambiguity warnings if needed
+            }
+            reportAttemptingFullContext(recognizer, dfa, startIndex, stopIndex, conflictingAlts, configs) {
+                // Optional: log full context attempts if needed
+            }
+            reportContextSensitivity(recognizer, dfa, startIndex, stopIndex, prediction, configs) {
+                // Optional: log context sensitivity if needed
+            }
         }
-        const lexer = new GenericSqlLexer_1.GenericSqlLexer(chars);
+        const lexer = new GenericSqlLexer_1.default(chars);
         lexer.removeErrorListeners();
         lexer.addErrorListener(new ExprErrorListener());
-        const parser = new GenericSqlParser_1.GenericSqlParser(new antlr4ts_1.CommonTokenStream(lexer));
-        parser.buildParseTree = true;
+        const parser = new GenericSqlParser_1.default(new antlr4_1.CommonTokenStream(lexer));
+        parser.buildParseTrees = true;
         parser.removeErrorListeners();
         parser.addErrorListener(new ExprErrorListener());
         return parser.statement();
@@ -116,8 +148,8 @@ class SqlParser {
         this.ast.accept(nodeVisitor({
             visitNode(ctx) {
                 if (ctx instanceof GenericSqlParser_1.QueryContext) {
-                    const selectItems = ctx.tryGetRuleContext(0, GenericSqlParser_1.SelectFieldsContext);
-                    if (selectItems && selectItems.text === '*') {
+                    const selectItems = ctx.getTypedRuleContext(GenericSqlParser_1.SelectFieldsContext, 0);
+                    if (selectItems && selectItems.getText() === '*') {
                         result = true;
                     }
                 }
@@ -135,38 +167,39 @@ class SqlParser {
         const whereBuildingVisitor = nodeVisitor({
             visitNode(ctx) {
                 if (ctx instanceof GenericSqlParser_1.IdPathContext) {
-                    result += sql.substring(cursor, ctx.start.startIndex);
-                    cursor = ctx.start.startIndex;
-                    const child = ctx.getChild(0);
-                    if (child && child.text === originalAlias) {
-                        const withoutFirst = ramda_1.default.drop(1, ctx.children);
-                        result += [tableAlias].concat(withoutFirst.map(c => c.text)).join('');
-                        cursor = ctx.stop?.stopIndex + 1;
+                    result += sql.substring(cursor, ctx.start.start);
+                    cursor = ctx.start.start;
+                    const { children } = ctx;
+                    const child = children ? children[0] : null;
+                    if (child && child.getText() === originalAlias) {
+                        const withoutFirst = ramda_1.default.drop(1, ctx.children || []);
+                        result += [tableAlias].concat(withoutFirst.map((c) => c.getText())).join('');
+                        cursor = (ctx.stop?.stop || 0) + 1;
                     }
-                    else if (ctx.childCount === 1) {
-                        result += [tableAlias, '.'].concat(ctx.children?.map(c => c.text)).join('');
-                        cursor = ctx.stop?.stopIndex + 1;
+                    else if (children && children.length === 1) {
+                        result += [tableAlias, '.'].concat(children?.map((c) => c.getText())).join('');
+                        cursor = (ctx.stop?.stop || 0) + 1;
                     }
                     else {
-                        result += sql.substring(cursor, ctx.stop?.stopIndex);
-                        cursor = ctx.stop?.stopIndex;
+                        result += sql.substring(cursor, ctx.stop?.stop);
+                        cursor = ctx.stop?.stop;
                     }
                 }
             }
         });
         this.ast.accept(nodeVisitor({
             visitNode(ctx) {
-                if (ctx instanceof GenericSqlParser_1.QueryContext && ctx._from && ctx._where) {
-                    const aliasField = ctx._from.getRuleContext(0, GenericSqlParser_1.AliasFieldContext);
-                    const lastNode = aliasField.getChild(aliasField.childCount - 1);
+                if (ctx instanceof GenericSqlParser_1.QueryContext && ctx._from_ && ctx._where) {
+                    const aliasField = ctx._from_.getTypedRuleContext(GenericSqlParser_1.AliasFieldContext, 0);
+                    const lastNode = aliasField.children ? aliasField.children[aliasField.children.length - 1] : null;
                     if (lastNode instanceof GenericSqlParser_1.IdPathContext) {
-                        originalAlias = lastNode.getChild(lastNode.childCount - 1).text;
+                        originalAlias = lastNode.children ? lastNode.children[lastNode.children.length - 1].getText() : '';
                     }
                     else {
-                        originalAlias = lastNode.text;
+                        originalAlias = lastNode ? lastNode.getText() : '';
                     }
-                    cursor = ctx._where.start.startIndex;
-                    end = ctx._where.stop?.stopIndex + 1;
+                    cursor = ctx._where.start.start;
+                    end = (ctx._where.stop?.stop || 0) + 1;
                     ctx._where.accept(whereBuildingVisitor);
                 }
             }
@@ -179,9 +212,9 @@ class SqlParser {
         let result = null;
         this.ast.accept(nodeVisitor({
             visitNode(ctx) {
-                if (ctx instanceof GenericSqlParser_1.QueryContext && ctx._from) {
-                    const aliasField = ctx._from.getRuleContext(0, GenericSqlParser_1.AliasFieldContext);
-                    result = aliasField.getChild(0).text;
+                if (ctx instanceof GenericSqlParser_1.QueryContext && ctx._from_) {
+                    const aliasField = ctx._from_.getTypedRuleContext(GenericSqlParser_1.AliasFieldContext, 0);
+                    result = aliasField.children ? aliasField.children[0].getText() : null;
                 }
             }
         }));

package/dist/src/parser/SqlParser.js.map

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/schema-compiler",
   "description": "Cube schema compiler",
   "author": "Cube Dev, Inc.",
-  "version": "1.3.55",
+  "version": "1.3.57",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -18,7 +18,7 @@
   "typings": "dist/src/index.d.ts",
   "scripts": {
     "build": "rm -rf dist && npm run tsc",
-    "generate": "antlr4ts -visitor src/parser/GenericSql.g4 src/parser/Python3Lexer.g4 src/parser/Python3Parser.g4",
+    "generate": "antlr4 -Dlanguage=TypeScript -visitor src/parser/GenericSql.g4 src/parser/Python3Lexer.g4 src/parser/Python3Parser.g4",
     "tsc": "tsc",
     "watch": "tsc -w",
     "test": "npm run unit && npm run integration",
@@ -40,9 +40,9 @@
     "@babel/standalone": "^7.24",
     "@babel/traverse": "^7.24",
     "@babel/types": "^7.24",
-    "@cubejs-backend/native": "1.3.55",
-    "@cubejs-backend/shared": "1.3.55",
-    "antlr4ts": "0.5.0-alpha.4",
+    "@cubejs-backend/native": "1.3.57",
+    "@cubejs-backend/shared": "1.3.57",
+    "antlr4": "^4.13.2",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
     "humps": "^2.0.1",
@@ -60,8 +60,8 @@
   },
   "devDependencies": {
     "@clickhouse/client": "^1.12.0",
-    "@cubejs-backend/linter": "1.3.55",
-    "@cubejs-backend/query-orchestrator": "1.3.55",
+    "@cubejs-backend/linter": "1.3.57",
+    "@cubejs-backend/query-orchestrator": "1.3.57",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.5",
@@ -74,7 +74,6 @@
     "@types/sqlstring": "^2.3.0",
     "@types/syntax-error": "^1.4.1",
     "@types/uuid": "^8.3.0",
-    "antlr4ts-cli": "^0.5.0-alpha.4",
     "jest": "^29",
     "mssql": "^10.0.2",
     "mysql": "^2.18.1",
@@ -89,5 +88,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "0782319e5ec9ab1f3274322d1730242fa6186513"
+  "gitHead": "909f2a7f438c876c9836e2fa2021f559355c676a"
 }