meocli 0.0.2 → 0.0.3

package/README.md

@@ -32,7 +32,7 @@ $ npm install -g meocli
 $ me COMMAND
 running command...
 $ me (--version)
-meocli/0.0.2 win32-x64 node-v24.12.0
+meocli/0.0.3 win32-x64 node-v24.12.0
 $ me --help [COMMAND]
 USAGE
   $ me COMMAND
@@ -56,7 +56,7 @@ USAGE
 * [`me plugins uninstall [PLUGIN]`](#me-plugins-uninstall-plugin)
 * [`me plugins unlink [PLUGIN]`](#me-plugins-unlink-plugin)
 * [`me plugins update`](#me-plugins-update)
-* [`me prettier FILEPATH`](#me-prettier-filepath)
+* [`me pr FILEPATH`](#me-pr-filepath)
 
 ## `me hello PERSON`
 
@@ -80,7 +80,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.2/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)_
 
 ## `me hello world`
 
@@ -98,7 +98,7 @@ EXAMPLES
   hello world! (./src/commands/hello/world.ts)
 ```
 
-_See code: [src/commands/hello/world.ts](https://github.com/meme2046/meocli/blob/v0.0.2/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)_
 
 ## `me help [COMMAND]`
 
@@ -410,29 +410,31 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/update.ts)_
 
-## `me prettier FILEPATH`
+## `me pr FILEPATH`
 
 Use Prettier to format file
 
 ```
 USAGE
-  $ me prettier FILEPATH [-c <value>] [-i <value>]
+  $ me pr FILEPATH [-c <value>] [--ignore-path <value>] [--no-config] [--no-ignore]
 
 ARGUMENTS
   FILEPATH  file path that need to be formatted by Prettier
 
 FLAGS
-  -c, --config=<value>  Prettier config file path
-  -i, --ignore=<value>  Prettier ignore file path
+  -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
 
 DESCRIPTION
   Use Prettier to format file
 
 EXAMPLES
-  $ me prettier ./tests/test.json
+  $ me pr ./tests/test.json
 
-  $ me prettier ./src/file.ts --config ./.prettierrc.yaml
+  $ me pr ./src/file.ts --config ./.prettierrc.yaml
 ```
 
-_See code: [src/commands/prettier/index.ts](https://github.com/meme2046/meocli/blob/v0.0.2/src/commands/prettier/index.ts)_
+_See code: [src/commands/pr/index.ts](https://github.com/meme2046/meocli/blob/v0.0.3/src/commands/pr/index.ts)_
 <!-- commandsstop -->

package/dist/commands/{prettier → pr}/index.d.ts

@@ -7,7 +7,9 @@ export default class Prettier extends Command {
     static examples: string[];
     static flags: {
         config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        ignore: 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>;
     };
     run(): Promise<void>;
     private detectPackageManager;

package/dist/commands/{prettier → pr}/index.js

@@ -1,7 +1,10 @@
 import { Args, Command, Flags } from '@oclif/core';
-import { spawn } from 'node:child_process';
+import { execa } from 'execa';
+// import {spawn} from 'node:child_process'
 import { existsSync } from 'node:fs';
-import { join } from 'node:path';
+import { platform } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { DEFAULT_ARGS } from '../../consts/prettierrc.js';
 export default class Prettier extends Command {
     static args = {
@@ -22,77 +25,86 @@ export default class Prettier extends Command {
             description: 'Prettier config file path',
             required: false,
         }),
-        ignore: Flags.string({
-            char: 'i',
-            // default: './src/files/.prettierignore',
+        'ignore-path': Flags.string({
             description: 'Prettier ignore file path',
             required: false,
         }),
+        '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 } = flags;
+        const { config, 'ignore-path': ignorePath, 'no-config': noConfig, 'no-ignore': noIgnore } = flags;
         // 检查文件是否存在
         if (!existsSync(filePath)) {
-            this.error(`file 『${filePath}』 not found`);
+            this.error(`file『${filePath}』not found`);
             return;
         }
         // 检测当前使用的包管理器
-        const packageManager = this.detectPackageManager();
+        // const packageManager = this.detectPackageManager()
+        // 获取 prettier 可执行文件的路径
+        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 = ['prettier', '--write', filePath];
-        if (config && existsSync(config)) {
-            prettierArgs.push(`--config=${config}`);
+        let prettierArgs = ['--write', filePath];
+        if (noIgnore) {
+            prettierArgs.unshift('--ignore-path', '');
+        }
+        else if (ignorePath && existsSync(ignorePath)) {
+            prettierArgs.unshift('--ignore-path', ignorePath);
         }
         else {
-            // 否则尝试查找项目中的配置文件
-            const projectConfig = this.findProjectPrettierConfig();
-            if (projectConfig) {
-                prettierArgs.push(`--config=${projectConfig}`);
-            }
-            else {
-                prettierArgs = [...prettierArgs, ...DEFAULT_ARGS];
+            const projectIgnore = this.findProjectPrettierIgnore();
+            if (projectIgnore) {
+                prettierArgs.unshift('--ignore-path', projectIgnore);
             }
         }
-        if (ignore && existsSync(ignore)) {
-            prettierArgs.push(`--ignore-path=${ignore}`);
+        if (noConfig) {
+            prettierArgs = [...DEFAULT_ARGS, ...prettierArgs];
+        }
+        else if (config && existsSync(config)) {
+            prettierArgs.unshift('--config', config);
         }
         else {
-            const projectIgnore = this.findProjectPrettierIgnore();
-            if (projectIgnore) {
-                prettierArgs.push(`--ignore-path=${projectIgnore}`);
+            // 否则尝试查找项目中的配置文件
+            const projectConfig = this.findProjectPrettierConfig();
+            if (projectConfig) {
+                prettierArgs.unshift('--config', projectConfig);
             }
             else {
-                // 如果没有找到项目 ignore 文件，跳过此参数
-                // Prettier 会使用默认的忽略规则
+                prettierArgs = [...DEFAULT_ARGS, ...prettierArgs];
             }
         }
-        this.log(JSON.stringify(prettierArgs));
+        // this.log(JSON.stringify(prettierArgs))
         // this.log(`Formatting file: ${filePath}`)
-        // 返回一个 Promise 以等待子进程完成
-        await new Promise((resolve, reject) => {
-            const prettierProcess = spawn(packageManager, prettierArgs, {
-                env: { ...process.env }, // 确保子进程继承当前环境变量
-                shell: false, // 设置为 false 以避免安全警告
-                // stdio: 'inherit',
-                stdio: 'pipe', // 更改为 pipe 以便捕获输出
-            });
-            prettierProcess.on('close', (code) => {
-                if (code === 0) {
-                    this.log(`Successfully formatted ${filePath}`);
-                    resolve(null);
-                }
-                else {
-                    reject(new Error(`Prettier exited with code ${code}`));
-                }
-            });
-            prettierProcess.on('error', (error) => {
-                reject(error);
-            });
-        }).catch((error) => {
-            this.error(`Error executing prettier: ${error.message}`);
+        const { stderr, stdout } = await execa(prettierBin, prettierArgs, {
+            env: { ...process.env },
         });
+        if (stdout) {
+            this.log(stdout);
+        }
+        if (stderr) {
+            this.warn(stderr);
+        }
+        this.log(`Successfully formatted ${filePath}`);
     }
     detectPackageManager() {
         // 检查项目根目录是否存在 pnpm-lock.yaml 来判断是否使用 pnpm
@@ -107,13 +119,7 @@ export default class Prettier extends Command {
         return 'npx';
     }
     findProjectPrettierConfig() {
-        const possibleConfigs = [
-            './.prettierrc',
-            './.prettierrc.json',
-            './.prettierrc.yaml',
-            './.prettierrc.yml',
-            './.prettierrc.js',
-        ];
+        const possibleConfigs = ['.prettierrc', '.prettierrc.json', '.prettierrc.yaml', '.prettierrc.yml', '.prettierrc.js'];
         for (const configFile of possibleConfigs) {
             if (existsSync(configFile)) {
                 return configFile;
@@ -122,10 +128,7 @@ export default class Prettier extends Command {
         return null;
     }
     findProjectPrettierIgnore() {
-        const possibleIgnoreFiles = [
-            './.prettierignore',
-            // './.gitignore'
-        ];
+        const possibleIgnoreFiles = ['.prettierignore', '.gitignore'];
         for (const ignoreFile of possibleIgnoreFiles) {
             if (existsSync(ignoreFile)) {
                 return ignoreFile;

package/dist/consts/prettierrc.js

@@ -1,39 +1,69 @@
 export const DEFAULT_ARGS = [
-    '--arrow-parens=always',
-    '--bracket-same-line=false',
-    '--object-wrap=preserve',
-    '--experimental-operator-position=end',
+    '--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',
+    '--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',
+    '--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',
+    '--xml-whitespace-sensitivity',
+    'strict',
+    '--xml-sort-attributes-by-key',
+    'true',
+    '--xml-self-closing-space',
+    'true',
     // toml
-    '--indent-entries=true',
-    '--reorder-keys=true',
+    '--indent-entries',
+    'true',
+    '--reorder-keys',
+    'true',
     // nginx
-    '--wrap-parameters=false',
-    '--continuation-indent=2',
+    '--wrap-parameters',
+    'false',
+    '--continuation-indent',
+    '2',
 ];
 // 默认的 Prettier 插件列表
 export const DEFAULT_PLUGINS = [

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,54 @@
+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/',
+];

package/oclif.manifest.json

@@ -64,7 +64,7 @@
         "world.js"
       ]
     },
-    "prettier": {
+    "pr": {
       "aliases": [],
       "args": {
         "filePath": {
@@ -88,19 +88,30 @@
           "multiple": false,
           "type": "option"
         },
-        "ignore": {
-          "char": "i",
+        "ignore-path": {
           "description": "Prettier ignore file path",
-          "name": "ignore",
+          "name": "ignore-path",
           "required": false,
           "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,
       "hiddenAliases": [],
-      "id": "prettier",
+      "id": "pr",
       "pluginAlias": "meocli",
       "pluginName": "meocli",
       "pluginType": "core",
@@ -110,10 +121,10 @@
       "relativePath": [
         "dist",
         "commands",
-        "prettier",
+        "pr",
         "index.js"
       ]
     }
   },
-  "version": "0.0.2"
+  "version": "0.0.3"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meocli",
   "description": "A new CLI generated with oclif",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "author": "meme2046",
   "bin": {
     "me": "./bin/run.js"
@@ -12,6 +12,7 @@
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-plugins": "^5",
     "@prettier/plugin-xml": "^3.4.2",
+    "execa": "^9.6.1",
     "prettier": "^3.7.4",
     "prettier-plugin-nginx": "^1.0.3",
     "prettier-plugin-sh": "^0.18.0",