jostraca 0.31.0 → 0.31.2

package/dist/diff.js

@@ -0,0 +1,446 @@
+"use strict";
+/* Copyright (c) 2024 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = merge;
+exports.diff = diff;
+exports.hasConflicts = hasConflicts;
+exports.lines = lines;
+exports.lcs = lcs;
+exports.alignLcs = alignLcs;
+exports.hunks = hunks;
+// --- Markers --------------------------------------------------------------
+const MARK_START = '<<<<<<< ';
+const MARK_MID = '=======\n';
+const MARK_END = '>>>>>>> ';
+const LABEL_GENERATED = 'GENERATED';
+const LABEL_EXISTING = 'EXISTING';
+// The end-of-conflict marker for the EXISTING side. A file still holding
+// this has an unresolved merge in it.
+const UNRESOLVED_MARK = MARK_END + LABEL_EXISTING + ':';
+// Whether text still holds an unresolved conflict from an earlier merge.
+// Keyed on the closing EXISTING marker alone: a half-resolved file, where
+// the opening marker was removed but the closing one was not, must still
+// count as unresolved rather than being re-merged.
+//
+// The `existingLabel` argument matters when the caller supplied a custom
+// one: `writeConflict` emits `>>>>>>> ` + whatever label was configured, so
+// a file conflicted under `labels.existing = 'E'` does not contain the
+// default sentinel at all. Without it, merge's unresolved guard did not
+// fire and the markers nested one level deeper on every run — exactly what
+// the guard exists to prevent.
+//
+// Detection only holds when the SAME existing label is used across runs. A
+// caller that changes its labels between generations cannot expect an older
+// conflict to be recognised, and the default is unchanged for callers that
+// never set one.
+function hasConflicts(text, existingLabel) {
+    // The default sentinel is a PREFIX (`>>>>>>> EXISTING:`), so it matches
+    // whatever timestamp follows. Checking the fully-formatted label instead
+    // would only match a conflict written in the same millisecond.
+    if (text.includes(UNRESOLVED_MARK)) {
+        return true;
+    }
+    // Match the COMPLETE emitted marker, including its newline. A bare
+    // substring check on `MARK_END + label` treats a custom label as a
+    // prefix, so label `E` matched an ordinary line `>>>>>>> Example` and
+    // merge returned `unresolved` — silently suppressing a legitimate
+    // regeneration over a marker the engine never emitted. writeConflict
+    // always appends '\n', so the newline is safe to require.
+    return null != existingLabel &&
+        text.includes(MARK_END + existingLabel + '\n');
+}
+function isoOf(when) {
+    return new Date(null == when ? 0 : when).toISOString();
+}
+function labelsOf(spec, defaultKind) {
+    const kind = null == spec?.kind ? defaultKind : spec.kind;
+    return {
+        generated: null == spec?.labels?.generated ?
+            LABEL_GENERATED + ': ' + isoOf(spec?.when) + '/' + kind :
+            spec.labels.generated,
+        existing: null == spec?.labels?.existing ?
+            LABEL_EXISTING + ': ' + isoOf(spec?.last) + '/' + kind :
+            spec.labels.existing,
+    };
+}
+// --- Line primitives ------------------------------------------------------
+// Split on \n, keeping the newline on each line so join('') round-trips
+// exactly, including a final line with no trailing newline.
+function lines(text) {
+    if ('' === text) {
+        return [];
+    }
+    const out = [];
+    let rest = text;
+    for (;;) {
+        const at = rest.indexOf('\n');
+        if (at < 0) {
+            out.push(rest);
+            return out;
+        }
+        out.push(rest.substring(0, at + 1));
+        rest = rest.substring(at + 1);
+        if ('' === rest) {
+            return out;
+        }
+    }
+}
+// Longest common subsequence of two line arrays.
+function lcs(a, b) {
+    if (0 === a.length || 0 === b.length) {
+        return [];
+    }
+    // Common prefix, then common suffix of what is left. Those lines are in
+    // every optimal LCS, and skipping them is what makes the realistic case
+    // (a mostly-unchanged regenerated file) fast.
+    let head = 0;
+    while (head < a.length && head < b.length && a[head] === b[head]) {
+        head++;
+    }
+    let tail = 0;
+    while (tail < a.length - head && tail < b.length - head &&
+        a[a.length - 1 - tail] === b[b.length - 1 - tail]) {
+        tail++;
+    }
+    const out = a.slice(0, head);
+    hirschberg(a.slice(head, a.length - tail), b.slice(head, b.length - tail), out);
+    for (let i = a.length - tail; i < a.length; i++) {
+        out.push(a[i]);
+    }
+    return out;
+}
+// Hirschberg's divide and conquer: recurse on the two halves of `a`, each
+// step holding only two rows of the length table.
+function hirschberg(a, b, out) {
+    if (0 === a.length || 0 === b.length) {
+        return;
+    }
+    if (1 === a.length) {
+        // Scanning backwards mirrors how a full-table walk recovers the LCS
+        // (it starts at the end of `b` and steps back), which keeps this
+        // readable against the oracle in the tests. It is not a tie-break:
+        // `a[0]` is pushed whichever position matched, so first and last
+        // occurrence produce the same string.
+        for (let i = b.length - 1; 0 <= i; i--) {
+            if (b[i] === a[0]) {
+                out.push(a[0]);
+                return;
+            }
+        }
+        return;
+    }
+    const mid = Math.floor(a.length / 2);
+    const headRow = lcsRow(a.slice(0, mid), b, false);
+    const tailRow = lcsRow(a.slice(mid), b, true);
+    // `>=` so a tie takes the LARGEST split. This is THE load-bearing
+    // tie-break: changing it to `>` changes the merged content on 658 of
+    // the differential corpus cases (`make mutation` prints the live
+    // number). See the note at the top of this file.
+    let best = -1;
+    let split = 0;
+    for (let k = 0; k <= b.length; k++) {
+        const sum = headRow[k] + tailRow[b.length - k];
+        if (sum >= best) {
+            best = sum;
+            split = k;
+        }
+    }
+    hirschberg(a.slice(0, mid), b.slice(0, split), out);
+    hirschberg(a.slice(mid), b.slice(split), out);
+}
+// Final row of the LCS length table for `a` against `b`. With `reverse`,
+// both sequences are walked back to front, so the result is indexed by
+// suffix length rather than prefix length.
+function lcsRow(a, b, reverse) {
+    let prev = new Array(b.length + 1).fill(0);
+    let cur = new Array(b.length + 1).fill(0);
+    const at = (xs, i) => reverse ? xs[xs.length - 1 - i] : xs[i];
+    for (let i = 0; i < a.length; i++) {
+        const ai = at(a, i);
+        cur[0] = 0;
+        for (let j = 0; j < b.length; j++) {
+            if (ai === at(b, j)) {
+                cur[j + 1] = prev[j] + 1;
+            }
+            // max(prev[j+1], cur[j]). The `>=` is not a tie-break: on a tie both
+            // branches assign the same number.
+            else if (prev[j + 1] >= cur[j]) {
+                cur[j + 1] = prev[j + 1];
+            }
+            else {
+                cur[j + 1] = cur[j];
+            }
+        }
+        const swap = prev;
+        prev = cur;
+        cur = swap;
+    }
+    return prev;
+}
+// Anchor map: `m[i]` is the index in `target` where `base[i]` sits in the
+// LCS of the two, or -1 when `base[i]` is not in it.
+function alignLcs(base, target) {
+    const m = new Array(base.length).fill(-1);
+    if (0 === base.length || 0 === target.length) {
+        return m;
+    }
+    const common = lcs(base, target);
+    let ci = 0;
+    let ti = 0;
+    let bi = 0;
+    while (ci < common.length && bi < base.length && ti < target.length) {
+        while (bi < base.length && base[bi] !== common[ci]) {
+            bi++;
+        }
+        while (ti < target.length && target[ti] !== common[ci]) {
+            ti++;
+        }
+        if (bi < base.length && ti < target.length) {
+            m[bi] = ti;
+            bi++;
+            ti++;
+            ci++;
+        }
+    }
+    return m;
+}
+function sameLines(a, b) {
+    if (a.length !== b.length) {
+        return false;
+    }
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+// Whether the text accumulated so far ends with a newline, so a marker
+// always starts on its own line.
+//
+// Precondition: `parts` is non-empty and holds no empty strings. Both hold
+// at every call site — writeConflict pushes its opening marker first, and
+// `lines` never yields an empty element.
+function endsWithNewline(parts) {
+    return parts[parts.length - 1].endsWith('\n');
+}
+function writeConflict(out, generated, existing, labels) {
+    out.push(MARK_START + labels.generated + '\n');
+    out.push(...generated);
+    if (!endsWithNewline(out)) {
+        out.push('\n');
+    }
+    out.push(MARK_MID);
+    out.push(...existing);
+    if (!endsWithNewline(out)) {
+        out.push('\n');
+    }
+    out.push(MARK_END + labels.existing + '\n');
+}
+// --- Three-way merge ------------------------------------------------------
+// Merge what was just generated with what is on disk, using the previous
+// generate as the common ancestor.
+//
+//   generated - what this run produced
+//   baseline  - what the last run produced (the merge base)
+//   existing  - what is on disk now, possibly hand-edited
+//
+// Taking the previous generate as the ancestor is what preserves manual
+// edits: anything in `existing` that is not in `baseline` is the user's.
+function merge(generated, baseline, existing, spec) {
+    // Fast paths, in order. Each is semantics-identical to running the full
+    // merge, and each avoids the quadratic core entirely.
+    // Nothing changed on either side.
+    if (generated === existing) {
+        return { content: existing, conflict: false, outcome: 'same' };
+    }
+    // The file is untouched since the last generate, so there is nothing of
+    // the user's to preserve: the new generate wins outright.
+    if (existing === baseline) {
+        return { content: generated, conflict: false, outcome: 'clean' };
+    }
+    const labels = labelsOf(spec, 'merge');
+    // Never merge into an unresolved merge — that stacks conflict markers
+    // inside conflict markers and is unreadable. Leave it for the user.
+    // Pass the EXPLICIT custom label, not the formatted one: the formatted
+    // default carries a timestamp and would never match an older conflict.
+    if (hasConflicts(existing, spec?.labels?.existing)) {
+        return { content: existing, conflict: false, outcome: 'unresolved' };
+    }
+    const gl = lines(generated);
+    const bl = lines(baseline);
+    const el = lines(existing);
+    const gMap = alignLcs(bl, gl);
+    const eMap = alignLcs(bl, el);
+    const out = [];
+    let conflict = false;
+    let bi = 0;
+    let gi = 0;
+    let ei = 0;
+    while (bi < bl.length) {
+        if (0 <= gMap[bi] && 0 <= eMap[bi]) {
+            // Anchor: this baseline line survives on both sides. Reconcile
+            // whatever each side inserted in front of it.
+            const gIns = gl.slice(gi, gMap[bi]);
+            const eIns = el.slice(ei, eMap[bi]);
+            if (sameLines(gIns, eIns)) {
+                out.push(...gIns);
+            }
+            else if (0 === gIns.length) {
+                out.push(...eIns);
+            }
+            else if (0 === eIns.length) {
+                out.push(...gIns);
+            }
+            else {
+                writeConflict(out, gIns, eIns, labels);
+                conflict = true;
+            }
+            out.push(bl[bi]);
+            gi = gMap[bi] + 1;
+            ei = eMap[bi] + 1;
+            bi++;
+            continue;
+        }
+        // Not an anchor: run forward to the next one and reconcile the whole
+        // region between.
+        let nextBi = bi;
+        while (nextBi < bl.length && (gMap[nextBi] < 0 || eMap[nextBi] < 0)) {
+            nextBi++;
+        }
+        const bRegion = bl.slice(bi, nextBi);
+        let gRegion;
+        let eRegion;
+        if (nextBi < bl.length) {
+            gRegion = gl.slice(gi, gMap[nextBi]);
+            eRegion = el.slice(ei, eMap[nextBi]);
+        }
+        else {
+            gRegion = gl.slice(gi);
+            eRegion = el.slice(ei);
+        }
+        if (sameLines(bRegion, gRegion)) {
+            // Only the user changed this region.
+            out.push(...eRegion);
+        }
+        else if (sameLines(bRegion, eRegion)) {
+            // Only the generator changed this region.
+            out.push(...gRegion);
+        }
+        else if (sameLines(gRegion, eRegion)) {
+            // Both made the same change.
+            out.push(...gRegion);
+        }
+        else {
+            writeConflict(out, gRegion, eRegion, labels);
+            conflict = true;
+        }
+        if (nextBi < bl.length) {
+            gi = gMap[nextBi];
+            ei = eMap[nextBi];
+        }
+        else {
+            gi = gl.length;
+            ei = el.length;
+        }
+        bi = nextBi;
+    }
+    // Anything after the last anchor.
+    if (gi < gl.length || ei < el.length) {
+        const gTail = gl.slice(gi);
+        const eTail = el.slice(ei);
+        if (sameLines(gTail, eTail)) {
+            out.push(...gTail);
+        }
+        else if (0 === gTail.length) {
+            out.push(...eTail);
+        }
+        else if (0 === eTail.length) {
+            out.push(...gTail);
+        }
+        else {
+            writeConflict(out, gTail, eTail, labels);
+            conflict = true;
+        }
+    }
+    return { content: out.join(''), conflict, outcome: 'merged' };
+}
+// --- Two-way diff ---------------------------------------------------------
+const HUNK_SAME = 0;
+const HUNK_CHANGE = 1;
+// Hunks describing the difference between the two line arrays. Adjacent
+// insertions and deletions merge into a single change hunk, so a modified
+// region is reported once rather than as a delete followed by an add.
+function hunks(generated, existing) {
+    const common = lcs(generated, existing);
+    const out = [];
+    let gi = 0;
+    let ei = 0;
+    // Two change hunks can never end up adjacent: every flush in the loop
+    // below is immediately followed by a same-hunk, and the trailing flush is
+    // the last thing to run. So there is nothing to merge into.
+    const flush = (g, e) => {
+        if (0 === g.length && 0 === e.length) {
+            return;
+        }
+        out.push({ kind: HUNK_CHANGE, generated: g, existing: e });
+    };
+    for (const line of common) {
+        const g = [];
+        const e = [];
+        while (gi < generated.length && generated[gi] !== line) {
+            g.push(generated[gi]);
+            gi++;
+        }
+        while (ei < existing.length && existing[ei] !== line) {
+            e.push(existing[ei]);
+            ei++;
+        }
+        flush(g, e);
+        const last = out[out.length - 1];
+        if (null != last && HUNK_SAME === last.kind) {
+            last.generated.push(line);
+        }
+        else {
+            out.push({ kind: HUNK_SAME, generated: [line], existing: [] });
+        }
+        gi++;
+        ei++;
+    }
+    flush(generated.slice(gi), existing.slice(ei));
+    return out;
+}
+// Annotated view of the difference between the new generate and what is on
+// disk. Unchanged text passes through; each changed region becomes a pair
+// of marked blocks, the existing side first.
+function diff(generated, existing, spec) {
+    if (generated === existing) {
+        return { content: generated, conflict: false, outcome: 'same' };
+    }
+    const labels = labelsOf(spec, 'diff');
+    const out = [];
+    const block = (block_lines, label) => {
+        out.push(MARK_START + label + '\n');
+        for (const line of block_lines) {
+            out.push(line);
+            if (!line.endsWith('\n')) {
+                out.push('\n');
+            }
+        }
+        out.push(MARK_END + label + '\n');
+    };
+    for (const hunk of hunks(lines(generated), lines(existing))) {
+        if (HUNK_SAME === hunk.kind) {
+            out.push(...hunk.generated);
+            continue;
+        }
+        if (0 < hunk.existing.length) {
+            block(hunk.existing, labels.existing);
+        }
+        if (0 < hunk.generated.length) {
+            block(hunk.generated, labels.generated);
+        }
+    }
+    return { content: out.join(''), conflict: true, outcome: 'changed' };
+}
+//# sourceMappingURL=diff.js.map

package/dist/diff.js.map

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

package/dist/jostraca.d.ts

@@ -1,9 +1,8 @@
 import type { Node, Component, JostracaResult } from './types';
 import { BuildContext } from './build/BuildContext';
-import { each, get, getx, camelify, snakify, kebabify, cmap, vmap, names, template, escre, indent, isbinext, partify, lcf, ucf } from './util/basic';
+import { each, get, getx, camelify, snakify, kebabify, cmap, vmap, deep, omap, names, template, escre, indent, isbincontent, isbinext, partify, lcf, ucf } from './util/basic';
 import * as PointUtil from './util/point';
-declare const deep: (...args: any[]) => any;
-declare const omap: (...args: any[]) => any;
+import * as DiffUtil from './diff';
 import { Content } from './cmp/Content';
 import { Line } from './cmp/Line';
 import { Slot } from './cmp/Slot';
@@ -91,8 +90,8 @@ declare const OptionsShape: {
             version: boolean;
         };
     };
-    match(root?: any, ctx?: import("shape").Context): boolean;
-    error(root?: any, ctx?: import("shape").Context): {
+    match: (root?: any, ctx?: import("shape").Context) => boolean;
+    error: (root?: any, ctx?: import("shape").Context) => {
         shape: boolean;
         code: string;
         gname: string;
@@ -110,6 +109,7 @@ declare const OptionsShape: {
                 node: import("shape").Node<any>;
                 value: any;
                 path: string;
+                pathArr: (string | number)[];
                 why: string;
                 check: string;
                 args: Record<string, any>;
@@ -129,8 +129,8 @@ declare const OptionsShape: {
         stack?: string;
         cause?: unknown;
     }[];
-    spec(): any;
-    node(): import("shape").Node<{
+    spec: () => any;
+    node: () => import("shape").Node<{
         folder: import("shape").Node<StringConstructor>;
         name: {
             file: {
@@ -168,9 +168,9 @@ declare const OptionsShape: {
             version: boolean;
         };
     }>;
-    stringify(...rest: any[]): string;
-    jsonify(): any;
-    toString(this: any): string;
+    stringify: (...rest: any[]) => string;
+    jsonify: () => any;
+    toString: (this: any) => string;
     shape: {
         shape$: symbol;
         v$: string;
@@ -205,8 +205,8 @@ declare const ExistingShape: {
             present: boolean;
         };
     };
-    match(root?: any, ctx?: import("shape").Context): boolean;
-    error(root?: any, ctx?: import("shape").Context): {
+    match: (root?: any, ctx?: import("shape").Context) => boolean;
+    error: (root?: any, ctx?: import("shape").Context) => {
         shape: boolean;
         code: string;
         gname: string;
@@ -224,6 +224,7 @@ declare const ExistingShape: {
                 node: import("shape").Node<any>;
                 value: any;
                 path: string;
+                pathArr: (string | number)[];
                 why: string;
                 check: string;
                 args: Record<string, any>;
@@ -243,8 +244,8 @@ declare const ExistingShape: {
         stack?: string;
         cause?: unknown;
     }[];
-    spec(): any;
-    node(): import("shape").Node<{
+    spec: () => any;
+    node: () => import("shape").Node<{
         txt: {
             write: boolean;
             preserve: boolean;
@@ -258,9 +259,9 @@ declare const ExistingShape: {
             present: boolean;
         };
     }>;
-    stringify(...rest: any[]): string;
-    jsonify(): any;
-    toString(this: any): string;
+    stringify: (...rest: any[]) => string;
+    jsonify: () => any;
+    toString: (this: any) => string;
     shape: {
         shape$: symbol;
         v$: string;
@@ -277,4 +278,4 @@ declare function Jostraca(gopts_in?: JostracaOptions | {}): {
 };
 declare function cmp(component: Function): Component;
 export type { JostracaResult, JostracaOptions, Component, Node, Existing, };
-export { Jostraca, BuildContext, cmp, each, get, getx, camelify, snakify, kebabify, cmap, vmap, names, template, escre, indent, isbinext, partify, lcf, ucf, deep, omap, Project, Content, File, Inject, Fragment, Folder, Copy, Line, Slot, List, PointUtil, };
+export { Jostraca, BuildContext, cmp, each, get, getx, camelify, snakify, kebabify, cmap, vmap, names, template, escre, indent, isbincontent, isbinext, partify, lcf, ucf, deep, omap, Project, Content, File, Inject, Fragment, Folder, Copy, Line, Slot, List, PointUtil, DiffUtil, };