@ugo-studio/jspp 0.2.9 → 0.3.1

package/scripts/precompile-headers.ts

@@ -1,7 +1,82 @@
-import { spawnSync } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import fs from "fs/promises";
 import path from "path";
 
+const COLORS = {
+    reset: "\x1b[0m",
+    cyan: "\x1b[36m",
+    green: "\x1b[32m",
+    yellow: "\x1b[33m",
+    red: "\x1b[31m",
+    dim: "\x1b[2m",
+    bold: "\x1b[1m",
+};
+
+export class Spinner {
+    private frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+    private interval: any = null;
+    private frameIndex = 0;
+    public text: string;
+
+    constructor(text: string) {
+        this.text = text;
+    }
+
+    start() {
+        process.stdout.write("\x1b[?25l"); // Hide cursor
+        this.frameIndex = 0;
+        this.render();
+        this.interval = setInterval(() => {
+            this.frameIndex = (this.frameIndex + 1) % this.frames.length;
+            this.render();
+        }, 80);
+    }
+
+    update(text: string) {
+        this.text = text;
+        this.render();
+    }
+
+    stop(symbol: string = "", color: string = COLORS.reset) {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = null;
+        }
+        this.clearLine();
+        process.stdout.write(
+            `${color}${symbol} ${COLORS.reset} ${this.text}\n`,
+        );
+        process.stdout.write("\x1b[?25h"); // Show cursor
+    }
+
+    succeed(text?: string) {
+        if (text) this.text = text;
+        this.stop("✔", COLORS.green);
+    }
+
+    fail(text?: string) {
+        if (text) this.text = text;
+        this.stop("✖", COLORS.red);
+    }
+
+    info(text?: string) {
+        if (text) this.text = text;
+        this.stop("ℹ", COLORS.cyan);
+    }
+
+    private render() {
+        this.clearLine();
+        const frame = this.frames[this.frameIndex];
+        process.stdout.write(
+            `${COLORS.cyan}${frame} ${COLORS.reset} ${this.text}`,
+        );
+    }
+
+    private clearLine() {
+        process.stdout.write("\r\x1b[K");
+    }
+}
+
 const PRELUDE_DIR = path.resolve(process.cwd(), "src", "prelude");
 const PRECOMPILED_HEADER_BASE_DIR = path.resolve(
     process.cwd(),
@@ -11,7 +86,7 @@ const PRECOMPILED_HEADER_BASE_DIR = path.resolve(
 const MODES = [
     {
         name: "debug",
-        flags: ["-O0"],
+        flags: ["-Og"],
     },
     {
         name: "release",
@@ -24,15 +99,19 @@ if (process.platform === "win32") {
     MODES[1].flags.push("-Wa,-mbig-obj");
 }
 
-async function getLatestMtime(dirPath: string): Promise<number> {
+async function getLatestMtime(
+    dirPath: string,
+    filter?: (name: string) => boolean,
+): Promise<number> {
     let maxMtime = 0;
     const entries = await fs.readdir(dirPath, { withFileTypes: true });
     for (const entry of entries) {
         const fullPath = path.join(dirPath, entry.name);
         if (entry.isDirectory()) {
-            const nestedMtime = await getLatestMtime(fullPath);
+            const nestedMtime = await getLatestMtime(fullPath, filter);
             if (nestedMtime > maxMtime) maxMtime = nestedMtime;
         } else {
+            if (filter && !filter(entry.name)) continue;
             const stats = await fs.stat(fullPath);
             if (stats.mtimeMs > maxMtime) maxMtime = stats.mtimeMs;
         }
@@ -40,53 +119,74 @@ async function getLatestMtime(dirPath: string): Promise<number> {
     return maxMtime;
 }
 
+async function findCppFiles(dir: string): Promise<string[]> {
+    const entries = await fs.readdir(dir, { withFileTypes: true });
+    const files = await Promise.all(entries.map((entry) => {
+        const res = path.resolve(dir, entry.name);
+        if (entry.isDirectory()) {
+            return findCppFiles(res);
+        } else {
+            return res.endsWith(".cpp") ? [res] : [];
+        }
+    }));
+    return Array.prototype.concat(...files);
+}
+
+async function runCommand(cmd: string, args: string[]): Promise<boolean> {
+    return new Promise((resolve) => {
+        const proc = spawn(cmd, args, { stdio: "ignore" });
+        proc.on("close", (code) => resolve(code === 0));
+    });
+}
+
 async function precompileHeaders() {
+    console.log(
+        `${COLORS.bold}${COLORS.cyan}JSPP: Precompiling headers and runtime...${COLORS.reset}\n`,
+    );
+
     const force = process.argv.includes("--force");
     try {
         await fs.mkdir(PRECOMPILED_HEADER_BASE_DIR, { recursive: true });
-        const sourceMtime = await getLatestMtime(PRELUDE_DIR);
+
+        const latestHeaderMtime = await getLatestMtime(
+            PRELUDE_DIR,
+            (name) => name.endsWith(".hpp") || name.endsWith(".h"),
+        );
 
         for (const mode of MODES) {
             const modeDir = path.join(PRECOMPILED_HEADER_BASE_DIR, mode.name);
-            const headerPath = path.join(modeDir, "index.hpp");
-            const gchPath = path.join(modeDir, "index.hpp.gch");
+            const headerPath = path.join(modeDir, "jspp.hpp");
+            const gchPath = path.join(modeDir, "jspp.hpp.gch");
+
+            const modeLabel = `[${mode.name.toUpperCase()}]`;
+            const spinner = new Spinner(`${modeLabel} Checking headers...`);
+            spinner.start();
+
+            await fs.mkdir(modeDir, { recursive: true });
 
-            if (!force) {
+            let gchRebuilt = false;
+            let shouldBuildGch = force;
+
+            if (!shouldBuildGch) {
                 try {
                     const gchStats = await fs.stat(gchPath);
-                    if (gchStats.mtimeMs >= sourceMtime) {
-                        console.log(
-                            `[${mode.name.toUpperCase()}] Headers are up-to-date. Skipping.`,
-                        );
-                        continue;
+                    if (latestHeaderMtime > gchStats.mtimeMs) {
+                        shouldBuildGch = true;
                     }
                 } catch (e) {
-                    // PCH doesn't exist, proceed to compile
+                    shouldBuildGch = true;
                 }
             }
 
-            console.log(`\n[${mode.name.toUpperCase()}] Setting up...`);
-            await fs.mkdir(modeDir, { recursive: true });
-
-            // Copy index.hpp
-            await fs.copyFile(path.join(PRELUDE_DIR, "index.hpp"), headerPath);
-
-            // Remove existing gch if it exists
-            if (
-                await fs.stat(gchPath).then(
-                    () => true,
-                    () => false,
-                )
-            ) {
-                await fs.unlink(gchPath);
-            }
-
-            console.log(`[${mode.name.toUpperCase()}] Compiling header...`);
-            const tempGchPath = `${gchPath}.tmp`;
+            if (shouldBuildGch) {
+                spinner.update(`${modeLabel} Compiling header...`);
+                await fs.copyFile(
+                    path.join(PRELUDE_DIR, "jspp.hpp"),
+                    headerPath,
+                );
 
-            const compile = spawnSync(
-                "g++",
-                [
+                const tempGchPath = `${gchPath}.tmp`;
+                const success = await runCommand("g++", [
                     "-x",
                     "c++-header",
                     "-std=c++23",
@@ -95,31 +195,130 @@ async function precompileHeaders() {
                     "-o",
                     tempGchPath,
                     "-I",
+                    modeDir,
+                    "-I",
                     PRELUDE_DIR,
-                ],
-                {
-                    stdio: "inherit",
-                },
+                ]);
+
+                if (!success) {
+                    spinner.fail(`${modeLabel} Failed to precompile headers.`);
+                    process.exit(1);
+                }
+
+                await fs.rename(tempGchPath, gchPath);
+                gchRebuilt = true;
+                spinner.succeed(`${modeLabel} PCH Success.`);
+            } else {
+                spinner.succeed(`${modeLabel} Headers are up-to-date.`);
+            }
+
+            // --- Incremental Compilation of .cpp files ---
+            const cppFiles = await findCppFiles(PRELUDE_DIR);
+            const objFiles: string[] = [];
+            let anyObjRebuilt = false;
+
+            const gchMtime = (await fs.stat(gchPath)).mtimeMs;
+
+            const libSpinner = new Spinner(
+                `${modeLabel} Checking runtime library...`,
             );
+            libSpinner.start();
+
+            for (let idx = 0; idx < cppFiles.length; idx++) {
+                const cppFile = cppFiles[idx];
+                const relativePath = path.relative(PRELUDE_DIR, cppFile);
+                const objFile = path.join(
+                    modeDir,
+                    relativePath.replace(/\.cpp$/, ".o"),
+                );
+                await fs.mkdir(path.dirname(objFile), { recursive: true });
+                objFiles.push(objFile);
+
+                let shouldCompile = force || gchRebuilt;
+                if (!shouldCompile) {
+                    try {
+                        const objStats = await fs.stat(objFile);
+                        const cppStats = await fs.stat(cppFile);
+                        if (
+                            cppStats.mtimeMs > objStats.mtimeMs ||
+                            gchMtime > objStats.mtimeMs
+                        ) {
+                            shouldCompile = true;
+                        }
+                    } catch (e) {
+                        shouldCompile = true;
+                    }
+                }
+
+                if (shouldCompile) {
+                    libSpinner.update(
+                        `${modeLabel} Compiling ${relativePath} ${COLORS.dim}[${
+                            idx + 1
+                        }/${cppFiles.length}]${COLORS.reset}`,
+                    );
+                    const success = await runCommand("g++", [
+                        "-c",
+                        "-std=c++23",
+                        ...mode.flags,
+                        cppFile,
+                        "-o",
+                        objFile,
+                        "-I",
+                        modeDir,
+                        "-I",
+                        PRELUDE_DIR,
+                    ]);
 
-            if (compile.status !== 0) {
+                    if (!success) {
+                        libSpinner.fail(
+                            `${modeLabel} Failed to compile ${relativePath}`,
+                        );
+                        process.exit(1);
+                    }
+                    anyObjRebuilt = true;
+                }
+            }
+
+            const libPath = path.join(modeDir, "libjspp.a");
+            let shouldArchive = anyObjRebuilt;
+            if (!shouldArchive) {
                 try {
-                    await fs.unlink(tempGchPath);
+                    await fs.access(libPath);
                 } catch (e) {
-                    // Ignore if temp file doesn't exist
+                    shouldArchive = true;
                 }
-                console.error(
-                    `[${mode.name.toUpperCase()}] Failed to precompile headers.`,
-                );
-                process.exit(1);
             }
 
-            // Atomically replace the old GCH with the new one
-            await fs.rename(tempGchPath, gchPath);
-            console.log(`[${mode.name.toUpperCase()}] Success.`);
+            if (shouldArchive) {
+                libSpinner.update(`${modeLabel} Updating runtime library...`);
+                const tempLibPath = `${libPath}.tmp`;
+
+                const success = await runCommand("ar", [
+                    "rcs",
+                    tempLibPath,
+                    ...objFiles,
+                ]);
+
+                if (!success) {
+                    libSpinner.fail(
+                        `${modeLabel} Failed to create static library.`,
+                    );
+                    process.exit(1);
+                }
+
+                await fs.rename(tempLibPath, libPath);
+                libSpinner.succeed(`${modeLabel} Runtime Library Success.`);
+            } else {
+                libSpinner.succeed(
+                    `${modeLabel} Runtime library is up-to-date.`,
+                );
+            }
         }
+        console.log(
+            `\n${COLORS.bold}${COLORS.green}JSPP: Environment ready.${COLORS.reset}\n`,
+        );
     } catch (error: any) {
-        console.error(`Error: ${error.message}`);
+        console.error(`${COLORS.red}Error: ${error.message}${COLORS.reset}`);
         process.exit(1);
     }
 }

package/scripts/setup-compiler.ts

@@ -1,63 +1,63 @@
-import { spawnSync } from "child_process";
-import { platform } from "os";
-
-const COLORS = {
-    reset: "\x1b[0m",
-    green: "\x1b[32m",
-    yellow: "\x1b[33m",
-    red: "\x1b[31m",
-    cyan: "\x1b[36m",
-    bold: "\x1b[1m",
-};
-
-function checkGpp(): boolean {
-    try {
-        const result = spawnSync("g++", ["--version"], { encoding: "utf8" });
-        return result.status === 0;
-    } catch (e) {
-        return false;
-    }
-}
-
-function setup() {
-    console.log(`${COLORS.bold}${COLORS.cyan}JSPP: Checking for C++ compiler...${COLORS.reset}`);
-
-    if (checkGpp()) {
-        console.log(`${COLORS.green}✔ g++ found.${COLORS.reset}`);
-        return;
-    }
-
-    console.log(`${COLORS.yellow}⚠ g++ (GCC) not found in PATH. JSPP requires a C++23 compatible compiler.${COLORS.reset}`);
-
-    const os = platform();
-
-    if (os === "win32") {
-        console.log(`\n${COLORS.bold}To install GCC on Windows:${COLORS.reset}`);
-        console.log(`1. Install MinGW-w64 via MSYS2: ${COLORS.cyan}https://www.msys2.org/${COLORS.reset}`);
-        console.log(`2. Or use winget: ${COLORS.cyan}winget install MSYS2.MSYS2${COLORS.reset}`);
-        console.log(`   Then run: ${COLORS.bold}pacman -S mingw-w64-x86_64-gcc${COLORS.reset}`);
-    } else if (os === "linux") {
-        console.log(`\n${COLORS.bold}To install GCC on Linux (Ubuntu/Debian):${COLORS.reset}`);
-        console.log(`${COLORS.cyan}sudo apt update && sudo apt install g++-14 -y${COLORS.reset}`);
-        console.log(`\nAttempting to install now (may require password)...`);
-        
-        // Try to install automatically on Linux if apt is found
-        try {
-            const install = spawnSync("sudo", ["apt-get", "install", "-y", "g++-14"], { stdio: "inherit" });
-            if (install.status === 0) {
-                console.log(`${COLORS.green}✔ g++-14 installed successfully.${COLORS.reset}`);
-                // Try to set up symlink if needed or just inform user
-                return;
-            }
-        } catch (e) {
-            console.error(`${COLORS.red}Automatic installation failed. Please install manually.${COLORS.reset}`);
-        }
-    } else if (os === "darwin") {
-        console.log(`\n${COLORS.bold}To install GCC on macOS:${COLORS.reset}`);
-        console.log(`${COLORS.cyan}brew install gcc${COLORS.reset}`);
-    }
-
-    console.log(`\n${COLORS.bold}After installation, please ensure 'g++' is in your PATH and restart your terminal.${COLORS.reset}\n`);
-}
-
-setup();
+import { spawnSync } from "child_process";
+import { platform } from "os";
+
+const COLORS = {
+    reset: "\x1b[0m",
+    green: "\x1b[32m",
+    yellow: "\x1b[33m",
+    red: "\x1b[31m",
+    cyan: "\x1b[36m",
+    bold: "\x1b[1m",
+};
+
+function checkGpp(): boolean {
+    try {
+        const result = spawnSync("g++", ["--version"], { encoding: "utf8" });
+        return result.status === 0;
+    } catch (e) {
+        return false;
+    }
+}
+
+function setup() {
+    console.log(`${COLORS.bold}${COLORS.cyan}JSPP: Checking for C++ compiler...${COLORS.reset}`);
+
+    if (checkGpp()) {
+        console.log(`${COLORS.green}✔ g++ found.${COLORS.reset}`);
+        return;
+    }
+
+    console.log(`${COLORS.yellow}⚠ g++ (GCC) not found in PATH. JSPP requires a C++23 compatible compiler.${COLORS.reset}`);
+
+    const os = platform();
+
+    if (os === "win32") {
+        console.log(`\n${COLORS.bold}To install GCC on Windows:${COLORS.reset}`);
+        console.log(`1. Install MinGW-w64 via MSYS2: ${COLORS.cyan}https://www.msys2.org/${COLORS.reset}`);
+        console.log(`2. Or use winget: ${COLORS.cyan}winget install MSYS2.MSYS2${COLORS.reset}`);
+        console.log(`   Then run: ${COLORS.bold}pacman -S mingw-w64-x86_64-gcc${COLORS.reset}`);
+    } else if (os === "linux") {
+        console.log(`\n${COLORS.bold}To install GCC on Linux (Ubuntu/Debian):${COLORS.reset}`);
+        console.log(`${COLORS.cyan}sudo apt update && sudo apt install g++-14 -y${COLORS.reset}`);
+        console.log(`\nAttempting to install now (may require password)...`);
+        
+        // Try to install automatically on Linux if apt is found
+        try {
+            const install = spawnSync("sudo", ["apt-get", "install", "-y", "g++-14"], { stdio: "inherit" });
+            if (install.status === 0) {
+                console.log(`${COLORS.green}✔ g++-14 installed successfully.${COLORS.reset}`);
+                // Try to set up symlink if needed or just inform user
+                return;
+            }
+        } catch (e) {
+            console.error(`${COLORS.red}Automatic installation failed. Please install manually.${COLORS.reset}`);
+        }
+    } else if (os === "darwin") {
+        console.log(`\n${COLORS.bold}To install GCC on macOS:${COLORS.reset}`);
+        console.log(`${COLORS.cyan}brew install gcc${COLORS.reset}`);
+    }
+
+    console.log(`\n${COLORS.bold}After installation, please ensure 'g++' is in your PATH and restart your terminal.${COLORS.reset}\n`);
+}
+
+setup();