fix: await generators

salesforcecli · Jul 27, 2022 · 4470a81 · 4470a81
1 parent 6c9f53b
commit 4470a81
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/commands/dev/generate/command.ts b/src/commands/dev/generate/command.ts
@@ -41,7 +41,7 @@ export default class GenerateCommand extends SfCommand<void> {
   public async run(): Promise<void> {
     const { flags } = await this.parse(GenerateCommand);
     if (!fileExists('package.json')) throw messages.createError('errors.InvalidDir');
-    generate('command', {
+    await generate('command', {
       name: flags.name,
       force: flags.force,
       nuts: flags.nuts,

diff --git a/src/commands/dev/generate/hook.ts b/src/commands/dev/generate/hook.ts
@@ -33,7 +33,7 @@ export default class GenerateHook extends SfCommand<void> {
   public async run(): Promise<void> {
     const { flags } = await this.parse(GenerateHook);
     if (!fileExists('package.json')) throw messages.createError('errors.InvalidDir');
-    generate('hook', {
+    await generate('hook', {
       force: flags.force,
       event: flags.event,
     });

diff --git a/src/commands/dev/generate/library.ts b/src/commands/dev/generate/library.ts
@@ -19,8 +19,7 @@ export default class GenerateLibrary extends SfCommand<void> {
 
   public static flags = {};
 
-  // eslint-disable-next-line @typescript-eslint/require-await
   public async run(): Promise<void> {
-    generate('library', { force: true });
+    await generate('library', { force: true });
   }
 }
diff --git a/src/commands/dev/generate/plugin.ts b/src/commands/dev/generate/plugin.ts
@@ -19,8 +19,7 @@ export default class GeneratePlugin extends SfCommand<void> {
 
   public static flags = {};
 
-  // eslint-disable-next-line @typescript-eslint/require-await
   public async run(): Promise<void> {
-    generate('plugin', { force: true });
+    await generate('plugin', { force: true });
   }
 }
diff --git a/src/util.ts b/src/util.ts
@@ -8,13 +8,15 @@ import * as fs from 'fs';
 import { createEnv } from 'yeoman-environment';
 import { Hook, PackageJson } from './types';
 
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-
-export function generate(type: string, generatorOptions: Record<string, unknown> = {}): void {
+export async function generate(type: string, generatorOptions: Record<string, unknown> = {}): Promise<void> {
   const env = createEnv();
   env.register(require.resolve(`./generators/${type}`), `sf:${type}`);
-  // @ts-ignore
-  env.run(`sf:${type}`, generatorOptions);
+  return new Promise((resolve, reject) => {
+    env.run(`sf:${type}`, generatorOptions, (err: Error) => {
+      if (err) reject(err);
+      else resolve();
+    });
+  });
 }
 
 export function readJson<T>(filePath: string): T {