xshell 1.3.42 → 1.3.44

package/package.json

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

package/xlint.js

@@ -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_}`,
@@ -719,6 +720,8 @@ export const xlint_plugin = {
                         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);
                         });
                         for (let i = 0; i < imports.length; i++) {
@@ -750,7 +753,7 @@ export const xlint_plugin = {
                                         return text;
                                     });
                                     // 一次性替换所有 import
-                                    return fixer.replaceTextRange([_start, _end], texts.join_lines());
+                                    return fixer.replaceTextRange([_start, _end], texts.join_lines(false));
                                 }
                             });
                             break;
@@ -1011,7 +1014,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 +1064,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 +1075,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)