zixulu 1.69.2 → 1.70.0

package/dist/index.js

@@ -293,19 +293,16 @@ async function installDependceny(config) {
     }
     return true;
 }
-function getTsConfigJsonPath(path) {
-    return join(path ?? external_process_cwd(), "tsconfig.json");
-}
-async function readTsConfig(path) {
-    try {
-        const result = json5.parse(await readFile(getTsConfigJsonPath(path), "utf-8"));
-        return result;
-    } catch (error) {
-        consola.fail("\u8BFB\u53D6 tsconfig.json \u5931\u8D25");
-        throw error;
-    }
-}
-const originalConfig = `// @ts-check
+const ignoreConfig = `node_modules
+public
+dist
+build
+generated
+.next
+.vscode
+.generated
+`;
+const prettierConfig = `// @ts-check
 
 /**
  * @type {import("prettier").Options}
@@ -316,147 +313,125 @@ const config = {
     arrowParens: "avoid",
     printWidth: 160,
     endOfLine: "lf",
-    plugins: ["prettier-plugin-organize-imports"],
+    plugins: ["./prettier-plugin-sort-imports.mjs"],
 }
 
 export default config
 `;
-const ignoreConfig = `node_modules
-public
-dist
-build
-generated
-.next
-.vscode
-.generated
-`;
-function getPrettierConfig({ tailwind, atAlias, next, react }) {
-    const plugins = [
-        "@ianvs/prettier-plugin-sort-imports"
-    ];
-    if (tailwind) plugins.push("prettier-plugin-tailwindcss");
-    const prettierConfigText = `// @ts-check
-${atAlias ? `
-import { readFileSync } from "fs"` : ""}
-import { parse } from "path"
-import { globSync } from "glob"
+function getPluginConfig({ isTailwind, isReact }) {
+    const config = `// @ts-check
 
+import { readFileSync } from "fs"
+import { builtinModules } from "module"
+
+import { createPlugin } from "@1adybug/prettier-plugin-sort-imports"
+import JSON5 from "json5"
+import blockPadding from "prettier-plugin-block-padding"${isTailwind ? `
+import * as tailwindcss from "prettier-plugin-tailwindcss"` : ""}
+${isReact ? `
 /**
- * \u{6570}\u{7EC4}\u{53BB}\u{91CD}
- * @template T - \u{6570}\u{7EC4}\u{7684}\u{5143}\u{7D20}\u{7C7B}\u{578B}
- * @param {T[]} array - \u{8F93}\u{5165}\u{7684}\u{6570}\u{7EC4}
- * @return {T[]} \u{65B0}\u{6570}\u{7EC4}
+ * @param {string} path
  */
