@wp-playground/cli 2.0.3 → 2.0.4

package/cli.cjs

@@ -1,2 +1,2 @@
-"use strict";const n=require("./run-cli-BaODvNPu.cjs");n.parseOptionsAndRunCLI();
+"use strict";const n=require("./run-cli-BSpDmClB.cjs");n.parseOptionsAndRunCLI();
 //# sourceMappingURL=cli.cjs.map

package/cli.js

@@ -1,3 +1,3 @@
-import { p } from "./run-cli-JA8jNok0.js";
+import { p } from "./run-cli-B0BNDNay.js";
 p();
 //# sourceMappingURL=cli.js.map

package/index.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("./run-cli-BaODvNPu.cjs");exports.parseOptionsAndRunCLI=n.parseOptionsAndRunCLI;exports.runCLI=n.runCLI;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("./run-cli-BSpDmClB.cjs");exports.parseOptionsAndRunCLI=n.parseOptionsAndRunCLI;exports.runCLI=n.runCLI;
 //# sourceMappingURL=index.cjs.map

package/index.js

@@ -1,4 +1,4 @@
-import { p, r as s } from "./run-cli-JA8jNok0.js";
+import { p, r as s } from "./run-cli-B0BNDNay.js";
 export {
   p as parseOptionsAndRunCLI,
   s as runCLI

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wp-playground/cli",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "WordPress Playground CLI",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
   "module": "./index.js",
   "types": "index.d.ts",
   "bin": "wp-playground.js",
-  "gitHead": "6355c320ae2de93d4a0176e45ded2ad4cc6f4ae2",
+  "gitHead": "8fc1b0f5379a854c9df792c14da17a2ba697e562",
   "dependencies": {
     "@zip.js/zip.js": "2.7.57",
     "ajv": "8.12.0",
@@ -53,16 +53,18 @@
     "simple-get": "4.0.1",
     "wasm-feature-detect": "1.8.0",
     "ws": "8.18.1",
+    "xml2js": "0.6.2",
     "yargs": "17.7.2",
-    "@php-wasm/logger": "2.0.3",
-    "@php-wasm/progress": "2.0.3",
-    "@php-wasm/universal": "2.0.3",
-    "@wp-playground/blueprints": "2.0.3",
-    "@wp-playground/common": "2.0.3",
-    "@wp-playground/wordpress": "2.0.3",
-    "@php-wasm/node": "2.0.3",
-    "@php-wasm/util": "2.0.3",
-    "@wp-playground/storage": "2.0.3"
+    "@php-wasm/logger": "2.0.4",
+    "@php-wasm/progress": "2.0.4",
+    "@php-wasm/universal": "2.0.4",
+    "@wp-playground/blueprints": "2.0.4",
+    "@wp-playground/common": "2.0.4",
+    "@wp-playground/wordpress": "2.0.4",
+    "@php-wasm/node": "2.0.4",
+    "@php-wasm/util": "2.0.4",
+    "@wp-playground/storage": "2.0.4",
+    "@php-wasm/xdebug-bridge": "2.0.4"
   },
   "overrides": {
     "rollup": "^4.34.6",

package/{run-cli-JA8jNok0.js → run-cli-B0BNDNay.js}

@@ -1,21 +1,22 @@
-import { logger as p, errorLogPath as F } from "@php-wasm/logger";
-import { consumeAPI as L, SupportedPHPVersions as T, printDebugDetails as V, PHPResponse as R, exposeAPI as q, exposeSyncAPI as j } from "@php-wasm/universal";
+import { logger as p, errorLogPath as I } from "@php-wasm/logger";
+import { consumeAPI as L, SupportedPHPVersions as T, printDebugDetails as V, PHPResponse as B, exposeAPI as q, exposeSyncAPI as j } from "@php-wasm/universal";
 import { resolveRemoteBlueprint as D, isBlueprintBundle as O, compileBlueprint as Z, runBlueprintSteps as _ } from "@wp-playground/blueprints";
 import { zipDirectory as M, RecommendedPHPVersion as $, unzipFile as N } from "@wp-playground/common";
 import w from "fs";
 import { Worker as J, MessageChannel as Y } from "worker_threads";
-import { p as U, a as Q, e as X } from "./mounts-B-Qdcyyt.js";
+import { p as R, a as Q, e as X } from "./mounts-B-Qdcyyt.js";
 import G from "express";
 import { FileLockManagerForNode as K } from "@php-wasm/node";
 import ee, { cpus as te } from "os";
 import { jspi as re } from "wasm-feature-detect";
 import oe from "yargs";
-import y, { basename as se } from "path";
+import b, { basename as se } from "path";
 import { NodeJsFilesystem as ie, OverlayFilesystem as ne, InMemoryFilesystem as ae, ZipFilesystem as le } from "@wp-playground/storage";
 import { EmscriptenDownloadMonitor as pe, ProgressTracker as de } from "@php-wasm/progress";
 import { resolveWordPressRelease as ce } from "@wp-playground/wordpress";
-import P from "fs-extra";
-async function ue(t) {
+import k from "fs-extra";
+import { startBridge as ue } from "@php-wasm/xdebug-bridge";
+async function he(t) {
   const r = G(), e = await new Promise((i, n) => {
     const l = r.listen(t.port, () => {
       const a = l.address();
@@ -25,9 +26,9 @@ async function ue(t) {
   r.use("/", async (i, n) => {
     const l = await t.handleRequest({
       url: i.url,
-      headers: fe(i),
+      headers: me(i),
       method: i.method,
-      body: await he(i)
+      body: await fe(i)
     });
     n.statusCode = l.httpStatusCode;
     for (const a in l.headers)
@@ -37,21 +38,21 @@ async function ue(t) {
   const s = e.address().port;
   return await t.onBind(e, s);
 }
-const he = async (t) => await new Promise((r) => {
+const fe = async (t) => await new Promise((r) => {
   const e = [];
   t.on("data", (o) => {
     e.push(o);
   }), t.on("end", () => {
     r(new Uint8Array(Buffer.concat(e)));
   });
-}), fe = (t) => {
+}), me = (t) => {
   const r = {};
   if (t.rawHeaders && t.rawHeaders.length)
     for (let e = 0; e < t.rawHeaders.length; e += 2)
       r[t.rawHeaders[e].toLowerCase()] = t.rawHeaders[e + 1];
   return r;
 };
-class me {
+class we {
   constructor(r) {
     this.workerLoads = [], this.addWorker(r);
   }
@@ -73,10 +74,10 @@ class me {
     });
   }
 }
-function we(t) {
+function ge(t) {
   return /^latest$|^trunk$|^nightly$|^(?:(\d+)\.(\d+)(?:\.(\d+))?)((?:-beta(?:\d+)?)|(?:-RC(?:\d+)?))?$/.test(t);
 }
-async function ge({
+async function ye({
   sourceString: t,
   blueprintMayReadAdjacentFiles: r
 }) {
@@ -84,15 +85,15 @@ async function ge({
     return;
   if (t.startsWith("http://") || t.startsWith("https://"))
     return await D(t);
-  let e = y.resolve(process.cwd(), t);
+  let e = b.resolve(process.cwd(), t);
   if (!w.existsSync(e))
     throw new Error(`Blueprint file does not exist: ${e}`);
   const o = w.statSync(e);
-  if (o.isDirectory() && (e = y.join(e, "blueprint.json")), !o.isFile() && o.isSymbolicLink())
+  if (o.isDirectory() && (e = b.join(e, "blueprint.json")), !o.isFile() && o.isSymbolicLink())
     throw new Error(
       `Blueprint path is neither a file nor a directory: ${e}`
     );
-  const s = y.extname(e);
+  const s = b.extname(e);
   switch (s) {
     case ".zip":
       return le.fromArrayBuffer(
@@ -107,7 +108,7 @@ async function ge({
           `Blueprint file at ${e} is not a valid JSON file`
         );
       }
-      const n = y.dirname(e), l = new ie(n);
+      const n = b.dirname(e), l = new ie(n);
       return new ne([
         new ae({
           "blueprint.json": i
@@ -135,13 +136,13 @@ You can allow this Blueprint to read files from the same parent directory by exp
       );
   }
 }
-const ye = "" + new URL("worker-thread-v2-Pfv6UYF4.js", import.meta.url).href;
-class be {
+const be = "" + new URL("worker-thread-v2-Pfv6UYF4.js", import.meta.url).href;
+class Pe {
   constructor(r, e) {
     this.lastProgressMessage = "", this.args = r, this.siteUrl = e.siteUrl, this.processIdSpaceLength = e.processIdSpaceLength, this.phpVersion = r.php;
   }
   getWorkerUrl() {
-    return ye;
+    return be;
   }
   async bootPrimaryWorker(r, e) {
     const o = L(r);
@@ -181,8 +182,8 @@ class be {
 `));
   }
 }
-const I = y.join(ee.homedir(), ".wordpress-playground");
-async function Pe(t) {
+const F = b.join(ee.homedir(), ".wordpress-playground");
+async function ke(t) {
   return await E(
     "https://github.com/WordPress/sqlite-database-integration/archive/refs/heads/develop.zip",
     "sqlite.zip",
@@ -190,11 +191,11 @@ async function Pe(t) {
   );
 }
 async function E(t, r, e) {
-  const o = y.join(I, r);
-  return P.existsSync(o) || (P.ensureDirSync(I), await ke(t, o, e)), A(o);
+  const o = b.join(F, r);
+  return k.existsSync(o) || (k.ensureDirSync(F), await ve(t, o, e)), A(o);
 }
-async function ke(t, r, e) {
-  const s = (await e.monitorFetch(fetch(t))).body.getReader(), i = `${r}.partial`, n = P.createWriteStream(i);
+async function ve(t, r, e) {
+  const s = (await e.monitorFetch(fetch(t))).body.getReader(), i = `${r}.partial`, n = k.createWriteStream(i);
   for (; ; ) {
     const { done: l, value: a } = await s.read();
     if (a && n.write(a), l)
@@ -202,22 +203,22 @@ async function ke(t, r, e) {
   }
   n.close(), n.closed || await new Promise((l, a) => {
     n.on("finish", () => {
-      P.renameSync(i, r), l(null);
+      k.renameSync(i, r), l(null);
     }), n.on("error", (c) => {
-      P.removeSync(i), a(c);
+      k.removeSync(i), a(c);
     });
   });
 }
 function A(t, r) {
-  return new File([P.readFileSync(t)], se(t));
+  return new File([k.readFileSync(t)], se(t));
 }
-const ve = "" + new URL("worker-thread-v1-BTJIbQLy.js", import.meta.url).href;
-class We {
+const We = "" + new URL("worker-thread-v1-BTJIbQLy.js", import.meta.url).href;
+class xe {
   constructor(r, e) {
     this.lastProgressMessage = "", this.args = r, this.siteUrl = e.siteUrl, this.processIdSpaceLength = e.processIdSpaceLength;
   }
   getWorkerUrl() {
-    return ve;
+    return We;
   }
   async bootPrimaryWorker(r, e) {
     const o = await this.compileInputBlueprint(
@@ -227,24 +228,24 @@ class We {
     let s;
     const i = new pe();
     if (!this.args.skipWordPressSetup) {
-      let k = !1;
+      let v = !1;
       i.addEventListener("progress", (h) => {
-        if (k)
+        if (v)
           return;
-        const { loaded: f, total: v } = h.detail, m = Math.floor(
-          Math.min(100, 100 * f / v)
+        const { loaded: m, total: W } = h.detail, f = Math.floor(
+          Math.min(100, 100 * m / W)
         );
-        k = m === 100, this.args.quiet || this.writeProgressUpdate(
+        v = f === 100, this.args.quiet || this.writeProgressUpdate(
           process.stdout,
-          `Downloading WordPress ${m}%...`,
-          k
+          `Downloading WordPress ${f}%...`,
+          v
         );
       }), s = await ce(this.args.wp), p.log(
         `Resolved WordPress release URL: ${s?.releaseUrl}`
       );
     }
-    const n = s && y.join(
-      I,
+    const n = s && b.join(
+      F,
       `prebuilt-wp-content-for-wp-${s.version}.zip`
     ), l = s ? w.existsSync(n) ? A(n) : await E(
       s.releaseUrl,
@@ -252,13 +253,13 @@ class We {
       i
     ) : void 0;
     p.log("Fetching SQLite integration plugin...");
-    const a = this.args.skipSqliteSetup ? void 0 : await Pe(i), c = this.args.followSymlinks === !0, d = this.args.experimentalTrace === !0, g = this.args["mount-before-install"] || [], b = this.args.mount || [], u = L(r);
+    const a = this.args.skipSqliteSetup ? void 0 : await ke(i), c = this.args.followSymlinks === !0, d = this.args.experimentalTrace === !0, g = this.args["mount-before-install"] || [], P = this.args.mount || [], u = L(r);
     return await u.isConnected(), p.log("Booting WordPress..."), await u.useFileLockManager(e), await u.bootAsPrimaryWorker({
       phpVersion: this.phpVersion,
       wpVersion: o.versions.wp,
       absoluteUrl: this.siteUrl,
       mountsBeforeWpInstall: g,
-      mountsAfterWpInstall: b,
+      mountsAfterWpInstall: P,
       wordPressZip: l && await l.arrayBuffer(),
       sqliteIntegrationPluginZip: await a.arrayBuffer(),
       firstProcessId: 0,
@@ -336,7 +337,7 @@ class We {
 `));
   }
 }
-async function Oe() {
+async function _e() {
   try {
     const t = oe(process.argv.slice(2)).usage("Usage: wp-playground <command> [options]").positional("command", {
       describe: "Command to run",
@@ -363,12 +364,12 @@ async function Oe() {
       describe: "Mount a directory to the PHP runtime (can be used multiple times). Format: /host/path:/vfs/path",
       type: "array",
       string: !0,
-      coerce: U
+      coerce: R
     }).option("mount-before-install", {
       describe: "Mount a directory to the PHP runtime before WordPress installation (can be used multiple times). Format: /host/path:/vfs/path",
       type: "array",
       string: !0,
-      coerce: U
+      coerce: R
     }).option("mount-dir", {
       describe: 'Mount a directory to the PHP runtime (can be used multiple times). Format: "/host/path" "/vfs/path"',
       type: "array",
@@ -431,6 +432,10 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
       describe: "Enable Xdebug.",
       type: "boolean",
       default: !1
+    }).option("experimental-devtools", {
+      describe: "Enable experimental browser development tools.",
+      type: "boolean",
+      default: !1
     }).option("experimental-multi-worker", {
       describe: "Enable experimental multi-worker support which requires JSPI and a /wordpress directory backed by a real filesystem. Pass a positive number to specify the number of workers to use. Otherwise, default to the number of CPUs minus 1.",
       type: "number",
@@ -442,7 +447,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
       // Remove the "hidden" flag once Blueprint V2 is fully supported
       hidden: !0
     }).showHelpOnFail(!1).strictOptions().check(async (s) => {
-      if (s.wp !== void 0 && !we(s.wp))
+      if (s.wp !== void 0 && !ge(s.wp))
         try {
           new URL(s.wp);
         } catch {
@@ -506,102 +511,104 @@ async function Se(t) {
     );
   }), i = new K(s);
   let n = !1, l = !0;
-  return p.log("Starting a PHP server..."), ue({
+  return p.log("Starting a PHP server..."), he({
     port: t.port,
     onBind: async (a, c) => {
-      const d = `http://127.0.0.1:${c}`, g = t.experimentalMultiWorker ?? 1, b = Math.floor(
+      const d = `http://127.0.0.1:${c}`, g = t.experimentalMultiWorker ?? 1, P = Math.floor(
         Number.MAX_SAFE_INTEGER / g
       );
       let u;
-      t["experimental-blueprints-v2-runner"] ? u = new be(t, {
+      t["experimental-blueprints-v2-runner"] ? u = new Pe(t, {
         siteUrl: d,
-        processIdSpaceLength: b
-      }) : (u = new We(t, {
+        processIdSpaceLength: P
+      }) : (u = new xe(t, {
         siteUrl: d,
-        processIdSpaceLength: b
-      }), typeof t.blueprint == "string" && (t.blueprint = await ge({
+        processIdSpaceLength: P
+      }), typeof t.blueprint == "string" && (t.blueprint = await ye({
         sourceString: t.blueprint,
         blueprintMayReadAdjacentFiles: t["blueprint-may-read-adjacent-files"] === !0
       })));
-      const k = xe(
+      const v = Le(
         u.getWorkerUrl(),
         g,
-        ({ exitCode: h, isMain: f, workerIndex: v }) => {
+        ({ exitCode: h, isMain: m, workerIndex: W }) => {
           h !== 0 && (p.error(
-            `Worker ${v} exited with code ${h}
+            `Worker ${W} exited with code ${h}
 `
-          ), f && t.exitOnPrimaryWorkerCrash && process.exit(1));
+          ), m && t.exitOnPrimaryWorkerCrash && process.exit(1));
         }
       );
       p.log(`Setting up WordPress ${t.wp}`);
       try {
-        const [h, ...f] = await k, v = await B(
+        const [h, ...m] = await v, W = await U(
           i
         );
         if (e = await u.bootPrimaryWorker(
           h.phpPort,
-          v
+          W
         ), o.push({
           playground: e,
           worker: h.worker
-        }), await e.isReady(), n = !0, p.log("Booted!"), r = new me(e), !t["experimental-blueprints-v2-runner"]) {
-          const m = await u.compileInputBlueprint(
+        }), await e.isReady(), n = !0, p.log("Booted!"), r = new we(e), !t["experimental-blueprints-v2-runner"]) {
+          const f = await u.compileInputBlueprint(
             t["additional-blueprint-steps"] || []
           );
-          m && (p.log("Running the Blueprint..."), await _(m, e), p.log("Finished running the blueprint"));
+          f && (p.log("Running the Blueprint..."), await _(f, e), p.log("Finished running the blueprint"));
         }
-        if (t.command === "build-snapshot" ? (await Le(e, t.outfile), p.log(`WordPress exported to ${t.outfile}`), process.exit(0)) : t.command === "run-blueprint" && (p.log("Blueprint executed"), process.exit(0)), t.experimentalMultiWorker && t.experimentalMultiWorker > 1) {
+        if (t.command === "build-snapshot" ? (await Fe(e, t.outfile), p.log(`WordPress exported to ${t.outfile}`), process.exit(0)) : t.command === "run-blueprint" && (p.log("Blueprint executed"), process.exit(0)), t.experimentalMultiWorker && t.experimentalMultiWorker > 1) {
           p.log("Preparing additional workers...");
-          const m = await M(
+          const f = await M(
             e,
             "/internal"
-          ), W = b;
+          ), y = P;
           await Promise.all(
-            f.map(async (x, C) => {
-              const H = W + C * b, z = await B(i), S = await u.bootSecondaryWorker({
-                worker: x,
+            m.map(async (S, C) => {
+              const H = y + C * P, z = await U(i), x = await u.bootSecondaryWorker({
+                worker: S,
                 fileLockManagerPort: z,
                 firstProcessId: H
               });
               o.push({
-                playground: S,
-                worker: x.worker
-              }), await S.writeFile(
+                playground: x,
+                worker: S.worker
+              }), await x.writeFile(
                 "/tmp/internal.zip",
-                m
+                f
               ), await N(
-                S,
+                x,
                 "/tmp/internal.zip",
                 "/internal"
-              ), await S.unlink(
+              ), await x.unlink(
                 "/tmp/internal.zip"
-              ), r.addWorker(S);
+              ), r.addWorker(x);
             })
           ), p.log("Ready!");
         }
-        return p.log(`WordPress is running on ${d}`), {
+        return p.log(`WordPress is running on ${d}`), t.experimentalDevtools && t.xdebug && (await ue({
+          getPHPFile: async (y) => await e.readFileAsText(y)
+        })).start(), {
           playground: e,
           server: a,
           [Symbol.asyncDispose]: async function() {
             await Promise.all(
               o.map(
-                async ({ playground: W, worker: x }) => {
-                  await W.dispose(), await x.terminate();
+                async ({ playground: y, worker: S }) => {
+                  await y.dispose(), await S.terminate();
                 }
               )
-            ), await new Promise((W) => a.close(W));
+            ), await new Promise((y) => a.close(y));
           }
         };
       } catch (h) {
         if (!t.debug)
           throw h;
-        let f = "";
-        throw await e.fileExists(F) && (f = await e.readFileAsText(F)), new Error(f, { cause: h });
+        let m = "";
+        throw await e.fileExists(I) && (m = await e.readFileAsText(I)), new Error(m, { cause: h });
       }
     },
     async handleRequest(a) {
       if (!n)
-        return R.forHttpCode(
+        return B.forHttpCode(
           502,
           "WordPress is not ready yet"
         );
@@ -616,13 +623,13 @@ async function Se(t) {
           "playground_auto_login_already_happened"
         ) && (c["Set-Cookie"] = [
           "playground_auto_login_already_happened=1; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/"
-        ]), new R(302, c, new Uint8Array());
+        ]), new B(302, c, new Uint8Array());
       }
       return await r.handleRequest(a);
     }
   });
 }
-function xe(t, r, e) {
+function Le(t, r, e) {
   const o = new URL(t, import.meta.url), s = [];
   for (let i = 0; i < r; i++) {
     const n = new J(o), l = (a) => {
@@ -650,11 +657,11 @@ function xe(t, r, e) {
   }
   return Promise.all(s);
 }
-async function B(t) {
+async function U(t) {
   const { port1: r, port2: e } = new Y();
   return await re() ? q(t, null, r) : await j(t, r), e;
 }
-async function Le(t, r) {
+async function Fe(t, r) {
   await t.run({
     code: `<?php
 		$zip = new ZipArchive();
@@ -679,7 +686,7 @@ async function Le(t, r) {
   w.writeFileSync(r, e);
 }
 export {
-  Oe as p,
+  _e as p,
   Se as r
 };
-//# sourceMappingURL=run-cli-JA8jNok0.js.map
+//# sourceMappingURL=run-cli-B0BNDNay.js.map