@php-wasm/util 0.3.1 → 0.5.2

package/index.js

@@ -1,9 +1,7 @@
 // packages/php-wasm/util/src/lib/semaphore.ts
 var Semaphore = class {
-  _running = 0;
-  concurrency;
-  queue;
   constructor({ concurrency }) {
+    this._running = 0;
     this.concurrency = concurrency;
     this.queue = [];
   }
@@ -40,22 +38,51 @@ var Semaphore = class {
   }
 };
 
-// packages/php-wasm/util/src/lib/join-paths.ts
+// packages/php-wasm/util/src/lib/paths.ts
 function joinPaths(...paths) {
   let path = paths.join("/");
-  const isAbsolute = path.charAt(0) === "/";
+  const isAbsolute = path[0] === "/";
   const trailingSlash = path.substring(path.length - 1) === "/";
-  path = normalizePathsArray(
-    path.split("/").filter((p) => !!p),
-    !isAbsolute
-  ).join("/");
+  path = normalizePath(path);
   if (!path && !isAbsolute) {
     path = ".";
   }
   if (path && trailingSlash) {
     path += "/";
   }
-  return (isAbsolute ? "/" : "") + path;
+  return path;
+}
+function dirname(path) {
+  if (path === "/") {
+    return "/";
+  }
+  path = normalizePath(path);
+  const lastSlash = path.lastIndexOf("/");
+  if (lastSlash === -1) {
+    return "";
+  } else if (lastSlash === 0) {
+    return "/";
+  }
+  return path.substr(0, lastSlash);
+}
+function basename(path) {
+  if (path === "/") {
+    return "/";
+  }
+  path = normalizePath(path);
+  const lastSlash = path.lastIndexOf("/");
+  if (lastSlash === -1) {
+    return path;
+  }
+  return path.substr(lastSlash + 1);
+}
+function normalizePath(path) {
+  const isAbsolute = path[0] === "/";
+  path = normalizePathsArray(
+    path.split("/").filter((p) => !!p),
+    !isAbsolute
+  ).join("/");
+  return (isAbsolute ? "/" : "") + path.replace(/\/$/, "");
 }
 function normalizePathsArray(parts, allowAboveRoot) {
   let up = 0;
@@ -79,33 +106,87 @@ function normalizePathsArray(parts, allowAboveRoot) {
   return parts;
 }
 
-// packages/php-wasm/util/src/lib/php-vars.ts
-var literal = Symbol("literal");
-function phpVar(value) {
-  if (typeof value === "string") {
-    if (value.startsWith("$")) {
-      return value;
-    } else {
-      return JSON.stringify(value);
+// packages/php-wasm/util/src/lib/create-spawn-handler.ts
+function createSpawnHandler(program) {
+  return function(command) {
+    const childProcess = new ChildProcess();
+    const processApi = new ProcessApi(childProcess);
+    setTimeout(() => {
+      program(command, processApi);
+    });
+    return childProcess;
+  };
+}
+var ProcessApi = class {
+  constructor(childProcess) {
+    this.childProcess = childProcess;
+    this.exited = false;
+    this.stdinData = [];
+    childProcess.on("stdin", (data) => {
+      this.stdinData.push(data);
+    });
+  }
+  stdout(data) {
+    if (typeof data === "string") {
+      data = new TextEncoder().encode(data);
     }
-  } else if (typeof value === "number") {
-    return value.toString();
-  } else if (Array.isArray(value)) {
-    const phpArray = value.map(phpVar).join(", ");
-    return `array(${phpArray})`;
-  } else if (value === null) {
-    return "null";
-  } else if (typeof value === "object") {
-    if (literal in value) {
-      return value.toString();
-    } else {
-      const phpAssocArray = Object.entries(value).map(([key, val]) => `${JSON.stringify(key)} => ${phpVar(val)}`).join(", ");
-      return `array(${phpAssocArray})`;
+    this.childProcess.stdout.emit("data", data);
+  }
+  stderr(data) {
+    if (typeof data === "string") {
+      data = new TextEncoder().encode(data);
+    }
+    this.childProcess.stderr.emit("data", data);
+  }
+  exit(code) {
+    if (!this.exited) {
+      this.exited = true;
+      this.childProcess.emit("exit", code);
+    }
+  }
+  flushStdin() {
+    const data = this.stdinData.join("");
+    this.stdinData = [];
+    return data;
+  }
+};
+var EventEmitter = class {
+  constructor() {
+    this.listeners = {};
+  }
+  emit(eventName, data) {
+    if (this.listeners[eventName]) {
+      this.listeners[eventName].forEach(function(listener) {
+        listener(data);
+      });
+    }
+  }
+  on(eventName, listener) {
+    if (!this.listeners[eventName]) {
+      this.listeners[eventName] = [];
     }
-  } else if (typeof value === "function") {
-    return value();
+    this.listeners[eventName].push(listener);
   }
-  throw new Error(`Unsupported value: ${value}`);
+};
+var ChildProcess = class extends EventEmitter {
+  constructor() {
+    super();
+    this.stdout = new EventEmitter();
+    this.stderr = new EventEmitter();
+    const self = this;
+    this.stdin = {
+      write: (data) => {
+        self.emit("stdin", data);
+      }
+    };
+  }
+};
+
+// packages/php-wasm/util/src/lib/php-vars.ts
+function phpVar(value) {
+  return `json_decode(base64_decode('${stringToBase64(
+    JSON.stringify(value)
+  )}'), true)`;
 }
 function phpVars(vars) {
   const result = {};
@@ -114,9 +195,20 @@ function phpVars(vars) {
   }
   return result;
 }
+function stringToBase64(str) {
+  return bytesToBase64(new TextEncoder().encode(str));
+}
+function bytesToBase64(bytes) {
+  const binString = String.fromCodePoint(...bytes);
+  return btoa(binString);
+}
 export {
   Semaphore,
+  basename,
+  createSpawnHandler,
+  dirname,
   joinPaths,
+  normalizePath,
   phpVar,
   phpVars
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/util",
-	"version": "0.3.1",
+	"version": "0.5.2",
 	"type": "commonjs",
 	"typedoc": {
 		"entryPoint": "./src/index.ts",
@@ -12,7 +12,7 @@
 		"access": "public",
 		"directory": "../../../dist/packages/php-wasm/util"
 	},
-	"gitHead": "73b285f8b496c7442474fd7325b3f6b1287cbf95",
+	"gitHead": "630288218e307d9a5e93d92b428ed30ae6a5fa2f",
 	"engines": {
 		"node": ">=16.15.1",
 		"npm": ">=8.11.0"