edf2csv 0.8.37 → 0.8.39

package/dist/convert/run.js

@@ -11,7 +11,7 @@ import { finished } from 'node:stream/promises';
 import { createGzip, gzipSync } from 'node:zlib';
 import path from 'node:path';
 import { EdfFile } from '../edf/reader.js';
-import { describeFormat, formatRates, formatWallClock, startsFormula } from '../edf/header.js';
+import { describeFormat, formatRate, formatRates, formatWallClock, startsFormula } from '../edf/header.js';
 import { EdfError } from '../edf/errors.js';
 import { BufferedLineWriter, DEFAULT_FLUSH_THRESHOLD, UTF8_BOM, csvRow, escapeCsvField, } from '../format/csv.js';
 import { counted, grouped, listed } from '../format/list.js';
@@ -986,6 +986,27 @@ async function writeChannelsCsv(outputDir, file, plan, gzip, bom) {
         for (const channel of group.channels)
             fileFor.set(channel.signal.index, group.fileName);
     }
+    /*
+      A rate rendered the way the file name beside it in the same row was rendered.
+  
+      `sampling_rate_hz` and `output_file` are two cells of one row about one rate, and they were
+      written from different renderings of it — the cell from `String`, the name from
+      `formatRates` over the whole set. They agree on every rate `String` prints plainly and part
+      company on the ones it does not:
+  
+          a,0,a,uV,1e-19,100,...,signals_1_000e-19hz.csv,yes
+  
+      A reader joining that column against the files on disk finds `1e-19` naming
+      `1_000e-19hz`, and `--info` printing a third thing again — except that `--info`'s RATE
+      column is `1.000e-19 Hz`, which is the name's own form. channels.csv was the one surface
+      rendering the rate for itself.
+  
+      Rendered together because that is how the names are: two rates a sixth decimal apart round
+      to one string, and `formatRates` widens the whole set when they do, so a per-rate rendering
+      would disagree with the names again on exactly those files.
+    */
+    const groupRates = plan.groups.map((group) => group.rate);
+    const rateText = new Map(formatRates(groupRates).map((text, i) => [groupRates[i], text]));
     const lines = [
         csvRow([
             'column',
@@ -1028,10 +1049,9 @@ async function writeChannelsCsv(outputDir, file, plan, gzip, bom) {
               signals.csv writing every one of those values out in full — and a channel calibrated
               to ±100 in the row above it, so the column held both notations at once.
             */
-            // Not the rate, which is the one number in this row that is about the *file*: it
-            // decides which signals_<rate>hz.csv the channel lands in, and `rateSlug` writes that
-            // name from the same exponent form. Nor samples_per_record, which is a count.
-            String(signal.samplingRate),
+            // Nor the rate, which is rendered above against the names it has to match. Nor
+            // samples_per_record, which is a count.
+            rateText.get(signal.samplingRate) ?? formatRate(signal.samplingRate),
             String(signal.samplesPerRecord),
             plain(signal.physicalMin),
             plain(signal.physicalMax),