diff --git a/CHANGELOG.md b/CHANGELOG.md index 875f078..1028fd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,27 @@ All notable changes to this project will be documented in this file. +## [v0.2.0] - 2025-03-31 + +### Added + +- Dark Mode support +- Live token count updates during file selection +- Separated include/exclude configuration boxes for better organization +- Auto detect and exclude binary files +- Use .gitignore to exclude files/folders + +### Improved + +- Enhanced UX/UI with better spacing and visual hierarchy +- Faster UI rendering and response times +- Simplified text entry for file patterns (vs. YAML format) + +### Fixed + +- Multiple bug fixes in file selection and processing +- Added robust testing for file selection edge cases + ## [v0.1.0] - 2025-03-11 Initial release of the AI Code Fusion application with the following features: diff --git a/README.md b/README.md index d86ea0b..1028125 100755 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A desktop application for preparing and optimizing code repositories for AI proc ### Download -Download the latest version for your platform from the [Releases page](https://github.com/user/repo/releases). +Download the latest version for your platform from the [Releases page](https://github.com/codingworkflow/ai-code-fusion/releases). ### Windows @@ -36,45 +36,41 @@ Download the latest version for your platform from the [Releases page](https://g ## Usage Guide -### 1. Configuration +### 1. Start and Filters -Configure file filtering to include or exclude specific file types and patterns. +The application now features both Dark and Light modes for improved user experience. +![Start Panel Dark Mode](assets/ai_code_fusion_1.jpg) -![Config Panel](assets/ai_code_fusion_1.jpg) +![Start Panel Light Mode](assets/ai_code_fusion_2.jpg) -- Set file extensions to include (e.g., `.js`, `.py`, `.cpp`) -- Define patterns to exclude (e.g., `node_modules`, `.git`, `build`) -- Choose your token counting model based on your target AI system +Extended file filtering options: + +- Exclude specific file types and patterns (using glob patterns) to remove build folders, venv, node_modules, .git from tree view and file selection +- Automatically exclude files based on .gitignore files in your repository +- Reduce selection to only the file extensions you specify +- Display token count in real-time during selection (can be disabled for very large repositories) +- Include file tree in output (recommended for better context in AI models) ### 2. File Selection -Select files and directories to analyze and process. +Select specific files and directories to analyze and process. -![Source Panel](assets/ai_code_fusion_2.jpg) +![Analysis Panel](assets/ai_code_fusion_3.jpg) - Browse and select your root project directory - Use the tree view to select specific files or folders -- See file counts and sizes in real-time - -### 3. Token Analysis - -Get accurate token estimations before processing. - -![Analysis Panel](assets/ai_code_fusion_3.jpg) - -- View token counts per file and total -- See character and line counts -- Get estimations for different AI models +- See file counts and token sizes in real-time (when token display is enabled) -### 4. Final Processing +### 3. Final Processing Generate the processed output ready for use with AI systems. ![Processing Panel](assets/ai_code_fusion_4.jpg) -- Get the final processed content -- Copy directly to clipboard -- Export to file if needed +- View the final processed content ready for AI systems +- Copy content directly to clipboard for immediate use +- Export to file for later reference +- Review files by token count to help identify large files you may want to exclude ## Building from Source @@ -88,8 +84,8 @@ Generate the processed output ready for use with AI systems. ```bash # Clone the repository -git clone https://github.com/user/repo.git -cd repo +git clone https://github.com/codingworkflow/ai-code-fusion +cd ai-code-fusion # Install dependencies make setup diff --git a/assets/ai_code_fusion_1.jpg b/assets/ai_code_fusion_1.jpg index 2252604..d27d5a0 100755 Binary files a/assets/ai_code_fusion_1.jpg and b/assets/ai_code_fusion_1.jpg differ diff --git a/assets/ai_code_fusion_2.jpg b/assets/ai_code_fusion_2.jpg index a6dbc16..c5029da 100755 Binary files a/assets/ai_code_fusion_2.jpg and b/assets/ai_code_fusion_2.jpg differ diff --git a/assets/ai_code_fusion_3.jpg b/assets/ai_code_fusion_3.jpg index b7b5ff5..74bccc9 100755 Binary files a/assets/ai_code_fusion_3.jpg and b/assets/ai_code_fusion_3.jpg differ diff --git a/assets/ai_code_fusion_4.jpg b/assets/ai_code_fusion_4.jpg index 7de5c2e..41fb1f5 100755 Binary files a/assets/ai_code_fusion_4.jpg and b/assets/ai_code_fusion_4.jpg differ diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index c3eadf9..d2d3bae 100755 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -1,94 +1,92 @@ # Configuration Guide -The AI Code Fusion uses a YAML configuration for file filtering. This document explains the available configuration options and best practices. +AI Code Fusion uses YAML configuration for file filtering. This document explains the available configuration options and best practices. ## Configuration Format -The application uses YAML format for its configuration: - -```yaml -# File extensions to include (with dot) -include_extensions: - - .py - - .ts - - .js - - .md - - .ini - - .yaml - - .yml - - .kt - - .go - - .scm - - .php +The application uses YAML format for its configuration. Below is an example showing common configuration patterns: + +### File extensions to include (with dot) + +``` +.py +.ts +.js +.md +.ini +.yaml +.yml +.kt +.go +.scm +.php # Patterns to exclude (using fnmatch syntax) -exclude_patterns: - # Version Control - - '**/.git/**' - - '**/.svn/**' - - '**/.hg/**' - - '**/vocab.txt' - - '**.onnx' - - '**/test*.py' - - # Dependencies - - '**/node_modules/**' - - '**/venv/**' - - '**/env/**' - - '**/.venv/**' - - '**/.github/**' - - '**/vendor/**' - - '**/website/**' - - # Build outputs - - '**/test/**' - - '**/dist/**' - - '**/build/**' - - '**/__pycache__/**' - - '**/*.pyc' - - # Config files - - '**/.DS_Store' - - '**/.env' - - '**/package-lock.json' - - '**/yarn.lock' - - '**/.prettierrc' - - '**/.prettierignore' - - '**/.gitignore' - - '**/.gitattributes' - - '**/.npmrc' - - # Documentation - - '**/LICENSE*' - - '**/LICENSE.*' - - '**/COPYING' - - '**/CODE_OF**' - - '**/CONTRIBUTING**' - - # Test files - - '**/tests/**' - - '**/test/**' - - '**/__tests__/**' +# Version Control +'**/.git/**' +'**/.svn/**' +'**/.hg/**' +'**/vocab.txt' +'**.onnx' +'**/test*.py' + +# Dependencies +'**/node_modules/**' +'**/venv/**' +'**/env/**' +'**/.venv/**' +'**/.github/**' +'**/vendor/**' +'**/website/**' + +# Build outputs +'**/test/**' +'**/dist/**' +'**/build/**' +'**/__pycache__/**' +'**/*.pyc' + +# Config files +'**/.DS_Store' +'**/.env' +'**/package-lock.json' +'**/yarn.lock' +'**/.prettierrc' +'**/.prettierignore' +'**/.gitignore' +'**/.gitattributes' +'**/.npmrc' + +# Documentation +'**/LICENSE*' +'**/LICENSE.*' +'**/COPYING' +'**/CODE_OF**' +'**/CONTRIBUTING**' + +# Test files +'**/tests/**' +'**/test/**' +'**/__tests__/**' ``` ## Configuration Options ### Include Extensions -The `include_extensions` section specifies file extensions that should be processed. Only files with these extensions will be considered for processing. +The `include_extensions` section specifies which file extensions should be processed. Only files with these extensions will be considered for processing. Example: -```yaml -include_extensions: - - .py # Include Python files - - .js # Include JavaScript files - - .md # Include Markdown files +``` +.py # Include Python files +.js # Include JavaScript files +.md # Include Markdown files ``` ### Exclude Patterns -The `exclude_patterns` section specifies patterns for files and directories that should be excluded from processing, even if they have an included extension. +The `exclude_patterns` section defines patterns for files and directories that should be excluded from processing, even if they have a matching extension from the include list. Patterns use the fnmatch syntax: @@ -98,11 +96,10 @@ Patterns use the fnmatch syntax: Example: -```yaml -exclude_patterns: - - '**/node_modules/**' # Exclude all node_modules directories - - '**/.git/**' # Exclude Git directories - - '**/test*.py' # Exclude Python files that start with 'test' +``` +'**/node_modules/**' # Exclude all node_modules directories +'**/.git/**' # Exclude Git directories +'**/test*.py' # Exclude Python files that start with 'test' ``` ## Best Practices @@ -111,53 +108,65 @@ exclude_patterns: 2. **Group related patterns** with comments for better organization 3. **Be specific with extensions** to avoid processing unnecessary files 4. **Use the file preview** to verify your configuration is working as expected -5. **Check token counts** to ensure you stay within your model's context limit +5. **Check token counts** to ensure you stay within your model's context limits ## Common Configurations +Here are some typical configurations for different project types: + ### For JavaScript/TypeScript Projects -```yaml -include_extensions: - - .js - - .jsx - - .ts - - .tsx - - .md - - .json - -exclude_patterns: - - '**/node_modules/**' - - '**/dist/**' - - '**/build/**' - - '**/.cache/**' - - '**/coverage/**' - - '**/*.test.*' - - '**/*.spec.*' +#### include_extensions: + +``` +.js +.jsx +.ts +.tsx +.md +.json +``` + +#### #### exclude_patterns: + +``` +'**/node_modules/**' +'**/dist/**' +'**/build/**' +'**/.cache/**' +'**/coverage/**' +'**/*.test.*' +'**/*.spec.*' ``` ### For Python Projects -```yaml -include_extensions: - - .py - - .md - - .yml - - .yaml - - .ini - -exclude_patterns: - - '**/venv/**' - - '**/.venv/**' - - '**/__pycache__/**' - - '**/*.pyc' - - '**/tests/**' - - '**/.pytest_cache/**' +#### include_extensions: + +``` +.py +.md +.yml +.yaml +.ini +``` + +#### #### exclude_patterns: + +``` +'**/venv/**' +'**/.venv/**' +'**/__pycache__/**' +'**/*.pyc' +'**/tests/**' +'**/.pytest_cache/**' ``` ## Troubleshooting -- **No files are processed**: Check that the file extensions match your project files -- **Too many files are processed**: Add more specific exclude patterns -- **Important files are excluded**: Check for conflicting exclude patterns -- **Token count is too high**: Add more exclude patterns to reduce the number of files +If you encounter issues with your configuration: + +- **No files are processed**: Verify that your include extensions match your project's file types +- **Too many files are processed**: Add more specific exclude patterns to filter unwanted files +- **Important files are excluded**: Check for conflicting exclude patterns that might be too broad +- **Token count is too high**: Add more exclude patterns to reduce the number of processed files diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index d607612..7f7b8d4 100755 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -10,19 +10,13 @@ This document provides detailed information for developers working on the AI Cod - npm - Git -### Development Container (Recommended) - -This project includes a development container configuration that provides a consistent, pre-configured development environment. - -For detailed instructions on using the dev container, see the [Dev Container Guide](DEV_CONTAINER.md). - ### Platform-Specific Build Instructions #### Windows Use the included `make.bat` file for all build commands: -``` +```cmd make ``` @@ -30,7 +24,7 @@ make Use the included `Makefile`: -``` +```bash make ``` @@ -89,19 +83,20 @@ If you encounter issues with the development server: 1. Clean the build outputs and reinstall dependencies: - ``` + ```bash make clean make fix-deps ``` 2. Make sure the CSS is built before starting the dev server: - ``` + ```bash npm run build:css ``` 3. Start the development server: - ``` + + ```bash npm run dev ``` @@ -129,28 +124,36 @@ make test-file FILE=src/__tests__/token-counter.test.js For project maintainers, follow these steps to create a new release: 1. Ensure all changes are committed to the main branch -2. Run the release preparation script: +2. Run the release preparation script using either method: -```bash + ```bash + # Using the scripts/index.js entry point (recommended) + node scripts/index.js release + + # OR using the direct script node scripts/prepare-release.js -``` + ``` -Where `` can be: + Where `` can be: -- A specific version number (e.g., `1.0.0`) -- `patch` - increment the patch version -- `minor` - increment the minor version -- `major` - increment the major version + - A specific version number (e.g., `1.0.0`) + - `patch` - increment the patch version + - `minor` - increment the minor version + - `major` - increment the major version 3. Enter the changelog entries when prompted -4. Push the tag to GitHub when prompted -5. The GitHub Actions workflow will automatically: - - Build the application for Windows and Linux +4. Confirm git tag creation when prompted +5. Push the changes and tag to GitHub: + + ```bash + git push && git push origin v + ``` + +6. The GitHub Actions workflow will automatically: + - Build the application for Windows, macOS, and Linux - Create a GitHub Release - Upload the builds as release assets -6. Go to the GitHub releases page to review the draft release and publish it - -See the [scripts/README.md](../scripts/README.md) file for more details on the release process. +7. Go to the GitHub releases page to review the draft release and publish it ## Project Structure diff --git a/docs/SONARQUBE.md b/docs/SONARQUBE.md index 95300b6..47e0874 100755 --- a/docs/SONARQUBE.md +++ b/docs/SONARQUBE.md @@ -19,7 +19,7 @@ Note: The SonarQube Scanner is now included as a dependency in the project, so y 2. Edit the `.env` file and set your SonarQube server URL, authentication token, and project key: - ``` + ```bash SONAR_URL=http://your-sonarqube-server:9000 SONAR_TOKEN=your-sonar-auth-token SONAR_PROJECT_KEY=ai-code-fusion diff --git a/jest.config.js b/jest.config.js index fde4b12..3483c1a 100755 --- a/jest.config.js +++ b/jest.config.js @@ -2,12 +2,16 @@ module.exports = { testEnvironment: 'jsdom', moduleNameMapper: { '\\.(css|less|scss|sass)$': 'identity-obj-proxy', + // Mock yaml module to fix import issues + '^yaml$': '/tests/mocks/yaml-mock.js', }, setupFilesAfterEnv: ['/tests/setup.js'], testPathIgnorePatterns: ['/node_modules/'], transform: { '^.+\\.(js|jsx)$': 'babel-jest', }, + // Needed to transform ESM modules + transformIgnorePatterns: ['/node_modules/(?!(yaml)/)'], // Test match patterns testMatch: ['/tests/**/*.{js,jsx,ts,tsx}'], // Set verbose mode for more information during test runs diff --git a/make.bat b/make.bat index fbf3032..ae388dc 100755 --- a/make.bat +++ b/make.bat @@ -27,6 +27,29 @@ if /i "%1"=="release" ( exit /b %errorlevel% ) +rem Special handling for sonar command on Windows +if /i "%1"=="sonar" ( + echo Running: npm run sonar + + rem Check if .env file exists and load it + if exist ".env" ( + echo Loading environment variables from .env file + for /F "tokens=*" %%A in (.env) do ( + set line=%%A + if not "!line:~0,1!"=="#" ( + for /f "tokens=1,2 delims==" %%G in ("!line!") do ( + set "%%G=%%H" + ) + ) + ) + ) else ( + echo Warning: .env file not found + ) + + npm run sonar + exit /b %errorlevel% +) + rem Special handling for dev command on Windows if /i "%1"=="dev" ( echo Starting development environment for Windows... @@ -34,6 +57,10 @@ if /i "%1"=="dev" ( rem Set environment variables set NODE_ENV=development + rem Cleanup + echo Cleanup... + call npm run clean + rem Build CSS if needed if not exist "src\renderer\output.css" ( echo Building CSS... diff --git a/package.json b/package.json index 8c29d22..8454ff6 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ai-code-fusion", - "version": "0.1.0", + "version": "0.2.0", "description": "AI Code Fusion", "main": "src/main/index.js", "scripts": { @@ -12,8 +12,9 @@ "build:webpack": "cross-env NODE_ENV=production webpack --mode production", "prewatch:webpack": "node scripts/ensure-build-dirs.js", "watch:webpack": "cross-env NODE_ENV=development webpack --mode development --watch", - "dev": "node scripts/index.js dev", - "dev:direct": "npx cross-env NODE_ENV=development npx electron .", + "predev": "node scripts/clean-dev-assets.js", + "dev": "concurrently \"npm run watch:webpack\" \"npm run watch:css\" \"node scripts/index.js dev\"", + "clear-assets": "rimraf src/renderer/bundle.js src/renderer/bundle.js.map src/renderer/bundle.js.LICENSE.txt src/renderer/output.css", "lint": "eslint src tests --ext .js,.jsx --cache", "lint:tests": "eslint tests --ext .js,.jsx --cache", "format": "prettier --write \"**/*.{js,jsx,json,md,html,css}\"", @@ -26,6 +27,7 @@ "watch:css": "npx tailwindcss -i ./src/renderer/styles.css -o ./src/renderer/output.css --watch", "build:css": "npx tailwindcss -i ./src/renderer/styles.css -o ./src/renderer/output.css", "prepare": "husky install", + "sonar": "node scripts/sonar-scan.js", "release": "node scripts/index.js release", "clean": "node scripts/index.js clean", "setup": "node scripts/index.js setup", @@ -140,6 +142,7 @@ "postcss": "^8.4.35", "postcss-loader": "^8.1.0", "prettier": "^3.2.5", + "rimraf": "^5.0.5", "style-loader": "^3.3.4", "sonarqube-scanner": "^3.3.0", "tailwindcss": "^3.4.1", diff --git a/scripts/README.md b/scripts/README.md new file mode 100644 index 0000000..d8bdc2b --- /dev/null +++ b/scripts/README.md @@ -0,0 +1,87 @@ +# AI Code Fusion Scripts + +This directory contains scripts for development, building, and releasing the AI Code Fusion application. + +## Script Organization + +- `index.js` - Main entry point for all scripts +- `lib/` - Reusable script modules + - `build.js` - Build-related functions + - `dev.js` - Development server functions + - `release.js` - Release preparation functions + - `utils.js` - Shared utility functions +- `prepare-release.js` - Standalone script for release preparation +- Various utility scripts for specific tasks + +## Usage + +The recommended way to run scripts is through the unified `index.js` entry point: + +```bash +node scripts/index.js [args...] +``` + +### Available Commands + +#### Development + +- `dev` or `start` - Start the development server +- `css` - Build CSS files +- `css:watch` - Watch and rebuild CSS files on changes + +#### Building + +- `build` - Build for the current platform +- `build-win` - Build for Windows +- `build-linux` - Build for Linux +- `build-mac` - Build for macOS (Intel) +- `build-mac-arm` - Build for macOS (Apple Silicon) +- `build-mac-universal` - Build for macOS (Universal) + +#### Testing and Quality + +- `test` - Run all tests +- `test:watch` - Watch and run tests on changes +- `lint` - Run linter +- `format` - Run code formatter +- `validate` - Run all validation (lint + test) +- `sonar` - Run SonarQube analysis + +#### Release Management + +- `release ` - Prepare a new release + - `` can be a specific version number or `patch`, `minor`, or `major` + +#### Utility Commands + +- `setup` or `init` - Setup project +- `clean` - Clean build artifacts +- `clean-all` - Clean all generated files (including node_modules) +- `icons` - Generate application icons + +## Release Process + +The release process is handled by the `release.js` module, which can be invoked in two ways: + +```bash +# Using the unified entry point +node scripts/index.js release + +# Using the standalone script +node scripts/prepare-release.js +``` + +The release preparation process: + +1. Updates the version in `package.json` +2. Prompts for changelog entries and updates `CHANGELOG.md` +3. Creates a git commit with the changes +4. Creates a git tag for the release + +After running the script, you need to manually push the changes and tag: + +```bash +git push && git push origin v +``` + +This will trigger the GitHub Actions workflow to build the application and create a release. diff --git a/scripts/clean-dev-assets.js b/scripts/clean-dev-assets.js new file mode 100644 index 0000000..5bba4fb --- /dev/null +++ b/scripts/clean-dev-assets.js @@ -0,0 +1,43 @@ +/** + * This script cleans development assets to ensure they're properly rebuilt. + * It removes CSS output files and bundled JS files. + */ + +const fs = require('fs'); +const path = require('path'); +const { promisify } = require('util'); +const rimraf = promisify(require('rimraf')); + +// Asset paths relative to project root +const assetPaths = [ + 'src/renderer/bundle.js', + 'src/renderer/bundle.js.map', + 'src/renderer/bundle.js.LICENSE.txt', + 'src/renderer/output.css', +]; + +async function cleanDevAssets() { + console.log('๐Ÿงน Cleaning development assets...'); + + for (const assetPath of assetPaths) { + const fullPath = path.join(process.cwd(), assetPath); + + try { + await rimraf(fullPath); + console.log(` โœ“ Removed: ${assetPath}`); + } catch (err) { + // Ignore errors for files that don't exist + if (err.code !== 'ENOENT') { + console.error(` โœ— Error removing ${assetPath}:`, err.message); + } + } + } + + console.log('โœ… Development assets cleaned successfully'); +} + +// Run the cleaning process +cleanDevAssets().catch((err) => { + console.error('Error cleaning assets:', err); + process.exit(1); +}); diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js new file mode 100644 index 0000000..53670d0 --- /dev/null +++ b/scripts/prepare-release.js @@ -0,0 +1,48 @@ +#!/usr/bin/env node +/** + * Prepare Release Script + * + * This script is a convenience wrapper that calls the release module + * to prepare a new release by updating the version, changelog, and creating a git tag. + * + * Usage: + * node scripts/prepare-release.js + * + * Arguments: + * - Can be a specific version number (e.g. '1.0.0') or 'patch', 'minor', or 'major' + * + * Example: + * node scripts/prepare-release.js patch # Increments patch version + * node scripts/prepare-release.js minor # Increments minor version + * node scripts/prepare-release.js major # Increments major version + * node scripts/prepare-release.js 1.2.3 # Sets version to 1.2.3 + */ + +const release = require('./lib/release'); + +async function main() { + // Get version from arguments + const version = process.argv[2]; + + if (!version) { + console.error('Error: Version argument is required'); + console.error('Usage: node scripts/prepare-release.js '); + console.error('Example: node scripts/prepare-release.js 1.0.0'); + console.error('or: node scripts/prepare-release.js patch|minor|major'); + process.exit(1); + } + + try { + // Call the release prepare function + await release.prepare(version); + } catch (error) { + console.error(`Error preparing release: ${error.message}`); + process.exit(1); + } +} + +// Run the main function +main().catch((error) => { + console.error(`Unhandled error: ${error.message}`); + process.exit(1); +}); diff --git a/scripts/sonar-scan.js b/scripts/sonar-scan.js index 28f39a3..94f42dc 100755 --- a/scripts/sonar-scan.js +++ b/scripts/sonar-scan.js @@ -4,6 +4,31 @@ const fs = require('fs'); const path = require('path'); const sonarqubeScanner = require('sonarqube-scanner'); +// Load environment variables from .env file +const dotenvPath = path.resolve(__dirname, '..', '.env'); +if (fs.existsSync(dotenvPath)) { + console.log('Loading environment variables from .env file'); + const envConfig = fs + .readFileSync(dotenvPath, 'utf8') + .split('\n') + .filter((line) => line.trim() && !line.startsWith('#')) + .reduce((acc, line) => { + const [key, value] = line.split('=').map((part) => part.trim()); + if (key && value) { + acc[key] = value; + // Also set in process.env if not already set + if (!process.env[key]) { + process.env[key] = value; + } + } + return acc; + }, {}); + + console.log('Loaded environment variables:', Object.keys(envConfig).join(', ')); +} else { + console.log('No .env file found, using existing environment variables'); +} + // Check environment variables const sonarToken = process.env.SONAR_TOKEN; const sonarUrl = process.env.SONAR_URL; diff --git a/src/main/index.js b/src/main/index.js index ae1775e..f5819fc 100755 --- a/src/main/index.js +++ b/src/main/index.js @@ -1,15 +1,20 @@ -const { app, BrowserWindow, ipcMain, dialog } = require('electron'); +const { app, BrowserWindow, ipcMain, dialog, protocol } = require('electron'); const path = require('path'); const fs = require('fs'); const yaml = require('yaml'); const { TokenCounter } = require('../utils/token-counter'); -const { FileAnalyzer } = require('../utils/file-analyzer'); +const { FileAnalyzer, isBinaryFile } = require('../utils/file-analyzer'); const { ContentProcessor } = require('../utils/content-processor'); const { GitignoreParser } = require('../utils/gitignore-parser'); +const { loadDefaultConfig } = require('../utils/config-manager'); +const { shouldExclude, getRelativePath, normalizePath } = require('../utils/filter-utils'); // Initialize the gitignore parser const gitignoreParser = new GitignoreParser(); +// Create a singleton TokenCounter instance for reuse +const tokenCounter = new TokenCounter(); + // Keep a global reference of the window object to avoid garbage collection let mainWindow; @@ -25,6 +30,7 @@ async function createWindow() { nodeIntegration: false, contextIsolation: true, preload: path.join(__dirname, 'preload.js'), + additionalArguments: [`--app-dev-mode=${isDevelopment ? 'true' : 'false'}`], }, autoHideMenuBar: true, // Hide the menu bar by default icon: path.join(__dirname, '../assets/icon.ico'), // Set the application icon @@ -41,6 +47,12 @@ async function createWindow() { await mainWindow.loadFile(path.join(__dirname, '../renderer/index.html')); } + // Set up protocol for the public assets folder + protocol.registerFileProtocol('assets', (request) => { + const url = request.url.slice(9); // Remove 'assets://' prefix + return { path: path.normalize(`${__dirname}/../../public/assets/${url}`) }; + }); + // Window closed event mainWindow.on('closed', () => { mainWindow = null; @@ -53,7 +65,16 @@ if (process.platform === 'win32') { } // Create window when Electron is ready -app.whenReady().then(createWindow); +app.whenReady().then(() => { + // Register assets protocol + protocol.registerFileProtocol('assets', (request) => { + const url = request.url.replace('assets://', ''); + const assetPath = path.normalize(path.join(__dirname, '../../public/assets', url)); + return { path: assetPath }; + }); + + createWindow(); +}); // Quit when all windows are closed app.on('window-all-closed', () => { @@ -97,17 +118,29 @@ ipcMain.handle('fs:getDirectoryTree', async (_, dirPath, configContent) => { // Check if we should use custom excludes (default to true if not specified) const useCustomExcludes = config.use_custom_excludes !== false; - // Check if we should use gitignore (default to false if not specified) - const useGitignore = config.use_gitignore === true; + // Check if we should use custom includes (default to true if not specified) + const useCustomIncludes = config.use_custom_includes !== false; - // Start with default critical patterns - excludePatterns = ['**/node_modules/**', '**/.git/**', '**/dist/**', '**/build/**']; + // Check if we should use gitignore (default to true if not specified) + const useGitignore = config.use_gitignore !== false; + + // Start with empty excludePatterns array (no hardcoded patterns) + excludePatterns = ['']; // Add custom exclude patterns if enabled if (useCustomExcludes && config.exclude_patterns && Array.isArray(config.exclude_patterns)) { excludePatterns = [...excludePatterns, ...config.exclude_patterns]; } + // Store include extensions for filtering later (if enabled) + if ( + useCustomIncludes && + config.include_extensions && + Array.isArray(config.include_extensions) + ) { + excludePatterns.includeExtensions = config.include_extensions; + } + // Add gitignore patterns if enabled if (useGitignore) { const gitignoreResult = gitignoreParser.parseGitignore(dirPath); @@ -123,92 +156,18 @@ ipcMain.handle('fs:getDirectoryTree', async (_, dirPath, configContent) => { } } catch (error) { console.error('Error parsing config:', error); - // Fall back to default exclude patterns - excludePatterns = ['**/node_modules/**', '**/.git/**', '**/dist/**', '**/build/**']; + // Fall back to only hiding .git folder + excludePatterns = ['**/.git/**']; } - // Helper function to check if a path should be excluded - const shouldExclude = (itemPath, itemName) => { - // Use our consistent path normalization function - const normalizedPath = getRelativePath(itemPath, dirPath); + // Import the fnmatch module - // Check for common directories to exclude - if (['node_modules', '.git', 'dist', 'build'].includes(itemName)) { - return true; - } - - // Special case for root-level files - check if the file name directly matches a pattern - // This ensures patterns like ".env" will match files at the root level - const isRootLevelFile = normalizedPath.indexOf('/') === -1; - - // First check if path is in include patterns (negated gitignore patterns) - // includePatterns take highest priority - if (excludePatterns.includePatterns) { - for (const pattern of excludePatterns.includePatterns) { - try { - // Direct match for simple patterns (especially for root-level files) - if (isRootLevelFile && !pattern.includes('/') && !pattern.includes('*')) { - if (normalizedPath === pattern) { - return false; // Include this file - } - } + // Get the config for filtering + const config = configContent ? yaml.parse(configContent) : { exclude_patterns: [] }; - // Simple pattern matching - if (pattern.includes('*')) { - // Replace ** with wildcard - const regexPattern = pattern - .replace(/[.+^${}()|[\]\\]/g, '\\$&') - .replace(/\*\*/g, '.*') - .replace(/\*/g, '[^/]*') - .replace(/\?/g, '[^/]'); - - // Match against the pattern - const regex = new RegExp(`^${regexPattern}$`); - if (regex.test(normalizedPath) || regex.test(itemName)) { - // This path explicitly matches an include pattern, so don't exclude it - return false; - } - } else if (normalizedPath === pattern || itemName === pattern) { - return false; - } - } catch (error) { - console.error(`Error matching include pattern ${pattern}:`, error); - } - } - } - - // Then check exclude patterns - for (const pattern of Array.isArray(excludePatterns) ? excludePatterns : []) { - try { - // Direct match for simple patterns (especially for root-level files) - if (isRootLevelFile && !pattern.includes('/') && !pattern.includes('*')) { - if (normalizedPath === pattern) { - return true; // Exclude this file - } - } - - // Simple pattern matching - if (pattern.includes('*')) { - // Replace ** with wildcard - const regexPattern = pattern - .replace(/[.+^${}()|[\]\\]/g, '\\$&') - .replace(/\*\*/g, '.*') - .replace(/\*/g, '[^/]*') - .replace(/\?/g, '[^/]'); - - // Match against the pattern - const regex = new RegExp(`^${regexPattern}$`); - if (regex.test(normalizedPath) || regex.test(itemName)) { - return true; - } - } else if (normalizedPath === pattern || itemName === pattern) { - return true; - } - } catch (error) { - console.error(`Error matching pattern ${pattern}:`, error); - } - } - return false; + // Use the shared shouldExclude function from filter-utils + const localShouldExclude = (itemPath) => { + return shouldExclude(itemPath, dirPath, excludePatterns, config); }; const walkDirectory = (dir) => { @@ -220,7 +179,7 @@ ipcMain.handle('fs:getDirectoryTree', async (_, dirPath, configContent) => { const itemPath = path.join(dir, item); // Skip excluded items based on patterns, but don't exclude binary files from the tree - if (shouldExclude(itemPath, item)) { + if (localShouldExclude(itemPath)) { continue; } @@ -273,16 +232,7 @@ ipcMain.handle('fs:getDirectoryTree', async (_, dirPath, configContent) => { } }); -// Utility function to normalize paths consistently -const normalizePath = (inputPath) => { - return inputPath.replace(/\\/g, '/'); -}; - -// Utility function to get relative path consistently -const getRelativePath = (filePath, rootPath) => { - const relativePath = path.relative(rootPath, filePath); - return normalizePath(relativePath); -}; +// Use the imported normalizePath from filter-utils // Analyze repository ipcMain.handle('repo:analyze', async (_, { rootPath, configContent, selectedFiles }) => { @@ -362,6 +312,58 @@ ipcMain.handle('repo:analyze', async (_, { rootPath, configContent, selectedFile } }); +// Helper function to generate tree view from filesInfo +function generateTreeView(filesInfo) { + if (!filesInfo || !Array.isArray(filesInfo)) { + return ''; + } + + // Generate a more structured tree view from filesInfo + const sortedFiles = [...filesInfo].sort((a, b) => a.path.localeCompare(b.path)); + + // Build a path tree + const pathTree = {}; + sortedFiles.forEach((file) => { + if (!file || !file.path) return; + + const parts = file.path.split('/'); + let currentLevel = pathTree; + + parts.forEach((part, index) => { + if (!currentLevel[part]) { + currentLevel[part] = index === parts.length - 1 ? null : {}; + } + + if (index < parts.length - 1) { + currentLevel = currentLevel[part]; + } + }); + }); + + // Recursive function to print the tree + const printTree = (tree, prefix = '', isLast = true) => { + const entries = Object.entries(tree); + let result = ''; + + entries.forEach(([key, value], index) => { + const isLastItem = index === entries.length - 1; + + // Print current level + result += `${prefix}${isLast ? 'โ””โ”€โ”€ ' : 'โ”œโ”€โ”€ '}${key}\n`; + + // Print children + if (value !== null) { + const newPrefix = `${prefix}${isLast ? ' ' : 'โ”‚ '}`; + result += printTree(value, newPrefix, isLastItem); + } + }); + + return result; + }; + + return printTree(pathTree); +} + // Process repository ipcMain.handle('repo:process', async (_, { rootPath, filesInfo, treeView, options = {} }) => { try { @@ -377,11 +379,14 @@ ipcMain.handle('repo:process', async (_, { rootPath, filesInfo, treeView, option let processedContent = '# Repository Content\n\n'; - // Add tree view if provided - if (treeView) { + // Add tree view if requested in options, whether provided or not + if (options.includeTreeView) { processedContent += '## File Structure\n\n'; processedContent += '```\n'; - processedContent += treeView; + + // If treeView was provided, use it, otherwise generate a more complete one + processedContent += treeView || generateTreeView(filesInfo); + processedContent += '```\n\n'; processedContent += '## File Contents\n\n'; } @@ -390,13 +395,24 @@ ipcMain.handle('repo:process', async (_, { rootPath, filesInfo, treeView, option let processedFiles = 0; let skippedFiles = 0; - for (const { path: filePath, tokens } of filesInfo) { + for (const fileInfo of filesInfo ?? []) { try { + if (!fileInfo || !fileInfo.path) { + console.warn('Skipping invalid file info entry'); + skippedFiles++; + continue; + } + + const { path: filePath, tokens = 0 } = fileInfo; + // Use consistent path joining const fullPath = path.join(rootPath, filePath); // Validate the full path is within the root path - if (!normalizePath(fullPath).startsWith(normalizePath(rootPath))) { + const normalizedFullPath = normalizePath(fullPath); + const normalizedRootPath = normalizePath(rootPath); + + if (!normalizedFullPath.startsWith(normalizedRootPath)) { console.warn(`Skipping file outside root directory: ${filePath}`); skippedFiles++; continue; @@ -415,24 +431,19 @@ ipcMain.handle('repo:process', async (_, { rootPath, filesInfo, treeView, option skippedFiles++; } } catch (error) { - console.warn(`Failed to process ${filePath}: ${error.message}`); + console.warn(`Failed to process file: ${error.message}`); skippedFiles++; } } processedContent += '\n--END--\n'; - processedContent += `Total tokens: ${totalTokens}\n`; - processedContent += `Processed files: ${processedFiles}\n`; - - if (skippedFiles > 0) { - processedContent += `Skipped files: ${skippedFiles}\n`; - } return { content: processedContent, totalTokens, processedFiles, skippedFiles, + filesInfo: filesInfo, // Add filesInfo to the response }; } catch (error) { console.error('Error processing repository:', error); @@ -464,3 +475,77 @@ ipcMain.handle('gitignore:resetCache', () => { gitignoreParser.clearCache(); return true; }); + +// Get default configuration +ipcMain.handle('config:getDefault', async () => { + try { + return loadDefaultConfig(); + } catch (error) { + console.error('Error loading default config:', error); + throw error; + } +}); + +// Get path to an asset +ipcMain.handle('assets:getPath', (_, assetName) => { + try { + const assetPath = path.join(__dirname, '..', 'assets', assetName); + if (fs.existsSync(assetPath)) { + return assetPath; + } + console.error(`Asset not found: ${assetName} at ${assetPath}`); + return null; + } catch (error) { + console.error('Error getting asset path:', error); + return null; + } +}); + +// Count tokens for multiple files in a single call +ipcMain.handle('tokens:countFiles', async (_, filePaths) => { + try { + const results = {}; + const stats = {}; + + // Process each file + for (const filePath of filePaths) { + try { + // Check if file exists + if (!fs.existsSync(filePath)) { + console.warn(`File not found for token counting: ${filePath}`); + results[filePath] = 0; + continue; + } + + // Get file stats + const fileStats = fs.statSync(filePath); + stats[filePath] = { + size: fileStats.size, + mtime: fileStats.mtime.getTime(), // Modification time for cache validation + }; + + // Skip binary files + if (isBinaryFile(filePath)) { + console.log(`Skipping binary file for token counting: ${filePath}`); + results[filePath] = 0; + continue; + } + + // Read file content + const content = fs.readFileSync(filePath, { encoding: 'utf-8', flag: 'r' }); + + // Count tokens using the singleton token counter + const tokenCount = tokenCounter.countTokens(content); + results[filePath] = tokenCount; + } catch (error) { + console.error(`Error counting tokens for file ${filePath}:`, error); + results[filePath] = 0; + } + } + + return { results, stats }; + } catch (error) { + console.error(`Error counting tokens for files:`, error); + return { results: {}, stats: {} }; + } +}); diff --git a/src/main/preload.js b/src/main/preload.js index 91aa411..9699862 100755 --- a/src/main/preload.js +++ b/src/main/preload.js @@ -1,4 +1,21 @@ -const { contextBridge, ipcRenderer } = require('electron'); +const { contextBridge, ipcRenderer, shell } = require('electron'); + +// Expose development utilities for managing localStorage +const isDev = process.env.NODE_ENV === 'development'; +contextBridge.exposeInMainWorld('devUtils', { + clearLocalStorage: () => { + // Signal to clear, but actual clearing happens in renderer + return isDev; + }, + isDev: isDev, +}); + +// Expose electron shell for external links +contextBridge.exposeInMainWorld('electron', { + shell: { + openExternal: (url) => shell.openExternal(url), + }, +}); // Expose protected methods that allow the renderer process to use // the ipcRenderer without exposing the entire object @@ -15,4 +32,13 @@ contextBridge.exposeInMainWorld('electronAPI', { // Repository operations analyzeRepository: (options) => ipcRenderer.invoke('repo:analyze', options), processRepository: (options) => ipcRenderer.invoke('repo:process', options), + + // Configuration operations + getDefaultConfig: () => ipcRenderer.invoke('config:getDefault'), + + // Asset operations + getAssetPath: (assetName) => ipcRenderer.invoke('assets:getPath', assetName), + + // Token counting + countFilesTokens: (filePaths) => ipcRenderer.invoke('tokens:countFiles', filePaths), }); diff --git a/src/renderer/components/AnalyzeTab.jsx b/src/renderer/components/AnalyzeTab.jsx deleted file mode 100755 index d7db3c6..0000000 --- a/src/renderer/components/AnalyzeTab.jsx +++ /dev/null @@ -1,188 +0,0 @@ -import React, { useState } from 'react'; -import PropTypes from 'prop-types'; - -const AnalyzeTab = ({ analysisResult, onProcess }) => { - const [includeTreeView, setIncludeTreeView] = useState(false); - const [showTokenCount, setShowTokenCount] = useState(true); - - // Generate a tree view of the selected files - const generateTreeView = () => { - if (!analysisResult || !analysisResult.filesInfo || !analysisResult.filesInfo.length) { - return ''; - } - - // This is a simplified tree view since we don't have access to the original implementation - // You might want to move the actual tree generation logic here from SourceTab - let treeText = 'File structure will be included in the output\n'; - analysisResult.filesInfo.forEach((file) => { - treeText += `โ”œโ”€โ”€ ${file.path}\n`; - }); - - return treeText; - }; - - if (!analysisResult) { - return ( -
- - - -

