@preventive/compare 1.2.8 → 1.2.9

package/compare.d.ts

@@ -120,11 +120,14 @@ export interface LineOptions {
 // lowercase letters alone), as `index-CyWAfh-p.js` and `index-hRvO4yU2.js`
 // are, or `main.3f9a2c1d.chunk.js` and `main.8b7e6a5f.chunk.js`. Minified onto
 // a line, such a chunk scores little as git splits it, so it is scored with
-// its spans ending after `,` `;` `=` `{` `}` too, and taken at git's stricter
-// score for a basename, halfway from -M's to 100%: the best pairs first, its
-// similarity that score, giving way as a pair by path does but only where git
-// takes the candidate it gives way to, and none past the rename limit, as they
-// are scored. git has no such passes, so false is git's own -M.
+// its spans ending after `,` `;` `=` `{` `}` too, and taken however it scores
+// where each is the other's only such chunk, as a pair by path is (a build's
+// chunk rewritten: playwright's dashboard `index-*.js`, 31% alike from 1.61.1
+// to 1.62.0), else at git's stricter score for a basename, halfway from -M's
+// to 100%: the best pairs first, its similarity that score, giving way as a
+// pair by path does but only where git takes the candidate it gives way to,
+// and none past the rename limit, as they are scored. git has no such passes,
+// so false is git's own -M.
 //
 // `renameLimit` is git's diff.renameLimit: when more deleted files times added
 // files are left, in a group, after the renames that need no scoring than its

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preventive/compare",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "Git-compatible file tree diffs and minified JavaScript comparison",
   "type": "module",
   "main": "./compare.js",

package/src/chunks.js

@@ -32,25 +32,29 @@ function oneChunk(a, b) {
 }
 
 // Chunks git's scored pass has yet to claim, by directory, extension and
-// name's length, each pair at least `bar`: the best first, as git takes its
-// candidates, but for a pair `outdone` by a file's other candidate, set aside
-// and returned, best first, for git to pair that candidate with another file:
-// it holds its files, so that a later pair of either is set aside behind it.
+// name's length, each pair at least `bar` -- or however it scores, where each
+// is the other's only such chunk, as a pair by path is: the build's own chunk,
+// rewritten (playwright's dashboard `index-*.js`, 31% alike from 1.61 to 1.62):
+// the best first, as git takes its candidates, but for a pair `outdone` by a
+// file's other candidate, set aside and returned, best first, for git to pair
+// that candidate with another file: it holds its files, so that a later pair
+// of either is set aside behind it.
 export function chunkRenames({ sources, dests, pairs, used, record, punctuatedScoreOf }, { remaining, open }, bar, outdone) {
   const names = (files, indices) => new Map(indices.filter((i) => files[i].type === 'file').map((i) => [i, nameOf(files[i].path)]))
   const destNames = names(dests, open), sourceNames = names(sources, remaining)
   const byKey = Map.groupBy(sourceNames.keys(), (s) => sourceNames.get(s).key)
   const opens = Map.groupBy(destNames.keys(), (d) => destNames.get(d).key)
-  const candidates = []
+  const chunks = []
   for (const [key, ds] of opens) {
     const ss = byKey.get(key) ?? []
-    for (const d of ds) {
-      for (const s of ss) {
-        if (!oneChunk(sourceNames.get(s).name, destNames.get(d).name)) continue
-        const score = punctuatedScoreOf(s, d, bar)
-        if (score >= bar) candidates.push({ s, d, score })
-      }
-    }
+    for (const d of ds) for (const s of ss) if (oneChunk(sourceNames.get(s).name, destNames.get(d).name)) chunks.push({ s, d })
+  }
+  const byDest = Map.groupBy(chunks, ({ d }) => d), bySource = Map.groupBy(chunks, ({ s }) => s)
+  const candidates = []
+  for (const { s, d } of chunks) {
+    const only = bySource.get(s).length === 1 && byDest.get(d).length === 1
+    const score = punctuatedScoreOf(s, d, only ? 0 : bar)
+    if (only || score >= bar) candidates.push({ s, d, score })
   }
   const aside = [], heldDests = new Set(), heldSources = new Set()
   for (const pair of candidates.sort((x, y) => y.score - x.score)) {

package/src/renames.js

@@ -193,7 +193,8 @@ const unpaired = ({ sources, dests, pairs, used }) => ({
 })
 
 // git's stricter score, halfway from -M's to 100%, for a pair that names alone
-// put forward: a basename both sides have once, or a chunk's.
+// put forward: a basename both sides have once, or a chunk's of a name either
+// side has more of.
 const stricter = (minimum) => minimum + Math.trunc(0.5 * (MAX_SCORE - minimum))
 
 // Each added file's rename by its index in `dests`: { source, score }. A