Merge pull request #374 from formidablejs/feature/db-commands

Feature/db commands

Author: donaldp

src/Foundation/Console.imba

@@ -37,6 +37,7 @@ export default class Console
 		'make:tag'
 		'make:type'
 		'make:view'
+		'migrate'
 		'migrate:down'
 		'migrate:fresh'
 		'migrate:latest'

src/Foundation/Console/Command.imba

@@ -39,6 +39,8 @@ export class Command < BaseCommand
 
 				exit!
 
+				return
+
 			confirmed
 
 		else true

src/Foundation/Console/Commands/DbSeedCommand.imba

@@ -37,9 +37,10 @@ export class DbSeedCommand < Command
 		this.error "Seeder file {seeder} does not exist"
 
 	def handle
-		await self.shouldRun!
+		if !self.app.console![Symbol.for('#internal')]
+			await self.shouldRun!
 
-		self.usingEnv!
+			self.usingEnv!
 
 		if isTS
 			require('ts-node').register({
@@ -63,10 +64,12 @@ export class DbSeedCommand < Command
 
 			Output.group { newLine: false }, do
 				results[0].forEach do(seeder)
-					self.message 'info', "Seeder \x1b[1m[{seeder.substring(root.length)}]\x1b[0m ran successfully."
+					self.message 'info', "Seeder \x1b[1m[{seeder.substring(root.length + 1)}]\x1b[0m ran successfully."
 
 			exit!
 
+			return
+
 		console.error results
 
 		self.exit!

src/Foundation/Console/Commands/MigrateCommand.imba

@@ -0,0 +1,7 @@
+import { Prop } from '@formidablejs/console'
+import { MigrateUpCommand } from './MigrateUpCommand'
+
+export class MigrateCommand < MigrateUpCommand
+
+	get signature
+		'migrate {?--migration}'

src/Foundation/Console/Commands/MigrateFreshCommand.imba

@@ -1,13 +1,48 @@
-import { Prop } from '@formidablejs/console'
+import { Prop, Output } from '@formidablejs/console'
 import { MigrationCommand } from './MigrationCommand'
+import { join } from 'path'
+import { existsSync } from 'fs-extra'
 
 export class MigrateFreshCommand < MigrationCommand
 
+	get isTS
+		const appPackage = join(process.cwd!, 'package.json')
+
+		if !existsSync(appPackage)
+			return false
+
+		const language = require(appPackage).language || 'imba'
+
+		language.toLowerCase! == 'typescript'
+
 	get signature
-		'migrate:fresh'
+		'migrate:fresh {?--seed} {?--seeder}'
 
 	get description
 		'Drop all tables and re-run all migrations'
 
+	get props
+		{
+			seed: Prop.boolean!.default(false).description('Indicates if db:seed should run after migrations have been ran')
+			seeder: Prop.string!.default("DatabaseSeeder.{isTS ? 'ts' : 'js'}").description('The specific seeder to run. If not provided, all seeders will be run')
+		}
+
 	def handle
-		call 'fresh'
+		const shouldSeed? = this.option('seed')
+
+		if shouldSeed?
+			process.env.CONSOLE_FORMIDABLE_GROUP = JSON.stringify({
+				newLine: false
+			})
+
+			await call 'fresh', false
+
+			const seeder = this.option('seeder', 'DefaultSeeder')
+
+			Output.write "Running <dim>db:seed --seeder={seeder}</dim>"
+
+			await self.app.console!.run("db:seed --seeder={seeder}")
+
+			self.exit!
+		else
+			call 'fresh'

src/Foundation/Console/Commands/MigrationCommand.imba

@@ -16,7 +16,7 @@ export class MigrationCommand < Command
 
 		language.toLowerCase! == 'typescript'
 
-	def call action\string
+	def call action\string, exitOnEnd\boolean = true
 		await shouldRun!
 
 		self.usingEnv!
@@ -55,10 +55,12 @@ export class MigrationCommand < Command
 				results[1].forEach do(migration)
 					self.message 'info', "<fg:green>{action === 'rollback' ? 'Rollback' : 'Migrate'}:</fg:green> {migration}"
 
-			exit!
+			if exitOnEnd
+				exit!
 
 			return
 
 		self.write "<fg:red>No migration to run</fg:red>"
 
-		exit!
+		if exitOnEnd
+			exit!

src/Foundation/ConsoleKernel.imba

@@ -21,6 +21,7 @@ import { MakeResolverCommand } from './Console/Commands/MakeResolverCommand'
 import { MakeSeederCommand } from './Console/Commands/MakeSeederCommand'
 import { MakeTagCommand } from './Console/Commands/MakeTagCommand'
 import { MakeViewCommand } from './Console/Commands/MakeViewCommand'
+import { MigrateCommand } from './Console/Commands/MigrateCommand'
 import { MigrateDownCommand } from './Console/Commands/MigrateDownCommand'
 import { MigrateFreshCommand } from './Console/Commands/MigrateFreshCommand'
 import { MigrateLatestCommand } from './Console/Commands/MigrateLatestCommand'
@@ -88,6 +89,7 @@ export default class ConsoleKernel
 			UpCommand
 
 			# migration commands
+			MigrateCommand
 			MigrateDownCommand
 			MigrateFreshCommand
 			MigrateLatestCommand

types/Foundation/Console/Commands/MigrationCommand.d.ts

@@ -2,6 +2,6 @@ export class MigrationCommand extends Command {
     /**
     @param {string} action
     */
-    call(action: string): Promise<mixed>;
+    call(action: string, exitOnEnd?: boolean): Promise<mixed>;
 }
 import { Command } from "../Command";