xshell 1.3.44 → 1.3.46

package/builder.d.ts

@@ -60,6 +60,9 @@ type Assets = {
     productions?: (string | AssetOption)[];
     devs?: (string | AssetOption)[];
 };
+/** 从 tsconfig.json 中解析 paths 配置为 resolve alias
+    文件不存在或无 paths alias 配置时返回 null */
+export declare function get_resolve_alias(fpd_root: string): Promise<Record<string, string> | null>;
 export interface BundlerOptions {
     dependencies?: DependencyId[];
     source_map?: boolean;
@@ -153,7 +156,7 @@ export declare class Bundler {
             - expose?: `false` 入口模块所有导出的属性赋值到全局对象 globalThis 上
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
-            - resolve_alias?: 配置 resolve alias
+            - resolve_alias?: 配置 resolve alias，会自动从项目 tsconfig.json 的 paths 中读取，用户配置作为覆盖
             - resolve_fallback?: 配置 resolve fallback
             - assets_stats?: `true` 打印输出的文件信息
             - analyzer?: `false` 启用 WebpackBundleAnalyzer 插件分析构建产物大小

package/builder.js

@@ -1,8 +1,8 @@
 import { fileURLToPath } from 'node:url';
 import { not_empty } from "./prototype.js";
 import { noprint } from "./process.js";
-import { Lock, filter_values } from "./utils.js";
-import { fcopy, fmkdir, fwrite, print_info, ramdisk } from "./file.js";
+import { Lock, check, filter_values } from "./utils.js";
+import { fcopy, fmkdir, fwrite, print_info, ramdisk, fread_lines } from "./file.js";
 import { path } from "./path.js";
 const get_target = (production) => production ? 'production' : 'development';
 function get_react_js(production, src, map) {
@@ -112,6 +112,51 @@ function get_vendor_asset_out(asset) {
         ? `vendors/${asset}`
         : asset.out || asset.src;
 }
+/** get_resolve_alias 的缓存，null 表示文件不存在或无 paths 配置 */
+const resolve_alias_cache = new Map();
+/** 从 tsconfig.json 中解析 paths 配置为 resolve alias
+    文件不存在或无 paths alias 配置时返回 null */
+export async function get_resolve_alias(fpd_root) {
+    const cached = resolve_alias_cache.get(fpd_root);
+    if (cached !== undefined)
+        return cached;
+    const fp = `${fpd_root}tsconfig.json`;
+    let lines;
+    try {
+        lines = await fread_lines(fp);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            resolve_alias_cache.set(fpd_root, null);
+            return null;
+        }
+        throw error;
+    }
+    // 移除 // 行注释
+    const { compilerOptions } = JSON.parse(lines
+        .filter(line => !line.trimStart().startsWith('//'))
+        .join_lines());
+    const paths = compilerOptions?.paths;
+    if (!paths) {
+        resolve_alias_cache.set(fpd_root, null);
+        return null;
+    }
+    const result = Object.fromEntries(Object.entries(paths).map(([key, values]) => {
+        // 检查 value 数组只有一项
+        check(values.length === 1, `paths 的 value 数组必须只有一项: ${key}`);
+        const value = values[0];
+        // key 和 value 都以 /* 结尾时，去掉 *
+        if (key.endsWith('/*') && value.endsWith('/*'))
+            return [
+                key.slice(0, -1),
+                fpd_root + value.slice(0, -1).strip_if_start('./')
+            ];
+        else // 是某个具体文件
+            return [key, fpd_root + value.strip_if_start('./')];
+    }));
+    resolve_alias_cache.set(fpd_root, result);
+    return result;
+}
 export class Bundler {
     name;
     target;
@@ -177,7 +222,7 @@ export class Bundler {
             - expose?: `false` 入口模块所有导出的属性赋值到全局对象 globalThis 上
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
-            - resolve_alias?: 配置 resolve alias
+            - resolve_alias?: 配置 resolve alias，会自动从项目 tsconfig.json 的 paths 中读取，用户配置作为覆盖
             - resolve_fallback?: 配置 resolve fallback
             - assets_stats?: `true` 打印输出的文件信息
             - analyzer?: `false` 启用 WebpackBundleAnalyzer 插件分析构建产物大小
@@ -201,6 +246,7 @@ export class Bundler {
             throw new Error('expose 和 commonjs2 不能同时启用');
     }
     async build(print = true) {
+        const { fpd_root } = this;
         if (!this.lcompiler)
             await (this.lcompiler = new Lock()).request(async () => {
                 const { default: Webpack } = await import('webpack');
@@ -232,7 +278,7 @@ export class Bundler {
                     name: this.name,
                     mode: get_target(this.production),
                     devtool: this.source_map ? 'source-map' : false,
-                    context: this.fpd_root,
+                    context: fpd_root,
                     entry: this.entry,
                     experiments: {
                         outputModule: output_module,
@@ -286,7 +332,10 @@ export class Bundler {
                         extensionAlias: {
                             '.js': ['.js', '.ts', '.tsx']
                         },
-                        ...this.resolve_alias ? { alias: this.resolve_alias } : {},
+                        alias: filter_values({
+                            ...await get_resolve_alias(fpd_root),
+                            ...this.resolve_alias
+                        }),
                         // modules: [
                         //     '',
                         // ],
@@ -319,7 +368,7 @@ export class Bundler {
                                 loader: get_loader('ts-loader'),
                                 // https://github.com/TypeStrong/ts-loader
                                 options: {
-                                    configFile: `${this.fpd_root}tsconfig.json`,
+                                    configFile: `${fpd_root}tsconfig.json`,
                                     onlyCompileBundledFiles: true,
                                     transpileOnly: !this.dts,
                                     compilerOptions: {
@@ -438,7 +487,7 @@ export class Bundler {
                     },
                     stats: {
                         colors: true,
-                        context: this.fpd_root,
+                        context: fpd_root,
                         entrypoints: false,
                         errors: true,
                         errorDetails: true,

package/package.json

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

package/tsconfig.json

@@ -5,7 +5,7 @@
     
     "compilerOptions": {
         // --- module
-        "module": "ESNext", // none, CommonJS, amd, system, umd, es6, es2015, ESNext
+        "module": "ESNext",
         "moduleResolution": "Bundler",
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": false,
@@ -57,7 +57,7 @@
         "noImplicitOverride": true,
         "noUnusedLocals": false,
         "noUnusedParameters": false,
-        "skipLibCheck": true,
+        "skipLibCheck": true
     }
 }
 

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));
+                            }
+                        });
                     }
                 };
             }