No Analysis Available

-

- Please select files and run analysis from the Select Files tab first. -

-
- ); - } - - return ( -
-

Analysis Results

- -
-
-
-
Total Files
-
{analysisResult.filesInfo.length}
-
- -
-
Total Tokens
-
- {analysisResult.totalTokens.toLocaleString()} -
-
-
-
- -

Files by Token Count

- -
-
- - - - - - - - - {analysisResult.filesInfo.map((file, index) => ( - - - - - ))} - -
- File Path - - Tokens -
{file.path}{file.tokens.toLocaleString()}
-
-
- -
-

Processing Options

- -
-
-
- setIncludeTreeView(!includeTreeView)} - /> - -
- -
- {includeTreeView - ? 'A tree structure of all files will be included' - : 'No file tree will be included'} -
- - {includeTreeView && ( -
-
Preview:
- 
-                  {generateTreeView().substring(0, 200) +
-                    (generateTreeView().length > 200 ? '...' : '')}
-
-
- )} -
- -
-
- setShowTokenCount(!showTokenCount)} - /> - -
- -
- {showTokenCount - ? 'Token counts will be shown in file headers' - : 'Token counts will be hidden from file headers'} -
- -
-
File header preview:
- 
-                {'######\n'}
-                {showTokenCount ? 'src\\main\\index.js (1599 tokens)' : 'src\\main\\index.js'}
-                {'\n######'}
-
-
-
-
- -
- -
-
-
- ); -}; - -AnalyzeTab.propTypes = { - analysisResult: PropTypes.object, - onProcess: PropTypes.func.isRequired, -}; - -export default AnalyzeTab; diff --git a/src/renderer/components/App.jsx b/src/renderer/components/App.jsx index b32dac7..ee3e7ed 100755 --- a/src/renderer/components/App.jsx +++ b/src/renderer/components/App.jsx @@ -1,135 +1,156 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import TabBar from './TabBar'; import SourceTab from './SourceTab'; import ConfigTab from './ConfigTab'; -import AnalyzeTab from './AnalyzeTab'; import ProcessedTab from './ProcessedTab'; - -const defaultConfig = `# Filtering options -use_custom_excludes: true -use_gitignore: true - - -# File extensions to include (with dot) -include_extensions: - - .py - - .ts - - .js - - .jsx - - .tsx - - .json - - .md - - .txt - - .html - - .css - - .scss - - .less - - .ini - - .yaml - - .yml - - .kt - - .java - - .go - - .scm - - .php - - .rb - - .c - - .cpp - - .h - - .cs - - .sql - - .sh - - .bat - - .ps1 - - .xml - - .config - -# Patterns to exclude (using fnmatch syntax) -exclude_patterns: - # Version Control - - "**/.git/**" - - "**/.svn/**" - - "**/.hg/**" - - "**/vocab.txt" - - "**.onnx" - - "**/test*.py" - - # Dependencies - - "**/node_modules/**" - - "**/venv/**" - - "**/env/**" - - "**/.venv/**" - - "**/.github/**" - - "**/vendor/**" - - "**/website/**" - - # Build outputs - - "**/test/**" - - "**/dist/**" - - "**/build/**" - - "**/__pycache__/**" - - "**/*.pyc" - - "**/bundle.js" - - "**/bundle.js.map" - - "**/bundle.js.LICENSE.txt" - - "**/index.js.map" - - "**/output.css" - - # Config files - - "**/.DS_Store" - - "**/.env" - - "**/package-lock.json" - - "**/yarn.lock" - - "**/.prettierrc" - - "**/.prettierignore" - - "**/.gitignore" - - "**/.gitattributes" - - "**/.npmrc" - - # Documentation - - "**/LICENSE*" - - "**/LICENSE.*" - - "**/COPYING" - - "**/CODE_OF**" - - "**/CONTRIBUTING**" - - # Test files - - "**/tests/**" - - "**/test/**" - - "**/__tests__/**"`; +import DarkModeToggle from './DarkModeToggle'; +import { DarkModeProvider } from '../context/DarkModeContext'; +import yaml from 'yaml'; + +// Helper function to ensure consistent error handling +const ensureError = (error) => { + if (error instanceof Error) return error; + return new Error(String(error)); +}; const App = () => { const [activeTab, setActiveTab] = useState('config'); const [rootPath, setRootPath] = useState(''); const [directoryTree, setDirectoryTree] = useState([]); const [selectedFiles, setSelectedFiles] = useState([]); - const [configContent, setConfigContent] = useState(defaultConfig); + // Load config from localStorage or via API, no fallbacks + const [configContent, setConfigContent] = useState('# Loading configuration...'); + + // Load config from localStorage or default config + useEffect(() => { + // First try to load from localStorage + const savedConfig = localStorage.getItem('configContent'); + if (savedConfig) { + setConfigContent(savedConfig); + } else if (window.electronAPI?.getDefaultConfig) { + // Otherwise load from the main process + window.electronAPI + .getDefaultConfig?.() + .then((defaultConfig) => { + if (defaultConfig) { + setConfigContent(defaultConfig); + localStorage.setItem('configContent', defaultConfig); + } + }) + .catch((err) => { + console.error('Error loading config:', err); + }); + } + + // Load rootPath from localStorage if available + const savedRootPath = localStorage.getItem('rootPath'); + if (savedRootPath) { + setRootPath(savedRootPath); + // Load directory tree for the saved path + if (window.electronAPI?.getDirectoryTree) { + window.electronAPI + .getDirectoryTree?.(savedRootPath, localStorage.getItem('configContent')) + .then((tree) => { + setDirectoryTree(tree); + }) + .catch((err) => { + console.error('Error loading directory tree:', err); + }); + } + } + }, []); + + // Setup path change listener to keep all components in sync + useEffect(() => { + // Create a function to check for rootPath changes + const handleStorageChange = (e) => { + if (e.key === 'rootPath' && e.newValue !== rootPath) { + // Update our internal state with the new path + setRootPath(e.newValue); + } + }; + + // Add event listener for localStorage changes + window.addEventListener('storage', handleStorageChange); + + // Create an interval to check localStorage directly (for cross-component updates) + const pathSyncInterval = setInterval(() => { + const currentStoredPath = localStorage.getItem('rootPath'); + if (currentStoredPath && currentStoredPath !== rootPath) { + setRootPath(currentStoredPath); + } + }, 500); + + // Cleanup + return () => { + window.removeEventListener('storage', handleStorageChange); + clearInterval(pathSyncInterval); + }; + }, [rootPath]); + + // Whenever configContent changes, save to localStorage + useEffect(() => { + localStorage.setItem('configContent', configContent); + }, [configContent]); + /* This state is used indirectly via setAnalysisResult to track analysis results. + Although the variable is not directly read, the state updates are important + for component lifecycle and data flow (e.g., used in handleRefreshProcessed). + SonarQube flags this as unused, but removing it would break functionality. + SONARQUBE-IGNORE: Necessary React state with side effects */ + // eslint-disable-next-line no-unused-vars const [analysisResult, setAnalysisResult] = useState(null); const [processedResult, setProcessedResult] = useState(null); const handleTabChange = (tab) => { + if (activeTab === tab) return; // Don't do anything if clicking the same tab + + // Save current tab configuration to localStorage for all components to access + localStorage.setItem('configContent', configContent); + + // When switching tabs, try to do so with consistent state + try { + const config = yaml.parse(configContent) || {}; + + // Make sure arrays are initialized to avoid issues + if (!config.include_extensions) config.include_extensions = []; + if (!config.exclude_patterns) config.exclude_patterns = []; + + // Update processing options from config to maintain consistency + setProcessingOptions({ + showTokenCount: config.show_token_count === true, + includeTreeView: config.include_tree_view === true, + }); + + // Ensure we've saved any config changes before switching tabs + localStorage.setItem('configContent', configContent); + } catch (error) { + console.error('Error parsing config when changing tabs:', error); + } + setActiveTab(tab); // If switching from config tab to source tab and we have a root path, refresh the directory tree // This allows the exclude patterns to be applied when the config is updated if (activeTab === 'config' && tab === 'source' && rootPath) { // Reset gitignore parser cache to ensure fresh parsing - window.electronAPI.resetGitignoreCache && window.electronAPI.resetGitignoreCache(); + window.electronAPI?.resetGitignoreCache?.(); // refreshDirectoryTree now resets selection states and gets a fresh tree refreshDirectoryTree(); } - // Clear analysis and processed results when switching to source to select new files - // But don't clear selections when switching from analyze to source - if (tab === 'source' && activeTab !== 'analyze') { + // Clear analysis results when switching to source tab + if (tab === 'source') { setAnalysisResult(null); } - if (tab === 'source' && activeTab !== 'processed') { + if (tab === 'source') { setProcessedResult(null); } }; + // Expose the tab change function for other components to use + window.switchToTab = handleTabChange; + // Function to refresh the directory tree with current config const refreshDirectoryTree = async () => { if (rootPath) { @@ -142,18 +163,19 @@ const App = () => { setProcessedResult(null); // Reset gitignore cache to ensure fresh parsing - if (window.electronAPI.resetGitignoreCache) { - await window.electronAPI.resetGitignoreCache(); - } + await window.electronAPI?.resetGitignoreCache?.(); // Get fresh directory tree - const tree = await window.electronAPI.getDirectoryTree(rootPath, configContent); + const tree = await window.electronAPI?.getDirectoryTree?.(rootPath, configContent); setDirectoryTree(tree); } }; + // Expose the refreshDirectoryTree function to the window object for SourceTab to use + window.refreshDirectoryTree = refreshDirectoryTree; + const handleDirectorySelect = async () => { - const dirPath = await window.electronAPI.selectDirectory(); + const dirPath = await window.electronAPI?.selectDirectory?.(); if (dirPath) { // First reset selection states and analysis results @@ -162,27 +184,33 @@ const App = () => { setAnalysisResult(null); setProcessedResult(null); - // Update rootPath + // Update rootPath and save to localStorage setRootPath(dirPath); + localStorage.setItem('rootPath', dirPath); + + // Dispatch a custom event to notify all components of the path change + window.dispatchEvent(new CustomEvent('rootPathChanged', { detail: dirPath })); // Reset gitignore cache to ensure fresh parsing - if (window.electronAPI.resetGitignoreCache) { - await window.electronAPI.resetGitignoreCache(); - } + await window.electronAPI?.resetGitignoreCache?.(); // Get fresh directory tree - const tree = await window.electronAPI.getDirectoryTree(dirPath, configContent); + const tree = await window.electronAPI?.getDirectoryTree?.(dirPath, configContent); setDirectoryTree(tree); } }; // Create state for processing options - const [processingOptions, setProcessingOptions] = useState({ showTokenCount: true }); + const [processingOptions, setProcessingOptions] = useState({ + showTokenCount: false, + includeTreeView: false, + }); + // Process files directly from Source to Processed Output const handleAnalyze = async () => { if (!rootPath || selectedFiles.length === 0) { alert('Please select a root directory and at least one file.'); - return Promise.reject(new Error('No directory or files selected')); + throw new Error('No directory or files selected'); } try { @@ -202,150 +230,121 @@ const App = () => { alert( 'No valid files selected for analysis. Please select files within the current directory.' ); - return Promise.reject(new Error('No valid files selected')); + throw new Error('No valid files selected'); } // Apply current config before analyzing - const result = await window.electronAPI.analyzeRepository({ + const currentAnalysisResult = await window.electronAPI?.analyzeRepository?.({ rootPath, configContent, selectedFiles: validFiles, // Use validated files only }); - setAnalysisResult(result); - // Switch to analyze tab to show results - setActiveTab('analyze'); - return Promise.resolve(result); - } catch (error) { - console.error('Error analyzing repository:', error); - alert(`Error analyzing repository: ${error.message}`); - return Promise.reject(error); - } - }; - - // Helper function for consistent path normalization - const normalizeAndGetRelativePath = (filePath) => { - if (!filePath || !rootPath) return ''; - - // Get path relative to root - const relativePath = filePath.replace(rootPath, '').replace(/\\/g, '/').replace(/^\/+/, ''); - - return relativePath; - }; - - // Helper function to generate tree view of selected files - const generateTreeView = () => { - if (!selectedFiles.length) return ''; - - // Create a mapping of paths to help build the tree - const pathMap = new Map(); - - // Process selected files to build a tree structure - selectedFiles.forEach((filePath) => { - // Get relative path using the consistent normalization function - const relativePath = normalizeAndGetRelativePath(filePath); - - if (!relativePath) { - console.warn(`Skipping invalid path: ${filePath}`); - return; + // Store analysis result + setAnalysisResult(currentAnalysisResult); + + // Read options from config + let options = {}; + try { + const config = yaml.parse(configContent); + options.showTokenCount = config.show_token_count === true; + options.includeTreeView = config.include_tree_view === true; + } catch (error) { + console.error('Error parsing config for processing:', ensureError(error)); } - const parts = relativePath.split('/'); - - // Build tree structure - let currentPath = ''; - parts.forEach((part, index) => { - const isFile = index === parts.length - 1; - const prevPath = currentPath; - currentPath = currentPath ? `${currentPath}/${part}` : part; - - if (!pathMap.has(currentPath)) { - pathMap.set(currentPath, { - name: part, - path: currentPath, - isFile, - children: [], - level: index, - }); - - // Add to parent's children - if (prevPath) { - const parent = pathMap.get(prevPath); - if (parent) { - parent.children.push(pathMap.get(currentPath)); - } - } - } + // Process directly without going to analyze tab + const result = await window.electronAPI?.processRepository?.({ + rootPath, + // Now using a conditional expression to meet SonarQube's preference + filesInfo: currentAnalysisResult?.filesInfo ?? [], + treeView: null, // Let the main process handle tree generation + options, }); - }); - - // Find root nodes (level 0) - const rootNodes = Array.from(pathMap.values()).filter((node) => node.level === 0); - - // Recursive function to render tree - const renderTree = (node, prefix = '', isLast = true) => { - const linePrefix = prefix + (isLast ? 'โ””โ”€โ”€ ' : 'โ”œโ”€โ”€ '); - const childPrefix = prefix + (isLast ? ' ' : 'โ”‚ '); - let result = linePrefix; + // Check if the result is valid before using it + if (!result) { + console.error('Processing failed or returned invalid data:', result); + throw new Error('Processing operation failed or did not return expected data.'); + } - // Just add the name without icons - result += node.name + '\n'; + // Set processed result and go directly to processed tab + setProcessedResult(result); + setActiveTab('processed'); - // Sort children: folders first, then files, both alphabetically - const sortedChildren = [...node.children].sort((a, b) => { - if (a.isFile !== b.isFile) return a.isFile ? 1 : -1; - return a.name.localeCompare(b.name); - }); + return currentAnalysisResult; + } catch (error) { + const processedError = ensureError(error); + console.error('Error processing repository:', processedError); + alert(`Error processing repository: ${processedError.message}`); + throw processedError; + } + }; - // Render children - sortedChildren.forEach((child) => { - // Don't create circular reference that could cause stack overflow - const isChildLast = sortedChildren.indexOf(child) === sortedChildren.length - 1; - result += renderTree(child, childPrefix, isChildLast); - }); + // Helper function for consistent path normalization (used by handleFolderSelect indirectly) + // We'll just use inline path normalization where needed - return result; - }; + // Method to reload and reprocess files with the latest content + const handleRefreshProcessed = async () => { + try { + // First check if we have valid selections + if (!rootPath || selectedFiles.length === 0) { + alert( + 'No files are selected for processing. Please go to the Source tab and select files.' + ); + return null; + } - // Generate the tree text without mentioning the root path - let treeText = ''; - rootNodes.forEach((node, index) => { - const isLastRoot = index === rootNodes.length - 1; - treeText += renderTree(node, '', isLastRoot); - }); + console.log('Reloading and processing files...'); - return treeText; - }; + // Run a fresh analysis to re-read all files from disk + const currentReanalysisResult = await window.electronAPI?.analyzeRepository?.({ + rootPath, + configContent, + selectedFiles: selectedFiles, + }); - // Method to process from the Analyze tab - const handleProcessDirect = async (treeViewData = null, options = {}) => { - try { - if (!analysisResult) { - throw new Error('No analysis results available'); + // Update our state with the fresh analysis + setAnalysisResult(currentReanalysisResult); + + // Get the latest config options + let options = { ...processingOptions }; + try { + const configStr = localStorage.getItem('configContent'); + if (configStr) { + const config = yaml.parse(configStr); + options.showTokenCount = config.show_token_count === true; + options.includeTreeView = config.include_tree_view === true; + } + } catch (error) { + console.error('Error parsing config for refresh:', ensureError(error)); } - // Store processing options - setProcessingOptions({ ...processingOptions, ...options }); + console.log('Processing with fresh analysis and options:', options); - // Generate tree view if requested but not provided - const treeViewForProcess = - treeViewData || (options.includeTreeView ? generateTreeView() : null); - - const result = await window.electronAPI.processRepository({ + // Process with the fresh analysis + const result = await window.electronAPI?.processRepository?.({ rootPath, - filesInfo: analysisResult.filesInfo, - treeView: treeViewForProcess, + // Now using a conditional expression to meet SonarQube's preference + filesInfo: currentReanalysisResult?.filesInfo ?? [], + treeView: null, // Let server generate options, }); + // Check if the result is valid before using it + if (!result) { + console.error('Re-processing failed or returned invalid data:', result); + throw new Error('Re-processing operation failed or did not return expected data.'); + } + + // Update the result and stay on the processed tab setProcessedResult(result); - setActiveTab('processed'); return result; } catch (error) { - console.error('Error processing repository:', error); - alert(`Error processing repository: ${error.message}`); - throw error; + const processedError = ensureError(error); + console.error('Error refreshing processed content:', processedError); + alert(`Error refreshing processed content: ${processedError.message}`); + throw processedError; } }; @@ -356,13 +355,14 @@ const App = () => { } try { - await window.electronAPI.saveFile({ + await window.electronAPI?.saveFile?.({ content: processedResult.content, defaultPath: `${rootPath}/output.md`, }); } catch (error) { - console.error('Error saving file:', error); - alert(`Error saving file: ${error.message}`); + const processedError = ensureError(error); + console.error('Error saving file:', processedError); + alert(`Error saving file: ${processedError.message}`); } }; @@ -404,13 +404,13 @@ const App = () => { // Find the folder in the directory tree const findFolder = (items, path) => { - for (const item of items) { - if (item.path === path) { + for (const item of items ?? []) { + if (item?.path === path) { return item; } - if (item.type === 'directory' && item.children) { - const found = findFolder(item.children, path); + if (item?.type === 'directory' && item?.children) { + const found = findFolder(item?.children, path); if (found) { return found; } @@ -422,15 +422,15 @@ const App = () => { // Get all sub-folders in the folder recursively const getAllSubFolders = (folder) => { - if (!folder || !folder.children) return []; + if (!folder?.children) return []; let folders = []; - for (const item of folder.children) { - if (item.type === 'directory') { + for (const item of folder?.children ?? []) { + if (item?.type === 'directory') { // Validate each folder is within current root - if (item.path.startsWith(rootPath)) { - folders.push(item.path); + if (item?.path?.startsWith(rootPath)) { + folders.push(item?.path); folders = [...folders, ...getAllSubFolders(item)]; } } @@ -441,17 +441,17 @@ const App = () => { // Get all files in the folder recursively const getAllFiles = (folder) => { - if (!folder || !folder.children) return []; + if (!folder?.children) return []; let files = []; - for (const item of folder.children) { - if (item.type === 'file') { + for (const item of folder?.children ?? []) { + if (item?.type === 'file') { // Validate each file is within current root - if (item.path.startsWith(rootPath)) { - files.push(item.path); + if (item?.path?.startsWith(rootPath)) { + files.push(item?.path); } - } else if (item.type === 'directory') { + } else if (item?.type === 'directory') { files = [...files, ...getAllFiles(item)]; } } @@ -495,38 +495,98 @@ const App = () => { }; return ( -
-

