@cubejs-backend/schema-compiler 1.0.8 → 1.0.10
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/dist/src/compiler/DataSchemaCompiler.d.ts +9 -5
- package/dist/src/compiler/DataSchemaCompiler.d.ts.map +1 -1
- package/dist/src/compiler/DataSchemaCompiler.js +65 -12
- package/dist/src/compiler/DataSchemaCompiler.js.map +1 -1
- package/dist/src/compiler/ErrorReporter.d.ts +6 -1
- package/dist/src/compiler/ErrorReporter.d.ts.map +1 -1
- package/dist/src/compiler/ErrorReporter.js +3 -4
- package/dist/src/compiler/ErrorReporter.js.map +1 -1
- package/dist/src/compiler/PrepareCompiler.d.ts.map +1 -1
- package/dist/src/compiler/PrepareCompiler.js +4 -2
- package/dist/src/compiler/PrepareCompiler.js.map +1 -1
- package/dist/src/compiler/transpilers/transpiler_worker.js +1 -1
- package/dist/src/compiler/transpilers/transpiler_worker.js.map +1 -1
- package/package.json +6 -6
|
@@ -21,6 +21,7 @@ export class DataSchemaCompiler {
|
|
|
21
21
|
yamlCompiler: any;
|
|
22
22
|
pythonContext: any;
|
|
23
23
|
workerPool: import("workerpool/types/Pool") | null;
|
|
24
|
+
compilerId: any;
|
|
24
25
|
compileObjects(compileServices: any, objects: any, errorsReport: any): any;
|
|
25
26
|
/**
|
|
26
27
|
* @protected
|
|
@@ -29,14 +30,17 @@ export class DataSchemaCompiler {
|
|
|
29
30
|
/**
|
|
30
31
|
* @protected
|
|
31
32
|
*/
|
|
32
|
-
protected doCompile(): Promise<
|
|
33
|
+
protected doCompile(): Promise<any>;
|
|
33
34
|
errorsReport: ErrorReporter | undefined;
|
|
34
|
-
compile(): Promise<
|
|
35
|
-
compilePromise: Promise<
|
|
35
|
+
compile(): Promise<any>;
|
|
36
|
+
compilePromise: Promise<any> | undefined;
|
|
36
37
|
transpileFile(file: any, errorsReport: any, options: any): Promise<any>;
|
|
37
|
-
transpileJsFile(file: any, errorsReport: any, { cubeNames,
|
|
38
|
+
transpileJsFile(file: any, errorsReport: any, { cubeNames, cubeSymbols, contextSymbols, transpilerNames, compilerId }: {
|
|
38
39
|
cubeNames: any;
|
|
39
|
-
|
|
40
|
+
cubeSymbols: any;
|
|
41
|
+
contextSymbols: any;
|
|
42
|
+
transpilerNames: any;
|
|
43
|
+
compilerId: any;
|
|
40
44
|
}): Promise<any>;
|
|
41
45
|
withQuery(query: any, fn: any): any;
|
|
42
46
|
currentQuery: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSchemaCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/DataSchemaCompiler.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DataSchemaCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/DataSchemaCompiler.js"],"names":[],"mappings":"AAsBA;IACE,2CAwBC;IAvBC,gBAA4B;IAC5B,mBAAgD;IAChD,sBAAsD;IACtD,iBAA4C;IAC5C,+BAAwE;IACxE,uBAAwD;IACxD,gBAA0C;IAC1C,oBAA4C;IAC5C,iBAAsC;IACtC,iBAAsC;IACtC,oBAA4C;IAC5C,gBAAoC;IACpC,sBAAgD;IAChD,oBAA4C;IAC5C,mBAA0C;IAC1C,iBAAsC;IACtC,gBAAoC;IACpC,oBAA4C;IAC5C,kBAAwC;IAExC,mBAAyB;IACzB,mDAAsB;IACtB,gBAAoC;IAGtC,2EAYC;IAED;;OAEG;IACH,uEAcC;IAED;;OAEG;IACH,oCAgGC;IAvFC,wCAAgC;IAyFlC,wBAWC;IATG,yCAKE;IAMN,wEAuBC;IAED;;;;;;qBAkEC;IAED,oCAQC;IANC,kBAAyB;IAQ3B,oBAEC;IAED,kFAuBC;IAED,yBAEC;IAED,gJAgCC;IAED,kJAgEC;IAID,6DAIC;IAED,oCAMC;IAED,6FAoDC;IAED,qDAgBC;IAED,gDAGC;CACF;8BA/f6B,iBAAiB"}
|
|
@@ -14,8 +14,10 @@ const traverse_1 = __importDefault(require("@babel/traverse"));
|
|
|
14
14
|
const ramda_1 = __importDefault(require("ramda"));
|
|
15
15
|
const workerpool_1 = __importDefault(require("workerpool"));
|
|
16
16
|
const shared_1 = require("@cubejs-backend/shared");
|
|
17
|
+
const native_1 = require("@cubejs-backend/native");
|
|
17
18
|
const UserError_1 = require("./UserError");
|
|
18
19
|
const ErrorReporter_1 = require("./ErrorReporter");
|
|
20
|
+
const CubeSymbols_1 = require("./CubeSymbols");
|
|
19
21
|
const NATIVE_IS_SUPPORTED = (0, shared_1.isNativeSupported)();
|
|
20
22
|
const moduleFileCache = {};
|
|
21
23
|
const JINJA_SYNTAX = /{%|%}|{{|}}/ig;
|
|
@@ -43,6 +45,7 @@ class DataSchemaCompiler {
|
|
|
43
45
|
this.yamlCompiler.dataSchemaCompiler = this;
|
|
44
46
|
this.pythonContext = null;
|
|
45
47
|
this.workerPool = null;
|
|
48
|
+
this.compilerId = options.compilerId;
|
|
46
49
|
}
|
|
47
50
|
compileObjects(compileServices, objects, errorsReport) {
|
|
48
51
|
try {
|
|
@@ -82,14 +85,19 @@ class DataSchemaCompiler {
|
|
|
82
85
|
const toCompile = files.filter((f) => !this.filesToCompile || this.filesToCompile.indexOf(f.fileName) !== -1);
|
|
83
86
|
const errorsReport = new ErrorReporter_1.ErrorReporter(null, [], this.errorReport);
|
|
84
87
|
this.errorsReport = errorsReport;
|
|
85
|
-
|
|
88
|
+
const transpilationWorkerThreads = (0, shared_1.getEnv)('transpilationWorkerThreads');
|
|
89
|
+
const transpilationNative = (0, shared_1.getEnv)('transpilationNative');
|
|
90
|
+
const { compilerId } = this;
|
|
91
|
+
if (!transpilationNative && transpilationWorkerThreads) {
|
|
86
92
|
const wc = (0, shared_1.getEnv)('transpilationWorkerThreadsCount');
|
|
87
93
|
this.workerPool = workerpool_1.default.pool(path_1.default.join(__dirname, 'transpilers/transpiler_worker'), wc > 0 ? { maxWorkers: wc } : undefined);
|
|
88
94
|
}
|
|
89
95
|
const transpile = async () => {
|
|
90
96
|
let cubeNames;
|
|
91
|
-
let
|
|
92
|
-
|
|
97
|
+
let cubeSymbols;
|
|
98
|
+
let transpilerNames;
|
|
99
|
+
let results;
|
|
100
|
+
if (transpilationNative || transpilationWorkerThreads) {
|
|
93
101
|
cubeNames = Object.keys(this.cubeDictionary.byId);
|
|
94
102
|
// We need only cubes and all its member names for transpiling.
|
|
95
103
|
// Cubes doesn't change during transpiling, but are changed during compilation phase,
|
|
@@ -97,10 +105,26 @@ class DataSchemaCompiler {
|
|
|
97
105
|
// Communication between main and worker threads uses
|
|
98
106
|
// The structured clone algorithm (@see https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm)
|
|
99
107
|
// which doesn't allow passing any function objects, so we need to sanitize the symbols.
|
|
100
|
-
|
|
108
|
+
cubeSymbols = Object.fromEntries(Object.entries(this.cubeSymbols.symbols)
|
|
101
109
|
.map(([key, value]) => [key, Object.fromEntries(Object.keys(value).map((k) => [k, true]))]));
|
|
110
|
+
// Transpilers are the same for all files within phase.
|
|
111
|
+
transpilerNames = this.transpilers.map(t => t.constructor.name);
|
|
112
|
+
}
|
|
113
|
+
if (transpilationNative) {
|
|
114
|
+
// Warming up swc compiler cache
|
|
115
|
+
const dummyFile = {
|
|
116
|
+
fileName: 'dummy.js',
|
|
117
|
+
content: ';',
|
|
118
|
+
};
|
|
119
|
+
await this.transpileJsFile(dummyFile, errorsReport, { cubeNames, cubeSymbols, transpilerNames, contextSymbols: CubeSymbols_1.CONTEXT_SYMBOLS, compilerId });
|
|
120
|
+
results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, { transpilerNames, compilerId })));
|
|
121
|
+
}
|
|
122
|
+
else if (transpilationWorkerThreads) {
|
|
123
|
+
results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, { cubeNames, cubeSymbols, transpilerNames })));
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, {})));
|
|
102
127
|
}
|
|
103
|
-
const results = await Promise.all(toCompile.map(f => this.transpileFile(f, errorsReport, { cubeNames, cubeSymbolsNames })));
|
|
104
128
|
return results.filter(f => !!f);
|
|
105
129
|
};
|
|
106
130
|
const compilePhase = async (compilers) => this.compileCubeFiles(compilers, await transpile(), errorsReport);
|
|
@@ -111,9 +135,18 @@ class DataSchemaCompiler {
|
|
|
111
135
|
contextCompilers: this.contextCompilers,
|
|
112
136
|
}))
|
|
113
137
|
.then(() => {
|
|
114
|
-
if (
|
|
138
|
+
if (transpilationNative) {
|
|
139
|
+
// Clean up cache
|
|
140
|
+
const dummyFile = {
|
|
141
|
+
fileName: 'terminate.js',
|
|
142
|
+
content: ';',
|
|
143
|
+
};
|
|
144
|
+
return this.transpileJsFile(dummyFile, errorsReport, { cubeNames: [], cubeSymbols: {}, transpilerNames: [], contextSymbols: {}, compilerId: this.compilerId });
|
|
145
|
+
}
|
|
146
|
+
else if (transpilationWorkerThreads && this.workerPool) {
|
|
115
147
|
this.workerPool.terminate();
|
|
116
148
|
}
|
|
149
|
+
return Promise.resolve();
|
|
117
150
|
});
|
|
118
151
|
}
|
|
119
152
|
compile() {
|
|
@@ -149,15 +182,35 @@ class DataSchemaCompiler {
|
|
|
149
182
|
return file;
|
|
150
183
|
}
|
|
151
184
|
}
|
|
152
|
-
async transpileJsFile(file, errorsReport, { cubeNames,
|
|
185
|
+
async transpileJsFile(file, errorsReport, { cubeNames, cubeSymbols, contextSymbols, transpilerNames, compilerId }) {
|
|
153
186
|
try {
|
|
154
|
-
if ((0, shared_1.getEnv)('
|
|
187
|
+
if ((0, shared_1.getEnv)('transpilationNative')) {
|
|
188
|
+
const reqData = {
|
|
189
|
+
fileName: file.fileName,
|
|
190
|
+
transpilers: transpilerNames,
|
|
191
|
+
compilerId,
|
|
192
|
+
...(cubeNames && {
|
|
193
|
+
metaData: {
|
|
194
|
+
cubeNames,
|
|
195
|
+
cubeSymbols,
|
|
196
|
+
contextSymbols,
|
|
197
|
+
},
|
|
198
|
+
}),
|
|
199
|
+
};
|
|
200
|
+
errorsReport.inFile(file);
|
|
201
|
+
const res = await (0, native_1.transpileJs)(file.content, reqData);
|
|
202
|
+
errorsReport.addErrors(res.errors);
|
|
203
|
+
errorsReport.addWarnings(res.warnings);
|
|
204
|
+
errorsReport.exitFile();
|
|
205
|
+
return Object.assign({}, file, { content: res.code });
|
|
206
|
+
}
|
|
207
|
+
else if ((0, shared_1.getEnv)('transpilationWorkerThreads')) {
|
|
155
208
|
const data = {
|
|
156
209
|
fileName: file.fileName,
|
|
157
210
|
content: file.content,
|
|
158
|
-
transpilers:
|
|
211
|
+
transpilers: transpilerNames,
|
|
159
212
|
cubeNames,
|
|
160
|
-
|
|
213
|
+
cubeSymbols,
|
|
161
214
|
};
|
|
162
215
|
const res = await this.workerPool.exec('transpile', [data]);
|
|
163
216
|
errorsReport.addErrors(res.errors);
|
|
@@ -170,11 +223,11 @@ class DataSchemaCompiler {
|
|
|
170
223
|
sourceType: 'module',
|
|
171
224
|
plugins: ['objectRestSpread'],
|
|
172
225
|
});
|
|
226
|
+
errorsReport.inFile(file);
|
|
173
227
|
this.transpilers.forEach((t) => {
|
|
174
|
-
errorsReport.inFile(file);
|
|
175
228
|
(0, traverse_1.default)(ast, t.traverseObject(errorsReport));
|
|
176
|
-
errorsReport.exitFile();
|
|
177
229
|
});
|
|
230
|
+
errorsReport.exitFile();
|
|
178
231
|
const content = (0, generator_1.default)(ast, {}, file.content).code;
|
|
179
232
|
return Object.assign({}, file, { content });
|
|
180
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSchemaCompiler.js","sourceRoot":"","sources":["../../../src/compiler/DataSchemaCompiler.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DataSchemaCompiler.js","sourceRoot":"","sources":["../../../src/compiler/DataSchemaCompiler.js"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { SourceLocation } from '@babel/code-frame';
|
|
2
|
+
import { UserError } from './UserError';
|
|
3
|
+
export type ErrorLikeObject = {
|
|
4
|
+
message: string;
|
|
5
|
+
};
|
|
6
|
+
export type PossibleError = Error | UserError | string | ErrorLikeObject;
|
|
2
7
|
export interface CompilerErrorInterface {
|
|
3
8
|
message: string;
|
|
4
9
|
plainMessage?: string;
|
|
@@ -34,7 +39,7 @@ export declare class ErrorReporter {
|
|
|
34
39
|
inContext(context: string): ErrorReporter;
|
|
35
40
|
throwIfAny(): void;
|
|
36
41
|
getErrors(): CompilerErrorInterface[];
|
|
37
|
-
addErrors(errors:
|
|
42
|
+
addErrors(errors: PossibleError[]): void;
|
|
38
43
|
getWarnings(): SyntaxErrorInterface[];
|
|
39
44
|
addWarnings(warnings: SyntaxErrorInterface[]): void;
|
|
40
45
|
protected rootReporter(): ErrorReporter;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"ErrorReporter.d.ts","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,eAAe,CAAC;AAEzE,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,GAAG,SAAS,CAAC;CACxC;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;IASV,SAAS;IAIT,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE;IAIjC,WAAW;IAIX,WAAW,CAAC,QAAQ,EAAE,oBAAoB,EAAE;IAInD,SAAS,CAAC,YAAY,IAAI,aAAa;CAGxC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ErrorReporter = void 0;
|
|
4
4
|
const code_frame_1 = require("@babel/code-frame");
|
|
5
|
-
const UserError_1 = require("./UserError");
|
|
6
5
|
const CompileError_1 = require("./CompileError");
|
|
7
6
|
class ErrorReporter {
|
|
8
7
|
parent;
|
|
@@ -74,7 +73,7 @@ class ErrorReporter {
|
|
|
74
73
|
}
|
|
75
74
|
}
|
|
76
75
|
error(e, fileName, lineNumber, position) {
|
|
77
|
-
const message = `${this.context.length ? `${this.context.join(' -> ')}: ` : ''}${e
|
|
76
|
+
const message = `${this.context.length ? `${this.context.join(' -> ')}: ` : ''}${e.message ? e.message : (e.stack || e)}`;
|
|
78
77
|
if (this.rootReporter().errors.find(m => (m.message || m) === message)) {
|
|
79
78
|
return;
|
|
80
79
|
}
|
|
@@ -101,13 +100,13 @@ class ErrorReporter {
|
|
|
101
100
|
return this.rootReporter().errors;
|
|
102
101
|
}
|
|
103
102
|
addErrors(errors) {
|
|
104
|
-
|
|
103
|
+
errors.forEach((e) => { this.error(e); });
|
|
105
104
|
}
|
|
106
105
|
getWarnings() {
|
|
107
106
|
return this.rootReporter().warnings;
|
|
108
107
|
}
|
|
109
108
|
addWarnings(warnings) {
|
|
110
|
-
|
|
109
|
+
warnings.forEach((w) => { this.warning(w); });
|
|
111
110
|
}
|
|
112
111
|
rootReporter() {
|
|
113
112
|
return this.parent ? this.parent.rootReporter() : this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorReporter.js","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":";;;AAAA,kDAAqE;
|
|
1
|
+
{"version":3,"file":"ErrorReporter.js","sourceRoot":"","sources":["../../../src/compiler/ErrorReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrepareCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/PrepareCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAW1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,MAAM,sBAAsB,GAAG;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,oBAAoB,YAAW,sBAAsB;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PrepareCompiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/PrepareCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAW1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,MAAM,sBAAsB,GAAG;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,oBAAoB,YAAW,sBAAsB;;;;;;;;;CAyD1F,CAAC;AAEF,eAAO,MAAM,OAAO,SAAU,oBAAoB,YAAY,sBAAsB;;;;;;;;;EAKnF,CAAC"}
|
|
@@ -35,6 +35,7 @@ const prepareCompiler = (repo, options = {}) => {
|
|
|
35
35
|
if (!options.allowJsDuplicatePropsInSchema) {
|
|
36
36
|
transpilers.push(new transpilers_1.CubeCheckDuplicatePropTranspiler());
|
|
37
37
|
}
|
|
38
|
+
const compilerId = (0, uuid_1.v4)();
|
|
38
39
|
const compiler = new DataSchemaCompiler_1.DataSchemaCompiler(repo, Object.assign({}, {
|
|
39
40
|
cubeNameCompilers: [cubeDictionary],
|
|
40
41
|
preTranspileCubeCompilers: [cubeSymbols, cubeValidator],
|
|
@@ -53,7 +54,8 @@ const prepareCompiler = (repo, options = {}) => {
|
|
|
53
54
|
compileContext: options.compileContext,
|
|
54
55
|
standalone: options.standalone,
|
|
55
56
|
nativeInstance,
|
|
56
|
-
yamlCompiler
|
|
57
|
+
yamlCompiler,
|
|
58
|
+
compilerId,
|
|
57
59
|
}, options));
|
|
58
60
|
return {
|
|
59
61
|
compiler,
|
|
@@ -63,7 +65,7 @@ const prepareCompiler = (repo, options = {}) => {
|
|
|
63
65
|
joinGraph,
|
|
64
66
|
compilerCache,
|
|
65
67
|
headCommitId: options.headCommitId,
|
|
66
|
-
compilerId
|
|
68
|
+
compilerId,
|
|
67
69
|
};
|
|
68
70
|
};
|
|
69
71
|
exports.prepareCompiler = prepareCompiler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrepareCompiler.js","sourceRoot":"","sources":["../../../src/compiler/PrepareCompiler.ts"],"names":[],"mappings":";;;AACA,mDAAwD;AACxD,+BAAoC;AAEpC,mDAAgD;AAChD,6DAA0D;AAC1D,+CAMuB;AACvB,8CAAiE;AACjE,+CAA4C;AAC5C,qDAAkD;AAClD,mDAAgD;AAChD,yDAAsD;AACtD,2CAAwC;AACxC,mEAAgE;AAChE,mDAAgD;AAChD,iDAA8C;AAcvC,MAAM,eAAe,GAAG,CAAC,IAA0B,EAAE,UAAkC,EAAE,EAAE,EAAE;IAClG,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,IAAI,uBAAc,EAAE,CAAC;IACtE,MAAM,cAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;IACtC,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,aAAa,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,aAAa,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,6CAAqB,CAAC,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC7G,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACjF,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IAEnF,MAAM,WAAW,GAA0B;QACzC,IAAI,kCAAoB,EAAE;QAC1B,IAAI,oCAAsB,EAAE;QAC5B,IAAI,uCAAyB,CAAC,WAAW,EAAE,cAAc,CAAC;KAC3D,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE;QAC1C,WAAW,CAAC,IAAI,CAAC,IAAI,8CAAgC,EAAE,CAAC,CAAC;KAC1D;IAED,MAAM,QAAQ,GAAG,IAAI,uCAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;QAC9D,iBAAiB,EAAE,CAAC,cAAc,CAAC;QACnC,yBAAyB,EAAE,CAAC,WAAW,EAAE,aAAa,CAAC;QACvD,WAAW;QACX,aAAa,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,CAAC;QAC1D,gBAAgB,EAAE,CAAC,gBAAgB,CAAC;QACpC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC;QACrD,aAAa;QACb,cAAc;QACd,WAAW;QACX,UAAU,EAAE;YACV,OAAO,EAAP,oBAAO;YACP,WAAW,EAAX,wBAAW;YACX,UAAU,EAAV,uBAAU;SACX;QACD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,cAAc;QACd,YAAY;
|
|
1
|
+
{"version":3,"file":"PrepareCompiler.js","sourceRoot":"","sources":["../../../src/compiler/PrepareCompiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ const transpilers = {
|
|
|
25
25
|
};
|
|
26
26
|
const transpile = (data) => {
|
|
27
27
|
cubeDictionary.setCubeNames(data.cubeNames);
|
|
28
|
-
cubeSymbols.setSymbols(data.
|
|
28
|
+
cubeSymbols.setSymbols(data.cubeSymbols);
|
|
29
29
|
const ast = (0, parser_1.parse)(data.content, {
|
|
30
30
|
sourceFilename: data.fileName,
|
|
31
31
|
sourceType: 'module',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transpiler_worker.js","sourceRoot":"","sources":["../../../../src/compiler/transpilers/transpiler_worker.ts"],"names":[],"mappings":";;;;;AAAA,4DAAoC;AACpC,0CAAsC;AACtC,iEAA8C;AAC9C,+DAA4C;AAE5C,iEAA8D;AAC9D,qEAAkE;AAClE,yFAAsF;AACtF,2EAAwE;AACxE,oDAAiD;AACjD,2EAAwE;AACxE,mFAAgF;AAUhF,MAAM,cAAc,GAAG,IAAI,6DAA6B,EAAE,CAAC;AAC3D,MAAM,WAAW,GAAG,IAAI,qDAAyB,EAAE,CAAC;AACpD,MAAM,YAAY,GAAG,IAAI,6BAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAEjD,MAAM,WAAW,GAAG;IAClB,oBAAoB,EAAE,IAAI,2CAAoB,EAAE;IAChD,sBAAsB,EAAE,IAAI,+CAAsB,EAAE;IACpD,gCAAgC,EAAE,IAAI,mEAAgC,EAAE;IACxE,yBAAyB,EAAE,IAAI,qDAAyB,CAAC,WAAW,EAAE,cAAc,CAAC;CACtF,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAqB,EAAE,EAAE;IAC1C,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5C,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"transpiler_worker.js","sourceRoot":"","sources":["../../../../src/compiler/transpilers/transpiler_worker.ts"],"names":[],"mappings":";;;;;AAAA,4DAAoC;AACpC,0CAAsC;AACtC,iEAA8C;AAC9C,+DAA4C;AAE5C,iEAA8D;AAC9D,qEAAkE;AAClE,yFAAsF;AACtF,2EAAwE;AACxE,oDAAiD;AACjD,2EAAwE;AACxE,mFAAgF;AAUhF,MAAM,cAAc,GAAG,IAAI,6DAA6B,EAAE,CAAC;AAC3D,MAAM,WAAW,GAAG,IAAI,qDAAyB,EAAE,CAAC;AACpD,MAAM,YAAY,GAAG,IAAI,6BAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAEjD,MAAM,WAAW,GAAG;IAClB,oBAAoB,EAAE,IAAI,2CAAoB,EAAE;IAChD,sBAAsB,EAAE,IAAI,+CAAsB,EAAE;IACpD,gCAAgC,EAAE,IAAI,mEAAgC,EAAE;IACxE,yBAAyB,EAAE,IAAI,qDAAyB,CAAC,WAAW,EAAE,cAAc,CAAC;CACtF,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAqB,EAAE,EAAE;IAC1C,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5C,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEzC,MAAM,GAAG,GAAG,IAAA,cAAK,EACf,IAAI,CAAC,OAAO,EACZ;QACE,cAAc,EAAE,IAAI,CAAC,QAAQ;QAC7B,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE,CAAC,kBAAkB,CAAC;KAC9B,CACF,CAAC;IAEF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QACxC,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE;YAC/B,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAA,kBAAa,EAAC,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;YAC7E,YAAY,CAAC,QAAQ,EAAE,CAAC;SACzB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,cAAc,cAAc,gBAAgB,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,mBAAc,EAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;IAE3D,OAAO;QACL,OAAO;QACP,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE;QAChC,QAAQ,EAAE,YAAY,CAAC,WAAW,EAAE;KACrC,CAAC;AACJ,CAAC,CAAC;AAEF,oBAAU,CAAC,MAAM,CAAC;IAChB,SAAS;CACV,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/schema-compiler",
|
|
3
3
|
"description": "Cube schema compiler",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "1.0.
|
|
5
|
+
"version": "1.0.10",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"@babel/standalone": "^7.24",
|
|
41
41
|
"@babel/traverse": "^7.24",
|
|
42
42
|
"@babel/types": "^7.24",
|
|
43
|
-
"@cubejs-backend/native": "1.0.
|
|
44
|
-
"@cubejs-backend/shared": "1.0.
|
|
43
|
+
"@cubejs-backend/native": "1.0.10",
|
|
44
|
+
"@cubejs-backend/shared": "1.0.10",
|
|
45
45
|
"antlr4ts": "0.5.0-alpha.4",
|
|
46
46
|
"camelcase": "^6.2.0",
|
|
47
47
|
"cron-parser": "^4.9.0",
|
|
@@ -59,8 +59,8 @@
|
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@cubejs-backend/apla-clickhouse": "^1.7.0",
|
|
62
|
-
"@cubejs-backend/linter": "1.0.
|
|
63
|
-
"@cubejs-backend/query-orchestrator": "1.0.
|
|
62
|
+
"@cubejs-backend/linter": "1.0.10",
|
|
63
|
+
"@cubejs-backend/query-orchestrator": "1.0.10",
|
|
64
64
|
"@types/babel__code-frame": "^7.0.6",
|
|
65
65
|
"@types/babel__generator": "^7.6.8",
|
|
66
66
|
"@types/babel__traverse": "^7.20.5",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
],
|
|
103
103
|
"globalSetup": "<rootDir>/dist/test/global-setup.js"
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "6ee1251b3fee303dce4f5360d655414146621418"
|
|
106
106
|
}
|