build: 更新eslint等依赖

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npm run lint && npm run generate-all && npm run pre-commit

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "$schema": "http://json.schemastore.org/prettierrc",
+  "printWidth": 120,
+  "tabWidth": 4,
+  "trailingComma": "none",
+  "singleQuote": true
+}

backend/index.js

@@ -1,8 +1,8 @@
-const fs = require('fs');
-const nodePath = require('path');
-const Koa = require('koa');
-const Router = require('@koa/router');
-const pinyinRaw = require('pinyin');
+import { readFileSync, statSync } from 'fs';
+import { join, resolve } from 'path';
+import Koa from 'koa';
+import Router from '@koa/router';
+import pinyinRaw, { STYLE_NORMAL } from 'pinyin';
 
 const DefaultId = Symbol('DefaultId');
 const Keywords = Symbol('Keywords');
@@ -18,20 +18,20 @@ function dateTimeToString(date) {
 }
 
 function readJSON(path) {
-    return JSON.parse(fs.readFileSync(path, 'utf-8'));
+    return JSON.parse(readFileSync(path, 'utf-8'));
 }
 
 function readFileModifiedTime(path) {
     try {
-        const stats = fs.statSync(path);
+        const stats = statSync(path);
         return stats.mtimeMs;
-    } catch (err) {
+    } catch {
         return NaN;
     }
 }
 
 function loadData(path) {
-    const pinyin = (w) => pinyinRaw(w, { style: pinyinRaw.STYLE_NORMAL }).join('');
+    const pinyin = (w) => pinyinRaw(w, { style: STYLE_NORMAL }).join('');
     const dataIndex = readJSON(path);
     const newData = {};
     const keywords = {};
@@ -55,18 +55,14 @@ function loadData(path) {
         addKeywords(versionType, { versionType });
         addKeywords(versionIndex.name, { versionType });
         versionIndex.branchList.forEach((branchInfo) => {
-            const branchData = readJSON(nodePath.join(path, '..', versionIndex.id, `${branchInfo.id}.json`));
+            const branchData = readJSON(join(path, '..', versionIndex.id, `${branchInfo.id}.json`));
             const enumEntriesMap = {};
             const nameMap = {};
             const branchId = branchInfo.id;
             addKeywords(branchId, { versionType, branchId });
             addKeywords(branchInfo.name, { versionType, branchId });
             for (const [enumKey, enumData] of Object.entries(branchData.enums)) {
-                enumEntriesMap[enumKey] = Object.entries(enumData).map(([key, value]) => [
-                    key,
-                    value,
-                    pinyin(value)
-                ]);
+                enumEntriesMap[enumKey] = Object.entries(enumData).map(([key, value]) => [key, value, pinyin(value)]);
             }
             branchData.names.forEach(([id, name]) => {
                 addKeywords(id, { versionType, branchId, enumId: id });
@@ -196,7 +192,12 @@ function doSearch(dataStore, options) {
     } else {
         let restLimit = limit;
         for (const id of Object.keys(branchData.enums)) {
-            const enumResult = searchEnum(searcher, { scope, limit: restLimit, enumId: id, branchData });
+            const enumResult = searchEnum(searcher, {
+                scope,
+                limit: restLimit,
+                enumId: id,
+                branchData
+            });
             result.push(...enumResult);
             restLimit -= enumResult.length;
             if (restLimit <= 0) {
@@ -208,11 +209,12 @@ function doSearch(dataStore, options) {
 }
 
 function toPWAHash(options) {
-    return [
+    const urlSegs = [
         `#${options.versionType}-${options.branchId}`,
         options.enumId,
         encodeURIComponent(options.searchText)
-    ].join('/');
+    ];
+    return urlSegs.join('/');
 }
 
 function toHumanReadable(options, result) {
@@ -222,7 +224,7 @@ function toHumanReadable(options, result) {
     return lines.join('\r\n');
 }
 
-const dataIndexPath = nodePath.resolve(process.argv[2], 'index.json');
+const dataIndexPath = resolve(process.argv[2], 'index.json');
 let dataStore = loadData(dataIndexPath);
 let dataCheckTime = Date.now();
 let dataUpdateTime = readFileModifiedTime(dataIndexPath);

backend/package.json

@@ -4,6 +4,7 @@
   "main": "index.js",
   "author": "ProjectXero",
   "license": "GPL-3.0",
+  "type": "module",
   "dependencies": {
     "@koa/router": "^10.1.1",
     "koa": "^2.13.4",

data/config.js

@@ -19,25 +19,27 @@ const commonOptions = {
     ime: 'com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME',
     // OCR识别错误手动校正
     tesseractMistakes: [
-        ['\'n"\'sUmmOn Creeper', '/summon creeper'],
-        ['\'n"\'sUmmOn raVager', '/summon ravager']
+        ["'n\"'sUmmOn Creeper", '/summon creeper'],
+        ["'n\"'sUmmOn raVager", '/summon ravager']
     ],
     // 可调试行为包路径
     devBehaviorPackPath: '/sdcard/Android/data/com.mojang.minecraftpe/files/games/com.mojang/development_behavior_packs'
 };
 
 // eslint-disable-next-line no-unused-vars
-const smallerGUIOptions = { // GUI Scale = -1
+const smallerGUIOptions = {
+    // GUI Scale = -1
     ...commonOptions,
     // 命令区域大小
     commandAreaRect: [328, 976, 1784, 100],
     tesseractMistakes: [
-        ['\'/sUmmOn Creeper', '/summon creeper'],
-        ['\'/sUmmOn raVager', '/summon ravager']
+        ["'/sUmmOn Creeper", '/summon creeper'],
+        ["'/sUmmOn raVager", '/summon ravager']
     ]
 };
 
-const smallestGUIOptions = { // GUI Scale = -2
+const smallestGUIOptions = {
+    // GUI Scale = -2
     ...commonOptions,
     // 命令区域大小
     commandAreaRect: [246, 1002, 1989, 75],

data/gametest_behavior_pack/scripts/main_1.18.0.js

@@ -1,11 +1,11 @@
-import * as Minecraft from "mojang-minecraft";
-import * as GameTest from "mojang-gametest";
+import * as Minecraft from 'mojang-minecraft';
+import * as GameTest from 'mojang-gametest';
 
 globalThis.totalTicks = 0;
 Minecraft.world.events.tick.subscribe(() => {
     globalThis.totalTicks += 1;
 });
 
-GameTest.register("gametest", "remote", (test) => {
+GameTest.register('gametest', 'remote', (test) => {
     test.succeed();
 });

data/gametest_behavior_pack/scripts/main_1.19.40.js

@@ -1,11 +1,11 @@
-import * as Minecraft from "@minecraft/server";
-import * as GameTest from "@minecraft/server-gametest";
+import * as Minecraft from '@minecraft/server';
+import * as GameTest from '@minecraft/server-gametest';
 
 globalThis.totalTicks = 0;
 Minecraft.world.events.tick.subscribe(() => {
     globalThis.totalTicks += 1;
 });
 
-GameTest.register("gametest", "remote", (test) => {
+GameTest.register('gametest', 'remote', (test) => {
     test.succeed();
 });

data/gametest_behavior_pack/scripts/main_1.19.70.js

@@ -1,12 +1,12 @@
-import * as Minecraft from "@minecraft/server";
-import * as GameTest from "@minecraft/server-gametest";
+import * as Minecraft from '@minecraft/server';
+import * as GameTest from '@minecraft/server-gametest';
 
 globalThis.totalTicks = 0;
 Minecraft.system.run(function handler() {
     globalThis.totalTicks += 1;
     Minecraft.system.run(handler);
 });
 
-GameTest.register("gametest", "remote", (test) => {
+GameTest.register('gametest', 'remote', (test) => {
     test.succeed();
 });

data/tess-mistakes.smallest.js

@@ -1,6 +1,6 @@
 export default [
-    ['\'/summon Creeper', '/summon creeper'],
-    ['/recipe take @s ^\'*^\'', '/recipe take @s "*"'],
+    ["'/summon Creeper", '/summon creeper'],
+    ["/recipe take @s ^'*^'", '/recipe take @s "*"'],
     ['cak_', 'oak_'],
     ['scul_', 'soul_']
 ];

eslint.config.mjs

@@ -0,0 +1,27 @@
+import js from '@eslint/js';
+import html from 'eslint-plugin-html';
+import prettier from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+
+export default [
+    js.configs.recommended,
+    prettier,
+    {
+        files: ['**/*.html'],
+        plugins: { html },
+        languageOptions: {
+            globals: {
+                ...globals.node,
+                ...globals.browser
+            }
+        }
+    },
+    {
+        ignores: ['output/*'],
+        languageOptions: {
+            globals: {
+                ...globals.node
+            }
+        }
+    }
+];