@1adybug/prettier 0.0.5 → 0.0.6

package/dist/index.js

@@ -1,10 +1,42 @@
-import { readFileSync } from "fs";
+import { existsSync, readFileSync, statSync } from "fs";
 import { builtinModules } from "module";
+import { join, parse, resolve } from "path";
 import prettier_plugin_block_padding from "@1adybug/prettier-plugin-block-padding";
 import prettier_plugin_remove_braces from "@1adybug/prettier-plugin-remove-braces";
 import { createPlugin } from "@1adybug/prettier-plugin-sort-imports";
 import json5 from "json5";
+import { createMatchPath, loadConfig } from "tsconfig-paths";
 import * as __rspack_external_prettier_plugin_tailwindcss_a3404f7e from "prettier-plugin-tailwindcss";
+const extensions = [
+    ".ts",
+    ".tsx",
+    ".js",
+    ".jsx",
+    ".mjs",
+    ".cjs"
+];
+function getResolveAlias(filepath) {
+    try {
+        filepath = resolve(filepath);
+        let tsconfigPath;
+        while(true){
+            const { root, dir } = parse(filepath);
+            tsconfigPath = join(dir, "tsconfig.json");
+            if (existsSync(tsconfigPath)) break;
+            if (dir === root) break;
+            filepath = dir;
+        }
+        if (!tsconfigPath) return;
+        const tsconfig = loadConfig(tsconfigPath);
+        if ("failed" === tsconfig.resultType) return;
+        const matchPath = createMatchPath(tsconfig.absoluteBaseUrl, tsconfig.paths);
+        return function(importPath) {
+            return matchPath(importPath, void 0, void 0, extensions);
+        };
+    } catch (error) {
+        return;
+    }
+}
 const packageJson = json5.parse(readFileSync("package.json", "utf-8"));
 function hasDependency(dependency) {
     const dependencies = packageJson.dependencies ?? {};
@@ -17,20 +49,14 @@ function hasDependency(dependency) {
     });
     return total.some((item)=>"string" == typeof dependency ? item === dependency : dependency.test(item));
 }
-const hasReact = hasDependency("react");
 function isReact(path) {
-    return hasReact && /^@?react\b/.test(path);
+    return /^(npm:)?react(-dom|-native)?(\/|$)/.test(path);
 }
 function isBuiltin(path) {
     return path.startsWith("node:") || builtinModules.includes(path);
 }
-let pathAlias = [];
-try {
-    const tsConfig = json5.parse(readFileSync("tsconfig.json", "utf-8"));
-    pathAlias = Object.keys(tsConfig.compilerOptions?.paths ?? {}).map((item)=>item.match(/^((@|~).*\/)\*/)).filter(Boolean).map((item)=>item[1]);
-} catch  {}
 function isAbsolute(path) {
-    return pathAlias.some((item)=>path.startsWith(item));
+    return !!src_resolveAlias?.(path);
 }
 function isRelative(path) {
     return path.startsWith("./") || path.startsWith("../");
@@ -47,9 +73,6 @@ function compareGroupName(a, b) {
     const bInfo = JSON.parse(b);
     return orders.indexOf(aInfo.type) - orders.indexOf(bInfo.type) || aInfo.dir.localeCompare(bInfo.dir);
 }
-function getDir(path) {
-    return path.match(/^(((@|~)\/?|\.{1,2}\/)([^./]+))\//)?.[1] ?? "";
-}
 function getModuleType(path) {
     if (isReact(path)) return "react";
     if (isBuiltin(path)) return "builtin";
@@ -66,12 +89,25 @@ const otherPlugins = hasTailwindcss ? [
     prettier_plugin_block_padding,
     prettier_plugin_remove_braces
 ];
+let src_resolveAlias;
+function getResolvedPathDir(resolvedPath) {
+    if (existsSync(resolvedPath) && statSync(resolvedPath).isFile()) return parse(resolvedPath).dir;
+    for (const extension of extensions){
+        const importPath = resolvedPath + extension;
+        if (existsSync(importPath)) return parse(importPath).dir;
+    }
+    return resolvedPath;
+}
 const src_plugin = createPlugin({
-    getGroup ({ path }) {
+    getGroup ({ path, filepath }) {
+        if (filepath) src_resolveAlias ??= getResolveAlias(filepath);
         const type = getModuleType(path);
+        let dir = "";
+        if ("absolute" === type) dir = getResolvedPathDir(src_resolveAlias(path));
+        if ("relative" === type && !!filepath) dir = getResolvedPathDir(resolve(filepath, path));
         const info = {
             type,
-            dir: "absolute" === type || "relative" === type ? getDir(path) : ""
+            dir
         };
         return JSON.stringify(info);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1adybug/prettier",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "推荐的 Prettier 配置",
   "keywords": [
     "prettier",
@@ -36,9 +36,10 @@
   "dependencies": {
     "json5": "^2.2.3",
     "prettier-plugin-tailwindcss": "^0.7.1",
-    "@1adybug/prettier-plugin-remove-braces": "0.0.4",
-    "@1adybug/prettier-plugin-block-padding": "0.0.11",
-    "@1adybug/prettier-plugin-sort-imports": "0.0.18"
+    "tsconfig-paths": "^4.2.0",
+    "@1adybug/prettier-plugin-sort-imports": "0.0.19",
+    "@1adybug/prettier-plugin-remove-braces": "0.0.5",
+    "@1adybug/prettier-plugin-block-padding": "0.0.11"
   },
   "devDependencies": {
     "@rslib/core": "^0.18.2",