@thymian/core 0.3.0-canary.20261007-e6cb8dc → 0.3.0-canary.20261007-cdbe1d3
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.
- package/dist/http-testing/http-test/create-http-test-context.d.ts.map +1 -1
- package/dist/http-testing/http-test/create-http-test-context.js +17 -1
- package/dist/http-testing/http-test/create-http-test-context.js.map +1 -1
- package/dist/http-testing/operators/run-requests.operator.d.ts.map +1 -1
- package/dist/http-testing/operators/run-requests.operator.js +26 -2
- package/dist/http-testing/operators/run-requests.operator.js.map +1 -1
- package/dist/http-testing/serialize-request.d.ts +9 -0
- package/dist/http-testing/serialize-request.d.ts.map +1 -1
- package/dist/http-testing/serialize-request.js +37 -10
- package/dist/http-testing/serialize-request.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/selector/index.d.ts +2 -0
- package/dist/selector/index.d.ts.map +1 -0
- package/dist/selector/index.js +2 -0
- package/dist/selector/index.js.map +1 -0
- package/dist/selector/render-selector.d.ts +120 -0
- package/dist/selector/render-selector.d.ts.map +1 -0
- package/dist/selector/render-selector.js +167 -0
- package/dist/selector/render-selector.js.map +1 -0
- package/dist/thymian.error.d.ts +8 -0
- package/dist/thymian.error.d.ts.map +1 -1
- package/dist/thymian.error.js +10 -0
- package/dist/thymian.error.js.map +1 -1
- package/dist/utils.d.ts +24 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +30 -11
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-http-test-context.d.ts","sourceRoot":"","sources":["../../../src/http-testing/http-test/create-http-test-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAM/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAGhC,wBAAgB,qBAAqB,CACnC,MAAM,SAAS,qBAAqB,GAAG,qBAAqB,EAE5D,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,GACtD,eAAe,CAAC,MAAM,CAAC,CA8BzB;AAED,wBAAgB,wBAAwB,CAAC,MAAM,SAAS,qBAAqB,EAC3E,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,GAAE,MAAqB,
|
|
1
|
+
{"version":3,"file":"create-http-test-context.d.ts","sourceRoot":"","sources":["../../../src/http-testing/http-test/create-http-test-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAM/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,KAAK,EACV,eAAe,EACf,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAGhC,wBAAgB,qBAAqB,CACnC,MAAM,SAAS,qBAAqB,GAAG,qBAAqB,EAE5D,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,GACtD,eAAe,CAAC,MAAM,CAAC,CA8BzB;AAED,wBAAgB,wBAAwB,CAAC,MAAM,SAAS,qBAAqB,EAC3E,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,GAAE,MAAqB,2BAiD9B"}
|
|
@@ -29,9 +29,25 @@ export function createContextFromEmitter(format, logger, emitter, origin, locals
|
|
|
29
29
|
format,
|
|
30
30
|
logger,
|
|
31
31
|
locals,
|
|
32
|
+
/**
|
|
33
|
+
* The override lands on the **template**, not only on the dispatched
|
|
34
|
+
* request.
|
|
35
|
+
*
|
|
36
|
+
* The template is what hooks are handed, and what a `utils.request` seed
|
|
37
|
+
* inherits its origin from. Applied at dispatch alone, the run itself went
|
|
38
|
+
* to `--target-url` while every seed a hook sent went to the server the
|
|
39
|
+
* description names — so a seeded fixture existed on one server and the
|
|
40
|
+
* transaction that needed it ran against another.
|
|
41
|
+
*/
|
|
32
42
|
sampleRequest: async function (transaction) {
|
|
33
|
-
|
|
43
|
+
const template = await emitter.emitAction('core.request.sample', { transaction }, { strategy: 'first' });
|
|
44
|
+
return origin ? { ...template, origin } : template;
|
|
34
45
|
},
|
|
46
|
+
/**
|
|
47
|
+
* Still applied here, for a request built by some route other than
|
|
48
|
+
* {@link sampleRequest} — a hook that replaced the origin outright, say.
|
|
49
|
+
* With the template already carrying it, this is normally a no-op.
|
|
50
|
+
*/
|
|
35
51
|
runRequest: async function (req) {
|
|
36
52
|
const finalOrigin = origin ?? req.origin;
|
|
37
53
|
return await emitter.emitAction('core.request.dispatch', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-http-test-context.js","sourceRoot":"","sources":["../../../src/http-testing/http-test/create-http-test-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,aAAa,GAEd,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,0CAA0C,EAAE,MAAM,yBAAyB,CAAC;AAQrF,MAAM,UAAU,qBAAqB,CAGnC,OAAuD;IAEvD,OAAO;QACL,GAAG,OAAO;QACV,IAAI,CACF,QAA6B,EAC7B,MAAe;YAEf,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;YAC5B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,QAAQ,CAAC,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YAEjC,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,QAAQ;aAClB,CAAC;QACJ,CAAC;QACD,IAAI,CACF,QAA6B,EAC7B,MAAe;YAEf,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC;YAC3B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,QAAQ,CAAC,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YAEjC,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,QAAQ;aAClB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,MAAqB,EACrB,MAAc,EACd,OAAuB,EACvB,MAAe,EACf,SAAiB,EAAY;IAE7B,OAAO,qBAAqB,CAAC;QAC3B,MAAM;QACN,MAAM;QACN,MAAM;QACN,aAAa,EAAE,KAAK,WAClB,WAAmC;YAEnC,
|
|
1
|
+
{"version":3,"file":"create-http-test-context.js","sourceRoot":"","sources":["../../../src/http-testing/http-test/create-http-test-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,aAAa,GAEd,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,0CAA0C,EAAE,MAAM,yBAAyB,CAAC;AAQrF,MAAM,UAAU,qBAAqB,CAGnC,OAAuD;IAEvD,OAAO;QACL,GAAG,OAAO;QACV,IAAI,CACF,QAA6B,EAC7B,MAAe;YAEf,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;YAC5B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,QAAQ,CAAC,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YAEjC,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,QAAQ;aAClB,CAAC;QACJ,CAAC;QACD,IAAI,CACF,QAA6B,EAC7B,MAAe;YAEf,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC;YAC3B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,QAAQ,CAAC,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YAEjC,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,QAAQ;aAClB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,MAAqB,EACrB,MAAc,EACd,OAAuB,EACvB,MAAe,EACf,SAAiB,EAAY;IAE7B,OAAO,qBAAqB,CAAC;QAC3B,MAAM;QACN,MAAM;QACN,MAAM;QACN;;;;;;;;;WASG;QACH,aAAa,EAAE,KAAK,WAClB,WAAmC;YAEnC,MAAM,QAAQ,GAAwB,MAAM,OAAO,CAAC,UAAU,CAC5D,qBAAqB,EACrB,EAAE,WAAW,EAAE,EACf,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAC;YAEF,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QACrD,CAAC;QACD;;;;WAIG;QACH,UAAU,EAAE,KAAK,WAAW,GAAgB;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;YACzC,OAAO,MAAM,OAAO,CAAC,UAAU,CAC7B,uBAAuB,EACvB;gBACE,OAAO,EAAE;oBACP,GAAG,GAAG;oBACN,MAAM,EAAE,WAAW;iBACpB;aACF,EACD;gBACE,QAAQ,EAAE,OAAO;aAClB,CACF,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,0CAA0C,CAAC,OAAO,CAAC;KAC7D,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-requests.operator.d.ts","sourceRoot":"","sources":["../../../src/http-testing/operators/run-requests.operator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,wBAAwB,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"run-requests.operator.d.ts","sourceRoot":"","sources":["../../../src/http-testing/operators/run-requests.operator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,wBAAwB,EAAE,MAAM,MAAM,CAAC;AAO/D,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAG1B,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAQ/B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,oJAAoJ;IACpJ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,WAAW,CACzB,KAAK,SAAS,gBAAgB,EAAE,EAChC,MAAM,SAAS,qBAAqB,EAEpC,IAAI,GAAE,OAAO,CAAC,kBAAkB,CAAM,GACrC,wBAAwB,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAmPrE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { mergeMap } from 'rxjs';
|
|
2
|
-
import { thymianHttpTransactionToString } from '../../index.js';
|
|
2
|
+
import { errorSuggestions, isRequestSerializationError, thymianHttpTransactionToString, } from '../../index.js';
|
|
3
3
|
import { isFailedTestCase, isSkippedTestCase, } from '../http-test/index.js';
|
|
4
4
|
import { serializeRequest } from '../serialize-request.js';
|
|
5
5
|
import { validateBodyForResponse, validateHeaders, validateStatusCode, } from '../validate/index.js';
|
|
@@ -58,7 +58,31 @@ export function runRequests(opts = {}) {
|
|
|
58
58
|
ctx: transaction.source,
|
|
59
59
|
})).result ?? transaction.requestTemplate;
|
|
60
60
|
}
|
|
61
|
-
|
|
61
|
+
// A request that cannot be built from the description and the hooks is
|
|
62
|
+
// a Transaction that cannot be executed *as described* — the pipeline's
|
|
63
|
+
// own word for which is `skipped`. It used to reject the observable
|
|
64
|
+
// instead, which aborted the whole run over one unresolvable path
|
|
65
|
+
// parameter and threw away every result the case had already recorded,
|
|
66
|
+
// attribution included.
|
|
67
|
+
try {
|
|
68
|
+
transaction.request = serializeRequest(transaction);
|
|
69
|
+
}
|
|
70
|
+
catch (e) {
|
|
71
|
+
if (!isRequestSerializationError(e)) {
|
|
72
|
+
throw e;
|
|
73
|
+
}
|
|
74
|
+
const message = e instanceof Error ? e.message : String(e);
|
|
75
|
+
current.results.push({
|
|
76
|
+
type: 'invalid-transaction',
|
|
77
|
+
message,
|
|
78
|
+
transaction: transaction.source,
|
|
79
|
+
timestamp: Date.now(),
|
|
80
|
+
...(errorSuggestions(e).length > 0
|
|
81
|
+
? { details: errorSuggestions(e).join(' ') }
|
|
82
|
+
: {}),
|
|
83
|
+
});
|
|
84
|
+
return ctx.skip(current, message);
|
|
85
|
+
}
|
|
62
86
|
transaction.response = await ctx.runRequest(transaction.request);
|
|
63
87
|
const afterResponse = await ctx.runHook('afterResponse', {
|
|
64
88
|
value: transaction.response,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-requests.operator.js","sourceRoot":"","sources":["../../../src/http-testing/operators/run-requests.operator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiC,MAAM,MAAM,CAAC;AAE/D,OAAO,
|
|
1
|
+
{"version":3,"file":"run-requests.operator.js","sourceRoot":"","sources":["../../../src/http-testing/operators/run-requests.operator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { type HttpRequest } from '../index.js';
|
|
2
2
|
import type { HttpTestCaseStepTransaction } from './http-test/http-test-case.js';
|
|
3
|
+
/**
|
|
4
|
+
* Whether the request could not be serialized from what the description and the
|
|
5
|
+
* hooks supplied — as opposed to any other way sending can fail.
|
|
6
|
+
*
|
|
7
|
+
* Exported so the one predicate lives beside the one producer: `runRequests`
|
|
8
|
+
* reads it to turn the failure into a skipped case, and `sampler check` reads
|
|
9
|
+
* it to give that Transaction the `skipped` Outcome rather than `errored`.
|
|
10
|
+
*/
|
|
11
|
+
export declare function isRequestSerializationError(error: unknown): boolean;
|
|
3
12
|
export declare function serializePath(transaction: HttpTestCaseStepTransaction): string;
|
|
4
13
|
export declare function serializeHeaders(transaction: HttpTestCaseStepTransaction): Record<string, string>;
|
|
5
14
|
export declare function serializeBody(body: unknown): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialize-request.d.ts","sourceRoot":"","sources":["../../src/http-testing/serialize-request.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"serialize-request.d.ts","sourceRoot":"","sources":["../../src/http-testing/serialize-request.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAGjB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AA6BjF;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEnE;AAiFD,wBAAgB,aAAa,CAC3B,WAAW,EAAE,2BAA2B,GACvC,MAAM,CAMR;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,2BAA2B,GACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBxB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CA2B/D;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,2BAA2B,GACvC,WAAW,CAgBb"}
|
|
@@ -1,5 +1,35 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isThymianError, ThymianBaseError, } from '../index.js';
|
|
2
2
|
import { serializeHeaderParameter, serializePathParameter, serializeQueryParameter, } from './serialize-parameter.js';
|
|
3
|
+
/**
|
|
4
|
+
* The request could not be built from what the description and the hooks
|
|
5
|
+
* supplied — a path parameter with no value, a header that is not a string.
|
|
6
|
+
*
|
|
7
|
+
* One name for every way serialization can fail, because every one of them
|
|
8
|
+
* means the same thing to a caller: this Transaction cannot be executed *as
|
|
9
|
+
* described*. `thymian sampler check` reads that as a skip rather than an
|
|
10
|
+
* error, and the sentence says which value is missing — never which
|
|
11
|
+
* transaction, because every surface that prints one already names it
|
|
12
|
+
* (ADR-0022).
|
|
13
|
+
*/
|
|
14
|
+
function serializationError(message, suggestions = []) {
|
|
15
|
+
return new ThymianBaseError(message, {
|
|
16
|
+
name: 'RequestSerializationError',
|
|
17
|
+
ref: 'https://thymian.dev/references/errors/request-serialization-error/',
|
|
18
|
+
suggestions,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Whether the request could not be serialized from what the description and the
|
|
23
|
+
* hooks supplied — as opposed to any other way sending can fail.
|
|
24
|
+
*
|
|
25
|
+
* Exported so the one predicate lives beside the one producer: `runRequests`
|
|
26
|
+
* reads it to turn the failure into a skipped case, and `sampler check` reads
|
|
27
|
+
* it to give that Transaction the `skipped` Outcome rather than `errored`.
|
|
28
|
+
*/
|
|
29
|
+
export function isRequestSerializationError(error) {
|
|
30
|
+
return isThymianError(error) && error.name === 'RequestSerializationError';
|
|
31
|
+
}
|
|
32
|
+
const SUPPLY_A_VALUE = 'Give it a value with an example in the API description, or set it from a hook.';
|
|
3
33
|
function serializeBasePath(transaction) {
|
|
4
34
|
return transaction.requestTemplate.path.replace(
|
|
5
35
|
// from https://github.com/scalar/scalar/blob/8165b3b1487ef38a1e97571032b0bd8c32cd9d91/packages/helpers/src/regex/regex-helpers.ts#L8
|
|
@@ -18,15 +48,12 @@ function serializeBasePath(transaction) {
|
|
|
18
48
|
return String(transaction.requestTemplate.pathParameters[parameterName]);
|
|
19
49
|
}
|
|
20
50
|
else {
|
|
21
|
-
throw
|
|
51
|
+
throw serializationError(`Value of path parameter "${parameterName}" must be a string, but is a ${type}.`, [SUPPLY_A_VALUE]);
|
|
22
52
|
}
|
|
23
53
|
}
|
|
24
54
|
}
|
|
25
55
|
else {
|
|
26
|
-
|
|
27
|
-
? thymianHttpTransactionToString(transaction.source.thymianReq, transaction.source.thymianRes)
|
|
28
|
-
: `${transaction.requestTemplate.method.toUpperCase()} ${transaction.requestTemplate.origin}${transaction.requestTemplate.path}`;
|
|
29
|
-
throw new Error(`Missing value for path parameter "${parameterName}" of transaction "${transactionName}".`);
|
|
56
|
+
throw serializationError(`Missing value for path parameter "${parameterName}".`, [SUPPLY_A_VALUE]);
|
|
30
57
|
}
|
|
31
58
|
});
|
|
32
59
|
}
|
|
@@ -46,7 +73,7 @@ function serializeQuery(transaction) {
|
|
|
46
73
|
return encodeURIComponent(String(value));
|
|
47
74
|
}
|
|
48
75
|
else {
|
|
49
|
-
throw
|
|
76
|
+
throw serializationError(`Value of query parameter "${name}" must be a primitive, but is a ${type}.`, [SUPPLY_A_VALUE]);
|
|
50
77
|
}
|
|
51
78
|
}
|
|
52
79
|
})
|
|
@@ -68,7 +95,7 @@ export function serializeHeaders(transaction) {
|
|
|
68
95
|
acc[key] = serializeHeaderParameter(key, value, headers[key].style);
|
|
69
96
|
}
|
|
70
97
|
else {
|
|
71
|
-
throw
|
|
98
|
+
throw serializationError(`Value of header "${key}" must be a string, but is a ${typeof value}.`, [SUPPLY_A_VALUE]);
|
|
72
99
|
}
|
|
73
100
|
}
|
|
74
101
|
return acc;
|
|
@@ -87,11 +114,11 @@ export function serializeBody(body) {
|
|
|
87
114
|
return JSON.stringify(body);
|
|
88
115
|
}
|
|
89
116
|
catch (e) {
|
|
90
|
-
throw
|
|
117
|
+
throw serializationError(`Cannot stringify the request body: ${e}`);
|
|
91
118
|
}
|
|
92
119
|
}
|
|
93
120
|
if (type === 'function') {
|
|
94
|
-
throw
|
|
121
|
+
throw serializationError('Cannot serialize a request body that is a function.');
|
|
95
122
|
}
|
|
96
123
|
return body;
|
|
97
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialize-request.js","sourceRoot":"","sources":["../../src/http-testing/serialize-request.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"serialize-request.js","sourceRoot":"","sources":["../../src/http-testing/serialize-request.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export * from './logger/text.logger.js';
|
|
|
20
20
|
export * from './report/index.js';
|
|
21
21
|
export * from './report-input-claim.js';
|
|
22
22
|
export * from './rules/index.js';
|
|
23
|
+
export * from './selector/index.js';
|
|
23
24
|
export * from './thymian.error.js';
|
|
24
25
|
export * from './thymian.js';
|
|
25
26
|
export * from './thymian-plugin.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,gDAAgD,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,gDAAgD,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -20,6 +20,7 @@ export * from './logger/text.logger.js';
|
|
|
20
20
|
export * from './report/index.js';
|
|
21
21
|
export * from './report-input-claim.js';
|
|
22
22
|
export * from './rules/index.js';
|
|
23
|
+
export * from './selector/index.js';
|
|
23
24
|
export * from './thymian.error.js';
|
|
24
25
|
export * from './thymian.js';
|
|
25
26
|
export * from './thymian-plugin.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,gDAAgD,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,gDAAgD,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/selector/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/selector/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import type { ThymianHttpRequest } from '../format/nodes/http-request.node.js';
|
|
2
|
+
import type { ThymianHttpResponse } from '../format/nodes/http-response.node.js';
|
|
3
|
+
import type { ThymianHttpTransaction } from '../format/thymian-format.js';
|
|
4
|
+
/**
|
|
5
|
+
* A fully-qualified transaction selector:
|
|
6
|
+
*
|
|
7
|
+
* ```
|
|
8
|
+
* METHOD SP path [ SP "(" reqMediaType ")" ] SP "->" SP status [ SP "(" resMediaType ")" ]
|
|
9
|
+
* ```
|
|
10
|
+
*
|
|
11
|
+
* ```
|
|
12
|
+
* GET /launches -> 200 (application/json)
|
|
13
|
+
* POST /astronauts (application/json) -> 201 (application/json)
|
|
14
|
+
* DELETE /astronauts/{id} -> 204
|
|
15
|
+
* ```
|
|
16
|
+
*
|
|
17
|
+
* A selector names exactly one Transaction. It is host-stripped, media-typed
|
|
18
|
+
* and ASCII, and it is **the only spelling of a Transaction anywhere Thymian
|
|
19
|
+
* writes one** (ADR-0022): check lines, test-case names, rule headings, report
|
|
20
|
+
* locations and error texts all render it, so any printed transaction pastes
|
|
21
|
+
* back as a hook target.
|
|
22
|
+
*
|
|
23
|
+
* This is a documentation alias only. `@thymian/plugin-sampler` generates the
|
|
24
|
+
* typed union (`Selector = keyof Endpoints`) from the catalog, so branding the
|
|
25
|
+
* runtime type here would have to be undone there.
|
|
26
|
+
*/
|
|
27
|
+
export type Selector = string;
|
|
28
|
+
/**
|
|
29
|
+
* RFC 9110 §5.6.2 `tchar`, the character set a method is written in. Exported
|
|
30
|
+
* because the sampler's parser and its near-miss hint have to agree with the
|
|
31
|
+
* renderer on what a method looks like — one grammar, one character class.
|
|
32
|
+
*/
|
|
33
|
+
export declare const SELECTOR_METHOD_CHARS = "A-Za-z0-9!#$%&'*+.^_`|~-";
|
|
34
|
+
/**
|
|
35
|
+
* The path as a selector spells it.
|
|
36
|
+
*
|
|
37
|
+
* The leading `/` that `req.path` is not guaranteed to carry is supplied — a
|
|
38
|
+
* canonicalization, not an escape: a description that declared both `launches`
|
|
39
|
+
* and `/launches` declared one path twice.
|
|
40
|
+
*
|
|
41
|
+
* Beyond that the path is carried verbatim. Braces, parentheses, existing
|
|
42
|
+
* percent-encoding, a trailing slash and an OpenAPI server base path all
|
|
43
|
+
* survive. A path that contains whitespace, a `>` (whose only role here would
|
|
44
|
+
* be to complete the `->` separator) or that begins with a `"` is rendered
|
|
45
|
+
* quoted instead, because the bare form cannot carry those characters
|
|
46
|
+
* unambiguously.
|
|
47
|
+
*/
|
|
48
|
+
export declare function encodePath(path: string): string;
|
|
49
|
+
/**
|
|
50
|
+
* The path as everything that is not a selector spells it: the description's
|
|
51
|
+
* own text, with the leading `/` it is not guaranteed to carry.
|
|
52
|
+
*
|
|
53
|
+
* This — not {@link encodePath} — is what a path glob is matched against and
|
|
54
|
+
* what a filter compares. A glob author writes the path the description writes;
|
|
55
|
+
* the selector's quoting is a property of the selector grammar and has no
|
|
56
|
+
* business leaking into a filter.
|
|
57
|
+
*/
|
|
58
|
+
export declare function canonicalPath(path: string): string;
|
|
59
|
+
/**
|
|
60
|
+
* The method as a selector spells it: uppercased, and quoted when it is not an
|
|
61
|
+
* RFC 9110 token.
|
|
62
|
+
*
|
|
63
|
+
* Uppercasing is a canonicalization for the same reason the leading slash is:
|
|
64
|
+
* HTTP methods are case-sensitive but a description cannot declare `get` and
|
|
65
|
+
* `GET` as two operations on one path.
|
|
66
|
+
*/
|
|
67
|
+
export declare function encodeMethod(method: string): string;
|
|
68
|
+
/**
|
|
69
|
+
* The media type as a selector spells it.
|
|
70
|
+
*
|
|
71
|
+
* Rendered RFC-9110-faithfully: parameters, spacing and quoted strings survive
|
|
72
|
+
* verbatim, **including a parenthesis inside a quoted string**, which the
|
|
73
|
+
* parenthesized media group delimits with quote awareness rather than by
|
|
74
|
+
* counting characters.
|
|
75
|
+
*
|
|
76
|
+
* Outside a quoted string, `\` is the escape and `(`/`)` are escaped with it. A
|
|
77
|
+
* bare parenthesis is not a legal token character and a bare backslash is not
|
|
78
|
+
* legal media-type syntax at all, so using them as the escape pair cannot
|
|
79
|
+
* shadow anything a legal media type contains.
|
|
80
|
+
*
|
|
81
|
+
* A media type whose quoting is unbalanced cannot be scanned back with quote
|
|
82
|
+
* awareness, so it falls back to escaping `"` as well. That form never enters
|
|
83
|
+
* quote state on the way back, which keeps even a malformed media type
|
|
84
|
+
* addressable instead of unrepresentable.
|
|
85
|
+
*/
|
|
86
|
+
export declare function encodeMediaType(mediaType: string): string;
|
|
87
|
+
/**
|
|
88
|
+
* The request half of a selector: `POST /launches (application/json)`.
|
|
89
|
+
*
|
|
90
|
+
* A label that names only a request is this, so a request heading and a
|
|
91
|
+
* response heading compose into the transaction's own selector rather than
|
|
92
|
+
* being a third format (ADR-0022).
|
|
93
|
+
*/
|
|
94
|
+
export declare function formatRequestSelector(req: ThymianHttpRequest): string;
|
|
95
|
+
/**
|
|
96
|
+
* The response half of a selector: `201 (application/json)`.
|
|
97
|
+
*
|
|
98
|
+
* No reason phrase: it is derivable from the status code and is not part of the
|
|
99
|
+
* grammar, so carrying it would put a second spelling of a Transaction back
|
|
100
|
+
* (ADR-0022). Failure *detail* text may still spell one out.
|
|
101
|
+
*
|
|
102
|
+
* The status is `String(res.statusCode)`. `statusCode` is typed `number`, and
|
|
103
|
+
* `String` is injective over the numbers a description can carry, so a loader
|
|
104
|
+
* that produces a status outside `100..599` — or one that is not an integer at
|
|
105
|
+
* all — still yields an addressable label rather than aborting the load.
|
|
106
|
+
*/
|
|
107
|
+
export declare function formatResponseSelector(res: ThymianHttpResponse): string;
|
|
108
|
+
/**
|
|
109
|
+
* Renders one `(request, response)` pair as its selector. The only code path
|
|
110
|
+
* that produces a selector string.
|
|
111
|
+
*
|
|
112
|
+
* Media parts appear whenever the node **declares** a media type — not only
|
|
113
|
+
* when it carries a body. `mediaType` is a non-optional string whose `''` means
|
|
114
|
+
* "none", so a `content:` entry that declares a media type but no schema still
|
|
115
|
+
* gets its own selector and its own media part.
|
|
116
|
+
*/
|
|
117
|
+
export declare function formatSelector(req: ThymianHttpRequest, res: ThymianHttpResponse): Selector;
|
|
118
|
+
/** {@link formatSelector} for a whole transaction. */
|
|
119
|
+
export declare function selectorForTransaction(transaction: ThymianHttpTransaction): Selector;
|
|
120
|
+
//# sourceMappingURL=render-selector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-selector.d.ts","sourceRoot":"","sources":["../../src/selector/render-selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,6BAA6B,CAAC;AAkBhE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAInD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAIzD;AAqDD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAIrE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAIvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,mBAAmB,GACvB,QAAQ,CAEV;AAED,sDAAsD;AACtD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,sBAAsB,GAClC,QAAQ,CAEV"}
|
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* RFC 9110 §5.6.2 `tchar`, the character set a method is written in. Exported
|
|
3
|
+
* because the sampler's parser and its near-miss hint have to agree with the
|
|
4
|
+
* renderer on what a method looks like — one grammar, one character class.
|
|
5
|
+
*/
|
|
6
|
+
export const SELECTOR_METHOD_CHARS = "A-Za-z0-9!#$%&'*+.^_`|~-";
|
|
7
|
+
const METHOD_TOKEN = new RegExp(`^[${SELECTOR_METHOD_CHARS}]+$`);
|
|
8
|
+
/**
|
|
9
|
+
* Renders a component the grammar cannot carry bare as a quoted string.
|
|
10
|
+
*
|
|
11
|
+
* Quoting rather than percent-encoding is what makes rendering **injective**.
|
|
12
|
+
* Percent-encoding a raw space to `%20` cannot be told apart from a path that
|
|
13
|
+
* already contained the three characters `%20`, so two distinct transactions
|
|
14
|
+
* would render one selector. A bare component never begins with `"` and a
|
|
15
|
+
* quoted one always does, so the two forms are disjoint and the escape is
|
|
16
|
+
* reversible.
|
|
17
|
+
*/
|
|
18
|
+
function quote(value) {
|
|
19
|
+
return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* The path as a selector spells it.
|
|
23
|
+
*
|
|
24
|
+
* The leading `/` that `req.path` is not guaranteed to carry is supplied — a
|
|
25
|
+
* canonicalization, not an escape: a description that declared both `launches`
|
|
26
|
+
* and `/launches` declared one path twice.
|
|
27
|
+
*
|
|
28
|
+
* Beyond that the path is carried verbatim. Braces, parentheses, existing
|
|
29
|
+
* percent-encoding, a trailing slash and an OpenAPI server base path all
|
|
30
|
+
* survive. A path that contains whitespace, a `>` (whose only role here would
|
|
31
|
+
* be to complete the `->` separator) or that begins with a `"` is rendered
|
|
32
|
+
* quoted instead, because the bare form cannot carry those characters
|
|
33
|
+
* unambiguously.
|
|
34
|
+
*/
|
|
35
|
+
export function encodePath(path) {
|
|
36
|
+
const withSlash = canonicalPath(path);
|
|
37
|
+
return /[\s>]/.test(withSlash) || withSlash.startsWith('"')
|
|
38
|
+
? quote(withSlash)
|
|
39
|
+
: withSlash;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* The path as everything that is not a selector spells it: the description's
|
|
43
|
+
* own text, with the leading `/` it is not guaranteed to carry.
|
|
44
|
+
*
|
|
45
|
+
* This — not {@link encodePath} — is what a path glob is matched against and
|
|
46
|
+
* what a filter compares. A glob author writes the path the description writes;
|
|
47
|
+
* the selector's quoting is a property of the selector grammar and has no
|
|
48
|
+
* business leaking into a filter.
|
|
49
|
+
*/
|
|
50
|
+
export function canonicalPath(path) {
|
|
51
|
+
return path.startsWith('/') ? path : `/${path}`;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* The method as a selector spells it: uppercased, and quoted when it is not an
|
|
55
|
+
* RFC 9110 token.
|
|
56
|
+
*
|
|
57
|
+
* Uppercasing is a canonicalization for the same reason the leading slash is:
|
|
58
|
+
* HTTP methods are case-sensitive but a description cannot declare `get` and
|
|
59
|
+
* `GET` as two operations on one path.
|
|
60
|
+
*/
|
|
61
|
+
export function encodeMethod(method) {
|
|
62
|
+
const upper = method.toUpperCase();
|
|
63
|
+
return METHOD_TOKEN.test(upper) ? upper : quote(upper);
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* The media type as a selector spells it.
|
|
67
|
+
*
|
|
68
|
+
* Rendered RFC-9110-faithfully: parameters, spacing and quoted strings survive
|
|
69
|
+
* verbatim, **including a parenthesis inside a quoted string**, which the
|
|
70
|
+
* parenthesized media group delimits with quote awareness rather than by
|
|
71
|
+
* counting characters.
|
|
72
|
+
*
|
|
73
|
+
* Outside a quoted string, `\` is the escape and `(`/`)` are escaped with it. A
|
|
74
|
+
* bare parenthesis is not a legal token character and a bare backslash is not
|
|
75
|
+
* legal media-type syntax at all, so using them as the escape pair cannot
|
|
76
|
+
* shadow anything a legal media type contains.
|
|
77
|
+
*
|
|
78
|
+
* A media type whose quoting is unbalanced cannot be scanned back with quote
|
|
79
|
+
* awareness, so it falls back to escaping `"` as well. That form never enters
|
|
80
|
+
* quote state on the way back, which keeps even a malformed media type
|
|
81
|
+
* addressable instead of unrepresentable.
|
|
82
|
+
*/
|
|
83
|
+
export function encodeMediaType(mediaType) {
|
|
84
|
+
const quoteAware = escapeMediaType(mediaType, true);
|
|
85
|
+
return quoteAware ?? escapeMediaType(mediaType, false) ?? mediaType;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Escapes a media type for the parenthesized group.
|
|
89
|
+
*
|
|
90
|
+
* Returns `undefined` from the quote-aware pass when the input's quoting does
|
|
91
|
+
* not balance, which is the signal to take the quote-blind pass instead.
|
|
92
|
+
*/
|
|
93
|
+
function escapeMediaType(mediaType, quoteAware) {
|
|
94
|
+
let out = '';
|
|
95
|
+
let inQuotes = false;
|
|
96
|
+
for (let i = 0; i < mediaType.length; i++) {
|
|
97
|
+
const char = mediaType[i];
|
|
98
|
+
if (inQuotes) {
|
|
99
|
+
// An RFC 9110 quoted-pair belongs to the media type's own text and is
|
|
100
|
+
// carried through untouched.
|
|
101
|
+
if (char === '\\' && i + 1 < mediaType.length) {
|
|
102
|
+
out += char + mediaType[i + 1];
|
|
103
|
+
i++;
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
if (char === '"') {
|
|
107
|
+
inQuotes = false;
|
|
108
|
+
}
|
|
109
|
+
out += char;
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
if (char === '"' && quoteAware) {
|
|
113
|
+
inQuotes = true;
|
|
114
|
+
out += char;
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
117
|
+
out +=
|
|
118
|
+
char === '\\' || char === '(' || char === ')' || char === '"'
|
|
119
|
+
? `\\${char}`
|
|
120
|
+
: char;
|
|
121
|
+
}
|
|
122
|
+
return inQuotes ? undefined : out;
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* The request half of a selector: `POST /launches (application/json)`.
|
|
126
|
+
*
|
|
127
|
+
* A label that names only a request is this, so a request heading and a
|
|
128
|
+
* response heading compose into the transaction's own selector rather than
|
|
129
|
+
* being a third format (ADR-0022).
|
|
130
|
+
*/
|
|
131
|
+
export function formatRequestSelector(req) {
|
|
132
|
+
const media = req.mediaType ? ` (${encodeMediaType(req.mediaType)})` : '';
|
|
133
|
+
return `${encodeMethod(req.method)} ${encodePath(req.path)}${media}`;
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* The response half of a selector: `201 (application/json)`.
|
|
137
|
+
*
|
|
138
|
+
* No reason phrase: it is derivable from the status code and is not part of the
|
|
139
|
+
* grammar, so carrying it would put a second spelling of a Transaction back
|
|
140
|
+
* (ADR-0022). Failure *detail* text may still spell one out.
|
|
141
|
+
*
|
|
142
|
+
* The status is `String(res.statusCode)`. `statusCode` is typed `number`, and
|
|
143
|
+
* `String` is injective over the numbers a description can carry, so a loader
|
|
144
|
+
* that produces a status outside `100..599` — or one that is not an integer at
|
|
145
|
+
* all — still yields an addressable label rather than aborting the load.
|
|
146
|
+
*/
|
|
147
|
+
export function formatResponseSelector(res) {
|
|
148
|
+
const media = res.mediaType ? ` (${encodeMediaType(res.mediaType)})` : '';
|
|
149
|
+
return `${String(res.statusCode)}${media}`;
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Renders one `(request, response)` pair as its selector. The only code path
|
|
153
|
+
* that produces a selector string.
|
|
154
|
+
*
|
|
155
|
+
* Media parts appear whenever the node **declares** a media type — not only
|
|
156
|
+
* when it carries a body. `mediaType` is a non-optional string whose `''` means
|
|
157
|
+
* "none", so a `content:` entry that declares a media type but no schema still
|
|
158
|
+
* gets its own selector and its own media part.
|
|
159
|
+
*/
|
|
160
|
+
export function formatSelector(req, res) {
|
|
161
|
+
return `${formatRequestSelector(req)} -> ${formatResponseSelector(res)}`;
|
|
162
|
+
}
|
|
163
|
+
/** {@link formatSelector} for a whole transaction. */
|
|
164
|
+
export function selectorForTransaction(transaction) {
|
|
165
|
+
return formatSelector(transaction.thymianReq, transaction.thymianRes);
|
|
166
|
+
}
|
|
167
|
+
//# sourceMappingURL=render-selector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-selector.js","sourceRoot":"","sources":["../../src/selector/render-selector.ts"],"names":[],"mappings":"AA6BA;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,0BAA0B,CAAC;AAEhE,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,KAAK,qBAAqB,KAAK,CAAC,CAAC;AAEjE;;;;;;;;;GASG;AACH,SAAS,KAAK,CAAC,KAAa;IAC1B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;AAClE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEtC,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QACzD,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;QAClB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;AAClD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IAEnC,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,eAAe,CAAC,SAAiB;IAC/C,MAAM,UAAU,GAAG,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAEpD,OAAO,UAAU,IAAI,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC;AACtE,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CACtB,SAAiB,EACjB,UAAmB;IAEnB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAW,CAAC;QAEpC,IAAI,QAAQ,EAAE,CAAC;YACb,sEAAsE;YACtE,6BAA6B;YAC7B,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC9C,GAAG,IAAI,IAAI,GAAI,SAAS,CAAC,CAAC,GAAG,CAAC,CAAY,CAAC;gBAC3C,CAAC,EAAE,CAAC;gBAEJ,SAAS;YACX,CAAC;YAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjB,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC;YAED,GAAG,IAAI,IAAI,CAAC;YAEZ,SAAS;QACX,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;YAC/B,QAAQ,GAAG,IAAI,CAAC;YAChB,GAAG,IAAI,IAAI,CAAC;YAEZ,SAAS;QACX,CAAC;QAED,GAAG;YACD,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG;gBAC3D,CAAC,CAAC,KAAK,IAAI,EAAE;gBACb,CAAC,CAAC,IAAI,CAAC;IACb,CAAC;IAED,OAAO,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;AACpC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAuB;IAC3D,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAE1E,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC;AACvE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,sBAAsB,CAAC,GAAwB;IAC7D,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAE1E,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,KAAK,EAAE,CAAC;AAC7C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAC5B,GAAuB,EACvB,GAAwB;IAExB,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,OAAO,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC;AAC3E,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,sBAAsB,CACpC,WAAmC;IAEnC,OAAO,cAAc,CAAC,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;AACxE,CAAC"}
|
package/dist/thymian.error.d.ts
CHANGED
|
@@ -14,6 +14,14 @@ export interface ThymianError {
|
|
|
14
14
|
options: PartialExceptFor<ThymianErrorOptions, 'severity'>;
|
|
15
15
|
}
|
|
16
16
|
export declare function isThymianError(value: unknown): value is ThymianError;
|
|
17
|
+
/**
|
|
18
|
+
* The remediation an error brought with it, for a caller that wants to print it
|
|
19
|
+
* beside its own header.
|
|
20
|
+
*
|
|
21
|
+
* `options` is optional on the interface and absent on a plain `Error` — which
|
|
22
|
+
* {@link isThymianError} accepts, since it asks for a shape rather than a class.
|
|
23
|
+
*/
|
|
24
|
+
export declare function errorSuggestions(error: unknown): string[];
|
|
17
25
|
export declare class ThymianBaseError extends Error implements ThymianError {
|
|
18
26
|
cause?: unknown;
|
|
19
27
|
readonly options: PartialExceptFor<ThymianErrorOptions, 'severity'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thymian.error.d.ts","sourceRoot":"","sources":["../src/thymian.error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;CAC5D;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,YAAY,CAYpE;AAED,qBAAa,gBAAiB,SAAQ,KAAM,YAAW,YAAY;IACxD,KAAK,CAAC,EAAE,OAAO,CAAC;IAEzB,SAAgB,OAAO,EAAE,gBAAgB,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;gBAEzE,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG;QAC5D,QAAQ,CAAC,EAAE,oBAAoB,CAAC;KAC5B;CAoBT"}
|
|
1
|
+
{"version":3,"file":"thymian.error.d.ts","sourceRoot":"","sources":["../src/thymian.error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;CAC5D;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,YAAY,CAYpE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAEzD;AAED,qBAAa,gBAAiB,SAAQ,KAAM,YAAW,YAAY;IACxD,KAAK,CAAC,EAAE,OAAO,CAAC;IAEzB,SAAgB,OAAO,EAAE,gBAAgB,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;gBAEzE,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG;QAC5D,QAAQ,CAAC,EAAE,oBAAoB,CAAC;KAC5B;CAoBT"}
|
package/dist/thymian.error.js
CHANGED
|
@@ -10,6 +10,16 @@ export function isThymianError(value) {
|
|
|
10
10
|
value.options.cause instanceof Error)) ||
|
|
11
11
|
!Object.hasOwn(value, 'options')));
|
|
12
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* The remediation an error brought with it, for a caller that wants to print it
|
|
15
|
+
* beside its own header.
|
|
16
|
+
*
|
|
17
|
+
* `options` is optional on the interface and absent on a plain `Error` — which
|
|
18
|
+
* {@link isThymianError} accepts, since it asks for a shape rather than a class.
|
|
19
|
+
*/
|
|
20
|
+
export function errorSuggestions(error) {
|
|
21
|
+
return isThymianError(error) ? (error.options?.suggestions ?? []) : [];
|
|
22
|
+
}
|
|
13
23
|
export class ThymianBaseError extends Error {
|
|
14
24
|
cause;
|
|
15
25
|
options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thymian.error.js","sourceRoot":"","sources":["../src/thymian.error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAyB,MAAM,YAAY,CAAC;AAmB7D,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,oEAAoE;IACpE,OAAO,CACL,QAAQ,CAAC,KAAK,CAAC;QACf,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ;QAC/B,OAAO,KAAK,EAAE,OAAO,KAAK,QAAQ;QAClC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC;YAC/B,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;YACvB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS;gBAChC,KAAK,CAAC,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC;YACxC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CACpC,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAChC,KAAK,CAAW;IAET,OAAO,CAAoD;IAC3E,YACE,OAAe,EACf,UAEI,EAAE;QAEN,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,OAAO,CAAC,KAAK,YAAY,KAAK,EAAE,CAAC;gBACnC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,QAAQ,EAAE,OAAO;YACjB,GAAG,OAAO;SACX,CAAC;QAEF,IAAI,CAAC,IAAI;YACP,OAAO,CAAC,IAAI;gBACZ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB;oBAC3C,CAAC,CAAC,cAAc;oBAChB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"thymian.error.js","sourceRoot":"","sources":["../src/thymian.error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAyB,MAAM,YAAY,CAAC;AAmB7D,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,oEAAoE;IACpE,OAAO,CACL,QAAQ,CAAC,KAAK,CAAC;QACf,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ;QAC/B,OAAO,KAAK,EAAE,OAAO,KAAK,QAAQ;QAClC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC;YAC/B,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;YACvB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS;gBAChC,KAAK,CAAC,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC;YACxC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CACpC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACzE,CAAC;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAChC,KAAK,CAAW;IAET,OAAO,CAAoD;IAC3E,YACE,OAAe,EACf,UAEI,EAAE;QAEN,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,OAAO,CAAC,KAAK,YAAY,KAAK,EAAE,CAAC;gBACnC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,QAAQ,EAAE,OAAO;YACjB,GAAG,OAAO;SACX,CAAC;QAEF,IAAI,CAAC,IAAI;YACP,OAAO,CAAC,IAAI;gBACZ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB;oBAC3C,CAAC,CAAC,cAAc;oBAChB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;CACF"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -18,8 +18,32 @@ export declare function findKeyIgnoreCase(obj: Record<PropertyKey, unknown>, key
|
|
|
18
18
|
export declare function objHasKeyIgnoreCase(obj: Record<PropertyKey, unknown>, key: PropertyKey): boolean;
|
|
19
19
|
export declare function setHeader(headers: Record<string, unknown>, headerName: string, value: unknown): Record<string, unknown>;
|
|
20
20
|
export type PartialExceptFor<T, K extends keyof T> = Partial<Omit<T, K>> & Pick<T, K>;
|
|
21
|
+
/**
|
|
22
|
+
* How Thymian writes a request node down: the **request half of its
|
|
23
|
+
* Selector**, `POST /launches (application/json)`.
|
|
24
|
+
*
|
|
25
|
+
* One grammar for one concept (ADR-0022) — a heading a reader sees is a
|
|
26
|
+
* fragment of the string a hook is anchored to, not a near-twin of it. The
|
|
27
|
+
* rendering itself lives in `selector/render-selector.ts`, beside the whole-
|
|
28
|
+
* transaction renderer it has to stay consistent with.
|
|
29
|
+
*/
|
|
21
30
|
export declare function thymianRequestToString(req: ThymianHttpRequest): string;
|
|
31
|
+
/**
|
|
32
|
+
* How Thymian writes a response node down: the **response half of its
|
|
33
|
+
* Selector**, `201 (application/json)`.
|
|
34
|
+
*
|
|
35
|
+
* Deliberately without the reason phrase the old display string carried:
|
|
36
|
+
* `CREATED` is derivable from `201`, and it is not part of the selector
|
|
37
|
+
* grammar. Failure detail text may still spell a phrase out.
|
|
38
|
+
*/
|
|
22
39
|
export declare function thymianResponseToString(res: ThymianHttpResponse): string;
|
|
40
|
+
/**
|
|
41
|
+
* How Thymian writes a Transaction down: **its Selector, verbatim**.
|
|
42
|
+
*
|
|
43
|
+
* Every surface that names a Transaction goes through here — check lines,
|
|
44
|
+
* test-case names, rule headings, report locations, error texts — so any line
|
|
45
|
+
* a user reads pastes back as a hook target (ADR-0022).
|
|
46
|
+
*/
|
|
23
47
|
export declare function thymianHttpTransactionToString(req: ThymianHttpRequest, res: ThymianHttpResponse): string;
|
|
24
48
|
export declare function thymianHttpRequestToUrl(req: ThymianHttpRequest): string;
|
|
25
49
|
export declare function equalsIgnoreCase(a: string, ...b: string[]): boolean;
|
package/dist/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAG3C,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAG3C,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAY3D,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,MAAM,SAAO,EACb,GAAG,CAAC,EAAE,KAAK,GACV,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED,wBAAgB,QAAQ,CACtB,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAEvC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAgBtE;AAED,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI,MAAM;KAE/C,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,GACpE,CAAC,GACD,KAAK,GACR,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI,OAAO,CAAC;KAChD,GAAG,IAAI,2BAA2B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC;CAChD,CAAC,CAAC;AAEH,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,GACvD,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAChC,KAAK,CAAC;AAEV,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAQ1D;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,YAAK,EAC3D,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAY/B;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACxE,OAAO,EAAE,CAAC,EACV,UAAU,EAAE,MAAM,GACjB,CAAC,CAQH;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,EACjC,GAAG,EAAE,WAAW,GACf,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,EACjC,GAAG,EAAE,WAAW,GACf,OAAO,CAET;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,OAAO,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GACtE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEb;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAEtE;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAExE;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,mBAAmB,GACvB,MAAM,CAER;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAIvE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAInE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACzC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,GACD,CAAC,CAAC;AAEN,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAEtE;AAED,wBAAgB,cAAc,CAC5B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAM,EAC3D,YAAY,SAAK,GAChB,MAAM,CAYR;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAuBtD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAK/D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,CAUlE;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,YAAY,GACrB,MAAM,CAER;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,WAAW,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIxB;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGtE;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,kBAAkB,EAC7B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;AACX,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,mBAAmB,EAC9B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;AASX,cAAc,OAAO,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import deepmerge from '@fastify/deepmerge';
|
|
2
2
|
import { is } from 'type-is';
|
|
3
3
|
import { httpStatusCodeToPhrase, isValidHttpStatusCode, } from './http-status-codes/index.js';
|
|
4
|
+
import { formatRequestSelector, formatResponseSelector, formatSelector, } from './selector/render-selector.js';
|
|
4
5
|
import { ThymianBaseError } from './thymian.error.js';
|
|
5
6
|
export function timeoutPromise(promise, toWait = 5000, err) {
|
|
6
7
|
let timoutId;
|
|
@@ -67,20 +68,38 @@ export function setHeader(headers, headerName, value) {
|
|
|
67
68
|
}
|
|
68
69
|
return headers;
|
|
69
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* How Thymian writes a request node down: the **request half of its
|
|
73
|
+
* Selector**, `POST /launches (application/json)`.
|
|
74
|
+
*
|
|
75
|
+
* One grammar for one concept (ADR-0022) — a heading a reader sees is a
|
|
76
|
+
* fragment of the string a hook is anchored to, not a near-twin of it. The
|
|
77
|
+
* rendering itself lives in `selector/render-selector.ts`, beside the whole-
|
|
78
|
+
* transaction renderer it has to stay consistent with.
|
|
79
|
+
*/
|
|
70
80
|
export function thymianRequestToString(req) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
81
|
+
return formatRequestSelector(req);
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* How Thymian writes a response node down: the **response half of its
|
|
85
|
+
* Selector**, `201 (application/json)`.
|
|
86
|
+
*
|
|
87
|
+
* Deliberately without the reason phrase the old display string carried:
|
|
88
|
+
* `CREATED` is derivable from `201`, and it is not part of the selector
|
|
89
|
+
* grammar. Failure detail text may still spell a phrase out.
|
|
90
|
+
*/
|
|
74
91
|
export function thymianResponseToString(res) {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
92
|
+
return formatResponseSelector(res);
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* How Thymian writes a Transaction down: **its Selector, verbatim**.
|
|
96
|
+
*
|
|
97
|
+
* Every surface that names a Transaction goes through here — check lines,
|
|
98
|
+
* test-case names, rule headings, report locations, error texts — so any line
|
|
99
|
+
* a user reads pastes back as a hook target (ADR-0022).
|
|
100
|
+
*/
|
|
82
101
|
export function thymianHttpTransactionToString(req, res) {
|
|
83
|
-
return
|
|
102
|
+
return formatSelector(req, res);
|
|
84
103
|
}
|
|
85
104
|
export function thymianHttpRequestToUrl(req) {
|
|
86
105
|
return normalizeUrl(`${req.protocol}://${req.host}:${req.port}${req.path.startsWith('/') ? req.path : '/' + req.path}`);
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAO7B,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,UAAU,cAAc,CAC5B,OAAmB,EACnB,MAAM,GAAG,IAAI,EACb,GAAW;IAEX,IAAI,QAAwB,CAAC;IAE7B,OAAO,OAAO,CAAC,IAAI,CAAI;QACrB,OAAO;QACP,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACxB,QAAQ,GAAG,UAAU,CACnB,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,2BAA2B,MAAM,MAAM,CAAC,CAAC,EACvE,MAAM,CACP,CAAC;QACJ,CAAC,CAAC;KACH,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,KAAc;IAEd,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAe,EAAE,MAAe;IAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACrC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACtB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjE,OAAO,CACL,GAAG,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CACnE,CAAC;QACJ,CAAC;QAED,OAAO,GAAG,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;IAChD,CAAC,CAAC,CAAC;AACP,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED