@php-wasm/util 0.9.19 → 0.9.21

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=Symbol("SleepFinished");function m(t){return new Promise(e=>{setTimeout(()=>e(f),t)})}class a extends Error{constructor(){super("Acquiring lock timed out")}}class E{constructor({concurrency:e,timeout:s}){this._running=0,this.concurrency=e,this.timeout=s,this.queue=[]}get remaining(){return this.concurrency-this.running}get running(){return this._running}async acquire(){for(;;)if(this._running>=this.concurrency){const e=new Promise(s=>{this.queue.push(s)});this.timeout!==void 0?await Promise.race([e,m(this.timeout)]).then(s=>{if(s===f)throw new a}):await e}else{this._running++;let e=!1;return()=>{e||(e=!0,this._running--,this.queue.length>0&&this.queue.shift()())}}}async run(e){const s=await this.acquire();try{return await e()}finally{s()}}}class p extends Error{constructor(e,s){super(e),this.userFriendlyMessage=s,this.userFriendlyMessage||(this.userFriendlyMessage=e)}}function y(...t){let e=t.join("/");const s=e[0]==="/",i=e.substring(e.length-1)==="/";return e=c(e),!e&&!s&&(e="."),e&&i&&(e+="/"),e}function P(t){if(t==="/")return"/";t=c(t);const e=t.lastIndexOf("/");return e===-1?"":e===0?"/":t.substr(0,e)}function w(t){if(t==="/")return"/";t=c(t);const e=t.lastIndexOf("/");return e===-1?t:t.substr(e+1)}function c(t){const e=t[0]==="/";return t=O(t.split("/").filter(s=>!!s),!e).join("/"),(e?"/":"")+t.replace(/\/$/,"")}function O(t,e){let s=0;for(let i=t.length-1;i>=0;i--){const n=t[i];n==="."?t.splice(i,1):n===".."?(t.splice(i,1),s++):s&&(t.splice(i,1),s--)}if(e)for(;s;s--)t.unshift("..");return t}function S(t,e){return t==="/"?!0:(t=c(t),e=c(e),e.startsWith(t+"/")||e===t)}function D(t){let i=0,n="";const l=[];let r="";for(let o=0;o<t.length;o++){const u=t[o];u==="\\"?((t[o+1]==='"'||t[o+1]==="'")&&o++,r+=t[o]):i===0?u==='"'||u==="'"?(i=1,n=u):u.match(/\s/)?(r.trim().length&&l.push(r.trim()),r=u):l.length&&!r?r=l.pop()+u:r+=u:i===1&&(u===n?(i=0,n=""):r+=u)}return r&&l.push(r.trim()),l}function _(t){return function(e,s=[],i={}){const n=new x,l=new T(n);return setTimeout(async()=>{let r=[];if(s.length)r=[e,...s];else if(typeof e=="string")r=D(e);else if(Array.isArray(e))r=e;else throw new Error("Invalid command ",e);try{await t(r,l,i)}catch(o){n.emit("error",o),typeof o=="object"&&o!==null&&"message"in o&&typeof o.message=="string"&&l.stderr(o.message),l.exit(1)}n.emit("spawn",!0)}),n}}class h{constructor(){this.listeners={}}emit(e,s){this.listeners[e]&&this.listeners[e].forEach(function(i){i(s)})}on(e,s){this.listeners[e]||(this.listeners[e]=[]),this.listeners[e].push(s)}}class T extends h{constructor(e){super(),this.childProcess=e,this.exited=!1,this.stdinData=[],e.on("stdin",s=>{this.stdinData?this.stdinData.push(s.slice()):this.emit("stdin",s)})}stdout(e){typeof e=="string"&&(e=new TextEncoder().encode(e)),this.childProcess.stdout.emit("data",e)}stdoutEnd(){this.childProcess.stdout.emit("end",{})}stderr(e){typeof e=="string"&&(e=new TextEncoder().encode(e)),this.childProcess.stderr.emit("data",e)}stderrEnd(){this.childProcess.stderr.emit("end",{})}exit(e){this.exited||(this.exited=!0,this.childProcess.emit("exit",e))}flushStdin(){if(this.stdinData)for(let e=0;e<this.stdinData.length;e++)this.emit("stdin",this.stdinData[e]);this.stdinData=null}}let b=9743;class x extends h{constructor(e=b++){super(),this.pid=e,this.stdout=new h,this.stderr=new h;const s=this;this.stdin={write:i=>{s.emit("stdin",i)}}}}function d(t=36,e="!@#$%^&*()_+=-[]/.,<>?"){const s="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"+e;let i="";for(let n=t;n>0;--n)i+=s[Math.floor(Math.random()*s.length)];return i}function M(){return d(36,"-_")}function g(t){return`json_decode(base64_decode('${U(JSON.stringify(t))}'), true)`}function q(t){const e={};for(const s in t)e[s]=g(t[s]);return e}function U(t){return A(new TextEncoder().encode(t))}function A(t){const e=String.fromCodePoint(...t);return btoa(e)}exports.AcquireTimeoutError=a;exports.PhpWasmError=p;exports.Semaphore=E;exports.basename=w;exports.createSpawnHandler=_;exports.dirname=P;exports.isParentOf=S;exports.joinPaths=y;exports.normalizePath=c;exports.phpVar=g;exports.phpVars=q;exports.randomFilename=M;exports.randomString=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=Symbol("SleepFinished");function m(t){return new Promise(e=>{setTimeout(()=>e(f),t)})}class a extends Error{constructor(){super("Acquiring lock timed out")}}class E{constructor({concurrency:e,timeout:s}){this._running=0,this.concurrency=e,this.timeout=s,this.queue=[]}get remaining(){return this.concurrency-this.running}get running(){return this._running}async acquire(){for(;;)if(this._running>=this.concurrency){const e=new Promise(s=>{this.queue.push(s)});this.timeout!==void 0?await Promise.race([e,m(this.timeout)]).then(s=>{if(s===f)throw new a}):await e}else{this._running++;let e=!1;return()=>{e||(e=!0,this._running--,this.queue.length>0&&this.queue.shift()())}}}async run(e){const s=await this.acquire();try{return await e()}finally{s()}}}class y extends Error{constructor(e,s){super(e),this.userFriendlyMessage=s,this.userFriendlyMessage||(this.userFriendlyMessage=e)}}function p(...t){function e(u){return u.substring(u.length-1)==="/"}let s=t.join("/");const i=s[0]==="/",r=e(s);return s=c(s),!s&&!i&&(s="."),s&&r&&!e(s)&&(s+="/"),s}function P(t){if(t==="/")return"/";t=c(t);const e=t.lastIndexOf("/");return e===-1?"":e===0?"/":t.substr(0,e)}function w(t){if(t==="/")return"/";t=c(t);const e=t.lastIndexOf("/");return e===-1?t:t.substr(e+1)}function c(t){const e=t[0]==="/";return t=O(t.split("/").filter(s=>!!s),!e).join("/"),(e?"/":"")+t.replace(/\/$/,"")}function O(t,e){let s=0;for(let i=t.length-1;i>=0;i--){const r=t[i];r==="."?t.splice(i,1):r===".."?(t.splice(i,1),s++):s&&(t.splice(i,1),s--)}if(e)for(;s;s--)t.unshift("..");return t}function S(t,e){return t==="/"?!0:(t=c(t),e=c(e),e.startsWith(t+"/")||e===t)}function D(t){let i=0,r="";const u=[];let n="";for(let o=0;o<t.length;o++){const l=t[o];l==="\\"?((t[o+1]==='"'||t[o+1]==="'")&&o++,n+=t[o]):i===0?l==='"'||l==="'"?(i=1,r=l):l.match(/\s/)?(n.trim().length&&u.push(n.trim()),n=l):u.length&&!n?n=u.pop()+l:n+=l:i===1&&(l===r?(i=0,r=""):n+=l)}return n&&u.push(n.trim()),u}function T(t){return function(e,s=[],i={}){const r=new x,u=new _(r);return setTimeout(async()=>{let n=[];if(s.length)n=[e,...s];else if(typeof e=="string")n=D(e);else if(Array.isArray(e))n=e;else throw new Error("Invalid command ",e);try{await t(n,u,i)}catch(o){r.emit("error",o),typeof o=="object"&&o!==null&&"message"in o&&typeof o.message=="string"&&u.stderr(o.message),u.exit(1)}r.emit("spawn",!0)}),r}}class h{constructor(){this.listeners={}}emit(e,s){this.listeners[e]&&this.listeners[e].forEach(function(i){i(s)})}on(e,s){this.listeners[e]||(this.listeners[e]=[]),this.listeners[e].push(s)}}class _ extends h{constructor(e){super(),this.childProcess=e,this.exited=!1,this.stdinData=[],e.on("stdin",s=>{this.stdinData?this.stdinData.push(s.slice()):this.emit("stdin",s)})}stdout(e){typeof e=="string"&&(e=new TextEncoder().encode(e)),this.childProcess.stdout.emit("data",e)}stdoutEnd(){this.childProcess.stdout.emit("end",{})}stderr(e){typeof e=="string"&&(e=new TextEncoder().encode(e)),this.childProcess.stderr.emit("data",e)}stderrEnd(){this.childProcess.stderr.emit("end",{})}exit(e){this.exited||(this.exited=!0,this.childProcess.emit("exit",e))}flushStdin(){if(this.stdinData)for(let e=0;e<this.stdinData.length;e++)this.emit("stdin",this.stdinData[e]);this.stdinData=null}}let b=9743;class x extends h{constructor(e=b++){super(),this.pid=e,this.stdout=new h,this.stderr=new h;const s=this;this.stdin={write:i=>{s.emit("stdin",i)}}}}function d(t=36,e="!@#$%^&*()_+=-[]/.,<>?"){const s="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"+e;let i="";for(let r=t;r>0;--r)i+=s[Math.floor(Math.random()*s.length)];return i}function M(){return d(36,"-_")}function g(t){return`json_decode(base64_decode('${U(JSON.stringify(t))}'), true)`}function q(t){const e={};for(const s in t)e[s]=g(t[s]);return e}function U(t){return A(new TextEncoder().encode(t))}function A(t){const e=String.fromCodePoint(...t);return btoa(e)}exports.AcquireTimeoutError=a;exports.PhpWasmError=y;exports.Semaphore=E;exports.basename=w;exports.createSpawnHandler=T;exports.dirname=P;exports.isParentOf=S;exports.joinPaths=p;exports.normalizePath=c;exports.phpVar=g;exports.phpVars=q;exports.randomFilename=M;exports.randomString=d;

package/index.js

@@ -1,10 +1,10 @@
 const f = Symbol("SleepFinished");
-function d(e) {
+function a(e) {
   return new Promise((t) => {
     setTimeout(() => t(f), e);
   });
 }
-class a extends Error {
+class d extends Error {
   constructor() {
     super("Acquiring lock timed out");
   }
@@ -25,10 +25,10 @@ class _ {
         const t = new Promise((s) => {
           this.queue.push(s);
         });
-        this.timeout !== void 0 ? await Promise.race([t, d(this.timeout)]).then(
+        this.timeout !== void 0 ? await Promise.race([t, a(this.timeout)]).then(
           (s) => {
             if (s === f)
-              throw new a();
+              throw new d();
           }
         ) : await t;
       } else {
@@ -54,9 +54,12 @@ class x extends Error {
   }
 }
 function T(...e) {
-  let t = e.join("/");
-  const s = t[0] === "/", i = t.substring(t.length - 1) === "/";
-  return t = c(t), !t && !s && (t = "."), t && i && (t += "/"), t;
+  function t(u) {
+    return u.substring(u.length - 1) === "/";
+  }
+  let s = e.join("/");
+  const i = s[0] === "/", n = t(s);
+  return s = c(s), !s && !i && (s = "."), s && n && !t(s) && (s += "/"), s;
 }
 function S(e) {
   if (e === "/")
@@ -82,8 +85,8 @@ function c(e) {
 function g(e, t) {
   let s = 0;
   for (let i = e.length - 1; i >= 0; i--) {
-    const r = e[i];
-    r === "." ? e.splice(i, 1) : r === ".." ? (e.splice(i, 1), s++) : s && (e.splice(i, 1), s--);
+    const n = e[i];
+    n === "." ? e.splice(i, 1) : n === ".." ? (e.splice(i, 1), s++) : s && (e.splice(i, 1), s--);
   }
   if (t)
     for (; s; s--)
@@ -94,35 +97,35 @@ function M(e, t) {
   return e === "/" ? !0 : (e = c(e), t = c(t), t.startsWith(e + "/") || t === e);
 }
 function m(e) {
-  let i = 0, r = "";
-  const l = [];
-  let n = "";
+  let i = 0, n = "";
+  const u = [];
+  let r = "";
   for (let o = 0; o < e.length; o++) {
-    const u = e[o];
-    u === "\\" ? ((e[o + 1] === '"' || e[o + 1] === "'") && o++, n += e[o]) : i === 0 ? u === '"' || u === "'" ? (i = 1, r = u) : u.match(/\s/) ? (n.trim().length && l.push(n.trim()), n = u) : l.length && !n ? n = l.pop() + u : n += u : i === 1 && (u === r ? (i = 0, r = "") : n += u);
+    const l = e[o];
+    l === "\\" ? ((e[o + 1] === '"' || e[o + 1] === "'") && o++, r += e[o]) : i === 0 ? l === '"' || l === "'" ? (i = 1, n = l) : l.match(/\s/) ? (r.trim().length && u.push(r.trim()), r = l) : u.length && !r ? r = u.pop() + l : r += l : i === 1 && (l === n ? (i = 0, n = "") : r += l);
   }
-  return n && l.push(n.trim()), l;
+  return r && u.push(r.trim()), u;
 }
 function U(e) {
   return function(t, s = [], i = {}) {
-    const r = new w(), l = new E(r);
+    const n = new w(), u = new E(n);
     return setTimeout(async () => {
-      let n = [];
+      let r = [];
       if (s.length)
-        n = [t, ...s];
+        r = [t, ...s];
       else if (typeof t == "string")
-        n = m(t);
+        r = m(t);
       else if (Array.isArray(t))
-        n = t;
+        r = t;
       else
         throw new Error("Invalid command ", t);
       try {
-        await e(n, l, i);
+        await e(r, u, i);
       } catch (o) {
-        r.emit("error", o), typeof o == "object" && o !== null && "message" in o && typeof o.message == "string" && l.stderr(o.message), l.exit(1);
+        n.emit("error", o), typeof o == "object" && o !== null && "message" in o && typeof o.message == "string" && u.stderr(o.message), u.exit(1);
       }
-      r.emit("spawn", !0);
-    }), r;
+      n.emit("spawn", !0);
+    }), n;
   };
 }
 class h {
@@ -178,17 +181,17 @@ class w extends h {
     };
   }
 }
-function p(e = 36, t = "!@#$%^&*()_+=-[]/.,<>?") {
+function P(e = 36, t = "!@#$%^&*()_+=-[]/.,<>?") {
   const s = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + t;
   let i = "";
-  for (let r = e; r > 0; --r)
+  for (let n = e; n > 0; --n)
     i += s[Math.floor(Math.random() * s.length)];
   return i;
 }
 function q() {
-  return p(36, "-_");
+  return P(36, "-_");
 }
-function P(e) {
+function p(e) {
   return `json_decode(base64_decode('${D(
     JSON.stringify(e)
   )}'), true)`;
@@ -196,7 +199,7 @@ function P(e) {
 function A(e) {
   const t = {};
   for (const s in e)
-    t[s] = P(e[s]);
+    t[s] = p(e[s]);
   return t;
 }
 function D(e) {
@@ -207,7 +210,7 @@ function O(e) {
   return btoa(t);
 }
 export {
-  a as AcquireTimeoutError,
+  d as AcquireTimeoutError,
   x as PhpWasmError,
   _ as Semaphore,
   b as basename,
@@ -216,8 +219,8 @@ export {
   M as isParentOf,
   T as joinPaths,
   c as normalizePath,
-  P as phpVar,
+  p as phpVar,
   A as phpVars,
   q as randomFilename,
-  p as randomString
+  P as randomString
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/util",
-  "version": "0.9.19",
+  "version": "0.9.21",
   "type": "module",
   "types": "index.d.ts",
   "typedoc": {
@@ -13,7 +13,7 @@
     "access": "public",
     "directory": "../../../dist/packages/php-wasm/util"
   },
-  "gitHead": "aafbbcdc4b0644885bd55d0ed67381952f0b16b6",
+  "gitHead": "a497916495035caba2f28cfdef75a8a0f3732f0e",
   "engines": {
     "node": ">=18.18.0",
     "npm": ">=8.11.0"

package/index.d.ts

@@ -1,146 +0,0 @@
-// Generated by dts-bundle-generator v7.2.0
-
-export interface SemaphoreOptions {
-	/**
-	 * The maximum number of concurrent locks.
-	 */
-	concurrency: number;
-	/**
-	 * The maximum time to wait for a lock to become available.
-	 */
-	timeout?: number;
-}
-export declare class AcquireTimeoutError extends Error {
-	constructor();
-}
-export declare class Semaphore {
-	private _running;
-	private concurrency;
-	private timeout?;
-	private queue;
-	constructor({ concurrency, timeout }: SemaphoreOptions);
-	get remaining(): number;
-	get running(): number;
-	acquire(): Promise<() => void>;
-	run<T>(fn: () => T | Promise<T>): Promise<T>;
-}
-export declare class PhpWasmError extends Error {
-	userFriendlyMessage?: string | undefined;
-	constructor(message: string, userFriendlyMessage?: string | undefined);
-}
-/**
- * The functions in this module are mostly copied from the generated
- * Emscripten PHP module. This enables features like filesystem journaling,
- * which use some low-level Emscripten APIs and need access to the
- * same path helpers.
- */
-/**
- * Joins paths together.
- *
- * For example:
- *
- * > joinPaths('wordpress', 'wp-content')
- * 'wordpress/wp-content'
- *
- * Use this for all PHP paths and **do not** use path.join().
- * This is important because Emscripten paths are **always**
- * POSIX-style paths. Imagine joining paths on Windows:
- *
- * > path.join('wordpress', 'wp-content')
- * '\\wordpress\\wp-content'  // invalid in PHP.wasm
- *
- * See the path.join issue for more details:
- *
- * https://github.com/WordPress/playground-tools/issues/11#issuecomment-1579074763
- *
- * @param paths Paths segments to join
- * @returns A joined path
- */
-export declare function joinPaths(...paths: string[]): string;
-/**
- * Returns the directory name of a path.
- *
- * @param path
- * @returns
- */
-export declare function dirname(path: string): string;
-/**
- * Returns the last portion of a path.
- *
- * @param path - The path to extract the basename from.
- * @returns The basename of the path.
- */
-export declare function basename(path: string): string;
-/**
- * Normalizes a path.
- *
- * For example:
- *
- * > normalizePath('wordpress/wp-content/../')
- * 'wordpress'
- *
- * @param path
- * @returns
- */
-export declare function normalizePath(path: string): string;
-/**
- * Checks if the given parent path is an ancestor of the given child path.
- *
- * @param parent The parent path to check.
- * @param child The child path to verify against the parent.
- * @returns Whether the `parent` path is an ancestor of the `child` path.
- */
-export declare function isParentOf(parent: string, child: string): boolean;
-export type Listener = (...args: any[]) => any;
-export interface ProcessOptions {
-	cwd?: string;
-	env?: Record<string, string>;
-}
-/**
- * Usage:
- * ```ts
- * php.setSpawnHandler(
- *   createSpawnHandler(function (command, processApi) {
- *     console.log(processApi.flushStdin());
- *     processApi.stdout('/\n/tmp\n/home');
- *	   processApi.exit(0);
- *   })
- * );
- * ```
- * @param program
- * @returns
- */
-export declare function createSpawnHandler(program: (command: string[], processApi: ProcessApi, options: ProcessOptions) => void | Promise<void>): any;
-declare class EventEmitter {
-	listeners: Record<string, Listener[]>;
-	emit(eventName: string, data: any): void;
-	on(eventName: string, listener: Listener): void;
-}
-declare class ProcessApi extends EventEmitter {
-	private childProcess;
-	private exited;
-	private stdinData;
-	constructor(childProcess: ChildProcess);
-	stdout(data: string | ArrayBuffer): void;
-	stdoutEnd(): void;
-	stderr(data: string | ArrayBuffer): void;
-	stderrEnd(): void;
-	exit(code: number): void;
-	flushStdin(): void;
-}
-export type StdIn = {
-	write: (data: string) => void;
-};
-declare class ChildProcess extends EventEmitter {
-	pid: number;
-	stdout: EventEmitter;
-	stderr: EventEmitter;
-	stdin: StdIn;
-	constructor(pid?: number);
-}
-export declare function randomString(length?: number, specialChars?: string): string;
-export declare function randomFilename(): string;
-export declare function phpVar(value: unknown): string;
-export declare function phpVars<T extends Record<string, unknown>>(vars: T): Record<keyof T, string>;
-
-export {};