@php-wasm/web 0.1.18 → 0.1.20

package/{index-bdd9b9c8.js → index-66fa419d.js}

@@ -8,7 +8,7 @@ const W = [
   "7.1",
   "7.0",
   "5.6"
-], Y = W[0], ve = W;
+], Y = W[0], Se = W;
 class K {
   #e;
   #t;
@@ -106,9 +106,27 @@ class Z {
         };
   }
 }
-class O {
+class E {
   constructor(e, r, n, s = "", a = 0) {
-    this.httpStatusCode = e, this.headers = r, this.body = n, this.exitCode = a, this.errors = s;
+    this.httpStatusCode = e, this.headers = r, this.bytes = n, this.exitCode = a, this.errors = s;
+  }
+  static fromRawData(e) {
+    return new E(
+      e.httpStatusCode,
+      e.headers,
+      e.bytes,
+      e.errors,
+      e.exitCode
+    );
+  }
+  toRawData() {
+    return {
+      headers: this.headers,
+      bytes: this.bytes,
+      errors: this.errors,
+      exitCode: this.exitCode,
+      httpStatusCode: this.httpStatusCode
+    };
   }
   /**
    * Response body as JSON.
@@ -120,13 +138,7 @@ class O {
    * Response body as text.
    */
   get text() {
-    return new TextDecoder().decode(this.body);
-  }
-  /**
-   * Response body as bytes.
-   */
-  get bytes() {
-    return this.body;
+    return new TextDecoder().decode(this.bytes);
   }
 }
 class ee {
@@ -147,7 +159,7 @@ class ee {
     this.#a = new Z({ concurrency: 1 });
     const {
       documentRoot: n = "/www/",
-      absoluteUrl: s = location.origin,
+      absoluteUrl: s = typeof location == "object" ? location?.href : "",
       isStaticFilePath: a = () => !1
     } = r;
     this.php = e, this.#e = n, this.#c = a;
@@ -225,13 +237,13 @@ class ee {
   #l(e) {
     const r = `${this.#e}${e}`;
     if (!this.php.fileExists(r))
-      return new O(
+      return new E(
         404,
         {},
         new TextEncoder().encode("404 File not found")
       );
     const n = this.php.readFileAsBuffer(r);
-    return new O(
+    return new E(
       200,
       {
         "content-length": [`${n.byteLength}`],
@@ -432,7 +444,7 @@ const I = {
   75: "Cross-device link.",
   76: "Extension: Capabilities insufficient."
 };
-function g(t = "") {
+function y(t = "") {
   return function(r, n, s) {
     const a = s.value;
     s.value = function(...i) {
@@ -451,12 +463,12 @@ function g(t = "") {
     };
   };
 }
-var re = Object.defineProperty, ne = Object.getOwnPropertyDescriptor, y = (t, e, r, n) => {
+var re = Object.defineProperty, ne = Object.getOwnPropertyDescriptor, g = (t, e, r, n) => {
   for (var s = n > 1 ? void 0 : n ? ne(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (s = (n ? i(e, r, s) : i(s)) || s);
   return n && s && re(e, r, s), s;
 };
-const h = "string", w = "number", S = [], se = function() {
+const d = "string", w = "number", x = [], se = function() {
   return typeof window < "u" && !{}.TEST ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
 }();
 class m {
@@ -478,9 +490,9 @@ class m {
   initializeRuntime(e) {
     if (this.#e)
       throw new Error("PHP runtime already initialized.");
-    if (!S[e])
+    if (!x[e])
       throw new Error("Invalid PHP runtime id.");
-    this.#e = S[e];
+    this.#e = x[e];
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
@@ -525,7 +537,7 @@ class m {
       this.#e.ccall(
         "wasm_set_phpini_entries",
         null,
-        [h],
+        [d],
         [e]
       );
     }
@@ -533,7 +545,7 @@ class m {
   }
   cli(e) {
     for (const r of e)
-      this.#e.ccall("wasm_add_cli_arg", null, [h], [r]);
+      this.#e.ccall("wasm_add_cli_arg", null, [d], [r]);
     return this.#e.ccall("run_cli", null, [], [], { async: !0 });
   }
   #i() {
@@ -555,18 +567,18 @@ class m {
     };
   }
   #n(e) {
-    if (this.#e.ccall("wasm_set_request_uri", null, [h], [e]), e.includes("?")) {
+    if (this.#e.ccall("wasm_set_request_uri", null, [d], [e]), e.includes("?")) {
       const r = e.substring(e.indexOf("?") + 1);
       this.#e.ccall(
         "wasm_set_query_string",
         null,
-        [h],
+        [d],
         [r]
       );
     }
   }
   #o(e, r) {
-    this.#e.ccall("wasm_set_request_host", null, [h], [e]);
+    this.#e.ccall("wasm_set_request_host", null, [d], [e]);
     let n;
     try {
       n = parseInt(new URL(e).port, 10);
@@ -575,7 +587,7 @@ class m {
     (!n || isNaN(n) || n === 80) && (n = r === "https" ? 443 : 80), this.#e.ccall("wasm_set_request_port", null, [w], [n]), (r === "https" || !r && n === 443) && this.addServerGlobalEntry("HTTPS", "on");
   }
   #a(e) {
-    this.#e.ccall("wasm_set_request_method", null, [h], [e]);
+    this.#e.ccall("wasm_set_request_method", null, [d], [e]);
   }
   setSkipShebang(e) {
     this.#e.ccall(
@@ -589,12 +601,12 @@ class m {
     e.cookie && this.#e.ccall(
       "wasm_set_cookies",
       null,
-      [h],
+      [d],
       [e.cookie]
     ), e["content-type"] && this.#e.ccall(
       "wasm_set_content_type",
       null,
-      [h],
+      [d],
       [e["content-type"]]
     ), e["content-length"] && this.#e.ccall(
       "wasm_set_content_length",
@@ -609,7 +621,7 @@ class m {
       );
   }
   #l(e) {
-    this.#e.ccall("wasm_set_request_body", null, [h], [e]), this.#e.ccall(
+    this.#e.ccall("wasm_set_request_body", null, [d], [e]), this.#e.ccall(
       "wasm_set_content_length",
       null,
       [w],
@@ -617,13 +629,13 @@ class m {
     );
   }
   #u(e) {
-    this.#e.ccall("wasm_set_path_translated", null, [h], [e]);
+    this.#e.ccall("wasm_set_path_translated", null, [d], [e]);
   }
   addServerGlobalEntry(e, r) {
     this.#e.ccall(
       "wasm_add_SERVER_entry",
       null,
-      [h, h],
+      [d, d],
       [e, r]
     );
   }
@@ -643,12 +655,12 @@ class m {
     this.#e.ccall(
       "wasm_add_uploaded_file",
       null,
-      [h, h, h, h, w, w],
+      [d, d, d, d, w, w],
       [r, n, s, i, o, a.byteLength]
     );
   }
   #d(e) {
-    this.#e.ccall("wasm_set_php_code", null, [h], [e]);
+    this.#e.ccall("wasm_set_php_code", null, [d], [e]);
   }
   async #f() {
     const e = await await this.#e.ccall(
@@ -657,7 +669,7 @@ class m {
       [],
       []
     ), { headers: r, httpStatusCode: n } = this.#i();
-    return new O(
+    return new E(
       n,
       r,
       this.readFileAsBuffer("/tmp/stdout"),
@@ -665,9 +677,12 @@ class m {
       e
     );
   }
-  mkdirTree(e) {
+  mkdir(e) {
     this.#e.FS.mkdirTree(e);
   }
+  mkdirTree(e) {
+    this.mkdir(e);
+  }
   readFileAsText(e) {
     return new TextDecoder().decode(this.readFileAsBuffer(e));
   }
@@ -706,37 +721,40 @@ class m {
   mount(e, r) {
     this.#e.FS.mount(
       this.#e.FS.filesystems.NODEFS,
-      e,
+      typeof e == "object" ? e : { root: e },
       r
     );
   }
 }
-y([
-  g('Could not create directory "{path}"')
+g([
+  y('Could not create directory "{path}"')
+], m.prototype, "mkdir", 1);
+g([
+  y('Could not create directory "{path}"')
 ], m.prototype, "mkdirTree", 1);
-y([
-  g('Could not read "{path}"')
+g([
+  y('Could not read "{path}"')
 ], m.prototype, "readFileAsText", 1);
-y([
-  g('Could not read "{path}"')
+g([
+  y('Could not read "{path}"')
 ], m.prototype, "readFileAsBuffer", 1);
-y([
-  g('Could not write to "{path}"')
+g([
+  y('Could not write to "{path}"')
 ], m.prototype, "writeFile", 1);
-y([
-  g('Could not unlink "{path}"')
+g([
+  y('Could not unlink "{path}"')
 ], m.prototype, "unlink", 1);
-y([
-  g('Could not list files in "{path}"')
+g([
+  y('Could not list files in "{path}"')
 ], m.prototype, "listFiles", 1);
-y([
-  g('Could not stat "{path}"')
+g([
+  y('Could not stat "{path}"')
 ], m.prototype, "isDir", 1);
-y([
-  g('Could not stat "{path}"')
+g([
+  y('Could not stat "{path}"')
 ], m.prototype, "fileExists", 1);
-y([
-  g("Could not mount a directory")
+g([
+  y("Could not mount a directory")
 ], m.prototype, "mount", 1);
 function ie(t) {
   const e = {};
@@ -770,14 +788,14 @@ async function oe(t, e = {}, r = []) {
   });
   for (const { default: c } of r)
     c(o);
-  return r.length || s(), await a, await i, S.push(o), S.length - 1;
+  return r.length || s(), await a, await i, x.push(o), x.length - 1;
 }
 /**
  * @license
  * Copyright 2019 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const D = Symbol("Comlink.proxy"), ae = Symbol("Comlink.endpoint"), ce = Symbol("Comlink.releaseProxy"), C = Symbol("Comlink.finalizer"), v = Symbol("Comlink.thrown"), z = (t) => typeof t == "object" && t !== null || typeof t == "function", le = {
+const D = Symbol("Comlink.proxy"), ae = Symbol("Comlink.endpoint"), ce = Symbol("Comlink.releaseProxy"), O = Symbol("Comlink.finalizer"), k = Symbol("Comlink.thrown"), z = (t) => typeof t == "object" && t !== null || typeof t == "function", le = {
   canHandle: (t) => z(t) && t[D],
   serialize(t) {
     const { port1: e, port2: r } = new MessageChannel();
@@ -787,7 +805,7 @@ const D = Symbol("Comlink.proxy"), ae = Symbol("Comlink.endpoint"), ce = Symbol(
     return t.start(), L(t);
   }
 }, ue = {
-  canHandle: (t) => z(t) && v in t,
+  canHandle: (t) => z(t) && k in t,
   serialize({ value: t }) {
     let e;
     return t instanceof Error ? e = {
@@ -802,7 +820,7 @@ const D = Symbol("Comlink.proxy"), ae = Symbol("Comlink.endpoint"), ce = Symbol(
   deserialize(t) {
     throw t.isError ? Object.assign(new Error(t.value.message), t.value) : t.value;
   }
-}, _ = /* @__PURE__ */ new Map([
+}, S = /* @__PURE__ */ new Map([
   ["proxy", le],
   ["throw", ue]
 ]);
@@ -823,7 +841,7 @@ function F(t, e = globalThis, r = ["*"]) {
     const { id: a, type: i, path: o } = Object.assign({ path: [] }, s.data), c = (s.data.argumentList || []).map(P);
     let l;
     try {
-      const u = o.slice(0, -1).reduce((f, E) => f[E], t), p = o.reduce((f, E) => f[E], t);
+      const u = o.slice(0, -1).reduce((f, R) => f[R], t), p = o.reduce((f, R) => f[R], t);
       switch (i) {
         case "GET":
           l = p;
@@ -842,8 +860,8 @@ function F(t, e = globalThis, r = ["*"]) {
           break;
         case "ENDPOINT":
           {
-            const { port1: f, port2: E } = new MessageChannel();
-            F(t, E), l = ge(f, [f]);
+            const { port1: f, port2: R } = new MessageChannel();
+            F(t, R), l = ye(f, [f]);
           }
           break;
         case "RELEASE":
@@ -853,15 +871,15 @@ function F(t, e = globalThis, r = ["*"]) {
           return;
       }
     } catch (u) {
-      l = { value: u, [v]: 0 };
+      l = { value: u, [k]: 0 };
     }
-    Promise.resolve(l).catch((u) => ({ value: u, [v]: 0 })).then((u) => {
-      const [p, f] = T(u);
-      e.postMessage(Object.assign(Object.assign({}, p), { id: a }), f), i === "RELEASE" && (e.removeEventListener("message", n), j(e), C in t && typeof t[C] == "function" && t[C]());
+    Promise.resolve(l).catch((u) => ({ value: u, [k]: 0 })).then((u) => {
+      const [p, f] = C(u);
+      e.postMessage(Object.assign(Object.assign({}, p), { id: a }), f), i === "RELEASE" && (e.removeEventListener("message", n), $(e), O in t && typeof t[O] == "function" && t[O]());
     }).catch((u) => {
-      const [p, f] = T({
+      const [p, f] = C({
         value: new TypeError("Unserializable return value"),
-        [v]: 0
+        [k]: 0
       });
       e.postMessage(Object.assign(Object.assign({}, p), { id: a }), f);
     });
@@ -870,42 +888,42 @@ function F(t, e = globalThis, r = ["*"]) {
 function de(t) {
   return t.constructor.name === "MessagePort";
 }
-function j(t) {
+function $(t) {
   de(t) && t.close();
 }
 function L(t, e) {
-  return A(t, [], e);
+  return H(t, [], e);
 }
-function R(t) {
+function v(t) {
   if (t)
     throw new Error("Proxy has been released and is not useable");
 }
-function $(t) {
+function q(t) {
   return b(t, {
     type: "RELEASE"
   }).then(() => {
-    j(t);
+    $(t);
   });
 }
-const k = /* @__PURE__ */ new WeakMap(), x = "FinalizationRegistry" in globalThis && new FinalizationRegistry((t) => {
-  const e = (k.get(t) || 0) - 1;
-  k.set(t, e), e === 0 && $(t);
+const _ = /* @__PURE__ */ new WeakMap(), T = "FinalizationRegistry" in globalThis && new FinalizationRegistry((t) => {
+  const e = (_.get(t) || 0) - 1;
+  _.set(t, e), e === 0 && q(t);
 });
 function fe(t, e) {
-  const r = (k.get(e) || 0) + 1;
-  k.set(e, r), x && x.register(t, e, t);
+  const r = (_.get(e) || 0) + 1;
+  _.set(e, r), T && T.register(t, e, t);
 }
 function pe(t) {
-  x && x.unregister(t);
+  T && T.unregister(t);
 }
-function A(t, e = [], r = function() {
+function H(t, e = [], r = function() {
 }) {
   let n = !1;
   const s = new Proxy(r, {
     get(a, i) {
-      if (R(n), i === ce)
+      if (v(n), i === ce)
         return () => {
-          pe(s), $(t), n = !0;
+          pe(s), q(t), n = !0;
         };
       if (i === "then") {
         if (e.length === 0)
@@ -916,11 +934,11 @@ function A(t, e = [], r = function() {
         }).then(P);
         return o.then.bind(o);
       }
-      return A(t, [...e, i]);
+      return H(t, [...e, i]);
     },
     set(a, i, o) {
-      R(n);
-      const [c, l] = T(o);
+      v(n);
+      const [c, l] = C(o);
       return b(t, {
         type: "SET",
         path: [...e, i].map((u) => u.toString()),
@@ -928,14 +946,14 @@ function A(t, e = [], r = function() {
       }, l).then(P);
     },
     apply(a, i, o) {
-      R(n);
+      v(n);
       const c = e[e.length - 1];
       if (c === ae)
         return b(t, {
           type: "ENDPOINT"
         }).then(P);
       if (c === "bind")
-        return A(t, e.slice(0, -1));
+        return H(t, e.slice(0, -1));
       const [l, u] = U(o);
       return b(t, {
         type: "APPLY",
@@ -944,7 +962,7 @@ function A(t, e = [], r = function() {
       }, u).then(P);
     },
     construct(a, i) {
-      R(n);
+      v(n);
       const [o, c] = U(i);
       return b(t, {
         type: "CONSTRUCT",
@@ -959,12 +977,12 @@ function me(t) {
   return Array.prototype.concat.apply([], t);
 }
 function U(t) {
-  const e = t.map(T);
+  const e = t.map(C);
   return [e.map((r) => r[0]), me(e.map((r) => r[1]))];
 }
-const q = /* @__PURE__ */ new WeakMap();
-function ge(t, e) {
-  return q.set(t, e), t;
+const j = /* @__PURE__ */ new WeakMap();
+function ye(t, e) {
+  return j.set(t, e), t;
 }
 function B(t) {
   return Object.assign(t, { [D]: !0 });
@@ -976,8 +994,8 @@ function V(t, e = globalThis, r = "*") {
     removeEventListener: e.removeEventListener.bind(e)
   };
 }
-function T(t) {
-  for (const [e, r] of _)
+function C(t) {
+  for (const [e, r] of S)
     if (r.canHandle(t)) {
       const [n, s] = r.serialize(t);
       return [
@@ -994,34 +1012,34 @@ function T(t) {
       type: "RAW",
       value: t
     },
-    q.get(t) || []
+    j.get(t) || []
   ];
 }
 function P(t) {
   switch (t.type) {
     case "HANDLER":
-      return _.get(t.name).deserialize(t.value);
+      return S.get(t.name).deserialize(t.value);
     case "RAW":
       return t.value;
   }
 }
 function b(t, e, r) {
   return new Promise((n) => {
-    const s = ye();
+    const s = ge();
     t.addEventListener("message", function a(i) {
       !i.data || !i.data.id || i.data.id !== s || (t.removeEventListener("message", a), n(i.data));
     }), t.start && t.start(), t.postMessage(Object.assign({ id: s }, e), r);
   });
 }
-function ye() {
+function ge() {
   return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
 }
-function Se(t) {
+function ve(t) {
   G();
   const e = t instanceof Worker ? t : V(t);
   return L(e);
 }
-function _e(t, e) {
+function ke(t, e) {
   G();
   let r;
   const n = new Promise((i) => {
@@ -1035,7 +1053,7 @@ function _e(t, e) {
   ), [r, a];
 }
 function G() {
-  _.set("EVENT", {
+  S.set("EVENT", {
     canHandle: (t) => t instanceof CustomEvent,
     serialize: (t) => [
       {
@@ -1044,7 +1062,7 @@ function G() {
       []
     ],
     deserialize: (t) => t
-  }), _.set("FUNCTION", {
+  }), S.set("FUNCTION", {
     canHandle: (t) => typeof t == "function",
     serialize(t) {
       console.debug("[Comlink][Performance] Proxying a function");
@@ -1054,6 +1072,14 @@ function G() {
     deserialize(t) {
       return t.start(), L(t);
     }
+  }), S.set("PHPResponse", {
+    canHandle: (t) => typeof t == "object" && t !== null && "headers" in t && "bytes" in t && "errors" in t && "exitCode" in t && "httpStatusCode" in t,
+    serialize(t) {
+      return [t.toRawData(), []];
+    },
+    deserialize(t) {
+      return E.fromRawData(t);
+    }
   });
 }
 function J(t) {
@@ -1097,7 +1123,7 @@ async function we(t = Y) {
   }
   throw new Error(`Unsupported PHP version ${t}`);
 }
-class H extends m {
+class A extends m {
   /**
    * Creates a new PHP instance.
    *
@@ -1111,7 +1137,7 @@ class H extends m {
    * @returns A new PHP instance
    */
   static async load(e, r = {}) {
-    return await H.loadSync(e, r).phpReady;
+    return await A.loadSync(e, r).phpReady;
   }
   /**
    * Does what load() does, but synchronously returns
@@ -1119,10 +1145,9 @@ class H extends m {
    * resolves when the PHP instance is ready.
    *
    * @see load
-   * @inheritdoc load
    */
   static loadSync(e, r = {}) {
-    const n = new H(void 0, r.requestHandler), a = (async () => {
+    const n = new A(void 0, r.requestHandler), a = (async () => {
       const i = await Promise.all([
         we(e),
         ...r.dataModules || []
@@ -1145,11 +1170,11 @@ class H extends m {
     };
   }
 }
-const d = /* @__PURE__ */ new WeakMap();
-class ke {
+const h = /* @__PURE__ */ new WeakMap();
+class xe {
   /** @inheritDoc */
   constructor(e, r) {
-    d.set(this, {
+    h.set(this, {
       php: e,
       monitor: r
     }), this.absoluteUrl = Promise.resolve(
@@ -1160,66 +1185,70 @@ class ke {
   }
   /** @inheritDoc @php-wasm/web!PHPRequestHandler.pathToInternalUrl */
   async pathToInternalUrl(e) {
-    return d.get(this).php.requestHandler.server.pathToInternalUrl(e);
+    return h.get(this).php.requestHandler.server.pathToInternalUrl(e);
   }
   /** @inheritDoc @php-wasm/web!PHPRequestHandler.internalUrlToPath */
   async internalUrlToPath(e) {
-    return d.get(this).php.requestHandler.server.internalUrlToPath(e);
+    return h.get(this).php.requestHandler.server.internalUrlToPath(e);
   }
   async onDownloadProgress(e) {
-    d.get(this).monitor?.addEventListener("progress", e);
+    h.get(this).monitor?.addEventListener("progress", e);
   }
   /** @inheritDoc @php-wasm/web!PHPRequestHandler.request */
   request(e, r) {
-    return d.get(this).php.request(e, r);
+    return h.get(this).php.request(e, r);
   }
   /** @inheritDoc @php-wasm/web!PHP.run */
   async run(e) {
-    return d.get(this).php.run(e);
+    return h.get(this).php.run(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.chdir */
   chdir(e) {
-    return d.get(this).php.chdir(e);
+    return h.get(this).php.chdir(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.setPhpIniPath */
   setPhpIniPath(e) {
-    return d.get(this).php.setPhpIniPath(e);
+    return h.get(this).php.setPhpIniPath(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.setPhpIniEntry */
   setPhpIniEntry(e, r) {
-    d.get(this).php.setPhpIniEntry(e, r);
+    h.get(this).php.setPhpIniEntry(e, r);
+  }
+  /** @inheritDoc @php-wasm/web!PHP.mkdir */
+  mkdir(e) {
+    h.get(this).php.mkdir(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.mkdirTree */
   mkdirTree(e) {
-    d.get(this).php.mkdirTree(e);
+    h.get(this).php.mkdirTree(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.readFileAsText */
   async readFileAsText(e) {
-    return d.get(this).php.readFileAsText(e);
+    return h.get(this).php.readFileAsText(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.readFileAsBuffer */
   async readFileAsBuffer(e) {
-    return d.get(this).php.readFileAsBuffer(e);
+    return h.get(this).php.readFileAsBuffer(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.writeFile */
   writeFile(e, r) {
-    d.get(this).php.writeFile(e, r);
+    h.get(this).php.writeFile(e, r);
   }
   /** @inheritDoc @php-wasm/web!PHP.unlink */
   unlink(e) {
-    d.get(this).php.unlink(e);
+    h.get(this).php.unlink(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.listFiles */
   async listFiles(e) {
-    return d.get(this).php.listFiles(e);
+    return h.get(this).php.listFiles(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.isDir */
   async isDir(e) {
-    return d.get(this).php.isDir(e);
+    return h.get(this).php.isDir(e);
   }
   /** @inheritDoc @php-wasm/web!PHP.fileExists */
   async fileExists(e) {
-    return d.get(this).php.fileExists(e);
+    return h.get(this).php.fileExists(e);
   }
 }
 function Pe(t, e) {
@@ -1229,7 +1258,7 @@ function Pe(t, e) {
     response: e
   };
 }
-async function xe(t, e, r, n) {
+async function _e(t, e, r, n) {
   const s = navigator.serviceWorker;
   if (!s)
     throw new Error("Service workers are not supported in this browser.");
@@ -1280,10 +1309,10 @@ function Te() {
     t[n] = r;
   }), t;
 }
-const Fe = function() {
+const Ce = function() {
   return navigator.userAgent.toLowerCase().indexOf("firefox") > -1 ? "iframe" : "webworker";
 }();
-async function Ce(t, e = "webworker", r = {}) {
+async function Fe(t, e = "webworker", r = {}) {
   if (t = Ee(t, r), e === "webworker")
     return new Worker(t, { type: "module" });
   if (e === "iframe")
@@ -1306,18 +1335,18 @@ async function Re(t) {
 }
 export {
   Y as LatestSupportedPHPVersion,
-  H as PHP,
+  A as PHP,
   K as PHPBrowser,
-  ke as PHPClient,
+  xe as PHPClient,
   ee as PHPRequestHandler,
   W as SupportedPHPVersions,
-  ve as SupportedPHPVersionsList,
-  Se as consumeAPI,
-  _e as exposeAPI,
+  Se as SupportedPHPVersionsList,
+  ve as consumeAPI,
+  ke as exposeAPI,
   we as getPHPLoaderModule,
   oe as loadPHPRuntime,
   Te as parseWorkerStartupOptions,
-  Fe as recommendedWorkerBackend,
-  xe as registerServiceWorker,
-  Ce as spawnPHPWorkerThread
+  Ce as recommendedWorkerBackend,
+  _e as registerServiceWorker,
+  Fe as spawnPHPWorkerThread
 };

package/index.d.ts

@@ -2,11 +2,7 @@
 
 import * as Comlink from 'comlink';
 
-/**
- * PHP response. Body is an `ArrayBuffer` because it can
- * contain binary data.
- */
-export declare class PHPResponse {
+export interface PHPResponseData {
 	/**
 	 * Response headers.
 	 */
@@ -15,7 +11,7 @@ export declare class PHPResponse {
 	 * Response body. Contains the output from `echo`,
 	 * `print`, inline HTML etc.
 	 */
-	private readonly body;
+	readonly bytes: ArrayBuffer;
 	/**
 	 * Stderr contents, if any.
 	 */
@@ -29,7 +25,28 @@ export declare class PHPResponse {
 	 * Response HTTP status code, e.g. 200.
 	 */
 	readonly httpStatusCode: number;
+}
+/**
+ * PHP response. Body is an `ArrayBuffer` because it can
+ * contain binary data.
+ *
+ * This type is used in Comlink.transferHandlers.set('PHPResponse', { ... })
+ * so be sure to update that if you change this type.
+ */
+export declare class PHPResponse implements PHPResponseData {
+	/** @inheritDoc */
+	readonly headers: Record<string, string[]>;
+	/** @inheritDoc */
+	readonly bytes: ArrayBuffer;
+	/** @inheritDoc */
+	readonly errors: string;
+	/** @inheritDoc */
+	readonly exitCode: number;
+	/** @inheritDoc */
+	readonly httpStatusCode: number;
 	constructor(httpStatusCode: number, headers: Record<string, string[]>, body: ArrayBuffer, errors?: string, exitCode?: number);
+	static fromRawData(data: PHPResponseData): PHPResponse;
+	toRawData(): PHPResponseData;
 	/**
 	 * Response body as JSON.
 	 */
@@ -38,20 +55,36 @@ export declare class PHPResponse {
 	 * Response body as text.
 	 */
 	get text(): string;
+}
+export type HTTPMethod = "GET" | "POST" | "HEAD" | "OPTIONS" | "PATCH" | "PUT" | "DELETE";
+export type PHPRequestHeaders = Record<string, string>;
+export interface PHPRequest {
 	/**
-	 * Response body as bytes.
+	 * Request method. Default: `GET`.
+	 */
+	method?: HTTPMethod;
+	/**
+	 * Request path or absolute URL.
 	 */
-	get bytes(): ArrayBuffer;
-}
-export type PHPRequest = Pick<PHPRunOptions, "method" | "headers"> & {
 	url: string;
+	/**
+	 * Request headers.
+	 */
+	headers?: PHPRequestHeaders;
+	/**
+	 * Uploaded files
+	 */
 	files?: Record<string, File>;
-} & ((Pick<PHPRunOptions, "body"> & {
-	formData?: never;
-}) | {
-	body?: never;
-	formData: Record<string, unknown>;
-});
+	/**
+	 * Request body without the files.
+	 */
+	body?: string;
+	/**
+	 * Form data. If set, the request body will be ignored and
+	 * the content-type header will be set to `application/x-www-form-urlencoded`.
+	 */
+	formData?: Record<string, unknown>;
+}
 export interface PHPRequestHandlerConfiguration {
 	/**
 	 * The directory in the PHP filesystem where the server will look
@@ -210,7 +243,6 @@ export declare class PHPBrowser implements WithRequestHandler {
 	request(request: PHPRequest, redirects?: number): Promise<PHPResponse>;
 }
 export type RuntimeType = "NODE" | "WEB" | "WORKER";
-export type PHPRequestHeaders = Record<string, string>;
 export interface FileInfo {
 	key: string;
 	name: string;
@@ -233,7 +265,7 @@ export interface PHPRunOptions {
 	/**
 	 * Request method. Default: `GET`.
 	 */
-	method?: "GET" | "POST" | "HEAD" | "OPTIONS" | "PATCH" | "PUT" | "DELETE";
+	method?: HTTPMethod;
 	/**
 	 * Request headers.
 	 */
@@ -272,11 +304,11 @@ export interface WithNodeFilesystem {
 	/**
 	 * Mounts a Node.js filesystem to a given path in the PHP filesystem.
 	 *
-	 * @param  settings - The Node.js filesystem settings.
-	 * @param  path     - The path to mount the filesystem to.
+	 * @param  localPath - The path of a real local directory you want to mount.
+	 * @param  virtualFSPath - Where to mount it in the virtual filesystem.
 	 * @see {@link https://emscripten.org/docs/api_reference/Filesystem-API.html#FS.mount}
 	 */
-	mount(settings: any, path: string): void;
+	mount(localPath: string | MountSettings, virtualFSPath: string): void;
 }
 export interface WithFilesystem {
 	/**
@@ -286,6 +318,10 @@ export interface WithFilesystem {
 	 *
 	 * @param  path - The directory path to create.
 	 */
+	mkdir(path: string): void;
+	/**
+	 * @deprecated Use mkdir instead.
+	 */
 	mkdirTree(path: string): void;
 	/**
 	 * Reads a file from the PHP filesystem and returns it as a string.
@@ -448,6 +484,8 @@ declare abstract class BasePHP implements WithPHPIniBindings, WithFilesystem, Wi
 	setSkipShebang(shouldSkip: boolean): void;
 	addServerGlobalEntry(key: string, value: string): void;
 	/** @inheritDoc */
+	mkdir(path: string): void;
+	/** @inheritDoc */
 	mkdirTree(path: string): void;
 	/** @inheritDoc */
 	readFileAsText(path: string): string;
@@ -464,7 +502,7 @@ declare abstract class BasePHP implements WithPHPIniBindings, WithFilesystem, Wi
 	/** @inheritDoc */
 	fileExists(path: string): boolean;
 	/** @inheritDoc */
-	mount(settings: MountSettings, path: string): void;
+	mount(localPath: string | MountSettings, virtualFSPath: string): void;
 }
 /**
  * Output of the PHP.wasm runtime.
@@ -668,7 +706,6 @@ export declare class PHP extends BasePHP {
 	 * resolves when the PHP instance is ready.
 	 *
 	 * @see load
-	 * @inheritdoc load
 	 */
 	static loadSync(phpVersion: SupportedPHPVersion, options?: PHPWebLoaderOptions): {
 		php: PHP;
@@ -712,6 +749,8 @@ export declare class PHPClient implements Promisify<WithPHPIniBindings & WithFil
 	setPhpIniPath(path: string): void;
 	/** @inheritDoc @php-wasm/web!PHP.setPhpIniEntry */
 	setPhpIniEntry(key: string, value: string): void;
+	/** @inheritDoc @php-wasm/web!PHP.mkdir */
+	mkdir(path: string): void;
 	/** @inheritDoc @php-wasm/web!PHP.mkdirTree */
 	mkdirTree(path: string): void;
 	/** @inheritDoc @php-wasm/web!PHP.readFileAsText */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/web",
-	"version": "0.1.18",
+	"version": "0.1.20",
 	"description": "PHP.wasm for the web",
 	"repository": {
 		"type": "git",
@@ -29,5 +29,5 @@
 	"type": "module",
 	"main": "index.js",
 	"types": "index.d.ts",
-	"gitHead": "2de8f9182b249b7e87694efaa06e7f25b64b7bb3"
+	"gitHead": "bbe56ef04fa9740506efed428ef8c89de7223d96"
 }