edf2csv 0.8.68 → 0.8.70

package/dist/convert/run.js

@@ -98,10 +98,10 @@ export async function convert(inputPath, options = {}) {
                 readerHungUp,
                 annotationCount: 0,
                 // Over both lists, because the timing warnings are pushed onto the plan's.
-                diagnostics: withSignalTableUnwritten(withSidecarsNamed([
+                diagnostics: withSidecarsNamed(withSignalTableUnwritten([
                     ...withTimingPromiseKept(withoutFileRateWarning(file.diagnostics), timing.starts !== null),
                     ...plan.diagnostics,
-                ], { toStdout: true, gzip: plan.gzip }), plan.writeSignals),
+                ], plan.writeSignals), { toStdout: true, gzip: plan.gzip }),
                 plan,
                 file,
                 elapsedMs: Date.now() - startedAt,
@@ -199,11 +199,11 @@ export async function convert(inputPath, options = {}) {
             annotationCount: annotationsWritten,
             // The directory path needs it too: `--gzip` changes the names, and two of these
             // sentences are a file name and nothing else. See withSidecarsNamed.
-            diagnostics: withSignalTableUnwritten(withSidecarsNamed([
+            diagnostics: withSidecarsNamed(withSignalTableUnwritten([
                 ...withTimingPromiseKept(withoutFileRateWarning(file.diagnostics), timing.starts !== null),
                 ...plan.diagnostics,
                 ...stale,
-            ], { toStdout: false, gzip: plan.gzip }), plan.writeSignals),
+            ], plan.writeSignals), { toStdout: false, gzip: plan.gzip }),
             plan,
             file,
             elapsedMs: Date.now() - startedAt,
@@ -1481,7 +1481,15 @@ export function stdoutRefusal(file, plan) {
             ? `--stdout has no signal data to write: this recording has no signal channels, ` +
                 `only ${file.header.isBdf ? 'BDF+' : 'EDF+'} annotations.`
             : '--stdout has no signal data to write: nothing was selected that carries samples.', file.dataSignals.length === 0
-            ? 'Convert to a directory to get its annotations.csv, or drop --stdout.'
+            ? /*
+             Named the way that conversion would name it, since `--gzip` is already on the
+             command line this is refusing. This hint is nothing but a command to run, and the
+             command it names writes `annotations.csv.gz` — so a reader who follows it finds
+             nothing under the name they were given. Same fault 0.8.48 fixed for the warnings,
+             in the one refusal that names a file.
+          */
+                `Convert to a directory to get its ${outputCsvName('annotations', plan.gzip)}, or ` +
+                    `drop --stdout.`
             : 'Check --channels and the requested window, or convert to a directory instead.');
     }
     // The long layout is one table whatever the rates are, so it has nothing to refuse.
@@ -1699,6 +1707,25 @@ export function withSidecarsNamed(diagnostics, { toStdout, gzip }) {
     const channels = outputCsvName('channels', gzip);
     const annotations = outputCsvName('annotations', gzip);
     return diagnostics.map((diagnostic) => {
+        /*
+          The last message of this kind, and the one that names its files mid-sentence.
+    
+          `NONPRINTABLE_LABEL` says where an invisible byte lands — the channel's name in
+          signals.csv, a cell of channels.csv — and `--gzip` writes neither of those names. It was
+          left out of 0.8.48 because the file is named inside a sentence assembled from which of
+          the four header fields carry bytes, and out of 0.8.54 for the same reason. Renaming is
+          all it needs, once the sentence is settled: this runs after `withSignalTableUnwritten`
+          has had its say about the layout, so whichever file the sentence ended up naming is the
+          one that gets the suffix.
+        */
+        if (gzip && diagnostic.code === 'NONPRINTABLE_LABEL') {
+            return {
+                ...diagnostic,
+                message: diagnostic.message
+                    .replace(/\bsignals\.csv\b/gu, outputCsvName('signals', true))
+                    .replace(/\bchannels\.csv\b/gu, channels),
+            };
+        }
         /*
           The header's own `NO_SAMPLES`, which names the file that describes the channel it is
           about — and under `--stdout` there is no such file, so the reassurance is empty:
@@ -1916,12 +1943,12 @@ bom) {
                 decimals: g.channels.map((c) => c.decimals),
             })),
         },
-        notes: withSignalTableUnwritten(withSidecarsNamed([
+        notes: withSidecarsNamed(withSignalTableUnwritten([
             ...withTimingPromiseKept(withoutFileRateWarning(file.diagnostics), timedFromRecords),
             ...plan.diagnostics,
-        ], 
+        ], plan.writeSignals), 
         // metadata.json is only written into a directory, so this is never the stdout case.
-        { toStdout: false, gzip: plan.gzip }), plan.writeSignals).map((d) => ({
+        { toStdout: false, gzip: plan.gzip }).map((d) => ({
             code: d.code,
             severity: d.severity,
             message: d.message,