feat: 优化语言统计

Author: songyiping03

data/content-handler.data.mts

@@ -4,17 +4,38 @@ import { matchCodeBlocks } from '../utils/md-statistics';
 import { pie_base64 } from '../utils/chart';
 import { countLines } from '../utils/common';
 
+const langMap = {
+  javascript: ['js', 'javascript', 'JavaScript', 'jsx'],
+  cpp: ['c++', 'cpp', 'CPP'],
+  typescript: ['ts', 'typescript', 'TypeScript', 'tsx'],
+  python: ['py', 'python', 'Python'],
+  java: ['java', 'Java'],
+  go: ['go', 'Go', 'golang'],
+  rust: ['rs', 'rust', 'Rust'],
+  html: ['html', 'HTML', 'htm'],
+  css: ['css', 'CSS', 'scss', 'Sass', 'sass', 'less', 'Less'],
+  shell: ['sh', 'bash', 'Shell', 'zsh'],
+  text: ['text', 'Text', 'txt', 'Txt', 'plaintext', 'Plaintext', 'in', 'out'],
+}
+
+const getStdLang = (lang: string) => {
+  for (const [stdLang, variants] of Object.entries(langMap)) {
+    if (variants.includes(lang)) {
+      return stdLang;
+    }
+  }
+  return lang;
+}
+
 export default {
   async load() {
-    const count = new EasyMap<string, number>({defaultValue: 0});
+    const count = new EasyMap<string, number>();
     const proxy = count.createProxy(p => {
       return typeof p === 'string' ? p : p.toString();
-    });
+    }, 0);
     loadFiles('_posts/**/*.md', (content) => {
       matchCodeBlocks(content).forEach(({language, code}) => {
-        if (language === 'c++') language = 'cpp';
-        if (language === 'in' || language === 'out') language = 'text';
-        proxy[language] += countLines(code);
+        proxy[getStdLang(language)] += countLines(code);
       });
     });
     const pieData = {

package-lock.json

@@ -24,7 +24,7 @@
     "@docsearch/js": "^4.0.1",
     "@eslint/js": "^9.10.0",
     "@trudbot/json-format": "^0.0.4",
-    "@trudbot/map": "^0.0.4",
+    "@trudbot/map": "^0.0.5",
     "@types/d3": "^7.4.3",
     "@types/d3-cloud": "^1.2.9",
     "@types/lodash": "^4.17.20",

package.json

@@ -1,7 +1,7 @@
 // 定义一个类型来提取函数的返回类型
-export type FunctionReturnType<F> = F extends (...args: unknown[]) => infer R ? R : never;
+export type FunctionReturnType<F> = F extends (...args: never[]) => infer R ? R : never;
 
 // 定义一个类型来将函数列表映射为返回值的类型数组
-export type MapFunctionReturnTypes<T extends Array<(...args: unknown[]) => unknown>> = {
+export type MapFunctionReturnTypes<T extends Array<(...args: never[]) => unknown>> = {
   [K in keyof T]: FunctionReturnType<T[K]>
 };