@owlmeans/api 0.1.18-rc.46 → 0.1.18-rc.47

package/build/utils/body.js

@@ -2,72 +2,55 @@ import qs from 'qs';
 import { RouteMethod } from '@owlmeans/route';
 import { FORM_CONTENT_TYPE } from './consts.local.js';
 import { JSON_CONTENT_TYPE } from './consts.js';
-/** The request's own `content-type`, whatever case its key is written in. */
-const contentTypeOf = (headers) => {
-    const value = Object.entries(headers ?? {}).find(([key]) => key.toLowerCase() === 'content-type')?.[1];
-    if (value == null || value === '') {
-        return undefined;
-    }
-    return Array.isArray(value) ? value.join(', ') : `${value}`;
-};
-/** `application/json` or a `+json` suffix type, with or without parameters. */
-const isJsonContentType = (type) => type != null && /^application\/(?:[^\s;]+\+)?json\s*(?:;|$)/i.test(type.trim());
-/** A JSON value no serializer quotes for us: a string, a number or a boolean. */
-const isScalar = (value) => typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
-/** Does the entrypoint's body schema declare a string? */
-const stringContract = (schema) => {
-    const type = schema?.type;
-    return (Array.isArray(type) ? type : [type]).includes('string');
-};
-const parse = (text) => {
-    try {
-        return { json: true, value: JSON.parse(text) };
-    }
-    catch {
-        return { json: false };
-    }
-};
-/**
- * The JSON text a scalar body travels as, so the server parses it back to the same value.
- *
- * A number or a boolean is `JSON.stringify`'d. A string is a value unless it is already JSON text:
- * one that does not parse is quoted; one that parses is sent as it is (the caller serialized it
- * itself) — except under a body schema of `type: 'string'`, where only a JSON string literal
- * counts as serialized and `123`, `true` or `{…}` are the text the caller means.
- */
-const jsonScalarBody = (body, schema) => {
-    if (typeof body !== 'string') {
-        return JSON.stringify(body);
-    }
-    const parsed = parse(body);
-    const serialized = parsed.json && (!stringContract(schema) || typeof parsed.value === 'string');
-    return serialized ? body : JSON.stringify(body);
-};
-/**
- * What a request's body becomes on the wire.
- *
- * - A `x-www-form-urlencoded` request: the body through `qs`.
- * - A string, number or boolean under a JSON `content-type` — the caller's, or `application/json`
- *   supplied for a `POST` that names none — becomes JSON text ({@link jsonScalarBody}).
- * - Anything else — objects, arrays, a scalar under another content type — goes to axios as it is,
- *   which serializes an object or an array as JSON.
- */
-const requestBodyOf = (body, headers, method, schema) => {
-    const type = contentTypeOf(headers);
-    if (body != null && type?.includes(FORM_CONTENT_TYPE) === true) {
-        return { data: qs.stringify(body), verbatim: false };
-    }
-    if (!isScalar(body)) {
+export const createBodyUtils = () => {
+    const contentTypeOf = (headers) => {
+        const value = Object.entries(headers ?? {}).find(([key]) => key.toLowerCase() === 'content-type')?.[1];
+        if (value == null || value === '') {
+            return undefined;
+        }
+        return Array.isArray(value) ? value.join(', ') : `${value}`;
+    };
+    const isJsonContentType = (type) => type != null && /^application\/(?:[^\s;]+\+)?json\s*(?:;|$)/i.test(type.trim());
+    /** A JSON value no serializer quotes for us: a string, a number or a boolean. */
+    const isScalar = (value) => typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
+    /** Does the entrypoint's body schema declare a string? */
+    const stringContract = (schema) => {
+        const type = schema?.type;
+        return (Array.isArray(type) ? type : [type]).includes('string');
+    };
+    const parse = (text) => {
+        try {
+            return { json: true, value: JSON.parse(text) };
+        }
+        catch {
+            return { json: false };
+        }
+    };
+    const jsonScalarBody = (body, schema) => {
+        if (typeof body !== 'string') {
+            return JSON.stringify(body);
+        }
+        const parsed = parse(body);
+        const serialized = parsed.json && (!stringContract(schema) || typeof parsed.value === 'string');
+        return serialized ? body : JSON.stringify(body);
+    };
+    const requestBodyOf = (body, headers, method, schema) => {
+        const type = contentTypeOf(headers);
+        if (body != null && type?.includes(FORM_CONTENT_TYPE) === true) {
+            return { data: qs.stringify(body), verbatim: false };
+        }
+        if (!isScalar(body)) {
+            return { data: body, verbatim: false };
+        }
+        if (type == null && method === RouteMethod.POST) {
+            return { data: jsonScalarBody(body, schema), contentType: JSON_CONTENT_TYPE, verbatim: true };
+        }
+        if (isJsonContentType(type)) {
+            return { data: jsonScalarBody(body, schema), verbatim: true };
+        }
         return { data: body, verbatim: false };
-    }
-    if (type == null && method === RouteMethod.POST) {
-        return { data: jsonScalarBody(body, schema), contentType: JSON_CONTENT_TYPE, verbatim: true };
-    }
-    if (isJsonContentType(type)) {
-        return { data: jsonScalarBody(body, schema), verbatim: true };
-    }
-    return { data: body, verbatim: false };
+    };
+    return { contentTypeOf, isJsonContentType, jsonScalarBody, requestBodyOf };
 };
-export const createBodyHelper = () => ({ contentTypeOf, isJsonContentType, jsonScalarBody, requestBodyOf });
-export const bodyHelper = createBodyHelper();
+export const bodyUtils = createBodyUtils();
 //# sourceMappingURL=body.js.map

package/build/utils/body.js.map

@@ -1 +1 @@
-{"version":3,"file":"body.js","sourceRoot":"","sources":["../../src/utils/body.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../src/utils/body.ts"],"names":[],"mappings":"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"}

package/build/utils/index.d.ts

@@ -1,2 +1,3 @@
-export * from './handler.js';
+export type * from './response/types.js';
+export * from './response.js';
 //# sourceMappingURL=index.d.ts.map

package/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,mBAAmB,qBAAqB,CAAA;AACxC,cAAc,eAAe,CAAA"}

package/build/utils/index.js

@@ -1,2 +1,2 @@
-export * from './handler.js';
+export * from './response.js';
 //# sourceMappingURL=index.js.map

package/build/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAEA,cAAc,eAAe,CAAA"}

package/build/utils/response/types.d.ts

@@ -0,0 +1,15 @@
+import type { AbstractResponse } from '@owlmeans/entrypoint';
+import type { AxiosResponse } from 'axios';
+import type { ApiClientError } from '../../errors.js';
+/** Turns an axios answer into the entrypoint reply: a resolved value or a typed failure. */
+export interface ResponseUtils {
+    /** Resolves `reply` with a 2xx answer's value, or rejects it with the failure of any other status. */
+    processResponse: (response: AxiosResponse, reply: AbstractResponse<any>) => void;
+    /**
+     * The typed error of a bare status: `ServerCrashedError` (500), `ServerAuthError` (401),
+     * `ApiClientError('forbidden[:<id>]')` (403), `ApiStatusError` (`api:client:status:<n>[:<id>]`)
+     * for every other one.
+     */
+    statusError: (status: number, incidentId?: string) => ApiClientError;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/utils/response/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/response/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,4FAA4F;AAC5F,MAAM,WAAW,aAAa;IAC5B,sGAAsG;IACtG,eAAe,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,IAAI,CAAA;IAChF;;;;OAIG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,cAAc,CAAA;CACrE"}

package/build/utils/response/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/utils/response/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/response/types.ts"],"names":[],"mappings":""}

package/build/utils/response.d.ts

@@ -0,0 +1,4 @@
+import type { ResponseUtils } from './response/types.js';
+export declare const createResponseUtils: () => ResponseUtils;
+export declare const responseUtils: ResponseUtils;
+//# sourceMappingURL=response.d.ts.map

package/build/utils/response.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,eAAO,MAAM,mBAAmB,QAAO,aAqGtC,CAAA;AAED,eAAO,MAAM,aAAa,eAAwB,CAAA"}

package/build/utils/response.js

@@ -0,0 +1,99 @@
+import { EntrypointOutcome } from '@owlmeans/entrypoint';
+import { ACCEPTED, CREATED, FINISHED, FORBIDDEN_ERROR, INCIDENT_ID_HEADER, DENIAL_KIND_HEADER, ACCESS_DENIED_KIND, OK, SERVER_ERROR, UNAUTHORIZED_ERROR, } from '../consts.js';
+import { ResilientError } from '@owlmeans/error';
+import { ApiClientError, ApiStatusError, ServerAuthError, ServerCrashedError } from '../errors.js';
+import { apiStatusHelper } from '../status/helper.js';
+import { logger } from '@owlmeans/log';
+export const createResponseUtils = () => {
+    const log = logger('api');
+    const processResponse = (response, reply) => {
+        switch (response.status) {
+            case OK:
+                reply.resolve(response.data, EntrypointOutcome.Ok);
+                return;
+            case ACCEPTED:
+                reply.resolve(response.data, EntrypointOutcome.Accepted);
+                return;
+            case CREATED:
+                return processEmptyResponse(response, reply, EntrypointOutcome.Created);
+            case FINISHED:
+                return processEmptyResponse(response, reply, EntrypointOutcome.Finished);
+            default:
+                // A refusal is ordinary traffic (401, 403, 409, 428): debug, and never the headers.
+                log.debug('Request answered with a failure', {
+                    status: response.status, statusText: response.statusText, url: response.config?.url,
+                    incidentId: headerOf(response.headers, INCIDENT_ID_HEADER),
+                });
+                reply.reject(failureOf(response));
+        }
+    };
+    /**
+     * The error a non-2xx answer rejects with — always carrying the HTTP status and, when the server
+     * sent one, its incident id.
+     *
+     * A development body is the marshaled `ResilientError`: it is rebuilt into its own class and
+     * stamped with `responseStatus`. Anything else — the bare incident id of a production body, a
+     * proxy's HTML, a framework's JSON — becomes the status error of {@link statusError}.
+     */
+    const failureOf = (response) => {
+        const incidentId = headerOf(response.headers, INCIDENT_ID_HEADER)
+            ?? (apiStatusHelper.isIncidentBody(response.data) ? response.data.trim() : undefined);
+        const denialKind = response.status === FORBIDDEN_ERROR
+            && headerOf(response.headers, DENIAL_KIND_HEADER) === ACCESS_DENIED_KIND
+            ? ACCESS_DENIED_KIND : undefined;
+        if (typeof response.data === 'string' && response.data.includes(ResilientError.separator)) {
+            try {
+                const error = ResilientError.ensure(response.data, true);
+                error.incidentId ??= incidentId;
+                Object.assign(error, {
+                    responseStatus: response.status, denialKind,
+                });
+                return error;
+            }
+            catch {
+                log.warn('Server returned an unrecognizable text error', { status: response.status, body: response.data });
+            }
+        }
+        return Object.assign(statusError(response.status, incidentId), { denialKind });
+    };
+    /**
+     * The typed error of a bare status: `ServerCrashedError` (500), `ServerAuthError` (401),
+     * `ApiClientError('forbidden[:<id>]')` (403), `ApiStatusError` (`api:client:status:<n>[:<id>]`)
+     * for every other one.
+     */
+    const statusError = (status, incidentId) => {
+        const error = status === SERVER_ERROR ? new ServerCrashedError(incidentId)
+            : status === UNAUTHORIZED_ERROR ? new ServerAuthError(incidentId)
+                : status === FORBIDDEN_ERROR ? new ApiClientError(incidentId != null ? `forbidden:${incidentId}` : 'forbidden')
+                    : new ApiStatusError(status, incidentId);
+        if (incidentId != null) {
+            error.incidentId = incidentId;
+        }
+        return Object.assign(error, { responseStatus: status });
+    };
+    /** One response header, from an `AxiosHeaders` instance or a plain header object alike. */
+    const headerOf = (headers, name) => {
+        if (headers == null || typeof headers !== 'object') {
+            return undefined;
+        }
+        const get = headers.get;
+        const viaGet = typeof get === 'function' ? get.call(headers, name) : undefined;
+        const value = viaGet ?? Object.entries(headers).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1];
+        const first = Array.isArray(value) ? value[0] : value;
+        return typeof first === 'string' && first.trim() !== '' ? first.trim() : undefined;
+    };
+    const processEmptyResponse = (response, reply, outcome) => {
+        if (response.data != null && response.data != '') {
+            reply.resolve(response.data, outcome);
+            return;
+        }
+        if (response.headers.toJSON != null && typeof response.headers.toJSON === 'function') {
+            reply.resolve(response.headers.toJSON(), outcome);
+            return;
+        }
+        reply.resolve(response.headers, outcome);
+    };
+    return { processResponse, statusError };
+};
+export const responseUtils = createResponseUtils();
+//# sourceMappingURL=response.js.map

package/build/utils/response.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/api",
-  "version": "0.1.18-rc.46",
+  "version": "0.1.18-rc.47",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -29,21 +29,21 @@
     }
   },
   "dependencies": {
-    "@owlmeans/auth-common": "^0.1.18-rc.46",
-    "@owlmeans/client-config": "^0.1.18-rc.43",
-    "@owlmeans/client-route": "^0.1.18-rc.47",
-    "@owlmeans/config": "^0.1.18-rc.43",
-    "@owlmeans/context": "^0.1.18-rc.33",
-    "@owlmeans/entrypoint": "^0.1.18-rc.40",
-    "@owlmeans/error": "^0.1.18-rc.37",
-    "@owlmeans/log": "^0.1.18-rc.1",
-    "@owlmeans/route": "^0.1.18-rc.34",
+    "@owlmeans/auth-common": "^0.1.18-rc.47",
+    "@owlmeans/client-config": "^0.1.18-rc.44",
+    "@owlmeans/client-route": "^0.1.18-rc.48",
+    "@owlmeans/config": "^0.1.18-rc.44",
+    "@owlmeans/context": "^0.1.18-rc.34",
+    "@owlmeans/entrypoint": "^0.1.18-rc.41",
+    "@owlmeans/error": "^0.1.18-rc.38",
+    "@owlmeans/log": "^0.1.18-rc.2",
+    "@owlmeans/route": "^0.1.18-rc.35",
     "axios": "^1.20.0",
     "qs": "^6.16.0"
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",
-    "@owlmeans/resource": "^0.1.18-rc.39",
+    "@owlmeans/resource": "^0.1.18-rc.40",
     "@types/qs": "^6.15.1",
     "nodemon": "^3.1.14",
     "typescript": "^7.0.2"

package/src/index.ts

@@ -3,7 +3,7 @@ export * from './consts.js'
 export * from './service.js'
 export type * from './types.js'
 export {
-  httpStatusOf, incidentIdOf, isIncidentBody, parseClientMarker, API_CLIENT_MARKER, API_STATUS_MARKER,
+  httpStatusOf, apiStatusHelper, createApiStatusHelper, parseClientMarker, API_CLIENT_MARKER, API_STATUS_MARKER,
 } from './status/index.js'
-export type { ClientMarker } from './status/index.js'
+export type { ClientMarker, ApiStatusHelper } from './status/index.js'
 export type { ResponseStatusCarrier } from './status/types.js'

package/src/service.ts

@@ -1,15 +1,15 @@
 import { assertContext, createService } from '@owlmeans/context'
-import { extractParams } from '@owlmeans/client-route'
+import { clientRouteHelper } from '@owlmeans/client-route'
 import type { ApiClient } from './types.js'
 import axios, { AxiosHeaders } from 'axios'
 import type { AxiosRequestTransformer } from 'axios'
 import type { CommonEntrypoint } from '@owlmeans/entrypoint'
 import { DEFAULT_ALIAS, UNAUTHORIZED_ERROR } from './consts.js'
-import { processResponse } from './utils/handler.js'
+import { responseUtils } from './utils/response.js'
 import { makeSecurityHelper } from '@owlmeans/config'
 import { AUTH_HEADER, DEF_AUTH_SRV, TOKEN_UPDATE, type AuthService } from '@owlmeans/auth-common'
 import type { Config, Context } from './types.local.js'
-import { bodyHelper } from './utils/body.js'
+import { bodyUtils } from './utils/body.js'
 
 /** Whether a request carried an authentication header of its own. */
 const presented = (headers?: Record<string, unknown>): boolean =>
@@ -28,7 +28,7 @@ export const createApiService = (alias: string = DEFAULT_ALIAS): ApiClient => {
       const module = context.entrypoint<CommonEntrypoint>(request.alias)
       const route = module.route.route
       let path = module.path()
-      const params = extractParams(path)
+      const params = clientRouteHelper.extractParams(path)
       path = params.reduce((path, param) => {
         type Key = keyof typeof request.params
         if (request.params[param as Key] == null) {
@@ -48,7 +48,7 @@ export const createApiService = (alias: string = DEFAULT_ALIAS): ApiClient => {
 
       // A scalar JSON body (a string, a number, a boolean) is serialized here, so the server parses
       // back the value the caller sent; objects and arrays are left to axios.
-      const body = bodyHelper.requestBodyOf(request.body, request.headers, route.method, module.filter?.body)
+      const body = bodyUtils.requestBodyOf(request.body, request.headers, route.method, module.filter?.body)
       const transformer: AxiosRequestTransformer | undefined = body.verbatim ? data => data : undefined
       const requestHeaders = body.contentType != null
         ? { ...request.headers, 'content-type': body.contentType }
@@ -94,7 +94,7 @@ export const createApiService = (alias: string = DEFAULT_ALIAS): ApiClient => {
         await context.service<AuthService>(DEF_AUTH_SRV).update(undefined)
       }
 
-      processResponse(response, reply)
+      responseUtils.processResponse(response, reply)
 
       return [reply.error ?? reply.value, reply.outcome] as any
     }

package/src/status/helper.ts

@@ -0,0 +1,63 @@
+import { ResilientError } from '@owlmeans/error'
+import { ApiClientError } from '../errors.js'
+import { parseClientMarker } from './marker.js'
+import { ACCESS_DENIED_KIND } from '../consts.js'
+import { UUID } from './consts.local.js'
+import type { ApiStatusHelper, ClientMarker, ResponseStatusCarrier } from './types.js'
+
+export const createApiStatusHelper = (): ApiStatusHelper => {
+  const isAccessDenied = (error: unknown): boolean =>
+    httpStatusOf(error) === 403
+    && typeof error === 'object' && error != null
+    && (error as ResponseStatusCarrier).denialKind === ACCESS_DENIED_KIND
+
+  const httpStatus = (value: unknown): number | null =>
+    typeof value === 'number' && Number.isInteger(value) && value >= 100 && value <= 599 ? value : null
+
+  /** The first `api:client:*` marker in an error's `message`, else in its `type`. */
+  const markerOf = (error: object): ClientMarker | null => {
+    const { message, type } = error as { message?: unknown, type?: unknown }
+
+    return (typeof message === 'string' ? parseClientMarker(message) : null)
+      ?? (typeof type === 'string' ? parseClientMarker(type) : null)
+  }
+
+  const httpStatusOf = (error: unknown): number | null => {
+    if (error == null || typeof error !== 'object') {
+      return null
+    }
+    const stamped = httpStatus((error as ResponseStatusCarrier).responseStatus)
+    if (stamped != null) {
+      return stamped
+    }
+    if (error instanceof ApiClientError && httpStatus(error.status) != null) {
+      return error.status!
+    }
+    const declaration = error.constructor as { httpStatus?: unknown, allowServerErrorStatus?: unknown } | undefined
+    const declared = httpStatus(declaration?.httpStatus)
+    if (declared != null && (declared < 500 || declaration?.allowServerErrorStatus === true)) {
+      return declared
+    }
+
+    return markerOf(error)?.status ?? null
+  }
+
+  const incidentIdOf = (error: unknown): string | null => {
+    if (error == null || typeof error !== 'object') {
+      return null
+    }
+    const own = (error as { incidentId?: unknown }).incidentId
+    if (typeof own === 'string' && own !== '') {
+      return own
+    }
+
+    return markerOf(error)?.incidentId ?? null
+  }
+
+  const isIncidentBody = (data: unknown): data is string =>
+    typeof data === 'string' && !data.includes(ResilientError.separator) && UUID.test(data.trim())
+
+  return { isAccessDenied, httpStatusOf, incidentIdOf, isIncidentBody }
+}
+
+export const apiStatusHelper = createApiStatusHelper()

package/src/status/index.ts

@@ -1,82 +1,11 @@
-import { ResilientError } from '@owlmeans/error'
-import { ApiClientError } from '../errors.js'
-import { parseClientMarker } from './marker.js'
+import { apiStatusHelper } from './helper.js'
 
 export { INCIDENT_ID_HEADER } from '../consts.js'
 export { DENIAL_KIND_HEADER, ACCESS_DENIED_KIND } from '../consts.js'
-import { ACCESS_DENIED_KIND } from '../consts.js'
-import { UUID } from './consts.local.js'
-import type { ResponseStatusCarrier } from './types.js'
 export { parseClientMarker } from './marker.js'
 export { API_CLIENT_MARKER, API_STATUS_MARKER } from './consts.js'
-export type { ClientMarker } from './types.js'
+export type { ClientMarker, ResponseStatusCarrier, ApiStatusHelper } from './types.js'
+export { apiStatusHelper, createApiStatusHelper } from './helper.js'
 
-/** True only for a server-labelled auth/IAM refusal, never an unrelated 403. */
-export const isAccessDenied = (error: unknown): boolean =>
-  httpStatusOf(error) === 403
-  && typeof error === 'object' && error != null
-  && (error as ResponseStatusCarrier).denialKind === ACCESS_DENIED_KIND
-
-const httpStatus = (value: unknown): number | null =>
-  typeof value === 'number' && Number.isInteger(value) && value >= 100 && value <= 599 ? value : null
-
-/** The first `api:client:*` marker in an error's `message`, else in its `type`. */
-const markerOf = (error: object) => {
-  const { message, type } = error as { message?: unknown, type?: unknown }
-
-  return (typeof message === 'string' ? parseClientMarker(message) : null)
-    ?? (typeof type === 'string' ? parseClientMarker(type) : null)
-}
-
-/**
- * The HTTP status an error answers to, or `null` when nothing states one.
- *
- * Read in order: the status the API client stamped on the error it rebuilt from a response
- * (`responseStatus`); the status an `ApiClientError` parsed from its marker; the `httpStatus` its
- * class declares — a 4xx always, a 5xx only with `allowServerErrorStatus`, exactly what an
- * `@owlmeans/server-api` boundary answers with; finally an `api:client:*` marker in the message or
- * the type of anything else. This is what lets a browser recognise a refusal from its status
- * alone when a production body carries nothing but an incident id.
- */
-export const httpStatusOf = (error: unknown): number | null => {
-  if (error == null || typeof error !== 'object') {
-    return null
-  }
-  const stamped = httpStatus((error as ResponseStatusCarrier).responseStatus)
-  if (stamped != null) {
-    return stamped
-  }
-  if (error instanceof ApiClientError && httpStatus(error.status) != null) {
-    return error.status!
-  }
-  const declaration = error.constructor as { httpStatus?: unknown, allowServerErrorStatus?: unknown } | undefined
-  const declared = httpStatus(declaration?.httpStatus)
-  if (declared != null && (declared < 500 || declaration?.allowServerErrorStatus === true)) {
-    return declared
-  }
-
-  return markerOf(error)?.status ?? null
-}
-
-/** The server's incident id carried by an error — its own field, else its marker — or `null`. */
-export const incidentIdOf = (error: unknown): string | null => {
-  if (error == null || typeof error !== 'object') {
-    return null
-  }
-  const own = (error as { incidentId?: unknown }).incidentId
-  if (typeof own === 'string' && own !== '') {
-    return own
-  }
-
-  return markerOf(error)?.incidentId ?? null
-}
-
-/**
- * Whether a response body is a production incident body — the bare incident UUID an
- * `@owlmeans/server-api` boundary sends instead of the marshaled error. A development body
- * carries the `ResilientError` separator and is never one.
- */
-export const isIncidentBody = (data: unknown): data is string =>
-  typeof data === 'string' && !data.includes(ResilientError.separator) && UUID.test(data.trim())
-
-export type { ResponseStatusCarrier } from './types.js'
+/** @deprecated compat:factory-refactor — use `apiStatusHelper.httpStatusOf(…)` */
+export const httpStatusOf = (error: unknown): number | null => apiStatusHelper.httpStatusOf(error)

package/src/status/types.ts

@@ -9,3 +9,28 @@ export interface ClientMarker {
   status?: number
   incidentId?: string
 }
+
+/** Reads the HTTP status, the incident id and the denial kind a failed call carries. */
+export interface ApiStatusHelper {
+  /** True only for a server-labelled auth/IAM refusal, never an unrelated 403. */
+  isAccessDenied: (error: unknown) => boolean
+  /**
+   * The HTTP status an error answers to, or `null` when nothing states one.
+   *
+   * Read in order: the status the API client stamped on the error it rebuilt from a response
+   * (`responseStatus`); the status an `ApiClientError` parsed from its marker; the `httpStatus` its
+   * class declares — a 4xx always, a 5xx only with `allowServerErrorStatus`, exactly what an
+   * `@owlmeans/server-api` boundary answers with; finally an `api:client:*` marker in the message or
+   * the type of anything else. This is what lets a browser recognise a refusal from its status
+   * alone when a production body carries nothing but an incident id.
+   */
+  httpStatusOf: (error: unknown) => number | null
+  /** The server's incident id carried by an error — its own field, else its marker — or `null`. */
+  incidentIdOf: (error: unknown) => string | null
+  /**
+   * Whether a response body is a production incident body — the bare incident UUID an
+   * `@owlmeans/server-api` boundary sends instead of the marshaled error. A development body
+   * carries the `ResilientError` separator and is never one.
+   */
+  isIncidentBody: (data: unknown) => data is string
+}

package/src/utils/body/types.ts

@@ -0,0 +1,37 @@
+import type { RouteMethod } from '@owlmeans/route'
+
+export interface RequestBody {
+  /** What axios is handed as `data`. */
+  data: unknown
+  /** A `content-type` the request lacked and must carry. */
+  contentType?: string
+  /** `data` is final text — axios must not transform it again. */
+  verbatim: boolean
+}
+
+/** How a request's body travels: its content type and the text a scalar body becomes. */
+export interface BodyUtils {
+  /** The request's own `content-type`, whatever case its key is written in. */
+  contentTypeOf: (headers?: Record<string, unknown>) => string | undefined
+  /** `application/json` or a `+json` suffix type, with or without parameters. */
+  isJsonContentType: (type?: string) => boolean
+  /**
+   * The JSON text a scalar body travels as, so the server parses it back to the same value.
+   *
+   * A number or a boolean is `JSON.stringify`'d. A string is a value unless it is already JSON text:
+   * one that does not parse is quoted; one that parses is sent as it is (the caller serialized it
+   * itself) — except under a body schema of `type: 'string'`, where only a JSON string literal
+   * counts as serialized and `123`, `true` or `{…}` are the text the caller means.
+   */
+  jsonScalarBody: (body: string | number | boolean, schema?: object) => string
+  /**
+   * What a request's body becomes on the wire.
+   *
+   * - A `x-www-form-urlencoded` request: the body through `qs`.
+   * - A string, number or boolean under a JSON `content-type` — the caller's, or `application/json`
+   *   supplied for a `POST` that names none — becomes JSON text ({@link BodyUtils.jsonScalarBody}).
+   * - Anything else — objects, arrays, a scalar under another content type — goes to axios as it is,
+   *   which serializes an object or an array as JSON.
+   */
+  requestBodyOf: (body: unknown, headers: Record<string, unknown> | undefined, method?: RouteMethod, schema?: object) => RequestBody
+}