wp-now: avoid exposing emscriptenOptions and just onStdout

Author: sejas

packages/wp-now/src/execute-wp-cli.ts

@@ -1,11 +1,14 @@
-import startWPNow from './wp-now';
+import startWPNow, { WPNowOutputOptions } from './wp-now';
 import { downloadWPCLI } from './download';
 import { disableOutput } from './output';
 import getWpCliPath from './get-wp-cli-path';
 import getWpNowConfig from './config';
 import { DEFAULT_PHP_VERSION, DEFAULT_WORDPRESS_VERSION } from './constants';
 
-export async function executeWPCli(args: string[], emscriptenOptions = {}) {
+export async function executeWPCli(
+	args: string[],
+	outputOptions?: WPNowOutputOptions
+) {
 	await downloadWPCLI();
 	disableOutput();
 	const options = await getWpNowConfig({
@@ -18,7 +21,7 @@ export async function executeWPCli(args: string[], emscriptenOptions = {}) {
 			...options,
 			numberOfPhpInstances: 2,
 		},
-		emscriptenOptions
+		outputOptions
 	);
 	const [, php] = phpInstances;
 

packages/wp-now/src/tests/wp-now.spec.ts

@@ -529,11 +529,11 @@ describe('wp-cli command', () => {
 	 */
 	test('wp-cli displays the version', async () => {
 		let output = '';
-		function collectOutput(outputLine: string) {
+		function onStdout(outputLine: string) {
 			output += outputLine;
 		}
 		await executeWPCli(['cli', 'version'], {
-			print: collectOutput,
+			onStdout,
 		});
 		expect(output).toMatch(/WP-CLI (\d\.?)+/i);
 	});

packages/wp-now/src/wp-now.ts

@@ -1,5 +1,5 @@
 import fs from 'fs-extra';
-import { NodePHP } from '@php-wasm/node';
+import { NodePHP, PHPLoaderOptions } from '@php-wasm/node';
 import path from 'path';
 import { SQLITE_FILENAME } from './constants';
 import {
@@ -27,6 +27,10 @@ import getWpNowPath from './get-wp-now-path';
 import getWordpressVersionsPath from './get-wordpress-versions-path';
 import getSqlitePath from './get-sqlite-path';
 
+export interface WPNowOutputOptions {
+	onStdout?: (data: string) => void;
+}
+
 function seemsLikeAPHPFile(path) {
 	return path.endsWith('.php') || path.includes('.php/');
 }
@@ -39,10 +43,11 @@ async function applyToInstances(phpInstances: NodePHP[], callback: Function) {
 
 export default async function startWPNow(
 	options: Partial<WPNowOptions> = {},
-	emscriptenOptions = {}
+	outputOptions: WPNowOutputOptions = {}
 ): Promise<{ php: NodePHP; phpInstances: NodePHP[]; options: WPNowOptions }> {
 	const { documentRoot } = options;
-	const nodePHPOptions = {
+	const print = outputOptions.onStdout;
+	const nodePHPOptions: PHPLoaderOptions = {
 		requestHandler: {
 			documentRoot,
 			absoluteUrl: options.absoluteUrl,
@@ -60,7 +65,7 @@ export default async function startWPNow(
 				}
 			},
 		},
-		emscriptenOptions,
+		emscriptenOptions: print ? { print } : {},
 	};
 
 	const phpInstances = [];