@testspectra/cli 1.0.21 → 1.0.23

package/dist/commands/init.js

@@ -1,9 +1,10 @@
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
+import * as p from "@clack/prompts";
+import chalk from "chalk";
 import { ConfigLoader } from "../config/loader.js";
 import { TypeGenerator } from "../types/generator.js";
-import inquirer from "inquirer";
 function parsePnpmWorkspaceGlobs(content) {
     const lines = content.split("\n");
     const globs = [];
@@ -27,6 +28,54 @@ function parsePnpmWorkspaceGlobs(content) {
     }
     return globs;
 }
+function ensurePnpmWorkspaceIncludes(pnpmWorkspacePath, targetPath) {
+    const normalizedTarget = targetPath.replace(/\\/g, "/");
+    if (!fs.existsSync(pnpmWorkspacePath)) {
+        const newContent = `packages:\n  - '${normalizedTarget}'\n`;
+        fs.writeFileSync(pnpmWorkspacePath, newContent, "utf-8");
+        return;
+    }
+    const content = fs.readFileSync(pnpmWorkspacePath, "utf-8");
+    const currentGlobs = parsePnpmWorkspaceGlobs(content);
+    // Check if target is already covered by an existing glob or exact path
+    const isAlreadyCovered = currentGlobs.some((glob) => {
+        const normGlob = glob.replace(/\\/g, "/");
+        if (normGlob === normalizedTarget)
+            return true;
+        if (normGlob === `${normalizedTarget}/*` || normGlob === `${normalizedTarget}/**`)
+            return true;
+        if (normGlob.endsWith("/*")) {
+            const parent = normGlob.slice(0, -2);
+            if (normalizedTarget.startsWith(`${parent}/`) && normalizedTarget.split("/").length === parent.split("/").length + 1)
+                return true;
+        }
+        if (normGlob.endsWith("/**")) {
+            const parent = normGlob.slice(0, -3);
+            if (normalizedTarget.startsWith(`${parent}/`))
+                return true;
+        }
+        return false;
+    });
+    if (!isAlreadyCovered) {
+        // Insert new package pattern right under packages:
+        const lines = content.split("\n");
+        let insertIndex = -1;
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i].trim().startsWith("packages:")) {
+                insertIndex = i + 1;
+                break;
+            }
+        }
+        if (insertIndex !== -1) {
+            lines.splice(insertIndex, 0, `  - '${normalizedTarget}'`);
+            fs.writeFileSync(pnpmWorkspacePath, lines.join("\n"), "utf-8");
+        }
+        else {
+            const newContent = `packages:\n  - '${normalizedTarget}'\n` + content;
+            fs.writeFileSync(pnpmWorkspacePath, newContent, "utf-8");
+        }
+    }
+}
 function scanDirectoriesForProjects(cwd, patterns) {
     const foundProjects = [];
     const visited = new Set();
@@ -112,9 +161,10 @@ export async function initCommand(options = {}) {
     const cwd = process.cwd();
     const existingConfig = ConfigLoader.findConfigFile(cwd);
     if (existingConfig && existingConfig === path.join(cwd, path.basename(existingConfig)) && !options.force) {
-        console.log(`\x1b[33m[TestSpectra]\x1b[0m Config already exists at ${path.basename(existingConfig)}. Use --force to overwrite.`);
+        p.log.warn(chalk.yellow(`Config already exists at ${path.basename(existingConfig)}. Use --force to overwrite.`));
         return;
     }
+    p.intro(chalk.bold.cyan("✨ TestSpectra Enterprise Scaffolder"));
     // Detect monorepo environment
     let isMonorepo = false;
     let pnpmPatterns = [];
@@ -134,20 +184,27 @@ export async function initCommand(options = {}) {
     const detectedProjects = isMonorepo ? scanDirectoriesForProjects(cwd, pnpmPatterns) : [];
     let selectedTemplate = options.template;
     if (!selectedTemplate && !options.force) {
-        const choices = [
-            { name: "Standard (Standalone or single project)", value: "default" },
-            { name: "Nx Monorepo (Interactive multi-module feature discovery & centralized config)", value: "nx" },
-        ];
-        const answers = await inquirer.prompt([
-            {
-                type: "list",
-                name: "template",
-                message: "Select TestSpectra setup mode:",
-                choices,
-                default: isMonorepo ? "nx" : "default",
-            },
-        ]);
-        selectedTemplate = answers.template;
+        const templateChoice = await p.select({
+            message: "Select TestSpectra setup mode:",
+            initialValue: isMonorepo ? "nx" : "default",
+            options: [
+                {
+                    label: "Nx Monorepo (Recommended)",
+                    value: "nx",
+                    hint: "Interactive workspace feature discovery & centralized config",
+                },
+                {
+                    label: "Standard Project",
+                    value: "default",
+                    hint: "Standalone single-suite E2E testing project",
+                },
+            ],
+        });
+        if (p.isCancel(templateChoice)) {
+            p.cancel("Setup cancelled.");
+            return;
+        }
+        selectedTemplate = templateChoice;
     }
     const templateName = selectedTemplate || (isMonorepo ? "nx" : "default");
     // 1. Resolve template directory
@@ -161,10 +218,11 @@ export async function initCommand(options = {}) {
         templateDir = path.resolve(__dirname, `../../../templates/${templateName}`);
     }
     if (!fs.existsSync(templateDir)) {
-        throw new Error(`[TestSpectra] Scaffold template directory not found at: ${templateDir}`);
+        p.cancel(chalk.red(`Template directory not found: ${templateDir}`));
+        return;
     }
     // 2. Resolve CLI dependency version
-    let cliVersion = "^1.0.17";
+    let cliVersion = "^1.0.21";
     try {
         const cliPackageJsonPath = path.resolve(__dirname, "../../package.json");
         if (fs.existsSync(cliPackageJsonPath)) {
@@ -234,47 +292,53 @@ export async function initCommand(options = {}) {
     }
     // --- MONOREPO INTERACTIVE FLOW ---
     if (templateName === "nx" && (detectedProjects.length > 0 || isMonorepo)) {
-        console.log(`\n\x1b[36m[TestSpectra Monorepo Discovery]\x1b[0m`);
-        console.log(`Found ${detectedProjects.length} workspace feature project(s).`);
         let chosenProjects = [];
         if (detectedProjects.length > 0) {
-            const projectAnswers = await inquirer.prompt([
-                {
-                    type: "checkbox",
-                    name: "selectedProjects",
-                    message: "Select workspace features where TestSpectra should be initialized:",
-                    choices: detectedProjects.map((p) => ({
-                        name: `${p.relPath} (${p.name})${p.hasNxProject ? " [Nx project.json]" : ""}`,
-                        value: p.relPath,
-                        checked: true,
-                    })),
-                },
-            ]);
-            chosenProjects = projectAnswers.selectedProjects;
-        }
-        const folderAnswers = await inquirer.prompt([
-            {
-                type: "input",
-                name: "e2eFolderName",
-                message: "Enter E2E test folder name for each selected feature:",
-                default: "e2e",
-            },
-            {
-                type: "input",
-                name: "sharedTestingPath",
-                message: "Enter path for Shared Testing library (POMs, Steps, Actions, Fixtures):",
-                default: "shared/testing",
-            },
-        ]);
-        const e2eFolderName = folderAnswers.e2eFolderName.trim() || "e2e";
-        const sharedTestingRelPath = folderAnswers.sharedTestingPath.trim() || "shared/testing";
+            p.log.step(chalk.cyan(`Monorepo Auto-Discovery: Found ${detectedProjects.length} workspace feature package(s)`));
+            const projectChoices = await p.multiselect({
+                message: "Select workspace features to initialize with TestSpectra:",
+                options: detectedProjects.map((proj) => ({
+                    value: proj.relPath,
+                    label: `${proj.relPath} (${proj.name})`,
+                    hint: proj.hasNxProject ? "Nx project.json" : "package.json",
+                })),
+                initialValues: detectedProjects.map((p) => p.relPath),
+                required: true,
+            });
+            if (p.isCancel(projectChoices)) {
+                p.cancel("Setup cancelled.");
+                return;
+            }
+            chosenProjects = projectChoices;
+        }
+        const e2eFolderNameInput = await p.text({
+            message: "Enter E2E test folder name for each selected feature:",
+            placeholder: "e2e",
+            defaultValue: "e2e",
+        });
+        if (p.isCancel(e2eFolderNameInput)) {
+            p.cancel("Setup cancelled.");
+            return;
+        }
+        const sharedTestingPathInput = await p.text({
+            message: "Enter path for Shared Testing library (POMs, Steps, Actions, Fixtures):",
+            placeholder: "shared/testing",
+            defaultValue: "shared/testing",
+        });
+        if (p.isCancel(sharedTestingPathInput)) {
+            p.cancel("Setup cancelled.");
+            return;
+        }
+        const e2eFolderName = e2eFolderNameInput.trim() || "e2e";
+        const sharedTestingRelPath = sharedTestingPathInput.trim() || "shared/testing";
         const sharedTestingAbsPath = path.join(cwd, sharedTestingRelPath);
+        const s = p.spinner();
+        s.start("Scaffolding distributed monorepo structure and ambient types...");
         // 1. Centralized Root Config
         const rootConfigSrc = path.join(templateDir, "spectra.config.ts");
         const rootConfigDest = path.join(cwd, "spectra.config.ts");
         if (fs.existsSync(rootConfigSrc) && (!fs.existsSync(rootConfigDest) || options.force)) {
             fs.copyFileSync(rootConfigSrc, rootConfigDest);
-            console.log(`\x1b[32m[TestSpectra]\x1b[0m Created centralized configuration at ./spectra.config.ts`);
         }
         // 2. Centralized Root .testspectra folder for cache/logs
         const rootTestDataDir = path.join(cwd, ".testspectra");
@@ -285,7 +349,6 @@ export async function initCommand(options = {}) {
         const sharedTestingSrc = path.join(templateDir, "shared/testing");
         if (fs.existsSync(sharedTestingSrc)) {
             copyRecursive(sharedTestingSrc, sharedTestingAbsPath);
-            console.log(`\x1b[32m[TestSpectra]\x1b[0m Initialized shared testing library at ./${sharedTestingRelPath}`);
         }
         // 4. Distribute E2E Folders to Selected Feature Modules
         const sampleE2eSrc = path.join(templateDir, "modules/auth/e2e");
@@ -318,9 +381,14 @@ export async function initCommand(options = {}) {
             if (fs.existsSync(localConfig))
                 fs.unlinkSync(localConfig);
             featureE2eDirs.push(targetE2eDir);
-            console.log(`\x1b[32m[TestSpectra]\x1b[0m Initialized ${e2eProjectName} in ./${path.relative(cwd, targetE2eDir)}`);
         }
-        // 5. Update Root Solution tsconfig.json references
+        // 5. Ensure pnpm-workspace.yaml includes shared library and all feature E2E directories
+        const pnpmWorkspaceFilePath = path.join(cwd, "pnpm-workspace.yaml");
+        ensurePnpmWorkspaceIncludes(pnpmWorkspaceFilePath, sharedTestingRelPath);
+        for (const e2eDir of featureE2eDirs) {
+            ensurePnpmWorkspaceIncludes(pnpmWorkspaceFilePath, path.relative(cwd, e2eDir));
+        }
+        // 6. Update Root Solution tsconfig.json references
         const rootTsConfigPath = path.join(cwd, "tsconfig.json");
         const references = [];
         for (const e2eDir of featureE2eDirs) {
@@ -344,12 +412,13 @@ export async function initCommand(options = {}) {
         else {
             rootTsConfig = { files: [], references };
         }
-        // 6. Generate Ambient Types for Shared + All E2E Feature Directories
+        fs.writeFileSync(rootTsConfigPath, JSON.stringify(rootTsConfig, null, 2), "utf-8");
+        // 7. Generate Ambient Types for Shared + All E2E Feature Directories
         TypeGenerator.writeDeclarationFiles(cwd);
         for (const e2eDir of featureE2eDirs) {
             TypeGenerator.writeDeclarationFiles(e2eDir);
         }
-        // 7. Generate ARCHITECTURE.md in root documenting the exact generated layout
+        // 8. Generate ARCHITECTURE.md in root documenting the exact generated layout
         const archDocContent = `# TestSpectra Enterprise Monorepo Architecture
 
 This workspace uses TestSpectra's **"Centralized Configuration, Distributed Implementation"** model for automated cross-platform testing.
@@ -431,15 +500,18 @@ pnpm type-check
             const readmeContent = `# ${projectName}\n\nAutomated cross-platform E2E testing powered by [TestSpectra](https://github.com/testspectra).\n${archSection}`;
             fs.writeFileSync(rootReadmePath, readmeContent, "utf-8");
         }
-        console.log(`\n\x1b[32m[TestSpectra]\x1b[0m Enterprise Nx Monorepo initialized successfully!`);
-        console.log(`\x1b[36m- Centralized Configuration:\x1b[0m ./spectra.config.ts`);
-        console.log(`\x1b[36m- Centralized App Data/Cache:\x1b[0m ./.testspectra/`);
-        console.log(`\x1b[36m- Shared Testing Library:\x1b[0m ./${sharedTestingRelPath}`);
-        console.log(`\x1b[36m- Architecture Documentation:\x1b[0m ./ARCHITECTURE.md`);
-        console.log(`\x1b[36m- Initialized Features (${featureE2eDirs.length}):\x1b[0m\n  ${featureE2eDirs.map((d) => path.relative(cwd, d)).join("\n  ")}`);
+        s.stop("Monorepo scaffolding complete!");
+        p.log.success(chalk.green("Centralized Configuration: ./spectra.config.ts"));
+        p.log.success(chalk.green("Centralized App Data/Cache: ./.testspectra/"));
+        p.log.success(chalk.green(`Shared Testing Library: ./${sharedTestingRelPath}`));
+        p.log.success(chalk.green("Architecture Documentation: ./ARCHITECTURE.md"));
+        p.log.message(chalk.cyan(`Initialized Features (${featureE2eDirs.length}):\n${featureE2eDirs.map((d) => `  - ./${path.relative(cwd, d)}`).join("\n")}`));
+        p.outro(chalk.bold.green("🎉 Enterprise Nx Monorepo ready for testing!"));
         return;
     }
     // --- STANDALONE / DEFAULT PROJECT FLOW ---
+    const s = p.spinner();
+    s.start("Scaffolding standalone TestSpectra project...");
     copyRecursive(templateDir, cwd);
     if (!isInternalWorkspace) {
         const pnpmWorkspacePath = path.join(cwd, "pnpm-workspace.yaml");
@@ -491,7 +563,8 @@ pnpm type-check
         const standaloneReadme = `# ${projectName}\n\nTestSpectra automated testing project.\n${standaloneArchSection}`;
         fs.writeFileSync(standaloneReadmePath, standaloneReadme, "utf-8");
     }
-    console.log(`\x1b[32m[TestSpectra]\x1b[0m Initialized project from template successfully!`);
-    console.log(`\x1b[32m[TestSpectra]\x1b[0m Generated documentation at ./ARCHITECTURE.md`);
-    console.log(`\x1b[32m[TestSpectra]\x1b[0m Generated ambient multi-platform types in .testspectra/types/`);
+    s.stop("Standalone project ready!");
+    p.log.success(chalk.green("Generated ambient multi-platform types in .testspectra/types/"));
+    p.log.success(chalk.green("Architecture documentation created at ./ARCHITECTURE.md"));
+    p.outro(chalk.bold.green("🎉 Project initialized successfully!"));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testspectra/cli",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "TestSpectra Zero-Config Cross-Platform Test Runner CLI",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,16 +20,15 @@
     "README.md"
   ],
   "dependencies": {
+    "@clack/prompts": "^1.7.0",
     "@testspectra/matchers": "^1.0.0",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
-    "inquirer": "^9.3.2",
     "ora": "^8.0.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@types/inquirer": "^9.0.7",
     "@types/node": "^20.14.0",
     "typescript": "^5.4.5"
   },