meocli 0.0.5 → 0.0.7

package/README.md

@@ -43,7 +43,7 @@ $ npm install -g meocli
 $ me COMMAND
 running command...
 $ me (--version)
-meocli/0.0.5 win32-x64 node-v24.12.0
+meocli/0.0.7 win32-x64 node-v24.12.0
 $ me --help [COMMAND]
 USAGE
   $ me COMMAND
@@ -91,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.5/src/commands/hello/index.ts)_
+_See code: [src/commands/hello/index.ts](https://github.com/meme2046/meocli/blob/v0.0.7/src/commands/hello/index.ts)_
 
 ## `me hello world`
 
@@ -109,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.5/src/commands/hello/world.ts)_
+_See code: [src/commands/hello/world.ts](https://github.com/meme2046/meocli/blob/v0.0.7/src/commands/hello/world.ts)_
 
 ## `me help [COMMAND]`
 
@@ -447,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.5/src/commands/pr/index.ts)_
+_See code: [src/commands/pr/index.ts](https://github.com/meme2046/meocli/blob/v0.0.7/src/commands/pr/index.ts)_
 <!-- commandsstop -->

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

@@ -14,5 +14,6 @@ export default class Prettier extends Command {
     private findProjectPrettierConfig;
     private findProjectPrettierIgnore;
     private replacePluginArgs;
+    private resolvePluginArgs;
     private resolvePluginPaths;
 }

package/dist/commands/pr/index.js

@@ -2,10 +2,11 @@ import { Args, Command, Flags } from '@oclif/core';
 import { execa } from 'execa';
 // import {spawn} from 'node:child_process'
 import { existsSync } from 'node:fs';
-import { platform } from 'node:os';
+import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { cwd } from 'node:process';
 import { DEFAULT_ARGS, DEFAULT_PLUGINS } from '../../consts/prettierrc.js';
+const require = createRequire(import.meta.url);
 export default class Prettier extends Command {
     static args = {
         filePath: Args.string({
@@ -50,14 +51,16 @@ export default class Prettier extends Command {
         }
         // 检测当前使用的包管理器
         // const packageManager = this.detectPackageManager()
+        const prettierMain = require.resolve('prettier');
+        const prettierBin = join(dirname(prettierMain), './bin/prettier.cjs');
         // 获取 prettier 可执行文件的路径
-        const __filename = fileURLToPath(import.meta.url);
-        const __dirname = dirname(__filename);
-        const projectRoot = join(__dirname, '../../../'); // 回到项目根目录
-        let prettierBin = join(projectRoot, 'node_modules', '.bin', 'prettier');
-        if (platform() === 'win32') {
-            prettierBin += '.cmd';
-        }
+        // const __filename = fileURLToPath(import.meta.url)
+        // const __dirname = dirname(__filename)
+        // const projectRoot = join(__dirname, '../../../') // 回到项目根目录
+        // let prettierBin = join(projectRoot, 'node_modules', '.bin', 'prettier')
+        // if (platform() === 'win32') {
+        //   prettierBin += '.cmd'
+        // }
         if (!existsSync(prettierBin)) {
             this.error(`prettier not found`);
             return;
@@ -65,6 +68,7 @@ export default class Prettier extends Command {
         // 根据包管理器类型构建参数
         let prettierArgs = ['--write', filePath];
         if (ignore === 'built_in') {
+            const projectRoot = cwd();
             prettierArgs.unshift('--ignore-path', join(projectRoot, '.prettierignore'));
         }
         else if (existsSync(ignore)) {
@@ -76,9 +80,10 @@ export default class Prettier extends Command {
                 prettierArgs.unshift('--ignore-path', projectIgnore);
             }
         }
-        const resolvedPluginArgs = this.resolvePluginPaths(DEFAULT_PLUGINS, projectRoot);
-        const argsWithResolvedPlugins = this.replacePluginArgs(DEFAULT_ARGS, resolvedPluginArgs);
-        const completeArgs = [...argsWithResolvedPlugins, ...prettierArgs];
+        // const resolvedPluginArgs = this.resolvePluginPaths(DEFAULT_PLUGINS, projectRoot)
+        // const argsWithResolvedPlugins = this.replacePluginArgs(DEFAULT_ARGS, resolvedPluginArgs)
+        const pluginArgs = this.resolvePluginArgs(DEFAULT_PLUGINS);
+        const completeArgs = [...DEFAULT_ARGS, ...pluginArgs, ...prettierArgs];
         if (config === 'built_in') {
             // 为插件参数使用绝对路径，避免全局安装时找不到插件
             prettierArgs = completeArgs;
@@ -97,8 +102,8 @@ export default class Prettier extends Command {
                 prettierArgs = completeArgs;
             }
         }
-        this.log(prettierBin);
-        this.log(JSON.stringify(prettierArgs));
+        this.debug(prettierBin);
+        this.debug(JSON.stringify(prettierArgs));
         // this.log(`Formatting file: ${filePath}`)
         const { stderr, stdout } = await execa(prettierBin, prettierArgs, {
             env: { ...process.env },
@@ -158,6 +163,19 @@ export default class Prettier extends Command {
         }
         return newArgs;
     }
+    resolvePluginArgs(plugins) {
+        const pluginArgs = [];
+        for (const plugin of plugins) {
+            const pluginPath = require.resolve(plugin.name);
+            if (existsSync(pluginPath)) {
+                pluginArgs.push('--plugin', pluginPath);
+            }
+            else {
+                pluginArgs.push('--plugin', plugin.name);
+            }
+        }
+        return pluginArgs;
+    }
     // 将插件名称转换为绝对路径
     resolvePluginPaths(plugins, projectRoot) {
         return plugins.map((plugin) => {

package/dist/consts/prettierrc.js

@@ -39,14 +39,14 @@ export const DEFAULT_ARGS = [
     '--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',
@@ -70,7 +70,7 @@ export const DEFAULT_PLUGINS = [
     { 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' },
+    { main: 'dist/index.js', name: 'prettier-plugin-nginx' },
 ];
 // 默认的忽略模式
 export const DEFAULT_IGNORE_PATTERNS = [

package/oclif.manifest.json

@@ -116,5 +116,5 @@
       ]
     }
   },
-  "version": "0.0.5"
+  "version": "0.0.7"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meocli",
   "description": "A new CLI generated with oclif",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "author": "meme2046",
   "bin": {
     "me": "./bin/run.js"
@@ -68,8 +68,6 @@
   "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",