@adecore/merge 0.54.1 → 0.54.3

package/dist/diff.js

@@ -1,6 +1,6 @@
 /* Past this edit distance two files are answered as one stretch that differs whole. */
 const MAX_DISTANCE = 4000;
-/* The walk keeps every STRIDE-th state and walks the rounds between two again on the way back: a
+/* The walk keeps every STRIDE-th state and walks the rounds between two again on the way back. A
    state per round came to over a hundred megabytes at MAX_DISTANCE. */
 const STRIDE = 64;
 /* Whether a diagonal's furthest reach steps in from diagonal + 1 (an insert) rather than diagonal - 1 (a delete). */

package/dist/resolve.js

@@ -55,7 +55,7 @@ function covers(base, outer, inner) {
     return added.every((line) => !base.includes(line) || inner.includes(line));
 }
 /*
- * What the wand makes of a conflict, or null for one that needs a person after all. It closes only
+ * What automatic resolution makes of a conflict, or null for one that needs a person after all. It closes only
  * 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.
  */
@@ -73,7 +73,7 @@ export function wandLines(block) {
 }
 /*
  * A short name for the two sides of one block, so an answer written for it can be checked against
- * the block it lands on. FNV-1a, not a digest: it has to read the same on a server and in a browser,
+ * the block it lands on. FNV-1a, not a digest, because it has to read the same on a server and in a browser,
  * and a browser has no synchronous crypto hash.
  */
 export function fingerprint(block) {
@@ -96,7 +96,7 @@ export function draftOf(blocks, answered = new Map()) {
     const spans = [];
     for (const [index, block] of blocks.entries()) {
         const from = lines.length;
-        // One push per line: a block of a few hundred thousand lines is more arguments than V8 takes in one call.
+        // One push per line, since 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);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/merge",
-  "version": "0.54.1",
+  "version": "0.54.3",
   "description": "Pure line diffs, three-way merge blocks and conflict resolution.",
   "license": "FSL-1.1-MIT",
   "author": "Bas Milius",

package/src/blocks.ts

@@ -2,7 +2,7 @@ import { diffLines, type Change } from './diff.ts';
 
 /*
  * What happened to one stretch of a file between the version the two sides started from and what
- * each of them made of it. Only `conflict` needs a person: the rest is one side's change, or the
+ * each of them made of it. Only `conflict` needs a person. The rest is one side's change, or the
  * same change made twice.
  */
 export type MergeBlockKind = 'stable' | 'ours' | 'theirs' | 'both' | 'conflict';

package/src/diff.ts

@@ -12,7 +12,7 @@ export interface Change {
 /* Past this edit distance two files are answered as one stretch that differs whole. */
 const MAX_DISTANCE = 4000;
 
-/* The walk keeps every STRIDE-th state and walks the rounds between two again on the way back: a
+/* The walk keeps every STRIDE-th state and walks the rounds between two again on the way back. A
    state per round came to over a hundred megabytes at MAX_DISTANCE. */
 const STRIDE = 64;
 

package/src/resolve.ts

@@ -71,7 +71,7 @@ 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
+ * What automatic resolution makes of a conflict, or null for one that needs a person after all. It closes only
  * 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.
  */
@@ -93,7 +93,7 @@ export function wandLines(block: MergeBlock): string[] | null {
 
 /*
  * A short name for the two sides of one block, so an answer written for it can be checked against
- * the block it lands on. FNV-1a, not a digest: it has to read the same on a server and in a browser,
+ * the block it lands on. FNV-1a, not a digest, because it has to read the same on a server and in a browser,
  * and a browser has no synchronous crypto hash.
  */
 export function fingerprint(block: MergeBlock): string {
@@ -135,7 +135,7 @@ export function draftOf(blocks: readonly MergeBlock[], answered: ReadonlyMap<num
     for (const [index, block] of blocks.entries()) {
         const from = lines.length;
 
-        // One push per line: a block of a few hundred thousand lines is more arguments than V8 takes in one call.
+        // One push per line, since 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);
         }