@adecore/merge 0.23.0 → 0.24.0

package/dist/blocks.d.ts

@@ -6,4 +6,3 @@ export interface MergeBlock {
     theirs: string[];
 }
 export declare function splitBlocks(base: readonly string[], ours: readonly string[], theirs: readonly string[]): MergeBlock[];
-export declare function openBlocks(blocks: readonly MergeBlock[]): number;

package/dist/blocks.js

@@ -76,7 +76,3 @@ export function splitBlocks(base, ours, theirs) {
     push(base.length, ours.length, theirs.length);
     return blocks;
 }
-/* The stretches a person still has to decide on. */
-export function openBlocks(blocks) {
-    return blocks.filter((block) => block.kind === 'conflict').length;
-}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { diffLines, type Change } from './diff.ts';
-export { openBlocks, splitBlocks, type MergeBlock, type MergeBlockKind } from './blocks.ts';
-export { autoLines, bothLines, draftOf, fingerprint, sideLines, wandLines, type MergeDraft, type MergeSide, type MergeSpan } from './resolve.ts';
+export { splitBlocks, type MergeBlock, type MergeBlockKind } from './blocks.ts';
+export { bothLines, draftOf, fingerprint, sideLines, wandLines, type MergeDraft, type MergeSide, type MergeSpan } from './resolve.ts';
 export { joinLines, shapeOf, splitLines, type TextShape } from './text.ts';
 export { missingSides, patchFits } from './patch.ts';
 export { parsePatch, parseHunkHeader, type HunkHeader, type Hunk, type ParsedPatch, type PatchLine } from './patch-parser.ts';

package/dist/index.js

@@ -1,6 +1,6 @@
 export { diffLines } from './diff.js';
-export { openBlocks, splitBlocks } from './blocks.js';
-export { autoLines, bothLines, draftOf, fingerprint, sideLines, wandLines } from './resolve.js';
+export { splitBlocks } from './blocks.js';
+export { bothLines, draftOf, fingerprint, sideLines, wandLines } from './resolve.js';
 export { joinLines, shapeOf, splitLines } from './text.js';
 export { missingSides, patchFits } from './patch.js';
 export { parsePatch, parseHunkHeader } from './patch-parser.js';

package/dist/patch.js

