@orxataguy/tyr 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orxataguy/tyr",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "bin": {
     "tyr": "./bin/tyr.js"
@@ -10,8 +10,7 @@
   },
   "files": [
     "bin/",
-    "src/",
-    "config/"
+    "src/"
   ],
   "scripts": {
     "test": "vitest run",

package/src/core/Kernel.ts

@@ -86,7 +86,8 @@ export class Kernel {
             console.log('Usage: tyr <command> [args...]');
             console.log('       tyr --config     Configure Tyr for the first time');
             console.log('       tyr --version    Show version');
-            console.log('       tyr --update     Update Tyr to the latest version');
+            console.log('       tyr --update     Pull latest changes from the linked ~/.tyr repo');
+            console.log('       tyr --upgrade    Upgrade Tyr to the latest npm version');
             return;
         }
 
@@ -98,14 +99,30 @@ export class Kernel {
             return;
         }
 
-        // --update
+        // --update: pull latest changes from the linked ~/.tyr git repo
         if (commandName === '--update') {
+            const shell = this.container.get().shell;
+            const gitDir = path.join(this.userRoot, '.git');
+            if (!fs.existsSync(gitDir)) {
+                console.log('~/.tyr no está vinculado a ningún repositorio git.');
+                console.log('Ejecuta: tyr --config --repo <url>  para vincularlo.');
+                return;
+            }
+            console.log('Actualizando ~/.tyr desde el repositorio...');
+            shell.cd(this.userRoot);
+            await shell.exec('git pull');
+            console.log('Actualización completada.');
+            return;
+        }
+
+        // --upgrade: update the Tyr npm package itself
+        if (commandName === '--upgrade') {
             const pkgPath = path.resolve(this.frameworkRoot, 'package.json');
             const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
             const shell = this.container.get().shell;
-            console.log(`Updating ${pkg.name}...`);
+            console.log(`Actualizando ${pkg.name}...`);
             await shell.exec(`npm update -g ${pkg.name}`);
-            console.log('Update complete. Run tyr --version to confirm.');
+            console.log('Actualización completada. Ejecuta tyr --version para confirmar.');
             return;
         }
 

package/src/core/sys/ai.ts

@@ -111,7 +111,7 @@ REGLAS:export default;async(args:string[]);task() p/errores;fail() p/validar;Tes
 Responde SOLO código TS sin explicaciones ni backticks.`;
 }
 
-export default function ai({ logger, fs: tyrFs, frameworkRoot, run, fail }: TyrContext) {
+export default function ai({ logger, fs: tyrFs, userRoot, run, fail }: TyrContext) {
     return async (args: string[]) => {
         const commandName = args[0];
         const prompt = args.slice(1).join(' ');
@@ -153,8 +153,8 @@ export default function ai({ logger, fs: tyrFs, frameworkRoot, run, fail }: TyrC
             );
         }
 
-        const filePath = path.resolve(frameworkRoot, 'src/commands', `${commandName}.tyr.ts`);
+        const filePath = path.join(userRoot, 'commands', `${commandName}.tyr.ts`);
         await tyrFs.write(filePath, code);
-        logger.success(`'${commandName}' -> src/commands/${commandName}.tyr.ts`);
+        logger.success(`'${commandName}' -> ~/.tyr/commands/${commandName}.tyr.ts`);
     };
 }

package/src/core/sys/config.ts

@@ -1,7 +1,6 @@
 import path from 'path';
-import yaml from 'js-yaml';
 import { homedir, platform } from 'os';
-import { existsSync, cpSync, rmSync } from 'fs';
+import { existsSync, cpSync, rmSync, mkdirSync, readdirSync } from 'fs';
 import { execSync } from 'child_process';
 import type { TyrContext } from '../Kernel';
 
@@ -13,7 +12,40 @@ function removeDirRecursive(dirPath: string): void {
     }
 }
 
-// ─── Shell RC detection ───────────────────────────────────────────────────────
+function clearDirExceptLogs(dirPath: string): void {
+    if (!existsSync(dirPath)) return;
+    for (const entry of readdirSync(dirPath, { withFileTypes: true })) {
+        if (entry.name === 'logs') continue;
+        const fullPath = path.join(dirPath, entry.name);
+        if (entry.isDirectory()) {
+            removeDirRecursive(fullPath);
+        } else {
+            rmSync(fullPath, { force: true });
+        }
+    }
+}
+
+function copyDirContents(srcDir: string, destDir: string): void {
+    for (const entry of readdirSync(srcDir, { withFileTypes: true })) {
+        cpSync(
+            path.join(srcDir, entry.name),
+            path.join(destDir, entry.name),
+            { recursive: true, force: true },
+        );
+    }
+}
+
+function backupUserRoot(userRoot: string, backupPath: string): void {
+    mkdirSync(backupPath, { recursive: true });
+    for (const entry of readdirSync(userRoot, { withFileTypes: true })) {
+        if (entry.name === 'logs') continue;
+        cpSync(
+            path.join(userRoot, entry.name),
+            path.join(backupPath, entry.name),
+            { recursive: true },
+        );
+    }
+}
 
 function detectShellRcFile(homeDir: string): string | null {
     const shell = process.env.SHELL || '';
@@ -27,8 +59,6 @@ function detectShellRcFile(homeDir: string): string | null {
     return fallbacks.find(p => existsSync(p)) ?? path.join(homeDir, '.bashrc');
 }
 
-// ─── File templates ───────────────────────────────────────────────────────────
-
 const ENV_TEMPLATE = `# ~/.tyr/.env
 # Variables de entorno para Tyr. Este archivo nunca debe subirse a git.
 #
@@ -77,8 +107,6 @@ const PS_PLUGINS_TEMPLATE = `# ~/.tyr/plugins.ps1
 #   Import-Module PSReadLine
 `;
 
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
 function makeTimestamp(): string {
     const now = new Date();
     const pad = (n: number) => String(n).padStart(2, '0');
@@ -113,8 +141,6 @@ async function configureWindowsShell(tyrFs: any, logger: any, aliasesPath: strin
     logger.info('Reinicia PowerShell para aplicar los cambios.');
 }
 
-// ─── Main ─────────────────────────────────────────────────────────────────────
-
 export default function config({ logger, fs: tyrFs, frameworkRoot, shell }: TyrContext) {
     return async (args: string[]) => {
         const homeDir = homedir();
@@ -132,37 +158,40 @@ export default function config({ logger, fs: tyrFs, frameworkRoot, shell }: TyrC
             return;
         }
 
-        // ── 1. Backup existing ~/.tyr ──────────────────────────────────────────
-        let backupPath: string | null = null;
+              let backupPath: string | null = null;
         if (existsSync(userRoot)) {
             backupPath = `${userRoot}.bak.${makeTimestamp()}`;
-            cpSync(userRoot, backupPath, { recursive: true });
-            removeDirRecursive(userRoot);
+            backupUserRoot(userRoot, backupPath);
             logger.warn(`Configuración anterior respaldada en: ${backupPath}`);
         }
 
-        // ── 2. Git clone (if --repo) ───────────────────────────────────────────
-        let repoHasContent = false;
+               let repoHasContent = false;
         if (repoUrl) {
+            const tempDir = `${userRoot}.setup-temp`;
+            if (existsSync(tempDir)) {
+                try { removeDirRecursive(tempDir); } catch {}
+            }
+
             logger.info(`\nClonando repositorio: ${repoUrl}`);
             try {
-                await shell.exec(`git clone "${repoUrl}" "${userRoot}"`);
+                await shell.exec(`git clone "${repoUrl}" "${tempDir}"`);
             } catch (e) {
-                // Restore backup if clone failed
-                if (backupPath && existsSync(backupPath)) {
-                    cpSync(backupPath, userRoot, { recursive: true });
-                    removeDirRecursive(backupPath);
-                    logger.warn('Error al clonar. Configuración anterior restaurada.');
+                if (existsSync(tempDir)) {
+                    try { removeDirRecursive(tempDir); } catch {}
                 }
                 throw e;
             }
-            repoHasContent = tyrFs.exists(path.join(userRoot, 'map.yml'));
+
+            repoHasContent = existsSync(path.join(tempDir, 'map.yml'));
             logger.success(repoHasContent
                 ? 'Repositorio clonado con configuración existente.'
                 : 'Repositorio vacío — iniciando configuración por defecto...');
+
+            clearDirExceptLogs(userRoot);
+            copyDirContents(tempDir, userRoot);
+            try { removeDirRecursive(tempDir); } catch {}
         }
 
-        // ── 3. Initialize if needed (no repo, or repo was empty) ──────────────
         if (!repoHasContent) {
             logger.info('\nInicializando ~/.tyr...\n');
 
@@ -181,19 +210,16 @@ export default function config({ logger, fs: tyrFs, frameworkRoot, shell }: TyrC
                 logger.success(`Archivo creado: ${pluginsPath}`);
             }
 
-            // Write map.yml
             const mapPath = path.join(userRoot, 'map.yml');
             await tyrFs.write(mapPath, 'commands: {}\n');
             logger.success(`Archivo creado: ${mapPath}`);
 
-            // Write .env template
             const envPath = path.join(userRoot, '.env');
             if (!tyrFs.exists(envPath)) {
                 await tyrFs.write(envPath, ENV_TEMPLATE);
                 logger.success(`Archivo creado: ${envPath}`);
             }
 
-            // If linked to a repo, commit and push
             if (repoUrl) {
                 logger.info('\nSubiendo configuración inicial al repositorio...');
                 shell.cd(userRoot);
@@ -208,7 +234,6 @@ export default function config({ logger, fs: tyrFs, frameworkRoot, shell }: TyrC
             }
         }
 
-        // ── 4. Configure shell (always) ────────────────────────────────────────
         const aliasesPath = path.join(userRoot, `aliases${ext}`);
         const pluginsPath = path.join(userRoot, `plugins${ext}`);
 

package/src/core/sys/doc.ts

@@ -304,7 +304,7 @@ if (!fs.existsSync('./package.json')) {
                         await run('ai', [name, prompt]);
 
                         res.writeHead(200, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ success: true, message: `Comando '${name}' generado correctamente en src/commands/${name}.tyr.ts` }));
+                        res.end(JSON.stringify({ success: true, message: `Comando '${name}' generado correctamente en ~/.tyr/commands/${name}.tyr.ts` }));
                     } catch (e: any) {
                         res.writeHead(500, { 'Content-Type': 'application/json' });
                         res.end(JSON.stringify({ success: false, message: e.message || 'Error al generar el comando.' }));

package/config/map.yml

@@ -1,4 +0,0 @@
-settings:
-  appName: Tyr CLI
-  version: 0.1.0
-commands: {}

package/src/commands/di.tyr.ts

@@ -1,113 +0,0 @@
-import { TyrContext } from '../core/Kernel';
-
-export default ({ task, fail, logger, shell, db, git, fs }: TyrContext) => {
-    /**
-     * @method extractBranchName
-     * @description Extrae el nombre de rama de una URL o devuelve el nombre tal cual
-     */
-    const extractBranchName = (input: string): string => {
-        if (input.includes('/')) {
-            const parts = input.split('/');
-            return parts[parts.length - 1];
-        }
-        return input;
-    };
-
-    return async (args: string[]) => {
-
-        // Validación de argumentos
-        if (args.length === 0) {
-            fail(
-                'No se especificó la URL del cliente',
-                'Uso: clone-client <url-cliente> [url-rama-opcional]'
-            );
-        }
-
-        const clientUrl = args[0];
-        const branchUrlOrName = args[1] || null;
-
-        logger.info('Navegando al directorio de clientes...');
-        shell.cd('~/dev/wolbenvironment/dev/online-booking/htdocs/datosBroker');
-
-        const broker = await task('Buscando broker en la base de datos', async () => {
-            const result = await db.searchBrokerOnDB(clientUrl);
-
-            if (!result) {
-                fail(
-                    `No se encontró broker para la URL: ${clientUrl}`,
-                    'Verifica que la URL sea correcta y esté registrada en la BD'
-                );
-            }
-
-            logger.success(`Broker encontrado: ${result}`);
-            return result;
-        });
-
-        const brokerPath = `~/dev/wolbenvironment/dev/online-booking/htdocs/datosBroker/${broker}`;
-        const dirExists = fs.exists(brokerPath);
-
-        if (dirExists) {
-            logger.warn(`El directorio '${broker}' ya existe`);
-
-            const choice = await shell.input(
-                '¿Qué deseas hacer? (s)obrescribir / (m)antener / (r)enombrar: '
-            );
-
-            if (choice.toLowerCase() === 'm' || choice.toLowerCase() === 'mantener') {
-                logger.info('Manteniendo directorio existente. Finalizando...');
-                return;
-            } else if (choice.toLowerCase() === 'r' || choice.toLowerCase() === 'renombrar') {
-                await task('Renombrando directorio existente', async () => {
-                    await shell.exec(`mv ${broker} ${broker}.bak`);
-                    logger.success(`Directorio renombrado a: ${broker}.bak`);
-                });
-            } else if (choice.toLowerCase() === 's' || choice.toLowerCase() === 'sobrescribir') {
-                await task('Eliminando directorio existente', async () => {
-                    await shell.exec(`rm -rf ${broker}`);
-                    logger.success('Directorio eliminado');
-                });
-            } else {
-                fail('Opción no válida', 'Usa: s (sobrescribir), m (mantener) o r (renombrar)');
-            }
-        }
-
-        const repoUrl = `git@github.com:Avantio/${broker}`;
-        logger.info(`Repositorio: ${repoUrl}`);
-
-        const loader = shell.showLoader('Clonando repositorio desde GitHub...');
-
-        await task('Clonando repositorio', async () => {
-            await git.clone(repoUrl);
-            loader.stop();
-            logger.success('Repositorio clonado exitosamente');
-        }, false, () => loader.stop());
-
-        shell.cd(broker);
-
-        let branchName: string;
-
-        if (branchUrlOrName) {
-            branchName = extractBranchName(branchUrlOrName);
-            logger.info(`Rama extraída: ${branchName}`);
-        } else {
-            const answer = await shell.input('🌿 ¿Qué rama quieres usar? (nombre o URL): ');
-            branchName = extractBranchName(answer);
-        }
-
-        await task(`Cambiando a la rama: ${branchName}`, async () => {
-            if (branchName.length > 0) {
-                await shell.exec(`git checkout -b ${branchName}`);
-                logger.success(`Ahora estás en la rama: ${branchName}`);
-            } else {
-                logger.info('No se va a generar ninguna rama nueva')
-            }
-        });
-        logger.success(`Repositorio ${broker} clonado y configurado exitosamente`);
-
-    };
-};
-
-
-// export const Test = {
-//     args: []
-// }

package/src/commands/dw.tyr.ts

@@ -1,116 +0,0 @@
-import { TyrContext } from '../core/Kernel';
-
-export default ({ task, fail, logger, shell, db, git, fs }: TyrContext) => {
-    /**
-     * @method extractBranchName
-     * @description Extrae el nombre de rama de una URL o devuelve el nombre tal cual
-     */
-    const extractBranchName = (input: string): string => {
-        if (input.includes('/')) {
-            const parts = input.split('/');
-            return parts[parts.length - 1];
-        }
-        return input;
-    };
-
-    return async (args: string[]) => {
-
-        // Validación de argumentos
-        if (args.length === 0) {
-            fail(
-                'No se especificó la URL del cliente',
-                'Uso: clone-client <url-cliente> [url-rama-opcional]'
-            );
-        }
-
-        const clientUrl = args[0];
-        const branchUrlOrName = args[1] || null;
-
-        logger.info('Navegando al directorio de clientes...');
-        shell.cd('~/dev/wolbenvironment/dev/websITS/clients');
-        console.log("Lanzo con url:", clientUrl)
-        const broker = await task('Buscando broker en la base de datos', async () => {
-            const result = await db.searchBrokerOnDB(clientUrl);
-
-            if (!result) {
-                fail(
-                    `No se encontró broker para la URL: ${clientUrl}`,
-                    'Verifica que la URL sea correcta y esté registrada en la BD'
-                );
-            }
-
-            logger.success(`Broker encontrado: ${result}`);
-            return result;
-        });
-
-        const brokerPath = `~/dev/wolbenvironment/dev/websITS/clients/${broker}`;
-        const dirExists = fs.exists(brokerPath);
-
-        if (dirExists) {
-            logger.warn(`El directorio '${broker}' ya existe`);
-
-            const choice = await shell.input(
-                '¿Qué deseas hacer? (s)obrescribir / (m)antener / (r)enombrar: '
-            );
-
-            if (choice.toLowerCase() === 'm' || choice.toLowerCase() === 'mantener') {
-                logger.info('Manteniendo directorio existente. Finalizando...');
-                return;
-            } else if (choice.toLowerCase() === 'r' || choice.toLowerCase() === 'renombrar') {
-                await task('Renombrando directorio existente', async () => {
-                    await shell.exec(`mv ${broker} ${broker}.bak`);
-                    logger.success(`Directorio renombrado a: ${broker}.bak`);
-                });
-            } else if (choice.toLowerCase() === 's' || choice.toLowerCase() === 'sobrescribir') {
-                await task('Eliminando directorio existente', async () => {
-                    await shell.exec(`rm -rf ${broker}`);
-                    logger.success('Directorio eliminado');
-                });
-            } else {
-                fail('Opción no válida', 'Usa: s (sobrescribir), m (mantener) o r (renombrar)');
-            }
-        }
-
-        const repoUrl = `git@github.com:Avantio/${broker}`;
-        logger.info(`Repositorio: ${repoUrl}`);
-
-        const loader = shell.showLoader('Clonando repositorio desde GitHub...');
-
-        await task('Clonando repositorio', async () => {
-            await git.clone(repoUrl);
-            loader.stop();
-            logger.success('Repositorio clonado exitosamente');
-        }, false, () => loader.stop());
-
-        shell.cd(broker);
-
-        let branchName: string;
-
-        if (branchUrlOrName) {
-            branchName = extractBranchName(branchUrlOrName);
-            logger.info(`Rama extraída: ${branchName}`);
-        } else {
-            const answer = await shell.input('🌿 ¿Qué rama quieres usar? (nombre o URL): ');
-            branchName = extractBranchName(answer);
-        }
-
-        await task(`Cambiando a la rama: ${branchName}`, async () => {
-            if (branchName.length > 0) {
-                await shell.exec(`git checkout -b ${branchName}`);
-                logger.success(`Ahora estás en la rama: ${branchName}`);
-            } else {
-                logger.info('No se va a generar ninguna rama nueva')
-            }
-        });
-        logger.success(`Repositorio ${broker} clonado y configurado exitosamente`);
-
-    };
-};
-
-// export const Test = {
-//     args: ['https://www.feelporto.com/'],
-//     mockInputs: {
-//         'sobrescribir': 'm',  
-//         'rama': '' 
-//     }
-// }

package/src/commands/install.tyr.ts

@@ -1,61 +0,0 @@
-import { TyrContext } from '../core/Kernel';
-import path from 'path';
-import { homedir } from 'os';
-
-export default ({ task, fail, logger, fs }: TyrContext) => {
-    return async (_args: string[]) => {
-        const homeDir = homedir();
-        const userRoot = path.join(homeDir, '.tyr');
-
-        const aliasesTemplatePath = path.join(homeDir, 'avantio', 'framework', 'core', 'include', 'bin', 'aliases.template.sh');
-        const pluginsTemplatePath = path.join(homeDir, 'avantio', 'framework', 'core', 'include', 'bin', 'plugins.template.sh');
-
-        const aliasesTarget = path.join(userRoot, 'aliases');
-        const pluginsTarget = path.join(userRoot, 'plugins');
-
-        await task('Verificando configuración de Tyr', async () => {
-            if (!fs.exists(userRoot)) {
-                fail(
-                    'El directorio ~/.tyr no existe.',
-                    "Ejecuta 'tyr --config' antes de continuar."
-                );
-            }
-            logger.success(`Directorio ~/.tyr encontrado: ${userRoot}`);
-        });
-
-        await task('Verificando templates de Avantio', async () => {
-            if (!fs.exists(aliasesTemplatePath)) {
-                fail(
-                    `Template de aliases no encontrado: ${aliasesTemplatePath}`,
-                    'Verifica que el framework de Avantio esté correctamente instalado.'
-                );
-            }
-            if (!fs.exists(pluginsTemplatePath)) {
-                fail(
-                    `Template de plugins no encontrado: ${pluginsTemplatePath}`,
-                    'Verifica que el framework de Avantio esté correctamente instalado.'
-                );
-            }
-            logger.success('Templates de Avantio encontrados.');
-        });
-
-        await task('Copiando aliases de Avantio', async () => {
-            const content = await fs.read(aliasesTemplatePath);
-            if (!content) fail('No se pudo leer aliases.template.sh');
-            await fs.write(aliasesTarget, content!);
-            logger.success(`Aliases copiados a: ${aliasesTarget}`);
-        });
-
-        await task('Copiando plugins de Avantio', async () => {
-            const content = await fs.read(pluginsTemplatePath);
-            if (!content) fail('No se pudo leer plugins.template.sh');
-            await fs.write(pluginsTarget, content!);
-            logger.success(`Plugins copiados a: ${pluginsTarget}`);
-        });
-
-        logger.success('\nInstalación de Avantio completada.');
-        logger.info(`  aliases → ${aliasesTarget}`);
-        logger.info(`  plugins → ${pluginsTarget}`);
-        logger.warn('\nRecuerda recargar tu shell para aplicar los cambios.');
-    };
-};