@wp-playground/cli 2.0.0 → 2.0.1

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

@@ -1,22 +1,22 @@
-import { logger as p, errorLogPath as z } from "@php-wasm/logger";
-import { consumeAPI as L, SupportedPHPVersions as T, PHPResponse as F, exposeAPI as V, exposeSyncAPI as q } from "@php-wasm/universal";
-import { resolveRemoteBlueprint as j, isBlueprintBundle as O, compileBlueprint as D, runBlueprintSteps as Z } from "@wp-playground/blueprints";
-import { zipDirectory as M, RecommendedPHPVersion as B, unzipFile as _ } from "@wp-playground/common";
-import m from "fs";
-import { Worker as N, MessageChannel as J } from "worker_threads";
-import { p as R, a as Y, e as Q } from "./mounts-B-Qdcyyt.js";
-import X from "express";
-import { FileLockManagerForNode as G } from "@php-wasm/node";
-import K, { cpus as ee } from "os";
-import { jspi as te } from "wasm-feature-detect";
-import re from "yargs";
-import y, { basename as oe } from "path";
-import { NodeJsFilesystem as se, OverlayFilesystem as ie, InMemoryFilesystem as ne, ZipFilesystem as ae } from "@wp-playground/storage";
-import { EmscriptenDownloadMonitor as le, ProgressTracker as pe } from "@php-wasm/progress";
-import { resolveWordPressRelease as de } from "@wp-playground/wordpress";
+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 { 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 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 { 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 ce(t) {
-  const r = X(), e = await new Promise((i, n) => {
+async function ue(t) {
+  const r = G(), e = await new Promise((i, n) => {
     const l = r.listen(t.port, () => {
       const a = l.address();
       a === null || typeof a == "string" ? n(new Error("Server address is not available")) : i(l);
@@ -25,9 +25,9 @@ async function ce(t) {
   r.use("/", async (i, n) => {
     const l = await t.handleRequest({
       url: i.url,
-      headers: he(i),
+      headers: fe(i),
       method: i.method,
-      body: await ue(i)
+      body: await he(i)
     });
     n.statusCode = l.httpStatusCode;
     for (const a in l.headers)
@@ -37,21 +37,21 @@ async function ce(t) {
   const s = e.address().port;
   return await t.onBind(e, s);
 }
-const ue = async (t) => await new Promise((r) => {
+const he = async (t) => await new Promise((r) => {
   const e = [];
   t.on("data", (o) => {
     e.push(o);
   }), t.on("end", () => {
     r(new Uint8Array(Buffer.concat(e)));
   });
-}), he = (t) => {
+}), fe = (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 fe {
+class me {
   constructor(r) {
     this.workerLoads = [], this.addWorker(r);
   }
@@ -73,21 +73,21 @@ class fe {
     });
   }
 }
-function me(t) {
+function we(t) {
   return /^latest$|^trunk$|^nightly$|^(?:(\d+)\.(\d+)(?:\.(\d+))?)((?:-beta(?:\d+)?)|(?:-RC(?:\d+)?))?$/.test(t);
 }
-async function we({
+async function ge({
   sourceString: t,
   blueprintMayReadAdjacentFiles: r
 }) {
   if (!t)
     return;
   if (t.startsWith("http://") || t.startsWith("https://"))
-    return await j(t);
+    return await D(t);
   let e = y.resolve(process.cwd(), t);
-  if (!m.existsSync(e))
+  if (!w.existsSync(e))
     throw new Error(`Blueprint file does not exist: ${e}`);
-  const o = m.statSync(e);
+  const o = w.statSync(e);
   if (o.isDirectory() && (e = y.join(e, "blueprint.json")), !o.isFile() && o.isSymbolicLink())
     throw new Error(
       `Blueprint path is neither a file nor a directory: ${e}`
@@ -95,11 +95,11 @@ async function we({
   const s = y.extname(e);
   switch (s) {
     case ".zip":
-      return ae.fromArrayBuffer(
-        m.readFileSync(e).buffer
+      return le.fromArrayBuffer(
+        w.readFileSync(e).buffer
       );
     case ".json": {
-      const i = m.readFileSync(e, "utf-8");
+      const i = w.readFileSync(e, "utf-8");
       try {
         JSON.parse(i);
       } catch {
@@ -107,9 +107,9 @@ async function we({
           `Blueprint file at ${e} is not a valid JSON file`
         );
       }
-      const n = y.dirname(e), l = new se(n);
-      return new ie([
-        new ne({
+      const n = y.dirname(e), l = new ie(n);
+      return new ne([
+        new ae({
           "blueprint.json": i
         }),
         /**
@@ -135,13 +135,13 @@ You can allow this Blueprint to read files from the same parent directory by exp
       );
   }
 }
-const ge = "" + new URL("worker-thread-v2-Pfv6UYF4.js", import.meta.url).href;
-class ye {
+const ye = "" + new URL("worker-thread-v2-Pfv6UYF4.js", import.meta.url).href;
+class be {
   constructor(r, e) {
     this.lastProgressMessage = "", this.args = r, this.siteUrl = e.siteUrl, this.processIdSpaceLength = e.processIdSpaceLength, this.phpVersion = r.php;
   }
   getWorkerUrl() {
-    return ge;
+    return ye;
   }
   async bootPrimaryWorker(r, e) {
     const o = L(r);
@@ -181,19 +181,19 @@ class ye {
 `));
   }
 }
-const I = y.join(K.homedir(), ".wordpress-playground");
-async function be(t) {
-  return await $(
+const I = y.join(ee.homedir(), ".wordpress-playground");
+async function Pe(t) {
+  return await E(
     "https://github.com/WordPress/sqlite-database-integration/archive/refs/heads/develop.zip",
     "sqlite.zip",
     t
   );
 }
-async function $(t, r, e) {
+async function E(t, r, e) {
   const o = y.join(I, r);
-  return P.existsSync(o) || (P.ensureDirSync(I), await Pe(t, o, e)), A(o);
+  return P.existsSync(o) || (P.ensureDirSync(I), await ke(t, o, e)), A(o);
 }
-async function Pe(t, r, e) {
+async function ke(t, r, e) {
   const s = (await e.monitorFetch(fetch(t))).body.getReader(), i = `${r}.partial`, n = P.createWriteStream(i);
   for (; ; ) {
     const { done: l, value: a } = await s.read();
@@ -209,15 +209,15 @@ async function Pe(t, r, e) {
   });
 }
 function A(t, r) {
-  return new File([P.readFileSync(t)], oe(t));
+  return new File([P.readFileSync(t)], se(t));
 }
-const ke = "" + new URL("worker-thread-v1-BTJIbQLy.js", import.meta.url).href;
-class ve {
+const ve = "" + new URL("worker-thread-v1-BTJIbQLy.js", import.meta.url).href;
+class We {
   constructor(r, e) {
     this.lastProgressMessage = "", this.args = r, this.siteUrl = e.siteUrl, this.processIdSpaceLength = e.processIdSpaceLength;
   }
   getWorkerUrl() {
-    return ke;
+    return ve;
   }
   async bootPrimaryWorker(r, e) {
     const o = await this.compileInputBlueprint(
@@ -225,39 +225,39 @@ class ve {
     );
     this.phpVersion = o.versions.php;
     let s;
-    const i = new le();
+    const i = new pe();
     if (!this.args.skipWordPressSetup) {
       let k = !1;
       i.addEventListener("progress", (h) => {
         if (k)
           return;
-        const { loaded: g, total: v } = h.detail, f = Math.floor(
-          Math.min(100, 100 * g / v)
+        const { loaded: f, total: v } = h.detail, m = Math.floor(
+          Math.min(100, 100 * f / v)
         );
-        k = f === 100, this.args.quiet || this.writeProgressUpdate(
+        k = m === 100, this.args.quiet || this.writeProgressUpdate(
           process.stdout,
-          `Downloading WordPress ${f}%...`,
+          `Downloading WordPress ${m}%...`,
           k
         );
-      }), s = await de(this.args.wp), p.log(
+      }), s = await ce(this.args.wp), p.log(
         `Resolved WordPress release URL: ${s?.releaseUrl}`
       );
     }
     const n = s && y.join(
       I,
       `prebuilt-wp-content-for-wp-${s.version}.zip`
-    ), l = s ? m.existsSync(n) ? A(n) : await $(
+    ), l = s ? w.existsSync(n) ? A(n) : await E(
       s.releaseUrl,
       `${s.version}.zip`,
       i
     ) : void 0;
     p.log("Fetching SQLite integration plugin...");
-    const a = this.args.skipSqliteSetup ? void 0 : await be(i), c = this.args.followSymlinks === !0, d = this.args.experimentalTrace === !0, w = this.args["mount-before-install"] || [], b = this.args.mount || [], u = L(r);
+    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);
     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: w,
+      mountsBeforeWpInstall: g,
       mountsAfterWpInstall: b,
       wordPressZip: l && await l.arrayBuffer(),
       sqliteIntegrationPluginZip: await a.arrayBuffer(),
@@ -267,7 +267,7 @@ class ve {
       trace: d,
       internalCookieStore: this.args.internalCookieStore,
       withXdebug: this.args.xdebug
-    }), s && !this.args["mount-before-install"] && !m.existsSync(n) && (p.log("Caching preinstalled WordPress for the next boot..."), m.writeFileSync(
+    }), s && !this.args["mount-before-install"] && !w.existsSync(n) && (p.log("Caching preinstalled WordPress for the next boot..."), w.writeFileSync(
       n,
       await M(u, "/wordpress")
     ), p.log("Cached!")), u;
@@ -307,11 +307,11 @@ class ve {
       login: e.login,
       ...o || {},
       preferredVersions: {
-        php: e.php ?? o?.preferredVersions?.php ?? B,
+        php: e.php ?? o?.preferredVersions?.php ?? $,
         wp: e.wp ?? o?.preferredVersions?.wp ?? "latest",
         ...o?.preferredVersions || {}
       }
-    }, i = new pe();
+    }, i = new de();
     let n = "", l = !1;
     return i.addEventListener("progress", (a) => {
       if (l)
@@ -325,7 +325,7 @@ class ve {
         d,
         l
       );
-    }), await D(s, {
+    }), await Z(s, {
       progress: i,
       additionalSteps: r
     });
@@ -338,7 +338,7 @@ class ve {
 }
 async function Oe() {
   try {
-    const t = re(process.argv.slice(2)).usage("Usage: wp-playground <command> [options]").positional("command", {
+    const t = oe(process.argv.slice(2)).usage("Usage: wp-playground <command> [options]").positional("command", {
       describe: "Command to run",
       choices: ["server", "run-blueprint", "build-snapshot"],
       demandOption: !0
@@ -353,7 +353,7 @@ async function Oe() {
     }).option("php", {
       describe: "PHP version to use.",
       type: "string",
-      default: B,
+      default: $,
       choices: T
     }).option("wp", {
       describe: "WordPress version to use.",
@@ -363,12 +363,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: R
+      coerce: U
     }).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: R
+      coerce: U
     }).option("mount-dir", {
       describe: 'Mount a directory to the PHP runtime (can be used multiple times). Format: "/host/path" "/vfs/path"',
       type: "array",
@@ -380,7 +380,7 @@ async function Oe() {
       type: "string",
       nargs: 2,
       array: !0,
-      coerce: Y
+      coerce: Q
     }).option("login", {
       describe: "Should log the user in",
       type: "boolean",
@@ -434,7 +434,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
     }).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",
-      coerce: (s) => s ?? ee().length - 1
+      coerce: (s) => s ?? te().length - 1
     }).option("experimental-blueprints-v2-runner", {
       describe: "Use the experimental Blueprint V2 runner.",
       type: "boolean",
@@ -442,7 +442,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 && !me(s.wp))
+      if (s.wp !== void 0 && !we(s.wp))
         try {
           new URL(s.wp);
         } catch {
@@ -477,54 +477,65 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
         ...r["mount-dir-before-install"] || []
       ]
     };
-    await We(o);
+    await Se(o);
   } catch (t) {
     if (!(t instanceof Error))
       throw t;
-    const r = process.argv.includes("--debug");
-    console.error(r ? t : t.message), process.exit(1);
+    if (process.argv.includes("--debug"))
+      V(t);
+    else {
+      const e = [];
+      let o = t;
+      do
+        e.push(o.message), o = o.cause;
+      while (o instanceof Error);
+      console.error(
+        "\x1B[1m" + e.join(" caused by ") + "\x1B[0m"
+      );
+    }
+    process.exit(1);
   }
 }
-async function We(t) {
+async function Se(t) {
   let r, e;
   const o = [];
-  t.autoMount && (t = Q(t)), t.quiet && (p.handlers = []);
+  t.autoMount && (t = X(t)), t.quiet && (p.handlers = []);
   const s = await import("fs-ext").then((a) => a.flockSync).catch(() => {
     p.warn(
       "The fs-ext package is not installed. Internal file locking will not be integrated with host OS file locking."
     );
-  }), i = new G(s);
+  }), i = new K(s);
   let n = !1, l = !0;
-  return p.log("Starting a PHP server..."), ce({
+  return p.log("Starting a PHP server..."), ue({
     port: t.port,
     onBind: async (a, c) => {
-      const d = `http://127.0.0.1:${c}`, w = t.experimentalMultiWorker ?? 1, b = Math.floor(
-        Number.MAX_SAFE_INTEGER / w
+      const d = `http://127.0.0.1:${c}`, g = t.experimentalMultiWorker ?? 1, b = Math.floor(
+        Number.MAX_SAFE_INTEGER / g
       );
       let u;
-      t["experimental-blueprints-v2-runner"] ? u = new ye(t, {
+      t["experimental-blueprints-v2-runner"] ? u = new be(t, {
         siteUrl: d,
         processIdSpaceLength: b
-      }) : (u = new ve(t, {
+      }) : (u = new We(t, {
         siteUrl: d,
         processIdSpaceLength: b
-      }), typeof t.blueprint == "string" && (t.blueprint = await we({
+      }), typeof t.blueprint == "string" && (t.blueprint = await ge({
         sourceString: t.blueprint,
         blueprintMayReadAdjacentFiles: t["blueprint-may-read-adjacent-files"] === !0
       })));
-      const k = Se(
+      const k = xe(
         u.getWorkerUrl(),
-        w,
-        ({ exitCode: h, isMain: g, workerIndex: v }) => {
+        g,
+        ({ exitCode: h, isMain: f, workerIndex: v }) => {
           h !== 0 && (p.error(
             `Worker ${v} exited with code ${h}
 `
-          ), g && t.exitOnPrimaryWorkerCrash && process.exit(1));
+          ), f && t.exitOnPrimaryWorkerCrash && process.exit(1));
         }
       );
       p.log(`Setting up WordPress ${t.wp}`);
       try {
-        const [h, ...g] = await k, v = await U(
+        const [h, ...f] = await k, v = await B(
           i
         );
         if (e = await u.bootPrimaryWorker(
@@ -533,32 +544,32 @@ async function We(t) {
         ), o.push({
           playground: e,
           worker: h.worker
-        }), await e.isReady(), n = !0, p.log("Booted!"), r = new fe(e), !t["experimental-blueprints-v2-runner"]) {
-          const f = await u.compileInputBlueprint(
+        }), await e.isReady(), n = !0, p.log("Booted!"), r = new me(e), !t["experimental-blueprints-v2-runner"]) {
+          const m = await u.compileInputBlueprint(
             t["additional-blueprint-steps"] || []
           );
-          f && (p.log("Running the Blueprint..."), await Z(f, e), p.log("Finished running the blueprint"));
+          m && (p.log("Running the Blueprint..."), await _(m, e), p.log("Finished running the blueprint"));
         }
-        if (t.command === "build-snapshot" ? (await xe(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 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) {
           p.log("Preparing additional workers...");
-          const f = await M(
+          const m = await M(
             e,
             "/internal"
           ), W = b;
           await Promise.all(
-            g.map(async (x, C) => {
-              const E = W + C * b, H = await U(i), S = await u.bootSecondaryWorker({
+            f.map(async (x, C) => {
+              const H = W + C * b, z = await B(i), S = await u.bootSecondaryWorker({
                 worker: x,
-                fileLockManagerPort: H,
-                firstProcessId: E
+                fileLockManagerPort: z,
+                firstProcessId: H
               });
               o.push({
                 playground: S,
                 worker: x.worker
               }), await S.writeFile(
                 "/tmp/internal.zip",
-                f
-              ), await _(
+                m
+              ), await N(
                 S,
                 "/tmp/internal.zip",
                 "/internal"
@@ -584,13 +595,13 @@ async function We(t) {
       } catch (h) {
         if (!t.debug)
           throw h;
-        const g = await e.readFileAsText(z);
-        throw new Error(g, { cause: h });
+        let f = "";
+        throw await e.fileExists(F) && (f = await e.readFileAsText(F)), new Error(f, { cause: h });
       }
     },
     async handleRequest(a) {
       if (!n)
-        return F.forHttpCode(
+        return R.forHttpCode(
           502,
           "WordPress is not ready yet"
         );
@@ -605,16 +616,16 @@ async function We(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 F(302, c, new Uint8Array());
+        ]), new R(302, c, new Uint8Array());
       }
       return await r.handleRequest(a);
     }
   });
 }
-function Se(t, r, e) {
+function xe(t, r, e) {
   const o = new URL(t, import.meta.url), s = [];
   for (let i = 0; i < r; i++) {
-    const n = new N(o), l = (a) => {
+    const n = new J(o), l = (a) => {
       e({
         exitCode: a,
         isMain: i === 0,
@@ -628,10 +639,10 @@ function Se(t, r, e) {
             d.command === "worker-script-initialized" && a({ worker: n, phpPort: d.phpPort });
           }), n.once("error", function(d) {
             console.error(d);
-            const w = new Error(
+            const g = new Error(
               `Worker failed to load at ${o}. ${d.message ? `Original error: ${d.message}` : ""}`
             );
-            w.filename = o, c(w);
+            g.filename = o, c(g);
           }), n.once("exit", l);
         }
       )
@@ -639,11 +650,11 @@ function Se(t, r, e) {
   }
   return Promise.all(s);
 }
-async function U(t) {
-  const { port1: r, port2: e } = new J();
-  return await te() ? V(t, null, r) : await q(t, r), e;
+async function B(t) {
+  const { port1: r, port2: e } = new Y();
+  return await re() ? q(t, null, r) : await j(t, r), e;
 }
-async function xe(t, r) {
+async function Le(t, r) {
   await t.run({
     code: `<?php
 		$zip = new ZipArchive();
@@ -665,10 +676,10 @@ async function xe(t, r) {
 	`
   });
   const e = await t.readFileAsBuffer("/tmp/build.zip");
-  m.writeFileSync(r, e);
+  w.writeFileSync(r, e);
 }
 export {
   Oe as p,
-  We as r
+  Se as r
 };
-//# sourceMappingURL=run-cli-CY1lYIJH.js.map
+//# sourceMappingURL=run-cli-JA8jNok0.js.map