@preventive/compare 1.2.3 → 1.2.4

package/names.d.ts

@@ -21,18 +21,19 @@ export type RenameReason = 'unparsed' | 'dynamic' | 'jsx' | 'block-function' | '
 // The diff of two JavaScript files minified on both sides with renamed names
 // set aside. The old side is given the new side's names wherever a minifier
 // renamed a variable alike throughout (a declared variable's short ASCII name,
-// not a script's top level, an export's or import's by its own name, or a
-// shorthand property's), checked to bind every name as before by this
-// package's scope analysis and again by oxc's minifier; formatted again where
-// that changes its layout alone and still binds alike; diffed as diff -U0 has
-// it; and the blocks checked to take `before` to the new side (thrown should
-// they not). `reason` says why no names were given; `reads` the properties
-// either text reads names through (`name`, `toString`, `stack`, `callee`,
-// `caller`), sorted, as code reading its names may act otherwise renamed:
-// none where none is renamed, and `name` only where a name renamed is a
-// function's or class's, the one name it reads (`function f`, `f = () => {}`);
-// `marks` the plain diff's blocks that differ in renamed names alone; and
-// `warnings` what a check that should never fail found.
+// not a script's top level -- but where the file's other version is a module,
+// as a bundle's chunk is once it exports, the same file loaded alike -- a name
+// exported or imported as itself, or a shorthand property's), checked to bind
+// every name as before by this package's scope analysis and again by oxc's
+// minifier; formatted again where that changes its layout alone and still binds
+// alike; diffed as diff -U0 has it; and the blocks checked to take `before` to
+// the new side (thrown should they not). `reason` says why no names were given;
+// `reads` the properties either text reads names through (`name`, `toString`,
+// `stack`, `callee`, `caller`), sorted, as code reading its names may act
+// otherwise renamed: none where none is renamed, and `name` only where a name
+// renamed is a function's or class's, the one name it reads (`function f`,
+// `f = () => {}`); `marks` the plain diff's blocks that differ in renamed names
+// alone; and `warnings` what a check that should never fail found.
 export function renamedDiff(before: string, after: string, options?: RenameOptions & { whitespace?: Whitespace }): Promise<{
   before: string
   blocks: Pick<Block, 'a0' | 'a1' | 'b0' | 'b1'>[]

package/package.json

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

package/src/names/analyze.js

@@ -234,7 +234,7 @@ function resolved(program, s) {
     if (s.naming.has(node)) variable.naming = true
   }
   const own = program.sourceType === 'module' || program.sourceType === 'commonjs' || globals.some(([node]) => COMMONJS.has(node.name))
-  for (const variable of s.variables) variable.aside = variable.name.length <= RENAMED_MAX_LENGTH && MINIFIED.test(variable.name) && !variable.kept && (own || variable.scope !== s.root)
+  for (const variable of s.variables) variable.aside = renamable(variable) && (own || variable.scope !== s.root)
   // A shorthand property's two names are one, at one place.
   const byStart = (x, y) => x[0].start - y[0].start
   occurrences.sort(byStart)
@@ -248,6 +248,17 @@ function resolved(program, s) {
   return { scopes: s.scopes, variables: s.variables, occurrences: deduplicated, globals, names, reads: s.reads, module: program.sourceType === 'module', commonjs: program.sourceType === 'commonjs', own }
 }
 
+// A short minified name, declared, and kept by no export, import or shorthand.
+const renamable = (variable) => variable.name.length <= RENAMED_MAX_LENGTH && MINIFIED.test(variable.name) && !variable.kept
+
+// A script's analysis with its top level its own, as a module's: renamable there
+// too. Still read as a script, `this` and all, but no global of it set aside.
+export function ownTopLevel(analysis) {
+  if (analysis.reason || analysis.own) return analysis
+  for (const variable of analysis.variables) variable.aside = renamable(variable)
+  return { ...analysis, own: true }
+}
+
 export function analyze(text, extension) {
   const program = parsed(text, extension)
   if (!program) return { reason: 'unparsed' }

package/src/names/rename.js

@@ -3,7 +3,7 @@
 // to read wrongly, and the result checked again by oxc (bindsAlike).
 
 import { getOxc } from '#oxc'
-import { analyze } from './analyze.js'
+import { analyze, ownTopLevel } from './analyze.js'
 import { bindsAlike } from './binds.js'
 import { checkAnalysis, checkGiven, checkPairing, checkRenamed } from './check.js'
 import { misread } from './misread.js'
@@ -33,8 +33,12 @@ function givenNames(a, b, { map, weak }) {
 }
 
 function renamedNames(before, after, { extension = 'js', otherExtension = extension }) {
-  const a = analyze(before, extension), b = analyze(after, otherExtension)
+  let a = analyze(before, extension), b = analyze(after, otherExtension)
   if (a.reason || b.reason) return { reason: a.reason ?? b.reason }
+  // A file is a module by how it is loaded, which its versions share, more than
+  // by its syntax: a bundle's chunk that one version exports from, the other not.
+  // Where its other version is a module, a script's top level is its own too.
+  if (a.module || b.module) [a, b] = [ownTopLevel(a), ownTopLevel(b)]
   checkAnalysis(before, a)
   checkAnalysis(after, b)
   const paired = pairing(before, after, a, b)