edf2csv 0.7.253 → 0.7.255

package/dist/cli.js

@@ -97,6 +97,13 @@ Examples
   edf2csv /data/*.edf --out ./converted --jobs auto
   edf2csv /data/study --out ./converted --jobs auto
 `;
+/**
+ * The placeholder `--help` writes after each option that takes a value, read off `--help`.
+ *
+ * Read rather than listed again so the two cannot part company: `--channels <list>` is what
+ * the usage block says and what the reference documents, and the refusals below quote it back.
+ */
+const VALUE_NAMES = new Map([...USAGE.matchAll(/--([a-z-]+) (<[a-z]+>)/gu)].map((m) => [m[1], m[2]]));
 /**
  * A continuation line under an `error: ` or `interrupted (SIGINT): ` head.
  *
@@ -576,7 +583,7 @@ export async function main(argv) {
               clause: there is no output to say was still written.
             */
             if (strict && warnings > 0) {
-                process.stderr.write(`\n${wrap(`--strict: ${warnings} warning${warnings === 1 ? '' : 's'} raised, so this run is ` +
+                process.stderr.write(`\n${wrap(`--strict: ${counted(warnings, 'warning')} raised, so this run is ` +
                     `reported as a failure. Nothing was written either way, since --info converts nothing.`)}\n`);
                 return EXIT_ERROR;
             }
@@ -679,8 +686,8 @@ export async function main(argv) {
                 */
                 const started = abandoned.filter((destination) => existsSync(destination));
                 const untouched = abandoned.filter((destination) => !existsSync(destination));
-                process.stderr.write(`\ninterrupted (${signal}): ${abandoned.length} conversion` +
-                    `${abandoned.length === 1 ? '' : 's'} stopped part way through.\n` +
+                process.stderr.write(`\ninterrupted (${signal}): ${counted(abandoned.length, 'conversion')} ` +
+                    `stopped part way through.\n` +
                     (started.length > 0
                         ? detail(`Incomplete, and should not be used: ${listed(started.map(printable))}`)
                         : '') +
@@ -761,7 +768,7 @@ export async function main(argv) {
             failures.push(EXIT_ERROR);
         if (batch && !quiet && !asJson) {
             const unread = unreadable.length > 0
-                ? `; ${unreadable.length} path${unreadable.length === 1 ? '' : 's'} could not be read`
+                ? `; ${counted(unreadable.length, 'path')} could not be read`
                 : '';
             const failed = converted < inputs.length ? `; ${inputs.length - converted} failed` : '';
             process.stderr.write(`\nConverted ${converted} of ${counted(inputs.length, 'recording')}${failed}${unread}.\n`);
@@ -789,7 +796,7 @@ export async function main(argv) {
           to do about it is the caller's decision, and they still have the files to inspect.
         */
         if (strict && warnings > 0) {
-            process.stderr.write(`\n${wrap(`--strict: ${warnings} warning${warnings === 1 ? '' : 's'} raised, so this run is ` +
+            process.stderr.write(`\n${wrap(`--strict: ${counted(warnings, 'warning')} raised, so this run is ` +
                 `reported as a failure. The output was still written.`)}\n`);
             return EXIT_ERROR;
         }
@@ -1983,6 +1990,17 @@ function survivesBare(text) {
 function singleQuoted(text) {
     return `'${text.replaceAll("'", "'\\''")}'`;
 }
+/**
+ * Which spelling of an option the command actually used.
+ *
+ * Node names both — `-c, --channels` — and the reader typed one of them. Quoting the pair back
+ * makes a refusal about a command nobody wrote.
+ */
+function asTyped(short, long, argv) {
+    if (short === undefined)
+        return long;
+    return argv.some((a) => a === long || a.startsWith(`${long}=`)) ? long : short;
+}
 /**
  * A `parseArgs` failure, in this tool's words where they are better than Node's.
  *
@@ -2030,6 +2048,37 @@ function usageMessage(error, argv) {
     if (code !== 'ERR_PARSE_ARGS_INVALID_OPTION_VALUE') {
         return asError(raw);
     }
+    /*
+      Node's voice, in the two refusals this file had not taken over.
+  
+      `unknownOption` and the ambiguous-value branch below both rewrite their message into this
+      tool's words. Forgetting a value did not, so the commonest slip of the three came back as
+  
+          error: Option '-c, --channels <value>' argument missing
+  
+      which names both spellings when the reader typed one, ends without the full stop 68 of
+      this tool's 69 diagnostics carry, and quotes a placeholder — `<value>` — that appears
+      nowhere in `--help`, the reference, or any other message here: this option takes a
+      `<list>`, `--start` takes a `<time>`, `--out` a `<dir>`. Nothing in it tells the reader
+      what to write, and it is the one refusal where that is the whole question.
+  
+      `--gzip=yes` is the same failure from the other side, and had the same treatment.
+    */
+    const missing = /^Option '(?:(-[A-Za-z]), )?(--[a-z-]+) <value>' argument missing$/u.exec(raw);
+    if (missing) {
+        const long = missing[2];
+        return printableLines(`error: ${asTyped(missing[1], long, argv)} needs a value and was given none.\n` +
+            `       It takes one: ${long} ${VALUE_NAMES.get(long.slice(2)) ?? '<value>'}.`);
+    }
+    const unwanted = /^Option '(?:(-[A-Za-z]), )?(--[a-z-]+)' does not take an argument$/u.exec(raw);
+    if (unwanted) {
+        const long = unwanted[2];
+        const typed = asTyped(unwanted[1], long, argv);
+        const given = argv.find((a) => a.startsWith(`${long}=`))?.slice(long.length + 1);
+        return printableLines(`error: ${typed} is a switch and takes no value` +
+            `${given === undefined ? '' : `, but was given "${given}"`}.\n` +
+            `       Write it on its own: ${typed}`);
+    }
     const ambiguous = /^Option '(-[^']+)' argument is ambiguous/u.exec(raw);
     if (!ambiguous)
         return asError(raw);