Unify fetch inputs & add format script

Author: max-lt

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "endOfLine": "lf",
+  "arrowParens": "always",
+  "printWidth": 120
+}

bun.lock

@@ -1,6 +1,6 @@
 {
   "name": "@openworkers/workers-types",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "TypeScript types for the OpenWorkers runtime",
   "license": "MIT",
   "repository": {
@@ -18,12 +18,18 @@
     "index.d.ts",
     "types/*.d.ts"
   ],
+  "scripts": {
+    "format": "prettier --write ."
+  },
   "peerDependencies": {
     "typescript": "^5"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/",
     "provenance": true
+  },
+  "devDependencies": {
+    "prettier": "^3.8.1"
   }
 }

package.json

@@ -18,10 +18,10 @@ declare global {
   interface BindingAssets {
     /**
      * Fetches a static asset from the bundle.
-     * @param path The asset path (e.g., "/index.html").
-     * @param options Optional request options.
+     * @param input The asset path, URL, or request.
+     * @param init Optional request options.
      */
-    fetch(path: string, options?: RequestInit): Promise<Response>;
+    fetch(input: Request | string | URL, init?: RequestInit): Promise<Response>;
   }
 
   /**
@@ -124,13 +124,7 @@ declare global {
    * Supports strings, numbers, booleans, null, arrays, and objects.
    * Note: Binary data (Uint8Array, ArrayBuffer) is not supported.
    */
-  type JsonValue =
-    | string
-    | number
-    | boolean
-    | null
-    | JsonValue[]
-    | { [key: string]: JsonValue };
+  type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue };
 
   /**
    * Key-Value storage binding for fast, low-latency data access.
@@ -217,9 +211,9 @@ declare global {
   interface BindingWorker {
     /**
      * Calls another worker with a request.
-     * @param request The request to send.
-     * @param init Optional request options (when using string URL).
+     * @param input The request, URL, or string URL to send.
+     * @param init Optional request options.
      */
-    fetch(request: Request | string, init?: RequestInit): Promise<Response>;
+    fetch(input: Request | string | URL, init?: RequestInit): Promise<Response>;
   }
 }

types/bindings.d.ts

