ts-procedures 5.14.0 → 5.16.0

package/agent_config/claude-code/skills/ts-procedures/SKILL.md

@@ -151,7 +151,7 @@ The npm package ships user-facing documentation with narrative explanations and
 | `docs/core.md` | Procedures factory, Create, CreateStream, schema.input, error handling |
 | `docs/streaming.md` | Streaming procedures, AbortSignal, SSE patterns |
 | `docs/http-integrations.md` | Express RPC, Hono RPC/Stream/API builders, DocRegistry |
-| `docs/client-and-codegen.md` | Client code generation, createClient, CLI options |
+| `docs/client-and-codegen.md` | Client code generation, createClient, per-call options (timeout/signal/headers/basePath/meta), client-level defaults, typed RequestMeta augmentation, CLI options |
 
 ## Workflow
 

package/agent_config/claude-code/skills/ts-procedures/api-reference.md

@@ -732,6 +732,7 @@ function createClient<TScopes>(config: {
   basePath: string
   scopes: (client: ClientInstance) => TScopes
   hooks?: ClientHooks
+  defaults?: ProcedureCallDefaults
 }): TScopes
 ```
 
@@ -740,7 +741,8 @@ function createClient<TScopes>(config: {
 - `config.adapter` — Transport adapter implementing `ClientAdapter`. Use `createFetchAdapter()` for fetch-based transport.
 - `config.basePath` — Base URL prepended to all request paths (e.g., `'http://localhost:3000'`).
 - `config.scopes` — Factory function that receives a raw `ClientInstance` and returns the typed scope object. The generated `create${ServiceName}Bindings` export (defaults to `createApiBindings`; pass `--service-name <Name>` to rename).
-- `config.hooks` — Optional global hooks applied to every call. Can be overridden per call.
+- `config.hooks` — Optional global hooks applied to every call. Per-call hooks (passed via the options bag) run *after* global hooks — they stack, not replace.
+- `config.defaults` — Optional default request options (timeout, signal, headers, basePath) applied to every call. Overridden by per-call options.
 
 ### Return Value
 
@@ -750,11 +752,51 @@ Returns the result of `config.scopes(clientInstance)` — a typed object where e
 
 ```typescript
 interface ClientHooks {
-  onBeforeRequest?: (ctx: { request: ClientRequest }) => { request: ClientRequest } | void
-  onAfterResponse?: (ctx: { request: ClientRequest; response: ClientResponse }) => void
+  onBeforeRequest?: (ctx: BeforeRequestContext) => BeforeRequestContext | Promise<BeforeRequestContext>
+  onAfterResponse?: (ctx: AfterResponseContext) => void | Promise<void>
+  onError?: (ctx: ErrorContext) => void | Promise<void>
 }
 ```
 
+### ProcedureCallDefaults / ProcedureCallOptions
+
+`ProcedureCallDefaults` is the shape used at `config.defaults` and is a strict subset of `ProcedureCallOptions` (per-call options). `ProcedureCallOptions` additionally includes the `ClientHooks` fields so a single options bag covers both request config and hooks.
+
+```typescript
+interface ProcedureCallDefaults {
+  signal?: AbortSignal         // cancel signal (combined with per-call via AbortSignal.any)
+  timeout?: number              // ms — per-call timeout:0 disables an inherited default
+  headers?: Record<string, string>  // merged (per-call keys win)
+  basePath?: string             // per-call > default > config.basePath
+  meta?: RequestMeta            // typed per-request metadata (see RequestMeta below)
+}
+
+interface ProcedureCallOptions extends ProcedureCallDefaults, ClientHooks {}
+```
+
+### RequestMeta (typed per-request metadata)
+
+`RequestMeta` is an empty interface designed for TypeScript declaration merging. Augment it in your project to type the `meta` field end-to-end (per-call options, hook contexts, and the adapter).
+
+```typescript
+// Self-contained (code-generated) client
+declare module './generated/_types' {
+  interface RequestMeta {
+    traceId: string
+    priority?: 'high' | 'low'
+  }
+}
+
+// Or when using ts-procedures/client directly
+declare module 'ts-procedures/client' {
+  interface RequestMeta {
+    traceId: string
+  }
+}
+```
+
+After augmentation, `request.meta` is typed in adapters, hooks, defaults, and per-call options. If `RequestMeta` declares required fields, supply them via `defaults.meta` or per-call `options.meta` — the merged shape must satisfy them at runtime.
+
 ### Example
 
 ```typescript