@@ -1,3 +1,4 @@
+import { parsePatch } from './patch-parser.js';
 /* Which side a patch says the file is missing on, read from its header so no line of the file can pass for it. */
 export function missingSides(patch) {
     const start = patch.search(/^@@/m);
@@ -5,8 +6,11 @@ export function missingSides(patch) {
     return { old: /^--- \/dev\/null$/m.test(header), new: /^\+\+\+ \/dev\/null$/m.test(header) };
 }
 const HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
-/* Git's --ignore-all-space may show either side's spacing on a context line. */
+/* Git's --ignore-all-space may show either side's spacing on a context line. A patch cut off before its hunks end fits nothing. */
 export function patchFits(patch, oldText, newText, ignoreWhitespace) {
+    if (parsePatch(patch).partial) {
+        return false;
+    }
     const oldLines = oldText.split('\n');
     const newLines = newText.split('\n');
     const same = ignoreWhitespace

package/dist/resolve.d.ts

@@ -2,7 +2,6 @@ import type { MergeBlock } from './blocks.ts';
 export type MergeSide = 'ours' | 'theirs';
 export declare function sideLines(block: MergeBlock, side: MergeSide): string[];
 export declare function bothLines(block: MergeBlock, first: MergeSide): string[];
-export declare function autoLines(block: MergeBlock): string[] | null;
 export declare function wandLines(block: MergeBlock): string[] | null;
 export declare function fingerprint(block: MergeBlock): string;
 export interface MergeSpan {

package/dist/resolve.js

@@ -6,7 +6,7 @@ export function bothLines(block, first) {
     return first === 'ours' ? [...block.ours, ...block.theirs] : [...block.theirs, ...block.ours];
 }
 /* What a block is worth without anyone choosing: the side that changed, or the change both made. */
-export function autoLines(block) {
+function autoLines(block) {
     switch (block.kind) {
         case 'stable':
         case 'ours':
@@ -18,16 +18,6 @@ export function autoLines(block) {
             return null;
     }
 }
-function squashed(lines) {
-    return lines
-        .map((line) => {
-        const body = line.trim();
-        // Indentation is meaning in Python, YAML or a Makefile, so only a blank line loses its own.
-        const indent = body === '' ? '' : line.slice(0, line.length - line.trimStart().length);
-        return `${indent}${body.replace(/\s+/g, ' ')}`;
-    })
-        .join('\n');
-}
 /* Where `inner` starts in `outer` as one run of lines, or -1. */
 function runIn(outer, inner) {
     for (let start = 0; start + inner.length <= outer.length; start += 1) {
@@ -51,14 +41,14 @@ function covers(base, outer, inner) {
 }
 /*
  * What the wand makes of a conflict, or null for one that needs a person after all. It closes only
- * sides that differ in whitespace inside or after a line, and a side that already holds every line
- * of the other without putting back what the other deleted. Anything else is a choice it never guesses.
+ * identical sides and a side that already holds every line of the other without putting back what
+ * the other deleted. Whitespace keeps its meaning because this function has no language context.
  */
 export function wandLines(block) {
     if (block.kind !== 'conflict') {
         return autoLines(block);
     }
-    if (squashed(block.ours) === squashed(block.theirs)) {
+    if (block.ours.length === block.theirs.length && block.ours.every((line, index) => line === block.theirs[index])) {
         return [...block.ours];
     }
     if (covers(block.base, block.ours, block.theirs)) {
@@ -94,7 +84,10 @@ export function draftOf(blocks, answered = new Map()) {
     const spans = [];
     for (const [index, block] of blocks.entries()) {
         const from = lines.length;
-        lines.push(...(answered.get(index) ?? autoLines(block) ?? block.ours));
+        // One push per line: a block of a few hundred thousand lines is more arguments than V8 takes in one call.
+        for (const line of answered.get(index) ?? autoLines(block) ?? block.ours) {
+            lines.push(line);
+        }
         spans.push({ block: index, kind: block.kind, from, to: lines.length });
     }
     return { lines, spans };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/merge",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "Pure line diffs, three-way merge blocks and conflict resolution.",
   "license": "FSL-1.1-MIT",
   "author": "Bas Milius",
@@ -19,6 +19,7 @@
     "dist",
     "src",
     "!src/**/*.test.ts",
+    "!src/**/__snapshots__",
     "!src/fixtures"
   ],
   "exports": {

package/src/blocks.ts

@@ -97,8 +97,3 @@ export function splitBlocks(base: readonly string[], ours: readonly string[], th
     push(base.length, ours.length, theirs.length);
     return blocks;
 }
-
-/* The stretches a person still has to decide on. */
-export function openBlocks(blocks: readonly MergeBlock[]): number {
-    return blocks.filter((block) => block.kind === 'conflict').length;
-}

package/src/index.ts

@@ -1,6 +1,6 @@
 export { diffLines, type Change } from './diff.ts';
-export { openBlocks, splitBlocks, type MergeBlock, type MergeBlockKind } from './blocks.ts';
-export { autoLines, bothLines, draftOf, fingerprint, sideLines, wandLines, type MergeDraft, type MergeSide, type MergeSpan } from './resolve.ts';
+export { splitBlocks, type MergeBlock, type MergeBlockKind } from './blocks.ts';
+export { bothLines, draftOf, fingerprint, sideLines, wandLines, type MergeDraft, type MergeSide, type MergeSpan } from './resolve.ts';
 export { joinLines, shapeOf, splitLines, type TextShape } from './text.ts';
 export { missingSides, patchFits } from './patch.ts';
 export { parsePatch, parseHunkHeader, type HunkHeader, type Hunk, type ParsedPatch, type PatchLine } from './patch-parser.ts';

package/src/patch.ts

@@ -1,3 +1,5 @@
+import { parsePatch } from './patch-parser.ts';
+
 /* Which side a patch says the file is missing on, read from its header so no line of the file can pass for it. */
 export function missingSides(patch: string): { old: boolean; new: boolean } {
     const start = patch.search(/^@@/m);
@@ -7,8 +9,11 @@ export function missingSides(patch: string): { old: boolean; new: boolean } {
 
 const HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
 
-/* Git's --ignore-all-space may show either side's spacing on a context line. */
+/* Git's --ignore-all-space may show either side's spacing on a context line. A patch cut off before its hunks end fits nothing. */
 export function patchFits(patch: string, oldText: string, newText: string, ignoreWhitespace: boolean): boolean {
+    if (parsePatch(patch).partial) {
+        return false;
+    }
     const oldLines = oldText.split('\n');
     const newLines = newText.split('\n');
     const same = ignoreWhitespace

package/src/resolve.ts

@@ -12,7 +12,7 @@ export function bothLines(block: MergeBlock, first: MergeSide): string[] {
 }
 
 /* What a block is worth without anyone choosing: the side that changed, or the change both made. */
-export function autoLines(block: MergeBlock): string[] | null {
+function autoLines(block: MergeBlock): string[] | null {
     switch (block.kind) {
         case 'stable':
         case 'ours':
@@ -25,17 +25,6 @@ export function autoLines(block: MergeBlock): string[] | null {
     }
 }
 
-function squashed(lines: readonly string[]): string {
-    return lines
-        .map((line) => {
-            const body = line.trim();
-            // Indentation is meaning in Python, YAML or a Makefile, so only a blank line loses its own.
-            const indent = body === '' ? '' : line.slice(0, line.length - line.trimStart().length);
-            return `${indent}${body.replace(/\s+/g, ' ')}`;
-        })
-        .join('\n');
-}
-
 /* Where `inner` starts in `outer` as one run of lines, or -1. */
 function runIn(outer: readonly string[], inner: readonly string[]): number {
     for (let start = 0; start + inner.length <= outer.length; start += 1) {
@@ -61,14 +50,14 @@ function covers(base: readonly string[], outer: readonly string[], inner: readon
 
 /*
  * What the wand makes of a conflict, or null for one that needs a person after all. It closes only
- * sides that differ in whitespace inside or after a line, and a side that already holds every line
- * of the other without putting back what the other deleted. Anything else is a choice it never guesses.
+ * identical sides and a side that already holds every line of the other without putting back what
+ * the other deleted. Whitespace keeps its meaning because this function has no language context.
  */
 export function wandLines(block: MergeBlock): string[] | null {
     if (block.kind !== 'conflict') {
         return autoLines(block);
     }
-    if (squashed(block.ours) === squashed(block.theirs)) {
+    if (block.ours.length === block.theirs.length && block.ours.every((line, index) => line === block.theirs[index])) {
         return [...block.ours];
     }
     if (covers(block.base, block.ours, block.theirs)) {
@@ -119,7 +108,10 @@ export function draftOf(blocks: readonly MergeBlock[], answered: ReadonlyMap<num
     const spans: MergeSpan[] = [];
     for (const [index, block] of blocks.entries()) {
         const from = lines.length;
-        lines.push(...(answered.get(index) ?? autoLines(block) ?? block.ours));
+        // One push per line: a block of a few hundred thousand lines is more arguments than V8 takes in one call.
+        for (const line of answered.get(index) ?? autoLines(block) ?? block.ours) {
+            lines.push(line);
+        }
         spans.push({ block: index, kind: block.kind, from, to: lines.length });
     }
     return { lines, spans };