xshell 1.0.86 → 1.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.86",
+    "version": "1.0.87",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -58,6 +58,8 @@
         "@babel/traverse": "^7.24.1",
         "@koa/cors": "^5.0.0",
         "@types/ws": "^8.5.10",
+        "@typescript-eslint/eslint-plugin": "^7.5.0",
+        "@typescript-eslint/parser": "^7.5.0",
         "@typescript-eslint/utils": "^7.5.0",
         "ali-oss": "^6.20.0",
         "archiver": "^7.0.1",
@@ -69,6 +71,9 @@
         "colors": "^1.4.0",
         "commander": "^12.0.0",
         "emoji-regex": "^10.3.0",
+        "eslint": "^9.0.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-react": "^7.34.1",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "i18next": "^23.10.1",
@@ -120,8 +125,7 @@
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
         "@types/vinyl-fs": "^3.0.5",
-        "@types/vscode": "^1.88.0",
-        "eslint": "^9.0.0"
+        "@types/vscode": "^1.88.0"
     },
     "pnpm": {
         "patchedDependencies": {

package/xlint.d.ts

@@ -1,108 +1,3 @@
-import type ESTree from 'estree';
-import type { Rule } from 'eslint';
-import { TSESTree, type TSESLint } from '@typescript-eslint/utils';
-export declare const xlint_plugin: {
-    rules: {
-        'fold-jsdoc-comments': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create: (context: Rule.RuleContext) => {
-                Program(): void;
-            };
-        };
-        'nonblock-statement-body-position-with-indentation': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create(context: Rule.RuleContext): {
-                IfStatement(node: ESTree.IfStatement & Rule.NodeParentExtension): void;
-                WhileStatement: (node: ESTree.WhileStatement & Rule.NodeParentExtension) => void;
-                DoWhileStatement: (node: ESTree.DoWhileStatement & Rule.NodeParentExtension) => void;
-                ForStatement: (node: ESTree.ForStatement & Rule.NodeParentExtension) => void;
-                ForInStatement: (node: ESTree.ForInStatement & Rule.NodeParentExtension) => void;
-                ForOfStatement: (node: ESTree.ForOfStatement & Rule.NodeParentExtension) => void;
-            };
-        };
-        'empty-bracket-spacing': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create(context: Rule.RuleContext): {
-                ObjectExpression(node: ESTree.ObjectExpression & Rule.NodeParentExtension): void;
-                ArrayExpression(node: ESTree.ArrayExpression & Rule.NodeParentExtension): void;
-                BlockStatement(node: ESTree.BlockStatement & Rule.NodeParentExtension): void;
-            };
-        };
-        'space-infix-ops-except-exponentiation': {
-            meta: {
-                messages: {
-                    missingSpace: string;
-                    redundantSpace: string;
-                };
-                fixable: "whitespace";
-                type: "layout";
-            };
-            create(context: TSESLint.RuleContext<'missingSpace' | 'redundantSpace', any[]>): {
-                AssignmentExpression: (node: any) => void;
-                AssignmentPattern: (node: any) => void;
-                BinaryExpression: (node: any) => void;
-                LogicalExpression: (node: any) => void;
-                ConditionalExpression: (node: any) => void;
-                VariableDeclarator: (node: any) => void;
-                TSEnumMember: (node: TSESTree.TSEnumMember) => void;
-                PropertyDefinition: (node: TSESTree.PropertyDefinition) => void;
-                TSTypeAliasDeclaration: (node: TSESTree.TSTypeAliasDeclaration) => void;
-                TSUnionType: (typeAnnotation: TSESTree.TSIntersectionType | TSESTree.TSUnionType) => void;
-                TSIntersectionType: (typeAnnotation: TSESTree.TSIntersectionType | TSESTree.TSUnionType) => void;
-                TSConditionalType: (node: TSESTree.TSConditionalType) => void;
-            };
-        };
-        'space-in-for-statement': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create(context: Rule.RuleContext): {
-                ForStatement(node: ESTree.ForStatement & Rule.NodeParentExtension): void;
-            };
-        };
-        'jsx-no-redundant-parenthesis-in-return': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create(context: Rule.RuleContext): {
-                ReturnStatement(node: ESTree.ReturnStatement & Rule.NodeParentExtension): void;
-                ArrowFunctionExpression(node: ESTree.ArrowFunctionExpression & Rule.NodeParentExtension): void;
-            };
-        };
-        'keep-indent': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create(context: Rule.RuleContext): {
-                Program(): void;
-            };
-        };
-        'func-style': {
-            meta: {
-                readonly fixable: "whitespace";
-                readonly type: "layout";
-            };
-            create(context: Rule.RuleContext): {
-                FunctionDeclaration(node: ESTree.FunctionDeclaration & Rule.NodeParentExtension): void;
-                'FunctionDeclaration:exit'(): void;
-                FunctionExpression(node: ESTree.FunctionExpression & Rule.NodeParentExtension): void;
-                'FunctionExpression:exit'(): void;
-                ThisExpression(): void;
-                ArrowFunctionExpression(): void;
-                'ArrowFunctionExpression:exit'(node: ESTree.ArrowFunctionExpression & Rule.NodeParentExtension): void;
-            };
-        };
-    };
-};
+import type { ESLint, Linter } from 'eslint';
+export declare const xlint_plugin: ESLint.Plugin;
+export declare const xlint_config: Linter.FlatConfig;

