meocli 0.0.7 → 0.0.9

package/README.md

@@ -22,7 +22,7 @@ $ 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.svg --verbose
 $ pnpm run dev pr ./tmp/test.json --config=auto --ignore=auto
 $ pnpm run dev pr ./tmp/test.svg --config=built_in --ignore=auto
 ```
@@ -43,7 +43,7 @@ $ npm install -g meocli
 $ me COMMAND
 running command...
 $ me (--version)
-meocli/0.0.7 win32-x64 node-v24.12.0
+meocli/0.0.9 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.7/src/commands/hello/index.ts)_
+_See code: [src/commands/hello/index.ts](https://github.com/meme2046/meocli/blob/v0.0.9/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.7/src/commands/hello/world.ts)_
+_See code: [src/commands/hello/world.ts](https://github.com/meme2046/meocli/blob/v0.0.9/src/commands/hello/world.ts)_
 
 ## `me help [COMMAND]`
 
@@ -427,7 +427,7 @@ Use Prettier to format file
 
 ```
 USAGE
-  $ me pr FILEPATH [-c <value>] [--ignore <value>]
+  $ me pr FILEPATH [-c <value>] [--ignore <value>] [-v]
 
 ARGUMENTS
   FILEPATH  file path that need to be formatted by Prettier
@@ -435,6 +435,7 @@ ARGUMENTS
 FLAGS
   -c, --config=<value>  [default: built_in] built_in:使用内置规则(默认值), 传入路径则是使用自定义配置,
                         auto:自动检测config file
+  -v, --verbose         Show verbose output
       --ignore=<value>  [default: built_in] built_in:使用内置规则(默认值), 传入路径则是使用自定义规则,
                         auto:自动检测ignore file
 
