switch to original antlr4 package

Author: KSDaemon

.gitignore

@@ -25,3 +25,4 @@ rust/cubesql/profile.json
 .env
 .vimspector.json
 .claude/settings.local.json
+gen

jest.base.config.js

@@ -15,6 +15,7 @@ module.exports = {
     // @See https://github.com/uuidjs/uuid/issues/451
     '^uuid$': require.resolve('uuid'),
     '^yaml$': require.resolve('yaml'),
+    '^antlr4$': require.resolve('antlr4'),
   },
   setupFiles: ['../../jest.setup.js'],
   snapshotFormat: {

packages/cubejs-schema-compiler/package.json

@@ -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",
@@ -42,7 +42,7 @@
     "@babel/types": "^7.24",
     "@cubejs-backend/native": "1.3.56",
     "@cubejs-backend/shared": "1.3.56",
-    "antlr4ts": "0.5.0-alpha.4",
+    "antlr4": "^4.13.2",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
     "humps": "^2.0.1",
@@ -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",

packages/cubejs-schema-compiler/src/parser/GenericSql.interp

@@ -75,4 +75,4 @@ identifier
 
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 29, 167, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 37, 10, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 45, 10, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 7, 5, 52, 10, 5, 12, 5, 14, 5, 55, 11, 5, 3, 6, 3, 6, 5, 6, 59, 10, 6, 3, 7, 3, 7, 5, 7, 63, 10, 7, 3, 7, 5, 7, 66, 10, 7, 3, 8, 3, 8, 3, 8, 3, 8, 5, 8, 72, 10, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 80, 10, 8, 12, 8, 14, 8, 83, 11, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 92, 10, 9, 12, 9, 14, 9, 95, 11, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9, 114, 10, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 122, 10, 9, 12, 9, 14, 9, 125, 11, 9, 3, 10, 6, 10, 128, 10, 10, 13, 10, 14, 10, 129, 3, 10, 3, 10, 6, 10, 134, 10, 10, 13, 10, 14, 10, 135, 5, 10, 138, 10, 10, 3, 10, 3, 10, 6, 10, 142, 10, 10, 13, 10, 14, 10, 143, 5, 10, 146, 10, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 5, 12, 155, 10, 12, 3, 13, 3, 13, 3, 13, 7, 13, 160, 10, 13, 12, 13, 14, 13, 163, 11, 13, 3, 14, 3, 14, 3, 14, 2, 2, 4, 14, 16, 15, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 2, 4, 3, 2, 15, 20, 4, 2, 25, 25, 27, 27, 2, 179, 2, 36, 3, 2, 2, 2, 4, 38, 3, 2, 2, 2, 6, 46, 3, 2, 2, 2, 8, 48, 3, 2, 2, 2, 10, 58, 3, 2, 2, 2, 12, 60, 3, 2, 2, 2, 14, 71, 3, 2, 2, 2, 16, 113, 3, 2, 2, 2, 18, 145, 3, 2, 2, 2, 20, 147, 3, 2, 2, 2, 22, 154, 3, 2, 2, 2, 24, 156, 3, 2, 2, 2, 26, 164, 3, 2, 2, 2, 28, 29, 5, 4, 3, 2, 29, 30, 7, 2, 2, 3, 30, 37, 3, 2, 2, 2, 31, 32, 7, 3, 2, 2, 32, 33, 5, 4, 3, 2, 33, 34, 7, 4, 2, 2, 34, 35, 7, 2, 2, 3, 35, 37, 3, 2, 2, 2, 36, 28, 3, 2, 2, 2, 36, 31, 3, 2, 2, 2, 37, 3, 3, 2, 2, 2, 38, 39, 7, 7, 2, 2, 39, 40, 5, 8, 5, 2, 40, 41, 7, 9, 2, 2, 41, 44, 5, 6, 4, 2, 42, 43, 7, 10, 2, 2, 43, 45, 5, 14, 8, 2, 44, 42, 3, 2, 2, 2, 44, 45, 3, 2, 2, 2, 45, 5, 3, 2, 2, 2, 46, 47, 5, 12, 7, 2, 47, 7, 3, 2, 2, 2, 48, 53, 5, 10, 6, 2, 49, 50, 7, 5, 2, 2, 50, 52, 5, 10, 6, 2, 51, 49, 3, 2, 2, 2, 52, 55, 3, 2, 2, 2, 53, 51, 3, 2, 2, 2, 53, 54, 3, 2, 2, 2, 54, 9, 3, 2, 2, 2, 55, 53, 3, 2, 2, 2, 56, 59, 5, 12, 7, 2, 57, 59, 7, 8, 2, 2, 58, 56, 3, 2, 2, 2, 58, 57, 3, 2, 2, 2, 59, 11, 3, 2, 2, 2, 60, 65, 5, 24, 13, 2, 61, 63, 7, 14, 2, 2, 62, 61, 3, 2, 2, 2, 62, 63, 3, 2, 2, 2, 63, 64, 3, 2, 2, 2, 64, 66, 5, 26, 14, 2, 65, 62, 3, 2, 2, 2, 65, 66, 3, 2, 2, 2, 66, 13, 3, 2, 2, 2, 67, 68, 8, 8, 1, 2, 68, 72, 5, 16, 9, 2, 69, 70, 7, 13, 2, 2, 70, 72, 5, 14, 8, 3, 71, 67, 3, 2, 2, 2, 71, 69, 3, 2, 2, 2, 72, 81, 3, 2, 2, 2, 73, 74, 12, 5, 2, 2, 74, 75, 7, 11, 2, 2, 75, 80, 5, 14, 8, 6, 76, 77, 12, 4, 2, 2, 77, 78, 7, 12, 2, 2, 78, 80, 5, 14, 8, 5, 79, 73, 3, 2, 2, 2, 79, 76, 3, 2, 2, 2, 80, 83, 3, 2, 2, 2, 81, 79, 3, 2, 2, 2, 81, 82, 3, 2, 2, 2, 82, 15, 3, 2, 2, 2, 83, 81, 3, 2, 2, 2, 84, 85, 8, 9, 1, 2, 85, 114, 5, 24, 13, 2, 86, 87, 5, 26, 14, 2, 87, 88, 7, 3, 2, 2, 88, 93, 5, 16, 9, 2, 89, 90, 7, 5, 2, 2, 90, 92, 5, 16, 9, 2, 91, 89, 3, 2, 2, 2, 92, 95, 3, 2, 2, 2, 93, 91, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 96, 3, 2, 2, 2, 95, 93, 3, 2, 2, 2, 96, 97, 7, 4, 2, 2, 97, 114, 3, 2, 2, 2, 98, 99, 7, 23, 2, 2, 99, 100, 7, 3, 2, 2, 100, 101, 5, 16, 9, 2, 101, 102, 7, 14, 2, 2, 102, 103, 5, 26, 14, 2, 103, 104, 7, 4, 2, 2, 104, 114, 3, 2, 2, 2, 105, 114, 7, 28, 2, 2, 106, 114, 5, 18, 10, 2, 107, 114, 5, 26, 14, 2, 108, 114, 7, 24, 2, 2, 109, 110, 7, 3, 2, 2, 110, 111, 5, 16, 9, 2, 111, 112, 7, 4, 2, 2, 112, 114, 3, 2, 2, 2, 113, 84, 3, 2, 2, 2, 113, 86, 3, 2, 2, 2, 113, 98, 3, 2, 2, 2, 113, 105, 3, 2, 2, 2, 113, 106, 3, 2, 2, 2, 113, 107, 3, 2, 2, 2, 113, 108, 3, 2, 2, 2, 113, 109, 3, 2, 2, 2, 114, 123, 3, 2, 2, 2, 115, 116, 12, 12, 2, 2, 116, 117, 5, 20, 11, 2, 117, 118, 5, 16, 9, 13, 118, 122, 3, 2, 2, 2, 119, 120, 12, 11, 2, 2, 120, 122, 5, 22, 12, 2, 121, 115, 3, 2, 2, 2, 121, 119, 3, 2, 2, 2, 122, 125, 3, 2, 2, 2, 123, 121, 3, 2, 2, 2, 123, 124, 3, 2, 2, 2, 124, 17, 3, 2, 2, 2, 125, 123, 3, 2, 2, 2, 126, 128, 7, 26, 2, 2, 127, 126, 3, 2, 2, 2, 128, 129, 3, 2, 2, 2, 129, 127, 3, 2, 2, 2, 129, 130, 3, 2, 2, 2, 130, 137, 3, 2, 2, 2, 131, 133, 7, 6, 2, 2, 132, 134, 7, 26, 2, 2, 133, 132, 3, 2, 2, 2, 134, 135, 3, 2, 2, 2, 135, 133, 3, 2, 2, 2, 135, 136, 3, 2, 2, 2, 136, 138, 3, 2, 2, 2, 137, 131, 3, 2, 2, 2, 137, 138, 3, 2, 2, 2, 138, 146, 3, 2, 2, 2, 139, 141, 7, 6, 2, 2, 140, 142, 7, 26, 2, 2, 141, 140, 3, 2, 2, 2, 142, 143, 3, 2, 2, 2, 143, 141, 3, 2, 2, 2, 143, 144, 3, 2, 2, 2, 144, 146, 3, 2, 2, 2, 145, 127, 3, 2, 2, 2, 145, 139, 3, 2, 2, 2, 146, 19, 3, 2, 2, 2, 147, 148, 9, 2, 2, 2, 148, 21, 3, 2, 2, 2, 149, 150, 7, 21, 2, 2, 150, 155, 7, 22, 2, 2, 151, 152, 7, 21, 2, 2, 152, 153, 7, 13, 2, 2, 153, 155, 7, 22, 2, 2, 154, 149, 3, 2, 2, 2, 154, 151, 3, 2, 2, 2, 155, 23, 3, 2, 2, 2, 156, 161, 5, 26, 14, 2, 157, 158, 7, 6, 2, 2, 158, 160, 5, 26, 14, 2, 159, 157, 3, 2, 2, 2, 160, 163, 3, 2, 2, 2, 161, 159, 3, 2, 2, 2, 161, 162, 3, 2, 2, 2, 162, 25, 3, 2, 2, 2, 163, 161, 3, 2, 2, 2, 164, 165, 9, 3, 2, 2, 165, 27, 3, 2, 2, 2, 22, 36, 44, 53, 58, 62, 65, 71, 79, 81, 93, 113, 121, 123, 129, 135, 137, 143, 145, 154, 161]
+[4, 1, 27, 165, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 35, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 43, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 5, 3, 50, 8, 3, 10, 3, 12, 3, 53, 9, 3, 1, 4, 1, 4, 3, 4, 57, 8, 4, 1, 5, 1, 5, 3, 5, 61, 8, 5, 1, 5, 3, 5, 64, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 70, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 78, 8, 6, 10, 6, 12, 6, 81, 9, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 90, 8, 7, 10, 7, 12, 7, 93, 9, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 112, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 120, 8, 7, 10, 7, 12, 7, 123, 9, 7, 1, 8, 4, 8, 126, 8, 8, 11, 8, 12, 8, 127, 1, 8, 1, 8, 4, 8, 132, 8, 8, 11, 8, 12, 8, 133, 3, 8, 136, 8, 8, 1, 8, 1, 8, 4, 8, 140, 8, 8, 11, 8, 12, 8, 141, 3, 8, 144, 8, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 153, 8, 10, 1, 11, 1, 11, 1, 11, 5, 11, 158, 8, 11, 10, 11, 12, 11, 161, 9, 11, 1, 12, 1, 12, 1, 12, 0, 2, 12, 14, 13, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 0, 2, 1, 0, 13, 18, 2, 0, 23, 23, 25, 25, 177, 0, 34, 1, 0, 0, 0, 2, 36, 1, 0, 0, 0, 4, 44, 1, 0, 0, 0, 6, 46, 1, 0, 0, 0, 8, 56, 1, 0, 0, 0, 10, 58, 1, 0, 0, 0, 12, 69, 1, 0, 0, 0, 14, 111, 1, 0, 0, 0, 16, 143, 1, 0, 0, 0, 18, 145, 1, 0, 0, 0, 20, 152, 1, 0, 0, 0, 22, 154, 1, 0, 0, 0, 24, 162, 1, 0, 0, 0, 26, 27, 3, 2, 1, 0, 27, 28, 5, 0, 0, 1, 28, 35, 1, 0, 0, 0, 29, 30, 5, 1, 0, 0, 30, 31, 3, 2, 1, 0, 31, 32, 5, 2, 0, 0, 32, 33, 5, 0, 0, 1, 33, 35, 1, 0, 0, 0, 34, 26, 1, 0, 0, 0, 34, 29, 1, 0, 0, 0, 35, 1, 1, 0, 0, 0, 36, 37, 5, 5, 0, 0, 37, 38, 3, 6, 3, 0, 38, 39, 5, 7, 0, 0, 39, 42, 3, 4, 2, 0, 40, 41, 5, 8, 0, 0, 41, 43, 3, 12, 6, 0, 42, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 3, 1, 0, 0, 0, 44, 45, 3, 10, 5, 0, 45, 5, 1, 0, 0, 0, 46, 51, 3, 8, 4, 0, 47, 48, 5, 3, 0, 0, 48, 50, 3, 8, 4, 0, 49, 47, 1, 0, 0, 0, 50, 53, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 7, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 54, 57, 3, 10, 5, 0, 55, 57, 5, 6, 0, 0, 56, 54, 1, 0, 0, 0, 56, 55, 1, 0, 0, 0, 57, 9, 1, 0, 0, 0, 58, 63, 3, 22, 11, 0, 59, 61, 5, 12, 0, 0, 60, 59, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 64, 3, 24, 12, 0, 63, 60, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 11, 1, 0, 0, 0, 65, 66, 6, 6, -1, 0, 66, 70, 3, 14, 7, 0, 67, 68, 5, 11, 0, 0, 68, 70, 3, 12, 6, 1, 69, 65, 1, 0, 0, 0, 69, 67, 1, 0, 0, 0, 70, 79, 1, 0, 0, 0, 71, 72, 10, 3, 0, 0, 72, 73, 5, 9, 0, 0, 73, 78, 3, 12, 6, 4, 74, 75, 10, 2, 0, 0, 75, 76, 5, 10, 0, 0, 76, 78, 3, 12, 6, 3, 77, 71, 1, 0, 0, 0, 77, 74, 1, 0, 0, 0, 78, 81, 1, 0, 0, 0, 79, 77, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 13, 1, 0, 0, 0, 81, 79, 1, 0, 0, 0, 82, 83, 6, 7, -1, 0, 83, 112, 3, 22, 11, 0, 84, 85, 3, 24, 12, 0, 85, 86, 5, 1, 0, 0, 86, 91, 3, 14, 7, 0, 87, 88, 5, 3, 0, 0, 88, 90, 3, 14, 7, 0, 89, 87, 1, 0, 0, 0, 90, 93, 1, 0, 0, 0, 91, 89, 1, 0, 0, 0, 91, 92, 1, 0, 0, 0, 92, 94, 1, 0, 0, 0, 93, 91, 1, 0, 0, 0, 94, 95, 5, 2, 0, 0, 95, 112, 1, 0, 0, 0, 96, 97, 5, 21, 0, 0, 97, 98, 5, 1, 0, 0, 98, 99, 3, 14, 7, 0, 99, 100, 5, 12, 0, 0, 100, 101, 3, 24, 12, 0, 101, 102, 5, 2, 0, 0, 102, 112, 1, 0, 0, 0, 103, 112, 5, 26, 0, 0, 104, 112, 3, 16, 8, 0, 105, 112, 3, 24, 12, 0, 106, 112, 5, 22, 0, 0, 107, 108, 5, 1, 0, 0, 108, 109, 3, 14, 7, 0, 109, 110, 5, 2, 0, 0, 110, 112, 1, 0, 0, 0, 111, 82, 1, 0, 0, 0, 111, 84, 1, 0, 0, 0, 111, 96, 1, 0, 0, 0, 111, 103, 1, 0, 0, 0, 111, 104, 1, 0, 0, 0, 111, 105, 1, 0, 0, 0, 111, 106, 1, 0, 0, 0, 111, 107, 1, 0, 0, 0, 112, 121, 1, 0, 0, 0, 113, 114, 10, 10, 0, 0, 114, 115, 3, 18, 9, 0, 115, 116, 3, 14, 7, 11, 116, 120, 1, 0, 0, 0, 117, 118, 10, 9, 0, 0, 118, 120, 3, 20, 10, 0, 119, 113, 1, 0, 0, 0, 119, 117, 1, 0, 0, 0, 120, 123, 1, 0, 0, 0, 121, 119, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 15, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 124, 126, 5, 24, 0, 0, 125, 124, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 135, 1, 0, 0, 0, 129, 131, 5, 4, 0, 0, 130, 132, 5, 24, 0, 0, 131, 130, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 131, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 136, 1, 0, 0, 0, 135, 129, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 144, 1, 0, 0, 0, 137, 139, 5, 4, 0, 0, 138, 140, 5, 24, 0, 0, 139, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 139, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 144, 1, 0, 0, 0, 143, 125, 1, 0, 0, 0, 143, 137, 1, 0, 0, 0, 144, 17, 1, 0, 0, 0, 145, 146, 7, 0, 0, 0, 146, 19, 1, 0, 0, 0, 147, 148, 5, 19, 0, 0, 148, 153, 5, 20, 0, 0, 149, 150, 5, 19, 0, 0, 150, 151, 5, 11, 0, 0, 151, 153, 5, 20, 0, 0, 152, 147, 1, 0, 0, 0, 152, 149, 1, 0, 0, 0, 153, 21, 1, 0, 0, 0, 154, 159, 3, 24, 12, 0, 155, 156, 5, 4, 0, 0, 156, 158, 3, 24, 12, 0, 157, 155, 1, 0, 0, 0, 158, 161, 1, 0, 0, 0, 159, 157, 1, 0, 0, 0, 159, 160, 1, 0, 0, 0, 160, 23, 1, 0, 0, 0, 161, 159, 1, 0, 0, 0, 162, 163, 7, 1, 0, 0, 163, 25, 1, 0, 0, 0, 20, 34, 42, 51, 56, 60, 63, 69, 77, 79, 91, 111, 119, 121, 127, 133, 135, 141, 143, 152, 159]