add initial macOS support #40

src/application/Context/State/Code/Generation/CodeBuilder.ts

@@ -3,7 +3,7 @@ import { ICodeBuilder } from './ICodeBuilder';
 const NewLine = '\n';
 const TotalFunctionSeparatorChars = 58;
 
-export class CodeBuilder implements ICodeBuilder {
+export abstract class CodeBuilder implements ICodeBuilder {
     private readonly lines = new Array<string>();
 
     // Returns current line starting from 0 (no lines), or 1 (have single line)
@@ -29,7 +29,7 @@ export class CodeBuilder implements ICodeBuilder {
     }
 
     public appendCommentLine(commentLine?: string): CodeBuilder {
-        this.lines.push(`:: ${commentLine}`);
+        this.lines.push(`${this.getCommentDelimiter()} ${commentLine}`);
         return this;
     }
 
@@ -37,9 +37,8 @@ export class CodeBuilder implements ICodeBuilder {
         if (!name)  { throw new Error('name cannot be empty or null'); }
         if (!code)  { throw new Error('code cannot be empty or null'); }
         return this
-            .appendLine()
             .appendCommentLineWithHyphensAround(name)
-            .appendLine(`echo --- ${name}`)
+            .appendLine(this.writeStandardOut(`--- ${name}`))
             .appendLine(code)
             .appendTrailingHyphensCommentLine();
     }
@@ -62,4 +61,7 @@ export class CodeBuilder implements ICodeBuilder {
     public toString(): string {
         return this.lines.join(NewLine);
     }
+
+    protected abstract getCommentDelimiter(): string;
+    protected abstract writeStandardOut(text: string): string;
 }

src/application/Context/State/Code/Generation/CodeBuilderFactory.ts

@@ -0,0 +1,15 @@
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { ICodeBuilder } from './ICodeBuilder';
+import { ICodeBuilderFactory } from './ICodeBuilderFactory';
+import { BatchBuilder } from './Languages/BatchBuilder';
+import { ShellBuilder } from './Languages/ShellBuilder';
+
+export class CodeBuilderFactory implements ICodeBuilderFactory {
+    public create(language: ScriptingLanguage): ICodeBuilder {
+        switch (language) {
+            case ScriptingLanguage.shellscript: return new ShellBuilder();
+            case ScriptingLanguage.batchfile:   return new BatchBuilder();
+            default: throw new RangeError(`unknown language: "${ScriptingLanguage[language]}"`);
+        }
+    }
+}

src/application/Context/State/Code/Generation/ICodeBuilderFactory.ts

@@ -0,0 +1,6 @@
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { ICodeBuilder } from './ICodeBuilder';
+
+export interface ICodeBuilderFactory {
+    create(language: ScriptingLanguage): ICodeBuilder;
+}

src/application/Context/State/Code/Generation/Languages/BatchBuilder.ts

@@ -0,0 +1,10 @@
+import { CodeBuilder } from '@/application/Context/State/Code/Generation/CodeBuilder';
+
+export class BatchBuilder extends CodeBuilder {
+    protected getCommentDelimiter(): string {
+        return '::';
+    }
+    protected writeStandardOut(text: string): string {
+        return `echo ${text}`;
+    }
+}

src/application/Context/State/Code/Generation/Languages/ShellBuilder.ts

@@ -0,0 +1,10 @@
+import { CodeBuilder } from '@/application/Context/State/Code/Generation/CodeBuilder';
+
+export class ShellBuilder extends CodeBuilder {
+    protected getCommentDelimiter(): string {
+        return '#';
+    }
+    protected writeStandardOut(text: string): string {
+        return `echo '${text}'`;
+    }
+}

src/application/Context/State/Code/Generation/UserScriptGenerator.ts

@@ -1,14 +1,15 @@
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { IUserScriptGenerator } from './IUserScriptGenerator';
-import { CodeBuilder } from './CodeBuilder';
 import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition';
 import { CodePosition } from '../Position/CodePosition';
 import { IUserScript } from './IUserScript';
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 import { ICodeBuilder } from './ICodeBuilder';
+import { ICodeBuilderFactory } from './ICodeBuilderFactory';
+import { CodeBuilderFactory } from './CodeBuilderFactory';
 
 export class UserScriptGenerator implements IUserScriptGenerator {
-    constructor(private readonly codeBuilderFactory: () => ICodeBuilder = () => new CodeBuilder()) {
+    constructor(private readonly codeBuilderFactory: ICodeBuilderFactory = new CodeBuilderFactory()) {
 
     }
     public buildCode(
@@ -20,7 +21,7 @@ export class UserScriptGenerator implements IUserScriptGenerator {
         if (!selectedScripts.length) {
             return { code: '', scriptPositions };
         }
-        let builder = this.codeBuilderFactory();
+        let builder = this.codeBuilderFactory.create(scriptingDefinition.language);
         builder = initializeCode(scriptingDefinition.startCode, builder);
         for (const selection of selectedScripts) {
             scriptPositions = appendSelection(selection, scriptPositions, builder);
@@ -52,16 +53,19 @@ function appendSelection(
     selection: SelectedScript,
     scriptPositions: Map<SelectedScript, ICodePosition>,
     builder: ICodeBuilder): Map<SelectedScript, ICodePosition> {
-    const startPosition = builder.currentLine + 1;
-    appendCode(selection, builder);
+    const startPosition = builder.currentLine + 1; // Because first line will be empty to separate scripts
+    builder = appendCode(selection, builder);
     const endPosition = builder.currentLine - 1;
     builder.appendLine();
-    scriptPositions.set(selection, new CodePosition(startPosition, endPosition));
+    const position = new CodePosition(startPosition, endPosition);
+    scriptPositions.set(selection, position);
     return scriptPositions;
 }
 
-function appendCode(selection: SelectedScript, builder: ICodeBuilder) {
+function appendCode(selection: SelectedScript, builder: ICodeBuilder): ICodeBuilder {
     const name = selection.revert ? `${selection.script.name} (revert)` : selection.script.name;
     const scriptCode = selection.revert ? selection.script.code.revert : selection.script.code.execute;
-    builder.appendFunction(name, scriptCode);
+    return builder
+        .appendLine()
+        .appendFunction(name, scriptCode);
 }