xshell 1.3.44 → 1.3.45

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.44",
+    "version": "1.3.45",
     "type": "module",
     "main": "./index.js",
     "bin": {

package/xlint.js

@@ -5,7 +5,7 @@ import TSParser from '@typescript-eslint/parser';
 import ts_plugin from '@typescript-eslint/eslint-plugin';
 import react_plugin from 'eslint-plugin-react';
 import stylistic_plugin from '@stylistic/eslint-plugin';
-import { check } from "./utils.js";
+import { array_equals, check } from "./utils.js";
 import { path } from "./path.js";
 // 用 ast explorer 选 esprima 来看
 // 或者 https://explorer.eslint.org/
@@ -703,18 +703,6 @@ export const xlint_plugin = {
                     'Program:exit'() {
                         if (need_fix_source || imports.length <= 1)
                             return;
-                        const { sourceCode: source } = context;
-                        const { body } = source.ast;
-                        const first = imports[0].node;
-                        const ifirst = body.indexOf(first);
-                        if (body.indexOf(imports.last.node, ifirst + 1) - ifirst !== imports.length - 1) {
-                            context.report({
-                                // @ts-ignore
-                                message: 'import 语句不连续，中间有其他语句，无法自动排序修复，需手动修复',
-                                node: first
-                            });
-                            return;
-                        }
                         // 检查顺序并修复: 样式 xxx.sass < nodejs builtin < package < alias < subpath
                         // 如果为样式，则放前面，其他的就按照数组来
                         let imports_ = imports.toSorted((a, b) => {
@@ -724,40 +712,47 @@ export const xlint_plugin = {
                                 return a.ialias - b.ialias;
                             return imtypes.indexOf(a.type) - imtypes.indexOf(b.type);
                         });
-                        for (let i = 0; i < imports.length; i++) {
-                            let im = imports[i];
-                            let im_ = imports_[i];
-                            if (im.node === im_.node)
-                                continue;
+                        if (array_equals(imports, imports_))
+                            return;
+                        const { sourceCode: source } = context;
+                        const { body } = source.ast;
+                        const first = imports[0].node;
+                        const ifirst = body.indexOf(first);
+                        if (body.indexOf(imports.last.node, ifirst + 1) - ifirst !== imports.length - 1) {
                             context.report({
                                 // @ts-ignore
-                                message: `第 ${i} 个 import 顺序不对`,
-                                node: im.node,
-                                fix(fixer) {
-                                    let _start = Number.MAX_SAFE_INTEGER, _end = 0;
-                                    let type;
-                                    // 收集所有排序后的 import 文本
-                                    const texts = imports_.map((im, i) => {
-                                        const [start, end] = get_range_with_comments(source, im.node);
-                                        if (start < _start)
-                                            _start = start;
-                                        if (end > _end)
-                                            _end = end;
-                                        let text = source.text.slice(start, end);
-                                        // 分组之间空一行
-                                        if (im.type !== type) {
-                                            if (type)
-                                                text = '\n' + text;
-                                            type = im.type;
-                                        }
-                                        return text;
-                                    });
-                                    // 一次性替换所有 import
-                                    return fixer.replaceTextRange([_start, _end], texts.join_lines(false));
-                                }
+                                message: 'import 顺序不对，且 import 语句不连续，中间有其他语句，无法自动排序修复，需手动修复',
+                                node: first
                             });
-                            break;
+                            return;
                         }
+                        context.report({
+                            // @ts-ignore
+                            message: 'import 顺序不对',
+                            node: imports[0].node,
+                            fix(fixer) {
+                                let _start = Number.MAX_SAFE_INTEGER, _end = 0;
+                                let type;
+                                // 收集所有排序后的 import 文本
+                                const texts = imports_.map((im, i) => {
+                                    const [start, end] = get_range_with_comments(source, im.node);
+                                    if (start < _start)
+                                        _start = start;
+                                    if (end > _end)
+                                        _end = end;
+                                    let text = source.text.slice(start, end);
+                                    // 分组之间空一行
+                                    if (im.type !== type) {
+                                        if (type)
+                                            text = '\n' + text;
+                                        type = im.type;
+                                    }
+                                    return text;
+                                });
+                                // 一次性替换所有 import
+                                return fixer.replaceTextRange([_start, _end], texts.join_lines(false));
+                            }
+                        });
                     }
                 };
             }