package/xlint.js

@@ -1,4 +1,8 @@
 import { AST_TOKEN_TYPES, ASTUtils, TSESTree } from '@typescript-eslint/utils';
+import TSParser from '@typescript-eslint/parser';
+import ts_plugin from '@typescript-eslint/eslint-plugin';
+import react_plugin from 'eslint-plugin-react';
+import import_plugin from 'eslint-plugin-import';
 const line_break_pattern = /\r\n|[\r\n\u2028\u2029]/u;
 const meta = {
     fixable: 'whitespace',
@@ -724,6 +728,152 @@ export const xlint_plugin = {
         // }
     }
 };
+export const xlint_config = {
+    files: ['**/*.{js,mjs,cjs,ts,tsx,mts,cts}'],
+    ignores: [
+        '*.d.ts',
+        'node_modules/',
+        '.git/',
+    ],
+    languageOptions: {
+        ecmaVersion: 'latest',
+        parser: TSParser,
+        parserOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            project: './tsconfig.json',
+            ecmaFeatures: {
+                jsx: true
+            },
+        },
+    },
+    plugins: {
+        '@typescript-eslint': ts_plugin,
+        react: react_plugin,
+        import: import_plugin,
+        xlint: xlint_plugin,
+    },
+    settings: {
+        react: {
+            version: 'detect'
+        }
+    },
+    rules: {
+        'xlint/fold-jsdoc-comments': 'error',
+        // 取代 nonblock-statement-body-position
+        'xlint/nonblock-statement-body-position-with-indentation': 'error',
+        'xlint/empty-bracket-spacing': 'error',
+        // a + b**c
+        'xlint/space-infix-ops-except-exponentiation': 'error',
+        'xlint/space-in-for-statement': 'error',
+        'xlint/jsx-no-redundant-parenthesis-in-return': 'error',
+        'xlint/keep-indent': 'error',
+        // 函数使用 function 来声明而不是 const foo = () => { }
+        'xlint/func-style': 'error',
+        '@typescript-eslint/semi': ['error', 'never'],
+        '@typescript-eslint/no-extra-semi': 'error',
+        'semi-style': ['error', 'first'],
+        // 使用 ===
+        eqeqeq: 'error',
+        // 父类尽量返回 this 类型
+        '@typescript-eslint/prefer-return-this-type': 'error',
+        // 尽量使用 . 访问属性而不是 []
+        '@typescript-eslint/dot-notation': 'error',
+        // 必须 throw Error
+        '@typescript-eslint/no-throw-literal': 'error',
+        // ------------ async
+        // 返回 Promise 的函数一定要标记为 async 函数
+        '@typescript-eslint/promise-function-async': 'error',
+        // 不要 return await promise, 直接 return promise, 除非外面有 try catch
+        '@typescript-eslint/return-await': 'error',
+        // ------------ 括号
+        // a => { } 而不是 (a) => { }
+        'arrow-parens': ['error', 'as-needed', { requireForBlockBody: false }],
+        // 不要多余的大括号
+        // if (true)
+        //     console.log()
+        curly: ['error', 'multi'],
+        // 简单属性不要冗余的大括号 <Component prop='simple-value' />
+        'react/jsx-curly-brace-presence': ['error', 'never'],
+        // ------------ 空格
+        // { a, b } 这样的对象，大括号里面要有空格
+        '@typescript-eslint/object-curly-spacing': ['error', 'always'],
+        // [a, b, c]
+        '@typescript-eslint/comma-spacing': 'error',
+        // foo()
+        '@typescript-eslint/func-call-spacing': 'error',
+        // a => { } 中箭头左右两边空格
+        'arrow-spacing': ['error'],
+        // 注释双斜杠后面要有空格
+        'spaced-comment': ['error', 'always', { markers: ['/'] }],
+        // 函数声明中，名称后面要有空格
+        '@typescript-eslint/space-before-function-paren': 'error',
+        // { return true } 这样的 block 大括号里面要有空格
+        'block-spacing': ['error', 'always'],
+        // aaa: 123
+        '@typescript-eslint/key-spacing': ['error', { beforeColon: false, afterColon: true, mode: 'minimum' }],
+        // aaa: string
+        '@typescript-eslint/type-annotation-spacing': 'error',
+        // if ()
+        '@typescript-eslint/keyword-spacing': ['error', { before: true, after: true }],
+        // if (1) { }
+        '@typescript-eslint/space-before-blocks': 'error',
+        // case 1: ...
+        'switch-colon-spacing': 'error',
+        // <Hello name={firstname} />
+        'react/jsx-equals-spacing': ['error', 'never'],
+        // 不允许使用 tab
+        'no-tabs': 'error',
+        // 使用 \n 换行
+        'linebreak-style': ['error', 'unix'],
+        // 文件以 \n 结尾
+        'eol-last': ['error', 'always'],
+        // ------------ 引号
+        // 用单引号
+        'jsx-quotes': ['error', 'prefer-single'],
+        // 用单引号
+        quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
+        // 不要冗余的引号包裹属性
+        'quote-props': ['error', 'as-needed', { keywords: false, unnecessary: true }],
+        // ------------ 其它
+        // boolean 属性不要冗余的 ={true} <Component boolprop />
+        'react/jsx-boolean-value': ['error', 'never'],
+        // 没有 children 的 Component 写成闭合标签 <Component />
+        'react/self-closing-comp': 'error',
+        // 单行类型声明用 `,` 分割，多行类型声明结尾不要加分号
+        '@typescript-eslint/member-delimiter-style': [
+            'error',
+            {
+                multiline: {
+                    delimiter: 'none',
+                    requireLast: false
+                },
+                singleline: {
+                    delimiter: 'comma',
+                    requireLast: false
+                }
+            }
+        ],
+        '@typescript-eslint/prefer-includes': 'error',
+        '@typescript-eslint/prefer-regexp-exec': 'error',
+        // 禁止使用 export default
+        'no-restricted-exports': [
+            'error',
+            { restrictDefaultExports: { direct: true, named: true, defaultFrom: true, namedFrom: true, namespaceFrom: true } }
+        ],
+        '@typescript-eslint/consistent-type-imports': ['error', { fixStyle: 'inline-type-imports', disallowTypeAnnotations: false }],
+        // () => { 返回 void 的表达式 }
+        '@typescript-eslint/no-confusing-void-expression': 'error',
+        // ------------ import
+        'import/no-duplicates': ['error', { 'prefer-inline': true }],
+        'import/order': [
+            'error',
+            {
+                'newlines-between': 'always-and-inside-groups'
+            }
+        ]
+    }
+};
 function split_indent(line) {
     let i = 0;
     let indent = 0;