v-code-diff 1.5.0 → 1.6.0

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "v-code-diff",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "template component for vue-demi, can dev and build",
-  "main": "dist/index.cjs",
-  "module": "dist/index.es.js",
-  "types": "./types/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.es.js",
-      "require": "./dist/index.cjs.js"
+      "require": "./dist/index.cjs.js",
+      "import": "./dist/index.es.js"
     }
   },
+  "main": "dist/index.cjs",
+  "module": "dist/index.es.js",
+  "types": "./types/index.d.ts",
   "files": [
     "scripts",
     "dist",
@@ -31,20 +31,12 @@
     "dev:2.7": "vue-demi-switch 2.7 vue2 && pnpm --filter vue2.7-playground dev",
     "dev:3": "vue-demi-switch 3 vue3 && pnpm --filter vue3-playground dev",
     "dev:demo": "vue-demi-switch 3 vue3 && pnpm --filter demo dev",
-    "lint:fix": "eslint . --ext .vue,.js,.jsx,.ts,.tsx --fix --ignore-path .gitignore",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --ext .vue,.js,.jsx,.ts,.tsx,json --fix --ignore-path .gitignore",
     "postinstall": "node scripts/postinstall.js",
     "prepublishOnly": "npm run build",
     "release": "bumpp --commit --no-push --tag && npm publish"
   },
