v-code-diff 1.10.0 → 1.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "v-code-diff",
   "type": "module",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "template component for vue-demi, can dev and build",
   "license": "MIT",
   "exports": {
@@ -53,7 +53,8 @@
     "diff": "^5.1.0",
     "diff-match-patch": "^1.0.5",
     "highlight.js": "^11.9.0",
-    "vue-demi": "^0.14.6"
+    "vue-demi": "^0.14.6",
+    "vue-i18n": "9"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^2.4.5",

package/src/CodeDiff.vue

@@ -12,6 +12,7 @@ interface Props {
   language?: string
   context?: number
   diffStyle?: 'word' | 'char'
+  forceInlineComparison?: boolean
   outputFormat?: 'line-by-line' | 'side-by-side'
   trim?: boolean
   noDiffLineFeed?: boolean
@@ -29,6 +30,7 @@ const props = withDefaults(defineProps<Props>(), {
   language: 'plaintext',
   context: 10,
   diffStyle: 'word',
+  forceInlineComparison: false,
   outputFormat: 'line-by-line',
   trim: false,
   noDiffLineFeed: false,
@@ -70,8 +72,8 @@ const newString = computed(() => {
 
 const raw = computed(() =>
   isUnifiedViewer.value
-    ? createUnifiedDiff(oldString.value, newString.value, props.language, props.diffStyle, props.context, props.ignoreMatchingLines)
-    : createSplitDiff(oldString.value, newString.value, props.language, props.diffStyle, props.context, props.ignoreMatchingLines),
+    ? createUnifiedDiff(oldString.value, newString.value, props.language, props.diffStyle, props.forceInlineComparison, props.context, props.ignoreMatchingLines)
+    : createSplitDiff(oldString.value, newString.value, props.language, props.diffStyle, props.forceInlineComparison, props.context, props.ignoreMatchingLines),
 )
 const diffChange = ref(raw.value)
 const isNotChanged = computed(() => diffChange.value.stat.additionsNum === 0 && diffChange.value.stat.deletionsNum === 0)

package/src/utils.ts

@@ -170,6 +170,7 @@ export function createSplitDiff(
   newString: string,
   language = 'plaintext',
   diffStyle = 'word',
+  forceInlineComparison = false,
   context = 10,
   ignoreMatchingLines?: string,
 ): SplitViewerChange {
@@ -270,9 +271,9 @@ export function createSplitDiff(
             addNum++
 
           const [curLine, nextLine] = [curLines[j], nextLines[j]]
-
-          const leftLine = curLines.length === nextLines.length ? renderWords(nextLine, curLine, diffStyle) : curLine
-          const rightLine = curLines.length === nextLines.length ? renderWords(curLine, nextLine, diffStyle) : nextLine
+          const shouldRenderWords = forceInlineComparison || curLines.length === nextLines.length
+          const leftLine = shouldRenderWords ? renderWords(nextLine, curLine, diffStyle) : curLine
+          const rightLine = shouldRenderWords ? renderWords(curLine, nextLine, diffStyle) : nextLine
 
           // 忽略匹配的行等价于相等
           const leftDiffType = ignoreRegex?.test(curLine) ? DiffType.EQUAL : DiffType.DELETE
@@ -361,6 +362,7 @@ export function createUnifiedDiff(
   newString: string,
   language = 'plaintext',
   diffStyle = 'word',
+  forceInlineComparison = false,
   context = 10,
   ignoreMatchingLines?: string,
 ): UnifiedViewerChange {
@@ -430,7 +432,7 @@ export function createUnifiedDiff(
     // 处理当前 diff 为删除的情况
     if (curType === DiffType.DELETE) {
       // 下一处差异为新增，且删除与新增行数相同时，对每行依次 diff
-      if (nextType === DiffType.ADD && curLines.length === nextLines.length) {
+      if (nextType === DiffType.ADD && (curLines.length === nextLines.length || forceInlineComparison)) {
         for (let j = 0; j < curLines.length; j++) {
           const curLine = curLines[j]
           const nextLine = nextLines[j]