cli: add -C alias for --conditions flag

guybedford · danielleadams · commit bc8400122c9f · 2021-05-31T15:34:53.000-04:00
PR-URL: #38755 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Jan Krems <jan.krems@gmail.com>
diff --git a/doc/api/cli.md b/doc/api/cli.md
@@ -80,7 +80,7 @@ $ node --completion-bash > node_bash_completion
 $ source node_bash_completion
 ```
 
-### `--conditions=condition`
+### `-C=condition`, `--conditions=condition`
 <!-- YAML
 added:
   - v14.9.0
@@ -89,14 +89,20 @@ added:
 
 > Stability: 1 - Experimental
 
-Enable experimental support for custom conditional exports resolution
+Enable experimental support for custom [conditional exports][] resolution
 conditions.
 
 Any number of custom string condition names are permitted.
 
 The default Node.js conditions of `"node"`, `"default"`, `"import"`, and
 `"require"` will always apply as defined.
 
+For example, to run a module with "development" resolutions:
+
+```console
+$ node -C=development app.js
+```
+
 ### `--cpu-prof`
 <!-- YAML
 added: v12.0.0
@@ -1368,7 +1374,7 @@ node --require "./a.js" --require "./b.js"
 
 Node.js options that are allowed are:
 <!-- node-options-node start -->
-* `--conditions`
+* `--conditions`, `-C`
 * `--diagnostic-dir`
 * `--disable-proto`
 * `--enable-fips`
@@ -1764,6 +1770,7 @@ $ node --max-old-space-size=1536 index.js
 [`tls.DEFAULT_MIN_VERSION`]: tls.md#tls_tls_default_min_version
 [`unhandledRejection`]: process.md#process_event_unhandledrejection
 [`worker_threads.threadId`]: worker_threads.md#worker_threads_worker_threadid
+[conditional exports]: packages.md#packages_conditional_exports
 [context-aware]: addons.md#addons_context_aware_addons
 [customizing ESM specifier resolution]: esm.md#esm_customizing_esm_specifier_resolution_algorithm
 [debugger]: debugger.md
diff --git a/doc/node.1 b/doc/node.1
@@ -78,7 +78,7 @@ Aborting instead of exiting causes a core file to be generated for analysis.
 .It Fl -completion-bash
 Print source-able bash completion script for Node.js.
 .
-.It Fl -conditions Ar string
+.It Fl C , Fl -conditions Ar string
 Use custom conditional exports conditions.
 .Ar string
 .
diff --git a/src/node_options.cc b/src/node_options.cc
@@ -292,6 +292,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "additional user conditions for conditional exports and imports",
             &EnvironmentOptions::conditions,
             kAllowedInEnvironment);
+  AddAlias("-C", "--conditions");
   AddOption("--diagnostic-dir",
             "set dir for all output files"
             " (default: current working directory)",
diff --git a/test/es-module/test-esm-custom-exports.mjs b/test/es-module/test-esm-custom-exports.mjs
@@ -1,4 +1,4 @@
-// Flags: --conditions=custom-condition --conditions another
+// Flags: --conditions=custom-condition -C another
 import { mustCall } from '../common/index.mjs';
 import { strictEqual } from 'assert';
 import { requireFixture, importFixture } from '../fixtures/pkgexports.mjs';
diff --git a/test/parallel/test-process-env-allowed-flags.js b/test/parallel/test-process-env-allowed-flags.js
@@ -51,7 +51,7 @@ const assert = require('assert');
 // Assert all "canonical" flags begin with dash(es)
 {
   process.allowedNodeEnvironmentFlags.forEach((flag) => {
-    assert(/^--?[a-z0-9._-]+$/.test(flag),
+    assert(/^--?[a-zA-Z0-9._-]+$/.test(flag),
            `Unexpected format for flag ${flag}`);
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ Aborting instead of exiting causes a core file to be generated for analysis.`
`78`	`78`	`.It Fl -completion-bash`
`79`	`79`	`Print source-able bash completion script for Node.js.`
`80`	`80`	`.`
`81`		`-.It Fl -conditions Ar string`
	`81`	`+.It Fl C , Fl -conditions Ar string`
`82`	`82`	`Use custom conditional exports conditions.`
`83`	`83`	`.Ar string`
`84`	`84`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Flags: --conditions=custom-condition --conditions another`
	`1`	`+// Flags: --conditions=custom-condition -C another`
`2`	`2`	`import { mustCall } from '../common/index.mjs';`
`3`	`3`	`import { strictEqual } from 'assert';`
`4`	`4`	`import { requireFixture, importFixture } from '../fixtures/pkgexports.mjs';`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ const assert = require('assert');`
`51`	`51`	`// Assert all "canonical" flags begin with dash(es)`
`52`	`52`	`{`
`53`	`53`	`process.allowedNodeEnvironmentFlags.forEach((flag) => {`
`54`		`- assert(/^--?[a-z0-9._-]+$/.test(flag),`
	`54`	`+ assert(/^--?[a-zA-Z0-9._-]+$/.test(flag),`
`55`	`55`	`Unexpected format for flag ${flag}`);
`56`	`56`	`});`
`57`	`57`	`}`