orch-mini 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orch-mini",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Orquestador declarativo mínimo: un stack.yaml describe la arquitectura, om renderiza docker-compose + nginx + scripts y levanta el stack.",
   "type": "module",
   "engines": {

package/src/info.ts

@@ -1,5 +1,4 @@
-import { existsSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { relative } from 'node:path';
 import type { LoadedStack } from './parser.js';
 import { hasRepo, type Service, type Stack } from './schema.js';
 
@@ -35,6 +34,7 @@ function supportsColor(): boolean {
 export function renderInfo(loaded: LoadedStack): string {
   const out: string[] = [];
   const { stack } = loaded;
+  const sourceLabel = relative(process.cwd(), loaded.sourcePath) || loaded.sourcePath;
 
   const services = Object.entries(stack.services);
   const gw = stack.gateway;
@@ -42,7 +42,7 @@ export function renderInfo(loaded: LoadedStack): string {
   out.push(
     `${C.bold}${stack.name}${C.reset}  ${C.dim}${services.length} services${
       gw ? ` · gateway en :${gw.port}` : ''
-    }${C.reset}`,
+    } · ${sourceLabel}${C.reset}`,
   );
 
   out.push('');
@@ -59,6 +59,7 @@ export function renderInfo(loaded: LoadedStack): string {
     for (const r of repos) {
       const refLabel = r.ref ?? `${C.dim}(default branch)${C.reset}`;
       out.push(`  ${r.slug.padEnd(maxName + 2)}${refLabel}`);
+      out.push(`  ${' '.repeat(maxName + 2)}${C.dim}${r.url}${C.reset}`);
     }
   }
 
@@ -97,7 +98,7 @@ export function renderInfo(loaded: LoadedStack): string {
     }
   }
 
-  const concerns = collectConcerns(stack);
+  const concerns = collectConcerns(loaded);
   if (concerns.length > 0) {
     out.push('');
     out.push(`${C.yellow}⚠${C.reset}  ${C.bold}Probablemente quieras tocar${C.reset}`);
@@ -107,6 +108,9 @@ export function renderInfo(loaded: LoadedStack): string {
       out.push(`  ${C.cyan}${svcName}${C.reset}`);
       for (const c of items) {
         out.push(`    ${renderConcernLine(c)}`);
+        if (c.location) {
+          out.push(`    ${DESC_INDENT}${C.dim}${c.location}${C.reset}`);
+        }
         if (c.description) {
           for (const line of wrapText(c.description, WRAP_WIDTH - DESC_INDENT.length)) {
             out.push(`    ${DESC_INDENT}${C.dim}${line}${C.reset}`);
@@ -114,6 +118,15 @@ export function renderInfo(loaded: LoadedStack): string {
         }
       }
     }
+
+    out.push('');
+    const requiredCount = concerns.filter((c) => c.required).length;
+    const optionalCount = concerns.length - requiredCount;
+    out.push(
+      `  ${C.dim}Total:${C.reset} ${
+        requiredCount > 0 ? `${C.red}${requiredCount} required${C.reset}` : `${C.green}0 required${C.reset}`
+      }${C.dim} · ${optionalCount} opcionales${C.reset}`,
+    );
   } else {
     out.push('');
     out.push(`${C.green}✓${C.reset} no detecté placeholders ni valores vacíos`);
@@ -191,14 +204,14 @@ function effectiveLen(path: string): number {
   return path.replace(/^(=|\^~)\s*/, '').length;
 }
 
-type RepoEntry = { slug: string; ref: string | undefined };
+type RepoEntry = { slug: string; ref: string | undefined; url: string };
 
 function collectRepos(stack: Stack): RepoEntry[] {
   const seen = new Map<string, RepoEntry>();
   for (const svc of Object.values(stack.services)) {
     if (!hasRepo(svc)) continue;
     const slug = svc.repo.replace(/\.git$/, '').split(/[/:]/).pop()!;
-    if (!seen.has(slug)) seen.set(slug, { slug, ref: svc.ref });
+    if (!seen.has(slug)) seen.set(slug, { slug, ref: svc.ref, url: svc.repo });
   }
   return [...seen.values()];
 }
@@ -219,12 +232,14 @@ type Concern = {
   reason: string;
   description?: string;
   required?: boolean;
+  location?: string;       // "arch/stack.yaml:42" — clickeable en VS Code terminal
 };
 
-function collectConcerns(stack: Stack): Concern[] {
+function collectConcerns(loaded: LoadedStack): Concern[] {
   const out: Concern[] = [];
+  const sourceRel = relative(process.cwd(), loaded.sourcePath) || loaded.sourcePath;
 
-  for (const [svcName, svc] of Object.entries(stack.services)) {
+  for (const [svcName, svc] of Object.entries(loaded.stack.services)) {
     const meta = svc.env_meta ?? {};
     for (const [k, vRaw] of Object.entries(svc.env ?? {})) {
       const v = String(vRaw);
@@ -240,6 +255,8 @@ function collectConcerns(stack: Stack): Concern[] {
         const concern: Concern = { service: svcName, key: k, reason };
         if (m.description) concern.description = m.description;
         if (m.required) concern.required = m.required;
+        const loc = loaded.locations.get(`${svcName}.${k}`);
+        if (loc) concern.location = `${sourceRel}:${loc.line}:${loc.col}`;
         out.push(concern);
       }
     }

package/src/parser.ts

@@ -1,17 +1,22 @@
 import { readFileSync } from 'node:fs';
 import { basename, dirname, resolve } from 'node:path';
-import { parse as parseYaml } from 'yaml';
+import { isMap, isPair, isScalar, LineCounter, parseDocument } from 'yaml';
 import { z } from 'zod';
 import { expandFileRefs } from './file-refs.js';
 import { findStack, STACK_FILENAME, STACK_SUBDIRS } from './discover.js';
 import { stackSchema, type Stack } from './schema.js';
 
+// Mapa de "service.envKey" → {line, col} del archivo fuente.
+// Habilita reportes con archivo:línea clickeables en VS Code terminal.
+export type Locations = Map<string, { line: number; col: number }>;
+
 export type LoadedStack = {
   stack: Stack;
   sourcePath: string;
   workDir: string;          // dirname(stack.yaml)
   workspaceRoot: string;    // donde van repos/ y .stack/ — padre del workDir si el yaml vive en arch/
   outDir: string;           // workspaceRoot/.stack
+  locations: Locations;
 };
 
 export function loadStack(stackPath?: string): LoadedStack {
@@ -36,18 +41,23 @@ export function loadStack(stackPath?: string): LoadedStack {
     throw new Error(`no se pudo leer el stack en ${absPath}: ${msg}`);
   }
 
-  let doc: unknown;
+  const lineCounter = new LineCounter();
+  let docNode: ReturnType<typeof parseDocument>;
   try {
-    doc = parseYaml(raw);
+    docNode = parseDocument(raw, { lineCounter });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     throw new Error(`YAML inválido en ${absPath}: ${msg}`);
   }
 
   const workDir = resolve(absPath, '..');
+  const locations = collectLocations(docNode, lineCounter);
+
+  // Plain JS desde el AST para los pasos siguientes.
+  const docPlain = docNode.toJSON();
 
   // Expandir ${file:path} antes de validar — paths se resuelven relativo al workDir.
-  const expanded = expandFileRefs(doc, workDir);
+  const expanded = expandFileRefs(docPlain, workDir);
 
   // Normalizar el formato mixed de env (string | {value, description, required})
   // a dos campos planos: env (Record<string,string>) + env_meta (descripciones).
@@ -66,9 +76,44 @@ export function loadStack(stackPath?: string): LoadedStack {
     workDir,
     workspaceRoot,
     outDir: resolve(workspaceRoot, '.stack'),
+    locations,
   };
 }
 
+// Recorre el AST del YAML y extrae line/col de cada services.<svc>.env.<KEY>.
+// El path es el del KEY del par (donde el usuario debería pararse para editar).
+function collectLocations(
+  doc: ReturnType<typeof parseDocument>,
+  lineCounter: LineCounter,
+): Locations {
+  const locations: Locations = new Map();
+  const services = doc.get('services', true);
+  if (!isMap(services)) return locations;
+
+  for (const svcPair of services.items) {
+    if (!isPair(svcPair) || !isScalar(svcPair.key)) continue;
+    const svcName = String(svcPair.key.value);
+
+    const svcNode = svcPair.value;
+    if (!isMap(svcNode)) continue;
+
+    const envNode = svcNode.get('env', true);
+    if (!isMap(envNode)) continue;
+
+    for (const envPair of envNode.items) {
+      if (!isPair(envPair) || !isScalar(envPair.key)) continue;
+      const keyNode = envPair.key;
+      const key = String(keyNode.value);
+      const range = keyNode.range;
+      if (!range) continue;
+      const pos = lineCounter.linePos(range[0]);
+      locations.set(`${svcName}.${key}`, { line: pos.line, col: pos.col });
+    }
+  }
+
+  return locations;
+}
+
 function computeWorkspaceRoot(workDir: string): string {
   // Si el stack.yaml vive en un subdir convencional (arch/), el workspaceRoot
   // es el padre — repos/ y .stack/ no se mezclan con la definición.