pro-cpp-cli-core 1.0.3 → 1.0.5

package/index.js

@@ -1,15 +1,21 @@
 #!/usr/bin/env node
 
+/**
+ * PRO C++ CLI Core (With C++20 Modules Topological Sorter)
+ * FIX: Restored initProject!
+ * FIX: Smart post-build artifact routing to .build/ directory!
+ */
+
 const { execSync, spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
 const [,, command, ...args] = process.argv;
-
 let currentAppProcess = null;
 let watchTimeout = null;
 
-// Helper: Safely execute synchronous shell commands
+const BUILD_DIR = path.join(process.cwd(), '.build');
+
 function runSyncCommand(cmd) {
     try {
         execSync(cmd, { stdio: 'inherit' });
@@ -19,171 +25,194 @@ function runSyncCommand(cmd) {
     }
 }
 
-// Helper: Clean up old build files to save disk space
 function cleanupOldBuilds() {
-    const files = fs.readdirSync(process.cwd());
-    files.forEach(file => {
-        if ((file.startsWith('app_build_') && file.endsWith('.exe')) || file.endsWith('.obj') || file.endsWith('.pdb') || file.endsWith('.ilk')) {
-            try {
-                fs.unlinkSync(path.join(process.cwd(), file));
-            } catch (err) {
-                // Ignore errors: file might be locked by OS or Antivirus. We will try next time!
+    // 1. Clean .build folder
+    if (fs.existsSync(BUILD_DIR)) {
+        const files = fs.readdirSync(BUILD_DIR);
+        files.forEach(file => {
+            if (file.endsWith('.obj') || file.endsWith('.pdb') || file.endsWith('.ilk') || file.endsWith('.ifc') || file.startsWith('app_build_')) {
+                try { fs.unlinkSync(path.join(BUILD_DIR, file)); } catch (err) {}
             }
+        });
+    }
+    // 2. Clean root folder (just in case)
+    const rootFiles = fs.readdirSync(process.cwd());
+    rootFiles.forEach(file => {
+        if (file.endsWith('.obj') || file.endsWith('.pdb') || file.endsWith('.ilk') || file.endsWith('.ifc') || (file.startsWith('app_build_') && file.endsWith('.exe'))) {
+            try { fs.unlinkSync(path.join(process.cwd(), file)); } catch (err) {}
         }
     });
 }
 
-// Helper: Get all .cpp files in the directory
-function getCppFiles() {
-    const files = fs.readdirSync(process.cwd());
-    return files.filter(file => file.endsWith('.cpp')).join(' ');
-}
-
-// Command: procpp init
-function initProject() {
-    console.log("🚀 Initializing PRO C++ Project with C++20....");
+function getSortedCppFiles() {
+    const fileList = [];
     
-    const vscodeDir = path.join(process.cwd(), '.vscode');
-    if (!fs.existsSync(vscodeDir)) {
-        fs.mkdirSync(vscodeDir);
+    function scanDir(dir) {
+        const files = fs.readdirSync(dir);
+        for (const file of files) {
+            const filePath = path.join(dir, file);
+            if (fs.statSync(filePath).isDirectory()) {
+                // ИГНОРИРУЕМ ПАПКУ .build, ЧТОБЫ ВОЧЕР НЕ СОШЕЛ С УМА
+                if (file !== 'node_modules' && file !== '.vscode' && file !== '.build') {
+                    scanDir(filePath);
+                }
+            } else if (filePath.endsWith('.cpp') || filePath.endsWith('.ixx')) {
+                fileList.push(filePath);
+            }
+        }
     }
+    scanDir(process.cwd());
 
-    const mainCppPath = path.join(process.cwd(), 'main.cpp');
-    const mainCppContent = `#include <iostream>\n\n// The main entry point of the application\nint main() {\n    std::cout << "PRO CLI works like magic!\\n";\n    return 0;\n}\n`;
+    const fileData = fileList.map(file => {
+        const content = fs.readFileSync(file, 'utf8');
+        const exportsMatch = content.match(/export\s+module\s+([a-zA-Z0-9_]+)\s*;/);
+        const importsMatches = [...content.matchAll(/import\s+([a-zA-Z0-9_]+)\s*;/g)].map(m => m[1]);
+        
+        return { file, exports: exportsMatch ? exportsMatch[1] : null, imports: importsMatches };
+    });
 
-    if (!fs.existsSync(mainCppPath)) {
-        fs.writeFileSync(mainCppPath, mainCppContent);
-        console.log("✅ Created main.cpp");
+    const sortedFiles = [];
+    const visited = new Set();
+    const processing = new Set();
+
+    function visit(node) {
+        if (visited.has(node.file)) return;
+        if (processing.has(node.file)) return;
+        processing.add(node.file);
+
+        node.imports.forEach(imp => {
+            const dep = fileData.find(f => f.exports === imp);
+            if (dep) visit(dep);
+        });
+
+        processing.delete(node.file);
+        visited.add(node.file);
+        sortedFiles.push(`"${node.file}"`);
     }
 
-    // Generate tasks.json with C++20
+    fileData.forEach(visit);
+    return sortedFiles.join(' ');
+}
+
+function initProject() {
+    console.log("🚀 Initializing PRO C++ Project (C++20 Modules)...");
+    const vscodeDir = path.join(process.cwd(), '.vscode');
+    if (!fs.existsSync(vscodeDir)) fs.mkdirSync(vscodeDir);
+
+    // 1. tasks.json
     const tasksContent = {
         "version": "2.0.0",
-        "tasks": [
-            {
-                "type": "cppbuild",
-                "label": "DEBUG-BUILD-MSVC",
-                "command": "cl.exe",
-                "args": [
-                    "/std:c++20", "/Zi", "/EHsc", "/nologo",
-                    "/Fe${fileDirname}\\debug_build_999.exe",
-                    "${file}"
-                ],
-                "options": { "cwd": "${fileDirname}" },
-                "problemMatcher": ["$msCompile"],
-                "group": "build"
-            }
-        ]
+        "tasks": [{
+            "type": "cppbuild",
+            "label": "DEBUG-BUILD-MSVC",
+            "command": "cl.exe",
+            "args": ["/std:c++20", "/Zi", "/EHsc", "/nologo", "/Fe${fileDirname}\\.build\\debug_build.exe", "${file}"],
+            "problemMatcher": ["$msCompile"],
+            "group": "build"
+        }]
     };
     fs.writeFileSync(path.join(vscodeDir, 'tasks.json'), JSON.stringify(tasksContent, null, 4));
 
-    // Generate launch.json for bulletproof debugging
-    const launchContent = {
-        "version": "0.2.0",
-        "configurations": [
-            {
-                "name": "⚙️ PRO C++ Debug",
-                "type": "cppvsdbg",
-                "request": "launch",
-                "program": "${fileDirname}\\debug_build_999.exe",
-                "args": [],
-                "stopAtEntry": false,
-                "cwd": "${fileDirname}",
-                "environment": [],
-                "console": "integratedTerminal",
-                "preLaunchTask": "DEBUG-BUILD-MSVC"
-            }
-        ]
+    // 2. c_cpp_properties.json (FIX FOR IDE SQUIGGLES!)
+    const propertiesContent = {
+        "configurations": [{
+            "name": "Win32",
+            "includePath": ["${workspaceFolder}/**"],
+            "compilerPath": "cl.exe",
+            "cStandard": "c17",
+            "cppStandard": "c++20",
+            "intelliSenseMode": "windows-msvc-x64",
+            "compilerArgs": [
+                "/std:c++20",
+                "/experimental:module",
+                "/ifcSearchDir", // Указываем IDE, где искать .ifc файлы!
+                "${workspaceFolder}/.build"
+            ]
+        }],
+        "version": 4
+    };
+    fs.writeFileSync(path.join(vscodeDir, 'c_cpp_properties.json'), JSON.stringify(propertiesContent, null, 4));
+
+    // 3. settings.json (Hide .build folder from UI)
+    const settingsContent = {
+        "files.exclude": {
+            ".build": true,
+            "**/.build": true
+        },
+        "C_Cpp.errorSquiggles": "disabled"
     };
-    fs.writeFileSync(path.join(vscodeDir, 'launch.json'), JSON.stringify(launchContent, null, 4));
+    fs.writeFileSync(path.join(vscodeDir, 'settings.json'), JSON.stringify(settingsContent, null, 4));
 
-    console.log("✅ Created .vscode debugger configs (C++20 & F5 ready!)");
-    console.log("🎯 Project initialized! Run 'procpp watch' to start developing.");
-}
+    // 4. main.cpp template
+    const mainCppPath = path.join(process.cwd(), 'main.cpp');
+    if (!fs.existsSync(mainCppPath)) {
+        fs.writeFileSync(mainCppPath, `import std.core;\n// C++20 Modules ready!\nint main() { return 0; }`);
+    }
 
-// Core Build and Run Logic
-function buildAndRun(isWatchMode = false) {
-    const cppFiles = getCppFiles();
+    console.log("✅ Ready! .vscode configs created. IntelliSense is pointed to .build/");
+}
 
+function buildAndRun() {
+    const cppFiles = getSortedCppFiles();
     if (!cppFiles) {
-        console.error("❌ No .cpp files found in this directory!");
+        console.error("❌ Error: No .cpp or .ixx files found!");
         return;
     }
 
-    // 1. Kill previous running instance if it exists
-    if (currentAppProcess) {
-        currentAppProcess.kill();
-        currentAppProcess = null;
-    }
-
-    // 2. Background cleanup of unlocked old files
+    if (currentAppProcess) currentAppProcess.kill();
     cleanupOldBuilds();
+    if (!fs.existsSync(BUILD_DIR)) fs.mkdirSync(BUILD_DIR);
 
-    // 3. Generate unique executable name to bypass Antivirus/OS locks
-    const timestamp = Date.now();
-    const outputExe = `app_build_${timestamp}.exe`;
+    const outputExeName = `app_build_${Date.now()}.exe`;
+    
+    console.log(`\n🔨 Compiling with SMART DEPENDENCY GRAPH...`);
     
-    console.log(`\n🔨 Compiling (Standard: C++20)...`);
-    const compileCmd = `cl.exe /std:c++20 /nologo /EHsc ${cppFiles} /Fe"${outputExe}"`;
+    // Компилируем чисто, без странных флагов
+    const compileCmd = `cl.exe /std:c++20 /nologo /EHsc ${cppFiles} /Fe"${outputExeName}"`;
     
-    const success = runSyncCommand(compileCmd);
+    if (runSyncCommand(compileCmd)) {
+        // МАГИЯ ПЕРЕНОСА: Двигаем все созданные файлы в папку .build
+        const files = fs.readdirSync(process.cwd());
+        files.forEach(file => {
+            if (file.endsWith('.obj') || file.endsWith('.ifc') || file.endsWith('.pdb') || file.endsWith('.ilk') || file === outputExeName) {
+                try {
+                    fs.renameSync(path.join(process.cwd(), file), path.join(BUILD_DIR, file));
+                } catch(e) {}
+            }
+        });
 
-    if (success) {
-        console.log(`🟢 RUNNING -> ${outputExe}\n` + "-".repeat(40));
-        
-        // 4. Run the new executable asynchronously so Node.js can keep watching
-        currentAppProcess = spawn(`.\\${outputExe}`, [], { shell: true, stdio: 'inherit' });
+        console.log(`🟢 RUNNING -> .build\\${outputExeName}\n` + "-".repeat(40));
         
+        // Запускаем из папки .build
+        currentAppProcess = spawn(`.\\.build\\${outputExeName}`, [], { shell: true, stdio: 'inherit' });
         currentAppProcess.on('close', (code) => {
-            if (code !== null) {
-                console.log("-".repeat(40) + `\n🛑 Process exited with code ${code}`);
-            }
+            if (code !== null) console.log("-".repeat(40) + `\n🛑 Process exited with code ${code}`);
         });
     } else {
         console.log(`\n❌ BUILD FAILED`);
     }
 }
 
-// Command: procpp watch
 function watchProject() {
-    console.log("👀 PRO C++ Watcher Started (C++20 Mode)");
-    console.log("Press Ctrl+C to stop. Watching for file changes...");
-    
-    // Initial build
-    buildAndRun(true);
+    console.log("👀 PRO C++ Watcher Started (Mode: Smart C++20 Modules)");
+    buildAndRun();
 
-    // Watch the current directory for changes
-    fs.watch(process.cwd(), (eventType, filename) => {
-        if (filename && (filename.endsWith('.cpp') || filename.endsWith('.h'))) {
-            // Debounce to prevent multiple rapid triggers when saving
+    fs.watch(process.cwd(), { recursive: true }, (eventType, filename) => {
+        // Игнорируем всё, что происходит внутри папки .build
+        if (filename && (filename.endsWith('.cpp') || filename.endsWith('.ixx') || filename.endsWith('.h')) && !filename.includes('.build')) {
             clearTimeout(watchTimeout);
             watchTimeout = setTimeout(() => {
                 console.clear();
-                console.log(`[${new Date().toLocaleTimeString()}] Change detected in ${filename}`);
-                buildAndRun(true);
-            }, 300); // 300ms delay
+                console.log(`[${new Date().toLocaleTimeString()}] Change detected: ${filename}`);
+                buildAndRun();
+            }, 300);
         }
     });
 }
 
-// CLI Router
 switch (command) {
-    case 'init':
-        initProject();
-        break;
-    case 'run':
-        buildAndRun(false);
-        break;
-    case 'watch':
-        watchProject();
-        break;
-    default:
-        console.log(`
-🛠️  PRO CPP CLI 🛠️
-Usage:
-  procpp init   - Scaffold C++ project & VS Code debugger configs
-  procpp run    - Compile and run all .cpp files once
-  procpp watch  - Live reload! Auto-compile and run on file save
-        `);
-        break;
+    case 'init': initProject(); break;
+    case 'run': buildAndRun(); break;
+    case 'watch': watchProject(); break;
+    default: console.log("🛠️ PRO CPP CLI\nUsage: procpp <init|run|watch>"); break;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-cpp-cli-core",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anton-po-github/pro-cpp-cli-core.git"
@@ -12,7 +12,7 @@
   "description": "The ultimate C++ Developer Experience for Windows",
   "main": "index.js",
   "bin": {
-    "procpp": "./index.js"
+    "procpp": "index.js"
   },
   "scripts": {
     "start": "node index.js"
@@ -26,4 +26,4 @@
   ],
   "author": "PRO Developer",
   "license": "MIT"
-}
+}