@php-wasm/web 0.1.18 → 0.1.19

package/{index-bdd9b9c8.js → index-e5292333.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 {
@@ -138,7 +150,7 @@ class ee {
   #n;
   #o;
   #a;
-  #c;
+  #l;
   /**
    * @param  php    - The PHP instance.
    * @param  config - Request Handler configuration.
@@ -150,7 +162,7 @@ class ee {
       absoluteUrl: s = location.origin,
       isStaticFilePath: a = () => !1
     } = r;
-    this.php = e, this.#e = n, this.#c = a;
+    this.php = e, this.#e = n, this.#l = a;
     const i = new URL(s);
     this.#r = i.hostname, this.#s = i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80, this.#t = (i.protocol || "").replace(":", "");
     const o = this.#s !== 443 && this.#s !== 80;
@@ -214,7 +226,7 @@ class ee {
       n.pathname,
       this.#n
     );
-    return this.#c(s) ? this.#l(s) : await this.#u(e, n);
+    return this.#l(s) ? this.#c(s) : await this.#u(e, n);
   }
   /**
    * Serves a static file from the PHP filesystem.
@@ -222,16 +234,16 @@ class ee {
    * @param  path - The requested static file path.
    * @returns The response.
    */
-  #l(e) {
+  #c(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}`],
@@ -263,13 +275,13 @@ class ee {
       const a = [];
       if (e.files) {
         s = "POST";
-        for (const c in e.files) {
-          const l = e.files[c];
+        for (const l in e.files) {
+          const c = e.files[l];
           a.push({
-            key: c,
-            name: l.name,
-            type: l.type,
-            data: new Uint8Array(await l.arrayBuffer())
+            key: l,
+            name: c.name,
+            type: c.type,
+            data: new Uint8Array(await c.arrayBuffer())
           });
         }
       }
@@ -439,10 +451,10 @@ function g(t = "") {
       try {
         return a.apply(this, i);
       } catch (o) {
-        const c = typeof o == "object" ? o?.errno : null;
-        if (c in I) {
-          const l = I[c], u = typeof i[0] == "string" ? i[0] : null, p = u !== null ? t.replaceAll("{path}", u) : t;
-          throw new Error(`${p}: ${l}`, {
+        const l = typeof o == "object" ? o?.errno : null;
+        if (l in I) {
+          const c = I[l], u = typeof i[0] == "string" ? i[0] : null, p = u !== null ? t.replaceAll("{path}", u) : t;
+          throw new Error(`${p}: ${c}`, {
             cause: o
           });
         }
@@ -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, w = (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 h = "string", y = "number", _ = [], 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 (!_[e])
       throw new Error("Invalid PHP runtime id.");
-    this.#e = S[e];
+    this.#e = _[e];
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
@@ -511,7 +523,7 @@ class m {
       host: "example.com:443",
       ...ie(e.headers || {})
     };
-    if (this.#o(r, e.protocol || "http"), this.#c(n), e.body && this.#l(e.body), e.fileInfos)
+    if (this.#o(r, e.protocol || "http"), this.#l(n), e.body && this.#c(e.body), e.fileInfos)
       for (const s of e.fileInfos)
         this.#h(s);
     return e.code && this.#d(" ?>" + e.code), await this.#f();
@@ -572,7 +584,7 @@ class m {
       n = parseInt(new URL(e).port, 10);
     } catch {
     }
-    (!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");
+    (!n || isNaN(n) || n === 80) && (n = r === "https" ? 443 : 80), this.#e.ccall("wasm_set_request_port", null, [y], [n]), (r === "https" || !r && n === 443) && this.addServerGlobalEntry("HTTPS", "on");
   }
   #a(e) {
     this.#e.ccall("wasm_set_request_method", null, [h], [e]);
@@ -581,11 +593,11 @@ class m {
     this.#e.ccall(
       "wasm_set_skip_shebang",
       null,
-      [w],
+      [y],
       [e ? 1 : 0]
     );
   }
-  #c(e) {
+  #l(e) {
     e.cookie && this.#e.ccall(
       "wasm_set_cookies",
       null,
@@ -599,7 +611,7 @@ class m {
     ), e["content-length"] && this.#e.ccall(
       "wasm_set_content_length",
       null,
-      [w],
+      [y],
       [parseInt(e["content-length"], 10)]
     );
     for (const r in e)
@@ -608,11 +620,11 @@ class m {
         e[r]
       );
   }
-  #l(e) {
+  #c(e) {
     this.#e.ccall("wasm_set_request_body", null, [h], [e]), this.#e.ccall(
       "wasm_set_content_length",
       null,
-      [w],
+      [y],
       [e.length]
     );
   }
@@ -643,7 +655,7 @@ class m {
     this.#e.ccall(
       "wasm_add_uploaded_file",
       null,
-      [h, h, h, h, w, w],
+      [h, h, h, h, y, y],
       [r, n, s, i, o, a.byteLength]
     );
   }
@@ -653,11 +665,11 @@ class m {
   async #f() {
     const e = await await this.#e.ccall(
       "wasm_sapi_handle_request",
-      w,
+      y,
       [],
       []
     ), { headers: r, httpStatusCode: n } = this.#i();
-    return new O(
+    return new E(
       n,
       r,
       this.readFileAsBuffer("/tmp/stdout"),
@@ -711,31 +723,31 @@ class m {
     );
   }
 }
-y([
+w([
   g('Could not create directory "{path}"')
 ], m.prototype, "mkdirTree", 1);
-y([
+w([
   g('Could not read "{path}"')
 ], m.prototype, "readFileAsText", 1);
-y([
+w([
   g('Could not read "{path}"')
 ], m.prototype, "readFileAsBuffer", 1);
-y([
+w([
   g('Could not write to "{path}"')
 ], m.prototype, "writeFile", 1);
-y([
+w([
   g('Could not unlink "{path}"')
 ], m.prototype, "unlink", 1);
-y([
+w([
   g('Could not list files in "{path}"')
 ], m.prototype, "listFiles", 1);
-y([
+w([
   g('Could not stat "{path}"')
 ], m.prototype, "isDir", 1);
-y([
+w([
   g('Could not stat "{path}"')
 ], m.prototype, "fileExists", 1);
-y([
+w([
   g("Could not mount a directory")
 ], m.prototype, "mount", 1);
 function ie(t) {
@@ -746,38 +758,38 @@ function ie(t) {
 }
 async function oe(t, e = {}, r = []) {
   let n, s;
-  const a = new Promise((c) => {
-    s = c;
-  }), i = new Promise((c) => {
-    n = c;
+  const a = new Promise((l) => {
+    s = l;
+  }), i = new Promise((l) => {
+    n = l;
   }), o = t.init(se, {
-    onAbort(c) {
-      console.error("WASM aborted: "), console.error(c);
+    onAbort(l) {
+      console.error("WASM aborted: "), console.error(l);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
     // breaks vite dev mode. An identity `locateFile` function
     // fixes it.
-    locateFile: (c) => c,
+    locateFile: (l) => l,
     ...e,
     noInitialRun: !0,
     onRuntimeInitialized() {
       e.onRuntimeInitialized && e.onRuntimeInitialized(), n();
     },
-    monitorRunDependencies(c) {
-      c === 0 && (delete o.monitorRunDependencies, s());
+    monitorRunDependencies(l) {
+      l === 0 && (delete o.monitorRunDependencies, s());
     }
   });
-  for (const { default: c } of r)
-    c(o);
-  return r.length || s(), await a, await i, S.push(o), S.length - 1;
+  for (const { default: l } of r)
+    l(o);
+  return r.length || s(), await a, await i, _.push(o), _.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"), le = Symbol("Comlink.releaseProxy"), O = Symbol("Comlink.finalizer"), x = Symbol("Comlink.thrown"), z = (t) => typeof t == "object" && t !== null || typeof t == "function", ce = {
   canHandle: (t) => z(t) && t[D],
   serialize(t) {
     const { port1: e, port2: r } = new MessageChannel();
@@ -787,7 +799,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) && x in t,
   serialize({ value: t }) {
     let e;
     return t instanceof Error ? e = {
@@ -802,8 +814,8 @@ 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([
-  ["proxy", le],
+}, S = /* @__PURE__ */ new Map([
+  ["proxy", ce],
   ["throw", ue]
 ]);
 function he(t, e) {
@@ -820,48 +832,48 @@ function F(t, e = globalThis, r = ["*"]) {
       console.warn(`Invalid origin '${s.origin}' for comlink proxy`);
       return;
     }
-    const { id: a, type: i, path: o } = Object.assign({ path: [] }, s.data), c = (s.data.argumentList || []).map(P);
-    let l;
+    const { id: a, type: i, path: o } = Object.assign({ path: [] }, s.data), l = (s.data.argumentList || []).map(P);
+    let c;
     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;
+          c = p;
           break;
         case "SET":
-          u[o.slice(-1)[0]] = P(s.data.value), l = !0;
+          u[o.slice(-1)[0]] = P(s.data.value), c = !0;
           break;
         case "APPLY":
-          l = p.apply(u, c);
+          c = p.apply(u, l);
           break;
         case "CONSTRUCT":
           {
-            const f = new p(...c);
-            l = B(f);
+            const f = new p(...l);
+            c = B(f);
           }
           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), c = ge(f, [f]);
           }
           break;
         case "RELEASE":
-          l = void 0;
+          c = void 0;
           break;
         default:
           return;
       }
     } catch (u) {
-      l = { value: u, [v]: 0 };
+      c = { value: u, [x]: 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(c).catch((u) => ({ value: u, [x]: 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
+        [x]: 0
       });
       e.postMessage(Object.assign(Object.assign({}, p), { id: a }), f);
     });
@@ -870,87 +882,87 @@ 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 k = /* @__PURE__ */ new WeakMap(), T = "FinalizationRegistry" in globalThis && new FinalizationRegistry((t) => {
   const e = (k.get(t) || 0) - 1;
-  k.set(t, e), e === 0 && $(t);
+  k.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);
+  k.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 === le)
         return () => {
-          pe(s), $(t), n = !0;
+          pe(s), q(t), n = !0;
         };
       if (i === "then") {
         if (e.length === 0)
           return { then: () => s };
         const o = b(t, {
           type: "GET",
-          path: e.map((c) => c.toString())
+          path: e.map((l) => l.toString())
         }).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 [l, c] = C(o);
       return b(t, {
         type: "SET",
         path: [...e, i].map((u) => u.toString()),
-        value: c
-      }, l).then(P);
+        value: l
+      }, c).then(P);
     },
     apply(a, i, o) {
-      R(n);
-      const c = e[e.length - 1];
-      if (c === ae)
+      v(n);
+      const l = e[e.length - 1];
+      if (l === ae)
         return b(t, {
           type: "ENDPOINT"
         }).then(P);
-      if (c === "bind")
-        return A(t, e.slice(0, -1));
-      const [l, u] = U(o);
+      if (l === "bind")
+        return H(t, e.slice(0, -1));
+      const [c, u] = U(o);
       return b(t, {
         type: "APPLY",
         path: e.map((p) => p.toString()),
-        argumentList: l
+        argumentList: c
       }, u).then(P);
     },
     construct(a, i) {
-      R(n);
-      const [o, c] = U(i);
+      v(n);
+      const [o, l] = U(i);
       return b(t, {
         type: "CONSTRUCT",
-        path: e.map((l) => l.toString()),
+        path: e.map((c) => c.toString()),
         argumentList: o
-      }, c).then(P);
+      }, l).then(P);
     }
   });
   return fe(s, t), s;
@@ -959,12 +971,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();
+const j = /* @__PURE__ */ new WeakMap();
 function ge(t, e) {
-  return q.set(t, e), t;
+  return j.set(t, e), t;
 }
 function B(t) {
   return Object.assign(t, { [D]: !0 });
@@ -976,8 +988,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 +1006,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 = we();
     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 we() {
   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 xe(t, e) {
   G();
   let r;
   const n = new Promise((i) => {
@@ -1035,7 +1047,7 @@ function _e(t, e) {
   ), [r, a];
 }
 function G() {
-  _.set("EVENT", {
+  S.set("EVENT", {
     canHandle: (t) => t instanceof CustomEvent,
     serialize: (t) => [
       {
@@ -1044,7 +1056,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 +1066,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) {
@@ -1074,7 +1094,7 @@ function J(t) {
     }
   });
 }
-async function we(t = Y) {
+async function ye(t = Y) {
   switch (t) {
     case "8.2":
       return await import("php_8_2.js");
@@ -1097,7 +1117,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 +1131,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,24 +1139,23 @@ 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),
+        ye(e),
         ...r.dataModules || []
-      ]), [o, ...c] = i;
+      ]), [o, ...l] = i;
       r.downloadMonitor?.setModules(i);
-      const l = await oe(
+      const c = await oe(
         o,
         {
           ...r.emscriptenOptions || {},
           ...r.downloadMonitor?.getEmscriptenOptions() || {}
         },
-        c
+        l
       );
-      return n.initializeRuntime(l), { dataModules: c };
+      return n.initializeRuntime(c), { dataModules: l };
     })();
     return {
       php: n,
@@ -1146,7 +1165,7 @@ class H extends m {
   }
 }
 const d = /* @__PURE__ */ new WeakMap();
-class ke {
+class _e {
   /** @inheritDoc */
   constructor(e, r) {
     d.set(this, {
@@ -1229,7 +1248,7 @@ function Pe(t, e) {
     response: e
   };
 }
-async function xe(t, e, r, n) {
+async function ke(t, e, r, n) {
   const s = navigator.serviceWorker;
   if (!s)
     throw new Error("Service workers are not supported in this browser.");
@@ -1241,14 +1260,14 @@ async function xe(t, e, r, n) {
         `[window] Reloading the currently registered Service Worker (expected version: ${n}, registered version: ${i})`
       );
       for (const o of a) {
-        let c = !1;
+        let l = !1;
         try {
           await o.update();
         } catch {
-          c = !0;
+          l = !0;
         }
-        const l = o.waiting || o.installing;
-        l && !c && (i !== null ? l.postMessage("skip-waiting") : c = !0), c && (await o.unregister(), window.location.reload());
+        const c = o.waiting || o.installing;
+        c && !l && (i !== null ? c.postMessage("skip-waiting") : l = !0), l && (await o.unregister(), window.location.reload());
       }
     }
   } else
@@ -1262,7 +1281,7 @@ async function xe(t, e, r, n) {
     async function(o) {
       if (console.debug("Message from ServiceWorker", o), e && o.data.scope !== e)
         return;
-      const c = o.data.args || [], l = o.data.method, u = await t[l](...c);
+      const l = o.data.args || [], c = o.data.method, u = await t[c](...l);
       o.source.postMessage(Pe(o.data.requestId, u));
     }
   ), s.startMessages();
@@ -1280,10 +1299,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 +1325,18 @@ async function Re(t) {
 }
 export {
   Y as LatestSupportedPHPVersion,
-  H as PHP,
+  A as PHP,
   K as PHPBrowser,
-  ke as PHPClient,
+  _e as PHPClient,
   ee as PHPRequestHandler,
   W as SupportedPHPVersions,
-  ve as SupportedPHPVersionsList,
-  Se as consumeAPI,
-  _e as exposeAPI,
-  we as getPHPLoaderModule,
+  Se as SupportedPHPVersionsList,
+  ve as consumeAPI,
+  xe as exposeAPI,
+  ye as getPHPLoaderModule,
   oe as loadPHPRuntime,
   Te as parseWorkerStartupOptions,
-  Fe as recommendedWorkerBackend,
-  xe as registerServiceWorker,
-  Ce as spawnPHPWorkerThread
+  Ce as recommendedWorkerBackend,
+  ke 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.
 	 */
@@ -668,7 +700,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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/web",
-	"version": "0.1.18",
+	"version": "0.1.19",
 	"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": "ce0d93a79ad524677200b7e956ae1543d774696e"
 }