lucy-cli 0.8.3 → 0.9.1

package/src/helpers.ts

@@ -1,15 +1,14 @@
 import chalk from 'chalk';
-import { join } from 'path';
 import { simpleGit } from 'simple-git';
-import fs from 'fs/promises';
 import { spawnSync } from 'child_process';
 // https://www.sergevandenoever.nl/run-gulp4-tasks-programatically-from-node/
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { ModuleSettings, ProjectSettings } from '.';
 import { exec } from 'child_process';
+import os from 'os';
 
-import { blue, green, orange, red } from './index.js';
+import { blue, green, orange, red, yellow, magenta } from './index.js';
 
 export async function installPackages(wixPackages: Record<string, string>, devPackages: Record<string, string>,  cwd: string, locked: boolean ) {
 	if (locked) console.log("🐕" + blue.underline(` => Installing & version locked packages!`));
@@ -83,19 +82,84 @@ export async function runGulp(moduleSettings: ModuleSettings, projectSettings: P
 /**
  * Clean up and run a command before exiting the process.
  */
-export function handleExit() {
+export function cleanupWatchers() {
+    console.log(`🧹 ${magenta.underline('Cleaning up Watchman watchers...')}`);
     const cwd = process.cwd();
-    const command = `watchman watch-del '${cwd}'`;
-
-	console.log("🐕" + blue.underline(' => Cleaning up...'));
+    const command = `watchman watch-del "${cwd}"`; // Adjust for Windows paths
     exec(command, (error, stdout, stderr) => {
         if (error) {
-            console.error(`💩 Failed to run cleanup: ${error.message}`);
+            console.error(`💩 ${red.underline('Failed to run cleanup:')} ${orange(error.message)}`);
             return;
         }
         if (stderr) {
-            console.error(`⚠️  Watchman stderr: ${stderr}`);
+            console.error(`⚠️ ${yellow.underline('Watchman stderr:')} ${stderr}`);
         }
-        console.log(`✅ Watchman cleanup success: ${stdout}`);
+        console.log(`✅ ${green.underline('Watchman cleanup success:')} ${stdout}`);
     });
 }
+
+/**
+ * Kill all processes matching a specific substring in their command, with a fallback for Windows.
+ * @param {string} processPattern - The substring to match (e.g., "wix:dev" or "@wix/cli/bin/wix.cjs").
+ */
+export function killAllProcesses(processPattern: string) {
+    const isWindows = os.platform() === 'win32';
+    const command = isWindows
+        ? `tasklist /FI "IMAGENAME eq node.exe" /FO CSV | findstr "${processPattern}"` // Adjust for Node.js processes
+        : `ps -eo pid,command | grep "${processPattern}" | grep -v grep`;
+
+    exec(command, (error, stdout, stderr) => {
+        if (error) {
+            console.error(`💩 ${red.underline('Failed to find processes:')} ${orange(error.message)}`);
+            return;
+        }
+        if (stderr) {
+            console.error(`⚠️ ${yellow.underline('Error output:')} ${stderr}`);
+        }
+        if (!stdout.trim()) {
+            console.log(`ℹ️ ${blue.underline(`No processes found matching pattern:`)} ${orange(processPattern)}`);
+            return;
+        }
+
+        console.log(`📝 ${magenta.underline('Found matching processes:')}\n${stdout}`);
+        const lines = stdout.trim().split('\n');
+        const pids = isWindows
+            ? lines.map(line => line.match(/"(\d+)"/)?.[1]) // Extract PID from Windows tasklist output
+            : lines.map(line => line.trim().split(/\s+/)[0]).filter(pid => !isNaN(Number(pid)));
+
+        pids.forEach(pid => {
+            if (!pid) return;
+            try {
+                const killCommand = isWindows
+                    ? `taskkill /PID ${pid} /T /F` // Forcefully terminate the process on Windows
+                    : `kill -SIGTERM ${pid}`;
+                
+                exec(killCommand, (killError) => {
+                    if (killError) {
+                        console.error(`⚠️ ${yellow.underline('Failed to kill process with PID')} ${orange(pid)}: ${red(killError.message)}`);
+                    } else {
+                        console.log(`✅ ${green.underline('Killed process with PID:')} ${orange(pid)}`);
+                    }
+                });
+
+                // Schedule SIGKILL fallback for non-Windows platforms
+                if (!isWindows) {
+                    setTimeout(() => {
+                        try {
+                            process.kill(parseInt(pid, 10), 'SIGKILL');
+                            console.log(`🔪 ${red.underline('Sent SIGKILL to process with PID:')} ${orange(pid)} (fallback).`);
+                        } catch (killError: any) {
+                            if (killError.code === 'ESRCH') {
+                                console.log(`✅ ${green.underline('Process with PID')} ${orange(pid)} ${green.underline('already terminated.')}`);
+                            } else {
+                                console.error(`⚠️ ${yellow.underline('Failed to send SIGKILL to process with PID')} ${orange(pid)}: ${red(killError.message)}`);
+                            }
+                        }
+                    }, 10000);
+                }
+            } catch (err: any) {
+                console.error(`⚠️ ${yellow.underline('Failed to kill process with PID')} ${orange(pid)}: ${red(err.message)}`);
+            }
+        });
+    });
+}

package/src/index.ts

@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 
 import { init } from './init.js';
 import { sync } from './sync.js';
-import { runGulp, installPackages, handleExit } from './helpers.js';
+import { runGulp, installPackages, killAllProcesses, cleanupWatchers } from './helpers.js';
 import { prepare } from './prepare.js';
 import { spawnSync } from 'child_process';
 
@@ -71,10 +71,50 @@ const __filename = fileURLToPath(import.meta.url);
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const __dirname = dirname(__filename);
 
+// const cwd = process.cwd();
+// const command = `watchman watch-del '${cwd}'`;
+// killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+// killAllProcesses('wix:dev');   
+
+
+process.on('exit', (code) => {
+	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+	killAllProcesses('wix:dev');   
+    cleanupWatchers();
+	console.log(`🚪 ${magenta.underline('Process exiting with code:')} ${orange(code)}`);
+});
+
 process.on('SIGINT', () => {
-    console.log("🐕 Received Ctrl+C, cleaning up...");
-    handleExit();
-    process.exit(); // Exit the process explicitly
+	console.log(`🐕 ${green.underline('Received Ctrl+C (SIGINT), cleaning up...')}`);
+	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+	killAllProcesses('wix:dev');  
+    cleanupWatchers();
+    process.exit(); // Exit explicitly after handling
+});
+
+process.on('SIGTERM', () => {
+	console.log(`🛑 ${red.underline('Received termination signal (SIGTERM), cleaning up...')}`);
+	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+	killAllProcesses('wix:dev');  
+    cleanupWatchers();
+    process.exit(); // Exit explicitly after handling
+});
+
+process.on('uncaughtException', (error) => {
+	console.error(`💥 ${red.underline('Uncaught Exception:')}`, error);
+	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+	killAllProcesses('wix:dev');  
+    cleanupWatchers();
+    process.exit(1); // Exit with an error code
+});
+
+process.on('unhandledRejection', (reason, promise) => {
+	console.error(`🚨 ${yellow.underline('Unhandled Rejection at:')} ${orange(promise)}`);
+	console.error(`🚨 ${red.underline('Reason:')} ${reason}`);    cleanupWatchers();
+	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+	killAllProcesses('wix:dev');  
+    cleanupWatchers();
+    process.exit(1); // Exit with an error code
 });
 
 /**
@@ -115,6 +155,8 @@ async function main(): Promise<void> {
 		console.log("🦮 " + magenta.bold('install') + "            : Installs all Wix npm packages listed in the 'lucy.json' file in the project directory.");
 		console.log("🦮 " + magenta.bold('fix') + "                : Runs a fix command to resolve common issues in development or production settings.");
 		console.log("🦮 " + magenta.bold('docs') + "               : Generates documentation for the project.");
+		console.log("🦮 " + magenta.bold('cypress') + "            : Starts the cypress test runner.");
+		console.log("🦮 " + magenta.bold('e2e') + "                : Starts the cypress test runner in CI mode. first argument is the key second is the build id <e2e <somekey <someID>");
 		console.log("\nOptions:");
 		console.log("🦮 " + magenta.bold('-h, help') + "           : Displays this help message.");
 		console.log("🦮 " + magenta.bold('-v, version') + "        : Displays the current version of Lucy CLI as defined in the project’s package.json.");
@@ -194,11 +236,40 @@ async function main(): Promise<void> {
 	if(moduleSettings.args.includes('docs')){
 		const res = spawnSync('yarn docs', { shell: true, stdio: 'inherit' });
 		if (res.error) {
-			return console.log((`💩 ${red.underline.bold("=> Failed to install dev packages =>")} ${orange(res.error.message)}`));
+			return console.log((`💩 ${red.underline.bold("=> Failed to Docs generated => ")} ${orange(res.error.message)}`));
 		}
 		return console.log("🐕" + blue.underline(` => Docs generated!`));
 	}
 
+	if(moduleSettings.args.includes('cypress')){
+		const res = spawnSync('yarn cypress', { shell: true, stdio: 'inherit' });
+		if (res.error) {
+			return console.log((`💩 ${red.underline.bold("=> Failed to start cypress => ")} ${orange(res.error.message)}`));
+		}
+		return console.log("🐕" + blue.underline(` => Started Cypress`));
+	}
+
+	if (moduleSettings.args.includes('e2e')) {
+		// Extract arguments
+		const e2eIndex = moduleSettings.args.indexOf('e2e');
+		const key = moduleSettings.args[e2eIndex + 1];
+		const buildId = moduleSettings.args[e2eIndex + 2];
+	
+		// Validate that both arguments are provided
+		if (!key && !buildId) {
+			console.log(`💩 ${red.underline.bold("=> Missing required arguments:")} ${orange("key")} and ${orange("build ID")}`);
+			process.exit(1);
+		}
+	
+		// Run Cypress with the provided arguments
+		const res = spawnSync(`yarn e2e --key ${key} --ci-build-id ${buildId}`, { shell: true, stdio: 'inherit' });
+		if (res.error) {
+			console.log(`💩 ${red.underline.bold("=> Failed to start Cypress =>")} ${orange(res.error.message)}`);
+			process.exit(1);
+		}
+		return console.log("🐕 " + blue.underline(`=> Started Cypress successfully`));
+	}
+
 	if(moduleSettings.args.includes('prepare')){
 		await prepare( moduleSettings, projectSettings);
 

package/src/settings.json

@@ -57,6 +57,8 @@
     "fix-wix": "lucy-cli fix-wix",
     "tsc": "tsc -p ./typescript/tsconfig.json --noEmit",
     "test": "jest --config jest.config.ts --passWithNoTests",
-    "test:watch": "jest --config jest.config.ts --watch"
+    "test:watch": "jest --config jest.config.ts --watch",
+    "cypress": "cypress open",
+    "e2e": "cypress-cloud run --parallel --record"
   }
 }

package/src/types.d.ts

@@ -4,4 +4,5 @@ declare module 'gulp-foreach';
 declare module 'gulp-string-replace';
 declare module 'gulp-wait';
 declare module 'gulp-jest';
-declare module 'gulp-flatmap';
+declare module 'gulp-flatmap';
+declare module 'gulp-swc';