Skip to content

Commit

Permalink
feat: add configuration for diff truncation (vitest-dev#5073)
Browse files Browse the repository at this point in the history
  • Loading branch information
willieho committed Mar 4, 2024
1 parent 14ee16d commit 93d7047
Show file tree
Hide file tree
Showing 7 changed files with 262 additions and 28 deletions.
38 changes: 24 additions & 14 deletions packages/utils/src/diff/diffLines.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,28 @@ function printAnnotation({
return `${aColor(a)}\n${bColor(b)}\n\n`
}

export function printDiffLines(diffs: Array<Diff>, options: DiffOptionsNormalized): string {
export function printDiffLines(diffs: Array<Diff>, truncated: boolean, options: DiffOptionsNormalized): string {
return printAnnotation(options, countChanges(diffs))
+ (options.expand
? joinAlignedDiffsExpand(diffs, options)
: joinAlignedDiffsNoExpand(diffs, options))
? joinAlignedDiffsExpand(diffs, options)
: joinAlignedDiffsNoExpand(diffs, options))
+ (truncated
? options.truncateColor(`\n${options.truncateAnnotation}`)
: '')
}

// Compare two arrays of strings line-by-line. Format as comparison lines.
export function diffLinesUnified(aLines: Array<string>, bLines: Array<string>, options?: DiffOptions): string {
const normalizedOptions = normalizeDiffOptions(options)
const [diffs, truncated] = diffLinesRaw(
isEmptyString(aLines) ? [] : aLines,
isEmptyString(bLines) ? [] : bLines,
normalizedOptions,
)
return printDiffLines(
diffLinesRaw(
isEmptyString(aLines) ? [] : aLines,
isEmptyString(bLines) ? [] : bLines,
),
normalizeDiffOptions(options),
diffs,
truncated,
normalizedOptions,
)
}

Expand All @@ -120,7 +127,7 @@ export function diffLinesUnified2(aLinesDisplay: Array<string>, bLinesDisplay: A
return diffLinesUnified(aLinesDisplay, bLinesDisplay, options)
}

const diffs = diffLinesRaw(aLinesCompare, bLinesCompare)
const [diffs, truncated] = diffLinesRaw(aLinesCompare, bLinesCompare, options)

// Replace comparison lines with displayable lines.
let aIndex = 0
Expand All @@ -144,13 +151,16 @@ export function diffLinesUnified2(aLinesDisplay: Array<string>, bLinesDisplay: A
}
})

return printDiffLines(diffs, normalizeDiffOptions(options))
return printDiffLines(diffs, truncated, normalizeDiffOptions(options))
}

// Compare two arrays of strings line-by-line.
export function diffLinesRaw(aLines: Array<string>, bLines: Array<string>): Array<Diff> {
const aLength = aLines.length
const bLength = bLines.length
export function diffLinesRaw(aLines: Array<string>, bLines: Array<string>, options?: DiffOptions): [Array<Diff>, boolean] {
const truncate = options?.truncateThreshold ?? false
const truncateThreshold = Math.max(Math.floor(options?.truncateThreshold ?? 0), 0)
const aLength = truncate ? Math.min(aLines.length, truncateThreshold) : aLines.length
const bLength = truncate ? Math.min(bLines.length, truncateThreshold) : bLines.length
const truncated = aLength !== aLines.length || bLength !== bLines.length

const isCommon = (aIndex: number, bIndex: number) => aLines[aIndex] === bLines[bIndex]

Expand Down Expand Up @@ -185,5 +195,5 @@ export function diffLinesRaw(aLines: Array<string>, bLines: Array<string>): Arra
for (; bIndex !== bLength; bIndex += 1)
diffs.push(new Diff(DIFF_INSERT, bLines[bIndex]))

return diffs
return [diffs, truncated]
}
26 changes: 21 additions & 5 deletions packages/utils/src/diff/diffStrings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,24 @@

import * as diff from 'diff-sequences'
import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, Diff } from './cleanupSemantic'
import { DiffOptions } from './types';

