@atlashub/smartstack-cli 4.58.0 → 4.60.0

package/dist/index.js

@@ -113279,13 +113279,18 @@ async function installRalphConfig(options = {}) {
       result.errors.push("Ralph config template not found");
       logger.warning("Ralph config template not found in package");
     }
-    const gitignoreSrc = (0, import_path2.join)(TEMPLATES_DIR, "ralph", ".gitignore");
+    const gitignoreSrc = (0, import_path2.join)(TEMPLATES_DIR, "ralph", "gitignore.template");
     const gitignoreDest = (0, import_path2.join)(ralphDir, ".gitignore");
     if (await import_fs_extra2.default.pathExists(gitignoreSrc)) {
       if (!await import_fs_extra2.default.pathExists(gitignoreDest) || options.force) {
         const content = await import_fs_extra2.default.readFile(gitignoreSrc);
         await import_fs_extra2.default.writeFile(gitignoreDest, content);
+        logger.success("Created .ralph/.gitignore");
+      } else {
+        logger.info(".ralph/.gitignore already exists (use --force to overwrite)");
       }
+    } else {
+      logger.warning(".ralph/gitignore.template not found in package \u2014 .gitignore not created");
     }
     const readmeSrc = (0, import_path2.join)(TEMPLATES_DIR, "ralph", "README.md");
     const readmeDest = (0, import_path2.join)(ralphDir, "README.md");
@@ -117199,7 +117204,7 @@ ${projectName}/
 \u2502   \u2514\u2500\u2500 ${projectName}.Api/             # Web API controllers and configuration
 \u251C\u2500\u2500 web/
 \u2502   \u2514\u2500\u2500 ${projectName.toLowerCase()}-web/              # React frontend (Vite + TypeScript + Tailwind)
