Emit source file always return async

microsoft · Jul 13, 2023 · 9fd55a4 · 9fd55a4
1 parent d7e7ed9
commit 9fd55a4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/packages/compiler/src/config/config-loader.ts b/packages/compiler/src/config/config-loader.ts
@@ -103,7 +103,7 @@ export async function loadTypeSpecConfigFile(
  host: CompilerHost,
  filePath: string
 ): Promise<TypeSpecConfig> {
- const config = await loadConfigFile(host, filePath, jsyaml.load);
+ const config = await loadConfigFile(host, filePath);
  if (config.diagnostics.length === 0 && config.extends) {
  const extendPath = resolvePath(getDirectoryPath(filePath), config.extends);
  const parent = await loadTypeSpecConfigFile(host, extendPath);
@@ -157,15 +157,22 @@ async function searchConfigFile(
  return stat?.isFile() === true ? pkgPath : undefined;
 }
 
-async function loadConfigFile(
- host: CompilerHost,
- filename: string,
- loadData: (content: string) => any
-): Promise<TypeSpecConfig> {
+async function loadConfigFile(host: CompilerHost, filename: string): Promise<TypeSpecConfig> {
  let diagnostics: Diagnostic[] = [];
  const reportDiagnostic = (d: Diagnostic) => diagnostics.push(d);
 
- let [data, file] = await loadFile<TypeSpecRawConfig>(host, filename, loadData, reportDiagnostic);
+ let [data, file] = await loadFile<TypeSpecRawConfig>(
+ host,
+ filename,
+ (content) => {
+ return jsyaml.load(content, {
+ listener: (eventType, state) => {
+ console.log("LOaded", eventType, state.result);
+ },
+ }) as any;
+ },
+ reportDiagnostic
+ );
 
  if (data) {
  diagnostics = diagnostics.concat(configValidator.validate(data, file));

diff --git a/packages/compiler/src/emitter-framework/asset-emitter.ts b/packages/compiler/src/emitter-framework/asset-emitter.ts
@@ -432,8 +432,8 @@ export function createAssetEmitter<T, TOptions extends object>(
  return invokeTypeEmitter("tupleLiteralValues", tuple);
  },
 
- emitSourceFile(sourceFile) {
- return typeEmitter.sourceFile(sourceFile);
+ async emitSourceFile(sourceFile) {
+ return await typeEmitter.sourceFile(sourceFile);
  },
  };
 

diff --git a/packages/compiler/src/emitter-framework/types.ts b/packages/compiler/src/emitter-framework/types.ts
@@ -41,7 +41,7 @@ export interface AssetEmitter<T, TOptions extends object = Record<string, unknow
  emitEnumMembers(en: Enum): EmitEntity<T>;
  emitUnionVariants(union: Union): EmitEntity<T>;
  emitTupleLiteralValues(tuple: Tuple): EmitEntity<T>;
- emitSourceFile(sourceFile: SourceFile<T>): Promise<EmittedSourceFile> | EmittedSourceFile;
+ emitSourceFile(sourceFile: SourceFile<T>): Promise<EmittedSourceFile>;
  /**
  * Create a source file.
  *