@thymian/core 0.3.0 → 0.3.1-canary.20261022-df897f0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
import type { ThymianHttpRequest, ThymianHttpResponse } from '../format/index.js';
|
|
2
2
|
import type { HttpRequest, HttpResponse } from '../http.js';
|
|
3
|
+
import type { Logger } from '../logger/logger.js';
|
|
3
4
|
import type { CommonHttpRequest, CommonHttpResponse } from './contexts.js';
|
|
4
5
|
export declare function thymianToCommonHttpRequest(node: ThymianHttpRequest, _id: string): CommonHttpRequest;
|
|
5
6
|
export declare function thymianToCommonHttpResponse(node: ThymianHttpResponse, _id: string): CommonHttpResponse;
|
|
6
7
|
export declare function httpRequestToCommonHttpRequest(request: HttpRequest, _id?: string): CommonHttpRequest;
|
|
7
|
-
|
|
8
|
+
/**
|
|
9
|
+
* The bare, lowercased `type/subtype` of a `Content-Type` value, with
|
|
10
|
+
* parameters removed. Empty when the value is not a single `type/subtype`.
|
|
11
|
+
*/
|
|
12
|
+
export declare function normalizeMediaType(value: string | undefined): string;
|
|
13
|
+
export type HttpResponseConversionOptions = {
|
|
14
|
+
/** The Thymian node id of the response, when there is one. */
|
|
15
|
+
id?: string;
|
|
16
|
+
/** How warnings name the response. Defaults to the response's own label. */
|
|
17
|
+
label?: string;
|
|
18
|
+
logger?: Logger;
|
|
19
|
+
};
|
|
20
|
+
export declare function httpResponseToCommonHttpResponse(response: HttpResponse, options?: HttpResponseConversionOptions): CommonHttpResponse;
|
|
8
21
|
//# sourceMappingURL=common-http-converters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-http-converters.d.ts","sourceRoot":"","sources":["../../src/rules/common-http-converters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"common-http-converters.d.ts","sourceRoot":"","sources":["../../src/rules/common-http-converters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,MAAM,GACV,iBAAiB,CAanB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GACV,kBAAkB,CAUpB;AAgBD,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,WAAW,EACpB,GAAG,CAAC,EAAE,MAAM,GACX,iBAAiB,CAgBnB;AAKD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAIpE;AAmBD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,8DAA8D;IAC9D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,6BAAkC,GAC1C,kBAAkB,CAQpB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getHeader } from '../utils.js';
|
|
1
|
+
import { getHeader, httpResponseToLabel } from '../utils.js';
|
|
2
2
|
export function thymianToCommonHttpRequest(node, _id) {
|
|
3
3
|
void _id;
|
|
4
4
|
return {
|
|
@@ -17,7 +17,7 @@ export function thymianToCommonHttpResponse(node, _id) {
|
|
|
17
17
|
return {
|
|
18
18
|
body: !!node.schema,
|
|
19
19
|
headers: Object.keys(node.headers),
|
|
20
|
-
mediaType: node.mediaType,
|
|
20
|
+
mediaType: normalizeMediaType(node.mediaType),
|
|
21
21
|
statusCode: node.statusCode,
|
|
22
22
|
trailers: [],
|
|
23
23
|
};
|
|
@@ -46,12 +46,29 @@ export function httpRequestToCommonHttpRequest(request, _id) {
|
|
|
46
46
|
body: !!request.body,
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
// RFC 9110 §8.3.1: type "/" subtype, each a token (RFC 9110 §5.6.2).
|
|
50
|
+
const MEDIA_TYPE = /^[a-z0-9!#$%&'*+.^_`|~-]+\/[a-z0-9!#$%&'*+.^_`|~-]+$/;
|
|
51
|
+
/**
|
|
52
|
+
* The bare, lowercased `type/subtype` of a `Content-Type` value, with
|
|
53
|
+
* parameters removed. Empty when the value is not a single `type/subtype`.
|
|
54
|
+
*/
|
|
55
|
+
export function normalizeMediaType(value) {
|
|
56
|
+
const mediaType = value?.split(';')[0]?.trim().toLowerCase() ?? '';
|
|
57
|
+
return MEDIA_TYPE.test(mediaType) ? mediaType : '';
|
|
58
|
+
}
|
|
59
|
+
function getMediaType(response, { id, label, logger }) {
|
|
60
|
+
const ct = getHeader(response.headers, 'content-type');
|
|
61
|
+
if (Array.isArray(ct) && ct.length > 1) {
|
|
62
|
+
const name = label ?? httpResponseToLabel(response);
|
|
63
|
+
logger?.warn(`Content-Type is a single valued field, but ${ct.length} values were received for response ${id ? `${id} (${name})` : `"${name}"`}. Using the first one.`);
|
|
64
|
+
}
|
|
65
|
+
return normalizeMediaType(Array.isArray(ct) ? ct[0] : ct);
|
|
66
|
+
}
|
|
67
|
+
export function httpResponseToCommonHttpResponse(response, options = {}) {
|
|
51
68
|
return {
|
|
52
69
|
body: !!response.body,
|
|
53
70
|
headers: Object.keys(response.headers),
|
|
54
|
-
mediaType:
|
|
71
|
+
mediaType: getMediaType(response, options),
|
|
55
72
|
statusCode: response.statusCode,
|
|
56
73
|
trailers: Object.keys(response.trailers),
|
|
57
74
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-http-converters.js","sourceRoot":"","sources":["../../src/rules/common-http-converters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common-http-converters.js","sourceRoot":"","sources":["../../src/rules/common-http-converters.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED