@cplieger/actions 2.0.13 → 3.0.1

package/README.md

@@ -116,10 +116,10 @@ const action = apiAction({
 - `retryNetwork` — preset retry classifier for transient failures
 - `classifyFetchError(err)` — classify fetch errors (network vs timeout vs HTTP)
 - `hasErrorString(err)` — type guard for objects with a `.message` string
-- `withTimeout(signal, ms)` — compose an AbortSignal with a timeout
-- `API_TIMEOUT_MS` — default API request timeout (30 000 ms)
 - `RETRY_STANDARD` — standard retry config (2 retries, 300ms)
 
+> `withTimeout(signal, ms)` and `API_TIMEOUT_MS` moved to [`@cplieger/fetch`](https://github.com/cplieger/fetch) (the layer that owns timeout composition); import them from there.
+
 ### Test utilities (`@cplieger/actions/testing`)
 
 The `./testing` subpath exports test-only helpers. Import only from test code:

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/actions",
-  "version": "2.0.13",
+  "version": "3.0.1",
   "exports": {
     ".": "./src/index.ts",
     "./testing": "./src/testing.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/actions",
-  "version": "2.0.13",
+  "version": "3.0.1",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -13,8 +13,8 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@cplieger/fetch": "1.1.3",
-    "@cplieger/reactive": "1.2.4"
+    "@cplieger/fetch": "2.0.0",
+    "@cplieger/reactive": "1.2.5"
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",
@@ -29,7 +29,7 @@
     "happy-dom": "20.10.6",
     "prettier": "3.9.5",
     "typescript": "npm:@typescript/typescript6@6.0.2",
-    "typescript-eslint": "8.63.0",
+    "typescript-eslint": "8.64.0",
     "vitest": "4.1.10"
   },
   "description": "Declarative async UI-action framework for TypeScript",

package/src/api.ts

@@ -1,36 +1,18 @@
 // apiAction: factory for HTTP-backed actions. The run() implementation is just
 // a request descriptor (RequestSpec); the request/response envelope is owned by
-// @cplieger/fetch. actions holds its OWN isolated fetch instance (createFetch)
-// so configureApi() never collides with a consuming app's global configureFetch,
-// then maps fetch's ApiResult envelope onto ActionError so callers see the
-// identical typed errors they always have.
+// @cplieger/fetch. actions holds its OWN fetch instance (createFetch) — fully
+// isolated from any instance a consuming app builds (fetch v2 is
+// instances-only) — and maps fetch's ApiResult envelope onto ActionError so
+// callers see the identical typed errors they always have.
 // ---------------------------------------------------------------------------
 
-import { createFetch } from "@cplieger/fetch";
+import { API_TIMEOUT_MS, createFetch } from "@cplieger/fetch";
 import type { ApiErr, FetchConfig, FetchInstance, RequestOptions } from "@cplieger/fetch";
 
 import { defineAction, IDEMPOTENCY_HEADER } from "./define.js";
 import { ActionError } from "./error.js";
 import type { Action, ActionContext, ActionDefinition, RequestSpec } from "./types.js";
 
-/** Default request timeout in milliseconds. */
-export const API_TIMEOUT_MS = 30_000;
-
-/**
- * Compose an optional caller signal with a fresh timeout signal.
- * If the caller provides an existing signal, the result aborts when
- * either the caller signal or the timeout fires — whichever comes first.
- *
- * @param signal - Existing signal to compose with (may be undefined).
- * @param ms - Timeout in milliseconds.
- * @returns A composed AbortSignal.
- */
-export function withTimeout(signal: AbortSignal | undefined, ms: number): AbortSignal {
-  return signal !== undefined
-    ? AbortSignal.any([signal, AbortSignal.timeout(ms)])
-    : AbortSignal.timeout(ms);
-}
-
 const JSON_CT = "application/json";
 
 // ---------------------------------------------------------------------------
@@ -57,14 +39,15 @@ export interface ApiConfig {
   readonly fetchFn?: typeof fetch;
 }
 
-// actions owns a PRIVATE, isolated @cplieger/fetch instance rather than the
-// library's module-global configureFetch: a consuming app (subflux/vibekit) may
-// call configureFetch() for its own direct fetch usage, and actions must never
-// read or clobber that shared default. baseUrl / credentials / fetchFn are
-// projected onto this instance. prepareHeaders stays here (not on the instance)
-// because actions' hook is spec-aware — `(headers, { spec })` — a shape fetch's
-// `(headers)`-only hook can't express, so executeRequest runs it itself and
-// passes the result as the per-request headers.
+// actions owns a PRIVATE @cplieger/fetch instance. fetch v2 is instances-only
+// with config frozen at construction, so isolation from the consuming app's
+// own fetch instances is inherent — and configureApi's replace semantics are
+// implemented the only way v2 allows: by rebuilding the instance. baseUrl /
+// credentials / fetchFn are projected onto this instance. prepareHeaders stays
+// here (not on the instance) because actions' hook is spec-aware —
+// `(headers, { spec })` — a shape fetch's `(headers)`-only hook can't express,
+// so executeRequest runs it itself and passes the result as the per-request
+// headers.
 let apiFetch: FetchInstance = createFetch();
 let apiPrepareHeaders: ApiConfig["prepareHeaders"];
 
@@ -94,8 +77,8 @@ export function configureApi(config: ApiConfig): void {
   if (config.fetchFn !== undefined) {
     fetchConfig.fetchFn = config.fetchFn;
   }
-  // Rebuild the instance so this call REPLACES the previous config (a bare
-  // instance.configure() would shallow-merge/accumulate instead).
+  // Rebuild the instance: fetch v2 instances are immutable, and configureApi's
+  // contract is replace-not-merge, which a fresh instance implements exactly.
   apiFetch = createFetch(fetchConfig);
   apiPrepareHeaders = config.prepareHeaders;
 }

package/src/index.ts

@@ -11,7 +11,7 @@ export type { TransportSendResult, TransportCommand, TransportSendFn } from "./t
 
 // Action factories
 export { defineAction } from "./define.js";
-export { apiAction, configureApi, API_TIMEOUT_MS, withTimeout } from "./api.js";
+export { apiAction, configureApi } from "./api.js";
 export type { ApiConfig, ApiActionDefinition } from "./api.js";
 
 // Error class + utilities