@@ -765,6 +807,7 @@ const client = createClient({
   adapter: createFetchAdapter(),
   basePath: 'http://localhost:3000',
   scopes: createApiBindings,
+  defaults: { timeout: 30_000, headers: { 'X-Client-Version': '1.0.0' } },
   hooks: {
     onBeforeRequest(ctx) {
       ctx.request.headers = { ...ctx.request.headers, Authorization: `Bearer ${getToken()}` }
@@ -773,7 +816,17 @@ const client = createClient({
   },
 })
 
-const user = await client.users.GetUser({ pathParams: { id: '123' } })
+// Per-call timeout + signal + hooks — all in one options bag
+const controller = new AbortController()
+const user = await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  {
+    timeout: 5000,
+    signal: controller.signal,
+    headers: { 'X-Request-Id': crypto.randomUUID() },
+    onAfterResponse(ctx) { log(ctx) },
+  },
+)
 
 // Reach types via the namespace: Api.Users.GetUser.Params, Api.Errors.ProcedureError
 ```
@@ -832,6 +885,7 @@ async function generateClient(options: {
   namespaceTypes?: boolean
   selfContained?: boolean
   serviceName?: string
+  cleanOutDir?: boolean
 }): Promise<GeneratedFile[]>
 ```
 
@@ -858,6 +912,7 @@ async function generateClient(options: {
 | `--array-item-naming <value>` | Postfix for array item type names (ignored with `--no-namespace-types`) |
 | `--uncountable-words <list>` | Comma-separated words to skip singularization (ignored with `--no-namespace-types`) |
 | `--service-name <name>` | Names the service namespace and binding factory (e.g., `Auth` → `export namespace Auth { ... }` + `createAuthBindings`). Also prefixes `${Name}Errors` and `${Name}ProcedureErrorUnion` in `_errors.ts`. **Default: `Api`.** |
+| `--clean-out-dir` / `--no-clean-out-dir` | Recursively remove `--out <dir>` before writing so stale scope files (e.g. from removed scopes) are pruned. Skipped under `--dry-run`. **Default: off.** |
 
 ### Generated Output
 

package/agent_config/claude-code/skills/ts-procedures/patterns.md

@@ -782,6 +782,7 @@ app.get('/docs', (c) => c.json(docs.toJSON()))
 // npx ts-procedures-codegen --url http://localhost:3000/docs --out ./src/generated/api
 // Defaults: --self-contained --namespace-types --jsdoc
 // Optional: --service-name Auth --depluralize --enum-style union
+//           --clean-out-dir   // wipe --out before writing (prunes stale scope files)
 // Opt-out:  --no-self-contained --no-namespace-types --no-jsdoc
 ```
 
@@ -840,10 +841,11 @@ const result = await stream.result // Typed as WatchNotificationsReturn
 
 ---
 
-## Per-Procedure Hook Override
+## Per-Procedure Hooks
+
+Per-call hooks run *after* global hooks (they don't replace them). They live in the same options bag as `timeout`, `signal`, `headers`, etc.
 
 ```typescript
-// Override hooks for a specific call
 await client.users.GetUser({ pathParams: { id: '123' } }, {
   onAfterResponse(ctx) {
     const rateLimit = ctx.response.headers['x-rate-limit-remaining']
@@ -854,6 +856,102 @@ await client.users.GetUser({ pathParams: { id: '123' } }, {
 
 ---
 
+## Per-Call Request Options (timeout, signal, headers, basePath)
+
+Every generated callable takes an optional second argument for per-call config. The options bag covers both request-level config and hooks.
+
+```typescript
+// Timeout — aborts the request after 5 seconds
+const user = await client.users.GetUser({ pathParams: { id: '123' } }, { timeout: 5000 })
+
+// Cancellation — supply your own AbortSignal
+const controller = new AbortController()
+const user = await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  { signal: controller.signal },
+)
+
+// Extra per-call headers
+await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  { headers: { 'X-Request-Id': crypto.randomUUID() } },
+)
+
+// Override base path for a single call (multi-region, dev/prod switching)
+await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  { basePath: 'https://api-eu.example.com' },
+)
+```
+
+---
+
+## Client-Level Defaults
+
+Set defaults via `config.defaults` — applied to every call, overridden by per-call options. Headers merge (per-call keys win); `signal` combines via `AbortSignal.any` (whichever aborts first wins); per-call `timeout: 0` disables an inherited default timeout.
+
+```typescript
+const client = createClient({
+  adapter: createFetchAdapter(),
+  basePath: 'http://localhost:3000',
+  scopes: createApiBindings,
+  defaults: {
+    timeout: 30_000,
+    headers: { 'X-Client-Version': '1.0.0' },
+  },
+})
+```
+
+---
+
+## Typed Per-Request Meta (RequestMeta Augmentation)
+
+`AdapterRequest.meta` is typed via the `RequestMeta` interface — declared empty so developers augment it via TypeScript declaration merging. Augmented fields are then typed end-to-end: per-call options, hook contexts, and adapter.
+
+```typescript
+// Self-contained (code-generated) client
+declare module './generated/_types' {
+  interface RequestMeta {
+    traceId: string
+    priority?: 'high' | 'low'
+  }
+}
+
+// Or, when using ts-procedures/client directly
+declare module 'ts-procedures/client' {
+  interface RequestMeta {
+    traceId: string
+  }
+}
+
+// After augmentation, meta is typed everywhere:
+await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  { meta: { traceId: 'req-abc', priority: 'high' } },  // typed
+)
+
+// Typed in hooks
+hooks: {
+  onBeforeRequest(ctx) {
+    const trace = ctx.request.meta?.traceId   // string | undefined
+    return ctx
+  },
+}
+
+// Typed in adapters
+const adapter: ClientAdapter = {
+  async request(req) {
+    const priority = req.meta?.priority       // 'high' | 'low' | undefined
+    return { status: 200, headers: {}, body: {} }
+  },
+  async stream(req) { /* ... */ },
+}
+```
+
+If `RequestMeta` declares required fields, supply them in `defaults.meta` or per-call `options.meta` — the merged shape must contain them at runtime.
+
+---
+
 ## Custom Client Adapter (Axios)
 
 ```typescript
@@ -861,7 +959,9 @@ import type { ClientAdapter } from 'ts-procedures/client'
 import axios from 'axios'
 
 const axiosAdapter: ClientAdapter = {
-  async request({ url, method, headers, body, signal }) {
+  async request({ url, method, headers, body, signal, meta }) {
+    // meta is typed via RequestMeta augmentation — use it for tracing,
+    // priority routing, custom auth, etc.
     const res = await axios({ url, method, headers, data: body, signal })
     return {
       status: res.status,

package/agent_config/claude-code/skills/ts-procedures-scaffold/templates/client.md

@@ -7,12 +7,28 @@ import { createClient, createFetchAdapter } from 'ts-procedures/client'
 import { createApiBindings, Api } from './generated/api'
 // With --service-name {{Name}}: import { create{{Name}}Bindings, {{Name}} } from './generated/api'
 
+// --- Optional: type per-request meta end-to-end via declaration merging ---
+// Self-contained clients augment './generated/_types' instead:
+//   declare module './generated/_types' { interface RequestMeta { traceId: string } }
+declare module 'ts-procedures/client' {
+  interface RequestMeta {
+    // TODO: add your fields — typed in options.meta, ctx.request.meta, adapter req.meta
+    // traceId?: string
+    // priority?: 'high' | 'low'
+  }
+}
+
 // Create the typed client
 export const {{name}}Client = createClient({
   adapter: createFetchAdapter(),
   basePath: 'http://localhost:3000', // TODO: configure base URL
   scopes: createApiBindings,
   // With --service-name {{Name}}: scopes: create{{Name}}Bindings,
+  defaults: {
+    // TODO: set client-wide defaults (overridden by per-call options)
+    // timeout: 30_000,
+    // headers: { 'X-Client-Version': '1.0.0' },
+  },
   hooks: {
     onBeforeRequest(ctx) {
       // TODO: add auth headers, request IDs, etc.
@@ -42,12 +58,24 @@ export const {{name}}Client = createClient({
 // }
 // const result = await stream.result // Typed from server returnType schema
 
-// --- Per-procedure hook override ---
-// const user = await {{name}}Client.users.GetUser({ id: '123' }, {
-//   onAfterResponse(ctx) {
-//     console.log('Rate limit:', ctx.response.headers['x-rate-limit-remaining'])
+// --- Per-call options (timeout, signal, headers, basePath, meta, hooks) ---
+// const user = await {{name}}Client.users.GetUser(
+//   { id: '123' },
+//   {
+//     timeout: 5000,
+//     headers: { 'X-Request-Id': crypto.randomUUID() },
+//     // meta is typed via RequestMeta augmentation above:
+//     // meta: { traceId: 'req-abc' },
+//     onAfterResponse(ctx) {
+//       console.log('Rate limit:', ctx.response.headers['x-rate-limit-remaining'])
+//     },
 //   },
-// })
+// )
+
+// --- Cancellation with AbortController ---
+// const controller = new AbortController()
+// const promise = {{name}}Client.users.GetUser({ id: '123' }, { signal: controller.signal })
+// setTimeout(() => controller.abort(), 3000)
 ```
 
 ## Test — `{{Name}}.client.test.ts`
@@ -112,4 +140,7 @@ npx ts-procedures-codegen --url http://localhost:3000/docs --out ./src/generated
 
 # Watch mode for development
 npx ts-procedures-codegen --url http://localhost:3000/docs --out ./src/generated/api --watch
+
+# Wipe the output directory before writing (prunes stale scope files left over from removed scopes)
+npx ts-procedures-codegen --url http://localhost:3000/docs --out ./src/generated/api --clean-out-dir
 ```

package/agent_config/copilot/copilot-instructions.md

@@ -317,6 +317,7 @@ npx ts-procedures-codegen --url http://localhost:3000/docs --out ./src/generated
 #                  --array-item-naming Item --uncountable-words criteria,alumni
 #                  --dry-run --watch --client-import-path @my-app/client
 #                  --config ./codegen.config.json --service-name Auth
+#                  --clean-out-dir   # recursively wipe --out before writing (prunes stale scope files)
 ```
 
 Generates one `.ts` file per scope plus a root `index.ts` that imports each scope as a namespace and exports a `create${ServiceName}Bindings` factory (defaults to `createApiBindings`; pass `--service-name <Name>` to rename). When namespace mode is on (the default), `index.ts` also wraps every scope namespace in an outer `export namespace ${ServiceName} { ... }` block so types are reachable as `Api.Users.GetUser.Params`, `Api.Errors.ProcedureError`, etc. The errors file (`_errors.ts`) emits `${ServiceName}Errors` and `${ServiceName}ProcedureErrorUnion` (defaults: `ApiErrors`, `ApiProcedureErrorUnion`).
@@ -335,6 +336,7 @@ const client = createClient({
   adapter: createFetchAdapter(),
   basePath: 'http://localhost:3000',
   scopes: createApiBindings,
+  defaults: { timeout: 30_000, headers: { 'X-Client-Version': '1.0.0' } },
   hooks: {
     onBeforeRequest(ctx) {
       ctx.request.headers = { ...ctx.request.headers, Authorization: `Bearer ${getToken()}` }
@@ -349,20 +351,67 @@ const client = createClient({
 // Fully typed — params and response inferred from server schemas; type aliases live under Api.<Scope>.<Route>.
 const user = await client.users.GetUser({ pathParams: { id: '123' } })
 
-// Per-call hook override
-await client.users.GetUser({ pathParams: { id: '123' } }, {
-  onAfterResponse(ctx) {
-    console.log(ctx.response.headers['x-rate-limit-remaining'])
+// Per-call options — timeout, signal, headers, basePath, and hooks all share one bag
+await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  {
+    timeout: 5000,
+    headers: { 'X-Request-Id': crypto.randomUUID() },
+    onAfterResponse(ctx) {
+      console.log(ctx.response.headers['x-rate-limit-remaining'])
+    },
   },
-})
+)
+```
+
+### Per-Call Options & Defaults
+
+```typescript
+interface ProcedureCallDefaults {
+  signal?: AbortSignal      // cancellation (combined with per-call via AbortSignal.any)
+  timeout?: number          // ms — per-call timeout:0 disables inherited default
+  headers?: Record<string, string>  // merged, per-call keys win
+  basePath?: string         // per-call > default > config.basePath
+  meta?: RequestMeta        // typed per-request metadata (declaration-mergeable)
+}
+
+interface ProcedureCallOptions extends ProcedureCallDefaults, ClientHooks {}
+```
+
+- Defaults are set via `config.defaults`; per-call options are passed as the 2nd argument to any generated callable.
+- Header precedence (low → high): adapter config < `defaults.headers` < per-call `headers` < route-declared `schema.input.headers` < `onBeforeRequest` mutations.
+
+### Typed RequestMeta (Declaration Merging)
+
+Augment `RequestMeta` to type `meta` end-to-end (options, hooks, adapter):
+
+```typescript
+// For code-generated self-contained clients
+declare module './generated/_types' {
+  interface RequestMeta {
+    traceId: string
+    priority?: 'high' | 'low'
+  }
+}
+
+// Or for direct ts-procedures/client usage
+declare module 'ts-procedures/client' {
+  interface RequestMeta { traceId: string }
+}
+
+await client.users.GetUser(
+  { pathParams: { id: '1' } },
+  { meta: { traceId: 'req-abc', priority: 'high' } },  // fully typed
+)
 ```
 
 ### Hook Types
 
 ```typescript
 interface ClientHooks {
-  onBeforeRequest?: (ctx: { request: ClientRequest }) => { request: ClientRequest } | void
-  onAfterResponse?: (ctx: { request: ClientRequest; response: ClientResponse }) => void
+  onBeforeRequest?: (ctx: BeforeRequestContext) => BeforeRequestContext | Promise<BeforeRequestContext>
+  onAfterResponse?: (ctx: AfterResponseContext) => void | Promise<void>
+  onError?: (ctx: ErrorContext) => void | Promise<void>
 }
 ```
 

package/agent_config/cursor/cursorrules

@@ -317,6 +317,7 @@ npx ts-procedures-codegen --url http://localhost:3000/docs --out ./src/generated
 #                  --array-item-naming Item --uncountable-words criteria,alumni
 #                  --dry-run --watch --client-import-path @my-app/client
 #                  --config ./codegen.config.json --service-name Auth
+#                  --clean-out-dir   # recursively wipe --out before writing (prunes stale scope files)
 ```
 
 Generates one `.ts` file per scope plus a root `index.ts` that imports each scope as a namespace and exports a `create${ServiceName}Bindings` factory (defaults to `createApiBindings`; pass `--service-name <Name>` to rename). When namespace mode is on (the default), `index.ts` also wraps every scope namespace in an outer `export namespace ${ServiceName} { ... }` block so types are reachable as `Api.Users.GetUser.Params`, `Api.Errors.ProcedureError`, etc. The errors file (`_errors.ts`) emits `${ServiceName}Errors` and `${ServiceName}ProcedureErrorUnion` (defaults: `ApiErrors`, `ApiProcedureErrorUnion`).
@@ -335,6 +336,7 @@ const client = createClient({
   adapter: createFetchAdapter(),
   basePath: 'http://localhost:3000',
   scopes: createApiBindings,
+  defaults: { timeout: 30_000, headers: { 'X-Client-Version': '1.0.0' } },
   hooks: {
     onBeforeRequest(ctx) {
       ctx.request.headers = { ...ctx.request.headers, Authorization: `Bearer ${getToken()}` }
@@ -349,20 +351,67 @@ const client = createClient({
 // Fully typed — params and response inferred from server schemas; type aliases live under Api.<Scope>.<Route>.
 const user = await client.users.GetUser({ pathParams: { id: '123' } })
 
-// Per-call hook override
-await client.users.GetUser({ pathParams: { id: '123' } }, {
-  onAfterResponse(ctx) {
-    console.log(ctx.response.headers['x-rate-limit-remaining'])
+// Per-call options — timeout, signal, headers, basePath, and hooks all share one bag
+await client.users.GetUser(
+  { pathParams: { id: '123' } },
+  {
+    timeout: 5000,
+    headers: { 'X-Request-Id': crypto.randomUUID() },
+    onAfterResponse(ctx) {
+      console.log(ctx.response.headers['x-rate-limit-remaining'])
+    },
   },
-})
+)
+```
+
+### Per-Call Options & Defaults
+
+```typescript
+interface ProcedureCallDefaults {
+  signal?: AbortSignal      // cancellation (combined with per-call via AbortSignal.any)
+  timeout?: number          // ms — per-call timeout:0 disables inherited default
+  headers?: Record<string, string>  // merged, per-call keys win
+  basePath?: string         // per-call > default > config.basePath
+  meta?: RequestMeta        // typed per-request metadata (declaration-mergeable)
+}
+
+interface ProcedureCallOptions extends ProcedureCallDefaults, ClientHooks {}
+```
+
+- Defaults are set via `config.defaults`; per-call options are passed as the 2nd argument to any generated callable.
+- Header precedence (low → high): adapter config < `defaults.headers` < per-call `headers` < route-declared `schema.input.headers` < `onBeforeRequest` mutations.
+
+### Typed RequestMeta (Declaration Merging)
+
+Augment `RequestMeta` to type `meta` end-to-end (options, hooks, adapter):
+
+```typescript
+// For code-generated self-contained clients
+declare module './generated/_types' {
+  interface RequestMeta {
+    traceId: string
+    priority?: 'high' | 'low'
+  }
+}
+
+// Or for direct ts-procedures/client usage
+declare module 'ts-procedures/client' {
+  interface RequestMeta { traceId: string }
+}
+
+await client.users.GetUser(
+  { pathParams: { id: '1' } },
+  { meta: { traceId: 'req-abc', priority: 'high' } },  // fully typed
+)
 ```
 
 ### Hook Types
 
 ```typescript
 interface ClientHooks {
-  onBeforeRequest?: (ctx: { request: ClientRequest }) => { request: ClientRequest } | void
-  onAfterResponse?: (ctx: { request: ClientRequest; response: ClientResponse }) => void
+  onBeforeRequest?: (ctx: BeforeRequestContext) => BeforeRequestContext | Promise<BeforeRequestContext>
+  onAfterResponse?: (ctx: AfterResponseContext) => void | Promise<void>
+  onError?: (ctx: ErrorContext) => void | Promise<void>
 }
 ```
 

package/build/client/call.d.ts

@@ -1,14 +1,23 @@
-import type { ClientAdapter, ClientHooks, CallDescriptor } from './types.js';
+import type { ClientAdapter, ClientHooks, CallDescriptor, ProcedureCallDefaults, ProcedureCallOptions } from './types.js';
+export interface ExecuteCallConfig {
+    descriptor: CallDescriptor;
+    basePath: string;
+    adapter: ClientAdapter;
+    hooks: ClientHooks;
+    defaults?: ProcedureCallDefaults;
+    options?: ProcedureCallOptions;
+}
 /**
  * Executes a single procedure call through the adapter.
  *
  * Flow:
- * 1. Build AdapterRequest from descriptor
- * 2. Run onBeforeRequest hooks (global then local)
- * 3. Call adapter.request()
- * 4. On adapter error: run onError hooks, re-throw
- * 5. Run onAfterResponse hooks (hooks may mutate response.status)
- * 6. If response status is non-2xx: throw ClientRequestError
- * 7. Return response.body as TResponse
+ * 1. Resolve base path (per-call > defaults > config) and build AdapterRequest
+ * 2. Apply request options (headers, signal, timeout, meta) from defaults + per-call
+ * 3. Run onBeforeRequest hooks (global then local) — may further mutate request
+ * 4. Call adapter.request()
+ * 5. On adapter error: run onError hooks, re-throw
+ * 6. Run onAfterResponse hooks (may mutate response.status to swallow errors)
+ * 7. If response status is non-2xx: throw ClientRequestError
+ * 8. Return response.body as TResponse
  */
-export declare function executeCall<TResponse>(descriptor: CallDescriptor, basePath: string, adapter: ClientAdapter, globalHooks: ClientHooks, localHooks: ClientHooks | undefined): Promise<TResponse>;
+export declare function executeCall<TResponse>(config: ExecuteCallConfig): Promise<TResponse>;

package/build/client/call.js

@@ -1,37 +1,43 @@
 import { buildAdapterRequest } from './request-builder.js';
 import { runBeforeRequest, runAfterResponse, runOnError } from './hooks.js';
+import { applyRequestOptions, resolveBasePath } from './resolve-options.js';
 import { ClientRequestError } from './errors.js';
 /**
  * Executes a single procedure call through the adapter.
  *
  * Flow:
- * 1. Build AdapterRequest from descriptor
- * 2. Run onBeforeRequest hooks (global then local)
- * 3. Call adapter.request()
- * 4. On adapter error: run onError hooks, re-throw
- * 5. Run onAfterResponse hooks (hooks may mutate response.status)
- * 6. If response status is non-2xx: throw ClientRequestError
- * 7. Return response.body as TResponse
+ * 1. Resolve base path (per-call > defaults > config) and build AdapterRequest
+ * 2. Apply request options (headers, signal, timeout, meta) from defaults + per-call
+ * 3. Run onBeforeRequest hooks (global then local) — may further mutate request
+ * 4. Call adapter.request()
+ * 5. On adapter error: run onError hooks, re-throw
+ * 6. Run onAfterResponse hooks (may mutate response.status to swallow errors)
+ * 7. If response status is non-2xx: throw ClientRequestError
+ * 8. Return response.body as TResponse
  */
-export async function executeCall(descriptor, basePath, adapter, globalHooks, localHooks) {
-    // 1. Build the initial request
-    let request = buildAdapterRequest(descriptor, basePath);
-    // 2. Run before-request hooks — they may mutate the request
-    const beforeCtx = await runBeforeRequest({ procedureName: descriptor.name, scope: descriptor.scope, request }, globalHooks, localHooks);
+export async function executeCall(config) {
+    const { descriptor, basePath, adapter, hooks, defaults, options } = config;
+    // 1. Build the initial request (path/query/body from descriptor)
+    const resolvedBasePath = resolveBasePath(defaults, options, basePath);
+    let request = buildAdapterRequest(descriptor, resolvedBasePath);
+    // 2. Apply request-level options (headers, signal, timeout, meta)
+    request = applyRequestOptions(request, defaults, options);
+    // 3. Run before-request hooks — they may further mutate the request
+    const beforeCtx = await runBeforeRequest({ procedureName: descriptor.name, scope: descriptor.scope, request }, hooks, options);
     request = beforeCtx.request;
-    // 3. Call the adapter
+    // 4. Call the adapter
     let response;
     try {
         response = await adapter.request(request);
     }
     catch (err) {
-        // 4. On adapter error: run error hooks, re-throw
-        await runOnError({ procedureName: descriptor.name, scope: descriptor.scope, request, error: err }, globalHooks, localHooks);
+        // 5. On adapter error: run error hooks, re-throw
+        await runOnError({ procedureName: descriptor.name, scope: descriptor.scope, request, error: err }, hooks, options);
         throw err;
     }
-    // 5. Run after-response hooks — they may mutate response.status to swallow errors
-    await runAfterResponse({ procedureName: descriptor.name, scope: descriptor.scope, request, response }, globalHooks, localHooks);
-    // 6. Check status AFTER hooks (hooks may have swallowed the error by mutating status)
+    // 6. Run after-response hooks — they may mutate response.status to swallow errors
+    await runAfterResponse({ procedureName: descriptor.name, scope: descriptor.scope, request, response }, hooks, options);
+    // 7. Check status AFTER hooks (hooks may have swallowed the error by mutating status)
     if (response.status < 200 || response.status >= 300) {
         throw new ClientRequestError({
             status: response.status,
@@ -41,7 +47,7 @@ export async function executeCall(descriptor, basePath, adapter, globalHooks, lo
             scope: descriptor.scope,
         });
     }
-    // 7. Return the body
+    // 8. Return the body
     return response.body;
 }
 //# sourceMappingURL=call.js.map

package/build/client/call.js.map

@@ -1 +1 @@
-{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/client/call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAOhD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,UAA0B,EAC1B,QAAgB,EAChB,OAAsB,EACtB,WAAwB,EACxB,UAAmC;IAEnC,+BAA+B;IAC/B,IAAI,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAEvD,4DAA4D;IAC5D,MAAM,SAAS,GAAG,MAAM,gBAAgB,CACtC,EAAE,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,EACpE,WAAW,EACX,UAAU,CACX,CAAA;IACD,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;IAE3B,sBAAsB;IACtB,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,iDAAiD;QACjD,MAAM,UAAU,CACd,EAAE,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAChF,WAAW,EACX,UAAU,CACX,CAAA;QACD,MAAM,GAAG,CAAA;IACX,CAAC;IAED,kFAAkF;IAClF,MAAM,gBAAgB,CACpB,EAAE,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAC9E,WAAW,EACX,UAAU,CACX,CAAA;IAED,sFAAsF;IACtF,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,kBAAkB,CAAC;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,aAAa,EAAE,UAAU,CAAC,IAAI;YAC9B,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,CAAC,CAAA;IACJ,CAAC;IAED,qBAAqB;IACrB,OAAO,QAAQ,CAAC,IAAiB,CAAA;AACnC,CAAC"}
+{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/client/call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAkBhD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAY,MAAyB;IACpE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAE1E,iEAAiE;IACjE,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACrE,IAAI,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;IAE/D,kEAAkE;IAClE,OAAO,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEzD,oEAAoE;IACpE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CACtC,EAAE,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,EACpE,KAAK,EACL,OAAO,CACR,CAAA;IACD,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;IAE3B,sBAAsB;IACtB,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,iDAAiD;QACjD,MAAM,UAAU,CACd,EAAE,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAChF,KAAK,EACL,OAAO,CACR,CAAA;QACD,MAAM,GAAG,CAAA;IACX,CAAC;IAED,kFAAkF;IAClF,MAAM,gBAAgB,CACpB,EAAE,aAAa,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAC9E,KAAK,EACL,OAAO,CACR,CAAA;IAED,sFAAsF;IACtF,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,kBAAkB,CAAC;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,aAAa,EAAE,UAAU,CAAC,IAAI;YAC9B,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,CAAC,CAAA;IACJ,CAAC;IAED,qBAAqB;IACrB,OAAO,QAAQ,CAAC,IAAiB,CAAA;AACnC,CAAC"}