@preventive/compare 1.1.0 → 1.2.0

package/names.d.ts

@@ -33,7 +33,7 @@ export type RenameReason = 'unparsed' | 'dynamic' | 'jsx' | 'block-function' | '
 // 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?: 'none' | 'all' | 'change' | 'trailing' }): Promise<{
+export function renamedDiff(before: string, after: string, options?: RenameOptions & { whitespace?: Whitespace }): Promise<{
   before: string
   blocks: Pick<Block, 'a0' | 'a1' | 'b0' | 'b1'>[]
   reason: RenameReason | null
@@ -42,3 +42,17 @@ export function renamedDiff(before: string, after: string, options?: RenameOptio
   warnings: string[]
 }>
 
+export type Whitespace = 'none' | 'all' | 'change' | 'trailing'
+
+// renamedDiff for each of `whitespace`'s settings (`['none']` unless given),
+// `diffs` in their order: the names found and the old side given them once
+// for all, as are `before`, `reason`, `reads` and `warnings`; each setting's
+// `blocks` checked as renamedDiff's are, and its `marks` read as they are.
+export function renamedDiffs(before: string, after: string, options?: RenameOptions & { whitespace?: Whitespace[] }): Promise<{
+  before: string
+  reason: RenameReason | null
+  reads: string[]
+  diffs: { whitespace: Whitespace; blocks: Pick<Block, 'a0' | 'a1' | 'b0' | 'b1'>[]; marks: Pick<Block, 'a0' | 'a1' | 'b0' | 'b1'>[] }[]
+  warnings: string[]
+}>
+

package/names.js

@@ -5,5 +5,6 @@
 // peers: on Node loaded on first use, elsewhere oxc with this module.
 // compare.js loads none. Typed and described in names.d.ts.
 
-// The diff of two such files with renamed names set aside, checked to hide no change.
-export { renamedDiff } from './src/names/diff.js'
+// The diff of two such files with renamed names set aside, checked to hide no
+// change; and the same for several whitespace settings at once.
+export { renamedDiff, renamedDiffs } from './src/names/diff.js'

package/package.json

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

package/src/names/diff.js

@@ -6,12 +6,17 @@ import { changeSet } from '@preventive/diff'
 import { blocksHold } from '../blocks.js'
 import { markedBlocks } from '../marked.js'
 import { format } from '../pretty.js'
+import { checkLineOptions } from '../text.js'
 import { bindsAlike } from './binds.js'
 import { renameMap } from './rename.js'
 
 const ranges = ({ a0, a1, b0, b1 }) => ({ a0, a1, b0, b1 })
 
-export async function renamedDiff(before, after, { extension = 'js', otherExtension = extension, whitespace = 'none' } = {}) {
+// The same, diffed once for each whitespace setting given, in order: the names
+// found and the old side given them once for all.
+export async function renamedDiffs(before, after, { extension = 'js', otherExtension = extension, whitespace = ['none'] } = {}) {
+  if (!Array.isArray(whitespace)) throw new TypeError(`whitespace must be an array, not ${typeof whitespace}`)
+  const settings = whitespace.map((setting) => checkLineOptions({ horizon: 0, whitespace: setting }))
   const warnings = []
   const mapped = renameMap(before, after, { extension, otherExtension })
   if (mapped.invariant) warnings.push(`a rename map check failed: ${mapped.invariant}`)
@@ -23,11 +28,20 @@ export async function renamedDiff(before, after, { extension = 'js', otherExtens
     if ('code' in formatted && !read) warnings.push("the renamed old side, formatted, read otherwise")
     renamed = read ? formatted.code : mapped.text
   }
-  const options = { horizon: 0, whitespace }
-  const blocks = changeSet(renamed, after, options).map(ranges)
-  if (!blocksHold(renamed, after, blocks, options)) throw new Error('change blocks that do not take the old side to the new')
-  // Read off the renamed text before formatting, line for line the old side's.
-  const marks = mapped.reason ? [] : markedBlocks(before, mapped.text, after, options)
-  if (marks === null) warnings.push('a renamed text with lines the old one does not have; none marked')
-  return { before: renamed, blocks, reason: mapped.reason ?? null, reads: mapped.reads ?? [], marks: marks ?? [], warnings }
+  let unmarked = false
+  const diffs = settings.map((options) => {
+    const blocks = changeSet(renamed, after, options).map(ranges)
+    if (!blocksHold(renamed, after, blocks, options)) throw new Error('change blocks that do not take the old side to the new')
+    // Read off the renamed text before formatting, line for line the old side's.
+    const marks = mapped.reason ? [] : markedBlocks(before, mapped.text, after, options)
+    unmarked ||= marks === null
+    return { whitespace: options.whitespace, blocks, marks: marks ?? [] }
+  })
+  if (unmarked) warnings.push('a renamed text with lines the old one does not have; none marked')
+  return { before: renamed, reason: mapped.reason ?? null, reads: mapped.reads ?? [], diffs, warnings }
+}
+
+export async function renamedDiff(before, after, { whitespace = 'none', ...options } = {}) {
+  const { before: renamed, reason, reads, diffs: [{ blocks, marks }], warnings } = await renamedDiffs(before, after, { ...options, whitespace: [whitespace] })
+  return { before: renamed, blocks, reason, reads, marks, warnings }
 }