@php-wasm/node 3.1.22 → 3.1.26

package/README.md

@@ -41,7 +41,7 @@ const php = new PHP(
 ```
 
 `@php-wasm/node` ships `intl`, `xdebug`, `redis`, and `memcached`. It can also
-load external `.so` artifacts from a manifest:
+load external JSPI `.so` artifacts from a manifest:
 
 ```js
 const php = new PHP(
@@ -63,6 +63,10 @@ URL. Relative local paths are resolved from the current working directory.
 Relative artifact files in the manifest are resolved against the manifest
 location.
 
+External extensions are only supported when the Node.js runtime has JSPI
+available. Asyncify support is limited to the bundled extensions shipped with
+this package.
+
 The older `withIntl`, `withXdebug`, `withRedis`, and `withMemcached` loader
 options still work, but new code should use `extensions`.
 

package/index.cjs

@@ -1730,11 +1730,15 @@ async function withPHPExtensions(version, asyncMode, options, extensions = []) {
 }
 async function resolveRuntimePHPExtension(version, asyncMode, extension) {
   if (typeof extension === "object" && "source" in extension) {
+    if (asyncMode === "asyncify") {
+      throw new Error(
+        "External PHP extensions require JSPI. Asyncify is only supported for PHP.wasm bundled extensions."
+      );
+    }
     return await (0, import_universal8.resolvePHPExtension)({
       ...extension,
       source: normalizeNodeExtensionSource(extension.source),
       phpVersion: version,
-      asyncMode,
       fetch: extension.fetch ?? fetchNodeExtensionResource
     });
   }
@@ -1755,15 +1759,15 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           bytes: soBytes
         },
         phpVersion: version,
-        asyncMode,
         env: {
           ICU_DATA: "/internal/shared"
         },
         extraFiles: {
-          targetPath: "/internal/shared",
           files: {
             // The Intl extension looks for the hard-coded ICU data name.
-            "icudt74l.dat": new Uint8Array(ICUData)
+            "/internal/shared/icudt74l.dat": new Uint8Array(
+              ICUData
+            )
           }
         }
       });
@@ -1776,8 +1780,7 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           name: "redis",
           bytes: new Uint8Array(import_fs.default.readFileSync(extensionPath))
         },
-        phpVersion: version,
-        asyncMode
+        phpVersion: version
       });
     }
     case "memcached": {
@@ -1788,8 +1791,7 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           name: "memcached",
           bytes: new Uint8Array(import_fs.default.readFileSync(extensionPath))
         },
-        phpVersion: version,
-        asyncMode
+        phpVersion: version
       });
     }
     case "xdebug": {
@@ -1803,7 +1805,6 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           bytes: new Uint8Array(import_fs.default.readFileSync(filePath))
         },
         phpVersion: version,
-        asyncMode,
         loadWithIniDirective: "zend_extension",
         iniEntries: {
           "xdebug.mode": "debug,develop",
@@ -1850,15 +1851,12 @@ function resolveXdebugExtraFiles(version, xdebugOptions) {
   }
   const files = {};
   if (pathMappings) {
-    files["path.map"] = pathMappings.map((map) => `${map.vfsPath} = ${map.hostPath}`).join("\n");
+    files["/.xdebug/path.map"] = pathMappings.map((map) => `${map.vfsPath} = ${map.hostPath}`).join("\n");
   }
   if (pathSkippings) {
-    files["skip.map"] = pathSkippings.map((path3) => `${path3} = SKIP`).join("\n");
+    files["/.xdebug/skip.map"] = pathSkippings.map((path3) => `${path3} = SKIP`).join("\n");
   }
-  return {
-    targetPath: "/.xdebug",
-    files
-  };
+  return { files };
 }
 
 // packages/php-wasm/node/src/lib/load-runtime.ts

package/index.js

@@ -1712,11 +1712,15 @@ async function withPHPExtensions(version, asyncMode, options, extensions = []) {
 }
 async function resolveRuntimePHPExtension(version, asyncMode, extension) {
   if (typeof extension === "object" && "source" in extension) {
+    if (asyncMode === "asyncify") {
+      throw new Error(
+        "External PHP extensions require JSPI. Asyncify is only supported for PHP.wasm bundled extensions."
+      );
+    }
     return await resolvePHPExtension({
       ...extension,
       source: normalizeNodeExtensionSource(extension.source),
       phpVersion: version,
-      asyncMode,
       fetch: extension.fetch ?? fetchNodeExtensionResource
     });
   }
@@ -1737,15 +1741,15 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           bytes: soBytes
         },
         phpVersion: version,
-        asyncMode,
         env: {
           ICU_DATA: "/internal/shared"
         },
         extraFiles: {
-          targetPath: "/internal/shared",
           files: {
             // The Intl extension looks for the hard-coded ICU data name.
-            "icudt74l.dat": new Uint8Array(ICUData)
+            "/internal/shared/icudt74l.dat": new Uint8Array(
+              ICUData
+            )
           }
         }
       });
@@ -1758,8 +1762,7 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           name: "redis",
           bytes: new Uint8Array(fs.readFileSync(extensionPath))
         },
-        phpVersion: version,
-        asyncMode
+        phpVersion: version
       });
     }
     case "memcached": {
@@ -1770,8 +1773,7 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           name: "memcached",
           bytes: new Uint8Array(fs.readFileSync(extensionPath))
         },