@@ -19,10 +19,7 @@ declare global {
      * @param blobParts Array of data to include in the blob.
      * @param options Optional settings like MIME type.
      */
-    constructor(
-      blobParts?: (ArrayBuffer | Uint8Array | Blob | string)[],
-      options?: { type?: string }
-    );
+    constructor(blobParts?: (ArrayBuffer | Uint8Array | Blob | string)[], options?: { type?: string });
 
     /** The size of the blob in bytes. */
     readonly size: number;
@@ -104,9 +101,7 @@ declare global {
     set(name: string, value: string | Blob, filename?: string): void;
 
     /** Executes a callback for each key/value pair. */
-    forEach(
-      callback: (value: string | File, key: string, parent: FormData) => void
-    ): void;
+    forEach(callback: (value: string | File, key: string, parent: FormData) => void): void;
 
     /** Returns an iterator of all key/value pairs. */
     entries(): IterableIterator<[string, string | File]>;

types/blob.d.ts

@@ -18,46 +18,31 @@ declare global {
      * const hash = await crypto.subtle.digest('SHA-256', new TextEncoder().encode('hello'));
      * ```
      */
-    digest(
-      algorithm: string | { name: string },
-      data: BufferSource
-    ): Promise<ArrayBuffer>;
+    digest(algorithm: string | { name: string }, data: BufferSource): Promise<ArrayBuffer>;
 
     /**
      * Encrypts data using a key.
      * @param algorithm The encryption algorithm and parameters.
      * @param key The encryption key.
      * @param data The data to encrypt.
      */
-    encrypt(
-      algorithm: unknown,
-      key: CryptoKey,
-      data: BufferSource
-    ): Promise<ArrayBuffer>;
+    encrypt(algorithm: unknown, key: CryptoKey, data: BufferSource): Promise<ArrayBuffer>;
 
     /**
      * Decrypts data using a key.
      * @param algorithm The encryption algorithm and parameters.
      * @param key The decryption key.
      * @param data The data to decrypt.
      */
-    decrypt(
-      algorithm: unknown,
-      key: CryptoKey,
-      data: BufferSource
-    ): Promise<ArrayBuffer>;
+    decrypt(algorithm: unknown, key: CryptoKey, data: BufferSource): Promise<ArrayBuffer>;
 
     /**
      * Signs data using a private key.
      * @param algorithm The signing algorithm and parameters.
      * @param key The private key.
      * @param data The data to sign.
      */
-    sign(
-      algorithm: unknown,
-      key: CryptoKey,
-      data: BufferSource
-    ): Promise<ArrayBuffer>;
+    sign(algorithm: unknown, key: CryptoKey, data: BufferSource): Promise<ArrayBuffer>;
 
     /**
      * Verifies a signature using a public key.
@@ -67,24 +52,15 @@ declare global {
      * @param data The original data.
      * @returns True if the signature is valid.
      */
-    verify(
-      algorithm: unknown,
-      key: CryptoKey,
-      signature: BufferSource,
-      data: BufferSource
-    ): Promise<boolean>;
+    verify(algorithm: unknown, key: CryptoKey, signature: BufferSource, data: BufferSource): Promise<boolean>;
 
     /**
      * Generates a new cryptographic key or key pair.
      * @param algorithm The algorithm and parameters.
      * @param extractable Whether the key can be exported.
      * @param keyUsages The allowed operations for this key.
      */
-    generateKey(
-      algorithm: unknown,
-      extractable: boolean,
-      keyUsages: string[]
-    ): Promise<CryptoKey | CryptoKeyPair>;
+    generateKey(algorithm: unknown, extractable: boolean, keyUsages: string[]): Promise<CryptoKey | CryptoKeyPair>;
 
     /**
      * Imports a key from external format.
@@ -107,22 +83,15 @@ declare global {
      * @param format The key format ("raw", "pkcs8", "spki", "jwk").
      * @param key The key to export.
      */
-    exportKey(
-      format: string,
-      key: CryptoKey
-    ): Promise<ArrayBuffer | JsonWebKey>;
+    exportKey(format: string, key: CryptoKey): Promise<ArrayBuffer | JsonWebKey>;
 
     /**
      * Derives bits from a base key.
      * @param algorithm The derivation algorithm and parameters.
      * @param baseKey The base key.
      * @param length The number of bits to derive.
      */
-    deriveBits(
-      algorithm: unknown,
-      baseKey: CryptoKey,
-      length: number
-    ): Promise<ArrayBuffer>;
+    deriveBits(algorithm: unknown, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
 
     /**
      * Derives a new key from a base key.

types/crypto.d.ts

@@ -36,10 +36,7 @@ declare global {
      * @param destination The buffer to write into.
      * @returns An object with `read` (chars read) and `written` (bytes written).
      */
-    encodeInto(
-      source: string,
-      destination: Uint8Array
-    ): { read: number; written: number };
+    encodeInto(source: string, destination: Uint8Array): { read: number; written: number };
   }
 
   /**

types/encoding.d.ts

@@ -5,14 +5,7 @@ export {};
 /**
  * Valid types for a request or response body.
  */
-type BodyInit =
-  | ReadableStream
-  | Blob
-  | ArrayBuffer
-  | Uint8Array
-  | FormData
-  | URLSearchParams
-  | string;
+type BodyInit = ReadableStream | Blob | ArrayBuffer | Uint8Array | FormData | URLSearchParams | string;
 
 /**
  * Valid types for initializing Headers.
@@ -82,7 +75,7 @@ declare global {
     body?: BodyInit | null;
 
     /** How to handle redirects: "follow", "error", or "manual". */
-    redirect?: "follow" | "error" | "manual";
+    redirect?: 'follow' | 'error' | 'manual';
 
     /** An AbortSignal to cancel the request. */
     signal?: AbortSignal;
@@ -246,8 +239,5 @@ declare global {
    * const data = await response.json();
    * ```
    */
-  function fetch(
-    input: Request | string | URL,
-    init?: RequestInit
-  ): Promise<Response>;
+  function fetch(input: Request | string | URL, init?: RequestInit): Promise<Response>;
 }

types/fetch.d.ts

@@ -53,10 +53,7 @@ declare global {
      * Pipes this stream through a transform stream, returning the readable side.
      * @param transform An object with `writable` and `readable` properties.
      */
-    pipeThrough<T>(transform: {
-      writable: WritableStream<R>;
-      readable: ReadableStream<T>;
-    }): ReadableStream<T>;
+    pipeThrough<T>(transform: { writable: WritableStream<R>; readable: ReadableStream<T> }): ReadableStream<T>;
 
     /** Pipes this stream to a writable stream. */
     pipeTo(dest: WritableStream<R>): Promise<void>;

types/streams.d.ts

@@ -17,11 +17,7 @@ declare global {
    * clearTimeout(id); // Cancel before it runs
    * ```
    */
-  function setTimeout(
-    callback: (...args: unknown[]) => void,
-    ms?: number,
-    ...args: unknown[]
-  ): number;
+  function setTimeout(callback: (...args: unknown[]) => void, ms?: number, ...args: unknown[]): number;
 
   /**
    * Cancels a timeout previously scheduled with setTimeout().
@@ -46,11 +42,7 @@ declare global {
    * }, 1000);
    * ```
    */
-  function setInterval(
-    callback: (...args: unknown[]) => void,
-    ms?: number,
-    ...args: unknown[]
-  ): number;
+  function setInterval(callback: (...args: unknown[]) => void, ms?: number, ...args: unknown[]): number;
 
   /**
    * Cancels an interval previously scheduled with setInterval().