-\u251C\u2500\u2500 docker-images/                       # Dockerfiles (backend + frontend)
+\u251C\u2500\u2500 docker-images/                       # Dockerfiles + docker-compose (backend + frontend)
 \u2514\u2500\u2500 tests/                               # Unit and integration tests
 \`\`\`
 
@@ -117316,6 +117321,7 @@ async function createFrontendStructure(config, state, dryRun) {
       "eslint-plugin-react-refresh": "^0.4.24",
       globals: "^16.5.0",
       jsdom: "^28.0.0",
+      msw: "^2.7.5",
       typescript: "~5.9.3",
       "typescript-eslint": "^8.46.4",
       vite: "^7.2.4",
@@ -117734,6 +117740,19 @@ async function createDockerFiles(config, state, dryRun) {
     logSafeWriteResult(dockerignoreRelPath, dockerignoreResult);
     recordFile(state, "docker", dockerignoreRelPath, dockerignoreResult.hash);
   }
+  const dockerCompose = await loadTemplate("docker-compose.yml.template", projectName);
+  const composeRelPath = "docker-images/docker-compose.yml";
+  if (dryRun) {
+    logger.info(`Would create ${composeRelPath}`);
+  } else {
+    const composeResult = await safeWriteFile(
+      (0, import_path7.join)(projectDir, composeRelPath),
+      dockerCompose,
+      findKnownHash(state, "docker", composeRelPath)
+    );
+    logSafeWriteResult(composeRelPath, composeResult);
+    recordFile(state, "docker", composeRelPath, composeResult.hash);
+  }
   logger.success("Docker configuration created");
 }
 function checkGitIdentity(cwd) {
@@ -118134,6 +118153,17 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
         const ralphResult = await installRalphConfig({ projectPath: finalProjectDir });
         if (ralphResult.success) {
           logger.success("Ralph configuration created at .ralph/");
+          const ralphFiles = [
+            { path: ".ralph/ralph.config.yaml", abs: ralphResult.configPath },
+            { path: ".ralph/.gitignore", abs: (0, import_path7.join)(finalProjectDir, ".ralph", ".gitignore") },
+            { path: ".ralph/README.md", abs: (0, import_path7.join)(finalProjectDir, ".ralph", "README.md") }
+          ];
+          for (const rf of ralphFiles) {
+            if (await import_fs_extra6.default.pathExists(rf.abs)) {
+              const content = await import_fs_extra6.default.readFile(rf.abs);
+              recordFile(state, "ralph", rf.path, computeHash(content));
+            }
+          }
         } else {
           logger.warning("Could not create Ralph configuration (non-critical)");
         }
@@ -118168,6 +118198,7 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
       `  3. Start dev server: ${source_default.cyan("npm run dev")}`,
       "",
       source_default.yellow("Docker:"),
+      `  Build & run:    ${source_default.cyan("docker compose -f docker-images/docker-compose.yml up --build")}`,
       `  Build backend:  ${source_default.cyan(`docker build -t smartstack-${projectNameLower}-backend:latest -f docker-images/Dockerfile.backend .`)}`,
       `  Build frontend: ${source_default.cyan(`docker build -t smartstack-${projectNameLower}-frontend:latest -f docker-images/Dockerfile.frontend .`)}`,
       "",
@@ -125275,25 +125306,97 @@ async function syncClaudeSettings(projectDir, dryRun) {
   }
   return added;
 }
+async function syncTestFrontendTemplates(frontendDir, dryRun) {
+  const testFrontendDir = (0, import_path8.join)(TEMPLATES_DIR3, "test-frontend");
+  if (!await import_fs_extra7.default.pathExists(testFrontendDir)) {
+    logger.debug("test-frontend templates not found, skipping");
+    return 0;
+  }
+  let synced = 0;
+  const testFiles = [
+    { src: "vitest.config.ts", dest: "vitest.config.ts" },
+    { src: "setup.ts", dest: (0, import_path8.join)("src", "test", "setup.ts") },
+    { src: "test-utils.tsx", dest: (0, import_path8.join)("src", "test", "test-utils.tsx") },
+    { src: "msw/handlers.ts", dest: (0, import_path8.join)("src", "test", "msw", "handlers.ts") },
+    { src: "msw/server.ts", dest: (0, import_path8.join)("src", "test", "msw", "server.ts") }
+  ];
+  for (const file of testFiles) {
+    const destPath = (0, import_path8.join)(frontendDir, file.dest);
+    if (await import_fs_extra7.default.pathExists(destPath)) continue;
+    const srcPath = (0, import_path8.join)(testFrontendDir, file.src);
+    if (!await import_fs_extra7.default.pathExists(srcPath)) continue;
+    if (dryRun) {
+      logger.warning(`[DRY RUN] Would create ${file.dest}`);
+    } else {
+      await import_fs_extra7.default.ensureDir((0, import_path8.dirname)(destPath));
+      const content = await import_fs_extra7.default.readFile(srcPath, "utf-8");
+      await import_fs_extra7.default.writeFile(destPath, content, "utf-8");
+      logger.info(`  ${source_default.green("+")} ${file.dest}`);
+    }
+    synced++;
+  }
+  return synced;
+}
+async function cleanResidualFiles(projectDir, baseNamespace, dryRun) {
+  let cleaned = 0;
+  const residuals = [
+    (0, import_path8.join)(projectDir, "src", `${baseNamespace}.Api`, `${baseNamespace}.Api.http`)
+  ];
+  for (const file of residuals) {
+    if (await import_fs_extra7.default.pathExists(file)) {
+      if (dryRun) {
+        logger.warning(`[DRY RUN] Would remove residual: ${file}`);
+      } else {
+        await import_fs_extra7.default.remove(file);
+        logger.info(`  ${source_default.red("\u2212")} Removed residual: ${baseNamespace}.Api.http`);
+      }
+      cleaned++;
+    }
+  }
+  return cleaned;
+}
+async function fixInitStateVersion(projectDir, cliVersion, dryRun) {
+  const statePath = (0, import_path8.join)(projectDir, ".smartstack", "init-state.json");
+  if (!await import_fs_extra7.default.pathExists(statePath)) return false;
+  try {
+    const state = await import_fs_extra7.default.readJson(statePath);
+    if (state.cliVersion === "0.0.0") {
+      if (dryRun) {
+        logger.warning("[DRY RUN] Would fix cliVersion 0.0.0 in init-state.json");
+      } else {
+        state.cliVersion = cliVersion;
+        await import_fs_extra7.default.writeJson(statePath, state, { spaces: 2 });
+        logger.info(`  ${source_default.green("+")} Fixed cliVersion: 0.0.0 \u2192 ${cliVersion}`);
+      }
+      return true;
+    }
+  } catch {
+  }
+  return false;
+}
 async function syncDockerFiles(projectDir, baseNamespace, dryRun) {
   const projectName = baseNamespace;
-  const projectNameLower = projectName.toLowerCase();
   let updated = 0;
   const files = [
     {
       template: "Dockerfile.backend.template",
-      dest: (0, import_path8.join)(projectDir, "src", `${projectName}.Api`, "Dockerfile"),
-      label: `src/${projectName}.Api/Dockerfile`
+      dest: (0, import_path8.join)(projectDir, "docker-images", "Dockerfile.backend"),
+      label: "docker-images/Dockerfile.backend"
     },
     {
       template: "Dockerfile.frontend.template",
-      dest: (0, import_path8.join)(projectDir, "web", `${projectNameLower}-web`, "Dockerfile"),
-      label: `web/${projectNameLower}-web/Dockerfile`
+      dest: (0, import_path8.join)(projectDir, "docker-images", "Dockerfile.frontend"),
+      label: "docker-images/Dockerfile.frontend"
     },
     {
       template: "dockerignore.template",
       dest: (0, import_path8.join)(projectDir, ".dockerignore"),
       label: ".dockerignore"
+    },
+    {
+      template: "docker-compose.yml.template",
+      dest: (0, import_path8.join)(projectDir, "docker-images", "docker-compose.yml"),
+      label: "docker-images/docker-compose.yml"
     }
   ];
   for (const file of files) {
@@ -125342,6 +125445,9 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     ralphInitialized: false,
     ralphUpToDate: false,
     dockerSynced: 0,
+    testFrontendSynced: 0,
+    residualsCleaned: 0,
+    initStateFixed: false,
     programCsIssues: []
   };
   if (dryRun) {
@@ -125525,6 +125631,14 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     } else {
       logger.info(`Other npm packages: ${source_default.gray("skipped")} (use ${source_default.cyan("--all-packages")} to upgrade all)`);
     }
+    logger.info("Syncing test-frontend templates...");
+    const testSynced = await syncTestFrontendTemplates(frontendDir, dryRun);
+    result.testFrontendSynced = testSynced;
+    if (testSynced > 0) {
+      logger.success(`${testSynced} test template(s) deployed`);
+    } else {
+      logger.info(`Test templates ${source_default.green("\u2713")} up to date`);
+    }
     console.log();
   }
   logger.info("Checking for code migrations...");
@@ -125595,6 +125709,17 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     logger.info(`Dockerfiles ${source_default.green("\u2713")} up to date`);
   }
   console.log();
+  const residualsCleaned = await cleanResidualFiles(projectDir, config.baseNamespace, dryRun);
+  result.residualsCleaned = residualsCleaned;
+  if (residualsCleaned > 0) {
+    logger.success(`${residualsCleaned} residual file(s) cleaned`);
+    console.log();
+  }
+  result.initStateFixed = await fixInitStateVersion(projectDir, nugetVersion, dryRun);
+  if (result.initStateFixed) {
+    logger.success("Fixed cliVersion in init-state.json");
+    console.log();
+  }
   logger.info("Checking Ralph configuration...");
   const ralphStatus = await checkRalphInstallation(projectDir);
   if (ralphStatus.configExists) {
@@ -125638,7 +125763,7 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     logger.success(`Updated config version to ${source_default.cyan(nugetVersion)}`);
     console.log();
   }
-  const totalChanged = result.nugetUpgraded + result.otherPkgUpdated + (result.npmUpgraded ? 1 : 0) + (result.npmOtherUpdated ? 1 : 0) + migrationSummary.totalApplied + result.configSynced + result.claudeSettingsSynced + result.dockerSynced + (result.ralphInitialized ? 1 : 0);
+  const totalChanged = result.nugetUpgraded + result.otherPkgUpdated + (result.npmUpgraded ? 1 : 0) + (result.npmOtherUpdated ? 1 : 0) + migrationSummary.totalApplied + result.configSynced + result.claudeSettingsSynced + result.dockerSynced + result.testFrontendSynced + result.residualsCleaned + (result.initStateFixed ? 1 : 0) + (result.ralphInitialized ? 1 : 0);
   const allUpToDate = totalChanged === 0 && result.nugetFailed === 0 && result.otherPkgFailed === 0;
   const hasProgramIssues = result.programCsIssues.length > 0;
   if (allUpToDate && !hasProgramIssues) {
@@ -125702,6 +125827,15 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     if (result.dockerSynced > 0) {
       lines.push(`  ${source_default.green("\u2713")} Docker: ${result.dockerSynced} Dockerfile(s) updated`);
     }
+    if (result.testFrontendSynced > 0) {
+      lines.push(`  ${source_default.green("\u2713")} Test templates: ${result.testFrontendSynced} file(s) deployed`);
+    }
+    if (result.residualsCleaned > 0) {
+      lines.push(`  ${source_default.green("\u2713")} Cleanup: ${result.residualsCleaned} residual file(s) removed`);
+    }
+    if (result.initStateFixed) {
+      lines.push(`  ${source_default.green("\u2713")} Init-state: cliVersion fixed`);
+    }
     if (result.ralphInitialized) {
       lines.push(`  ${source_default.green("\u2713")} Ralph: configuration initialized`);
     }