migrate napi cli to v3 (#33)

Author: Brooooooklyn

crates/php/Cargo.toml

@@ -17,7 +17,7 @@ hostname = "0.4.1"
 lang_handler = { path = "../lang_handler", features = ["c"] }
 libc = "0.2.171"
 once_cell = "1.21.0"
-ext-php-rs = { git = "ssh://git@github.com/platformatic/ext-php-rs.git" }
+ext-php-rs = { git = "https://github.com/platformatic/ext-php-rs.git" }
 # ext-php-rs = { path = "../../../ext-php-rs" }
 
 [build-dependencies]

crates/php_node/Cargo.toml

@@ -9,9 +9,9 @@ path = "src/lib.rs"
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "3.0.0-beta.3", default-features = false, features = ["napi4"] }
-napi-derive = "3.0.0-beta.3"
+napi = { version = "3.0.0-beta.7", default-features = false, features = ["napi4"] }
+napi-derive = "3.0.0-beta.6"
 php = { path = "../php" }
 
 [build-dependencies]
-napi-build = "2.0.1"
+napi-build = "2.2.1"

index.d.ts

@@ -1,63 +1,5 @@
-/* tslint:disable */
-/* eslint-disable */
-
 /* auto-generated by NAPI-RS */
-
-export interface PhpRequestSocketOptions {
-  /** The string representation of the local IP address the remote client is connecting on. */
-  localAddress: string
-  /** The numeric representation of the local port. For example, 80 or 21. */
-  localPort: number
-  /** The string representation of the remote IP address. */
-  remoteAddress: string
-  /** The numeric representation of the remote port. For example, 80 or 21. */
-  remotePort: number
-}
-/** Options for creating a new PHP request. */
-export interface PhpRequestOptions {
-  /** The HTTP method for the request. */
-  method?: string
-  /** The URL for the request. */
-  url: string
-  /**
-   * The headers for the request.
-   * TODO: Figure out how to accept a Headers instance
-   * TODO: Figure out how to support both single values without array wrap
-   */
-  headers?: Record<string, Array<string>>
-  /** The body for the request. */
-  body?: Uint8Array
-  /** The socket information for the request. */
-  socket?: PhpRequestSocketOptions
-}
-/** Options for creating a new PHP response. */
-export interface PhpResponseOptions {
-  /** The HTTP status code for the response. */
-  status?: number
-  /**
-   * The headers for the response.
-   * TODO: Figure out how to accept a Headers instance
-   * TODO: Figure out how to support both single values without array wrap
-   */
-  headers?: Record<string, Array<string>>
-  /** The body for the response. */
-  body?: Uint8Array
-  /** The log for the response. */
-  log?: Uint8Array
-  /** The exception for the response. */
-  exception?: string
-}
-/** Options for creating a new PHP instance. */
-export interface PhpOptions {
-  /** The command-line arguments for the PHP instance. */
-  argv?: Array<string>
-  /** The document root for the PHP instance. */
-  docroot?: string
-  /** Throw request errors */
-  throwRequestErrors?: boolean
-}
-undefinedundefined
-export type PhpHeaders = Headers
+/* eslint-disable */
 /**
  * A multi-map of HTTP headers.
  *
@@ -273,7 +215,86 @@ export declare class Headers {
    */
   forEach(this: this, callback: (arg0: string, arg1: string, arg2: this) => void): void
 }
-export type PhpRequest = Request
+export type PhpHeaders = Headers
+
+/**
+ * A PHP instance.
+ *
+ * # Examples
+ *
+ * ```js
+ * const php = new Php({
+ *  code: 'echo "Hello, world!";'
+ * });
+ *
+ * const response = php.handleRequest(new Request({
+ *   method: 'GET',
+ *   url: 'http://example.com'
+ * }));
+ *
+ * console.log(response.status);
+ * console.log(response.body);
+ * ```
+ */
+export declare class Php {
+  /**
+   * Create a new PHP instance.
+   *
+   * # Examples
+   *
+   * ```js
+   * const php = new Php({
+   *   docroot: process.cwd(),
+   *   argv: process.argv
+   * });
+   * ```
+   */
+  constructor(options?: PhpOptions | undefined | null)
+  /**
+   * Handle a PHP request.
+   *
+   * # Examples
+   *
+   * ```js
+   * const php = new Php({
+   *   docroot: process.cwd(),
+   *   argv: process.argv
+   * });
+   *
+   * const response = php.handleRequest(new Request({
+   *   method: 'GET',
+   *   url: 'http://example.com'
+   * }));
+   *
+   * console.log(response.status);
+   * console.log(response.body);
+   * ```
+   */
+  handleRequest(request: Request, signal?: AbortSignal | undefined | null): Promise<unknown>
+  /**
+   * Handle a PHP request synchronously.
+   *
+   * # Examples
+   *
+   * ```js
+   * const php = new Php({
+   *   docroot: process.cwd(),
+   *   argv: process.argv
+   * });
+   *
+   * const response = php.handleRequestSync(new Request({
+   *   method: 'GET',
+   *   url: 'http://example.com'
+   * }));
+   *
+   * console.log(response.status);
+   * console.log(response.body);
+   * ```
+   */
+  handleRequestSync(request: Request): Response
+}
+export type PhpRuntime = Php
+
 /**
  * A PHP request.
  *
@@ -369,7 +390,8 @@ export declare class Request {
    */
   get body(): Buffer
 }
