auto fallback unsupport lang to highlight.js

MrWangJustToDo · MrWangJustToDo · commit 93b995236720 · 2024-12-06T14:36:24.000+08:00
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -3,7 +3,7 @@
   "description": "@git-diff-view/core",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -52,7 +52,7 @@
     "diff parse"
   ],
   "dependencies": {
-    "@git-diff-view/lowlight": "^0.0.22",
+    "@git-diff-view/lowlight": "^0.0.23",
     "highlight.js": "^11.10.0",
     "lowlight": "^3.2.0",
     "fast-diff": "^1.3.0"
diff --git a/packages/core/src/file.ts b/packages/core/src/file.ts
@@ -104,19 +104,31 @@ export class File {
       return;
     }
 
-    this.ast = finalHighlighter.getAST(this.raw, this.fileName, this.lang, theme);
+    // check current lang is support or not
+    // if it's a unsupported lang, fallback to use lowlightHighlighter
+    let supportEngin = finalHighlighter;
+
+    try {
+      if (!finalHighlighter.hasRegisteredCurrentLang(this.lang)) {
+        supportEngin = highlighter;
+      }
+    } catch {
+      supportEngin = highlighter;
+    }
+
+    this.ast = supportEngin.getAST(this.raw, this.fileName, this.lang, theme);
 
     if (!this.ast) return;
 
-    const { syntaxFileObject, syntaxFileLineNumber } = finalHighlighter.processAST(this.ast);
+    const { syntaxFileObject, syntaxFileLineNumber } = supportEngin.processAST(this.ast);
 
     this.syntaxFile = syntaxFileObject;
 
     this.syntaxLength = syntaxFileLineNumber;
 
-    this.highlighterName = finalHighlighter.name;
+    this.highlighterName = supportEngin.name;
 
-    this.highlighterType = finalHighlighter.type;
+    this.highlighterType = supportEngin.type;
 
     if (__DEV__) {
       this.#doCheck();
diff --git a/packages/file/index.d.ts b/packages/file/index.d.ts
@@ -1,6 +1,6 @@
 // Generated by dts-bundle-generator v9.5.1
 
-import { LinesOptions } from 'diff';
+import { PatchOptions } from 'diff';
 
 declare class Cache$1<K, V> extends Map<K, V> {
 	name: string;
@@ -625,8 +625,8 @@ export type SyntaxNode = {
 	};
 	children?: SyntaxNode[];
 };
-export declare function generateDiffFile(oldFileName: string, oldFileContent: string, newFileName: string, newFileContent: string, oldFileLang: DiffHighlighterLang, newFileLang: DiffHighlighterLang, option?: LinesOptions, uuid?: string): DiffFile;
-export declare function generateDiffFile(oldFileName: string, oldFileContent: string, newFileName: string, newFileContent: string, oldFileLang: string, newFileLang: string, option?: LinesOptions, uuid?: string): DiffFile;
+export declare function generateDiffFile(oldFileName: string, oldFileContent: string, newFileName: string, newFileContent: string, oldFileLang: DiffHighlighterLang, newFileLang: DiffHighlighterLang, option?: PatchOptions, uuid?: string): DiffFile;
+export declare function generateDiffFile(oldFileName: string, oldFileContent: string, newFileName: string, newFileContent: string, oldFileLang: string, newFileLang: string, option?: PatchOptions, uuid?: string): DiffFile;
 
 export {
 	File$1 as File,
diff --git a/packages/file/package.json b/packages/file/package.json
@@ -3,7 +3,7 @@
   "description": "@git-diff-view/file",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -52,14 +52,14 @@
     "diff parse"
   ],
   "dependencies": {
-    "@git-diff-view/core": "^0.0.22",
-    "diff": "^5.2.0",
+    "@git-diff-view/core": "^0.0.23",
+    "diff": "^7.0.0",
     "highlight.js": "^11.10.0",
     "lowlight": "^3.2.0",
     "fast-diff": "^1.3.0"
   },
   "devDependencies": {
-    "@types/diff": "^5.2.2",
+    "@types/diff": "^6.0.0",
     "@types/hast": "^3.0.0"
   }
 }
diff --git a/packages/file/src/index.ts b/packages/file/src/index.ts
@@ -1,5 +1,5 @@
 import { DiffFile, _cacheMap } from "@git-diff-view/core";
-import { createTwoFilesPatch, type LinesOptions } from "diff";
+import { createTwoFilesPatch, type PatchOptions } from "diff";
 
 import type { DiffHighlighterLang } from "@git-diff-view/core";
 
@@ -12,7 +12,7 @@ export function generateDiffFile(
   newFileContent: string,
   oldFileLang: DiffHighlighterLang,
   newFileLang: DiffHighlighterLang,
-  option?: LinesOptions,
+  option?: PatchOptions,
   uuid?: string
 ): DiffFile;
 export function generateDiffFile(
@@ -22,7 +22,7 @@ export function generateDiffFile(
   newFileContent: string,
   oldFileLang: string,
   newFileLang: string,
-  option?: LinesOptions,
+  option?: PatchOptions,
   uuid?: string
 ): DiffFile;
 export function generateDiffFile(
@@ -32,7 +32,7 @@ export function generateDiffFile(
   newFileContent: string,
   oldFileLang: DiffHighlighterLang | string,
   newFileLang: DiffHighlighterLang | string,
-  option?: LinesOptions,
+  option?: PatchOptions,
   uuid?: string
 ) {
   const diffString = createTwoFilesPatch(oldFileName, newFileName, oldFileContent, newFileContent, "", "", option);
diff --git a/packages/file/tsconfig.json b/packages/file/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "rootDir": "src",
-    "target": "ES2015",
+    "target": "ESNext",
     "moduleResolution": "Bundler",
     "stripInternal": true
   },
diff --git a/packages/lowlight/package.json b/packages/lowlight/package.json
@@ -3,7 +3,7 @@
   "description": "@git-diff-view/lowlight",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -3,7 +3,7 @@
   "description": "@git-diff-view/react",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -63,7 +63,7 @@
     "react diff component"
   ],
   "dependencies": {
-    "@git-diff-view/core": "^0.0.22",
+    "@git-diff-view/core": "^0.0.23",
     "@types/hast": "^3.0.0",
     "fast-diff": "^1.3.0",
     "highlight.js": "^11.10.0",
diff --git a/packages/shiki/package.json b/packages/shiki/package.json
@@ -3,7 +3,7 @@
   "description": "@git-diff-view/shiki",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "types": "index.d.ts",
   "type": "module",
   "files": [
@@ -44,6 +44,7 @@
     "virtual dom highlight"
   ],
   "dependencies": {
-    "shiki": "^1.22.0"
+    "@git-diff-view/lowlight": "^0.0.23",
+    "shiki": "^1.24.0"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -3,7 +3,7 @@
   "description": "@git-diff-view/vue",
   "author": "MrWangJustToDo",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "main": "index.js",
   "type": "module",
   "types": "index.d.ts",
@@ -49,7 +49,7 @@
     "vue diff component"
   ],
   "dependencies": {
-    "@git-diff-view/core": "^0.0.22",
+    "@git-diff-view/core": "^0.0.23",
     "@types/hast": "^3.0.0",
     "highlight.js": "^11.10.0",
     "lowlight": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"rootDir": "src",`
`4`		`- "target": "ES2015",`
	`4`	`+ "target": "ESNext",`
`5`	`5`	`"moduleResolution": "Bundler",`
`6`	`6`	`"stripInternal": true`
`7`	`7`	`},`