Prepare transpileYaml in native + schema compiler

Author: KSDaemon

packages/cubejs-backend-native/js/index.ts

@@ -517,6 +517,16 @@ export const transpileJs = async (transpileRequests: TransformConfig[]): Promise
   throw new Error('TranspileJs native implementation not found!');
 };
 
+export const transpileYaml = async (transpileRequests: TransformConfig[]): Promise<TransformResponse[]> => {
+  const native = loadNative();
+
+  if (native.transpileYaml) {
+    return native.transpileYaml(transpileRequests);
+  }
+
+  throw new Error('TranspileYaml native implementation not found!');
+};
+
 export interface PyConfiguration {
   repositoryFactory?: (ctx: unknown) => Promise<unknown>,
   logger?: (msg: string, params: Record<string, any>) => void,

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

@@ -13,7 +13,7 @@ import workerpool from 'workerpool';
 import { LRUCache } from 'lru-cache';
 
 import { FileContent, getEnv, isNativeSupported, SchemaFileRepository } from '@cubejs-backend/shared';
-import { NativeInstance, PythonCtx, transpileJs } from '@cubejs-backend/native';
+import { NativeInstance, PythonCtx, transpileJs, transpileYaml } from '@cubejs-backend/native';
 import { UserError } from './UserError';
 import { ErrorReporter, ErrorReporterOptions, SyntaxErrorInterface } from './ErrorReporter';
 import { CONTEXT_SYMBOLS, CubeDefinition, CubeSymbols } from './CubeSymbols';
@@ -630,10 +630,13 @@ export class DataSchemaCompiler {
     return undefined;
   }
 
+  // We update the 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.
   private async transpileYamlFile(
     file: FileContent,
     errorsReport: ErrorReporter,
-    { cubeNames, cubeSymbols, contextSymbols, transpilerNames, compilerId, stage }: TranspileOptions
+    { cubeNames, cubeSymbols, compilerId }: TranspileOptions
   ): Promise<(FileContent | undefined)> {
     const cacheKey = crypto.createHash('md5').update(JSON.stringify(file.content)).digest('hex');
 
@@ -644,9 +647,27 @@ export class DataSchemaCompiler {
       return { ...file };
     }
 
-    /* if (getEnv('transpilationNative')) {
+    if (getEnv('transpilationNative')) {
+      const reqData = {
+        fileName: file.fileName,
+        fileContent: file.content,
+        transpilers: [],
+        compilerId: compilerId || '',
+      };
+
+      errorsReport.inFile(file);
+      const res = await transpileYaml([reqData]);
+      errorsReport.addErrors(res[0].errors);
+      errorsReport.addWarnings(res[0].warnings as unknown as SyntaxErrorInterface[]);
+      errorsReport.exitFile();
+
+      file.content = res[0].code;
+      file.convertedToJs = true;
+
+      this.compiledYamlCache.set(cacheKey, res[0].code);
 
-    } else */ if (getEnv('transpilationWorkerThreads')) {
+      return { ...file };
+    } else if (getEnv('transpilationWorkerThreads')) {
       const data = {
         fileName: file.fileName,
         content: file.content,
@@ -664,14 +685,11 @@ export class DataSchemaCompiler {
 
       this.compiledYamlCache.set(cacheKey, res.content);
 
-      return { ...file, content: res.content };
+      return { ...file };
     } else {
       const transpiledFile = this.yamlCompiler.transpileYamlFile(file, errorsReport);
 
       if (transpiledFile) {
-        // We update the 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;
       }