@openaddresses/batch-schema 10.25.0 → 10.26.0

package/dist/test/schema.srv.test.js

@@ -19,6 +19,71 @@ describe('Schema Server', () => {
             }, async (_, res) => {
                 res.json({ ok: true });
             });
+            await schema.post('/json-only', {
+                description: 'Backwards compatible JSON body',
+                body: Type.Object({
+                    name: Type.String()
+                }),
+                res: Type.Object({ ok: Type.Boolean() })
+            }, async (req, res) => {
+                res.json({ ok: typeof req.body.name === 'string' });
+            });
+            await schema.post('/multi-body', {
+                description: 'Multi content-type body',
+                body: {
+                    'application/json': Type.Object({ name: Type.String() }),
+                    'text/xml': true
+                },
+                res: Type.Object({
+                    contentType: Type.String(),
+                    body: Type.Any()
+                })
+            }, async (req, res) => {
+                res.json({
+                    contentType: (req.headers['content-type'] || '').split(';')[0],
+                    body: req.body
+                });
+            });
+            await schema.post('/wildcard-body', {
+                description: 'Wildcard content-type body',
+                body: {
+                    'application/json': Type.Object({ name: Type.String() }),
+                    'text/*': true
+                },
+                res: Type.Object({
+                    contentType: Type.String(),
+                    body: Type.Any()
+                })
+            }, async (req, res) => {
+                res.json({
+                    contentType: (req.headers['content-type'] || '').split(';')[0],
+                    body: req.body
+                });
+            });
+            await schema.post('/optional-body', {
+                description: 'Optional body',
+                body: Type.Object({ name: Type.String() }),
+                bodyRequired: false,
+                res: Type.Object({ ok: Type.Boolean() })
+            }, async (_req, res) => {
+                res.json({ ok: true });
+            });
+            await schema.post('/with-examples', {
+                description: 'Body with examples in OpenAPI',
+                body: {
+                    'application/json': {
+                        schema: Type.Object({ name: Type.String() }),
+                        example: { name: 'sample' },
+                        examples: {
+                            primary: { summary: 'Primary', value: { name: 'alice' } },
+                            secondary: { summary: 'Secondary', value: { name: 'bob' } }
+                        }
+                    }
+                },
+                res: Type.Object({ ok: Type.Boolean() })
+            }, async (_req, res) => {
+                res.json({ ok: true });
+            });
             await schema.api();
             done();
         });
