Added convenience CLI flags

simshadows · simshadows · commit 295501714f5b · 2022-07-27T16:15:09.000+10:00
diff --git a/solves/src/arg-parse.ts b/solves/src/arg-parse.ts
@@ -19,9 +19,12 @@ function ensureStr(obj: any, argName: string): string {
 /********************************************************************/
 
 export interface ArgValues {
-    specFilePath:        string;
-    sourceOutputDirPath: string;
-    appOutputDirPath:    string;
+    specFilePath:         string;
+    sourceOutputDirPath:  string;
+    appOutputDirPath:     string;
+
+    allowOverwriteOutput: boolean;
+    startDevServer:       boolean;
 }
 
 const program = new Command();
@@ -46,6 +49,16 @@ program.option(
     "../../generated-web-app", // TODO: How to make this relative to invocation?
 );
 
+program.option(
+    "-f, --force",
+    "Allows overwriting of output directories (--source-out and --app-out).",
+);
+
+program.option(
+    "--start-dev-server",
+    "Instead of emitting a generated static web app (via. -o/--app-out), start the Webpack dev server. Using --start-dev-server will cause -o/--app-out to be ignored.",
+);
+
 program.parse();
 
 const rawOptions = program.opts();
@@ -54,6 +67,9 @@ const typedOptions: ArgValues = {
     specFilePath: path.join(cwd, ensureStr(rawOptions["spec"], "spec")),
     sourceOutputDirPath: path.join(cwd, ensureStr(rawOptions["sourceOut"], "source-out")),
     appOutputDirPath: path.join(cwd, ensureStr(rawOptions["appOut"], "app-out")),
+
+    allowOverwriteOutput: (rawOptions["force"] === true),
+    startDevServer: (rawOptions["startDevServer"] === true),
 };
 
 // Some really crude validation for this prototype, for safety
diff --git a/solves/src/code-generator/index.ts b/solves/src/code-generator/index.ts
@@ -4,6 +4,9 @@
  * License:  GNU Affero General Public License v3 (AGPL-3.0)
  */
 
+//import fs from "fs";
+//import child_process from "child_process";
+
 import {execute} from "@yarnpkg/shell";
 
 import {type ArgValues} from "../arg-parse";
@@ -12,15 +15,41 @@ import {copyDirAndApplyTemplate} from "./base-template";
 
 const BASE_TEMPLATE_PATH = "./base-template";
 
-export function generateSource(specValues: SpecValues, cliArgs: ArgValues) {
+export async function generateSource(specValues: SpecValues, cliArgs: ArgValues) {
+    if (cliArgs.allowOverwriteOutput) {
+        // Weird bug in yarn that causes this to fail.
+        // See <https://github.com/yarnpkg/berry/issues/1818>
+        //fs.rmSync(String(cliArgs.sourceOutputDirPath), {force: true, recursive: true});
+        // We'll just use a shell command for now
+        await execute(`rm -rf ${cliArgs.sourceOutputDirPath}`);
+        // TODO: Fix this
+    }
+
     copyDirAndApplyTemplate(BASE_TEMPLATE_PATH, cliArgs.sourceOutputDirPath, {
         ...specValues,
     });
     // TODO: Sanitize to prevent command injection
-    execute(
+
+    await execute(
         `cd ${cliArgs.sourceOutputDirPath}`
         + " && yarn set version stable && yarn install"
-        + ` && yarn build --output-path ${cliArgs.appOutputDirPath}`
     );
+
+    if (cliArgs.startDevServer) {
+        await execute(
+            `cd ${cliArgs.sourceOutputDirPath}`
+            + " && yarn start"
+        );
+    } else {
+        if (cliArgs.allowOverwriteOutput) {
+            //fs.rmSync(String(cliArgs.appOutputDirPath), {force: true, recursive: true});
+            await execute(`rm -rf ${cliArgs.appOutputDirPath}`);
+            // TODO: Fix this
+        }
+        await execute(
+            `cd ${cliArgs.sourceOutputDirPath}`
+            + ` && yarn build --output-path ${cliArgs.appOutputDirPath}`
+        );
+    }
 }
 
diff --git a/solves/src/index.ts b/solves/src/index.ts
@@ -13,5 +13,9 @@ const cliArgs = getCLIArgs();
 const specValues = getSpecValues(cliArgs.specFilePath);
 console.log(specValues);
 
-generateSource(specValues, cliArgs);
+generateSource(specValues, cliArgs)
+    .then()
+    .catch(err => {
+        console.log(err);
+    });
 
