@titanpl/cli 2.0.0 → 2.0.2

package/src/commands/init.js

@@ -1,182 +1,196 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { spawn } from 'child_process';
-import prompts from 'prompts';
-import chalk from 'chalk';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export function copyDir(src, dest, excludes = []) {
-    fs.mkdirSync(dest, { recursive: true });
-
-    for (const file of fs.readdirSync(src)) {
-        if (excludes.includes(file)) continue;
-
-        const srcPath = path.join(src, file);
-        const destPath = path.join(dest, file);
-
-        if (fs.lstatSync(srcPath).isDirectory()) {
-            copyDir(srcPath, destPath, excludes);
-        } else {
-            fs.copyFileSync(srcPath, destPath);
-        }
-    }
-}
-
-export async function initCommand(projectName, templateName) {
-    let projName = projectName;
-
-    if (!projName) {
-        const res = await prompts({
-            type: 'text',
-            name: 'name',
-            message: 'Project name:',
-            initial: 'my-titan-app'
-        });
-        projName = res.name;
-    }
-
-    if (!projName) {
-        console.log(chalk.red("✖ Initialization cancelled."));
-        process.exit(1);
-    }
-
-    let selectedTemplate = templateName;
-
-    if (!selectedTemplate) {
-        const langRes = await prompts({
-            type: 'select',
-            name: 'value',
-            message: 'Select language:',
-            choices: [
-                { title: 'JavaScript', value: 'js' },
-                { title: 'TypeScript', value: 'ts' },
-            ],
-            initial: 0
-        });
-
-        if (!langRes.value) {
-            console.log(chalk.red("✖ Operation cancelled."));
-            process.exit(1);
-        }
-        const lang = langRes.value;
-
-        const archRes = await prompts({
-            type: 'select',
-            name: 'value',
-            message: 'Select template:',
-            choices: [
-                {
-                    title: `Standard (${lang.toUpperCase()})`,
-                    description: `Standard Titan app with ${lang.toUpperCase()} actions`,
-                    value: 'standard'
-                },
-                {
-                    title: `Rust + ${lang.toUpperCase()} (Hybrid)`,
-                    description: `High-performance Rust actions + ${lang.toUpperCase()} flexibility`,
-                    value: 'hybrid'
-                }
-            ],
-            initial: 0
-        });
-
-        if (!archRes.value) {
-            console.log(chalk.red("✖ Operation cancelled."));
-            process.exit(1);
-        }
-        const arch = archRes.value;
-
-        if (lang === 'js') {
-            selectedTemplate = arch === 'standard' ? 'js' : 'rust-js';
-        } else {
-            selectedTemplate = arch === 'standard' ? 'ts' : 'rust-ts';
-        }
-    }
-
-    const target = path.resolve(process.cwd(), projName);
-    const templateDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', selectedTemplate);
-    const commonDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', 'common');
-
-    if (!fs.existsSync(templateDir) || !fs.existsSync(commonDir)) {
-        console.log(chalk.red(`✖ Error finding template paths.Are you in a valid Titan monorepo ? `));
-        process.exit(1);
-    }
-
-    if (fs.existsSync(target)) {
-        console.log(chalk.red(`✖ Directory '${projName}' already exists.`));
-        process.exit(1);
-    }
-
-    console.log(chalk.cyan(`\n→ Creating new Titan project in '${projName}'...\n`));
-
-    // 1. Copy common
-    copyDir(commonDir, target);
-
-    // 2. Copy specific template
-    copyDir(templateDir, target);
-
-    // 3. Dotfiles and Template Remapping
-    const remapping = {
-        "_gitignore": ".gitignore",
-        "_dockerignore": ".dockerignore",
-        "_titan.json": "titan.json",
-        ".env": ".env"
-    };
-    for (const [srcName, destName] of Object.entries(remapping)) {
-        const src = path.join(target, srcName);
-        const dest = path.join(target, destName);
-        if (fs.existsSync(src)) {
-            fs.renameSync(src, dest);
-        }
-    }
-
-    // Recursive template substitution
-    const substitute = (dir) => {
-        for (const file of fs.readdirSync(dir)) {
-            const fullPath = path.join(dir, file);
-            if (fs.lstatSync(fullPath).isDirectory()) {
-                if (file !== "node_modules" && file !== ".git" && file !== "target") {
-                    substitute(fullPath);
-                }
-            } else {
-                // Only process text files
-                const ext = path.extname(file).toLowerCase();
-                const textExts = ['.js', '.ts', '.json', '.md', '.txt', '.rs', '.toml', '.html', '.css', '.d.ts'];
-                if (textExts.includes(ext) || file === ".env" || file === "Dockerfile") {
-                    let content = fs.readFileSync(fullPath, 'utf8');
-                    let changed = false;
-                    if (content.includes("{{name}}")) {
-                        content = content.replace(/{{name}}/g, projName);
-                        changed = true;
-                    }
-                    if (content.includes("{{native_name}}")) {
-                        content = content.replace(/{{native_name}}/g, projName.replace(/-/g, '_'));
-                        changed = true;
-                    }
-                    if (changed) {
-                        fs.writeFileSync(fullPath, content);
-                    }
-                }
-            }
-        }
-    };
-    substitute(target);
-
-    console.log(chalk.gray(`  Installing dependencies...`));
-
-    await new Promise((resolve, reject) => {
-        const npm = spawn('npm', ['install'], {
-            cwd: target,
-            stdio: 'inherit',
-            shell: true
-        });
-        npm.on('error', reject);
-        npm.on('close', resolve);
-    });
-
-    console.log(chalk.green(`\n✔ Project '${projName}' created successfully!\n`));
-    console.log(chalk.yellow(`  cd ${projName}`));
-    console.log(chalk.yellow(`  npm run dev\n`));
-}
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { execSync } from 'child_process';
+import prompts from 'prompts';
+import chalk from 'chalk';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export function copyDir(src, dest, excludes = []) {
+    fs.mkdirSync(dest, { recursive: true });
+
+    for (const file of fs.readdirSync(src)) {
+        if (excludes.includes(file)) continue;
+
+        const srcPath = path.join(src, file);
+        const destPath = path.join(dest, file);
+
+        if (fs.lstatSync(srcPath).isDirectory()) {
+            copyDir(srcPath, destPath, excludes);
+        } else {
+            fs.copyFileSync(srcPath, destPath);
+        }
+    }
+}
+
+export async function initCommand(projectName, templateName) {
+    let projName = projectName;
+
+    if (!projName) {
+        const res = await prompts({
+            type: 'text',
+            name: 'name',
+            message: 'Project name:',
+            initial: 'my-titan-app'
+        });
+        projName = res.name;
+    }
+
+    if (!projName) {
+        console.log(chalk.red("✖ Initialization cancelled."));
+        process.exit(1);
+    }
+
+    let selectedTemplate = templateName;
+
+    if (!selectedTemplate) {
+        const langRes = await prompts({
+            type: 'select',
+            name: 'value',
+            message: 'Select language:',
+            choices: [
+                { title: 'JavaScript', value: 'js' },
+                { title: 'TypeScript', value: 'ts' },
+            ],
+            initial: 0
+        });
+
+        if (!langRes.value) {
+            console.log(chalk.red("✖ Operation cancelled."));
+            process.exit(1);
+        }
+        const lang = langRes.value;
+
+        const archRes = await prompts({
+            type: 'select',
+            name: 'value',
+            message: 'Select template:',
+            choices: [
+                {
+                    title: `Standard (${lang.toUpperCase()})`,
+                    description: `Standard Titan app with ${lang.toUpperCase()} actions`,
+                    value: 'standard'
+                },
+                {
+                    title: `Rust + ${lang.toUpperCase()} (Hybrid)`,
+                    description: `High-performance Rust actions + ${lang.toUpperCase()} flexibility`,
+                    value: 'hybrid'
+                }
+            ],
+            initial: 0
+        });
+
+        if (!archRes.value) {
+            console.log(chalk.red("✖ Operation cancelled."));
+            process.exit(1);
+        }
+        const arch = archRes.value;
+
+        if (lang === 'js') {
+            selectedTemplate = arch === 'standard' ? 'js' : 'rust-js';
+        } else {
+            selectedTemplate = arch === 'standard' ? 'ts' : 'rust-ts';
+        }
+    }
+
+    const target = path.resolve(process.cwd(), projName);
+    let templateDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', selectedTemplate);
+    let commonDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', 'common');
+
+    // Robust monorepo/fallback template search: look upwards from cwd
+    if (!fs.existsSync(templateDir) || !fs.existsSync(commonDir)) {
+        let searchDir = process.cwd();
+        while (searchDir !== path.parse(searchDir).root) {
+            const potentialTemplateDir = path.join(searchDir, 'templates', selectedTemplate);
+            const potentialCommonDir = path.join(searchDir, 'templates', 'common');
+            if (fs.existsSync(potentialTemplateDir) && fs.existsSync(potentialCommonDir)) {
+                templateDir = potentialTemplateDir;
+                commonDir = potentialCommonDir;
+                break;
+            }
+            const sdkPotentialTemplateDir = path.join(searchDir, 'titanpl-sdk', 'templates', selectedTemplate);
+            const sdkPotentialCommonDir = path.join(searchDir, 'titanpl-sdk', 'templates', 'common');
+            if (fs.existsSync(sdkPotentialTemplateDir) && fs.existsSync(sdkPotentialCommonDir)) {
+                templateDir = sdkPotentialTemplateDir;
+                commonDir = sdkPotentialCommonDir;
+                break;
+            }
+            searchDir = path.dirname(searchDir);
+        }
+    }
+
+    if (!fs.existsSync(templateDir) || !fs.existsSync(commonDir)) {
+        console.log(chalk.red(`✖ Error finding template paths. Are you in a valid Titan monorepo?`));
+        process.exit(1);
+    }
+
+    if (fs.existsSync(target)) {
+        console.log(chalk.red(`✖ Directory '${projName}' already exists.`));
+        process.exit(1);
+    }
+
+    console.log(chalk.cyan(`\n→ Creating new Titan project in '${projName}'...\n`));
+
+    // 1. Copy common
+    copyDir(commonDir, target);
+
+    // 2. Copy specific template
+    copyDir(templateDir, target);
+
+    // 3. Dotfiles and Template Remapping
+    const remapping = {
+        "_gitignore": ".gitignore",
+        "_dockerignore": ".dockerignore",
+        "_titan.json": "titan.json",
+        ".env": ".env"
+    };
+    for (const [srcName, destName] of Object.entries(remapping)) {
+        const src = path.join(target, srcName);
+        const dest = path.join(target, destName);
+        if (fs.existsSync(src)) {
+            fs.renameSync(src, dest);
+        }
+    }
+
+    // Recursive template substitution
+    const substitute = (dir) => {
+        for (const file of fs.readdirSync(dir)) {
+            const fullPath = path.join(dir, file);
+            if (fs.lstatSync(fullPath).isDirectory()) {
+                if (file !== "node_modules" && file !== ".git" && file !== "target") {
+                    substitute(fullPath);
+                }
+            } else {
+                // Only process text files
+                const ext = path.extname(file).toLowerCase();
+                const textExts = ['.js', '.ts', '.json', '.md', '.txt', '.rs', '.toml', '.html', '.css', '.d.ts'];
+                if (textExts.includes(ext) || file === ".env" || file === "Dockerfile") {
+                    let content = fs.readFileSync(fullPath, 'utf8');
+                    let changed = false;
+                    if (content.includes("{{name}}")) {
+                        content = content.replace(/{{name}}/g, projName);
+                        changed = true;
+                    }
+                    if (content.includes("{{native_name}}")) {
+                        content = content.replace(/{{native_name}}/g, projName.replace(/-/g, '_'));
+                        changed = true;
+                    }
+                    if (changed) {
+                        fs.writeFileSync(fullPath, content);
+                    }
+                }
+            }
+        }
+    };
+    substitute(target);
+
+    console.log(chalk.gray(`  Installing dependencies...`));
+
+    execSync('npm install', { cwd: target, stdio: 'inherit' });
+
+    console.log(chalk.green(`\n✔ Project '${projName}' created successfully!\n`));
+    console.log(chalk.yellow(`  cd ${projName}`));
+    console.log(chalk.yellow(`  npm run dev\n`));
+}

