@php-wasm/web 0.1.56 → 0.1.58

package/index.d.ts

@@ -275,9 +275,10 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 * Lists the files and directories in the given directory.
 	 *
 	 * @param  path - The directory path to list.
+	 * @param  options - Options for the listing.
 	 * @returns The list of files and directories in the given directory.
 	 */
-	listFiles(path: string): string[];
+	listFiles(path: string, options?: ListFilesOptions): string[];
 	/**
 	 * Checks if a directory exists in the PHP filesystem.
 	 *
@@ -448,6 +449,13 @@ export interface RmDirOptions {
 	 */
 	recursive?: boolean;
 }
+export interface ListFilesOptions {
+	/**
+	 * If true, prepend given folder path to all file names.
+	 * Default: false.
+	 */
+	prependPath: boolean;
+}
 declare const SupportedPHPVersions: readonly [
 	"8.2",
 	"8.1",
@@ -620,7 +628,7 @@ declare abstract class BasePHP implements IsomorphicLocalPHP {
 	/** @inheritDoc */
 	rmdir(path: string, options?: RmDirOptions): void;
 	/** @inheritDoc */
-	listFiles(path: string): string[];
+	listFiles(path: string, options?: ListFilesOptions): string[];
 	/** @inheritDoc */
 	isDir(path: string): boolean;
 	/** @inheritDoc */
@@ -716,7 +724,7 @@ export declare class WebPHPEndpoint implements IsomorphicLocalPHP {
 	/** @inheritDoc @php-wasm/web!WebPHP.unlink */
 	unlink(path: string): void;
 	/** @inheritDoc @php-wasm/web!WebPHP.listFiles */
-	listFiles(path: string): string[];
+	listFiles(path: string, options?: ListFilesOptions): string[];
 	/** @inheritDoc @php-wasm/web!WebPHP.isDir */
 	isDir(path: string): boolean;
 	/** @inheritDoc @php-wasm/web!WebPHP.fileExists */

package/{index-07ec8535.js → index.js}

@@ -1,4 +1,4 @@
-const W = Symbol("error"), D = Symbol("message");
+const W = Symbol("error"), $ = Symbol("message");
 class I extends Event {
   /**
    * Create a new `ErrorEvent`.
@@ -8,13 +8,13 @@ class I extends Event {
    *                  attributes via object members of the same name.
    */
   constructor(e, r = {}) {
-    super(e), this[W] = r.error === void 0 ? null : r.error, this[D] = r.message === void 0 ? "" : r.message;
+    super(e), this[W] = r.error === void 0 ? null : r.error, this[$] = r.message === void 0 ? "" : r.message;
   }
   get error() {
     return this[W];
   }
   get message() {
-    return this[D];
+    return this[$];
   }
 }
 Object.defineProperty(I.prototype, "error", { enumerable: !0 });
@@ -113,13 +113,13 @@ the Dockerfile, you'll need to trigger this error again with long stack
 traces enabled. In node.js, you can do it using the --stack-trace-limit=100
 CLI option: 
 
-`, $ = "\x1B[41m", he = "\x1B[1m", q = "\x1B[0m", z = "\x1B[K";
+`, D = "\x1B[41m", he = "\x1B[1m", q = "\x1B[0m", z = "\x1B[K";
 let B = !1;
 function de(t) {
   if (!B) {
-    B = !0, console.log(`${$}
+    B = !0, console.log(`${D}
 ${z}
-${he}  WASM ERROR${q}${$}`);
+${he}  WASM ERROR${q}${D}`);
     for (const e of t.split(`
 `))
       console.log(`${z}  ${e} `);
@@ -857,11 +857,13 @@ class m {
       [E],
       [parseInt(e["content-length"], 10)]
     );
-    for (const r in e)
-      this.addServerGlobalEntry(
-        `HTTP_${r.toUpperCase().replace(/-/g, "_")}`,
+    for (const r in e) {
+      let n = "HTTP_";
+      ["content-type", "content-length"].includes(r.toLowerCase()) && (n = ""), this.addServerGlobalEntry(
+        `${n}${r.toUpperCase().replace(/-/g, "_")}`,
         e[r]
       );
+    }
   }
   #u(e) {
     this[u].ccall(
@@ -992,15 +994,20 @@ class m {
       this.isDir(s) ? this.rmdir(s, r) : this.unlink(s);
     }), this[u].FS.rmdir(e);
   }
-  listFiles(e) {
+  listFiles(e, r = { prependPath: !1 }) {
     if (!this.fileExists(e))
       return [];
     try {
-      return this[u].FS.readdir(e).filter(
-        (r) => r !== "." && r !== ".."
+      const n = this[u].FS.readdir(e).filter(
+        (s) => s !== "." && s !== ".."
       );
-    } catch (r) {
-      return console.error(r, { path: e }), [];
+      if (r.prependPath) {
+        const s = e.replace(/\/$/, "");
+        return n.map((o) => `${s}/${o}`);
+      }
+      return n;
+    } catch (n) {
+      return console.error(n, { path: e }), [];
     }
   }
   isDir(e) {
@@ -1372,23 +1379,23 @@ function N(t) {
 async function We(t = me) {
   switch (t) {
     case "8.2":
-      return await import("php_8_2.js");
+      return await import("./php_8_2.js");
     case "8.1":
-      return await import("php_8_1.js");
+      return await import("./php_8_1.js");
     case "8.0":
-      return await import("php_8_0.js");
+      return await import("./php_8_0.js");
     case "7.4":
-      return await import("php_7_4.js");
+      return await import("./php_7_4.js");
     case "7.3":
-      return await import("php_7_3.js");
+      return await import("./php_7_3.js");
     case "7.2":
-      return await import("php_7_2.js");
+      return await import("./php_7_2.js");
     case "7.1":
-      return await import("php_7_1.js");
+      return await import("./php_7_1.js");
     case "7.0":
-      return await import("php_7_0.js");
+      return await import("./php_7_0.js");
     case "5.6":
-      return await import("php_5_6.js");
+      return await import("./php_5_6.js");
   }
   throw new Error(`Unsupported PHP version ${t}`);
 }
@@ -1515,8 +1522,8 @@ class Ge {
     return d.get(this).php.unlink(e);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.listFiles */
-  listFiles(e) {
-    return d.get(this).php.listFiles(e);
+  listFiles(e, r) {
+    return d.get(this).php.listFiles(e, r);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.isDir */
   isDir(e) {
@@ -1527,7 +1534,7 @@ class Ge {
     return d.get(this).php.fileExists(e);
   }
 }
-function De(t, e) {
+function $e(t, e) {
   return {
     type: "response",
     requestId: t,
@@ -1540,7 +1547,7 @@ async function Ve(t, e, r, n) {
     throw new Error("Service workers are not supported in this browser.");
   const o = await s.getRegistrations();
   if (o.length > 0) {
-    const i = await $e();
+    const i = await De();
     if (n !== i) {
       console.debug(
         `[window] Reloading the currently registered Service Worker (expected version: ${n}, registered version: ${i})`
@@ -1568,11 +1575,11 @@ async function Ve(t, e, r, n) {
       if (console.debug("Message from ServiceWorker", a), e && a.data.scope !== e)
         return;
       const l = a.data.args || [], c = a.data.method, h = await t[c](...l);
-      a.source.postMessage(De(a.data.requestId, h));
+      a.source.postMessage($e(a.data.requestId, h));
     }
   ), s.startMessages();
 }
-async function $e() {
+async function De() {
   try {
     return (await (await fetch("/version")).json()).version;
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/web",
-	"version": "0.1.56",
+	"version": "0.1.58",
 	"description": "PHP.wasm for the web",
 	"repository": {
 		"type": "git",
@@ -29,5 +29,5 @@
 	"type": "module",
 	"main": "index.js",
 	"types": "index.d.ts",
-	"gitHead": "af3583eb7c6644a9859ea4782702c6e2c3474821"
+	"gitHead": "dbc77ed4c0b0a2625cfbe08722fade036c69a425"
 }