Skip to content

Commit d240ae9

Browse files
committed
improve transpilationNative
1 parent a9b6287 commit d240ae9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

packages/cubejs-schema-compiler/src/compiler/DataSchemaCompiler.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export class DataSchemaCompiler {
237237

238238
const originalJsFiles: FileContent[] = [];
239239
const jinjaTemplatedFiles: FileContent[] = [];
240-
const yamlTemplatedFiles: FileContent[] = [];
240+
const yamlFiles: FileContent[] = [];
241241

242242
(this.filesToCompile?.length
243243
? files.filter(f => this.filesToCompile.includes(f.fileName))
@@ -248,12 +248,12 @@ export class DataSchemaCompiler {
248248
(file.fileName.endsWith('.yml') || file.fileName.endsWith('.yaml')) && file.content.match(JINJA_SYNTAX)) {
249249
jinjaTemplatedFiles.push(file);
250250
} else if (file.fileName.endsWith('.yml') || file.fileName.endsWith('.yaml')) {
251-
yamlTemplatedFiles.push(file);
251+
yamlFiles.push(file);
252252
}
253253
// We don't transpile/compile other files (like .py and so on)
254254
});
255255

256-
let toCompile = [...jinjaTemplatedFiles, ...yamlTemplatedFiles, ...originalJsFiles];
256+
let toCompile = [...jinjaTemplatedFiles, ...yamlFiles, ...originalJsFiles];
257257

258258
if (jinjaTemplatedFiles.length > 0) {
259259
// Preload Jinja templates to the engine
@@ -287,10 +287,10 @@ export class DataSchemaCompiler {
287287
}
288288

289289
if (transpilationNative) {
290-
const nonJsFilesTasks = toCompile.filter(file => !file.fileName.endsWith('.js'))
290+
const nonJsFilesTasks = [...jinjaTemplatedFiles, ...yamlFiles]
291291
.map(f => this.transpileFile(f, errorsReport, { transpilerNames, compilerId }));
292292

293-
const jsFiles = toCompile.filter(file => file.fileName.endsWith('.js'));
293+
const jsFiles = originalJsFiles;
294294
let jsFilesTasks: Promise<(FileContent | undefined)[]>[] = [];
295295

296296
if (jsFiles.length > 0) {

0 commit comments

Comments
 (0)