@@ -35,6 +100,31 @@ describe('Schema Server', () => {
                 query: false,
                 res: true
             },
+            'POST /json-only': {
+                body: true,
+                query: false,
+                res: true
+            },
+            'POST /multi-body': {
+                body: true,
+                query: false,
+                res: true
+            },
+            'POST /wildcard-body': {
+                body: true,
+                query: false,
+                res: true
+            },
+            'POST /optional-body': {
+                body: true,
+                query: false,
+                res: true
+            },
+            'POST /with-examples': {
+                body: true,
+                query: false,
+                res: true
+            },
             'GET /schema': {
                 body: false,
                 query: true,
@@ -104,5 +194,131 @@ describe('Schema Server', () => {
         assert.strictEqual(body.paths['/legacy'].get.deprecated, true);
         assert.strictEqual(body.paths['/schema'].get.deprecated, false);
     });
+    it('POST: /json-only with valid JSON body (backwards compat)', async () => {
+        const res = await fetch('http://localhost:2000/api/json-only', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ name: 'foo' })
+        });
+        assert.strictEqual(res.status, 200);
+        assert.deepStrictEqual(await res.json(), { ok: true });
+    });
+    it('POST: /multi-body with application/json', async () => {
+        const res = await fetch('http://localhost:2000/api/multi-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ name: 'foo' })
+        });
+        assert.strictEqual(res.status, 200);
+        assert.deepStrictEqual(await res.json(), {
+            contentType: 'application/json',
+            body: { name: 'foo' }
+        });
+    });
+    it('POST: /multi-body with text/xml (true => no validation)', async () => {
+        const res = await fetch('http://localhost:2000/api/multi-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'text/xml' },
+            body: '<root><a>1</a></root>'
+        });
+        assert.strictEqual(res.status, 200);
+        assert.deepStrictEqual(await res.json(), {
+            contentType: 'text/xml',
+            body: '<root><a>1</a></root>'
+        });
+    });
+    it('POST: /multi-body with unsupported content-type returns 400', async () => {
+        const res = await fetch('http://localhost:2000/api/multi-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'text/plain' },
+            body: 'hello'
+        });
+        assert.strictEqual(res.status, 400);
+        const body = await res.json();
+        assert.strictEqual(body.status, 400);
+        assert.match(body.message, /Content-Type text\/plain not supported/);
+    });
+    it('POST: /multi-body with invalid JSON body fails validation', async () => {
+        const res = await fetch('http://localhost:2000/api/multi-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({})
+        });
+        assert.strictEqual(res.status, 400);
+        const body = await res.json();
+        assert.strictEqual(body.message, 'Validation Error POST /multi-body');
+    });
+    it('GET: api/openapi documents multiple content types', async () => {
+        const res = await fetch('http://localhost:2000/api/openapi');
+        const body = await res.json();
+        assert.deepStrictEqual(Object.keys(body.paths['/multi-body'].post.requestBody.content).sort(), ['application/json', 'text/xml']);
+        assert.deepStrictEqual(body.paths['/multi-body'].post.requestBody.content['text/xml'], { schema: {} });
+        assert.strictEqual(body.paths['/json-only'].post.requestBody.content['application/json'].schema.type, 'object');
+    });
+    it('POST: /wildcard-body matches text/* with text/csv', async () => {
+        const res = await fetch('http://localhost:2000/api/wildcard-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'text/csv' },
+            body: 'a,b,c\n1,2,3'
+        });
+        assert.strictEqual(res.status, 200);
+        assert.deepStrictEqual(await res.json(), {
+            contentType: 'text/csv',
+            body: 'a,b,c\n1,2,3'
+        });
+    });
+    it('POST: /wildcard-body still validates application/json strictly', async () => {
+        const res = await fetch('http://localhost:2000/api/wildcard-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ name: 'foo' })
+        });
+        assert.strictEqual(res.status, 200);
+    });
+    it('POST: /wildcard-body rejects unsupported family', async () => {
+        const res = await fetch('http://localhost:2000/api/wildcard-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'image/png' },
+            body: 'binary'
+        });
+        assert.strictEqual(res.status, 400);
+        const body = await res.json();
+        assert.match(body.message, /Content-Type image\/png not supported/);
+    });
+    it('POST: /optional-body accepts no body when bodyRequired=false', async () => {
+        const res = await fetch('http://localhost:2000/api/optional-body', {
+            method: 'POST'
+        });
+        assert.strictEqual(res.status, 200);
+        assert.deepStrictEqual(await res.json(), { ok: true });
+    });
+    it('POST: /optional-body still validates when a body is sent', async () => {
+        const res = await fetch('http://localhost:2000/api/optional-body', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({})
+        });
+        assert.strictEqual(res.status, 400);
+    });
+    it('GET: api/openapi marks optional body required=false', async () => {
+        const res = await fetch('http://localhost:2000/api/openapi');
+        const body = await res.json();
+        assert.strictEqual(body.paths['/optional-body'].post.requestBody.required, false);
+        assert.strictEqual(body.paths['/json-only'].post.requestBody.required, true);
+    });
+    it('GET: api/openapi includes example and examples on media type', async () => {
+        const res = await fetch('http://localhost:2000/api/openapi');
+        const body = await res.json();
+        const media = body.paths['/with-examples'].post.requestBody.content['application/json'];
+        assert.deepStrictEqual(media.example, { name: 'sample' });
+        assert.deepStrictEqual(media.examples.primary, {
+            summary: 'Primary',
+            value: { name: 'alice' }
+        });
+        assert.deepStrictEqual(media.examples.secondary, {
+            summary: 'Secondary',
+            value: { name: 'bob' }
+        });
+    });
 });
 //# sourceMappingURL=schema.srv.test.js.map

package/dist/test/schema.srv.test.js.map

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

package/lib/openapi.ts

@@ -1,5 +1,6 @@
 import { OpenAPIV3 as Doc } from 'openapi-types'
 import type { RequestValidation } from './types.js';
