@tsed/platform-router 8.0.0-rc.4 → 8.0.0-rc.6
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/lib/esm/domain/PlatformHandlerMetadata.js +4 -4
- package/lib/esm/domain/PlatformHandlerMetadata.js.map +1 -1
- package/lib/esm/domain/PlatformRouter.js +9 -17
- package/lib/esm/domain/PlatformRouter.js.map +1 -1
- package/lib/esm/domain/PlatformRouters.js +30 -32
- package/lib/esm/domain/PlatformRouters.js.map +1 -1
- package/lib/types/domain/PlatformHandlerMetadata.d.ts +2 -2
- package/lib/types/domain/PlatformRouter.d.ts +1 -3
- package/lib/types/domain/PlatformRouters.d.ts +3 -4
- package/package.json +15 -15
- package/vitest.config.mts +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { nameOf } from "@tsed/core";
|
|
2
|
-
import { ProviderScope } from "@tsed/di";
|
|
2
|
+
import { injector, ProviderScope } from "@tsed/di";
|
|
3
3
|
import { ParamTypes } from "@tsed/platform-params";
|
|
4
4
|
import { EndpointMetadata, JsonEntityStore, JsonParameterStore } from "@tsed/schema";
|
|
5
5
|
import { PlatformHandlerType } from "./PlatformHandlerType.js";
|
|
@@ -46,12 +46,12 @@ export class PlatformHandlerMetadata {
|
|
|
46
46
|
get store() {
|
|
47
47
|
return JsonEntityStore.fromMethod(this.provider.useClass, this.propertyKey);
|
|
48
48
|
}
|
|
49
|
-
static from(
|
|
49
|
+
static from(input, opts = {}) {
|
|
50
50
|
if (input instanceof PlatformHandlerMetadata) {
|
|
51
51
|
return input;
|
|
52
52
|
}
|
|
53
53
|
if (input instanceof EndpointMetadata) {
|
|
54
|
-
const provider = injector.getProvider(opts.token);
|
|
54
|
+
const provider = injector().getProvider(opts.token);
|
|
55
55
|
return new PlatformHandlerMetadata({
|
|
56
56
|
provider,
|
|
57
57
|
type: PlatformHandlerType.ENDPOINT,
|
|
@@ -59,7 +59,7 @@ export class PlatformHandlerMetadata {
|
|
|
59
59
|
opts
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
|
-
const provider = injector.getProvider(input);
|
|
62
|
+
const provider = injector().getProvider(input);
|
|
63
63
|
if (provider) {
|
|
64
64
|
return new PlatformHandlerMetadata({
|
|
65
65
|
provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlatformHandlerMetadata.js","sourceRoot":"","sources":["../../../src/domain/PlatformHandlerMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"PlatformHandlerMetadata.js","sourceRoot":"","sources":["../../../src/domain/PlatformHandlerMetadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
var PlatformRouter_1;
|
|
2
|
-
import { __decorate, __metadata } from "tslib";
|
|
3
1
|
import { isString } from "@tsed/core";
|
|
4
|
-
import {
|
|
2
|
+
import { injectable, ProviderScope } from "@tsed/di";
|
|
5
3
|
import { concatPath } from "@tsed/schema";
|
|
6
4
|
import { formatMethod } from "../utils/formatMethod.js";
|
|
7
5
|
import { PlatformHandlerMetadata } from "./PlatformHandlerMetadata.js";
|
|
@@ -9,13 +7,12 @@ import { PlatformLayer } from "./PlatformLayer.js";
|
|
|
9
7
|
function printHandler(handler) {
|
|
10
8
|
return handler.toString().split("{")[0].trim();
|
|
11
9
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
constructor(injector) {
|
|
15
|
-
this.injector = injector;
|
|
10
|
+
export class PlatformRouter {
|
|
11
|
+
constructor() {
|
|
16
12
|
this.layers = [];
|
|
17
13
|
this.#isBuilt = false;
|
|
18
14
|
}
|
|
15
|
+
#isBuilt;
|
|
19
16
|
use(...handlers) {
|
|
20
17
|
const layer = handlers.reduce((layer, item) => {
|
|
21
18
|
if (isString(item) || item instanceof RegExp) {
|
|
@@ -23,7 +20,7 @@ let PlatformRouter = PlatformRouter_1 = class PlatformRouter {
|
|
|
23
20
|
layer.basePath = item;
|
|
24
21
|
}
|
|
25
22
|
else {
|
|
26
|
-
if (item instanceof
|
|
23
|
+
if (item instanceof PlatformRouter) {
|
|
27
24
|
layer.router = item;
|
|
28
25
|
layer.setLayers(item.layers);
|
|
29
26
|
if (!this.provider && item.provider) {
|
|
@@ -34,7 +31,7 @@ let PlatformRouter = PlatformRouter_1 = class PlatformRouter {
|
|
|
34
31
|
}
|
|
35
32
|
}
|
|
36
33
|
else {
|
|
37
|
-
item = PlatformHandlerMetadata.from(
|
|
34
|
+
item = PlatformHandlerMetadata.from(item);
|
|
38
35
|
}
|
|
39
36
|
layer.handlers.push(item);
|
|
40
37
|
}
|
|
@@ -53,7 +50,7 @@ let PlatformRouter = PlatformRouter_1 = class PlatformRouter {
|
|
|
53
50
|
method: formatMethod(method),
|
|
54
51
|
path,
|
|
55
52
|
handlers: handlers.map((input) => {
|
|
56
|
-
return PlatformHandlerMetadata.from(
|
|
53
|
+
return PlatformHandlerMetadata.from(input, opts);
|
|
57
54
|
}),
|
|
58
55
|
opts
|
|
59
56
|
});
|
|
@@ -104,11 +101,6 @@ let PlatformRouter = PlatformRouter_1 = class PlatformRouter {
|
|
|
104
101
|
this.#isBuilt = true;
|
|
105
102
|
return false;
|
|
106
103
|
}
|
|
107
|
-
}
|
|
108
|
-
PlatformRouter
|
|
109
|
-
Injectable(),
|
|
110
|
-
Scope(ProviderScope.INSTANCE),
|
|
111
|
-
__metadata("design:paramtypes", [InjectorService])
|
|
112
|
-
], PlatformRouter);
|
|
113
|
-
export { PlatformRouter };
|
|
104
|
+
}
|
|
105
|
+
injectable(PlatformRouter).scope(ProviderScope.INSTANCE);
|
|
114
106
|
//# sourceMappingURL=PlatformRouter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlatformRouter.js","sourceRoot":"","sources":["../../../src/domain/PlatformRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PlatformRouter.js","sourceRoot":"","sources":["../../../src/domain/PlatformRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,54 +1,48 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { getValue } from "@tsed/core";
|
|
2
|
+
import { constant, inject, injectable, injector, ProviderType } from "@tsed/di";
|
|
3
|
+
import { $on, Hooks } from "@tsed/hooks";
|
|
4
4
|
import { concatPath, getOperationsRoutes, OPERATION_HTTP_VERBS } from "@tsed/schema";
|
|
5
5
|
import { useContextHandler } from "../utils/useContextHandler.js";
|
|
6
6
|
import { PlatformLayer } from "./PlatformLayer.js";
|
|
7
7
|
import { PlatformRouter } from "./PlatformRouter.js";
|
|
8
8
|
let AUTO_INC = 0;
|
|
9
|
-
function getInjectableRouter(
|
|
10
|
-
return injector.get(provider.tokenRouter);
|
|
9
|
+
function getInjectableRouter(provider) {
|
|
10
|
+
return injector().get(provider.tokenRouter);
|
|
11
11
|
}
|
|
12
12
|
function createTokenRouter(provider) {
|
|
13
13
|
return (provider.tokenRouter = provider.tokenRouter || `${provider.name}_ROUTER_${AUTO_INC++}`);
|
|
14
14
|
}
|
|
15
|
-
function createInjectableRouter(
|
|
15
|
+
function createInjectableRouter(provider) {
|
|
16
16
|
const tokenRouter = createTokenRouter(provider);
|
|
17
|
-
if (injector.has(tokenRouter)) {
|
|
18
|
-
return getInjectableRouter(
|
|
17
|
+
if (injector().has(tokenRouter)) {
|
|
18
|
+
return getInjectableRouter(provider);
|
|
19
19
|
}
|
|
20
|
-
const router =
|
|
20
|
+
const router = inject(PlatformRouter);
|
|
21
21
|
router.provider = provider;
|
|
22
|
-
return injector
|
|
22
|
+
return injector()
|
|
23
23
|
.add(tokenRouter, {
|
|
24
24
|
useValue: router
|
|
25
25
|
})
|
|
26
26
|
.invoke(tokenRouter);
|
|
27
27
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const router = createInjectableRouter(injector, provider);
|
|
31
|
-
locals.set(PlatformRouter, router);
|
|
32
|
-
}
|
|
33
|
-
});
|
|
34
|
-
let PlatformRouters = class PlatformRouters {
|
|
35
|
-
constructor(injector) {
|
|
36
|
-
this.injector = injector;
|
|
28
|
+
export class PlatformRouters {
|
|
29
|
+
constructor() {
|
|
37
30
|
this.hooks = new Hooks();
|
|
38
31
|
this.allowedVerbs = OPERATION_HTTP_VERBS;
|
|
39
32
|
}
|
|
40
33
|
prebuild() {
|
|
41
|
-
|
|
42
|
-
|
|
34
|
+
injector()
|
|
35
|
+
.getProviders(ProviderType.CONTROLLER)
|
|
36
|
+
.forEach((provider) => {
|
|
37
|
+
createInjectableRouter(provider);
|
|
43
38
|
});
|
|
44
39
|
}
|
|
45
40
|
from(token, parentMiddlewares = []) {
|
|
46
|
-
const
|
|
47
|
-
const provider = injector.getProvider(token);
|
|
41
|
+
const provider = injector().getProvider(token);
|
|
48
42
|
if (!provider) {
|
|
49
43
|
throw new Error("Token not found in the provider registry");
|
|
50
44
|
}
|
|
51
|
-
const router = createInjectableRouter(
|
|
45
|
+
const router = createInjectableRouter(provider);
|
|
52
46
|
if (router.isBuilt()) {
|
|
53
47
|
return router;
|
|
54
48
|
}
|
|
@@ -56,7 +50,7 @@ let PlatformRouters = class PlatformRouters {
|
|
|
56
50
|
const middlewares = [...parentMiddlewares, ...useBefore];
|
|
57
51
|
const { children } = provider;
|
|
58
52
|
// Set default to true in next major version
|
|
59
|
-
const appendChildrenRoutesFirst =
|
|
53
|
+
const appendChildrenRoutesFirst = constant("router.appendChildrenRoutesFirst", false);
|
|
60
54
|
if (appendChildrenRoutesFirst) {
|
|
61
55
|
children.forEach((token) => {
|
|
62
56
|
const nested = this.from(token, middlewares);
|
|
@@ -95,7 +89,7 @@ let PlatformRouters = class PlatformRouters {
|
|
|
95
89
|
}
|
|
96
90
|
sortHandlers(handlers) {
|
|
97
91
|
const get = (token) => {
|
|
98
|
-
return
|
|
92
|
+
return injector().getProvider(token)?.priority || 0;
|
|
99
93
|
};
|
|
100
94
|
const sort = (p1, p2) => (get(p1) < get(p2) ? -1 : get(p1) > get(p2) ? 1 : 0);
|
|
101
95
|
handlers.before = handlers.before.sort(sort);
|
|
@@ -128,10 +122,14 @@ let PlatformRouters = class PlatformRouters {
|
|
|
128
122
|
return layer;
|
|
129
123
|
});
|
|
130
124
|
}
|
|
131
|
-
}
|
|
132
|
-
PlatformRouters
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
125
|
+
}
|
|
126
|
+
injectable(PlatformRouters);
|
|
127
|
+
/**
|
|
128
|
+
* Create injectable router for the current invoked provider.
|
|
129
|
+
* @ignore
|
|
130
|
+
*/
|
|
131
|
+
$on(`$beforeInvoke:${ProviderType.CONTROLLER}`, ({ provider, locals }) => {
|
|
132
|
+
const router = createInjectableRouter(provider);
|
|
133
|
+
locals.set(PlatformRouter, router);
|
|
134
|
+
});
|
|
137
135
|
//# sourceMappingURL=PlatformRouters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlatformRouters.js","sourceRoot":"","sources":["../../../src/domain/PlatformRouters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PlatformRouters.js","sourceRoot":"","sources":["../../../src/domain/PlatformRouters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DIContext,
|
|
1
|
+
import { DIContext, Provider, ProviderScope, TokenProvider } from "@tsed/di";
|
|
2
2
|
import { JsonParameterStore } from "@tsed/schema";
|
|
3
3
|
import { PlatformHandlerType } from "./PlatformHandlerType.js";
|
|
4
4
|
import { SinglePathType } from "./SinglePathType.js";
|
|
@@ -28,7 +28,7 @@ export declare class PlatformHandlerMetadata {
|
|
|
28
28
|
get scope(): ProviderScope;
|
|
29
29
|
get hasErrorParam(): boolean;
|
|
30
30
|
get store(): import("@tsed/schema").JsonMethodStore;
|
|
31
|
-
static from(
|
|
31
|
+
static from(input: any, opts?: PlatformHandlerMetadataOpts): PlatformHandlerMetadata;
|
|
32
32
|
getParams(): JsonParameterStore[];
|
|
33
33
|
hasParamType(paramType: any): boolean;
|
|
34
34
|
isInjectable(): boolean;
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Provider } from "@tsed/di";
|
|
2
2
|
import { PlatformLayer, PlatformLayerOptions } from "./PlatformLayer.js";
|
|
3
3
|
import { SinglePathType } from "./SinglePathType.js";
|
|
4
4
|
export declare class PlatformRouter {
|
|
5
5
|
#private;
|
|
6
|
-
protected readonly injector: InjectorService;
|
|
7
6
|
readonly layers: PlatformLayer[];
|
|
8
7
|
provider: Provider;
|
|
9
|
-
constructor(injector: InjectorService);
|
|
10
8
|
use(...handlers: any[]): this;
|
|
11
9
|
addRoute(method: string, path: SinglePathType, handlers: any[], opts?: PlatformLayerOptions): this;
|
|
12
10
|
all(path: SinglePathType, ...handlers: any[]): this;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Type } from "@tsed/core";
|
|
2
|
+
import { TokenProvider } from "@tsed/di";
|
|
3
|
+
import { Hooks } from "@tsed/hooks";
|
|
3
4
|
import { JsonMethodStore } from "@tsed/schema";
|
|
4
5
|
import { PlatformLayer } from "./PlatformLayer.js";
|
|
5
6
|
import { PlatformRouter } from "./PlatformRouter.js";
|
|
@@ -9,10 +10,8 @@ export interface AlterEndpointHandlersArg {
|
|
|
9
10
|
after: (Type<any> | Function)[];
|
|
10
11
|
}
|
|
11
12
|
export declare class PlatformRouters {
|
|
12
|
-
protected readonly injector: InjectorService;
|
|
13
13
|
readonly hooks: Hooks;
|
|
14
14
|
readonly allowedVerbs: import("@tsed/schema").OperationVerbs[];
|
|
15
|
-
constructor(injector: InjectorService);
|
|
16
15
|
prebuild(): void;
|
|
17
16
|
from(token: TokenProvider, parentMiddlewares?: any[]): PlatformRouter;
|
|
18
17
|
getLayers(router: PlatformRouter): PlatformLayer[];
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@tsed/platform-router",
|
|
3
3
|
"description": "Router",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"version": "8.0.0-rc.
|
|
5
|
+
"version": "8.0.0-rc.6",
|
|
6
6
|
"source": "./src/index.ts",
|
|
7
7
|
"main": "./lib/esm/index.js",
|
|
8
8
|
"module": "./lib/esm/index.js",
|
|
@@ -25,25 +25,25 @@
|
|
|
25
25
|
"tslib": "2.7.0"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@tsed/barrels": "8.0.0-rc.
|
|
29
|
-
"@tsed/core": "8.0.0-rc.
|
|
30
|
-
"@tsed/di": "8.0.0-rc.
|
|
31
|
-
"@tsed/exceptions": "8.0.0-rc.
|
|
32
|
-
"@tsed/json-mapper": "8.0.0-rc.
|
|
33
|
-
"@tsed/platform-params": "8.0.0-rc.
|
|
34
|
-
"@tsed/schema": "8.0.0-rc.
|
|
35
|
-
"@tsed/typescript": "8.0.0-rc.
|
|
28
|
+
"@tsed/barrels": "8.0.0-rc.6",
|
|
29
|
+
"@tsed/core": "8.0.0-rc.6",
|
|
30
|
+
"@tsed/di": "8.0.0-rc.6",
|
|
31
|
+
"@tsed/exceptions": "8.0.0-rc.6",
|
|
32
|
+
"@tsed/json-mapper": "8.0.0-rc.6",
|
|
33
|
+
"@tsed/platform-params": "8.0.0-rc.6",
|
|
34
|
+
"@tsed/schema": "8.0.0-rc.6",
|
|
35
|
+
"@tsed/typescript": "8.0.0-rc.6",
|
|
36
36
|
"eslint": "9.12.0",
|
|
37
37
|
"typescript": "5.4.5",
|
|
38
38
|
"vitest": "2.1.2"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@tsed/core": "8.0.0-rc.
|
|
42
|
-
"@tsed/di": "8.0.0-rc.
|
|
43
|
-
"@tsed/exceptions": "8.0.0-rc.
|
|
44
|
-
"@tsed/json-mapper": "8.0.0-rc.
|
|
45
|
-
"@tsed/platform-params": "8.0.0-rc.
|
|
46
|
-
"@tsed/schema": "8.0.0-rc.
|
|
41
|
+
"@tsed/core": "8.0.0-rc.6",
|
|
42
|
+
"@tsed/di": "8.0.0-rc.6",
|
|
43
|
+
"@tsed/exceptions": "8.0.0-rc.6",
|
|
44
|
+
"@tsed/json-mapper": "8.0.0-rc.6",
|
|
45
|
+
"@tsed/platform-params": "8.0.0-rc.6",
|
|
46
|
+
"@tsed/schema": "8.0.0-rc.6"
|
|
47
47
|
},
|
|
48
48
|
"peerDependenciesMeta": {
|
|
49
49
|
"@tsed/core": {
|