function diffStrings(a: string, b: string, options?: DiffOptions): [Array<Diff>, boolean] {
const truncate = options?.truncateThreshold ?? false
const truncateThreshold = Math.max(Math.floor(options?.truncateThreshold ?? 0), 0)
let aLength = a.length
let bLength = b.length
if (truncate) {
const aMultipleLines = a.includes('\n')
const bMultipleLines = b.includes('\n')
// multiple-lines string expects a newline to be appended at the end
const _a = aMultipleLines ? a.split('\n').slice(0 ,truncateThreshold).join('\n') + '\n' : a
const _b = bMultipleLines ? b.split('\n').slice(0 ,truncateThreshold).join('\n') + '\n' : b
aLength = _a.length
bLength = _b.length
}
const truncated = aLength !== a.length || bLength !== b.length

function diffStrings(a: string, b: string): Array<Diff> {
const isCommon = (aIndex: number, bIndex: number) => a[aIndex] === b[bIndex]

let aIndex = 0
Expand All @@ -34,16 +50,16 @@ function diffStrings(a: string, b: string): Array<Diff> {
// @ts-expect-error wrong bundling
const diffSequences = diff.default.default || diff.default

diffSequences(a.length, b.length, isCommon, foundSubsequence)
diffSequences(aLength, bLength, isCommon, foundSubsequence)

// After the last common subsequence, push remaining change items.
if (aIndex !== a.length)
if (aIndex !== aLength)
diffs.push(new Diff(DIFF_DELETE, a.slice(aIndex)))

if (bIndex !== b.length)
if (bIndex !== bLength)
diffs.push(new Diff(DIFF_INSERT, b.slice(bIndex)))

return diffs
return [diffs, truncated]
}

export default diffStrings
4 changes: 4 additions & 0 deletions packages/utils/src/diff/normalizeDiffOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import type { DiffOptions, DiffOptionsNormalized } from './types'
export const noColor = (string: string): string => string

const DIFF_CONTEXT_DEFAULT = 5
const DIFF_TRUNCATE_THRESHOLD_DEFAULT = 0

function getDefaultOptions(): DiffOptionsNormalized {
const c = getColors()
Expand All @@ -35,6 +36,9 @@ function getDefaultOptions(): DiffOptionsNormalized {
includeChangeCounts: false,
omitAnnotationLines: false,
patchColor: c.yellow,
truncateThreshold: DIFF_TRUNCATE_THRESHOLD_DEFAULT,
truncateAnnotation: '... Diff result is truncated',
truncateColor: noColor,
}
}

Expand Down
11 changes: 6 additions & 5 deletions packages/utils/src/diff/printDiffs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ export function diffStringsUnified(a: string, b: string, options?: DiffOptions):
const isMultiline = a.includes('\n') || b.includes('\n')

// getAlignedDiffs assumes that a newline was appended to the strings.
const diffs = diffStringsRaw(
let [diffs, truncated] = diffStringsRaw(
isMultiline ? `${a}\n` : a,
isMultiline ? `${b}\n` : b,
true, // cleanupSemantic
options,
)

if (hasCommonDiff(diffs, isMultiline)) {
const optionsNormalized = normalizeDiffOptions(options)
const lines = getAlignedDiffs(diffs, optionsNormalized.changeColor)
return printDiffLines(lines, optionsNormalized)
return printDiffLines(lines, truncated, optionsNormalized)
}
}

Expand All @@ -51,11 +52,11 @@ export function diffStringsUnified(a: string, b: string, options?: DiffOptions):

// Compare two strings character-by-character.
// Optionally clean up small common substrings, also known as chaff.
export function diffStringsRaw(a: string, b: string, cleanup: boolean): Array<Diff> {
const diffs = diffStrings(a, b)
export function diffStringsRaw(a: string, b: string, cleanup: boolean, options?: DiffOptions): [Array<Diff>, boolean] {
const [diffs, truncated] = diffStrings(a, b, options)

if (cleanup)
cleanupSemantic(diffs) // impure function

return diffs
return [diffs, truncated]
}
6 changes: 6 additions & 0 deletions packages/utils/src/diff/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ export interface DiffOptions {
omitAnnotationLines?: boolean
patchColor?: DiffOptionsColor
compareKeys?: CompareKeys
truncateThreshold?: number
truncateAnnotation?: string
truncateColor?: DiffOptionsColor
}

export interface DiffOptionsNormalized {
Expand All @@ -48,4 +51,7 @@ export interface DiffOptionsNormalized {
includeChangeCounts: boolean
omitAnnotationLines: boolean
patchColor: DiffOptionsColor
truncateThreshold: number
truncateAnnotation: string
truncateColor: DiffOptionsColor
}
3 changes: 3 additions & 0 deletions packages/vitest/src/types/matcher-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ export interface DiffOptions {
patchColor?: Formatter
// pretty-format type
compareKeys?: any
truncateThreshold?: number
truncateAnnotation?: string
truncateColor?: Formatter
}
Loading

0 comments on commit 93d7047

Please sign in to comment.