Refactor php-wasm-cli xdebug-bridge-cli and playground-cli

Author: mho22

.github/workflows/ci.yml

@@ -321,7 +321,7 @@ jobs:
               with:
                   submodules: true
             - uses: ./.github/actions/prepare-playground
-            - run: packages/playground/cli/tests/test-running-unbuilt-cli.sh
+            - run: packages/playground/cli/src/tests/test-running-unbuilt-cli.sh
 
     build:
         runs-on: ubuntu-latest

packages/php-wasm/cli/src/lib/run-cli.ts

@@ -13,6 +13,15 @@ import { PHP } from '@php-wasm/universal';
 import { loadNodeRuntime, useHostFilesystem } from '@php-wasm/node';
 import { startBridge } from '@php-wasm/xdebug-bridge';
 import path from 'path';
+import { logger, LogSeverity } from '@php-wasm/logger';
+
+const LogVerbosity = {
+	Quiet: { name: 'quiet', severity: LogSeverity.Fatal },
+	Normal: { name: 'normal', severity: LogSeverity.Info },
+	Debug: { name: 'debug', severity: LogSeverity.Debug },
+} as const;
+
+type LogVerbosity = (typeof LogVerbosity)[keyof typeof LogVerbosity]['name'];
 
 interface CLIDefaults {
 	directive: string[];
@@ -25,6 +34,8 @@ interface CLIArgs {
 	directive: string[];
 	xdebug?: boolean;
 	experimentalDevtools?: boolean;
+	verbosity?: LogVerbosity;
+	help?: boolean;
 }
 
 function parseCliArgs(defaults: CLIDefaults) {
@@ -58,6 +69,14 @@ Usage: php-wasm-cli <command> [options]
 			describe: 'Enable experimental browser development tools.',
 			default: false,
 		})
+		.option('verbosity', {
+			type: 'string',
+			describe: 'Output logs',
+			choices: Object.values(LogVerbosity).map(
+				(verbosity) => verbosity.name
+			),
+			default: 'normal',
+		})
 		.strictCommands()
 		.help()
 		.epilog(
@@ -112,6 +131,17 @@ export async function parseOptionsAndRunCLI(): Promise<void> {
 		config: defaultPhpIniPath,
 	});
 
+	if (args.help) {
+		return;
+	}
+
+	if (args.verbosity) {
+		const severity = Object.values(LogVerbosity).find(
+			(v) => v.name === args.verbosity
+		)!.severity;
+		logger.setSeverityFilterLevel(severity);
+	}
+
 	// npm scripts set the TMPDIR env variable
 	// PHP accepts a TMPDIR env variable and expects it to
 	// be a writable directory within the PHP filesystem.

packages/php-wasm/xdebug-bridge/src/tests/run-cli.spec.ts

@@ -1,6 +1,6 @@
 import './mocker';
 import { vi } from 'vitest';
-import { main } from '../lib/run-cli';
+import { parseOptionsAndRunCLI } from '../lib/run-cli';
 import { logger, LogSeverity } from '@php-wasm/logger';
 import { startBridge } from '../lib/start-bridge';
 import type { XdebugCDPBridge } from '../lib/xdebug-cdp-bridge';
@@ -26,7 +26,7 @@ describe('CLI', () => {
 	});
 
 	it('calls startBridge with default arguments', async () => {
-		await main();
+		await parseOptionsAndRunCLI();
 
 		expect(startBridge).toHaveBeenCalledWith({
 			cdpPort: 9229,
@@ -48,7 +48,7 @@ describe('CLI', () => {
 			'/var/www'
 		);
 
-		await main();
+		await parseOptionsAndRunCLI();
 
 		expect(startBridge).toHaveBeenCalledWith({
 			cdpPort: 9229,
@@ -62,7 +62,7 @@ describe('CLI', () => {
 		process.argv.push('--help');
 
 		try {
-			await main();
+			await parseOptionsAndRunCLI();
 		} catch (e: any) {
 			expect(e.message).toBe('process.exit unexpectedly called with "0"');
 		}
@@ -73,7 +73,7 @@ describe('CLI', () => {
 	it('runs cli with verbosity option set to quiet', async () => {
 		process.argv.push('--verbosity', 'quiet');
 
-		await main();
+		await parseOptionsAndRunCLI();
 
 		expect(logger.setSeverityFilterLevel).toHaveBeenCalledWith(
 			LogSeverity.Fatal
@@ -83,7 +83,7 @@ describe('CLI', () => {
 	it('runs cli with verbosity option set to normal', async () => {
 		process.argv.push('--verbosity', 'normal');
 
-		await main();
+		await parseOptionsAndRunCLI();
 
 		expect(logger.setSeverityFilterLevel).toHaveBeenCalledWith(
 			LogSeverity.Info
@@ -93,7 +93,7 @@ describe('CLI', () => {
 	it('runs cli with verbosity option set to debug', async () => {
 		process.argv.push('--verbosity', 'debug');
 
-		await main();
+		await parseOptionsAndRunCLI();
 
 		expect(logger.setSeverityFilterLevel).toHaveBeenCalledWith(
 			LogSeverity.Debug

packages/playground/cli/project.json

@@ -136,7 +136,6 @@
 			"executor": "@nx/vite:test",
 			"outputs": ["{workspaceRoot}/coverage/packages/playground/cli"],
 			"options": {
-				"passWithNoTests": true,
 				"reportsDirectory": "../../../coverage/packages/playground/cli"
 			}
 		},

packages/playground/cli/src/cli.ts

@@ -1,4 +1,4 @@
-import { parseOptionsAndRunCLI } from './run-cli';
+import { parseOptionsAndRunCLI } from './lib/run-cli';
 
 // Do not await this as top-level await is not supported in all environments.
 parseOptionsAndRunCLI();

packages/playground/cli/src/index.ts

@@ -1 +1 @@
-export * from './run-cli';
+export * from './lib/run-cli';

packages/playground/cli/src/blueprints-v1/blueprints-v1-handler.ts renamed to packages/playground/cli/src/lib/blueprints-v1/blueprints-v1-handler.ts

@@ -59,6 +59,7 @@ export class BlueprintsV1Handler {
 				import.meta.dirname,
 				'..',
 				'..',
+				'..',
 				importedWorkerV1UrlString
 			);
 		}