@@ -447,5 +448,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.7/src/commands/pr/index.ts)_
+_See code: [src/commands/pr/index.ts](https://github.com/meme2046/meocli/blob/v0.0.9/src/commands/pr/index.ts)_
 <!-- commandsstop -->

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

@@ -8,12 +8,14 @@ export default class Prettier extends Command {
     static flags: {
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         ignore: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
     private detectPackageManager;
     private findProjectPrettierConfig;
     private findProjectPrettierIgnore;
     private replacePluginArgs;
+    private resolvePlugin;
     private resolvePluginArgs;
     private resolvePluginPaths;
 }

package/dist/commands/pr/index.js

@@ -1,11 +1,12 @@
 import { Args, Command, Flags } from '@oclif/core';
 import { execa } from 'execa';
 // import {spawn} from 'node:child_process'
-import { existsSync } from 'node:fs';
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
+import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
-import { cwd } from 'node:process';
-import { DEFAULT_ARGS, DEFAULT_PLUGINS } from '../../consts/prettierrc.js';
+import { DEFAULT_CONFIG, DEFAULT_IGNORE_PATTERNS } from '../../consts/prettierrc.js';
+import { toYamlFile } from '../../lib/to-yaml-file.js';
 const require = createRequire(import.meta.url);
 export default class Prettier extends Command {
     static args = {
@@ -31,6 +32,11 @@ export default class Prettier extends Command {
             description: 'built_in:使用内置规则(默认值), 传入路径则是使用自定义规则, auto:自动检测ignore file',
             required: false,
         }),
+        verbose: Flags.boolean({
+            char: 'v',
+            default: false,
+            description: 'Show verbose output',
+        }),
         // 'no-config': Flags.boolean({
         //   default: false,
         //   description: 'Disable config file detection',
@@ -43,7 +49,11 @@ export default class Prettier extends Command {
     async run() {
         const { args, flags } = await this.parse(Prettier);
         const { filePath } = args;
-        const { config, ignore } = flags;
+        const { config, ignore, verbose } = flags;
+        if (verbose) {
+            process.env.DEBUG = 'oclif:me:pr';
+            require('debug').enable(process.env.DEBUG);
+        }
         // 检查文件是否存在
         if (!existsSync(filePath)) {
             this.error(`file『${filePath}』not found`);
@@ -65,11 +75,24 @@ export default class Prettier extends Command {
             this.error(`prettier not found`);
             return;
         }
+        const meocliPath = `${homedir}/.meocli`;
+        const ignorePath = `${meocliPath}/.prettierignore`;
+        const configPath = `${meocliPath}/.prettierrc.yaml`;
+        if (!existsSync(meocliPath)) {
+            mkdirSync(meocliPath);
+        }
+        if (!existsSync(ignorePath)) {
+            writeFileSync(ignorePath, DEFAULT_IGNORE_PATTERNS.join('\n'), { encoding: 'utf8' });
+        }
+        if (!existsSync(configPath)) {
+            DEFAULT_CONFIG.plugins = this.resolvePlugin(DEFAULT_CONFIG.plugins);
+            this.debug('prettier config:', DEFAULT_CONFIG);
+            toYamlFile(configPath, DEFAULT_CONFIG);
+        }
         // 根据包管理器类型构建参数
-        let prettierArgs = ['--write', filePath];
+        const prettierArgs = ['--write', filePath];
         if (ignore === 'built_in') {
-            const projectRoot = cwd();
-            prettierArgs.unshift('--ignore-path', join(projectRoot, '.prettierignore'));
+            prettierArgs.unshift('--ignore-path', ignorePath);
         }
         else if (existsSync(ignore)) {
             prettierArgs.unshift('--ignore-path', ignore);
@@ -79,14 +102,17 @@ export default class Prettier extends Command {
             if (projectIgnore) {
                 prettierArgs.unshift('--ignore-path', projectIgnore);
             }
+            else {
+                prettierArgs.unshift('--ignore-path', ignorePath);
+            }
         }
         // 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];
+        // const pluginArgs = this.resolvePluginArgs(DEFAULT_PLUGINS)
+        // const completeArgs = [...DEFAULT_ARGS, ...pluginArgs, ...prettierArgs]
         if (config === 'built_in') {
             // 为插件参数使用绝对路径，避免全局安装时找不到插件
-            prettierArgs = completeArgs;
+            prettierArgs.unshift('--config', configPath);
         }
         else if (existsSync(config)) {
             prettierArgs.unshift('--config', config);
@@ -99,11 +125,11 @@ export default class Prettier extends Command {
             }
             else {
                 // 为插件参数使用绝对路径，避免全局安装时找不到插件
-                prettierArgs = completeArgs;
+                prettierArgs.unshift('--config', configPath);
             }
         }
-        this.debug(prettierBin);
-        this.debug(JSON.stringify(prettierArgs));
+        this.debug('prettier path:', prettierBin);
+        this.debug('args:', JSON.stringify(prettierArgs));
         // this.log(`Formatting file: ${filePath}`)
         const { stderr, stdout } = await execa(prettierBin, prettierArgs, {
             env: { ...process.env },
@@ -163,6 +189,17 @@ export default class Prettier extends Command {
         }
         return newArgs;
     }
+    resolvePlugin(plugins) {
+        return plugins.map((plugin) => {
+            // 尝试查找插件的实际路径
+            const pluginPath = require.resolve(plugin);
+            if (existsSync(pluginPath)) {
+                return pluginPath;
+            }
+            // 如果插件路径不存在，则返回原始名称（让 prettier 自己处理）
+            return plugin;
+        });
+    }
     resolvePluginArgs(plugins) {
         const pluginArgs = [];
         for (const plugin of plugins) {

package/dist/consts/prettierrc.d.ts

@@ -1,4 +1,42 @@
 export declare const DEFAULT_ARGS: string[];
+export declare const DEFAULT_CONFIG: {
+    arrowParens: string;
+    bracketSameLine: boolean;
+    bracketSpacing: boolean;
+    continuationIndent: number;
+    embeddedLanguageFormatting: string;
+    endOfLine: string;
+    experimentalOperatorPosition: string;
+    experimentalTernaries: boolean;
+    htmlWhitespaceSensitivity: string;
+    indentEntries: boolean;
+    insertPragma: boolean;
+    jsxSingleQuote: boolean;
+    objectWrap: string;
+    overrides: {
+        files: string[];
+        options: {
+            parser: string;
+        };
+    }[];
+    plugins: string[];
+    printWidth: number;
+    proseWrap: string;
+    quoteProps: string;
+    reorderKeys: boolean;
+    requirePragma: boolean;
+    semi: boolean;
+    singleAttributePerLine: boolean;
+    singleQuote: boolean;
+    tabWidth: number;
+    trailingComma: string;
+    useTabs: boolean;
+    vueIndentScriptAndStyle: boolean;
+    wrapParameters: boolean;
+    xmlSelfClosingSpace: boolean;
+    xmlSortAttributesByKey: boolean;
+    xmlWhitespaceSensitivity: string;
+};
 export declare const DEFAULT_PLUGINS: {
     main: string;
     name: string;

package/dist/consts/prettierrc.js

@@ -65,6 +65,42 @@ export const DEFAULT_ARGS = [
     '--continuation-indent',
     '2',
 ];
+export const DEFAULT_CONFIG = {
+    arrowParens: 'always',
+    bracketSameLine: false,
+    bracketSpacing: true,
+    continuationIndent: 2, // nginx
+    embeddedLanguageFormatting: 'auto',
+    endOfLine: 'lf',
+    experimentalOperatorPosition: 'end',
+    experimentalTernaries: false,
+    htmlWhitespaceSensitivity: 'css',
+    indentEntries: true, // toml
+    insertPragma: false,
+    jsxSingleQuote: false,
+    objectWrap: 'preserve',
+    overrides: [
+        { files: ['*.env'], options: { parser: 'sh' } },
+        { files: ['*.txt'], options: { parser: 'markdown' } },
+    ],
+    plugins: ['@prettier/plugin-xml', 'prettier-plugin-toml', 'prettier-plugin-sh', 'prettier-plugin-nginx'],
+    printWidth: 80,
+    proseWrap: 'preserve',
+    quoteProps: 'as-needed',
+    reorderKeys: true, // toml
+    requirePragma: false,
+    semi: true,
+    singleAttributePerLine: false,
+    singleQuote: false,
+    tabWidth: 2,
+    trailingComma: 'all',
+    useTabs: false, // useTabs 和 tabWidth 不能同时使用
+    vueIndentScriptAndStyle: false,
+    wrapParameters: false, // nginx
+    xmlSelfClosingSpace: true, // xml
+    xmlSortAttributesByKey: true, // xml
+    xmlWhitespaceSensitivity: 'strict', // xml
+};
 // 默认的 Prettier 插件列表
 export const DEFAULT_PLUGINS = [
     { main: 'src/plugin.js', name: '@prettier/plugin-xml' },

package/dist/lib/to-yaml-file.d.ts

@@ -0,0 +1 @@
+export declare function toYamlFile(fp: string, data: unknown): void;

package/dist/lib/to-yaml-file.js

@@ -0,0 +1,6 @@
+import { dump } from 'js-yaml';
+import fs from 'node:fs';
+export function toYamlFile(fp, data) {
+    const yamlStr = dump(data, { indent: 2 });
+    fs.writeFileSync(fp, yamlStr, 'utf8');
+}

package/dist/tests/file-test.d.ts

@@ -0,0 +1 @@
+export declare function ensureDirectoryExists(filePath: string): void;

package/dist/tests/file-test.js

@@ -0,0 +1,11 @@
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { DEFAULT_IGNORE_PATTERNS } from '../consts/prettierrc.js';
+const ignoreStr = [...DEFAULT_IGNORE_PATTERNS].join('\n');
+writeFileSync('tmp/tmp/.prettierignore', ignoreStr, { encoding: 'utf8' });
+export function ensureDirectoryExists(filePath) {
+    const dir = dirname(filePath);
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+}

package/dist/tests/list-test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/list-test.js

@@ -0,0 +1,4 @@
+import { DEFAULT_CONFIG, DEFAULT_IGNORE_PATTERNS } from '../consts/prettierrc.js';
+console.log('hello world!');
+console.log(DEFAULT_IGNORE_PATTERNS.join('\n'));
+console.log(DEFAULT_CONFIG.plugins);

package/oclif.manifest.json

@@ -97,6 +97,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Show verbose output",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -116,5 +123,5 @@
       ]
     }
   },
-  "version": "0.0.7"
+  "version": "0.0.9"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meocli",
   "description": "A new CLI generated with oclif",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "author": "meme2046",
   "bin": {
     "me": "./bin/run.js"
@@ -12,7 +12,9 @@
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-plugins": "^5",
     "@prettier/plugin-xml": "^3.4.2",
+    "debug": "^4.4.3",
     "execa": "^9.6.1",
+    "js-yaml": "^4.1.1",
     "prettier": "^3.7.4",
     "prettier-plugin-nginx": "^1.0.3",
     "prettier-plugin-sh": "^0.18.0",
@@ -23,6 +25,7 @@
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4",
     "@types/chai": "^4",
+    "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10",
     "@types/node": "^18",
     "chai": "^4",