v-code-diff 1.2.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v-code-diff",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "template component for vue-demi, can dev and build",
   "main": "dist/index.cjs",
   "module": "dist/index.es.js",
@@ -53,12 +53,14 @@
   },
   "dependencies": {
     "diff": "^5.0.0",
+    "diff-match-patch": "^1.0.5",
     "highlight.js": "^11.6.0",
     "vue-demi": "^0.13.11"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.34.0",
     "@types/diff": "^5.0.0",
+    "@types/diff-match-patch": "^1.0.32",
     "@types/node": "^18.11.18",
     "bumpp": "^8.2.1",
     "eslint": "^8.31.0",

package/src/utils.ts

@@ -1,5 +1,6 @@
 import * as Diff from 'diff'
 import type { Change } from 'diff'
+import { DIFF_DELETE, DIFF_INSERT, diff_match_patch as DiffMatchPatch } from 'diff-match-patch'
 import hljs from './highlight'
 import { DiffType } from './types'
 import type { DiffLine, DiffStat, SplitDiffLine, SplitViewerChange, UnifiedLine, UnifiedViewerChange } from './types'
@@ -36,6 +37,27 @@ const renderWords = (prev?: string, current?: string, diffStyle = 'word'): strin
     .join('')
 }
 
+function diffLines(prev: string, current: string) {
+  const dmp = new DiffMatchPatch()
+  const a = dmp.diff_linesToChars_(prev, current)
+  const linePrev = a.chars1
+  const lineCurrent = a.chars2
+  const lineArray = a.lineArray
+  const diffs: any[] = dmp.diff_main(linePrev, lineCurrent, false)
+  dmp.diff_charsToLines_(diffs, lineArray)
+  return diffs.map((x) => {
+    const [type, text] = x
+    const count = text.trim().split('\n').length
+    const change: Diff.Change = {
+      count,
+      value: text,
+      removed: type === DIFF_DELETE,
+      added: type === DIFF_INSERT,
+    }
+    return change
+  })
+}
+
 const getHighlightCode = (language: string, code: string) => {
   const hasModifiedTags = code.match(new RegExp(`(${MODIFIED_START_TAG}|${MODIFIED_CLOSE_TAG})`, 'g'))
 
@@ -137,8 +159,7 @@ export function createSplitDiff(
 ): SplitViewerChange {
   const newEmptySplitDiff = (): DiffLine => ({ type: DiffType.EMPTY })
   const newSplitDiff = (type: DiffType, num: number, code: string): DiffLine => ({ type, num, code })
-
-  const changes = Diff.diffLines(oldString, newString)
+  const changes = diffLines(oldString, newString)
 
   let delNum = 0
   let addNum = 0
@@ -301,9 +322,9 @@ export function createUnifiedDiff(
   newString: string,
   language = 'plaintext',
   diffStyle = 'word',
-  context = 2,
+  context = 10,
 ): UnifiedViewerChange {
-  const changes = Diff.diffLines(oldString, newString)
+  const changes = diffLines(oldString, newString)
 
   let delNum = 0
   let addNum = 0