-export type PhpResponse = Response
+export type PhpRequest = Request
+
 /** A PHP response. */
 export declare class Response {
   /**
@@ -463,80 +485,61 @@ export declare class Response {
    */
   get exception(): string | null
 }
-export type PhpRuntime = Php
-/**
- * A PHP instance.
- *
- * # Examples
- *
- * ```js
- * const php = new Php({
- *  code: 'echo "Hello, world!";'
- * });
- *
- * const response = php.handleRequest(new Request({
- *   method: 'GET',
- *   url: 'http://example.com'
- * }));
- *
- * console.log(response.status);
- * console.log(response.body);
- * ```
- */
-export declare class Php {
-  /**
-   * Create a new PHP instance.
-   *
-   * # Examples
-   *
-   * ```js
-   * const php = new Php({
-   *   docroot: process.cwd(),
-   *   argv: process.argv
-   * });
-   * ```
-   */
-  constructor(options?: PhpOptions | undefined | null)
+export type PhpResponse = Response
+
+/** Options for creating a new PHP instance. */
+export interface PhpOptions {
+  /** The command-line arguments for the PHP instance. */
+  argv?: Array<string>
+  /** The document root for the PHP instance. */
+  docroot?: string
+  /** Throw request errors */
+  throwRequestErrors?: boolean
+}
+
+/** Options for creating a new PHP request. */
+export interface PhpRequestOptions {
+  /** The HTTP method for the request. */
+  method?: string
+  /** The URL for the request. */
+  url: string
   /**
-   * Handle a PHP request.
-   *
-   * # Examples
-   *
-   * ```js
-   * const php = new Php({
-   *   docroot: process.cwd(),
-   *   argv: process.argv
-   * });
-   *
-   * const response = php.handleRequest(new Request({
-   *   method: 'GET',
-   *   url: 'http://example.com'
-   * }));
-   *
-   * console.log(response.status);
-   * console.log(response.body);
-   * ```
+   * The headers for the request.
+   * TODO: Figure out how to accept a Headers instance
+   * TODO: Figure out how to support both single values without array wrap
    */
-  handleRequest(request: Request, signal?: AbortSignal | undefined | null): Promise<unknown>
+  headers?: Record<string, Array<string>>
+  /** The body for the request. */
+  body?: Uint8Array
+  /** The socket information for the request. */
+  socket?: PhpRequestSocketOptions
+}
+
+export interface PhpRequestSocketOptions {
+  /** The string representation of the local IP address the remote client is connecting on. */
+  localAddress: string
+  /** The numeric representation of the local port. For example, 80 or 21. */
+  localPort: number
+  /** The string representation of the remote IP address. */
+  remoteAddress: string
+  /** The numeric representation of the remote port. For example, 80 or 21. */
+  remotePort: number
+}
+
+/** Options for creating a new PHP response. */
+export interface PhpResponseOptions {
+  /** The HTTP status code for the response. */
+  status?: number
   /**
-   * Handle a PHP request synchronously.
-   *
-   * # Examples
-   *
-   * ```js
-   * const php = new Php({
-   *   docroot: process.cwd(),
-   *   argv: process.argv
-   * });
-   *
-   * const response = php.handleRequestSync(new Request({
-   *   method: 'GET',
-   *   url: 'http://example.com'
-   * }));
-   *
-   * console.log(response.status);
-   * console.log(response.body);
-   * ```
+   * The headers for the response.
+   * TODO: Figure out how to accept a Headers instance
+   * TODO: Figure out how to support both single values without array wrap
    */
-  handleRequestSync(request: Request): Response
+  headers?: Record<string, Array<string>>
+  /** The body for the response. */
+  body?: Uint8Array
+  /** The log for the response. */
+  log?: Uint8Array
+  /** The exception for the response. */
+  exception?: string
 }

package.json

@@ -4,19 +4,17 @@
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
-    "name": "php",
-    "triples": {
-      "additional": [
-        "aarch64-apple-darwin",
-        "x86_64-apple-darwin",
-        "x86_64-unknown-linux-gnu",
-        "universal-apple-darwin"
-      ]
-    }
+    "binaryName": "php",
+    "targets": [
+      "aarch64-apple-darwin",
+      "x86_64-apple-darwin",
+      "x86_64-unknown-linux-gnu",
+      "universal-apple-darwin"
+    ]
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.4",
+    "@napi-rs/cli": "^3.0.0-alpha.86",
     "@oxc-node/core": "^0.0.23",
     "ava": "^6.0.1",
     "oxlint": "^0.16.0"
@@ -28,8 +26,8 @@
     "node": ">= 10"
   },
   "scripts": {
-    "build": "napi build --cargo-name php_node --platform --js false --release",
-    "build:debug": "napi build --cargo-name php_node --platform --js false",
+    "build": "napi build --manifest-path ./crates/php_node/Cargo.toml --platform --js false --release",
+    "build:debug": "napi build --manifest-path ./crates/php_node/Cargo.toml --platform --js false",
     "lint": "oxlint",
     "test": "ava __test__/**.spec.mjs",
     "universal": "napi universal",