From 1d47e607b2b77d82b8c0bc0992ab8c0f3b3c907f Mon Sep 17 00:00:00 2001 From: Yamada Dev Date: Sat, 1 Feb 2025 23:51:09 +0900 Subject: [PATCH 1/2] feat(verbose): Disable spinner when verbose. Add trace logs --- src/cli/cliSpinner.ts | 11 +++++++++++ src/core/file/fileProcess.ts | 1 + src/core/metrics/calculateAllFileMetrics.ts | 1 + src/core/security/securityCheck.ts | 1 + src/shared/logger.ts | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/src/cli/cliSpinner.ts b/src/cli/cliSpinner.ts index 49d1cce1..1da1ab26 100644 --- a/src/cli/cliSpinner.ts +++ b/src/cli/cliSpinner.ts @@ -1,18 +1,25 @@ import cliSpinners from 'cli-spinners'; import logUpdate from 'log-update'; import pc from 'picocolors'; +import { logger } from '../shared/logger.js'; class Spinner { private spinner = cliSpinners.dots; private message: string; private currentFrame = 0; private interval: ReturnType | null = null; + private isEnabled: boolean; constructor(message: string) { this.message = message; + this.isEnabled = !logger.isVerboseEnabled(); } start(): void { + if (!this.isEnabled) { + return; + } + const frames = this.spinner.frames; const framesLength = frames.length; this.interval = setInterval(() => { @@ -23,6 +30,10 @@ class Spinner { } update(message: string): void { + if (!this.isEnabled) { + return; + } + this.message = message; } diff --git a/src/core/file/fileProcess.ts b/src/core/file/fileProcess.ts index 18bea4d1..0ba05082 100644 --- a/src/core/file/fileProcess.ts +++ b/src/core/file/fileProcess.ts @@ -40,6 +40,7 @@ export const processFiles = async ( runTask(task).then((result) => { completedTasks++; progressCallback(`Processing file... (${completedTasks}/${totalTasks}) ${pc.dim(task.rawFile.path)}`); + logger.trace(`Processing file... (${completedTasks}/${totalTasks}) ${task.rawFile.path}`); return result; }), ), diff --git a/src/core/metrics/calculateAllFileMetrics.ts b/src/core/metrics/calculateAllFileMetrics.ts index 7c301a25..51548e98 100644 --- a/src/core/metrics/calculateAllFileMetrics.ts +++ b/src/core/metrics/calculateAllFileMetrics.ts @@ -41,6 +41,7 @@ export const calculateAllFileMetrics = async ( runTask(task).then((result) => { completedTasks++; progressCallback(`Calculating metrics... (${completedTasks}/${task.totalFiles}) ${pc.dim(task.file.path)}`); + logger.trace(`Calculating metrics... (${completedTasks}/${task.totalFiles}) ${task.file.path}`); return result; }), ), diff --git a/src/core/security/securityCheck.ts b/src/core/security/securityCheck.ts index 81242ca8..62821205 100644 --- a/src/core/security/securityCheck.ts +++ b/src/core/security/securityCheck.ts @@ -43,6 +43,7 @@ export const runSecurityCheck = async ( runTask(task).then((result) => { completedTasks++; progressCallback(`Running security check... (${completedTasks}/${totalTasks}) ${pc.dim(task.filePath)}`); + logger.trace(`Running security check... (${completedTasks}/${totalTasks}) ${task.filePath}`); return result; }), ), diff --git a/src/shared/logger.ts b/src/shared/logger.ts index d4b8d9ad..58a1043c 100644 --- a/src/shared/logger.ts +++ b/src/shared/logger.ts @@ -8,6 +8,10 @@ class Logger { this.isVerbose = value; } + isVerboseEnabled(): boolean { + return this.isVerbose; + } + error(...args: unknown[]) { console.error(pc.red(this.formatArgs(args))); } From bc0033b13b01c6743b122a9b99493f42188e9694 Mon Sep 17 00:00:00 2001 From: Yamada Dev Date: Sun, 2 Feb 2025 00:11:32 +0900 Subject: [PATCH 2/2] chore(npm): Change cli-run in scripts to repomix and add repomix-src and repomix-website --- CONTRIBUTING.md | 2 +- package.json | 4 +++- website/client/src/en/guide/development/index.md | 2 +- website/client/src/en/guide/development/setup.md | 2 +- website/client/src/es/guide/development/index.md | 2 +- website/client/src/es/guide/development/setup.md | 2 +- website/client/src/ja/guide/development/index.md | 2 +- website/client/src/ja/guide/development/setup.md | 2 +- website/client/src/ko/guide/development/index.md | 2 +- website/client/src/ko/guide/development/setup.md | 2 +- website/client/src/pt-br/guide/development/index.md | 2 +- website/client/src/pt-br/guide/development/setup.md | 2 +- website/client/src/zh-cn/guide/development/index.md | 2 +- website/client/src/zh-cn/guide/development/setup.md | 2 +- 14 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b45538ca..ce440a15 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ npm install To run Repomix locally: ```bash -npm run cli-run +npm run repomix ``` ### Docker Usage diff --git a/package.json b/package.json index 68d5c06a..e3cb2317 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,9 @@ "lint-secretlint": "secretlint \"**/*\" --secretlintignore .gitignore", "test": "vitest", "test-coverage": "vitest run --coverage", - "cli-run": "npm run build && node --trace-warnings bin/repomix.cjs", + "repomix": "npm run build && node --trace-warnings bin/repomix.cjs", + "repomix-src": "npm run repomix -- --include 'src,tests'", + "repomix-website": "npm run repomix -- --include 'website'", "npm-publish": "npm run lint && npm run test-coverage && npm run build && npm publish", "npm-release-patch": "npm version patch && npm run npm-publish", "npm-release-minor": "npm version minor && npm run npm-publish", diff --git a/website/client/src/en/guide/development/index.md b/website/client/src/en/guide/development/index.md index 2320e054..68320f2e 100644 --- a/website/client/src/en/guide/development/index.md +++ b/website/client/src/en/guide/development/index.md @@ -12,7 +12,7 @@ npm install ```bash # Run CLI -npm run cli-run +npm run repomix # Run tests npm run test diff --git a/website/client/src/en/guide/development/setup.md b/website/client/src/en/guide/development/setup.md index ac67f2c0..04881d65 100644 --- a/website/client/src/en/guide/development/setup.md +++ b/website/client/src/en/guide/development/setup.md @@ -17,7 +17,7 @@ cd repomix npm install # Run CLI -npm run cli-run +npm run repomix ``` ## Docker Development diff --git a/website/client/src/es/guide/development/index.md b/website/client/src/es/guide/development/index.md index 34fd7bf3..e75d816a 100644 --- a/website/client/src/es/guide/development/index.md +++ b/website/client/src/es/guide/development/index.md @@ -12,7 +12,7 @@ npm install ```bash # Ejecutar CLI -npm run cli-run +npm run repomix # Ejecutar pruebas npm run test diff --git a/website/client/src/es/guide/development/setup.md b/website/client/src/es/guide/development/setup.md index 871b07c3..fba8829f 100644 --- a/website/client/src/es/guide/development/setup.md +++ b/website/client/src/es/guide/development/setup.md @@ -17,7 +17,7 @@ cd repomix npm install # Ejecutar CLI -npm run cli-run +npm run repomix ``` ## Desarrollo con Docker diff --git a/website/client/src/ja/guide/development/index.md b/website/client/src/ja/guide/development/index.md index 44aeb511..b8bbd3fb 100644 --- a/website/client/src/ja/guide/development/index.md +++ b/website/client/src/ja/guide/development/index.md @@ -12,7 +12,7 @@ npm install ```bash # CLIを実行 -npm run cli-run +npm run repomix # テストを実行 npm run test diff --git a/website/client/src/ja/guide/development/setup.md b/website/client/src/ja/guide/development/setup.md index b9ea0a0a..2db6d690 100644 --- a/website/client/src/ja/guide/development/setup.md +++ b/website/client/src/ja/guide/development/setup.md @@ -17,7 +17,7 @@ cd repomix npm install # CLIの実行 -npm run cli-run +npm run repomix ``` ## Docker開発 diff --git a/website/client/src/ko/guide/development/index.md b/website/client/src/ko/guide/development/index.md index 6a0e325b..e900dd33 100644 --- a/website/client/src/ko/guide/development/index.md +++ b/website/client/src/ko/guide/development/index.md @@ -12,7 +12,7 @@ npm install ```bash # CLI 실행 -npm run cli-run +npm run repomix # 테스트 실행 npm run test diff --git a/website/client/src/ko/guide/development/setup.md b/website/client/src/ko/guide/development/setup.md index 9b5f849e..14d8c946 100644 --- a/website/client/src/ko/guide/development/setup.md +++ b/website/client/src/ko/guide/development/setup.md @@ -17,7 +17,7 @@ cd repomix npm install # CLI 실행 -npm run cli-run +npm run repomix ``` ## Docker 개발 diff --git a/website/client/src/pt-br/guide/development/index.md b/website/client/src/pt-br/guide/development/index.md index db8582fc..93c4a1e4 100644 --- a/website/client/src/pt-br/guide/development/index.md +++ b/website/client/src/pt-br/guide/development/index.md @@ -12,7 +12,7 @@ npm install ```bash # Executar CLI -npm run cli-run +npm run repomix # Executar testes npm run test diff --git a/website/client/src/pt-br/guide/development/setup.md b/website/client/src/pt-br/guide/development/setup.md index bc55c05d..0e5028c5 100644 --- a/website/client/src/pt-br/guide/development/setup.md +++ b/website/client/src/pt-br/guide/development/setup.md @@ -17,7 +17,7 @@ cd repomix npm install # Executar CLI -npm run cli-run +npm run repomix ``` ## Desenvolvimento com Docker diff --git a/website/client/src/zh-cn/guide/development/index.md b/website/client/src/zh-cn/guide/development/index.md index 189f793a..60ec45d6 100644 --- a/website/client/src/zh-cn/guide/development/index.md +++ b/website/client/src/zh-cn/guide/development/index.md @@ -12,7 +12,7 @@ npm install ```bash # 运行 CLI -npm run cli-run +npm run repomix # 运行测试 npm run test diff --git a/website/client/src/zh-cn/guide/development/setup.md b/website/client/src/zh-cn/guide/development/setup.md index 5a19ce92..38720df6 100644 --- a/website/client/src/zh-cn/guide/development/setup.md +++ b/website/client/src/zh-cn/guide/development/setup.md @@ -17,7 +17,7 @@ cd repomix npm install # 运行 CLI -npm run cli-run +npm run repomix ``` ## Docker 开发环境