meocli 0.0.3 → 0.0.5

package/README.md

@@ -9,6 +9,7 @@ A new CLI generated with oclif
 <!-- toc -->
 * [meocli](#meocli)
 * [Dev](#dev)
+* [Publish](#publish)
 * [Usage](#usage)
 * [Commands](#commands)
 <!-- tocstop -->
@@ -16,9 +17,19 @@ A new CLI generated with oclif
 # Dev
 
 ```sh-session
+<!-- demo -->
 $ pnpm run dev hello world
 $ pnpm run prod hello world
 $ pnpm run dev hello foo -f bar
+<!-- prettier -->
+$ pnpm run dev pr ./tmp/test.svg
+$ pnpm run dev pr ./tmp/test.json --config=auto --ignore=auto
+$ pnpm run dev pr ./tmp/test.svg --config=built_in --ignore=auto
+```
+
+# Publish
+
+```sh-session
 $ pnpm login
 $ pnpm build
 $ pnpm publish
@@ -32,7 +43,7 @@ $ npm install -g meocli
 $ me COMMAND
 running command...
 $ me (--version)
-meocli/0.0.3 win32-x64 node-v24.12.0
+meocli/0.0.5 win32-x64 node-v24.12.0
 $ me --help [COMMAND]
 USAGE
   $ me COMMAND
@@ -80,7 +91,7 @@ EXAMPLES
   hello friend from oclif! (./src/commands/hello/index.ts)
 ```
 
-_See code: [src/commands/hello/index.ts](https://github.com/meme2046/meocli/blob/v0.0.3/src/commands/hello/index.ts)_
+_See code: [src/commands/hello/index.ts](https://github.com/meme2046/meocli/blob/v0.0.5/src/commands/hello/index.ts)_
 
 ## `me hello world`
 
@@ -98,7 +109,7 @@ EXAMPLES
   hello world! (./src/commands/hello/world.ts)
 ```
 
-_See code: [src/commands/hello/world.ts](https://github.com/meme2046/meocli/blob/v0.0.3/src/commands/hello/world.ts)_
+_See code: [src/commands/hello/world.ts](https://github.com/meme2046/meocli/blob/v0.0.5/src/commands/hello/world.ts)_
 
 ## `me help [COMMAND]`
 
@@ -416,16 +427,16 @@ Use Prettier to format file
 
 ```
 USAGE
-  $ me pr FILEPATH [-c <value>] [--ignore-path <value>] [--no-config] [--no-ignore]
+  $ me pr FILEPATH [-c <value>] [--ignore <value>]
 
 ARGUMENTS
   FILEPATH  file path that need to be formatted by Prettier
 
 FLAGS
-  -c, --config=<value>       Prettier config file path
-      --ignore-path=<value>  Prettier ignore file path
-      --no-config            Disable config file detection
-      --no-ignore            Disable ignore file detection
+  -c, --config=<value>  [default: built_in] built_in:使用内置规则(默认值), 传入路径则是使用自定义配置,
+                        auto:自动检测config file
+      --ignore=<value>  [default: built_in] built_in:使用内置规则(默认值), 传入路径则是使用自定义规则,
+                        auto:自动检测ignore file
 
 DESCRIPTION
   Use Prettier to format file
@@ -436,5 +447,5 @@ EXAMPLES
   $ me pr ./src/file.ts --config ./.prettierrc.yaml
 ```
 
-_See code: [src/commands/pr/index.ts](https://github.com/meme2046/meocli/blob/v0.0.3/src/commands/pr/index.ts)_
+_See code: [src/commands/pr/index.ts](https://github.com/meme2046/meocli/blob/v0.0.5/src/commands/pr/index.ts)_
 <!-- commandsstop -->

package/dist/commands/pr/index.d.ts

@@ -6,13 +6,13 @@ export default class Prettier extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        'ignore-path': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        'no-config': import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        'no-ignore': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        ignore: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
     private detectPackageManager;
     private findProjectPrettierConfig;
     private findProjectPrettierIgnore;
+    private replacePluginArgs;
+    private resolvePluginPaths;
 }

package/dist/commands/pr/index.js

@@ -5,7 +5,7 @@ import { existsSync } from 'node:fs';
 import { platform } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { DEFAULT_ARGS } from '../../consts/prettierrc.js';
+import { DEFAULT_ARGS, DEFAULT_PLUGINS } from '../../consts/prettierrc.js';
 export default class Prettier extends Command {
     static args = {
         filePath: Args.string({
@@ -21,27 +21,28 @@ export default class Prettier extends Command {
     static flags = {
         config: Flags.string({
             char: 'c',
-            // default: './src/files/.prettierrc.yaml',
-            description: 'Prettier config file path',
+            default: 'built_in',
+            description: 'built_in:使用内置规则(默认值), 传入路径则是使用自定义配置, auto:自动检测config file',
             required: false,
         }),
-        'ignore-path': Flags.string({
-            description: 'Prettier ignore file path',
+        ignore: Flags.string({
+            default: 'built_in',
+            description: 'built_in:使用内置规则(默认值), 传入路径则是使用自定义规则, auto:自动检测ignore file',
             required: false,
         }),
-        'no-config': Flags.boolean({
-            default: false,
-            description: 'Disable config file detection',
-        }),
-        'no-ignore': Flags.boolean({
-            default: false,
-            description: 'Disable ignore file detection',
-        }),
+        // 'no-config': Flags.boolean({
+        //   default: false,
+        //   description: 'Disable config file detection',
+        // }),
+        // 'no-ignore': Flags.boolean({
+        //   default: false,
+        //   description: 'Disable ignore file detection',
+        // }),
     };
     async run() {
         const { args, flags } = await this.parse(Prettier);
         const { filePath } = args;
-        const { config, 'ignore-path': ignorePath, 'no-config': noConfig, 'no-ignore': noIgnore } = flags;
+        const { config, ignore } = flags;
         // 检查文件是否存在
         if (!existsSync(filePath)) {
             this.error(`file『${filePath}』not found`);
@@ -53,23 +54,21 @@ export default class Prettier extends Command {
         const __filename = fileURLToPath(import.meta.url);
         const __dirname = dirname(__filename);
         const projectRoot = join(__dirname, '../../../'); // 回到项目根目录
-        // let prettierBin = join(projectRoot, 'node_modules', 'prettier', 'node_modules', '.bin', 'prettier')
         let prettierBin = join(projectRoot, 'node_modules', '.bin', 'prettier');
         if (platform() === 'win32') {
             prettierBin += '.cmd';
         }
-        // this.log(prettierBin)
         if (!existsSync(prettierBin)) {
             this.error(`prettier not found`);
             return;
         }
         // 根据包管理器类型构建参数
         let prettierArgs = ['--write', filePath];
-        if (noIgnore) {
-            prettierArgs.unshift('--ignore-path', '');
+        if (ignore === 'built_in') {
+            prettierArgs.unshift('--ignore-path', join(projectRoot, '.prettierignore'));
         }
-        else if (ignorePath && existsSync(ignorePath)) {
-            prettierArgs.unshift('--ignore-path', ignorePath);
+        else if (existsSync(ignore)) {
+            prettierArgs.unshift('--ignore-path', ignore);
         }
         else {
             const projectIgnore = this.findProjectPrettierIgnore();
@@ -77,10 +76,14 @@ export default class Prettier extends Command {
                 prettierArgs.unshift('--ignore-path', projectIgnore);
             }
         }
-        if (noConfig) {
-            prettierArgs = [...DEFAULT_ARGS, ...prettierArgs];
+        const resolvedPluginArgs = this.resolvePluginPaths(DEFAULT_PLUGINS, projectRoot);
+        const argsWithResolvedPlugins = this.replacePluginArgs(DEFAULT_ARGS, resolvedPluginArgs);
+        const completeArgs = [...argsWithResolvedPlugins, ...prettierArgs];
+        if (config === 'built_in') {
+            // 为插件参数使用绝对路径，避免全局安装时找不到插件
+            prettierArgs = completeArgs;
         }
-        else if (config && existsSync(config)) {
+        else if (existsSync(config)) {
             prettierArgs.unshift('--config', config);
         }
         else {
@@ -90,10 +93,12 @@ export default class Prettier extends Command {
                 prettierArgs.unshift('--config', projectConfig);
             }
             else {
-                prettierArgs = [...DEFAULT_ARGS, ...prettierArgs];
+                // 为插件参数使用绝对路径，避免全局安装时找不到插件
+                prettierArgs = completeArgs;
             }
         }
-        // this.log(JSON.stringify(prettierArgs))
+        this.log(prettierBin);
+        this.log(JSON.stringify(prettierArgs));
         // this.log(`Formatting file: ${filePath}`)
         const { stderr, stdout } = await execa(prettierBin, prettierArgs, {
             env: { ...process.env },
@@ -136,4 +141,33 @@ export default class Prettier extends Command {
         }
         return null;
     }
+    // 替换默认参数中的插件路径
+    replacePluginArgs(defaultArgs, resolvedPluginPaths) {
+        const newArgs = [];
+        for (let i = 0; i < defaultArgs.length; i++) {
+            if (defaultArgs[i] === '--plugin' && i + 1 < defaultArgs.length) {
+                // 跳过这个 '--plugin' 标记和它的值，稍后替换
+                i++; // 跳过下一个值（插件名称）
+                continue;
+            }
+            newArgs.push(defaultArgs[i]);
+        }
+        // 添加解析后的插件路径
+        for (const pluginPath of resolvedPluginPaths) {
+            newArgs.push('--plugin', pluginPath);
+        }
+        return newArgs;
+    }
+    // 将插件名称转换为绝对路径
+    resolvePluginPaths(plugins, projectRoot) {
+        return plugins.map((plugin) => {
+            // 查找插件的实际路径
+            const pluginPath = join(projectRoot, 'node_modules', plugin.name, plugin.main);
+            if (existsSync(pluginPath)) {
+                return pluginPath;
+            }
+            // 如果插件路径不存在，则返回原始名称（让 prettier 自己处理）
+            return plugin.name;
+        });
+    }
 }

package/dist/consts/prettierrc.d.ts

@@ -1,3 +1,6 @@
 export declare const DEFAULT_ARGS: string[];
-export declare const DEFAULT_PLUGINS: string[];
+export declare const DEFAULT_PLUGINS: {
+    main: string;
+    name: string;
+}[];
 export declare const DEFAULT_IGNORE_PATTERNS: string[];

package/dist/consts/prettierrc.js

@@ -67,10 +67,10 @@ export const DEFAULT_ARGS = [
 ];
 // 默认的 Prettier 插件列表
 export const DEFAULT_PLUGINS = [
-    '@prettier/plugin-xml',
-    'prettier-plugin-toml',
-    'prettier-plugin-nginx',
-    'prettier-plugin-sh',
+    { main: 'src/plugin.js', name: '@prettier/plugin-xml' },
+    { main: 'lib/index.cjs', name: 'prettier-plugin-toml' },
+    { main: 'lib/index.cjs', name: 'prettier-plugin-sh' },
+    { main: 'dist/index', name: 'prettier-plugin-nginx' },
 ];
 // 默认的忽略模式
 export const DEFAULT_IGNORE_PATTERNS = [

package/oclif.manifest.json

@@ -81,32 +81,22 @@
       "flags": {
         "config": {
           "char": "c",
-          "description": "Prettier config file path",
+          "description": "built_in:使用内置规则(默认值), 传入路径则是使用自定义配置, auto:自动检测config file",
           "name": "config",
           "required": false,
+          "default": "built_in",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "ignore-path": {
-          "description": "Prettier ignore file path",
-          "name": "ignore-path",
+        "ignore": {
+          "description": "built_in:使用内置规则(默认值), 传入路径则是使用自定义规则, auto:自动检测ignore file",
+          "name": "ignore",
           "required": false,
+          "default": "built_in",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "no-config": {
-          "description": "Disable config file detection",
-          "name": "no-config",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-ignore": {
-          "description": "Disable ignore file detection",
-          "name": "no-ignore",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -126,5 +116,5 @@
       ]
     }
   },
-  "version": "0.0.3"
+  "version": "0.0.5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meocli",
   "description": "A new CLI generated with oclif",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "author": "meme2046",
   "bin": {
     "me": "./bin/run.js"
@@ -68,6 +68,8 @@
   "repository": "meme2046/meocli",
   "types": "dist/index.d.ts",
   "scripts": {
+    "lk": "pnpm link --global",
+    "ulk": "pnpm unlink --global meocli",
     "dev": "node --no-deprecation --no-warnings --loader ts-node/esm --disable-warning=ExperimentalWarning bin/dev.js",
     "prod": "node bin/run.js",
     "prettier": "prettier",

package/dist/consts/prettierrc.tmp.d.ts

@@ -1,3 +0,0 @@
-export declare const DEFAULT_ARGS: string[];
-export declare const DEFAULT_PLUGINS: string[];
-export declare const DEFAULT_IGNORE_PATTERNS: string[];

package/dist/consts/prettierrc.tmp.js

@@ -1,54 +0,0 @@
-export const DEFAULT_ARGS = [
-    '--arrow-parens=always',
-    '--bracket-same-line=false',
-    '--object-wrap=preserve',
-    '--experimental-operator-position=end',
-    '--no-experimental-ternaries',
-    '--single-quote=false',
-    '--jsx-single-quote=false',
-    '--quote-props=as-needed',
-    '--trailing-comma=all',
-    '--single-attribute-per-line=false',
-    '--html-whitespace-sensitivity=css',
-    '--vue-indent-script-and-style=false',
-    '--prose-wrap=preserve',
-    '--end-of-line=lf',
-    '--insert-pragma=false',
-    '--print-width=80',
-    '--require-pragma=false',
-    '--tab-width=2',
-    '--use-tabs=false',
-    '--embedded-language-formatting=auto',
-    // plugins
-    '--plugin=@prettier/plugin-xml',
-    '--plugin=prettier-plugin-toml',
-    '--plugin=prettier-plugin-sh',
-    '--plugin=prettier-plugin-nginx',
-    // xml
-    '--xml-whitespace-sensitivity=strict',
-    '--xml-sort-attributes-by-key=true',
-    '--xml-self-closing-space=true',
-    // toml
-    '--indent-entries=true',
-    '--reorder-keys=true',
-    // nginx
-    '--wrap-parameters=false',
-    '--continuation-indent=2',
-];
-// 默认的 Prettier 插件列表
-export const DEFAULT_PLUGINS = [
-    '@prettier/plugin-xml',
-    'prettier-plugin-toml',
-    'prettier-plugin-nginx',
-    'prettier-plugin-sh',
-];
-// 默认的忽略模式
-export const DEFAULT_IGNORE_PATTERNS = [
-    'node_modules/',
-    'dist/',
-    'build/',
-    '.nyc_output/',
-    'coverage/',
-    '.next/',
-    'out/',
-];