feat: add watch option to bundle, fmt and lint commands

jurassiscripts · Jan 16, 2022 · 4e76fc0 · 4e76fc0
1 parent bfceeca
commit 4e76fc0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/cli_test.ts b/cli_test.ts
@@ -87,6 +87,11 @@ Deno.test("tsconfig", async () => {
   assertStringIncludes(output, expectedOutput);
 });
 
+Deno.test("config", async () => {
+  const output = await runScript("config", yamlWd);
+  assertMatch(output, /^\s*$/);
+});
+
 Deno.test("import map", async () => {
   const output = await runScript("importMap");
   assertStringIncludes(output, expectedOutput);
@@ -97,11 +102,6 @@ Deno.test("--help", async () => {
   assertStringIncludes(output, "--version");
 });
 
-Deno.test("--config", async () => {
-  const output = await runScript("config", yamlWd);
-  assertMatch(output, /^\s*$/);
-});
-
 Deno.test("forward arguments", async () => {
   const output = await runScript("forward", yamlWd, ["--shuffle=1234"]);
   assertStringIncludes(

diff --git a/src/build_command_string.ts b/src/build_command_string.ts
@@ -24,7 +24,7 @@ enum DenoOptions {
   shuffle = "shuffle",
 }
 
-const denoCmdOptions: { [key: string]: DenoOptions[] } = {
+export const denoCmdOptions: { [key: string]: DenoOptions[] } = {
   bundle: [
     DenoOptions.cert,
     DenoOptions.config,
@@ -38,6 +38,7 @@ const denoCmdOptions: { [key: string]: DenoOptions[] } = {
     DenoOptions.reload,
     DenoOptions.tsconfig,
     DenoOptions.unstable,
+    DenoOptions.watch,
   ],
   install: [
     DenoOptions.allow,
@@ -161,12 +162,14 @@ const denoCmdOptions: { [key: string]: DenoOptions[] } = {
     DenoOptions.log,
     DenoOptions.quiet,
     DenoOptions.unstable,
+    DenoOptions.watch,
   ],
   lint: [
     DenoOptions.config,
     DenoOptions.log,
     DenoOptions.quiet,
     DenoOptions.unstable,
+    DenoOptions.watch,
   ],
   types: [
     DenoOptions.log,
@@ -184,7 +187,7 @@ const denoCmdOptions: { [key: string]: DenoOptions[] } = {
   ],
 };
 
-const denoOption: Record<DenoOptions, string> = {
+export const denoOption: Record<DenoOptions, string> = {
   ...DenoOptions,
   [DenoOptions.allow]: "allow-",
   [DenoOptions.importMap]: "import-map",
@@ -278,7 +281,9 @@ export function buildCommandString(command: Command): string {
 
             default: {
               if (optionName === "imap") {
-                console.warn("The `imap` option is deprecated in favor of `importMap`. Please use `importMap` going forward as `imap` will be removed with the release of 2.0.0.");
+                console.warn(
+                  "The `imap` option is deprecated in favor of `importMap`. Please use `importMap` going forward as `imap` will be removed with the release of 2.0.0.",
+                );
               }
               cmd = insertOptions(
                 cmd,
@@ -307,7 +312,7 @@ function insertOptions(
 
 function generateFlagOptions(
   flags: FlagsObject,
-  prefix: string = "",
+  prefix = "",
 ): string[] {
   return Object.entries(flags).map(([k, v]) =>
     `--${prefix}${k}${v !== true ? `="${escapeCliOption(v.toString())}"` : ""}`

diff --git a/src/cli/commands/run.ts b/src/cli/commands/run.ts
@@ -11,7 +11,7 @@ export class RunCommand extends Command {
     this.description("Run a script")
       .arguments("<script:scriptid> [additionalArgs...]")
       .useRawArgs()
-      .action((options, script: string, ...additionalArgs: string[]) => {
+      .action((_, script: string, ...additionalArgs: string[]) => {
         return withUpdateChecks(async () => {
           if (script === "--help" || script === "-h") {
             console.log(this.getHelp());

diff --git a/src/cli/commands/upgrade.ts b/src/cli/commands/upgrade.ts
@@ -11,7 +11,7 @@ export class UpgradeCommand extends Command {
       "Upgrade Velociraptor to the latest version or to a specific one",
     )
       .arguments("[version:string]")
-      .action(async (options, version: string | undefined) => {
+      .action(async (_, version: string | undefined) => {
         let newVersion = version;
         if (!newVersion) {
           newVersion = await DenoLand.latestVersion(VR_NAME);

diff --git a/src/cli/commands/vr.ts b/src/cli/commands/vr.ts
@@ -35,7 +35,7 @@ export class VrCommand extends Command {
       .type("scriptid", new ScriptIdType(this.configData), { global: true })
       .arguments("[script:scriptid] [additionalArgs...]")
       .stopEarly()
-      .action((options, script: string, additionalArgs: string[]) => {
+      .action((_, script: string, additionalArgs: string[]) => {
         return withUpdateChecks(async () => {
           validateConfigData(this.configData);
           await checkGitHooks(this.configData as ConfigData);

diff --git a/src/scripts_config.ts b/src/scripts_config.ts
@@ -116,7 +116,7 @@ export interface DenoCliOptions {
   cert?: string;
 
   /**
-   * The path to a deno configuration file,
+   * The path to a deno/TypeScript configuration file,
    * passed to deno cli's `--config` option.
    */
   config?: string;

diff --git a/test/yaml/scripts.yml b/test/yaml/scripts.yml
@@ -24,10 +24,10 @@ scripts:
     cmd: deno run test.ts
     tsconfig: tsconfig.json
   importMap:
-    cmd: deno run --unstable import_map.ts
+    cmd: deno run import_map.ts
     importMap: import_map.json
   forward:
     cmd: echo deno test --lock=lock.json --cached-only
   config:
     cmd: deno lint test_config.ts
-    config: ../json/deno.jsonc
+    config: ../json/deno.jsonc