-        phpVersion: version,
-        asyncMode
+        phpVersion: version
       });
     }
     case "xdebug": {
@@ -1785,7 +1787,6 @@ async function resolveRuntimePHPExtension(version, asyncMode, extension) {
           bytes: new Uint8Array(fs.readFileSync(filePath))
         },
         phpVersion: version,
-        asyncMode,
         loadWithIniDirective: "zend_extension",
         iniEntries: {
           "xdebug.mode": "debug,develop",
@@ -1832,15 +1833,12 @@ function resolveXdebugExtraFiles(version, xdebugOptions) {
   }
   const files = {};
   if (pathMappings) {
-    files["path.map"] = pathMappings.map((map) => `${map.vfsPath} = ${map.hostPath}`).join("\n");
+    files["/.xdebug/path.map"] = pathMappings.map((map) => `${map.vfsPath} = ${map.hostPath}`).join("\n");
   }
   if (pathSkippings) {
-    files["skip.map"] = pathSkippings.map((path3) => `${path3} = SKIP`).join("\n");
+    files["/.xdebug/skip.map"] = pathSkippings.map((path3) => `${path3} = SKIP`).join("\n");
   }
-  return {
-    targetPath: "/.xdebug",
-    files
-  };
+  return { files };
 }
 
 // packages/php-wasm/node/src/lib/load-runtime.ts

package/lib/extensions/load-extensions.d.ts

@@ -1,4 +1,5 @@
-import type { EmscriptenOptions, PHPExtensionInstallOptions, PHPWasmAsyncMode, SupportedPHPVersion } from '@php-wasm/universal';
+import type { EmscriptenOptions, ResolvedInstallOptions, SupportedPHPVersion } from '@php-wasm/universal';
+type PHPWasmAsyncMode = 'jspi' | 'asyncify';
 export interface PathMapping {
     hostPath: string;
     vfsPath: string;
@@ -15,10 +16,10 @@ export type BuiltInPHPExtensionName = 'intl' | 'xdebug' | 'redis' | 'memcached';
 /**
  * External PHP extension source that can be installed before PHP starts.
  *
- * The runtime supplies the active PHP version and async mode before resolving
- * the source, so callers only provide the artifact source and install options.
+ * External sources are supported in JSPI runtimes only. Asyncify support is
+ * limited to bundled extensions shipped with this package.
  */
-export type RuntimePHPExtensionSource = PHPExtensionInstallOptions;
+export type RuntimePHPExtensionSource = Omit<ResolvedInstallOptions, 'phpVersion'>;
 /**
  * Built-in PHP extension request accepted by `loadNodeRuntime()`.
  *
@@ -57,3 +58,4 @@ export type PHPExtension = BuiltInPHPExtension | RuntimePHPExtensionSource;
  * downloads do not block each other.
  */
 export declare function withPHPExtensions(version: SupportedPHPVersion, asyncMode: PHPWasmAsyncMode, options: EmscriptenOptions, extensions?: PHPExtension[]): Promise<EmscriptenOptions>;
+export {};

package/lib/load-runtime.d.ts

@@ -7,7 +7,7 @@ export interface PHPLoaderOptions {
      * PHP extensions to install before the runtime starts.
      *
      * Use built-in names such as `intl`, `xdebug`, `redis`, and `memcached`,
-     * or pass an external extension source such as a manifest.
+     * or pass an external JSPI extension source such as a manifest.
      */
     extensions?: PHPExtension[];
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "3.1.22",
+  "version": "3.1.26",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -39,6 +39,7 @@
   "license": "GPL-2.0-or-later",
   "types": "index.d.ts",
   "dependencies": {
+    "ajv": "8.12.0",
     "express": "4.22.0",
     "fast-xml-parser": "^5.5.1",
     "fs-ext-extra-prebuilt": "2.2.7",
@@ -47,21 +48,21 @@
     "wasm-feature-detect": "1.8.0",
     "ws": "8.18.0",
     "yargs": "17.7.2",
-    "@php-wasm/universal": "3.1.22",
-    "@php-wasm/node-8-5": "3.1.22",
-    "@php-wasm/node-8-4": "3.1.22",
-    "@php-wasm/node-8-3": "3.1.22",
-    "@php-wasm/node-8-2": "3.1.22",
-    "@php-wasm/node-8-1": "3.1.22",
-    "@php-wasm/node-8-0": "3.1.22",
-    "@php-wasm/node-7-4": "3.1.22",
-    "@php-wasm/cli-util": "3.1.22",
-    "@php-wasm/logger": "3.1.22",
-    "@php-wasm/node-5-2": "3.1.22",
-    "@php-wasm/util": "3.1.22",
-    "@wp-playground/common": "3.1.22"
+    "@php-wasm/universal": "3.1.26",
+    "@php-wasm/node-8-5": "3.1.26",
+    "@php-wasm/node-8-4": "3.1.26",
+    "@php-wasm/node-8-3": "3.1.26",
+    "@php-wasm/node-8-2": "3.1.26",
+    "@php-wasm/node-8-1": "3.1.26",
+    "@php-wasm/node-8-0": "3.1.26",
+    "@php-wasm/node-7-4": "3.1.26",
+    "@php-wasm/cli-util": "3.1.26",
+    "@php-wasm/logger": "3.1.26",
+    "@php-wasm/node-5-2": "3.1.26",
+    "@php-wasm/util": "3.1.26",
+    "@wp-playground/common": "3.1.26"
   },
-  "gitHead": "04c986b63dd56fe74e4ed0cf04d00cae7ac050bf",
+  "gitHead": "6acfccb8e79f4e664429e3f729f04dbf2ff55303",
   "engines": {
     "node": ">=20.10.0",
     "npm": ">=10.2.3"