+import { normalizeBody } from './types.js';
 import type { TSchema } from '@sinclair/typebox';
 
 export type OpenAPIDocumentInput = {
@@ -165,13 +166,20 @@ export default class Docs {
             }
 
             if (schemas.body) {
+                const normalized = normalizeBody(schemas.body) || {};
+                const content: Record<string, Doc.MediaTypeObject> = {};
+                for (const ct of Object.keys(normalized)) {
+                    const entry = normalized[ct];
+                    const media: Doc.MediaTypeObject = {
+                        schema: entry.schema === true ? {} : entry.schema as Doc.SchemaObject
+                    };
+                    if (entry.example !== undefined) media.example = entry.example;
+                    if (entry.examples !== undefined) media.examples = entry.examples as Record<string, Doc.ExampleObject>;
+                    content[ct] = media;
+                }
                 document.requestBody = {
-                    required: true,
-                    content: {
-                        'application/json': {
-                            schema: schemas.body
-                        }
-                    }
+                    required: schemas.bodyRequired !== false,
+                    content
                 };
             }
 

package/lib/schema.ts

@@ -13,6 +13,7 @@ import { Ajv } from 'ajv'
 import type { ErrorObject } from 'ajv'
 import addFormatsModule from 'ajv-formats'
 import type { RequestValidation } from './types.js';
+import { normalizeBody, matchContentType } from './types.js';
 import type { OpenAPIDocumentInput } from './openapi.js'
 import SchemaAPI from './api.js';
 import Docs from './openapi.js';
@@ -53,6 +54,67 @@ export default class Schemas {
         return new Err(400, null, `Validation Error ${String(method).toUpperCase()} ${path}`);
     }
 
+    /**
+     * Compile body validators keyed by content-type. Returns null when no
+     * body validation is configured. Each entry is either `true` (any body
+     * accepted for this content-type) or a compiled ajv validator function.
+     */
+    compileBodyValidators(
+        body: RequestValidation<TSchema, TSchema, TSchema, TSchema>['body']
+    ): Map<string, true | ReturnType<typeof ajv.compile>> | null {
+        const normalized = normalizeBody(body);
+        if (!normalized) return null;
+
+        const map = new Map<string, true | ReturnType<typeof ajv.compile>>();
+        for (const ct of Object.keys(normalized)) {
+            const schema = normalized[ct].schema;
+            if (schema === true || schema === undefined) {
+                map.set(ct, true);
+            } else {
+                map.set(ct, ajv.compile(schema));
+            }
+        }
+        return map;
+    }
+
+    /**
+     * Validate the incoming request body against the compiled validator
+     * map for the route. Pushes a Body error onto `errors` if validation
+     * fails; returns an Err to respond with for an unsupported content-type.
+     *
+     * If `bodyRequired` is false and the request has no body / no
+     * content-type, validation is skipped.
+     */
+    validateBody(
+        req: Request,
+        validators: Map<string, true | ReturnType<typeof ajv.compile>>,
+        errors: Array<ErrorListItem>,
+        opts: { required?: boolean } = {}
+    ): Err | null {
+        const raw = (req.headers['content-type'] || '').split(';')[0].trim().toLowerCase();
+        const required = opts.required !== false;
+
+        if (!raw && !required) return null;
+
+        const normalizedMap: Record<string, { schema: true }> = {};
+        for (const key of validators.keys()) normalizedMap[key] = { schema: true };
+        const matched = matchContentType(raw, normalizedMap);
+        const validator = matched ? validators.get(matched) : undefined;
+
+        if (!validator) {
+            const supported = Array.from(validators.keys()).join(', ');
+            return new Err(400, null, `Content-Type ${raw || '(none)'} not supported. Supported: ${supported}`);
+        }
+
+        if (validator !== true) {
+            if (!validator(req.body)) {
+                errors.push({ type: 'Body', errors: validator.errors as ErrorObject[] });
+            }
+        }
+
+        return null;
+    }
+
     constructor(
         router: Router,
         opts: {
@@ -74,8 +136,16 @@ export default class Schemas {
             this.router.use(morgan('combined', morganOptions));
         }
 
-        this.router.use(bodyparser.urlencoded({ extended: true }));
+        this.router.use(bodyparser.urlencoded({ extended: true, limit: `${opts.limit || 50}mb` }));
         this.router.use(bodyparser.json({ limit: `${opts.limit || 50}mb` }));
+        this.router.use(bodyparser.text({
+            limit: `${opts.limit || 50}mb`,
+            type: ['text/*', 'application/xml', 'application/*+xml']
+        }));
+        this.router.use(bodyparser.raw({
+            limit: `${opts.limit || 50}mb`,
+            type: ['application/octet-stream']
+        }));
 
         if (opts.error) {
             this.error = opts.error;
@@ -264,7 +334,7 @@ export default class Schemas {
             const resValidation = validation.res && !(validation.res instanceof Type.Any) && !(validation.res instanceof Type.Unknown) && ajv.compile(validation.res);
             const paramsValidation = validation.params && ajv.compile(validation.params);
             const queryValidation = validation.query && ajv.compile(validation.query);
-            const bodyValidation = validation.body && ajv.compile(validation.body);
+            const bodyValidators = this.compileBodyValidators(validation.body);
 
             const _handler: RequestHandler = (req, res, next) => {
                 if (req.query) { // Ref: https://github.com/cdimascio/express-openapi-validator/issues/969
@@ -277,7 +347,10 @@ export default class Schemas {
                 const errors: Array<ErrorListItem> = [];
                 if (paramsValidation && !paramsValidation(req.params)) errors.push({ type: 'Params', errors: paramsValidation.errors as ErrorObject[] });
                 if (queryValidation && !queryValidation(req.query)) errors.push({ type: 'Query', errors: queryValidation.errors as ErrorObject[] });
-                if (bodyValidation && !bodyValidation(req.body)) errors.push({ type: 'Body', errors: bodyValidation.errors as ErrorObject[] });
+                if (bodyValidators) {
+                    const ctErr = this.validateBody(req, bodyValidators, errors, { required: validation.bodyRequired });
+                    if (ctErr) return Err.respond(ctErr, res);
+                }
                 if (errors.length) return Err.respond(this.validationError(Doc.HttpMethods.POST, path), res, errors);
 
                 const json = res.json;
@@ -315,7 +388,7 @@ export default class Schemas {
             const resValidation = validation.res && !(validation.res instanceof Type.Any) && !(validation.res instanceof Type.Unknown) && ajv.compile(validation.res);
             const paramsValidation = validation.params && ajv.compile(validation.params);
             const queryValidation = validation.query && ajv.compile(validation.query);
-            const bodyValidation = validation.body && ajv.compile(validation.body);
+            const bodyValidators = this.compileBodyValidators(validation.body);
 
             const _handler: RequestHandler = (req, res, next) => {
                 if (req.query) { // Ref: https://github.com/cdimascio/express-openapi-validator/issues/969
@@ -328,7 +401,10 @@ export default class Schemas {
                 const errors: Array<ErrorListItem> = [];
                 if (paramsValidation && !paramsValidation(req.params)) errors.push({ type: 'Params', errors: paramsValidation.errors as ErrorObject[] });
                 if (queryValidation && !queryValidation(req.query)) errors.push({ type: 'Query', errors: queryValidation.errors as ErrorObject[] });
-                if (bodyValidation && !bodyValidation(req.body)) errors.push({ type: 'Body', errors: bodyValidation.errors as ErrorObject[] });
+                if (bodyValidators) {
+                    const ctErr = this.validateBody(req, bodyValidators, errors, { required: validation.bodyRequired });
+                    if (ctErr) return Err.respond(ctErr, res);
+                }
                 if (errors.length) return Err.respond(this.validationError(Doc.HttpMethods.PATCH, path), res, errors);
 
                 const json = res.json;
@@ -366,7 +442,7 @@ export default class Schemas {
             const resValidation = validation.res && !(validation.res instanceof Type.Any) && !(validation.res instanceof Type.Unknown) && ajv.compile(validation.res);
             const paramsValidation = validation.params && ajv.compile(validation.params);
             const queryValidation = validation.query && ajv.compile(validation.query);
-            const bodyValidation = validation.body && ajv.compile(validation.body);
+            const bodyValidators = this.compileBodyValidators(validation.body);
 
             const _handler: RequestHandler = (req, res, next) => {
                 if (req.query) { // Ref: https://github.com/cdimascio/express-openapi-validator/issues/969
@@ -379,7 +455,10 @@ export default class Schemas {
                 const errors: Array<ErrorListItem> = [];
                 if (paramsValidation && !paramsValidation(req.params)) errors.push({ type: 'Params', errors: paramsValidation.errors as ErrorObject[] });
                 if (queryValidation && !queryValidation(req.query)) errors.push({ type: 'Query', errors: queryValidation.errors as ErrorObject[] });
-                if (bodyValidation && !bodyValidation(req.body)) errors.push({ type: 'Body', errors: bodyValidation.errors as ErrorObject[] });
+                if (bodyValidators) {
+                    const ctErr = this.validateBody(req, bodyValidators, errors, { required: validation.bodyRequired });
+                    if (ctErr) return Err.respond(ctErr, res);
+                }
                 if (errors.length) return Err.respond(this.validationError(Doc.HttpMethods.PUT, path), res, errors);
 
                 const json = res.json;

package/lib/types.ts

@@ -1,5 +1,88 @@
+import { Kind } from '@sinclair/typebox';
 import type { TSchema } from '@sinclair/typebox';
 
+/**
+ * Per-content-type body entry. May be:
+ *   - a TypeBox schema (validated, no example)
+ *   - `true` (any body accepted, no validation)
+ *   - an object with optional `schema` (TSchema | true), `example`, `examples`
+ *     (forwarded to the OpenAPI media type object)
+ */
+export type BodyEntryConfig = {
+    schema?: TSchema | true;
+    example?: unknown;
+    examples?: Record<string, { summary?: string; description?: string; value: unknown }>;
+};
+
+export type BodyEntry = TSchema | true | BodyEntryConfig;
+
+/**
+ * Body validation can either be:
+ *   - a TypeBox schema (treated as `application/json` for backwards compatibility)
+ *   - a record mapping content-type strings to a `BodyEntry`. Content-type
+ *     keys may include wildcards: `text/*`, `application/*`, or `* / *`.
+ */
+export type BodyValidation<TBody extends TSchema> =
+    | TBody
+    | Record<string, BodyEntry>;
+
+/**
+ * Normalized internal representation: every entry has the expanded
+ * `BodyEntryConfig` shape with `schema` always set (defaulting to `true`).
+ */
+export type NormalizedBody = Record<string, Required<Pick<BodyEntryConfig, 'schema'>> & BodyEntryConfig>;
+
+/**
+ * Detect whether a given value is a TypeBox schema. TypeBox attaches a
+ * `[Kind]` symbol to every schema instance which is what we use to
+ * distinguish a schema from a content-type-keyed body record.
+ */
+export function isTSchema(value: unknown): value is TSchema {
+    return !!value && typeof value === 'object' && Kind in (value as object);
+}
+
+function normalizeEntry(entry: BodyEntry): NormalizedBody[string] {
+    if (entry === true) return { schema: true };
+    if (isTSchema(entry)) return { schema: entry };
+    return { schema: true, ...entry };
+}
+
+/**
+ * Normalize the body option into a `NormalizedBody` map. A bare TypeBox
+ * schema is mapped to `application/json` for backwards compatibility.
+ */
+export function normalizeBody(
+    body: TSchema | Record<string, BodyEntry> | undefined
+): NormalizedBody | undefined {
+    if (!body) return undefined;
+    if (isTSchema(body)) return { 'application/json': { schema: body } };
+
+    const out: NormalizedBody = {};
+    for (const ct of Object.keys(body)) {
+        out[ct.toLowerCase()] = normalizeEntry(body[ct]);
+    }
+    return out;
+}
+
+/**
+ * Match an incoming content-type against a normalized body map, honoring
+ * wildcard entries like `text/*` or `*\/*`. Exact matches always win.
+ */
+export function matchContentType(
+    incoming: string,
+    normalized: NormalizedBody
+): string | undefined {
+    if (!incoming) {
+        return normalized['*/*'] ? '*/*' : undefined;
+    }
+    if (normalized[incoming]) return incoming;
+
+    const [type] = incoming.split('/');
+    if (type && normalized[`${type}/*`]) return `${type}/*`;
+    if (normalized['*/*']) return '*/*';
+    return undefined;
+}
+
 export type RequestValidation<
     TParams extends TSchema,
     TQuery extends TSchema,
@@ -13,6 +96,8 @@ export type RequestValidation<
   description?: string;
   params?: TParams;
   query?: TQuery;
-  body?: TBody;
+  body?: BodyValidation<TBody>;
+  /** Whether the request body is required. Defaults to true when `body` is set. */
+  bodyRequired?: boolean;
   res?: TResponse
 };

package/package.json

@@ -4,7 +4,7 @@
     "root": true,
     "main": "dist/index.js",
     "types": "index.ts",
-    "version": "10.25.0",
+    "version": "10.26.0",
     "description": "Strongly Validated JSON Schema support for address",
     "repository": {
         "type": "git",