reuse yaml transpilation flow for jinja files

Author: KSDaemon

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

@@ -732,33 +732,25 @@ export class DataSchemaCompiler {
   private async transpileJinjaFile(
     file: FileContent,
     errorsReport: ErrorReporter,
-    { cubeNames, cubeSymbols, contextSymbols, transpilerNames, compilerId, stage }: TranspileOptions
+    options: TranspileOptions
   ): Promise<(FileContent | undefined)> {
-    // if (getEnv('transpilationNative')) {
-    //
-    // } else if (getEnv('transpilationWorkerThreads')) {
-    //
-    // } else {
     const transpileJinjaFileTimer = perfTracker.start('transpileJinjaFile (common)');
 
-    const transpiledFile = await this.yamlCompiler.compileYamlWithJinjaFile(
+    const renderedFile = await this.yamlCompiler.renderTemplate(
       file,
-      errorsReport,
       this.standalone ? {} : this.cloneCompileContextWithGetterAlias(this.compileContext),
       this.pythonContext!
     );
-    if (transpiledFile) {
-      // We update the jinja/yaml file content to the transpiled js content
-      // and raise related flag so it will go JS transpilation flow afterward
-      // avoiding costly YAML/Python parsing again.
-      file.content = transpiledFile.content;
-      file.convertedToJs = true;
-    }
+
+    // We update the jinja/yaml file content to the rendered content
+    // to reuse the same transpileYamlFile() flow afterward which
+    // will update the content to the transpiled js content
+    // avoiding costly YAML/Python parsing again.
+    file.content = renderedFile.content;
 
     transpileJinjaFileTimer.end();
 
-    return transpiledFile;
-    // }
+    return this.transpileYamlFile(file, errorsReport, options);
   }
 
   public withQuery(query, fn) {

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

@@ -65,20 +65,6 @@ export class YamlCompiler {
     };
   }
 
-  public async compileYamlWithJinjaFile(
-    file: FileContent,
-    errorsReport: ErrorReporter,
-    compileContext: CompileContext,
-    pythonContext: PythonCtx
-  ): Promise<FileContent | undefined> {
-    const renderedFile = await this.renderTemplate(file, compileContext, pythonContext);
-
-    const transpileJinjaFileTimer2 = perfTracker.start('compile Jinja - transpileYamlFile');
-    const res = this.transpileYamlFile(renderedFile, errorsReport);
-    transpileJinjaFileTimer2.end();
-    return res;
-  }
-
   public transpileYamlFile(
     file: FileContent,
     errorsReport: ErrorReporter,