xshell 1.3.42 → 1.3.45

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.42",
+    "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/
@@ -679,17 +679,18 @@ export const xlint_plugin = {
                     // 格式化 source, 收集 decl
                     ImportDeclaration(node) {
                         const source = node.source.value;
-                        const [type, source_] = format_source(pkgs, aliases, cwd, context.filename.fp, source);
+                        const [type, source_, ialias] = format_source(pkgs, aliases, cwd, context.filename.fp, source);
                         if (!source_ || source_ === source) {
                             imports.push({
                                 node,
                                 type,
-                                style: style_fexts.has(source.fext)
+                                style: style_fexts.has(source.fext),
+                                ialias
                             });
                             return;
                         }
                         need_fix_source = true;
-                        console.log(`自动修复 ${source} -> ${source_}`);
+                        // console.log(`自动修复 ${source} -> ${source_}`)
                         context.report({
                             // @ts-ignore
                             message: `import source ${source} 应该改为 ${source_}`,
@@ -702,6 +703,17 @@ export const xlint_plugin = {
                     'Program:exit'() {
                         if (need_fix_source || imports.length <= 1)
                             return;
+                        // 检查顺序并修复: 样式 xxx.sass < nodejs builtin < package < alias < subpath
+                        // 如果为样式，则放前面，其他的就按照数组来
+                        let imports_ = imports.toSorted((a, b) => {
+                            if (a.style !== b.style)
+                                return a.style ? -1 : 1;
+                            if (a.type === 'alias' && b.type === 'alias')
+                                return a.ialias - b.ialias;
+                            return imtypes.indexOf(a.type) - imtypes.indexOf(b.type);
+                        });
+                        if (array_equals(imports, imports_))
+                            return;
                         const { sourceCode: source } = context;
                         const { body } = source.ast;
                         const first = imports[0].node;
@@ -709,52 +721,38 @@ export const xlint_plugin = {
                         if (body.indexOf(imports.last.node, ifirst + 1) - ifirst !== imports.length - 1) {
                             context.report({
                                 // @ts-ignore
-                                message: 'import 语句不连续，中间有其他语句，无法自动排序修复，需手动修复',
+                                message: 'import 顺序不对，且 import 语句不连续，中间有其他语句，无法自动排序修复，需手动修复',
                                 node: first
                             });
                             return;
                         }
-                        // 检查顺序并修复: 样式 xxx.sass < nodejs builtin < package < alias < subpath
-                        // 如果为样式，则放前面，其他的就按照数组来
-                        let imports_ = imports.toSorted((a, b) => {
-                            if (a.style !== b.style)
-                                return a.style ? -1 : 1;
-                            return imtypes.indexOf(a.type) - imtypes.indexOf(b.type);
+                        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));
+                            }
                         });
-                        for (let i = 0; i < imports.length; i++) {
-                            let im = imports[i];
-                            let im_ = imports_[i];
-                            if (im.node === im_.node)
-                                continue;
-                            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());
-                                }
-                            });
-                            break;
-                        }
                     }
                 };
             }
@@ -1011,7 +1009,11 @@ function get_packages(cwd) {
     if (cache_pkgs_cwd === cwd)
         return cache_pkgs;
     const { dependencies = {}, devDependencies = {} } = JSON.parse(fs.readFileSync(`${cwd}package.json`, 'utf-8'));
-    const pkgs = [...Object.keys(dependencies), ...Object.keys(devDependencies)];
+    const pkgs = [
+        ...Object.keys(dependencies),
+        ...Object.keys(devDependencies)
+            .map(pkg => pkg.startsWith('@types/') ? pkg.strip_start('@types/') : pkg),
+    ].unique();
     cache_pkgs_cwd = cwd;
     return cache_pkgs = pkgs;
 }
@@ -1057,9 +1059,10 @@ function format_source(pkgs, aliases, cwd, fp, source) {
         source = `${source}.${resolve_suffix(source)}`;
     }
     const relative = source.strip_start(cwd, true);
-    const alias_ = aliases.find(({ fp }) => relative.startsWith(fp));
-    check(alias_, '一定能找到匹配的 alias');
-    return ['alias', alias_.alias + relative.strip_start(alias_.fp)];
+    const ialias = aliases.findIndex(({ fp }) => relative.startsWith(fp));
+    check(ialias !== -1, '一定能找到匹配的 alias');
+    const alias_ = aliases[ialias];
+    return ['alias', alias_.alias + relative.strip_start(alias_.fp), ialias];
 }
 let cache_exists = new Map();
 function resolve_suffix(fp_base) {
@@ -1067,7 +1070,10 @@ function resolve_suffix(fp_base) {
         const fp = `${fp_base}.${suffix}`;
         const c = cache_exists.get(fp);
         if (c !== undefined)
-            return suffix;
+            if (c)
+                return suffix;
+            else
+                continue;
         const e = fs.existsSync(fp);
         cache_exists.set(fp, e);
         if (e)