Revert "fix(migrate): remove unnecessary await"

This reverts commit 0b09049.

src/packages/migrate/src/Migrate.ts

@@ -234,8 +234,8 @@ export class Migrate {
     return fs.readFileSync(this.schemaPath, 'utf-8')
   }
 
-  public reset(): Promise<void> {
-    return this.engine.reset()
+  public async reset(): Promise<void> {
+    await this.engine.reset()
   }
 
   public async draft({ name = '' }: MigrateOptions = {}): Promise<string> {
@@ -251,16 +251,16 @@ export class Migrate {
     return createMigrationResult.generatedMigrationName!
   }
 
-  public createMigration(
+  public async createMigration(
     params: EngineArgs.CreateMigrationInput,
   ): Promise<EngineResults.CreateMigrationOutput> {
-    return this.engine.createMigration(params)
+    return await this.engine.createMigration(params)
   }
 
-  public diagnoseMigrationHistory(): Promise<
+  public async diagnoseMigrationHistory(): Promise<
     EngineResults.DiagnoseMigrationHistoryOutput
   > {
-    return this.engine.diagnoseMigrationHistory({
+    return await this.engine.diagnoseMigrationHistory({
       migrationsDirectoryPath: this.migrationsDirectoryPath,
     })
   }
@@ -282,14 +282,15 @@ export class Migrate {
     }
   }
 
-  public listMigrationDirectories(): Promise<
+  public async listMigrationDirectories(): Promise<
     EngineResults.ListMigrationDirectoriesOutput
   > {
-    const listMigrationDirectoriesResult = this.engine.listMigrationDirectories(
+    const listMigrationDirectoriesResult = await this.engine.listMigrationDirectories(
       {
         migrationsDirectoryPath: this.migrationsDirectoryPath,
       },
     )
+    debug({ listMigrationDirectoriesResult })
     return listMigrationDirectoriesResult
   }
 
@@ -308,33 +309,62 @@ export class Migrate {
     return markMigrationApplied
   }
 
-  public markMigrationRolledBack({
+  public async markMigrationRolledBack({
     migrationId,
   }: {
     migrationId: string
   }): Promise<void> {
-    return this.engine.markMigrationRolledBack({
+    const markMigrationRolledBack = await this.engine.markMigrationRolledBack({
       migrationName: migrationId,
     })
+    return markMigrationRolledBack
   }
 
-  public applyScript({ script }: { script: string }): Promise<void> {
-    return this.engine.applyScript({ script })
+  public async applyScript({ script }: { script: string }): Promise<void> {
+    const appliedScriptResult = await this.engine.applyScript({ script })
+    debug({ appliedScriptResult })
+    return appliedScriptResult
   }
 
-  public applyOnly(): Promise<EngineResults.ApplyMigrationsOutput> {
-    return this.engine.applyMigrations({
+  public async applyOnly(): Promise<string[]> {
+    const { appliedMigrationNames } = await this.engine.applyMigrations({
       migrationsDirectoryPath: this.migrationsDirectoryPath,
     })
+    debug({ appliedMigrationNames })
+
+    return appliedMigrationNames
+  }
+
+  public async evaluateDataLoss(): Promise<
+    EngineResults.EvaluateDataLossOutput
+  > {
+    const datamodel = this.getDatamodel()
+
+    const evaluateDataLossResult = await this.engine.evaluateDataLoss({
+      migrationsDirectoryPath: this.migrationsDirectoryPath,
+      prismaSchema: datamodel,
+    })
+
+    debug({ evaluateDataLossResult })
+    return evaluateDataLossResult
   }
 
-  public evaluateDataLoss(): Promise<EngineResults.EvaluateDataLossOutput> {
+  public async createAndApply({ name = '' }: MigrateOptions = {}): Promise<
+    string[]
+  > {
     const datamodel = this.getDatamodel()
 
-    return this.engine.evaluateDataLoss({
+    // success?
+    const createMigrationResult = await this.createMigration({
       migrationsDirectoryPath: this.migrationsDirectoryPath,
+      migrationName: name,
+      draft: false,
       prismaSchema: datamodel,
     })
+    debug({ createMigrationResult })
+
+    // success?
+    return this.applyOnly()
   }
 
   public async push({

src/packages/migrate/src/commands/MigrateDeploy.ts

@@ -95,7 +95,7 @@ ${chalk.bold('Options')}
 
     await ensureDatabaseExists('apply', true, schemaPath)
 
-    const { appliedMigrationNames: migrationIds } = await migrate.applyOnly()
+    const migrationIds = await migrate.applyOnly()
 
     migrate.stop()
 

src/packages/migrate/src/commands/MigrateDev.ts

@@ -223,6 +223,9 @@ ${failedMigrationError.message}`,
         }
       }
     } else {
+      debug({ drift: diagnoseResult.drift })
+      debug({ history: diagnoseResult.history })
+
       if (diagnoseResult.drift) {
         if (diagnoseResult.drift?.diagnostic === 'migrationFailedToApply') {
           // Migration has a problem (failed to cleanly apply to a temporary database) and
@@ -296,9 +299,7 @@ ${diagnoseResult.drift.error.message}`,
 
       if (diagnoseResult.history) {
         if (diagnoseResult.history.diagnostic === 'databaseIsBehind') {
-          const {
-            appliedMigrationNames: migrationIdsFromDatabaseIsBehind,
-          } = await migrate.applyOnly()
+          migrationIdsFromDatabaseIsBehind = await migrate.applyOnly()
           // Inform user about applied migrations now
           if (migrationIdsFromDatabaseIsBehind.length > 0) {
             console.info(
@@ -378,16 +379,9 @@ ${diagnoseResult.drift.error.message}`,
       }
     }
 
-    const createMigrationResult = await migrate.createMigration({
-      migrationsDirectoryPath: migrate.migrationsDirectoryPath,
-      migrationName: migrationName || '',
-      draft: false,
-      prismaSchema: migrate.getDatamodel(),
+    const migrationIds = await migrate.createAndApply({
+      name: migrationName,
     })
-    debug({ createMigrationResult })
-
-    const { appliedMigrationNames: migrationIds } = await migrate.applyOnly()
-
     migrate.stop()
 
     if (migrationIds.length === 0) {

src/packages/migrate/src/commands/MigrateReset.ts

@@ -52,7 +52,7 @@ ${chalk.bold('Examples')}
   Specify a schema
   ${chalk.dim(
     '$',
-  )} prisma migrate reset --schema=./schema.prisma --early-access-feature 
+  )} prisma migrate reset --schema=./schema.prisma' --early-access-feature 
   `)
 
   public async parse(argv: string[]): Promise<string | Error> {
@@ -137,7 +137,7 @@ ${chalk.bold('Examples')}
 
     await migrate.reset()
 
-    const { appliedMigrationNames: migrationIds } = await migrate.applyOnly()
+    const migrationIds = await migrate.applyOnly()
     migrate.stop()
 
     if (migrationIds.length === 0) {

src/packages/migrate/src/types.ts

@@ -116,6 +116,9 @@ export namespace EngineArgs {
   export interface ApplyScriptInput {
     script: string
   }
+  export interface InitializeInput {
+    migrationsDirectoryPath: string
+  }
   export interface DiagnoseMigrationHistoryInput {
     migrationsDirectoryPath: string
   }