@astrale-os/kernel-protocol 0.5.0-beta.3 → 0.5.0-beta.4
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/invocation/admission.d.ts +2 -2
- package/dist/invocation/admission.d.ts.map +1 -1
- package/dist/invocation/admission.js +4 -3
- package/dist/invocation/admission.js.map +1 -1
- package/dist/invocation/index.d.ts +1 -1
- package/dist/invocation/index.d.ts.map +1 -1
- package/dist/invocation/index.js +1 -1
- package/dist/invocation/index.js.map +1 -1
- package/dist/invocation/redirect.d.ts +9 -7
- package/dist/invocation/redirect.d.ts.map +1 -1
- package/dist/invocation/redirect.js +6 -4
- package/dist/invocation/redirect.js.map +1 -1
- package/dist/invocation/routing.d.ts +3 -2
- package/dist/invocation/routing.d.ts.map +1 -1
- package/dist/invocation/routing.js +4 -3
- package/dist/invocation/routing.js.map +1 -1
- package/dist/invocation/schema.d.ts +2 -2
- package/dist/invocation/schema.d.ts.map +1 -1
- package/dist/invocation/schema.js +2 -2
- package/dist/invocation/schema.js.map +1 -1
- package/dist/invocation/service-reason.d.ts +17 -9
- package/dist/invocation/service-reason.d.ts.map +1 -1
- package/dist/invocation/service-reason.js +18 -6
- package/dist/invocation/service-reason.js.map +1 -1
- package/dist/issuer/configuration.d.ts +1 -1
- package/dist/issuer/configuration.d.ts.map +1 -1
- package/dist/issuer/hosted.d.ts +1 -1
- package/dist/issuer/hosted.d.ts.map +1 -1
- package/dist/issuer/key-set.d.ts +1 -1
- package/dist/issuer/key-set.d.ts.map +1 -1
- package/dist/issuer/key-set.js +3 -2
- package/dist/issuer/key-set.js.map +1 -1
- package/dist/issuer/url.d.ts +1 -1
- package/dist/issuer/url.d.ts.map +1 -1
- package/dist/issuer/url.js +3 -2
- package/dist/issuer/url.js.map +1 -1
- package/dist/publication/bindings/callable.d.ts +1 -1
- package/dist/publication/bindings/callable.d.ts.map +1 -1
- package/dist/publication/bindings/callable.js +1 -1
- package/dist/publication/bindings/callable.js.map +1 -1
- package/dist/publication/bindings/view.d.ts +1 -1
- package/dist/publication/bindings/view.d.ts.map +1 -1
- package/dist/publication/bindings/view.js +1 -1
- package/dist/publication/bindings/view.js.map +1 -1
- package/dist/publication/bundle-admission.d.ts +5 -0
- package/dist/publication/bundle-admission.d.ts.map +1 -0
- package/dist/publication/bundle-admission.js +66 -0
- package/dist/publication/bundle-admission.js.map +1 -0
- package/dist/publication/bundle-descriptor.d.ts +10 -0
- package/dist/publication/bundle-descriptor.d.ts.map +1 -0
- package/dist/publication/bundle-descriptor.js +20 -0
- package/dist/publication/bundle-descriptor.js.map +1 -0
- package/dist/publication/bundle-evidence.d.ts +4 -0
- package/dist/publication/bundle-evidence.d.ts.map +1 -0
- package/dist/publication/bundle-evidence.js +14 -0
- package/dist/publication/bundle-evidence.js.map +1 -0
- package/dist/publication/bundle.d.ts +4 -10
- package/dist/publication/bundle.d.ts.map +1 -1
- package/dist/publication/bundle.js +5 -25
- package/dist/publication/bundle.js.map +1 -1
- package/dist/publication/declaration.d.ts +12 -0
- package/dist/publication/declaration.d.ts.map +1 -0
- package/dist/publication/declaration.js +2 -0
- package/dist/publication/declaration.js.map +1 -0
- package/dist/publication/delivery/claims.d.ts +8 -7
- package/dist/publication/delivery/claims.d.ts.map +1 -1
- package/dist/publication/delivery/claims.js +6 -6
- package/dist/publication/delivery/claims.js.map +1 -1
- package/dist/publication/delivery/delivery.d.ts +1 -1
- package/dist/publication/delivery/delivery.d.ts.map +1 -1
- package/dist/publication/delivery/delivery.js +1 -1
- package/dist/publication/delivery/delivery.js.map +1 -1
- package/dist/publication/delivery/request.d.ts +3 -3
- package/dist/publication/delivery/request.d.ts.map +1 -1
- package/dist/publication/delivery/request.js +4 -3
- package/dist/publication/delivery/request.js.map +1 -1
- package/dist/publication/delivery-declaration.d.ts +5 -0
- package/dist/publication/delivery-declaration.d.ts.map +1 -0
- package/dist/publication/delivery-declaration.js +26 -0
- package/dist/publication/delivery-declaration.js.map +1 -0
- package/dist/publication/index.d.ts +6 -2
- package/dist/publication/index.d.ts.map +1 -1
- package/dist/publication/index.js +4 -1
- package/dist/publication/index.js.map +1 -1
- package/dist/publication/manifest.d.ts +1 -1
- package/dist/publication/manifest.d.ts.map +1 -1
- package/dist/publication/manifest.js +1 -1
- package/dist/publication/manifest.js.map +1 -1
- package/dist/publication/publication.d.ts +3 -5
- package/dist/publication/publication.d.ts.map +1 -1
- package/dist/publication/publication.js +7 -66
- package/dist/publication/publication.js.map +1 -1
- package/dist/publication/reference.d.ts +3 -2
- package/dist/publication/reference.d.ts.map +1 -1
- package/dist/publication/reference.js +7 -6
- package/dist/publication/reference.js.map +1 -1
- package/dist/publication/requirements.d.ts +3 -2
- package/dist/publication/requirements.d.ts.map +1 -1
- package/dist/publication/requirements.js +16 -11
- package/dist/publication/requirements.js.map +1 -1
- package/dist/publication/route.d.ts +6 -1
- package/dist/publication/route.d.ts.map +1 -1
- package/dist/publication/route.js +31 -8
- package/dist/publication/route.js.map +1 -1
- package/dist/publication/schema.d.ts +3 -3
- package/dist/publication/schema.d.ts.map +1 -1
- package/dist/publication/schema.js +3 -3
- package/dist/publication/schema.js.map +1 -1
- package/dist/routes/admission.d.ts +4 -0
- package/dist/routes/admission.d.ts.map +1 -0
- package/dist/routes/admission.js +90 -0
- package/dist/routes/admission.js.map +1 -0
- package/dist/routes/binding.d.ts +7 -0
- package/dist/routes/binding.d.ts.map +1 -0
- package/dist/routes/binding.js +28 -0
- package/dist/routes/binding.js.map +1 -0
- package/dist/routes/collision.d.ts +3 -0
- package/dist/routes/collision.d.ts.map +1 -0
- package/dist/routes/collision.js +17 -0
- package/dist/routes/collision.js.map +1 -0
- package/dist/routes/compiler.d.ts +9 -0
- package/dist/routes/compiler.d.ts.map +1 -0
- package/dist/routes/compiler.js +48 -0
- package/dist/routes/compiler.js.map +1 -0
- package/dist/routes/credential.d.ts +7 -7
- package/dist/routes/credential.d.ts.map +1 -1
- package/dist/routes/credential.js +7 -7
- package/dist/routes/credential.js.map +1 -1
- package/dist/routes/decode.d.ts +4 -2
- package/dist/routes/decode.d.ts.map +1 -1
- package/dist/routes/decode.js +36 -31
- package/dist/routes/decode.js.map +1 -1
- package/dist/routes/encode.d.ts +3 -2
- package/dist/routes/encode.d.ts.map +1 -1
- package/dist/routes/encode.js +25 -22
- package/dist/routes/encode.js.map +1 -1
- package/dist/routes/evidence.d.ts +6 -0
- package/dist/routes/evidence.d.ts.map +1 -0
- package/dist/routes/evidence.js +38 -0
- package/dist/routes/evidence.js.map +1 -0
- package/dist/routes/index.d.ts +9 -2
- package/dist/routes/index.d.ts.map +1 -1
- package/dist/routes/index.js +6 -2
- package/dist/routes/index.js.map +1 -1
- package/dist/routes/mapping.d.ts +1 -1
- package/dist/routes/mapping.d.ts.map +1 -1
- package/dist/routes/mapping.js +4 -12
- package/dist/routes/mapping.js.map +1 -1
- package/dist/routes/match.d.ts +3 -3
- package/dist/routes/match.d.ts.map +1 -1
- package/dist/routes/match.js +3 -4
- package/dist/routes/match.js.map +1 -1
- package/dist/routes/placement.d.ts +6 -0
- package/dist/routes/placement.d.ts.map +1 -0
- package/dist/routes/placement.js +19 -0
- package/dist/routes/placement.js.map +1 -0
- package/dist/routes/plan.d.ts +24 -0
- package/dist/routes/plan.d.ts.map +1 -0
- package/dist/routes/plan.js +2 -0
- package/dist/routes/plan.js.map +1 -0
- package/dist/routes/release-unavailable.d.ts +9 -0
- package/dist/routes/release-unavailable.d.ts.map +1 -0
- package/dist/routes/release-unavailable.js +33 -0
- package/dist/routes/release-unavailable.js.map +1 -0
- package/dist/routes/reservation.d.ts +3 -3
- package/dist/routes/reservation.d.ts.map +1 -1
- package/dist/routes/reservation.js +4 -4
- package/dist/routes/reservation.js.map +1 -1
- package/dist/routes/scalar.d.ts +4 -3
- package/dist/routes/scalar.d.ts.map +1 -1
- package/dist/routes/scalar.js +14 -10
- package/dist/routes/scalar.js.map +1 -1
- package/dist/routes/select.d.ts +2 -2
- package/dist/routes/select.d.ts.map +1 -1
- package/dist/routes/select.js +2 -2
- package/dist/routes/select.js.map +1 -1
- package/dist/routes/table.d.ts +10 -0
- package/dist/routes/table.d.ts.map +1 -0
- package/dist/routes/table.js +2 -0
- package/dist/routes/table.js.map +1 -0
- package/dist/routes/target.d.ts +14 -0
- package/dist/routes/target.d.ts.map +1 -0
- package/dist/routes/target.js +4 -0
- package/dist/routes/target.js.map +1 -0
- package/dist/runtime/artifact.d.ts +1 -1
- package/dist/runtime/artifact.d.ts.map +1 -1
- package/dist/runtime/artifact.js +2 -2
- package/dist/runtime/artifact.js.map +1 -1
- package/package.json +96 -3
- package/dist/routes/compile.d.ts +0 -5
- package/dist/routes/compile.d.ts.map +0 -1
- package/dist/routes/compile.js +0 -69
- package/dist/routes/compile.js.map +0 -1
- package/dist/routes/route.d.ts +0 -13
- package/dist/routes/route.d.ts.map +0 -1
- package/dist/routes/route.js +0 -6
- package/dist/routes/route.js.map +0 -1
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { accept as acceptPortable } from '@astrale-os/kernel-dsl/value';
|
|
2
|
+
import { acceptReference } from '../publication/reference.js';
|
|
3
|
+
import { admitRoute } from '../publication/route.js';
|
|
4
|
+
import { fail } from './error.js';
|
|
5
|
+
const AUTHENTICATION = new Set(['anonymous', 'authenticated', 'authorized']);
|
|
6
|
+
const OUTPUT = new Set(['value', 'stream', 'binary']);
|
|
7
|
+
/** Admit one emitted portable Table before Server composition. */
|
|
8
|
+
export function acceptTable(input) {
|
|
9
|
+
const value = object(acceptPortable(input), 'Route Table');
|
|
10
|
+
exact(value, ['publication', 'entries'], 'Route Table');
|
|
11
|
+
const reference = acceptReference(value.publication);
|
|
12
|
+
if (!Array.isArray(value.entries))
|
|
13
|
+
invalid('Route Table entries');
|
|
14
|
+
const entries = value.entries.map((entry) => acceptRoute(entry, reference.origin));
|
|
15
|
+
if (new Set(entries.map(({ name }) => name)).size !== entries.length) {
|
|
16
|
+
fail('NATIVE_ROUTE_BINDING_INVALID', 'Route Table names must be unique.');
|
|
17
|
+
}
|
|
18
|
+
return Object.freeze({ publication: reference, entries: Object.freeze(entries) });
|
|
19
|
+
}
|
|
20
|
+
function acceptRoute(input, origin) {
|
|
21
|
+
const value = object(input, 'Route Table entry');
|
|
22
|
+
exact(value, ['name', 'callable', 'target', 'authentication', 'output', 'href', 'method', 'default'], 'Route Table entry', ['requestMethod', 'query', 'headers', 'body', 'credential']);
|
|
23
|
+
if (typeof value.default !== 'boolean')
|
|
24
|
+
invalid('Route Table default');
|
|
25
|
+
if (typeof value.authentication !== 'string' || !AUTHENTICATION.has(value.authentication)) {
|
|
26
|
+
invalid('Route Table authentication');
|
|
27
|
+
}
|
|
28
|
+
if (typeof value.output !== 'string' || !OUTPUT.has(value.output))
|
|
29
|
+
invalid('Route Table output');
|
|
30
|
+
const wire = admitRoute({
|
|
31
|
+
name: value.name,
|
|
32
|
+
callable: value.callable,
|
|
33
|
+
href: value.href,
|
|
34
|
+
method: value.method,
|
|
35
|
+
...(value.default === true ? { default: true } : {}),
|
|
36
|
+
...(value.requestMethod === undefined ? {} : { requestMethod: value.requestMethod }),
|
|
37
|
+
...(value.query === undefined ? {} : { query: value.query }),
|
|
38
|
+
...(value.headers === undefined ? {} : { headers: value.headers }),
|
|
39
|
+
...(value.body === undefined ? {} : { body: value.body }),
|
|
40
|
+
...(value.credential === undefined ? {} : { credential: value.credential }),
|
|
41
|
+
...receiver(value.target),
|
|
42
|
+
}, origin);
|
|
43
|
+
const { default: _default, receiver: _receiver, ...common } = wire;
|
|
44
|
+
return Object.freeze({
|
|
45
|
+
...common,
|
|
46
|
+
target: target(value.target),
|
|
47
|
+
authentication: value.authentication,
|
|
48
|
+
output: value.output,
|
|
49
|
+
default: value.default,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
function target(input) {
|
|
53
|
+
const value = object(input, 'Route target');
|
|
54
|
+
if (value.kind === 'function') {
|
|
55
|
+
exact(value, ['kind'], 'Route Function target');
|
|
56
|
+
return Object.freeze({ kind: 'function' });
|
|
57
|
+
}
|
|
58
|
+
if (value.kind !== 'method' || (value.dispatch !== 'static' && value.dispatch !== 'instance')) {
|
|
59
|
+
invalid('Route Method target');
|
|
60
|
+
}
|
|
61
|
+
if (value.dispatch === 'static') {
|
|
62
|
+
exact(value, ['kind', 'dispatch'], 'Route static Method target');
|
|
63
|
+
return Object.freeze({ kind: 'method', dispatch: 'static' });
|
|
64
|
+
}
|
|
65
|
+
exact(value, ['kind', 'dispatch', 'receiver'], 'Route instance Method target');
|
|
66
|
+
if (typeof value.receiver !== 'string')
|
|
67
|
+
invalid('Route receiver');
|
|
68
|
+
return Object.freeze({ kind: 'method', dispatch: 'instance', receiver: value.receiver });
|
|
69
|
+
}
|
|
70
|
+
function receiver(input) {
|
|
71
|
+
const admitted = target(input);
|
|
72
|
+
return admitted.kind === 'method' && admitted.dispatch === 'instance'
|
|
73
|
+
? { receiver: admitted.receiver }
|
|
74
|
+
: {};
|
|
75
|
+
}
|
|
76
|
+
function object(input, label) {
|
|
77
|
+
if (input === null || typeof input !== 'object' || Array.isArray(input))
|
|
78
|
+
invalid(label);
|
|
79
|
+
return input;
|
|
80
|
+
}
|
|
81
|
+
function exact(value, required, label, optional = []) {
|
|
82
|
+
const allowed = new Set([...required, ...optional]);
|
|
83
|
+
if (Object.keys(value).some((key) => !allowed.has(key)) ||
|
|
84
|
+
required.some((key) => !Object.hasOwn(value, key)))
|
|
85
|
+
invalid(label);
|
|
86
|
+
}
|
|
87
|
+
function invalid(label) {
|
|
88
|
+
return fail('NATIVE_ROUTE_BINDING_INVALID', `${label} is invalid.`);
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=admission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"admission.js","sourceRoot":"","sources":["../../routes/admission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAKvE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC,CAAA;AAC5E,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;AAErD,kEAAkE;AAClE,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAA;IAC1D,KAAK,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,aAAa,CAAC,CAAA;IACvD,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACjE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IAClF,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;QACrE,IAAI,CAAC,8BAA8B,EAAE,mCAAmC,CAAC,CAAA;IAC3E,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;AACnF,CAAC;AAED,SAAS,WAAW,CAAC,KAAgB,EAAE,MAAc;IACnD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAA;IAChD,KAAK,CACH,KAAK,EACL,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,EACvF,mBAAmB,EACnB,CAAC,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,CAC5D,CAAA;IACD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,SAAS;QAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACtE,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1F,OAAO,CAAC,4BAA4B,CAAC,CAAA;IACvC,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAChG,MAAM,IAAI,GAAG,UAAU,CACrB;QACE,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,GAAG,CAAC,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5D,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QAClE,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACzD,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;QAC3E,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;KAC1B,EACD,MAAM,CACP,CAAA;IACD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAClE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,MAAM;QACT,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAC5B,cAAc,EAAE,KAAK,CAAC,cAAyC;QAC/D,MAAM,EAAE,KAAK,CAAC,MAAyB;QACvC,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,KAA4B;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAA;IAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9B,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAA;QAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;IAC5C,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,KAAK,UAAU,CAAC,EAAE,CAAC;QAC9F,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAChC,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAA;QAChE,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC9D,CAAC;IACD,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,8BAA8B,CAAC,CAAA;IAC9E,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACjE,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;AAC1F,CAAC;AAED,SAAS,QAAQ,CAAC,KAA4B;IAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,QAAQ,KAAK,UAAU;QACnE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;QACjC,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAED,SAAS,MAAM,CAAC,KAA4B,EAAE,KAAa;IACzD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACvF,OAAO,KAAmB,CAAA;AAC5B,CAAC;AAED,SAAS,KAAK,CACZ,KAAiB,EACjB,QAA2B,EAC3B,KAAa,EACb,QAAQ,GAAsB,EAAE;IAEhC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAA;IACnD,IACE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnD,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAElD,OAAO,CAAC,KAAK,CAAC,CAAA;AAClB,CAAC;AAED,SAAS,OAAO,CAAC,KAAa;IAC5B,OAAO,IAAI,CAAC,8BAA8B,EAAE,GAAG,KAAK,cAAc,CAAC,CAAA;AACrE,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { schema } from '@astrale-os/kernel-dsl/v1';
|
|
2
|
+
import type { Publication } from '../publication/publication.js';
|
|
3
|
+
import type { Plan } from './plan.js';
|
|
4
|
+
import type { Table } from './table.js';
|
|
5
|
+
/** Bind one Plan to an exact placed Publication and matching Validator. */
|
|
6
|
+
export declare function bind(plan: Plan, deployed: Publication, validator: schema.Validator): Table;
|
|
7
|
+
//# sourceMappingURL=binding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binding.d.ts","sourceRoot":"","sources":["../../routes/binding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAIvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAS,KAAK,EAAE,MAAM,YAAY,CAAA;AAO9C,2EAA2E;AAC3E,wBAAgB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,KAAK,CAwB1F"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { json } from '@astrale-os/kernel-dsl/value';
|
|
2
|
+
import { reference } from '../publication/reference.js';
|
|
3
|
+
import { fail } from './error.js';
|
|
4
|
+
import { place } from './placement.js';
|
|
5
|
+
import { rejectReserved } from './reservation.js';
|
|
6
|
+
/** Bind one Plan to an exact placed Publication and matching Validator. */
|
|
7
|
+
export function bind(plan, deployed, validator) {
|
|
8
|
+
if (plan.origin !== deployed.origin ||
|
|
9
|
+
plan.origin !== validator.origin ||
|
|
10
|
+
plan.revision !== deployed.schema.revision ||
|
|
11
|
+
plan.revision !== validator.revision) {
|
|
12
|
+
fail('NATIVE_ROUTE_BINDING_INVALID', 'Route Plan, Publication, and Validator identity differ.');
|
|
13
|
+
}
|
|
14
|
+
if (json.serialize(place(plan, deployed.identity.issuer)) !==
|
|
15
|
+
json.serialize(deployed.routes)) {
|
|
16
|
+
fail('NATIVE_ROUTE_BINDING_INVALID', 'Publication routes differ from the placed Route Plan.');
|
|
17
|
+
}
|
|
18
|
+
const entries = plan.entries.map((entry, index) => {
|
|
19
|
+
const { path: _path, ...portable } = entry;
|
|
20
|
+
return Object.freeze({ ...portable, href: deployed.routes[index].href });
|
|
21
|
+
});
|
|
22
|
+
rejectReserved(deployed, entries);
|
|
23
|
+
return Object.freeze({
|
|
24
|
+
publication: reference(deployed),
|
|
25
|
+
entries: Object.freeze(entries),
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=binding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binding.js","sourceRoot":"","sources":["../../routes/binding.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAMnD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,2EAA2E;AAC3E,MAAM,UAAU,IAAI,CAAC,IAAU,EAAE,QAAqB,EAAE,SAA2B;IACjF,IACE,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QAC/B,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QAChC,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,MAAM,CAAC,QAAQ;QAC1C,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EACpC,CAAC;QACD,IAAI,CAAC,8BAA8B,EAAE,yDAAyD,CAAC,CAAA;IACjG,CAAC;IACD,IACE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAU,CAAC;QAC9D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAe,CAAC,EACxC,CAAC;QACD,IAAI,CAAC,8BAA8B,EAAE,uDAAuD,CAAC,CAAA;IAC/F,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAS,EAAE;QACvD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,CAAA;QAC1C,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3E,CAAC,CAAC,CAAA;IACF,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACjC,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;KAChC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"collision.d.ts","sourceRoot":"","sources":["../../routes/collision.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAKvC,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,GAAG,IAAI,CAUhE"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { fail } from './error.js';
|
|
2
|
+
import { templatesOverlap } from './template.js';
|
|
3
|
+
export function rejectCollisions(entries) {
|
|
4
|
+
const accepted = [];
|
|
5
|
+
for (const entry of entries) {
|
|
6
|
+
for (const previous of accepted) {
|
|
7
|
+
if (overlap(entry.method, previous.method) && templatesOverlap(entry.href, previous.href)) {
|
|
8
|
+
fail('NATIVE_ROUTE_COLLISION', `Route ${entry.name} collides with ${previous.name}.`);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
accepted.push(entry);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
function overlap(left, right) {
|
|
15
|
+
return left === '*' || right === '*' || left === right;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=collision.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"collision.js","sourceRoot":"","sources":["../../routes/collision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,MAAM,UAAU,gBAAgB,CAAC,OAAyB;IACxD,MAAM,QAAQ,GAAY,EAAE,CAAA;IAC5B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;YAChC,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1F,IAAI,CAAC,wBAAwB,EAAE,SAAS,KAAK,CAAC,IAAI,kBAAkB,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAA;YACvF,CAAC;QACH,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,IAAgB,EAAE,KAAiB;IAClD,OAAO,IAAI,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,IAAI,IAAI,KAAK,KAAK,CAAA;AACxD,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { schema } from '@astrale-os/kernel-dsl/v1';
|
|
2
|
+
import type * as publication from '../publication/index.js';
|
|
3
|
+
import type { Plan } from './plan.js';
|
|
4
|
+
export interface CompileInput {
|
|
5
|
+
readonly routes: readonly publication.HttpRouteDeclaration[];
|
|
6
|
+
readonly validator: schema.Validator;
|
|
7
|
+
}
|
|
8
|
+
export declare function compile(input: CompileInput): Plan;
|
|
9
|
+
//# sourceMappingURL=compiler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../routes/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAEvD,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAa,MAAM,WAAW,CAAA;AAShD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,CAAC,oBAAoB,EAAE,CAAA;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAA;CACrC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CA+CjD"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { admitRouteDeclaration } from '../publication/route.js';
|
|
2
|
+
import { rejectCollisions } from './collision.js';
|
|
3
|
+
import { fail } from './error.js';
|
|
4
|
+
import { validateCredentialMapping, validateMapping, validateWireMapping } from './mapping.js';
|
|
5
|
+
import { placePath } from './placement.js';
|
|
6
|
+
import { validateTemplate } from './template.js';
|
|
7
|
+
export function compile(input) {
|
|
8
|
+
if (input === null || typeof input !== 'object' || !Array.isArray(input.routes)) {
|
|
9
|
+
throw new TypeError('Route compilation input is invalid.');
|
|
10
|
+
}
|
|
11
|
+
const authored = input.routes.map((entry) => admitRouteDeclaration(entry, input.validator.origin));
|
|
12
|
+
const entries = authored.map((declaration) => {
|
|
13
|
+
const meaning = input.validator.callable(declaration.callable);
|
|
14
|
+
if (meaning === undefined) {
|
|
15
|
+
fail('NATIVE_ROUTE_BINDING_INVALID', `Unknown callable ${declaration.callable}.`);
|
|
16
|
+
}
|
|
17
|
+
const href = placePath(declaration.path, 'https://routes.invalid');
|
|
18
|
+
const route = { ...declaration, href };
|
|
19
|
+
validateTemplate(href);
|
|
20
|
+
validateMapping(route, meaning.fields, meaning.target.kind === 'method' && meaning.target.dispatch === 'instance');
|
|
21
|
+
validateWireMapping(route);
|
|
22
|
+
validateCredentialMapping(route);
|
|
23
|
+
if (route.method === 'GET' && route.body !== undefined) {
|
|
24
|
+
fail('NATIVE_ROUTE_DECLARATION_INVALID', `GET route ${route.name} cannot declare a body.`);
|
|
25
|
+
}
|
|
26
|
+
const target = meaning.target.kind === 'function'
|
|
27
|
+
? { kind: 'function' }
|
|
28
|
+
: meaning.target.dispatch === 'static'
|
|
29
|
+
? { kind: 'method', dispatch: 'static' }
|
|
30
|
+
: { kind: 'method', dispatch: 'instance', receiver: route.receiver };
|
|
31
|
+
const { href: _href, receiver: _receiver, ...portable } = route;
|
|
32
|
+
return Object.freeze({
|
|
33
|
+
...portable,
|
|
34
|
+
target,
|
|
35
|
+
authentication: meaning.authentication,
|
|
36
|
+
output: meaning.output,
|
|
37
|
+
path: declaration.path,
|
|
38
|
+
default: declaration.default === true,
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
rejectCollisions(entries.map((entry) => ({ ...entry, href: placePath(entry.path, 'https://routes.invalid') })));
|
|
42
|
+
return Object.freeze({
|
|
43
|
+
origin: input.validator.origin,
|
|
44
|
+
revision: input.validator.revision,
|
|
45
|
+
entries: Object.freeze(entries),
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=compiler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../routes/compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { HttpRoute, SingleCredentialSource } from '../publication/index.js';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function credentialSources(route: HttpRoute): readonly SingleCredentialSource[];
|
|
4
|
-
export declare function firstCredentialIsAmbient(entry:
|
|
5
|
-
export declare function specificHeaderWires(entry:
|
|
6
|
-
export declare function putCredential(entry:
|
|
7
|
-
export declare function withoutCredentialHeaders(entry:
|
|
8
|
-
export declare function readCredential(entry:
|
|
2
|
+
import type { Route } from './table.js';
|
|
3
|
+
export declare function credentialSources(route: Pick<HttpRoute, 'credential'>): readonly SingleCredentialSource[];
|
|
4
|
+
export declare function firstCredentialIsAmbient(entry: Route): boolean;
|
|
5
|
+
export declare function specificHeaderWires(entry: Route): ReadonlySet<string>;
|
|
6
|
+
export declare function putCredential(entry: Route, url: URL, headers: Record<string, string>, credential: string): void;
|
|
7
|
+
export declare function withoutCredentialHeaders(entry: Route, input: Readonly<Record<string, string>>): Record<string, string>;
|
|
8
|
+
export declare function readCredential(entry: Route, url: URL, headers: Record<string, string>): string | undefined;
|
|
9
9
|
//# sourceMappingURL=credential.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.d.ts","sourceRoot":"","sources":["../../routes/credential.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"credential.d.ts","sourceRoot":"","sources":["../../routes/credential.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAIvC,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,GACnC,SAAS,sBAAsB,EAAE,CAGnC;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE9D;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAMrE;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,UAAU,EAAE,MAAM,GACjB,IAAI,CAaN;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBxB;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,MAAM,GAAG,SAAS,CA2BpB"}
|
|
@@ -4,19 +4,19 @@ export function credentialSources(route) {
|
|
|
4
4
|
return Array.isArray(source) ? source : [source];
|
|
5
5
|
}
|
|
6
6
|
export function firstCredentialIsAmbient(entry) {
|
|
7
|
-
return credentialSources(entry
|
|
7
|
+
return credentialSources(entry)[0].in === 'cookie';
|
|
8
8
|
}
|
|
9
9
|
export function specificHeaderWires(entry) {
|
|
10
|
-
return new Set(Object.values(entry.
|
|
10
|
+
return new Set(Object.values(entry.headers ?? {})
|
|
11
11
|
.filter((wire) => wire !== '*')
|
|
12
12
|
.map((wire) => wire.toLowerCase()));
|
|
13
13
|
}
|
|
14
14
|
export function putCredential(entry, url, headers, credential) {
|
|
15
|
-
if (entry.
|
|
15
|
+
if (entry.credential === undefined) {
|
|
16
16
|
headers.authorization = `Bearer ${credential}`;
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
const source = credentialSources(entry
|
|
19
|
+
const source = credentialSources(entry)[0];
|
|
20
20
|
if (source.in === 'header') {
|
|
21
21
|
headers[(source.name ?? 'authorization').toLowerCase()] = credential;
|
|
22
22
|
}
|
|
@@ -36,7 +36,7 @@ export function withoutCredentialHeaders(entry, input) {
|
|
|
36
36
|
}
|
|
37
37
|
output[canonical] = value;
|
|
38
38
|
}
|
|
39
|
-
for (const source of credentialSources(entry
|
|
39
|
+
for (const source of credentialSources(entry)) {
|
|
40
40
|
if (source.in === 'header') {
|
|
41
41
|
delete output[(source.name ?? 'authorization').toLowerCase()];
|
|
42
42
|
continue;
|
|
@@ -53,7 +53,7 @@ export function withoutCredentialHeaders(entry, input) {
|
|
|
53
53
|
}
|
|
54
54
|
export function readCredential(entry, url, headers) {
|
|
55
55
|
const found = [];
|
|
56
|
-
if (entry.
|
|
56
|
+
if (entry.credential === undefined) {
|
|
57
57
|
const authorization = headers.authorization;
|
|
58
58
|
if (authorization === undefined)
|
|
59
59
|
return undefined;
|
|
@@ -62,7 +62,7 @@ export function readCredential(entry, url, headers) {
|
|
|
62
62
|
invalidRequest('Authorization must contain one Bearer credential.');
|
|
63
63
|
return matched[1];
|
|
64
64
|
}
|
|
65
|
-
for (const source of credentialSources(entry
|
|
65
|
+
for (const source of credentialSources(entry)) {
|
|
66
66
|
let value;
|
|
67
67
|
if (source.in === 'header') {
|
|
68
68
|
value = headers[(source.name ?? 'authorization').toLowerCase()];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.js","sourceRoot":"","sources":["../../routes/credential.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,UAAU,iBAAiB,
|
|
1
|
+
{"version":3,"file":"credential.js","sourceRoot":"","sources":["../../routes/credential.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/decode.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import type { schema } from '@astrale-os/kernel-dsl/v1';
|
|
2
|
+
import type { PublicationRef } from '../publication/index.js';
|
|
1
3
|
import type { HttpRequest, Invocation } from './request.js';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function decode(entry:
|
|
4
|
+
import type { Route } from './table.js';
|
|
5
|
+
export declare function decode(entry: Route, request: HttpRequest, validator: schema.Validator, served: PublicationRef): Invocation;
|
|
4
6
|
//# sourceMappingURL=decode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../routes/decode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../routes/decode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAYvC,wBAAgB,MAAM,CACpB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,CAAC,SAAS,EAC3B,MAAM,EAAE,cAAc,GACrB,UAAU,CAiIZ"}
|
package/dist/routes/decode.js
CHANGED
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import { NodePath, Path } from '@astrale-os/kernel-core/path';
|
|
2
|
-
import { Key, Ref } from '@astrale-os/kernel-dsl/v1';
|
|
2
|
+
import { Key, Ref } from '@astrale-os/kernel-dsl/v1/addressing';
|
|
3
3
|
import * as portable from '@astrale-os/kernel-dsl/value';
|
|
4
4
|
import { readCredential, specificHeaderWires, withoutCredentialHeaders } from './credential.js';
|
|
5
5
|
import { fail, invalidRequest } from './error.js';
|
|
6
6
|
import { isReservedHeader } from './mapping.js';
|
|
7
7
|
import { methodMatches } from './match.js';
|
|
8
8
|
import { bodyText, normalizeHeaders, parseJsonObject } from './request.js';
|
|
9
|
-
import { requiresReceiver } from './route.js';
|
|
10
9
|
import { decodeRouting } from './routing.js';
|
|
11
|
-
import {
|
|
10
|
+
import { decodeScalar } from './scalar.js';
|
|
11
|
+
import { requiresReceiver } from './target.js';
|
|
12
12
|
import { matchTemplate, PLACEHOLDER } from './template.js';
|
|
13
|
-
export function decode(entry, request) {
|
|
13
|
+
export function decode(entry, request, validator, served) {
|
|
14
14
|
if (!methodMatches(entry, request.method))
|
|
15
15
|
invalidRequest('HTTP method does not match the route.');
|
|
16
|
-
const matched = matchTemplate(entry.
|
|
16
|
+
const matched = matchTemplate(entry.href, request.url);
|
|
17
17
|
if (matched === undefined)
|
|
18
18
|
invalidRequest('URL does not match the route template.');
|
|
19
19
|
const values = {};
|
|
20
20
|
for (const [name, value] of Object.entries(matched)) {
|
|
21
|
-
values[name] = decodeScalar(entry, name, value);
|
|
21
|
+
values[name] = decodeScalar(entry, name, value, validator);
|
|
22
22
|
}
|
|
23
|
-
if (entry.
|
|
24
|
-
values[entry.
|
|
23
|
+
if (entry.requestMethod !== undefined) {
|
|
24
|
+
values[entry.requestMethod] = decodeScalar(entry, entry.requestMethod, request.method.toUpperCase(), validator);
|
|
25
25
|
}
|
|
26
26
|
let url;
|
|
27
27
|
try {
|
|
@@ -35,32 +35,32 @@ export function decode(entry, request) {
|
|
|
35
35
|
}
|
|
36
36
|
const headers = normalizeHeaders(request.headers);
|
|
37
37
|
const credential = readCredential(entry, url, headers);
|
|
38
|
-
const routing = decodeRouting(request,
|
|
38
|
+
const routing = decodeRouting(request, served);
|
|
39
39
|
const applicationHeaders = withoutCredentialHeaders(entry, headers);
|
|
40
|
-
for (const [name, wire] of Object.entries(entry.
|
|
40
|
+
for (const [name, wire] of Object.entries(entry.query ?? {})) {
|
|
41
41
|
const found = url.searchParams.getAll(wire);
|
|
42
42
|
if (found.length !== 1)
|
|
43
43
|
invalidRequest(`Query parameter ${wire} must occur exactly once.`);
|
|
44
|
-
values[name] = decodeScalar(entry, name, found[0]);
|
|
44
|
+
values[name] = decodeScalar(entry, name, found[0], validator);
|
|
45
45
|
}
|
|
46
|
-
for (const [name, pick] of Object.entries(entry.
|
|
46
|
+
for (const [name, pick] of Object.entries(entry.headers ?? {})) {
|
|
47
47
|
if (pick === '*') {
|
|
48
48
|
const explicit = specificHeaderWires(entry);
|
|
49
49
|
values[name] = Object.fromEntries(Object.entries(applicationHeaders).filter(([header]) => !explicit.has(header) &&
|
|
50
50
|
header !== 'accept' &&
|
|
51
51
|
!isReservedHeader(header) &&
|
|
52
|
-
(entry.
|
|
52
|
+
(entry.body === undefined || header !== 'content-type')));
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
55
55
|
const value = headers[pick.toLowerCase()];
|
|
56
56
|
if (value === undefined)
|
|
57
57
|
invalidRequest(`Missing header ${pick}.`);
|
|
58
|
-
values[name] = decodeScalar(entry, name, value);
|
|
58
|
+
values[name] = decodeScalar(entry, name, value, validator);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
if (entry.
|
|
61
|
+
if (entry.body === '*') {
|
|
62
62
|
const body = parseJsonObject(request.body);
|
|
63
|
-
const allowed = remainderFields(entry);
|
|
63
|
+
const allowed = remainderFields(entry, validator);
|
|
64
64
|
for (const name of Object.keys(body)) {
|
|
65
65
|
if (!allowed.has(name)) {
|
|
66
66
|
invalidRequest(`JSON body field ${name} is not owned by the route remainder mapping.`);
|
|
@@ -68,10 +68,10 @@ export function decode(entry, request) {
|
|
|
68
68
|
}
|
|
69
69
|
Object.assign(values, body);
|
|
70
70
|
}
|
|
71
|
-
else if (entry.
|
|
72
|
-
const needsText = Object.values(entry.
|
|
71
|
+
else if (entry.body !== undefined) {
|
|
72
|
+
const needsText = Object.values(entry.body).some((pick) => typeof pick !== 'string');
|
|
73
73
|
const body = needsText ? bodyText(request.body) : parseJsonObject(request.body);
|
|
74
|
-
for (const [name, pick] of Object.entries(entry.
|
|
74
|
+
for (const [name, pick] of Object.entries(entry.body)) {
|
|
75
75
|
if (typeof pick !== 'string') {
|
|
76
76
|
values[name] = body;
|
|
77
77
|
}
|
|
@@ -85,7 +85,10 @@ export function decode(entry, request) {
|
|
|
85
85
|
}
|
|
86
86
|
let receiver;
|
|
87
87
|
if (requiresReceiver(entry)) {
|
|
88
|
-
const
|
|
88
|
+
const receiverName = entry.target.kind === 'method' && entry.target.dispatch === 'instance'
|
|
89
|
+
? entry.target.receiver
|
|
90
|
+
: undefined;
|
|
91
|
+
const encodedReceiver = receiverName === undefined ? undefined : values[receiverName];
|
|
89
92
|
if (typeof encodedReceiver !== 'string')
|
|
90
93
|
invalidRequest('Instance route receiver is missing.');
|
|
91
94
|
try {
|
|
@@ -97,7 +100,7 @@ export function decode(entry, request) {
|
|
|
97
100
|
}
|
|
98
101
|
throw cause;
|
|
99
102
|
}
|
|
100
|
-
delete values[
|
|
103
|
+
delete values[receiverName];
|
|
101
104
|
}
|
|
102
105
|
let input;
|
|
103
106
|
try {
|
|
@@ -129,18 +132,20 @@ export function decode(entry, request) {
|
|
|
129
132
|
...(routing === undefined ? {} : { routing }),
|
|
130
133
|
});
|
|
131
134
|
}
|
|
132
|
-
function remainderFields(entry) {
|
|
135
|
+
function remainderFields(entry, validator) {
|
|
133
136
|
const claimed = new Set([
|
|
134
|
-
...[...entry.
|
|
135
|
-
...(entry.
|
|
136
|
-
...Object.keys(entry.
|
|
137
|
-
...Object.keys(entry.
|
|
137
|
+
...[...entry.href.matchAll(PLACEHOLDER)].map((item) => item[1]),
|
|
138
|
+
...(entry.requestMethod === undefined ? [] : [entry.requestMethod]),
|
|
139
|
+
...Object.keys(entry.query ?? {}),
|
|
140
|
+
...Object.keys(entry.headers ?? {}),
|
|
138
141
|
]);
|
|
139
|
-
const
|
|
140
|
-
const
|
|
141
|
-
const
|
|
142
|
-
|
|
143
|
-
|
|
142
|
+
const fields = validator.callable(entry.callable)?.fields ?? [];
|
|
143
|
+
const allowed = new Set(fields.filter((name) => !claimed.has(name)));
|
|
144
|
+
const receiver = entry.target.kind === 'method' && entry.target.dispatch === 'instance'
|
|
145
|
+
? entry.target.receiver
|
|
146
|
+
: undefined;
|
|
147
|
+
if (receiver !== undefined && !claimed.has(receiver)) {
|
|
148
|
+
allowed.add(receiver);
|
|
144
149
|
}
|
|
145
150
|
return allowed;
|
|
146
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decode.js","sourceRoot":"","sources":["../../routes/decode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"decode.js","sourceRoot":"","sources":["../../routes/decode.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/encode.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import type { schema } from '@astrale-os/kernel-dsl/v1';
|
|
1
2
|
import type { Invocation, Request } from './request.js';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function encode(entry:
|
|
3
|
+
import type { Route } from './table.js';
|
|
4
|
+
export declare function encode(entry: Route, invocation: Invocation, validator: schema.Validator): Request;
|
|
4
5
|
//# sourceMappingURL=encode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.d.ts","sourceRoot":"","sources":["../../routes/encode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"encode.d.ts","sourceRoot":"","sources":["../../routes/encode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMvD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAevC,wBAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,OAAO,CAqJjG"}
|