@cubejs-backend/schema-compiler 0.30.57 → 0.30.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/dist/src/compiler/CompileError.d.ts +2 -1
- package/dist/src/compiler/CompileError.d.ts.map +1 -1
- package/dist/src/compiler/CompileError.js +2 -1
- package/dist/src/compiler/CompileError.js.map +1 -1
- package/dist/src/compiler/ErrorReporter.d.ts +2 -0
- package/dist/src/compiler/ErrorReporter.d.ts.map +1 -1
- package/dist/src/compiler/ErrorReporter.js +7 -3
- package/dist/src/compiler/ErrorReporter.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,30 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.30.63](https://github.com/cube-js/cube.js/compare/v0.30.62...v0.30.63) (2022-09-05)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @cubejs-backend/schema-compiler
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [0.30.61](https://github.com/cube-js/cube.js/compare/v0.30.60...v0.30.61) (2022-09-01)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @cubejs-backend/schema-compiler
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package @cubejs-backend/schema-compiler
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
6
30
|
## [0.30.57](https://github.com/cube-js/cube.js/compare/v0.30.56...v0.30.57) (2022-08-25)
|
|
7
31
|
|
|
8
32
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare class CompileError extends Error {
|
|
2
2
|
protected readonly messages: string;
|
|
3
|
-
|
|
3
|
+
protected readonly plainMessages?: string | undefined;
|
|
4
|
+
constructor(messages: string, plainMessages?: string | undefined);
|
|
4
5
|
}
|
|
5
6
|
//# sourceMappingURL=CompileError.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompileError.d.ts","sourceRoot":"","sources":["../../../src/compiler/CompileError.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAa,SAAQ,KAAK;IAEnC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"CompileError.d.ts","sourceRoot":"","sources":["../../../src/compiler/CompileError.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAa,SAAQ,KAAK;IAEnC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACnC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC;gBADd,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,oBAAQ;CAI5C"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CompileError = void 0;
|
|
4
4
|
class CompileError extends Error {
|
|
5
|
-
constructor(messages) {
|
|
5
|
+
constructor(messages, plainMessages) {
|
|
6
6
|
super(`Compile errors:\n${messages}`);
|
|
7
7
|
this.messages = messages;
|
|
8
|
+
this.plainMessages = plainMessages;
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
exports.CompileError = CompileError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompileError.js","sourceRoot":"","sources":["../../../src/compiler/CompileError.ts"],"names":[],"mappings":";;;AAAA,MAAa,YAAa,SAAQ,KAAK;IACrC,YACqB,QAAgB;
|
|
1
|
+
{"version":3,"file":"CompileError.js","sourceRoot":"","sources":["../../../src/compiler/CompileError.ts"],"names":[],"mappings":";;;AAAA,MAAa,YAAa,SAAQ,KAAK;IACrC,YACqB,QAAgB,EAChB,aAAsB;QAEzC,KAAK,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;QAHnB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,kBAAa,GAAb,aAAa,CAAS;IAG3C,CAAC;CACF;AAPD,oCAOC"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { SourceLocation } from '@babel/code-frame';
|
|
2
2
|
export interface CompilerErrorInterface {
|
|
3
3
|
message: string;
|
|
4
|
+
plainMessage?: string;
|
|
4
5
|
fileName?: string;
|
|
5
6
|
lineNumber?: string;
|
|
6
7
|
position?: number;
|
|
7
8
|
}
|
|
8
9
|
export interface SyntaxErrorInterface {
|
|
9
10
|
message: string;
|
|
11
|
+
plainMessage?: string;
|
|
10
12
|
loc: SourceLocation | null;
|
|
11
13
|
}
|
|
12
14
|
interface File {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorReporter.d.ts","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKrE,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,cAAc,GAAG,IAAI,CAAC;CAC5B;AAED,UAAU,IAAI;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,oBAAoB;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAC9B;AAED,qBAAa,aAAa;IAQtB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACjC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IATlD,SAAS,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAM;IAEhD,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAM;IAEhD,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAQ;gBAGd,MAAM,GAAE,aAAa,GAAG,IAAW,EACnC,OAAO,GAAE,GAAG,EAAO,EACnB,OAAO,GAAE,oBAE3B;IAII,QAAQ;IAIR,MAAM,CAAC,IAAI,EAAE,IAAI;IAIjB,OAAO,CAAC,CAAC,EAAE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"ErrorReporter.d.ts","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKrE,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,cAAc,GAAG,IAAI,CAAC;CAC5B;AAED,UAAU,IAAI;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,oBAAoB;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAC9B;AAED,qBAAa,aAAa;IAQtB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACjC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IATlD,SAAS,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAM;IAEhD,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAM;IAEhD,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAQ;gBAGd,MAAM,GAAE,aAAa,GAAG,IAAW,EACnC,OAAO,GAAE,GAAG,EAAO,EACnB,OAAO,GAAE,oBAE3B;IAII,QAAQ;IAIR,MAAM,CAAC,IAAI,EAAE,IAAI;IAIjB,OAAO,CAAC,CAAC,EAAE,oBAAoB;IA+B/B,WAAW,CAAC,CAAC,EAAE,oBAAoB;IA0BnC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG;IAiB9D,SAAS,CAAC,OAAO,EAAE,MAAM;IAIzB,UAAU;IASjB,SAAS,CAAC,YAAY,IAAI,aAAa;CAGxC"}
|
|
@@ -27,12 +27,14 @@ class ErrorReporter {
|
|
|
27
27
|
message: e.message,
|
|
28
28
|
highlightCode: true,
|
|
29
29
|
});
|
|
30
|
-
const
|
|
30
|
+
const plainMessage = `Warning: ${e.message} in ${this.file.fileName}`;
|
|
31
|
+
const message = `${plainMessage}\n${codeFrame}`;
|
|
31
32
|
if (this.rootReporter().warnings.find(m => (m.message || m) === message)) {
|
|
32
33
|
return;
|
|
33
34
|
}
|
|
34
35
|
this.rootReporter().warnings.push({
|
|
35
36
|
message,
|
|
37
|
+
plainMessage,
|
|
36
38
|
loc: e.loc,
|
|
37
39
|
});
|
|
38
40
|
this.options.logger(message);
|
|
@@ -51,12 +53,14 @@ class ErrorReporter {
|
|
|
51
53
|
message: e.message,
|
|
52
54
|
highlightCode: true,
|
|
53
55
|
});
|
|
54
|
-
const
|
|
56
|
+
const plainMessage = `Syntax Error: ${e.message} in ${this.file.fileName}`;
|
|
57
|
+
const message = `${plainMessage}\n${codeFrame}`;
|
|
55
58
|
if (this.rootReporter().errors.find(m => (m.message || m) === message)) {
|
|
56
59
|
return;
|
|
57
60
|
}
|
|
58
61
|
this.rootReporter().errors.push({
|
|
59
62
|
message,
|
|
63
|
+
plainMessage,
|
|
60
64
|
});
|
|
61
65
|
}
|
|
62
66
|
else {
|
|
@@ -87,7 +91,7 @@ class ErrorReporter {
|
|
|
87
91
|
}
|
|
88
92
|
throwIfAny() {
|
|
89
93
|
if (this.rootReporter().errors.length) {
|
|
90
|
-
throw new CompileError_1.CompileError(this.rootReporter().errors.map((e) => e.message).join('\n'));
|
|
94
|
+
throw new CompileError_1.CompileError(this.rootReporter().errors.map((e) => e.message).join('\n'), this.rootReporter().errors.map((e) => e.plainMessage).join('\n'));
|
|
91
95
|
}
|
|
92
96
|
}
|
|
93
97
|
rootReporter() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorReporter.js","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":";;;AAAA,kDAAqE;AAErE,2CAAwC;AACxC,iDAA8C;
|
|
1
|
+
{"version":3,"file":"ErrorReporter.js","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube.js schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.30.
|
|
5
|
+
"version": "0.30.63",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.js.git",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@apla/clickhouse": "^1.5.5",
|
|
61
61
|
"@cubejs-backend/linter": "^0.30.0",
|
|
62
|
-
"@cubejs-backend/query-orchestrator": "^0.30.
|
|
62
|
+
"@cubejs-backend/query-orchestrator": "^0.30.63",
|
|
63
63
|
"@types/babel__code-frame": "^7.0.2",
|
|
64
64
|
"@types/babel__generator": "^7.6.2",
|
|
65
65
|
"@types/babel__parser": "^7.1.1",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
".*\\.d\\.ts"
|
|
103
103
|
]
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "4a3227b40d563a9763a21aa7324f94ccb908fbe5"
|
|
106
106
|
}
|