edf2csv 0.7.254 → 0.7.255

package/dist/cli.js

@@ -583,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;
             }
@@ -686,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))}`)
                         : '') +
@@ -768,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`);
@@ -796,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;
         }