-function unique(array) {
-    return Array.from(new Set(array))
+function isReact(path) {
+    return /^@?react\\b/.test(path)
+}
+` : ""}
+/**
+ * @param {string} path
+ */
+function isBuiltin(path) {
+    return path.startsWith("node:") || builtinModules.includes(path)
 }
 
-const jsExts = [".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs", ".cts", ".mts", ".vue"]
-
-const assetExts = unique(
-    globSync("**/*", { ignore: ["node_modules/**"${next ? ', ".next/**"' : ""}], withFileTypes: true, cwd: import.meta.dirname })
-        .filter(path => path.isFile() && !jsExts.some(ext => path.name.toLowerCase().endsWith(ext)))
-        .map(path => parse(path.name).ext.slice(1))
-        .filter(ext => ext !== ""),
-)
+/** @type {string[]} */
+let pathAlias = []
 
-const assetExtsRegStr = \`\\\\.(\${assetExts.join("|")}|\${assetExts.join("|").toUpperCase()})\`
+try {
+    const tsConfig = JSON5.parse(readFileSync("tsconfig.json", "utf-8"))
+    pathAlias = Object.keys(tsConfig.compilerOptions?.paths ?? {})
+        .map(item => item.match(/^(@.*\\/)\\*/))
+        .filter(Boolean)
+        .map(item => /** @type {string} */ (item?.[1]))
+} catch {}
 
-const assetQueryRegStr = "(\\\\?[a-zA-Z0-9]+)?"
-${atAlias ? `
-const namespaces = unique(
-    unique(
-        globSync("**/package.json", { withFileTypes: true, cwd: import.meta.dirname })
-            .filter(path => path.isFile())
-            .map(path => path.fullpath()),
-    )
-        .map(path => JSON.parse(readFileSync(path, "utf8")))
-        .map(json =>
-            Object.keys({
-                ...json.dependencies,
-                ...json.devDependencies,
-                ...json.peerDependencies,
-                ...json.optionalDependencies,
-            }),
-        )
-        .flat()
-        .filter(dep => dep.startsWith("@"))
-        .map(dep => dep.split("/")[0].slice(1)),
-)
-` : ""}
-const folders = unique(
-    globSync("**/*", { withFileTypes: true, cwd: import.meta.dirname, ignore: ["node_modules/**"${next ? ', ".next/**"' : ""}] })
-        .filter(path => path.isDirectory())
-        .map(path => path.name),
-).sort()
+/**
+ * @param {string} path
+ */
+function isAbsolute(path) {
+    return pathAlias.some(item => path.startsWith(item))
+}
 
 /**
- * @type {import("prettier").Options}
+ * @param {string} path
  */
-const config = {
-    semi: false,
-    tabWidth: 4,
-    arrowParens: "avoid",
-    printWidth: 160,
-    endOfLine: "lf",
-    plugins: [${plugins.map((plugin)=>`"${plugin}"`).join(", ")}],
-    importOrder: [${react ? `
-        "^react(/.+)?$",
-        "^react-dom(/.+)?$",
-        "^react-native(/.+)?$",` : ""}
-        "<BUILTIN_MODULES>",
-        ${atAlias ? '`^@(${namespaces.join("|")})/`,' : '"^@[^/]",'}
-        "<THIRD_PARTY_MODULES>",
-        ...folders.map(folder => ["", \`^@/?\${folder}(.+?(?<!\${assetExtsRegStr}\${assetQueryRegStr}))?$\`]).flat(),
-        "",
-        \`^@/.+?(?<!\${assetExtsRegStr}\${assetQueryRegStr})$\`,
-        \`^\\\\.{1,2}/.+?(?<!\${assetExtsRegStr}\${assetQueryRegStr})$\`,
-        "",
-        \`^@/.+?\${assetExtsRegStr}\${assetQueryRegStr}$\`,
-        \`^\\\\.{1,2}/.+?\${assetExtsRegStr}\${assetQueryRegStr}$\`,
-    ],
-    importOrderParserPlugins: ["typescript", "jsx", "decorators-legacy"],
-    importOrderTypeScriptVersion: "5.0.0",
-    importOrderCaseSensitive: true,
+function isRelative(path) {
+    return path.startsWith("./") || path.startsWith("../")
 }
 
-export default config
+/**
+ * @param {string} a
+ * @param {string} b
+ */
+function compareGroupName(a, b) {
+    const orders = [${isReact ? '"react", ' : ""}"builtin", "third-party", "absolute", "relative"]
+
+    a = a.replace(/-side-effect$/, "")
+    b = b.replace(/-side-effect$/, "")
+    return orders.indexOf(a) - orders.indexOf(b) || a.localeCompare(b)
+}
+
+export default createPlugin({
+    getGroup({ path, isSideEffect }) {
+        if (isSideEffect) {${isReact ? `
+            if (isReact(path)) return "react-side-effect"` : ""}
+            if (isBuiltin(path)) return "builtin-side-effect"
+            if (isAbsolute(path)) return "absolute-side-effect"
+            if (isRelative(path)) return "relative-side-effect"
+            return "third-party-side-effect"
+        }
+${isReact ? `
+        if (isReact(path)) return "react"` : ""}
+        if (isBuiltin(path)) return "builtin"
+        if (isAbsolute(path)) return "absolute"
+        if (isRelative(path)) return "relative"
+        return "third-party"
+    },
+    sortGroup(a, b) {
+        return Number(a.isSideEffect) - Number(b.isSideEffect) || compareGroupName(a.name, b.name)
+    },
+    separator: "",
+    sortSideEffect: true,
+    removeUnusedImports: true,
+    otherPlugins: [blockPadding${isTailwind ? ", tailwindcss" : ""}],
+})
 `;
-    return prettierConfigText;
+    return config;
 }
 async function addPrettier() {
     consola.start("\u5F00\u59CB\u6DFB\u52A0 prettier \u914D\u7F6E");
     const packageJson = await readPackageJson();
-    const tailwind = Object.keys(packageJson.dependencies ?? {}).includes("tailwindcss") || Object.keys(packageJson.devDependencies ?? {}).includes("tailwindcss");
-    let atAlias = false;
-    try {
-        const config = await readTsConfig();
-        atAlias = Object.keys(config.compilerOptions?.paths ?? {}).some((path)=>/^@[a-zA-Z]/.test(path));
-    } catch  {}
-    const next = await hasDependency("next");
-    const react = await hasDependency("react");
-    await writeFile("prettier.config.mjs", originalConfig, "utf-8");
-    await writeFile(".prettierrc.mjs", getPrettierConfig({
-        tailwind,
-        atAlias,
-        next,
-        react
+    const isTailwind = Object.keys(packageJson.dependencies ?? {}).includes("tailwindcss") || Object.keys(packageJson.devDependencies ?? {}).includes("tailwindcss");
+    const isReact = await hasDependency("react");
+    await writeFile("prettier-plugin-sort-imports.mjs", getPluginConfig({
+        isTailwind,
+        isReact
     }), "utf-8");
+    await writeFile("prettier.config.mjs", prettierConfig, "utf-8");
     await writeFile(".prettierignore", ignoreConfig, "utf-8");
     const config2 = {
         package: [
             "prettier",
-            "@ianvs/prettier-plugin-sort-imports",
-            "glob",
-            "prettier-plugin-organize-imports"
+            "@1adybug/prettier-plugin-sort-imports",
+            "prettier-plugin-block-padding",
+            "json5"
         ],
         type: "devDependencies"
     };
-    if (tailwind) config2.package.push("prettier-plugin-tailwindcss");
+    if (isTailwind) config2.package.push("prettier-plugin-tailwindcss");
     await addDependency(config2);
     const packageJson2 = await readPackageJson();
     packageJson2.scripts ??= {};
-    packageJson2.scripts.format = "prettier --config prettier.config.mjs --write . && prettier --config .prettierrc.mjs --write .";
+    packageJson2.scripts.format = "prettier --write .";
     packageJson2.scripts.fg = 'npm run format && git add . && git commit -m "\u2728feature: format"';
     await writePackageJson({
         data: packageJson2
@@ -759,6 +734,18 @@ function getTsFile(path) {
     };
     throw new Error(`\u{627E}\u{4E0D}\u{5230} ${path} \u{5BF9}\u{5E94}\u{7684} ts \u{6216} tsx \u{6587}\u{4EF6}`);
 }
+function getTsConfigJsonPath(path) {
+    return join(path ?? external_process_cwd(), "tsconfig.json");
+}
+async function readTsConfig(path) {
+    try {
+        const result = json5.parse(await readFile(getTsConfigJsonPath(path), "utf-8"));
+        return result;
+    } catch (error) {
+        consola.fail("\u8BFB\u53D6 tsconfig.json \u5931\u8D25");
+        throw error;
+    }
+}
 async function writeTsConfig(config) {
     return await writeFile(getTsConfigJsonPath(), JSON.stringify(config, void 0, 4), "utf-8");
 }
@@ -2673,10 +2660,17 @@ async function upgradeDependency(config) {
     await installDependceny();
     return getCommitMessage("feature", `upgrade dependencies: ${upgradeLogs.join(", ")}`);
 }
-async function addGitCommit(message) {
+async function addGitCommit(messageOrParams) {
+    const { message, cwd } = "string" == typeof messageOrParams ? {
+        message: messageOrParams
+    } : messageOrParams;
     consola.start("\u63D0\u4EA4\u4EE3\u7801");
-    await execAsync("git add .");
-    await execAsync(`git commit -m "${message}"`);
+    await execAsync("git add .", {
+        cwd
+    });
+    await execAsync(`git commit -m "${message}"`, {
+        cwd
+    });
 }
 function actionWithBackup(action, message) {
     return async (...args)=>{
@@ -4393,11 +4387,13 @@ async function syncEditorSetting() {
             message: "\u9009\u62E9\u540C\u6B65\u76EE\u6807",
             choices: [
                 "Code",
-                "Cursor"
+                "Cursor",
+                "Online"
             ].filter((v)=>v !== source),
             default: (setting.syncEditor?.targets ?? [
                 "Code",
-                "Cursor"
+                "Cursor",
+                "Online"
             ]).filter((v)=>v !== source)
         },
         {
@@ -4418,10 +4414,19 @@ async function syncEditorSetting() {
     ]);
     setting.syncEditor.targets = targets;
     setting.syncEditor.types = types;
-    await writeZixuluSetting(setting);
+    if (targets.includes("Online")) {
+        const { onlinePath } = await inquirer_0.prompt({
+            type: "input",
+            name: "onlinePath",
+            message: "\u8BF7\u8F93\u5165 blog \u6587\u4EF6\u5939\u7684\u8DEF\u5F84",
+            default: setting.syncEditor?.onlinePath ?? "C:\\Users\\lenovo\\Desktop\\workspace\\blog"
+        });
+        setting.syncEditor.onlinePath = onlinePath;
+    }
+    const onlinePath = setting.syncEditor.onlinePath;
     const configs = types.filter((item)=>"extensions" !== item).map((fileType)=>targets.map((target)=>({
                 source: fileSourceMap[fileType][source],
-                target: fileSourceMap[fileType][target]
+                target: "Online" === target ? join(onlinePath, "static", "settings" === fileType ? "settings.json" : "global.code-snippets") : fileSourceMap[fileType][target]
             }))).flat();
     for (const config of configs)await syncEditorFile(config);
     if (types.includes("extensions")) {
@@ -4467,7 +4472,15 @@ async function syncEditorSetting() {
                 console.error(`${ext} \u{5378}\u{8F7D}\u{5931}\u{8D25}`);
             }
         }
+        if (targets.includes("Online")) await writeFile(join(onlinePath, "static", "extensions.json"), JSON.stringify(Array.from(sourceExtensions), null, 4));
     }
+    if (targets.includes("Online")) {
+        if (await hasChangeNoCommit(onlinePath)) await addGitCommit({
+            message: getCommitMessage("feature", "sync editor setting"),
+            cwd: onlinePath
+        });
+    }
+    await writeZixuluSetting(setting);
 }
 async function tailwindPatch() {
     const version = await getPackageVersionInDependcy("tailwindcss");