@wp-playground/blueprints 0.1.32 → 0.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wp-playground/blueprints",
-	"version": "0.1.32",
+	"version": "0.1.35",
 	"exports": {
 		".": {
 			"import": "./index.js",
@@ -20,5 +20,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "868bafca7e77ad31e30c1500a0d4da8b1c2314cc"
+	"gitHead": "0962f89a2b1a438997960a25c26f5341db063a3e"
 }

package/src/lib/compile.ts

@@ -82,9 +82,12 @@ export function compileBlueprint(
 		run: async (playground: UniversalPHP) => {
 			try {
 				// Start resolving resources early
-				for (const { asyncResources } of compiled) {
-					for (const resource of asyncResources) {
-						resource.resolve();
+				for (const { resources } of compiled) {
+					for (const resource of resources) {
+						resource.setPlayground(playground);
+						if (resource.isAsync) {
+							resource.resolve();
+						}
 					}
 				}
 
@@ -92,10 +95,17 @@ export function compileBlueprint(
 					const result = await run(playground);
 					onStepCompleted(result, step);
 				}
-				if ('goTo' in playground) {
+				try {
 					await (playground as any).goTo(
 						blueprint.landingPage || '/'
 					);
+				} catch (e) {
+					/*
+					 * NodePHP exposes no goTo method.
+					 * We can't use `goto` in playground here,
+					 * because it may be a Comlink proxy object
+					 * with no such method.
+					 */
 				}
 			} finally {
 				progress.finish();
@@ -159,7 +169,7 @@ function compileStep<S extends StepDefinition>(
 		rootProgressTracker,
 		totalProgressWeight,
 	}: CompileStepArgsOptions
-): { run: CompiledStep; step: S; asyncResources: Array<Resource> } {
+): { run: CompiledStep; step: S; resources: Array<Resource> } {
 	const stepProgress = rootProgressTracker.stage(
 		(step.progress?.weight || 1) / totalProgressWeight
 	);
@@ -195,6 +205,7 @@ function compileStep<S extends StepDefinition>(
 	 * The weight of each async resource is the same, and is the same as the
 	 * weight of the step itself.
 	 */
+	const resources = getResources(args);
 	const asyncResources = getResources(args).filter(
 		(resource) => resource.isAsync
 	);
@@ -204,7 +215,7 @@ function compileStep<S extends StepDefinition>(
 		resource.progress = stepProgress.stage(evenWeight);
 	}
 
-	return { run, step, asyncResources };
+	return { run, step, resources };
 }
 
 /**

package/src/lib/resources.ts

@@ -344,6 +344,11 @@ export class DecoratedResource<T extends Resource> extends Resource {
 		return this.resource.resolve();
 	}
 
+	/** @inheritDoc */
+	override async setPlayground(playground: UniversalPHP) {
+		return this.resource.setPlayground(playground);
+	}
+
 	/** @inheritDoc */
 	get progress() {
 		return this.resource.progress;

package/src/lib/steps/define-site-url.ts

@@ -16,11 +16,12 @@ export const defineSiteUrl: StepHandler<DefineSiteUrlStep> = async (
 	playground,
 	{ siteUrl }
 ) => {
+	const documentRoot = await playground.documentRoot;
 	await updateFile(
 		playground,
-		`/wordpress/wp-config.php`,
+		`${documentRoot}/wp-config.php`,
 		(contents) =>
-			`<?php 
+			`<?php
 			if ( ! defined( 'WP_HOME' ) ) {
             	define('WP_HOME', "${siteUrl}");
 			}

package/src/lib/steps/site-data.ts

@@ -9,19 +9,21 @@ export type SetSiteOptionsStep = {
 
 export const setSiteOptions: StepHandler<SetSiteOptionsStep> = async (
 	client,
-	options
+	{ options }
 ) => {
-	const result = await client.run({
-		code: `<?php
+	const code = `<?php
 	include 'wordpress/wp-load.php';
 	$site_options = ${phpVar(options)};
 	foreach($site_options as $name => $value) {
 		update_option($name, $value);
 	}
 	echo "Success";
-	`,
+	`;
+	const result = await client.run({
+		code,
 	});
 	assertSuccess(result);
+	return { code, result };
 };
 
 export interface UpdateUserMetaStep {
@@ -33,17 +35,19 @@ export const updateUserMeta: StepHandler<UpdateUserMetaStep> = async (
 	client,
 	{ meta, userId }
 ) => {
-	const result = await client.run({
-		code: `<?php
+	const code = `<?php
 	include 'wordpress/wp-load.php';
 	$meta = ${phpVar(meta)};
 	foreach($meta as $name => $value) {
 		update_user_meta(${phpVar(userId)}, $name, $value);
 	}
 	echo "Success";
-	`,
+	`;
+	const result = await client.run({
+		code,
 	});
 	assertSuccess(result);
+	return { code, result };
 };
 
 async function assertSuccess(result: PHPResponse) {