package/src/commands/migrate.js

@@ -1,106 +1,124 @@
-import fs from 'fs';
-import path from 'path';
-
-export async function migrateCommand() {
-    const root = process.cwd();
-    console.log(`\n🔍 Checking project for legacy Titan architecture...`);
-
-    const serverDir = path.join(root, 'server');
-    const titanDir = path.join(root, 'titan');
-    const pkgPath = path.join(root, 'package.json');
-
-    if (!fs.existsSync(serverDir) && !fs.existsSync(titanDir)) {
-        console.log(`✅ This project is already using the modern Titan runtime architecture.`);
-        return;
-    }
-
-    console.log(`\n⚠️ Legacy server architecture detected. Migrating to runtime-first model...`);
-
-    // 1. Delete server/
-    if (fs.existsSync(serverDir)) {
-        console.log(`   Deleting legacy server/ folder...`);
-        fs.rmSync(serverDir, { recursive: true, force: true });
-    }
-
-    // 2. Delete titan/ folder
-    if (fs.existsSync(titanDir)) {
-        console.log(`   Deleting legacy titan/ runtime folder...`);
-        fs.rmSync(titanDir, { recursive: true, force: true });
-    }
-
-    // 3. Update package.json
-    if (fs.existsSync(pkgPath)) {
-        console.log(`   Updating package.json...`);
-        try {
-            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-            let modified = false;
-
-            // Update scripts
-            if (pkg.scripts) {
-                if (pkg.scripts.build && pkg.scripts.build.includes('cd server')) {
-                    pkg.scripts.build = "titan build";
-                    modified = true;
-                }
-                if (pkg.scripts.start && pkg.scripts.start.includes('cd server')) {
-                    pkg.scripts.start = "titan start";
-                    modified = true;
-                }
-                if (pkg.scripts.dev && pkg.scripts.dev.includes('titan/dev.js')) {
-                    pkg.scripts.dev = "titan dev";
-                    modified = true;
-                }
-            }
-
-            // Add dependencies
-            pkg.dependencies = pkg.dependencies || {};
-            if (!pkg.dependencies['@titan/native']) {
-                pkg.dependencies['@titan/native'] = "latest";
-                modified = true;
-            }
-            if (!pkg.dependencies['@titan/route']) {
-                pkg.dependencies['@titan/route'] = "latest";
-                modified = true;
-            }
-
-            if (modified) {
-                fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-            }
-        } catch (e) {
-            console.log(`   ⚠️ Failed to update package.json automatically. Please do it manually.`);
-        }
-    }
-
-    // 4. Synchronize Dockerfile and other common files
-    try {
-        const commonDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', 'common');
-        if (fs.existsSync(commonDir)) {
-            const filesToSync = [
-                ['Dockerfile', 'Dockerfile'],
-                ['_dockerignore', '.dockerignore'],
-                ['_gitignore', '.gitignore'],
-                ['app/t.native.d.ts', 'app/t.native.d.ts'],
-                ['app/t.native.js', 'app/t.native.js']
-            ];
-
-            for (const [srcRel, destRel] of filesToSync) {
-                const src = path.join(commonDir, srcRel);
-                const dest = path.join(root, destRel);
-                if (fs.existsSync(src)) {
-                    // Create parent dir if needed
-                    const parent = path.dirname(dest);
-                    if (!fs.existsSync(parent)) {
-                        fs.mkdirSync(parent, { recursive: true });
-                    }
-                    fs.copyFileSync(src, dest);
-                }
-            }
-            console.log(`   Synchronized Dockerfiles and native definitions.`);
-        }
-    } catch (e) {
-        console.log(`   ⚠️ Failed to synchronize common template files.`);
-    }
-
-    console.log(`\n🎉 Migration complete!`);
-    console.log(`   Please run 'npm install' to fetch the new dependencies.`);
-    console.log(`   Then run 'titan dev' to start your application.\n`);
-}
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export async function migrateCommand() {
+    const root = process.cwd();
+    console.log(`\n🔍 Checking project for legacy Titan architecture...`);
+
+    const serverDir = path.join(root, 'server');
+    const titanDir = path.join(root, 'titan');
+    const pkgPath = path.join(root, 'package.json');
+
+    if (!fs.existsSync(serverDir) && !fs.existsSync(titanDir)) {
+        console.log(`✅ This project is already using the modern Titan runtime architecture.`);
+        return;
+    }
+
+    console.log(`\n⚠️ Legacy server architecture detected. Migrating to runtime-first model...`);
+
+    // 1. Delete server/
+    if (fs.existsSync(serverDir)) {
+        console.log(`   Deleting legacy server/ folder...`);
+        fs.rmSync(serverDir, { recursive: true, force: true });
+    }
+
+    // 2. Delete titan/ folder
+    if (fs.existsSync(titanDir)) {
+        console.log(`   Deleting legacy titan/ runtime folder...`);
+        fs.rmSync(titanDir, { recursive: true, force: true });
+    }
+
+    // 3. Update package.json
+    if (fs.existsSync(pkgPath)) {
+        console.log(`   Updating package.json...`);
+        try {
+            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+            let modified = false;
+
+            // Update scripts
+            if (pkg.scripts) {
+                if (pkg.scripts.build && pkg.scripts.build.includes('cd server')) {
+                    pkg.scripts.build = "titan build";
+                    modified = true;
+                }
+                if (pkg.scripts.start && pkg.scripts.start.includes('cd server')) {
+                    pkg.scripts.start = "titan start";
+                    modified = true;
+                }
+                if (pkg.scripts.dev && pkg.scripts.dev.includes('titan/dev.js')) {
+                    pkg.scripts.dev = "titan dev";
+                    modified = true;
+                }
+            }
+
+            // Add / fix dependencies — ensure correct @titanpl/ scope
+            pkg.dependencies = pkg.dependencies || {};
+
+            // Remove any stale old-scope packages (@titan/ typo) that may exist
+            const stalePackages = ['@titanp/native', '@titan/route', '@titan/cli', '@titan/packet'];
+            for (const stale of stalePackages) {
+                if (pkg.dependencies[stale]) {
+                    delete pkg.dependencies[stale];
+                    modified = true;
+                }
+            }
+
+            const requiredDeps = {
+                '@titanpl/cli': 'latest',
+                '@titanpl/route': 'latest',
+                '@titanpl/native': 'latest',
+                '@titanpl/packet': 'latest',
+            };
+            for (const [dep, version] of Object.entries(requiredDeps)) {
+                if (!pkg.dependencies[dep]) {
+                    pkg.dependencies[dep] = version;
+                    modified = true;
+                }
+            }
+
+            if (modified) {
+                fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+            }
+        } catch (e) {
+            console.log(`   ⚠️ Failed to update package.json automatically. Please do it manually.`);
+        }
+    }
+
+    // 4. Synchronize Dockerfile and other common files
+    try {
+        const commonDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', 'common');
+        if (fs.existsSync(commonDir)) {
+            const filesToSync = [
+                ['Dockerfile', 'Dockerfile'],
+                ['_dockerignore', '.dockerignore'],
+                ['_gitignore', '.gitignore'],
+                ['app/t.native.d.ts', 'app/t.native.d.ts'],
+                ['app/t.native.js', 'app/t.native.js']
+            ];
+
+            for (const [srcRel, destRel] of filesToSync) {
+                const src = path.join(commonDir, srcRel);
+                const dest = path.join(root, destRel);
+                if (fs.existsSync(src)) {
+                    // Create parent dir if needed
+                    const parent = path.dirname(dest);
+                    if (!fs.existsSync(parent)) {
+                        fs.mkdirSync(parent, { recursive: true });
+                    }
+                    fs.copyFileSync(src, dest);
+                }
+            }
+            console.log(`   Synchronized Dockerfiles and native definitions.`);
+        }
+    } catch (e) {
+        console.log(`   ⚠️ Failed to synchronize common template files.`);
+    }
+
+    console.log(`\n🎉 Migration complete!`);
+    console.log(`   Please run 'npm install' to fetch the new dependencies.`);
+    console.log(`   Then run 'titan dev' to start your application.\n`);
+}

package/src/commands/start.js

@@ -1,5 +1,5 @@
-import { startEngine } from "../engine.js";
-
-export function startCommand() {
-  startEngine(false);
+import { startEngine } from "../engine.js";
+
+export function startCommand() {
+  startEngine(false);
 }