Merge pull request #11 from badsyntax/sln-file

Generate script in new file

Author: badsyntax

.vscode/settings.json

@@ -45,5 +45,13 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "cSpell.language": "en-GB",
-  "cSpell.words": ["dbcontext", "efcore", "entityframework", "richardwillis"]
+  "cSpell.words": [
+    "color",
+    "dbcontext",
+    "efcore",
+    "entityframework",
+    "NLCR",
+    "Pseudoterminal",
+    "richardwillis"
+  ]
 }

.vscodeignore

@@ -6,11 +6,13 @@ src/**
 .gitignore
 .yarnrc
 webpack.config.js
-vsc-extension-quickstart.md
 **/tsconfig.json
 **/.eslintrc.json
 **/*.map
 **/*.ts
-**/.prettierrc.js
-**/.gitattributes
-**/.editorconfig
+.prettierrc.js
+.prettierignore
+.gitattributes
+.editorconfig
+.github/**
+images/**

src/actions/AddMigrationAction.ts

@@ -35,9 +35,9 @@ export class AddMigrationAction extends TerminalAction {
       prompt: 'For example: MigrationName',
     });
     if (!migrationName) {
-      return;
+      return '';
     }
-    await super.run({
+    const output = await super.run({
       ...this.params,
       migrationName,
     });
@@ -51,5 +51,6 @@ export class AddMigrationAction extends TerminalAction {
       CommandProvider.getCommandName(RefreshTreeCommand.commandName),
       false,
     );
+    return output;
   }
 }

src/actions/GenerateScriptAction.ts

@@ -1,3 +1,6 @@
+import * as vscode from 'vscode';
+
+import { extractDataFromStdOut } from '../cli/ef';
 import { getCommandsConfig } from '../config/config';
 import type { TerminalProvider } from '../terminal/TerminalProvider';
 import { TerminalAction } from './TerminalAction';
@@ -19,4 +22,13 @@ export class GenerateScriptAction extends TerminalAction {
       workspaceRoot,
     );
   }
+
+  public async run() {
+    const output = extractDataFromStdOut(await super.run());
+    const uri = vscode.Uri.parse('ef-script:' + output);
+    const doc = await vscode.workspace.openTextDocument(uri);
+    await vscode.languages.setTextDocumentLanguage(doc, 'sql');
+    await vscode.window.showTextDocument(doc, { preview: false });
+    return output;
+  }
 }

src/actions/IAction.ts

@@ -1,3 +1,3 @@
 export interface IAction {
-  run(): Promise<void>;
+  run(): Promise<string>;
 }

src/actions/RemoveMigrationAction.ts

@@ -28,7 +28,7 @@ export class RemoveMigrationAction extends TerminalAction {
   }
 
   public async run() {
-    await super.run();
+    const output = await super.run();
     const cacheId = DbContextTreeItem.getCacheId(
       this.workspaceRoot,
       this.project,
@@ -39,5 +39,6 @@ export class RemoveMigrationAction extends TerminalAction {
       CommandProvider.getCommandName(RefreshTreeCommand.commandName),
       false,
     );
+    return output;
   }
 }

src/actions/RunMigrationAction.ts

@@ -29,8 +29,8 @@ export class RunMigrationAction extends TerminalAction {
     );
   }
 
-  public async run(params = this.params): Promise<void> {
-    await super.run(params);
+  public async run(params = this.params): Promise<string> {
+    const output = await super.run(params);
 
     const cacheId = DbContextTreeItem.getCacheId(
       this.workspaceRoot,
@@ -43,5 +43,7 @@ export class RunMigrationAction extends TerminalAction {
       CommandProvider.getCommandName(RefreshTreeCommand.commandName),
       false,
     );
+
+    return output;
   }
 }

src/actions/TerminalAction.ts

@@ -9,10 +9,12 @@ export abstract class TerminalAction implements IAction {
     private readonly workingFolder: string,
   ) {}
 
-  public async run(params = this.params): Promise<void> {
+  public async run(params = this.params): Promise<string> {
     const terminal = this.terminalProvider.provideTerminal();
-    terminal.setCmdARgs(this.getInterpolatedArgs(params));
-    await terminal.exec(this.workingFolder);
+    terminal.setCmdARgs(
+      this.getInterpolatedArgs(params).concat(['--prefix-output']),
+    );
+    return await terminal.exec(this.workingFolder);
   }
 
   private getInterpolatedArgs(params = this.params) {

src/cli/ef.ts

@@ -7,9 +7,16 @@ const execAsync = promisify(exec);
 export function extractDataFromStdOut(output: string): string {
   return output
     .split(/\r\n|\r|\n/)
-    .filter(line => line.startsWith('data:'))
-    .map(line => line.replace('data:', '').trim())
-    .join('');
+    .filter(line => line.startsWith('data:    '))
+    .map(line => line.replace('data:    ', ''))
+    .join('\n');
+}
+
+export function removePrefixFromStdOut(output: string): string {
+  return output
+    .split(/\r\n|\r|\n/)
+    .map(line => line.replace(/^[a-z]+:    /, ''))
+    .join('\n');
 }
 
 export async function execEF(

src/commands/Command.ts

@@ -1,6 +1,6 @@
 export abstract class Command {
   public static commandName: string;
-  public run(): Promise<void> {
+  public run(): Promise<void | string> {
     throw new Error('Not implemented');
   }
 }