AI Code Fusion

- - - -
- {activeTab === 'config' && ( - - )} - - {activeTab === 'source' && ( - - )} - - {activeTab === 'analyze' && ( - - )} - - {activeTab === 'processed' && ( - - )} + +
+ {/* Tab navigation and content container */} +
+ {/* Tab Bar and title in the same row */} +
+ +
+ + +
+
+ + {/* Tab content */} +
+ {activeTab === 'config' && ( + + )} + + {activeTab === 'source' && ( + + )} + + {activeTab === 'processed' && ( + + )} +
+
-
+ ); }; diff --git a/src/renderer/components/ConfigTab.jsx b/src/renderer/components/ConfigTab.jsx index 0417bf6..690af55 100755 --- a/src/renderer/components/ConfigTab.jsx +++ b/src/renderer/components/ConfigTab.jsx @@ -1,136 +1,429 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState, useEffect, useCallback } from 'react'; import PropTypes from 'prop-types'; import yaml from 'yaml'; +import { yamlArrayToPlainText } from '../../utils/formatters/list-formatter'; + +// Helper functions for extension and pattern handling to reduce complexity +const processExtensions = (config, setFileExtensions) => { + setFileExtensions( + config?.include_extensions && Array.isArray(config.include_extensions) + ? yamlArrayToPlainText(config.include_extensions) + : '' + ); +}; + +const processPatterns = (config, setExcludePatterns) => { + setExcludePatterns( + config?.exclude_patterns && Array.isArray(config.exclude_patterns) + ? yamlArrayToPlainText(config.exclude_patterns) + : '' + ); +}; + +// Helper function to update config-related states +const updateConfigStates = (config, stateSetters) => { + const { + setFileExtensions, + setExcludePatterns, + setUseCustomExcludes, + setUseCustomIncludes, + setUseGitignore, + setIncludeTreeView, + setShowTokenCount, + } = stateSetters; + + // Process extensions and patterns + processExtensions(config, setFileExtensions); + processPatterns(config, setExcludePatterns); + + // Set checkbox states + if (config?.use_custom_excludes !== undefined) { + setUseCustomExcludes(config.use_custom_excludes !== false); + } + + if (config?.use_custom_includes !== undefined) { + setUseCustomIncludes(config.use_custom_includes !== false); + } + + if (config?.use_gitignore !== undefined) { + setUseGitignore(config.use_gitignore !== false); + } + + if (config?.include_tree_view !== undefined) { + setIncludeTreeView(config.include_tree_view === true); + } + + if (config?.show_token_count !== undefined) { + setShowTokenCount(config.show_token_count === true); + } +}; const ConfigTab = ({ configContent, onConfigChange }) => { const [isSaved, setIsSaved] = useState(false); - const [isCopied, setIsCopied] = useState(false); const [useCustomExcludes, setUseCustomExcludes] = useState(true); - const [useGitignore, setUseGitignore] = useState(false); + const [useCustomIncludes, setUseCustomIncludes] = useState(true); + const [useGitignore, setUseGitignore] = useState(true); + const [includeTreeView, setIncludeTreeView] = useState(true); + const [showTokenCount, setShowTokenCount] = useState(true); + const [fileExtensions, setFileExtensions] = useState(''); + const [excludePatterns, setExcludePatterns] = useState(''); - // Parse config when component mounts or configContent changes + // Extract and set file extensions and exclude patterns sections useEffect(() => { try { - const config = yaml.parse(configContent); - // Default to true for useCustomExcludes if not specified - setUseCustomExcludes(config.use_custom_excludes !== false); - // Default to false for useGitignore if not specified - setUseGitignore(config.use_gitignore === true); + // Parse the YAML config + const config = yaml.parse(configContent) || {}; + + // Use helper function to update states + updateConfigStates(config, { + setFileExtensions, + setExcludePatterns, + setUseCustomExcludes, + setUseCustomIncludes, + setUseGitignore, + setIncludeTreeView, + setShowTokenCount, + }); } catch (error) { console.error('Error parsing config:', error); } }, [configContent]); - const handleSave = () => { + // Auto-save function whenever options change or manual save + const saveConfig = useCallback(() => { try { - // Parse the current config - const config = yaml.parse(configContent); + let config; - // Update the config with filter options + try { + // Parse the current config + config = yaml.parse(configContent); + // If parsing returns null or undefined, use empty object + if (!config) { + config = {}; + } + } catch (error) { + console.error('Error parsing config content, using empty config:', error); + config = {}; + } + + // Update with current values config.use_custom_excludes = useCustomExcludes; + config.use_custom_includes = useCustomIncludes; config.use_gitignore = useGitignore; + config.include_tree_view = includeTreeView; + config.show_token_count = showTokenCount; + + // Process file extensions from the textarea + config.include_extensions = fileExtensions + .split('\n') + .map((line) => line.trim()) + .filter((line) => line.length > 0); + + // Process exclude patterns from the textarea + config.exclude_patterns = excludePatterns + .split('\n') + .map((line) => line.trim()) + .filter((line) => line.length > 0); // Convert back to YAML and save const updatedConfig = yaml.stringify(config); onConfigChange(updatedConfig); + // Save to localStorage to ensure persistence + localStorage.setItem('configContent', updatedConfig); + + // Show saved indicator setIsSaved(true); setTimeout(() => { setIsSaved(false); - }, 2000); + }, 1500); } catch (error) { console.error('Error updating config:', error); alert('Error updating configuration. Please check the YAML syntax.'); } - }; + }, [ + configContent, + useCustomExcludes, + useCustomIncludes, + useGitignore, + includeTreeView, + showTokenCount, + fileExtensions, + excludePatterns, + onConfigChange, + ]); + + // Auto-save whenever any option changes, but with a small delay to prevent + // circular updates and rapid toggling + useEffect(() => { + const timer = setTimeout(saveConfig, 50); + return () => clearTimeout(timer); + }, [ + useCustomExcludes, + useCustomIncludes, + useGitignore, + includeTreeView, + showTokenCount, + saveConfig, + ]); + + // State to track the current folder path + const [folderPath, setFolderPath] = useState(localStorage.getItem('rootPath') || ''); + + // Listen for path changes from other components + useEffect(() => { + // Function to update our path when localStorage changes + const checkForPathChanges = () => { + const currentPath = localStorage.getItem('rootPath'); + if (currentPath && currentPath !== folderPath) { + setFolderPath(currentPath); + } + }; + + // Check immediately + checkForPathChanges(); - const handleCopy = () => { - navigator.clipboard.writeText(configContent); - setIsCopied(true); + // Setup interval to check for changes + const pathCheckInterval = setInterval(checkForPathChanges, 500); - // Reset copied status after 2 seconds - setTimeout(() => { - setIsCopied(false); - }, 2000); + // Listen for custom events + const handleRootPathChanged = (e) => { + if (e.detail && e.detail !== folderPath) { + setFolderPath(e.detail); + } + }; + + window.addEventListener('rootPathChanged', handleRootPathChanged); + + return () => { + clearInterval(pathCheckInterval); + window.removeEventListener('rootPathChanged', handleRootPathChanged); + }; + }, [folderPath]); + + // Handle folder selection + const handleFolderSelect = async () => { + if (window.electronAPI?.selectDirectory) { + const dirPath = await window.electronAPI.selectDirectory?.(); + if (dirPath) { + // Store the selected path in localStorage for use across the app + localStorage.setItem('rootPath', dirPath); + setFolderPath(dirPath); + + // Dispatch a custom event to notify other components + window.dispatchEvent(new CustomEvent('rootPathChanged', { detail: dirPath })); + + // Automatically switch to Select Files tab + setTimeout(() => { + goToSourceTab(); + }, 500); + } + } + }; + + const goToSourceTab = () => { + // Switch to the Source tab + if (window.switchToTab) { + window.switchToTab('source'); + } }; return (
+ {/* Folder selector */}
-
- -
- Edit the configuration to filter which files should be included -
+
+ +
-