handle common args

nrwl · Feb 9, 2023 · 2f1c8a6 · 2f1c8a6
1 parent ae3ab3a
commit 2f1c8a6
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 136 deletions.
diff --git a/packages/deno/src/executors/build/build.impl.ts b/packages/deno/src/executors/build/build.impl.ts
@@ -3,7 +3,7 @@ import { dirname, join, resolve } from 'path';
 import { BuildExecutorSchema } from './schema';
 
 import { ensureDirSync } from 'fs-extra';
-import { processTypeCheckOption } from '../../utils/arg-utils';
+import { processCommonArgs } from '../../utils/arg-utils';
 import { runDeno } from '../../utils/run-deno';
 
 export async function denoBuildExecutor(options: BuildExecutorSchema) {
@@ -43,52 +43,7 @@ function createArgs(options: BuildExecutorSchema) {
 
   args.push(`--config=${options.denoConfig}`);
 
-  if (options.cert) {
-    args.push(`--cert=${options.cert}`);
-  }
-  if (options.check !== undefined) {
-    args.push(processTypeCheckOption(options.check));
-  }
-
-  if (options.lockWrite) {
-    args.push(`--lock-write`);
-  }
-
-  if (options.noLock) {
-    args.push(`--no-lock`);
-  }
-
-  if (options.noNpm) {
-    args.push(`--no-npm`);
-  }
-
-  if (options.noRemote) {
-    args.push(`--no-remote`);
-  }
-
-  if (options.nodeModulesDir) {
-    args.push(`--node-modules-dir=${options.nodeModulesDir}`);
-  }
-
-  if (options.quiet) {
-    args.push(`--quiet`);
-  }
-
-  if (options.reload) {
-    args.push(
-      `--reload${
-        typeof options.reload === 'string' ? `=${options.reload}` : ''
-      }`
-    );
-  }
-
-  if (options.unstable) {
-    args.push(`--unstable`);
-  }
-
-  if (options.watch) {
-    args.push(`--watch`);
-  }
+  args.push(...processCommonArgs(options));
 
   args.push(options.main);
 

diff --git a/packages/deno/src/executors/lint/lint.impl.ts b/packages/deno/src/executors/lint/lint.impl.ts
@@ -1,4 +1,5 @@
 import { ExecutorContext, ProjectConfiguration } from '@nrwl/devkit';
+import { processCommonArgs } from '../../utils/arg-utils';
 import { runDeno } from '../../utils/run-deno';
 import { LintExecutorSchema } from './schema';
 
@@ -41,7 +42,10 @@ function normalizeOpitons(
 }
 
 function createArgs(options: LintExecutorNormalizedSchema) {
-  const args: Array<string | boolean> = ['lint'];
+  const args: string[] = ['lint'];
+
+  args.push(`--config=${options.denoConfig}`);
+  args.push(...processCommonArgs(options));
 
   if (options.compact) {
     args.push('--compact');
@@ -55,10 +59,6 @@ function createArgs(options: LintExecutorNormalizedSchema) {
     args.push('--json');
   }
 
-  if (options.quiet) {
-    args.push('--quiet');
-  }
-
   if (options.rulesExclude) {
     args.push(`--rules-exclude=${options.rulesExclude}`);
   }
@@ -71,15 +71,6 @@ function createArgs(options: LintExecutorNormalizedSchema) {
     args.push(`--rules-tags=${options.rulesTags}`);
   }
 
-  if (options.unstable) {
-    args.push('--unstable');
-  }
-
-  if (options.watch) {
-    args.push('--watch');
-  }
-
-  args.push(`--config=${options.denoConfig}`);
   args.push(options.lintDir);
 
   return args;

diff --git a/packages/deno/src/executors/serve/serve.impl.ts b/packages/deno/src/executors/serve/serve.impl.ts
@@ -3,7 +3,7 @@ import {
   parseTargetString,
   readTargetOptions,
 } from '@nrwl/devkit';
-import { processTypeCheckOption } from '../../utils/arg-utils';
+import { processCommonArgs } from '../../utils/arg-utils';
 import { runDeno } from '../../utils/run-deno';
 import { BuildExecutorSchema } from '../build/schema';
 import { ServeExecutorSchema } from './schema';
@@ -60,12 +60,7 @@ function createArgs(options: ServeExecutorSchema) {
   const args = ['run', '--allow-all'];
 
   args.push(`--config=${options.denoConfig}`);
-  if (options.cert) {
-    args.push(`--cert=${options.cert}`);
-  }
-  if (options.check !== undefined) {
-    args.push(processTypeCheckOption(options.check));
-  }
+  args.push(...processCommonArgs(options));
 
   if (options.inspect) {
     args.push(
@@ -76,44 +71,14 @@ function createArgs(options: ServeExecutorSchema) {
       }`
     );
   }
+
   if (options.location) {
     args.push(`--location=${options.location}`);
   }
-  if (options.lockWrite) {
-    args.push(`--lock-write`);
-  }
-  if (options.noLock) {
-    args.push(`--no-lock`);
-  }
-  if (options.noNpm) {
-    args.push(`--no-npm`);
-  }
-  if (options.noRemote) {
-    args.push(`--no-remote`);
-  }
-  if (options.nodeModulesDir) {
-    args.push(`--node-modules-dir=${options.nodeModulesDir}`);
-  }
-  if (options.quiet) {
-    args.push(`--quiet`);
-  }
-  if (options.reload) {
-    args.push(
-      `--reload${
-        typeof options.reload === 'string' ? `=${options.reload}` : ''
-      }`
-    );
-  }
+
   if (options.seed) {
     args.push(`--seed=${options.seed}`);
   }
-  if (options.unstable) {
-    args.push('--unstable');
-  }
-
-  if (options.watch) {
-    args.push('--watch');
-  }
 
   args.push(options.main);
 

diff --git a/packages/deno/src/executors/test/test.impl.ts b/packages/deno/src/executors/test/test.impl.ts
@@ -1,7 +1,7 @@
 import { ExecutorContext, logger } from '@nrwl/devkit';
 import { emptyDirSync } from 'fs-extra';
 import { join, posix, resolve, sep } from 'path';
-import { processTypeCheckOption } from '../../utils/arg-utils';
+import { processCommonArgs } from '../../utils/arg-utils';
 import { runDeno } from '../../utils/run-deno';
 import { DenoTestExecutorSchema } from './schema';
 
@@ -91,9 +91,7 @@ function createArgs(options: DenoTestExecutorNormalizedSchema) {
   const args: Array<string | boolean | number> = ['test', '-A'];
 
   args.push(`--config=${options.denoConfig}`);
-  if (options.watch) {
-    args.push('--watch');
-  }
+  args.push(...processCommonArgs(options));
 
   if (options.coverageDirectory) {
     if (options.inspect) {
@@ -103,14 +101,6 @@ function createArgs(options: DenoTestExecutorNormalizedSchema) {
     }
   }
 
-  if (options.check !== undefined) {
-    args.push(processTypeCheckOption(options.check));
-  }
-
-  if (options.cert) {
-    args.push('--cert', options.cert);
-  }
-
   if (options.failFast) {
     args.push(
       `--fail-fast${
@@ -127,14 +117,6 @@ function createArgs(options: DenoTestExecutorNormalizedSchema) {
     args.push(`--ignore=${options.ignore.join(',')}`);
   }
 
-  if (options.inspect) {
-    args.push(
-      `--inspect-brk=${
-        typeof options.inspect === 'string' ? options.inspect : '127.0.0.1:9229'
-      }`
-    );
-  }
-
   if (options.location) {
     args.push(`--location=${options.location}`);
   }
@@ -146,18 +128,6 @@ function createArgs(options: DenoTestExecutorNormalizedSchema) {
     }
   }
 
-  if (options.quiet) {
-    args.push('--quiet');
-  }
-
-  if (options.reload) {
-    args.push(
-      `--reload${
-        typeof options.reload === 'string' ? `=${options.reload}` : ''
-      }`
-    );
-  }
-
   if (options.seed) {
     args.push(`--seed=${options.seed}`);
   }
@@ -166,10 +136,6 @@ function createArgs(options: DenoTestExecutorNormalizedSchema) {
     args.push(`--shuffle=${options.shuffle}`);
   }
 
-  if (options.unstable) {
-    args.push('--unstable');
-  }
-
   args.push(options.testDir);
   return args;
 }

diff --git a/packages/deno/src/utils/arg-utils.ts b/packages/deno/src/utils/arg-utils.ts
@@ -12,3 +12,69 @@ export function processTypeCheckOption(check: DenoTypeCheck): string {
   }
   return '--check';
 }
+
+/**
+ * handle args for:
+ *  --cert
+ *  --check
+ *  --lock-write
+ *  --no-lock
+ *  --no-npm
+ *  --no-remote
+ *  --node-modules-dir
+ *  --quiet
+ *  --reload
+ *  --unstable
+ *  --watch
+ **/
+export function processCommonArgs(options: Record<string, any>): string[] {
+  const args: string[] = [];
+  if (options.cert) {
+    args.push(`--cert=${options.cert}`);
+  }
+  if (options.check !== undefined) {
+    args.push(processTypeCheckOption(options.check));
+  }
+
+  if (options.lockWrite) {
+    args.push(`--lock-write`);
+  }
+
+  if (options.noLock) {
+    args.push(`--no-lock`);
+  }
+
+  if (options.noNpm) {
+    args.push(`--no-npm`);
+  }
+
+  if (options.noRemote) {
+    args.push(`--no-remote`);
+  }
+
+  if (options.nodeModulesDir) {
+    args.push(`--node-modules-dir=${options.nodeModulesDir}`);
+  }
+
+  if (options.quiet) {
+    args.push(`--quiet`);
+  }
+
+  if (options.reload) {
+    args.push(
+      `--reload${
+        typeof options.reload === 'string' ? `=${options.reload}` : ''
+      }`
+    );
+  }
+
+  if (options.unstable) {
+    args.push(`--unstable`);
+  }
+
+  if (options.watch) {
+    args.push(`--watch`);
+  }
+
+  return args;
+}