removed dataSchemaCompiler from YamlCompiler's deps

Author: KSDaemon

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

@@ -172,7 +172,6 @@ export class DataSchemaCompiler {
     this.standalone = options.standalone || false;
     this.nativeInstance = options.nativeInstance;
     this.yamlCompiler = options.yamlCompiler;
-    this.yamlCompiler.dataSchemaCompiler = this;
     this.pythonContext = null;
     this.workerPool = null;
     this.compilerId = options.compilerId || 'default';
@@ -671,12 +670,17 @@ export class DataSchemaCompiler {
         // TODO do Jinja syntax check with jinja compiler
       ) && file.content.match(JINJA_SYNTAX)
     ) {
-      asyncModules.push(() => this.yamlCompiler.compileYamlWithJinjaFile(
-        file,
-        errorsReport,
-        this.standalone ? {} : this.cloneCompileContextWithGetterAlias(this.compileContext),
-        this.pythonContext!
-      ));
+      asyncModules.push(async () => {
+        const transpiledFile = await this.yamlCompiler.compileYamlWithJinjaFile(
+          file,
+          errorsReport,
+          this.standalone ? {} : this.cloneCompileContextWithGetterAlias(this.compileContext),
+          this.pythonContext!
+        );
+        if (transpiledFile) {
+          this.compileJsFile(transpiledFile, errorsReport);
+        }
+      });
     } else if (file.fileName.endsWith('.yml') || file.fileName.endsWith('.yaml')) {
       // original yaml file was already transpiled into js
       this.compileJsFile(file, errorsReport);

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

@@ -11,7 +11,6 @@ import { getEnv } from '@cubejs-backend/shared';
 import { CubePropContextTranspiler, transpiledFields, transpiledFieldsPatterns } from './transpilers';
 import { PythonParser } from '../parser/PythonParser';
 import { CubeSymbols } from './CubeSymbols';
-import { DataSchemaCompiler } from './DataSchemaCompiler';
 import { nonStringFields } from './CubeValidator';
 import { CubeDictionary } from './CubeDictionary';
 import { ErrorReporter } from './ErrorReporter';
@@ -25,8 +24,6 @@ type EscapeStateStack = {
 };
 
 export class YamlCompiler {
-  public dataSchemaCompiler: DataSchemaCompiler | null = null;
-
   protected jinjaEngine: JinjaEngine | null = null;
 
   public constructor(
@@ -68,16 +65,10 @@ export class YamlCompiler {
     errorsReport: ErrorReporter,
     compileContext,
     pythonContext: PythonCtx
-  ) {
+  ): Promise<FileContent | undefined> {
     const renderedFile = await this.renderTemplate(file, compileContext, pythonContext);
 
-    const transpiledFile = this.transpileYamlFile(renderedFile, errorsReport);
-
-    if (!transpiledFile) {
-      return;
-    }
-
-    this.dataSchemaCompiler?.compileJsFile(transpiledFile, errorsReport);
+    return this.transpileYamlFile(renderedFile, errorsReport);
   }
 
   public transpileYamlFile(