-  "author": "Shimada666<649940882@qq.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Shimada666/v-code-diff/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Shimada666/v-code-diff.git"
-  },
   "peerDependencies": {
     "@vue/composition-api": "^1.4.9",
     "vue": "^2.6.0 || >=3.0.0"
@@ -61,18 +53,19 @@
     "vue-demi": "^0.13.11"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.34.0",
+    "@antfu/eslint-config": "^0.39.8",
     "@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",
+    "eslint": "^8.45.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "sass": "^1.57.1",
+    "sass": "^1.63.6",
     "typescript": "~4.7.4",
-    "vite": "^4.0.4",
+    "vite": "^4.4.4",
     "vite-plugin-css-injected-by-js": "^2.4.0",
+    "vue": "^3.3.4",
     "vue-tsc": "^0.40.13",
     "vue2": "npm:vue@2",
     "vue3": "npm:vue@3"

package/scripts/postinstall.js

@@ -1,8 +1,12 @@
+const fs = require('node:fs')
 const { switchVersion, loadModule } = require('./utils')
 
 const Vue = loadModule('vue')
 
-if (!Vue || typeof Vue.version !== 'string')
+if (fs.existsSync('.local'))
+  console.log('Currently, it is the local development environment, not doing anything.')
+
+else if (!Vue || typeof Vue.version !== 'string')
   console.warn('[v-code-diff] Vue is not found. Please run "npm install vue" to install.')
 
 else if (Vue.version.startsWith('2.7.'))
@@ -14,5 +18,4 @@ else if (Vue.version.startsWith('2.'))
 else if (Vue.version.startsWith('3.'))
   switchVersion('3')
 
-else
-  console.warn(`[v-code-diff] Vue version v${Vue.version} is not suppported.`)
+else console.warn(`[v-code-diff] Vue version v${Vue.version} is not suppported.`)

package/scripts/utils.js

@@ -1,5 +1,5 @@
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 
 const dir = path.resolve(__dirname, '..', 'dist')
 

package/src/CodeDiff.vue

@@ -20,6 +20,14 @@ interface Props {
   filename?: string
 }
 
+interface DiffResult {
+  stat: {
+    isChanged: boolean
+    addNum: number
+    delNum: number
+  }
+}
+
 const props = withDefaults(defineProps<Props>(), {
   language: 'plaintext',
   context: 10,
@@ -31,15 +39,23 @@ const props = withDefaults(defineProps<Props>(), {
   filename: undefined,
 })
 
+const emits = defineEmits<{
+  (e: 'diff', diffResult: DiffResult): void
+}>()
+
 const isUnifiedViewer = computed(() => props.outputFormat === 'line-by-line')
 
 const oldString = computed(() => {
-  const value = props.trim ? props.oldString.trim() : props.oldString
-  return props.noDiffLineFeed ? value.replace(/(\r\n)/g, '\n') : value
+  let value = props.oldString || ''
+  value = props.trim ? value.trim() : value
+  value = props.noDiffLineFeed ? value.replace(/(\r\n)/g, '\n') : value
+  return value
 })
 const newString = computed(() => {
-  const value = props.trim ? props.newString.trim() : props.newString
-  return props.noDiffLineFeed ? value.replace(/(\r\n)/g, '\n') : value
+  let value = props.newString || ''
+  value = props.trim ? value.trim() : value
+  value = props.noDiffLineFeed ? value.replace(/(\r\n)/g, '\n') : value
+  return value
 })
 
 const raw = computed(() =>
@@ -48,9 +64,18 @@ const raw = computed(() =>
     : createSplitDiff(oldString.value, newString.value, props.language, props.diffStyle, props.context),
 )
 const diffChange = ref(raw.value)
+const isNotChanged = computed(() => diffChange.value.stat.additionsNum === 0 && diffChange.value.stat.deletionsNum === 0)
+
 watch(() => props, () => {
   diffChange.value = raw.value
-}, { deep: true })
+  emits('diff', {
+    stat: {
+      isChanged: !isNotChanged.value,
+      addNum: diffChange.value.stat.additionsNum,
+      delNum: diffChange.value.stat.deletionsNum,
+    },
+  })
+}, { deep: true, immediate: true })
 </script>
 
 <template>
@@ -69,4 +94,5 @@ watch(() => props, () => {
   </div>
 </template>
 
-<style lang="scss"></style>
+<style lang="scss">
+</style>

package/src/global.ts

@@ -1,7 +1,7 @@
 import CodeDiff from './CodeDiff.vue'
 import hljs from './highlight'
 
-const install = (app: any) => {
+function install(app: any) {
   app.component('CodeDiff', CodeDiff)
 }
 

package/src/index.ts

@@ -1,7 +1,7 @@
 import CodeDiff from './CodeDiff.vue'
 import hljs from './highlight'
 
-const install = (app: any) => {
+function install(app: any) {
   app.component('CodeDiff', CodeDiff)
 }
 

package/src/split/SplitLine.vue

@@ -2,12 +2,13 @@
 import { DiffType } from '../types'
 import type { SplitLineChange } from '../types'
 
-const props = defineProps<{
+defineProps<{
   splitLine: SplitLineChange
 }>()
+
 const emit = defineEmits(['expand'])
 
-const getCodeMarker = (type: DiffType) => {
+function getCodeMarker(type: DiffType) {
   if (type === DiffType.DELETE)
     return '-'
   if (type === DiffType.ADD)

package/src/types.ts

@@ -1,4 +1,4 @@
-export const enum DiffType {
+export enum DiffType {
   EQUAL = 'equal',
   DELETE = 'removed',
   ADD = 'added',

package/src/unified/UnifiedLine.vue

@@ -2,12 +2,12 @@
 import type { UnifiedLineChange } from '../types'
 import { DiffType } from '../types'
 
-const props = defineProps<{
+defineProps<{
   line: UnifiedLineChange
 }>()
 const emit = defineEmits(['expand'])
 
-const getCodeMarker = (type: DiffType) => {
+function getCodeMarker(type: DiffType) {
   if (type === DiffType.DELETE)
     return '-'
   if (type === DiffType.ADD)

package/src/utils.ts

@@ -11,7 +11,7 @@ const MODIFIED_CLOSE_TAG = '</code-diff-modified>'
 const startEntity = MODIFIED_START_TAG.replace('<', '&lt;').replace('>', '&gt;')
 const closeEntity = MODIFIED_CLOSE_TAG.replace('<', '&lt;').replace('>', '&gt;')
 
-const lineType = (diff: Diff.Change): DiffType => {
+function lineType(diff: Diff.Change): DiffType {
   if (diff === undefined)
     return DiffType.EQUAL
   if (diff.added)
@@ -21,7 +21,7 @@ const lineType = (diff: Diff.Change): DiffType => {
   return DiffType.EQUAL
 }
 
-const renderWords = (prev?: string, current?: string, diffStyle = 'word'): string => {
+function renderWords(prev?: string, current?: string, diffStyle = 'word'): string {
   if (typeof prev === 'undefined')
     return current!
   if (typeof current === 'undefined')
@@ -58,7 +58,7 @@ function diffLines(prev: string, current: string) {
   })
 }
 
-const getHighlightCode = (language: string, code: string) => {
+function getHighlightCode(language: string, code: string) {
   const hasModifiedTags = code.match(new RegExp(`(${MODIFIED_START_TAG}|${MODIFIED_CLOSE_TAG})`, 'g'))
 
   if (!hasModifiedTags)