jostraca 0.38.0 → 0.39.0

package/dist/build/BuildContext.js

@@ -98,8 +98,10 @@ class BuildContext {
     }
     duplicateFolder() {
         if (null == this.dfolder) {
+            // From the handler's canonical folder, not the raw option, so the
+            // baselines sit under the same folder the files do.
             this.dfolder =
-                node_path_1.default.normalize(node_path_1.default.join(this.folder, this.bmeta.next.foldername, 'generated'));
+                node_path_1.default.normalize(node_path_1.default.join(this.fh.folder, this.bmeta.next.foldername, 'generated'));
         }
         return this.dfolder;
     }

package/dist/build/BuildContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuildContext.js","sourceRoot":"","sources":["../../src/build/BuildContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuildContext.js","sourceRoot":"","sources":["../../src/build/BuildContext.ts"],"names":[],"mappings":"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"}

package/dist/build/BuildMeta.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildMeta = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const FileHandler_1 = require("./FileHandler");
 const basic_1 = require("../util/basic");
 // Log non-fatal weirdness.
 const dlog = (0, basic_1.getdlog)('jostraca', __filename);
@@ -46,7 +47,7 @@ class BuildMeta {
         // save over previous
         saveMetaData(this.fh, this.next);
         if (false === this.fh.control.version) {
-            this.fh.saveFile(node_path_1.default.join(this.fh.folder, this.next.foldername, '.gitignore'), `
+            this.fh.saveFile((0, FileHandler_1.canonPath)(node_path_1.default.join(this.fh.folder, this.next.foldername, '.gitignore')), `
 ${this.next.filename}
 generated
 `);
@@ -58,13 +59,13 @@ exports.BuildMeta = BuildMeta;
 function loadMetaData(fh, bmeta) {
     // Full (folder-prefixed) path: the FileHandler FS methods use paths
     // directly and no longer re-join `this.folder`.
-    const metapath = node_path_1.default.join(fh.folder, bmeta.foldername, bmeta.filename);
+    const metapath = (0, FileHandler_1.canonPath)(node_path_1.default.join(fh.folder, bmeta.foldername, bmeta.filename));
     if (fh.existsFile(metapath)) {
         try {
             const json = fh.loadJSON(metapath);
-            bmeta.last = null == json?.last ? -1 : json.last;
-            bmeta.hlast = null == json?.hlast ? -1 : json.hlast;
-            bmeta.files = json?.files || {};
+            bmeta.last = isTime(json?.last) ? json.last : -1;
+            bmeta.hlast = isTime(json?.hlast) ? json.hlast : -1;
+            bmeta.files = isPlainObject(json?.files) ? json.files : {};
         }
         catch (err) {
             // A truncated or hand-edited meta log used to throw straight out of
@@ -82,10 +83,20 @@ function loadMetaData(fh, bmeta) {
     }
     return bmeta;
 }
+// A previous `last` is used only when a Date can carry it. A string, a
+// boolean or 1e20 in a hand-edited log reached the merge labels and threw
+// "Invalid time value"; anything else is treated as absent, as an
+// unreadable log is.
+function isTime(v) {
+    return 'number' === typeof v && Number.isFinite(v) && Math.abs(v) <= 8.64e15;
+}
+function isPlainObject(v) {
+    return null != v && 'object' === typeof v && !Array.isArray(v);
+}
 function saveMetaData(fh, bmeta) {
     // Full (folder-prefixed) path: the FileHandler FS methods use paths
     // directly and no longer re-join `this.folder`.
-    const metapath = node_path_1.default.join(fh.folder, bmeta.foldername, bmeta.filename);
+    const metapath = (0, FileHandler_1.canonPath)(node_path_1.default.join(fh.folder, bmeta.foldername, bmeta.filename));
     fh.saveJSON(metapath, bmeta);
 }
 //# sourceMappingURL=BuildMeta.js.map

package/dist/build/BuildMeta.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuildMeta.js","sourceRoot":"","sources":["../../src/build/BuildMeta.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuildMeta.js","sourceRoot":"","sources":["../../src/build/BuildMeta.ts"],"names":[],"mappings":"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"}

package/dist/build/FileHandler.d.ts

@@ -1,6 +1,7 @@
 import { BuildContext } from './BuildContext';
 import { FST, Audit } from '../types';
 declare function canonPath(path: string): string;
+declare function canonFolder(folder: string): string;
 declare class FileHandler {
     when: number;
     fs: () => FST;
@@ -32,6 +33,7 @@ declare class FileHandler {
     };
     createdDirs: Set<string>;
     savedPaths: Set<string>;
+    filelogged: Record<string, Set<string>>;
     constructor(bctx: BuildContext, existing: {
         txt: any;
         bin: any;
@@ -44,10 +46,12 @@ declare class FileHandler {
     withinFolder(path: string): boolean;
     saveBinary(path: string, newContentSource: string | Buffer, whence?: string): void;
     save(path: string, newContentSource: string | Buffer, write?: boolean | string, whence?: string, mode?: number, isText?: boolean): void;
+    private decision;
     copy(frompath: string, topath: string, write?: boolean | string, whence?: string): void;
     merge(generated: string, baseline: string, existing: string, why: string[]): {
         content: string;
         conflict: boolean;
+        outcome: string;
     };
     diff(generated: string, existing: string): string;
     existsFile(path: string, whence?: string): boolean;
@@ -55,6 +59,8 @@ declare class FileHandler {
     loadJSON(path: string, opts?: any | string, whence?: string): any;
     saveJSON(path: string, json: any, opts?: any | string, whence?: string): any;
     loadFile(path: string, opts?: any | string, whence?: string): string | Buffer;
+    loadSource(path: string, opts?: any | string, whence?: string): string | Buffer;
+    private load;
     ensureFolder(path: string): void;
     private ensureDir;
     private chmodUnchanged;
@@ -65,4 +71,4 @@ declare class FileHandler {
 declare function annotatedPath(target: string, kind: string): string;
 declare function validName(name: any, kind: string, errmark: string): void;
 declare function validPath(path: string, maxdepth: number, errmark: string): void;
-export { annotatedPath, canonPath, validName, validPath, FileHandler };
+export { annotatedPath, canonFolder, canonPath, validName, validPath, FileHandler };

package/dist/build/FileHandler.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileHandler = void 0;
 exports.annotatedPath = annotatedPath;
+exports.canonFolder = canonFolder;
 exports.canonPath = canonPath;
 exports.validName = validName;
 exports.validPath = validPath;
@@ -51,8 +52,9 @@ const CN = 'FileHandler:';
 function fwd(p) {
     return p.includes('\\') ? p.replace(/\\/g, '/') : p;
 }
-// THE ONE CANONICAL FORM OF AN OUTPUT PATH: separators collapsed, `.`
-// and `..` segments resolved, forward slashes.
+// THE ONE CANONICAL FORM OF AN OUTPUT PATH: separators folded, then `.`
+// and `..` segments resolved, forward slashes. Folded FIRST, so that a
+// backslash `..` segment resolves as a slash one does, as in Go.
 //
 // Exported because `save` is not the only place that has to agree about
 // what "the same file" means. `FileOp.before` composes a path from the
@@ -63,7 +65,21 @@ function fwd(p) {
 // case the guard exists to refuse. Go has never had it: `fileBefore`
 // does `path.Clean(fwd(raw))` BEFORE recording anything.
 function canonPath(path) {
-    return fwd(node_path_1.default.normalize(path));
+    return fwd(node_path_1.default.normalize(fwd(path)));
+}
+// The output folder, canonicalised once as canonPath does, with trailing
+// separators stripped except from a filesystem root. A kept slash (`out/`)
+// or an unresolved backslash `..` (`o\..\p`, when this normalised before
+// folding) left the folder unlike every file path under it, so no path was
+// inside it: meta keys kept the folder prefix, no baseline was written,
+// and a later merge found no ancestor and overwrote the user's edits.
+function canonFolder(folder) {
+    const norm = canonPath(folder);
+    if ('/' === norm || /^[A-Za-z]:\/$/.test(norm)) {
+        return norm;
+    }
+    const stripped = norm.replace(/\/+$/, '');
+    return '' === stripped ? '.' : stripped;
 }
 const JOSTRACA_PROTECT = 'JOSTRACA_PROTECT';
 // Audit breadcrumb per merge outcome, so the `why` trail says which fast
@@ -126,11 +142,12 @@ class FileHandler {
     files;
     createdDirs;
     savedPaths;
+    filelogged;
     constructor(bctx, existing, control) {
         this.fs = bctx.fs;
         this.now = bctx.now;
         this.when = bctx.when;
-        this.folder = fwd(node_path_1.default.normalize(bctx.folder));
+        this.folder = canonFolder(bctx.folder);
         this.audit = bctx.audit;
         this.existing = existing;
         this.control = control;
@@ -146,6 +163,7 @@ class FileHandler {
         };
         this.createdDirs = new Set();
         this.savedPaths = new Set();
+        this.filelogged = {};
         // Yikes!
         this.duplicateFolder = bctx.duplicateFolder.bind(bctx);
         this.last = () => bctx.bmeta.prev.last;
@@ -210,7 +228,7 @@ class FileHandler {
             // baseline — `.jostraca/generated` joined to the relative path — nor-
             // malize to a location outside the baseline directory entirely, and
             // silently overwrite whatever was there.
-            const norm = fwd(node_path_1.default.normalize(path));
+            const norm = canonPath(path);
             return '..' !== norm && !norm.startsWith('../');
         }
         if ('/' === this.folder) {
@@ -302,22 +320,17 @@ class FileHandler {
         // Tracks whether the generated content actually differs from what is
         // already on disk, so the write path can skip a no-op rewrite.
         let unchanged = false;
+        // Whether the save ends in a write or skip record.
+        let final = false;
         if (exists) {
             why.push('exists-0');
-            // Load the existing bytes in the SAME SHAPE as the incoming content.
-            // `loadFile` decodes utf8 by default, so a Copy-routed binary file --
-            // whose content arrives here as a Buffer -- was compared as
-            // `string === Buffer`, which is false whatever the bytes are. A target
-            // already holding exactly those bytes was therefore "changed" on every
-            // run: `bin.preserve` wrote a `.old` backup of a file about to be
-            // rewritten identically, `bin.present` wrote a `.new` sidecar of the
-            // same bytes, and the unchanged-file optimisation was defeated for
-            // every binary. Issue #30. Go has always used bytes.Equal.
-            //
-            // Decoding cannot be fixed by converting one side afterwards: utf8
-            // decoding is lossy for binary, so the string no longer carries the
-            // bytes to compare.
-            let currentContent = this.loadFile(path, isTextFile ? undefined : { encoding: null });
+            // The existing file is handled as BYTES, text included, as Go does.
+            // Decoding it as UTF-8 turned every invalid byte into U+FFFD, so a
+            // file the user saved in Latin-1 was judged "unchanged" against a
+            // generate holding U+FFFD, and diff and merge wrote the replacement
+            // characters back over the user's bytes. Every comparison below is
+            // on bytes; diff and merge run over a byte-transparent latin1 form.
+            const currentContent = this.loadFile(path, { encoding: null });
             const protect = 0 <= currentContent.indexOf(JOSTRACA_PROTECT);
             meta.protect = protect;
             unchanged = sameContent(currentContent, newContentSource);
@@ -327,7 +340,7 @@ class FileHandler {
                     why.push('protect-0');
                     write = false;
                 }
-                else if (!sameContent(currentContent, newContentSource)) {
+                else if (!unchanged) {
                     why.push('content-0');
                     let oldpath = annotatedPath(path, 'old');
                     this.copyFile(path, oldpath, whence + 'preserve:');
@@ -336,8 +349,7 @@ class FileHandler {
                     meta.action = 'preserve';
                     whenify(meta, this.now());
                     meta.actions.push(meta.action);
-                    this.audit.push([CN + FN + wstr + meta.action,
-                        { ...meta, why, action: meta.action, path }]);
+                    this.decision(CN + FN + wstr, meta, why, path);
                 }
             }
             if (existing.write && !protect) {
@@ -346,7 +358,7 @@ class FileHandler {
             }
             else if (existing.present) {
                 why.push('present-0');
-                if (!sameContent(currentContent, newContentSource)) {
+                if (!unchanged) {
                     why.push('content-1');
                     let newpath = annotatedPath(path, 'new');
                     this.saveFile(newpath, newContentSource, { flush: true }, whence + 'present:');
@@ -354,8 +366,7 @@ class FileHandler {
                     meta.action = 'present';
                     whenify(meta, this.now());
                     meta.actions.push(meta.action);
-                    this.audit.push([CN + FN + wstr + meta.action,
-                        { ...meta, why, action: meta.action, path }]);
+                    this.decision(CN + FN + wstr, meta, why, path);
                 }
             }
             if (!protect) {
@@ -363,13 +374,12 @@ class FileHandler {
                 if (existing.diff) {
                     why.push('diff-0');
                     write = false;
-                    if (!sameContent(currentContent, newContentSource)) {
+                    if (!unchanged) {
                         why.push('content-2');
                         meta.action = 'diff';
-                        const newContent = 'string' === typeof newContentSource ? newContentSource :
-                            newContentSource.toString('utf8');
-                        const diffContent = this.diff(newContent, currentContent.toString());
-                        this.saveFile(path, diffContent, { encoding: 'utf8', ...modeopts() }, whence + meta.action);
+                        const newContent = latin1(newContentSource);
+                        const diffContent = this.diff(newContent, latin1(currentContent));
+                        this.saveFile(path, Buffer.from(diffContent, 'latin1'), modeopts(), whence + meta.action);
                         // this.files.diffed.push(path)
                         this.filelog('diffed', path);
                         const conflict = newContent !== diffContent;
@@ -380,8 +390,7 @@ class FileHandler {
                         whenify(meta, this.now());
                         meta.actions.push(meta.action);
                         meta.conflict = conflict;
-                        this.audit.push([CN + FN + wstr + meta.action,
-                            { ...meta, why, action: meta.action, path }]);
+                        this.decision(CN + FN + wstr, meta, why, path);
                     }
                     else {
                         // Equal content is still not a no-op when an explicit mode was
@@ -396,7 +405,7 @@ class FileHandler {
                 }
                 else if (existing.merge) {
                     why.push('merge-0');
-                    if (!sameContent(currentContent, newContentSource)) {
+                    if (!unchanged) {
                         why.push('content-3');
                         if (this.control.duplicate) {
                             why.push('duplicate-0');
@@ -406,16 +415,27 @@ class FileHandler {
                                 why.push('dupexists-0');
                                 write = false;
                                 meta.action = 'merge';
-                                const newContent = 'string' === typeof newContentSource ? newContentSource :
-                                    newContentSource.toString('utf8');
-                                const prevGenContent = this.loadFile(dpath, { encoding: 'utf8' });
-                                const mergeres = this.merge(newContent, // generated
-                                prevGenContent, // baseline (last generate)
-                                currentContent.toString(), // existing (on disk)
+                                const prevGenContent = this.loadFile(dpath, { encoding: null });
+                                const mergeres = this.merge(latin1(newContentSource), // generated
+                                latin1(prevGenContent), // baseline (last generate)
+                                latin1(currentContent), // existing (on disk)
                                 why);
                                 const diffcontent = mergeres.content;
-                                const conflict = mergeres.conflict;
-                                this.saveFile(path, diffcontent, { encoding: 'utf8', ...modeopts() }, whence + meta.action);
+                                // A file still holding an earlier merge's markers is left
+                                // byte-for-byte untouched, and reported conflicted: it
+                                // still carries markers, and the documented guard on
+                                // files.conflicted must not pass over it. Rewriting it
+                                // bumped the mtime for nothing.
+                                const unresolved = 'unresolved' === mergeres.outcome;
+                                const conflict = mergeres.conflict || unresolved;
+                                if (unresolved) {
+                                    if (this.chmodUnchanged(path, mode)) {
+                                        why.push('chmod-0');
+                                    }
+                                }
+                                else {
+                                    this.saveFile(path, Buffer.from(diffcontent, 'latin1'), modeopts(), whence + meta.action);
+                                }
                                 // this.files.merged.push(path)
                                 this.filelog('merged', path);
                                 if (conflict) {
@@ -425,8 +445,7 @@ class FileHandler {
                                 whenify(meta, this.now());
                                 meta.actions.push(meta.action);
                                 meta.conflict = conflict;
-                                this.audit.push([CN + FN + wstr + meta.action,
-                                    { ...meta, why, action: meta.action, path }]);
+                                this.decision(CN + FN + wstr, meta, why, path);
                             }
                         }
                     }
@@ -473,15 +492,14 @@ class FileHandler {
             }
             meta.actions.push(meta.action);
             whenify(meta, this.now());
-            this.audit.push([CN + FN + wstr + meta.action,
-                { ...meta, why, action: meta.action, path }]);
+            final = true;
         }
         else if (0 === meta.actions.length) {
             why.push('skip-0');
             meta.action = 'skip';
             meta.actions.push(meta.action);
-            this.audit.push([CN + FN + wstr + meta.action,
-                { ...meta, why, action: meta.action, path }]);
+            whenify(meta, this.now());
+            final = true;
         }
         if (this.control.duplicate) {
             why.push('duplicate-1');
@@ -493,14 +511,23 @@ class FileHandler {
                     this.ensureDir(fwd(node_path_1.default.dirname(dpath)));
                     this.writeFileAtomic(dpath, newContentSource, { flush: true });
                 }
-                if (null == meta.when) {
-                    whenify(meta, this.now());
-                }
             }
         }
-        // console.log('WHY', path, why)
+        // The write or skip record is the save's last word, so it carries the
+        // baseline breadcrumbs too.
+        if (final) {
+            this.decision(CN + FN + wstr, meta, why, path);
+        }
         this.addmeta(path, meta);
     }
+    // Push a decision record as a SNAPSHOT. The record used to share the live
+    // `why` and `meta.actions` arrays, so an early record (a preserve) later
+    // reported the whole save's actions and breadcrumbs.
+    decision(tag, meta, why, path) {
+        this.audit.push([tag + meta.action, {
+                ...meta, actions: [...meta.actions], why: [...why], action: meta.action, path,
+            }]);
+    }
     copy(frompath, topath, write, whence) {
         const wstr = null == whence ? '' : whence + ':';
         const FN = 'copy:';
@@ -533,7 +560,7 @@ class FileHandler {
         //
         // CopyOp's own copyFile reads a Buffer and go/build.go reads bytes;
         // this is now the same shape as both, with no order to get wrong.
-        const raw = this.loadFile(frompath, { encoding: null }, whence);
+        const raw = this.loadSource(frompath, { encoding: null }, whence);
         // The SOURCE decides: a binary source stays governed by `existing.bin`
         // even when copied to a destination whose extension is not on the
         // list. Same rule as CopyOp's own copy paths and go/build.go's
@@ -562,7 +589,7 @@ class FileHandler {
             kind: 'merge',
         });
         why.push(MERGE_WHY[res.outcome]);
-        return { content: res.content, conflict: res.conflict };
+        return { content: res.content, conflict: res.conflict, outcome: res.outcome };
     }
     // Annotated two-way view of the difference between the new generate and
     // what is on disk.
@@ -582,7 +609,7 @@ class FileHandler {
         // Paths are canonical (already folder-prefixed by the build phase, or
         // absolute); use them directly. Do NOT re-join `this.folder`, which would
         // double-prefix relative non-`.` output folders. Matches the Go port.
-        const fullpath = fwd(node_path_1.default.normalize(path));
+        const fullpath = canonPath(path);
         try {
             const exists = fs.existsSync(fullpath);
             this.audit.push([CN + FN + wstr,
@@ -605,8 +632,8 @@ class FileHandler {
         validPath(frompath, this.maxdepth, CN + FN + 'from:' + wstr);
         validPath(topath, this.maxdepth, CN + FN + 'to:' + wstr);
         // Canonical paths: use directly, do not re-join `this.folder` (see existsFile).
-        const fulltopath = fwd(node_path_1.default.normalize(topath));
-        const fullfrompath = fwd(node_path_1.default.normalize(frompath));
+        const fulltopath = canonPath(topath);
+        const fullfrompath = canonPath(frompath);
         try {
             const existed = fs.existsSync(fulltopath);
             // Copy BYTES, always — never decode as UTF-8 first.
@@ -657,7 +684,7 @@ class FileHandler {
             const cstr = 'string' === typeof content ? content : content.toString(opts.encoding);
             const json = JSON.parse(cstr);
             this.audit.push([CN + FN + wstr,
-                { path, when, size: content.length }]);
+                { path, when, size: byteLength(content) }]);
             return json;
         }
         catch (err) {
@@ -683,7 +710,7 @@ class FileHandler {
             const jstr = 'string' === typeof json ? json : JSON.stringify(json, null, 2);
             this.saveFile(path, jstr, opts, whence);
             this.audit.push([CN + FN + wstr,
-                { path, when, size: jstr.length }]);
+                { path, when, size: byteLength(jstr) }]);
             return jstr;
         }
         catch (err) {
@@ -694,6 +721,18 @@ class FileHandler {
         }
     }
     loadFile(path, opts, whence) {
+        return this.load(path, canonPath(path), opts, whence);
+    }
+    // loadFile for the SOURCE of a copy, read at the path as given. A source
+    // keeps its platform meaning, as every other source read does (CopyOp
+    // stats and reads its entries raw): on POSIX a backslash is an ordinary
+    // name character. Folding it here, as an output path is folded, sent a
+    // binary tree entry named `b\in.png` to `b/in.png`, and the copy failed
+    // with ENOENT while the text entry beside it was copied.
+    loadSource(path, opts, whence) {
+        return this.load(path, path, opts, whence);
+    }
+    load(path, fullpath, opts, whence) {
         const when = this.now();
         const wstr = null == whence ? '' : whence + ':';
         const fs = this.fs();
@@ -708,11 +747,10 @@ class FileHandler {
         opts.encoding = undefined === opts.encoding ? 'utf8' : opts.encoding;
         validPath(path, this.maxdepth, CN + FN + wstr);
         try {
-            // Canonical path: use directly, do not re-join `this.folder` (see existsFile).
-            const fullpath = fwd(node_path_1.default.normalize(path));
+            // Used directly, never re-joined to `this.folder` (see existsFile).
             const content = fs.readFileSync(fullpath, opts);
             this.audit.push([CN + FN + wstr,
-                { path, when, size: content.length }]);
+                { path, when, size: byteLength(content) }]);
             return content;
         }
         catch (err) {
@@ -816,9 +854,10 @@ class FileHandler {
                     // is the R12 case, and `created` must stay false so the cleanup
                     // does not delete somebody else's file.
                     //
-                    // Any OTHER error (ENOSPC, EIO) happened AFTER the create
-                    // succeeded, so a partial temp file is on disk and is ours to
-                    // remove. Without this it survived the failed build.
+                    // Any OTHER error may have come AFTER the create succeeded
+                    // (ENOSPC, EIO), leaving a partial temp file that is ours to
+                    // remove. Without this it survived the failed build. If the
+                    // create itself failed (EACCES), the cleanup finds nothing.
                     if ('EEXIST' !== err?.code) {
                         created = true;
                     }
@@ -859,7 +898,10 @@ class FileHandler {
                 }
             }
             catch (cleanuperr) {
-                dlog('writeFileAtomic', 'temp cleanup failed: ' + tmppath);
+                // Already gone is not a failed cleanup: nothing was left behind.
+                if ('ENOENT' !== cleanuperr?.code) {
+                    dlog('writeFileAtomic', 'temp cleanup failed: ' + tmppath);
+                }
             }
             throw err;
         }
@@ -884,7 +926,7 @@ class FileHandler {
         }
         try {
             // Canonical path: use directly, do not re-join `this.folder` (see existsFile).
-            path = fwd(node_path_1.default.normalize(path));
+            path = canonPath(path);
             const fullpath = path;
             const parentfolder = fwd(node_path_1.default.dirname(fullpath));
             const existed = fs.existsSync(fullpath);
@@ -893,25 +935,29 @@ class FileHandler {
                 this.writeFileAtomic(fullpath, content, opts, opts.mode);
             }
             this.audit.push([CN + FN + wstr,
-                { path, when, existed, size: content.length }]);
+                { path, when, existed, size: byteLength(content) }]);
         }
         catch (err) {
             this.audit.push(['ERROR:' + CN + FN + wstr,
-                { path, when, size: content.length, err }]);
+                { path, when, size: byteLength(content), err }]);
             err.message = CN + FN + wstr + ' path=' + path + ':' + err.message;
             throw err;
         }
     }
+    // A path appears at most once per kind, at its first position. Only the
+    // LAST entry used to be checked, so File t, File u, Inject t listed t
+    // twice and the list depended on sibling order.
     filelog(kind, path) {
         path = fwd(path);
         let files = this.files;
         if (files[kind]) {
-            const kindlog = files[kind];
-            if (path === kindlog[kindlog.length - 1]) {
+            const seen = this.filelogged[kind] = this.filelogged[kind] || new Set();
+            if (seen.has(path)) {
                 dlog('filelog', kind, 'duplicate: ' + path);
             }
             else {
-                kindlog.push(path);
+                seen.add(path);
+                files[kind].push(path);
             }
         }
         else {
@@ -920,6 +966,19 @@ class FileHandler {
     }
 }
 exports.FileHandler = FileHandler;
+// The byte-transparent string form of content: one char per byte, so the
+// diff engine's line splitting and equality are byte-exact and a round trip
+// through Buffer.from(s, 'latin1') restores every byte. For valid UTF-8 the
+// engine's output is byte-identical to running it on the decoded text.
+function latin1(content) {
+    return (Buffer.isBuffer(content) ? content : Buffer.from(content, 'utf8'))
+        .toString('latin1');
+}
+// Audit sizes are byte lengths, whether the content is a string or a
+// Buffer; `length` counted UTF-16 units for a string.
+function byteLength(content) {
+    return 'string' === typeof content ? Buffer.byteLength(content, 'utf8') : content.length;
+}
 function whenify(meta, now) {
     meta.when = now;
     meta.hwhen = (0, basic_1.humanify)(now);