@asapjs/router 1.0.0-alpha.35 → 1.0.0-alpha.37
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/decorator/AutoInject.d.ts +25 -0
- package/dist/decorator/AutoInject.d.ts.map +1 -0
- package/dist/decorator/AutoInject.js +34 -0
- package/dist/decorator/AutoInject.js.map +1 -0
- package/dist/decorator/ErrorPayload.d.ts +5 -0
- package/dist/decorator/ErrorPayload.d.ts.map +1 -0
- package/dist/decorator/ErrorPayload.js +17 -0
- package/dist/decorator/ErrorPayload.js.map +1 -0
- package/dist/decorator/ResponsePayload.d.ts +20 -0
- package/dist/decorator/ResponsePayload.d.ts.map +1 -0
- package/dist/decorator/ResponsePayload.js +32 -0
- package/dist/decorator/ResponsePayload.js.map +1 -0
- package/dist/decorator/index.d.ts +4 -0
- package/dist/decorator/index.d.ts.map +1 -1
- package/dist/decorator/index.js +10 -0
- package/dist/decorator/index.js.map +1 -1
- package/dist/express/router.d.ts +4 -0
- package/dist/express/router.d.ts.map +1 -1
- package/dist/express/router.js +167 -55
- package/dist/express/router.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/plugin.js +5 -5
- package/dist/plugin.js.map +1 -1
- package/dist/router/index.js +6 -6
- package/dist/router/index.js.map +1 -1
- package/dist/utils/wrapper.d.ts +1 -1
- package/dist/utils/wrapper.d.ts.map +1 -1
- package/dist/utils/wrapper.js +65 -6
- package/dist/utils/wrapper.js.map +1 -1
- package/package.json +8 -7
- package/dist/middleware/jwtVerification.d.ts +0 -14
- package/dist/middleware/jwtVerification.d.ts.map +0 -1
- package/dist/middleware/jwtVerification.js +0 -38
- package/dist/middleware/jwtVerification.js.map +0 -1
- package/dist/utils/globalRouteDefaults.d.ts +0 -4
- package/dist/utils/globalRouteDefaults.d.ts.map +0 -1
- package/dist/utils/globalRouteDefaults.js +0 -12
- package/dist/utils/globalRouteDefaults.js.map +0 -1
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import 'reflect-metadata';
|
|
2
|
+
import type { Request } from 'express';
|
|
3
|
+
export declare const AUTO_INJECT_METADATA_KEY = "response:autoInject";
|
|
4
|
+
export interface AutoInjectEntry {
|
|
5
|
+
key: string;
|
|
6
|
+
factory: (req: Request) => any;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Marks a field in a Global Response DTO as auto-injected.
|
|
10
|
+
* The factory function receives the Express Request and returns the value to inject.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* class GlobalResponseDto extends ExtendableDto {
|
|
14
|
+
* @TypeIs.INT({ comment: '응답 시각' })
|
|
15
|
+
* @AutoInject(() => Date.now())
|
|
16
|
+
* timestamp: number;
|
|
17
|
+
*
|
|
18
|
+
* @TypeIs.STRING({ comment: '요청 ID' })
|
|
19
|
+
* @AutoInject((req) => req.headers['x-request-id'] || uuid())
|
|
20
|
+
* requestId: string;
|
|
21
|
+
* }
|
|
22
|
+
*/
|
|
23
|
+
export declare function AutoInject(factory: (req: Request) => any): PropertyDecorator;
|
|
24
|
+
export declare function getAutoInjectEntries(DtoClass: new () => any): AutoInjectEntry[];
|
|
25
|
+
//# sourceMappingURL=AutoInject.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AutoInject.d.ts","sourceRoot":"","sources":["../../src/decorator/AutoInject.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,GAAG,CAAC;CAC/B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,GAAG,GAAG,iBAAiB,CAQ5E;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,UAAU,GAAG,GAAG,eAAe,EAAE,CAE/E"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AUTO_INJECT_METADATA_KEY = void 0;
|
|
4
|
+
exports.AutoInject = AutoInject;
|
|
5
|
+
exports.getAutoInjectEntries = getAutoInjectEntries;
|
|
6
|
+
require("reflect-metadata");
|
|
7
|
+
exports.AUTO_INJECT_METADATA_KEY = 'response:autoInject';
|
|
8
|
+
/**
|
|
9
|
+
* Marks a field in a Global Response DTO as auto-injected.
|
|
10
|
+
* The factory function receives the Express Request and returns the value to inject.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* class GlobalResponseDto extends ExtendableDto {
|
|
14
|
+
* @TypeIs.INT({ comment: '응답 시각' })
|
|
15
|
+
* @AutoInject(() => Date.now())
|
|
16
|
+
* timestamp: number;
|
|
17
|
+
*
|
|
18
|
+
* @TypeIs.STRING({ comment: '요청 ID' })
|
|
19
|
+
* @AutoInject((req) => req.headers['x-request-id'] || uuid())
|
|
20
|
+
* requestId: string;
|
|
21
|
+
* }
|
|
22
|
+
*/
|
|
23
|
+
function AutoInject(factory) {
|
|
24
|
+
return (target, propertyKey) => {
|
|
25
|
+
const key = String(propertyKey);
|
|
26
|
+
const existing = Reflect.getMetadata(exports.AUTO_INJECT_METADATA_KEY, target.constructor) || [];
|
|
27
|
+
existing.push({ key, factory });
|
|
28
|
+
Reflect.defineMetadata(exports.AUTO_INJECT_METADATA_KEY, existing, target.constructor);
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
function getAutoInjectEntries(DtoClass) {
|
|
32
|
+
return Reflect.getMetadata(exports.AUTO_INJECT_METADATA_KEY, DtoClass) || [];
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=AutoInject.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AutoInject.js","sourceRoot":"","sources":["../../src/decorator/AutoInject.ts"],"names":[],"mappings":";;;AAyBA,gCAQC;AAED,oDAEC;AArCD,4BAA0B;AAGb,QAAA,wBAAwB,GAAG,qBAAqB,CAAC;AAO9D;;;;;;;;;;;;;;GAcG;AACH,SAAgB,UAAU,CAAC,OAA8B;IACxD,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QAChC,MAAM,QAAQ,GACb,OAAO,CAAC,WAAW,CAAC,gCAAwB,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QAChC,OAAO,CAAC,cAAc,CAAC,gCAAwB,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAuB;IAC3D,OAAO,OAAO,CAAC,WAAW,CAAC,gCAAwB,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;AACtE,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import 'reflect-metadata';
|
|
2
|
+
export declare const ERROR_PAYLOAD_METADATA_KEY = "response:errorPayloadKey";
|
|
3
|
+
export declare function ErrorPayload(): PropertyDecorator;
|
|
4
|
+
export declare function getErrorPayloadKey(DtoClass: new () => any): string | undefined;
|
|
5
|
+
//# sourceMappingURL=ErrorPayload.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ErrorPayload.d.ts","sourceRoot":"","sources":["../../src/decorator/ErrorPayload.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,eAAO,MAAM,0BAA0B,6BAA6B,CAAC;AAErE,wBAAgB,YAAY,IAAI,iBAAiB,CAKhD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,GAAG,GAAG,MAAM,GAAG,SAAS,CAE9E"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ERROR_PAYLOAD_METADATA_KEY = void 0;
|
|
4
|
+
exports.ErrorPayload = ErrorPayload;
|
|
5
|
+
exports.getErrorPayloadKey = getErrorPayloadKey;
|
|
6
|
+
require("reflect-metadata");
|
|
7
|
+
exports.ERROR_PAYLOAD_METADATA_KEY = 'response:errorPayloadKey';
|
|
8
|
+
function ErrorPayload() {
|
|
9
|
+
return (target, propertyKey) => {
|
|
10
|
+
const key = String(propertyKey);
|
|
11
|
+
Reflect.defineMetadata(exports.ERROR_PAYLOAD_METADATA_KEY, key, target.constructor);
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
function getErrorPayloadKey(DtoClass) {
|
|
15
|
+
return Reflect.getMetadata(exports.ERROR_PAYLOAD_METADATA_KEY, DtoClass);
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=ErrorPayload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ErrorPayload.js","sourceRoot":"","sources":["../../src/decorator/ErrorPayload.ts"],"names":[],"mappings":";;;AAIA,oCAKC;AAED,gDAEC;AAbD,4BAA0B;AAEb,QAAA,0BAA0B,GAAG,0BAA0B,CAAC;AAErE,SAAgB,YAAY;IAC3B,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,CAAC,cAAc,CAAC,kCAA0B,EAAE,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7E,CAAC,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,QAAuB;IACzD,OAAO,OAAO,CAAC,WAAW,CAAC,kCAA0B,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import 'reflect-metadata';
|
|
2
|
+
export declare const RESPONSE_PAYLOAD_METADATA_KEY = "response:payloadKey";
|
|
3
|
+
/**
|
|
4
|
+
* Marks a field in a Global Response DTO as the slot where each route's response DTO will be placed.
|
|
5
|
+
* If no field is marked with @ResponsePayload(), the Global DTO operates in "spread" mode:
|
|
6
|
+
* the route DTO's fields are merged at the top level using OpenAPI allOf.
|
|
7
|
+
*
|
|
8
|
+
* @example
|
|
9
|
+
* class DefaultResponseDto extends ExtendableDto {
|
|
10
|
+
* @TypeIs.INT()
|
|
11
|
+
* @AutoInject(() => Date.now())
|
|
12
|
+
* timestamp: number;
|
|
13
|
+
*
|
|
14
|
+
* @ResponsePayload()
|
|
15
|
+
* result: any; // route DTO goes here
|
|
16
|
+
* }
|
|
17
|
+
*/
|
|
18
|
+
export declare function ResponsePayload(): PropertyDecorator;
|
|
19
|
+
export declare function getResponsePayloadKey(DtoClass: new () => any): string | undefined;
|
|
20
|
+
//# sourceMappingURL=ResponsePayload.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ResponsePayload.d.ts","sourceRoot":"","sources":["../../src/decorator/ResponsePayload.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AAEnE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,IAAI,iBAAiB,CAKnD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,UAAU,GAAG,GAAG,MAAM,GAAG,SAAS,CAEjF"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RESPONSE_PAYLOAD_METADATA_KEY = void 0;
|
|
4
|
+
exports.ResponsePayload = ResponsePayload;
|
|
5
|
+
exports.getResponsePayloadKey = getResponsePayloadKey;
|
|
6
|
+
require("reflect-metadata");
|
|
7
|
+
exports.RESPONSE_PAYLOAD_METADATA_KEY = 'response:payloadKey';
|
|
8
|
+
/**
|
|
9
|
+
* Marks a field in a Global Response DTO as the slot where each route's response DTO will be placed.
|
|
10
|
+
* If no field is marked with @ResponsePayload(), the Global DTO operates in "spread" mode:
|
|
11
|
+
* the route DTO's fields are merged at the top level using OpenAPI allOf.
|
|
12
|
+
*
|
|
13
|
+
* @example
|
|
14
|
+
* class DefaultResponseDto extends ExtendableDto {
|
|
15
|
+
* @TypeIs.INT()
|
|
16
|
+
* @AutoInject(() => Date.now())
|
|
17
|
+
* timestamp: number;
|
|
18
|
+
*
|
|
19
|
+
* @ResponsePayload()
|
|
20
|
+
* result: any; // route DTO goes here
|
|
21
|
+
* }
|
|
22
|
+
*/
|
|
23
|
+
function ResponsePayload() {
|
|
24
|
+
return (target, propertyKey) => {
|
|
25
|
+
const key = String(propertyKey);
|
|
26
|
+
Reflect.defineMetadata(exports.RESPONSE_PAYLOAD_METADATA_KEY, key, target.constructor);
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
function getResponsePayloadKey(DtoClass) {
|
|
30
|
+
return Reflect.getMetadata(exports.RESPONSE_PAYLOAD_METADATA_KEY, DtoClass);
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=ResponsePayload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ResponsePayload.js","sourceRoot":"","sources":["../../src/decorator/ResponsePayload.ts"],"names":[],"mappings":";;;AAmBA,0CAKC;AAED,sDAEC;AA5BD,4BAA0B;AAEb,QAAA,6BAA6B,GAAG,qBAAqB,CAAC;AAEnE;;;;;;;;;;;;;;GAcG;AACH,SAAgB,eAAe;IAC9B,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,CAAC,cAAc,CAAC,qCAA6B,EAAE,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC,CAAC;AACH,CAAC;AAED,SAAgB,qBAAqB,CAAC,QAAuB;IAC5D,OAAO,OAAO,CAAC,WAAW,CAAC,qCAA6B,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { ErrorCreator } from '@asapjs/error';
|
|
2
2
|
import RouterController, { IPreference } from '../express/router';
|
|
3
|
+
export { AutoInject, getAutoInjectEntries } from './AutoInject';
|
|
4
|
+
export type { AutoInjectEntry } from './AutoInject';
|
|
5
|
+
export { ResponsePayload, getResponsePayloadKey } from './ResponsePayload';
|
|
6
|
+
export { ErrorPayload, getErrorPayloadKey } from './ErrorPayload';
|
|
3
7
|
export interface GlobalRouteOptions {
|
|
4
8
|
}
|
|
5
9
|
export interface IOptions extends Omit<IPreference, 'path' | 'excute'>, GlobalRouteOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,gBAAgB,EAAE,EAAE,WAAW,EAAc,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,gBAAgB,EAAE,EAAE,WAAW,EAAc,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAChE,YAAY,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGlE,MAAM,WAAW,kBAAkB;CAAG;AAEtC,MAAM,WAAW,QAAS,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,kBAAkB;IACxF,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAiBD,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,YAdxB,YAAY,CAAC,OAAO,gBAAgB,CAAC,eAAe,MAAM,UAgBpF;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,YAlBzB,YAAY,CAAC,OAAO,gBAAgB,CAAC,eAAe,MAAM,UAoBpF;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,YAtBxB,YAAY,CAAC,OAAO,gBAAgB,CAAC,eAAe,MAAM,UAwBpF;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,YA1B3B,YAAY,CAAC,OAAO,gBAAgB,CAAC,eAAe,MAAM,UA4BpF"}
|
package/dist/decorator/index.js
CHANGED
|
@@ -1,9 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getErrorPayloadKey = exports.ErrorPayload = exports.getResponsePayloadKey = exports.ResponsePayload = exports.getAutoInjectEntries = exports.AutoInject = void 0;
|
|
3
4
|
exports.Get = Get;
|
|
4
5
|
exports.Post = Post;
|
|
5
6
|
exports.Put = Put;
|
|
6
7
|
exports.Delete = Delete;
|
|
8
|
+
var AutoInject_1 = require("./AutoInject");
|
|
9
|
+
Object.defineProperty(exports, "AutoInject", { enumerable: true, get: function () { return AutoInject_1.AutoInject; } });
|
|
10
|
+
Object.defineProperty(exports, "getAutoInjectEntries", { enumerable: true, get: function () { return AutoInject_1.getAutoInjectEntries; } });
|
|
11
|
+
var ResponsePayload_1 = require("./ResponsePayload");
|
|
12
|
+
Object.defineProperty(exports, "ResponsePayload", { enumerable: true, get: function () { return ResponsePayload_1.ResponsePayload; } });
|
|
13
|
+
Object.defineProperty(exports, "getResponsePayloadKey", { enumerable: true, get: function () { return ResponsePayload_1.getResponsePayloadKey; } });
|
|
14
|
+
var ErrorPayload_1 = require("./ErrorPayload");
|
|
15
|
+
Object.defineProperty(exports, "ErrorPayload", { enumerable: true, get: function () { return ErrorPayload_1.ErrorPayload; } });
|
|
16
|
+
Object.defineProperty(exports, "getErrorPayloadKey", { enumerable: true, get: function () { return ErrorPayload_1.getErrorPayloadKey; } });
|
|
7
17
|
function Route(path, method, options) {
|
|
8
18
|
return function (target, propertyKey) {
|
|
9
19
|
if (!target.routes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorator/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorator/index.ts"],"names":[],"mappings":";;;AA8BA,kBAEC;AAED,oBAEC;AAED,kBAEC;AAED,wBAEC;AAzCD,2CAAgE;AAAvD,wGAAA,UAAU,OAAA;AAAE,kHAAA,oBAAoB,OAAA;AAEzC,qDAA2E;AAAlE,kHAAA,eAAe,OAAA;AAAE,wHAAA,qBAAqB,OAAA;AAC/C,+CAAkE;AAAzD,4GAAA,YAAY,OAAA;AAAE,kHAAA,kBAAkB,OAAA;AASzC,SAAS,KAAK,CAAC,IAAY,EAAE,MAAkB,EAAE,OAAiB;IAChE,OAAO,UAAU,MAA6C,EAAE,WAAmB;QACjF,IAAI,CAAE,MAAc,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAc,CAAC,MAAM,GAAG,EAAE,CAAC;QAC9B,CAAC;QAEA,MAAc,CAAC,MAAM,CAAC,IAAI,+BACzB,MAAM;YACN,IAAI,IACD,OAAO,KACV,UAAU,EAAE,WAAW,IACvB,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,GAAG,CAAC,IAAY,EAAE,OAAiB;IACjD,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,IAAI,CAAC,IAAY,EAAE,OAAiB;IAClD,OAAO,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAED,SAAgB,GAAG,CAAC,IAAY,EAAE,OAAiB;IACjD,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,MAAM,CAAC,IAAY,EAAE,OAAiB;IACpD,OAAO,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC"}
|
package/dist/express/router.d.ts
CHANGED
|
@@ -23,11 +23,15 @@ export interface IDecoratorPreference extends IPreference {
|
|
|
23
23
|
}
|
|
24
24
|
export default class RouterController {
|
|
25
25
|
basePath: string;
|
|
26
|
+
responseDto?: (new () => any) | null;
|
|
26
27
|
expressRouter: ExpressRouter;
|
|
27
28
|
constructor();
|
|
28
29
|
protected registerRoutes(): void;
|
|
29
30
|
private generateRequestBody;
|
|
30
31
|
private generateResponseBody;
|
|
32
|
+
private getEffectiveResponseDto;
|
|
33
|
+
private getResponseSchemaSuffix;
|
|
34
|
+
private buildGlobalResponseSchema;
|
|
31
35
|
private generateDtoScheme;
|
|
32
36
|
private generateTypeScheme;
|
|
33
37
|
private generateErrorSchemes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,KAAK,WAAW,EAAqD,MAAM,eAAe,CAAC;AACpG,OAAU,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,KAAK,WAAW,EAAqD,MAAM,eAAe,CAAC;AACpG,OAAU,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAYrD,KAAK,eAAe,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AAClE,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACxD,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACnB;AAUD,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAC7B,QAAQ,SAAO;IACf,WAAW,CAAC,EAAE,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC;IAErC,aAAa,EAAE,aAAa,CAAC;;IAMpC,SAAS,CAAC,cAAc;IAaxB,OAAO,CAAC,mBAAmB,CAOxB;IAEH,OAAO,CAAC,oBAAoB,CASzB;IAEH,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,yBAAyB;IA4BjC,OAAO,CAAC,iBAAiB,CAuBvB;IAEF,OAAO,CAAC,kBAAkB,CAiBxB;IAEF,OAAO,CAAC,oBAAoB,CAuH1B;IAEF,OAAO,CAAC,0BAA0B,CA2IhC;IAEK,MAAM,GAAI,QAAQ,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,MAAM,SAAS,WAAW,UA+ClF;IAEK,MAAM;uBAjD4D,WAAW;wBAAX,WAAW;uBAAX,WAAW;0BAAX,WAAW;MAsDlF;CACF;AAED,UAAU,aAAa,CAAC,CAAC;IACxB,QAAQ,CAAC,CAAC;CACV;AAED,KAAK,qBAAqB,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9C,KAAK,oBAAoB,GACtB;IACA,IAAI,EAAE,qBAAqB,CAAC;IAC5B,IAAI,EAAE,GAAG,CAAC;CACT,GACD,SAAS,GACT,IAAI,CAAC;AAER,KAAK,cAAc,GAAG,MAAM,oBAAoB,CAAC;AAyBjD,eAAO,MAAM,WAAW,QApBlB,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,cAClB,qBAAqB,YACvB,OAAO,KACb,cAiB2C,CAAC;AACjD,eAAO,MAAM,YAAY,QArBnB,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,cAClB,qBAAqB,YACvB,OAAO,KACb,cAkB6C,CAAC"}
|
package/dist/express/router.js
CHANGED
|
@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.responseType = exports.requestType = void 0;
|
|
7
7
|
const error_1 = require("@asapjs/error");
|
|
8
8
|
const express_1 = require("express");
|
|
9
|
+
const AutoInject_1 = require("../decorator/AutoInject");
|
|
10
|
+
const ErrorPayload_1 = require("../decorator/ErrorPayload");
|
|
11
|
+
const ResponsePayload_1 = require("../decorator/ResponsePayload");
|
|
9
12
|
const swagger_1 = require("../swagger");
|
|
10
13
|
const collectMiddlewareErrors_1 = require("../utils/collectMiddlewareErrors");
|
|
11
14
|
const generateSchemeRefWithName_1 = __importDefault(require("../utils/generateSchemeRefWithName"));
|
|
@@ -35,36 +38,36 @@ class RouterController {
|
|
|
35
38
|
},
|
|
36
39
|
});
|
|
37
40
|
this.generateDtoScheme = (res, prefix) => {
|
|
41
|
+
if (!res)
|
|
42
|
+
return undefined;
|
|
38
43
|
if (res.$ref) {
|
|
39
|
-
const
|
|
44
|
+
const suffix = prefix === 'Body' ? '' : this.getResponseSchemaSuffix();
|
|
45
|
+
const name = `${(0, getSchemeNameFromRef_1.default)(res.$ref)}${suffix}_${prefix}`;
|
|
40
46
|
(0, swagger_1.addScheme)({
|
|
41
47
|
name,
|
|
42
48
|
data: prefix === 'Body'
|
|
43
49
|
? res
|
|
44
|
-
:
|
|
45
|
-
type: 'object',
|
|
46
|
-
properties: {
|
|
47
|
-
result: res,
|
|
48
|
-
},
|
|
49
|
-
},
|
|
50
|
+
: this.buildGlobalResponseSchema(res),
|
|
50
51
|
});
|
|
51
52
|
return {
|
|
52
53
|
$ref: (0, generateSchemeRefWithName_1.default)(name),
|
|
53
54
|
};
|
|
54
55
|
}
|
|
56
|
+
if (prefix !== 'Body') {
|
|
57
|
+
return this.buildGlobalResponseSchema(res);
|
|
58
|
+
}
|
|
59
|
+
return res;
|
|
55
60
|
};
|
|
56
61
|
this.generateTypeScheme = (options, prefix) => {
|
|
57
|
-
var _a;
|
|
62
|
+
var _a, _b;
|
|
58
63
|
const type = options();
|
|
59
|
-
const
|
|
64
|
+
const suffix = prefix === 'Body' ? '' : this.getResponseSchemaSuffix();
|
|
65
|
+
const name = `TYPE_${type.__name.toUpperCase()}${suffix}_${prefix}`;
|
|
60
66
|
(0, swagger_1.addScheme)({
|
|
61
67
|
name,
|
|
62
|
-
data:
|
|
63
|
-
type: 'object',
|
|
64
|
-
|
|
65
|
-
result: (_a = type.toSwagger) === null || _a === void 0 ? void 0 : _a.call(type),
|
|
66
|
-
},
|
|
67
|
-
},
|
|
68
|
+
data: prefix === 'Body'
|
|
69
|
+
? { type: 'object', properties: (_a = type.toSwagger) === null || _a === void 0 ? void 0 : _a.call(type) }
|
|
70
|
+
: this.buildGlobalResponseSchema((_b = type.toSwagger) === null || _b === void 0 ? void 0 : _b.call(type)),
|
|
68
71
|
});
|
|
69
72
|
return {
|
|
70
73
|
$ref: (0, generateSchemeRefWithName_1.default)(name),
|
|
@@ -73,50 +76,78 @@ class RouterController {
|
|
|
73
76
|
this.generateErrorSchemes = (errors) => {
|
|
74
77
|
if (!errors || errors.length === 0)
|
|
75
78
|
return {};
|
|
79
|
+
const GlobalDto = this.getEffectiveResponseDto();
|
|
80
|
+
const errorPayloadKey = GlobalDto ? (0, ErrorPayload_1.getErrorPayloadKey)(GlobalDto) : undefined;
|
|
76
81
|
const byStatus = new Map();
|
|
77
82
|
errors.forEach((errorCreator) => {
|
|
78
83
|
const status = errorCreator._status;
|
|
79
84
|
const code = errorCreator._code;
|
|
80
85
|
const message = errorCreator._message;
|
|
81
86
|
const schema = errorCreator._schema;
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
if (errorCreator._isCustom && errorCreator._swaggerSchema) {
|
|
88
|
+
const customSwagger = errorCreator._swaggerSchema;
|
|
89
|
+
const dataProperties = Object.entries(schema).reduce((acc, [key, typeIs]) => {
|
|
90
|
+
if (typeIs && typeof typeIs === 'function') {
|
|
91
|
+
try {
|
|
92
|
+
const typeData = typeIs();
|
|
93
|
+
if (typeData && typeData.toSwagger)
|
|
94
|
+
acc[key] = typeData.toSwagger();
|
|
95
|
+
}
|
|
96
|
+
catch (_a) { }
|
|
97
|
+
}
|
|
98
|
+
else if (typeIs && typeof typeIs === 'object' && typeIs.toSwagger) {
|
|
99
|
+
try {
|
|
100
|
+
acc[key] = typeIs.toSwagger();
|
|
101
|
+
}
|
|
102
|
+
catch (_b) { }
|
|
103
|
+
}
|
|
104
|
+
else if (typeIs && typeof typeIs === 'object') {
|
|
105
|
+
acc[key] = typeIs;
|
|
106
|
+
}
|
|
107
|
+
return acc;
|
|
108
|
+
}, {});
|
|
109
|
+
const errorSwaggerSchema = Object.assign(Object.assign({}, customSwagger), { properties: Object.assign(Object.assign({}, customSwagger.properties), { data: { type: 'object', properties: dataProperties } }) });
|
|
110
|
+
(0, swagger_1.addScheme)({ name: code, data: errorSwaggerSchema });
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
const swaggerSchema = {
|
|
114
|
+
type: 'object',
|
|
115
|
+
properties: {
|
|
116
|
+
status: { type: 'number', example: status },
|
|
117
|
+
errorCode: { type: 'string', example: code },
|
|
118
|
+
message: { type: 'string', example: message },
|
|
119
|
+
data: {
|
|
120
|
+
type: 'object',
|
|
121
|
+
properties: Object.entries(schema).reduce((acc, [key, typeIs]) => {
|
|
122
|
+
if (typeIs && typeof typeIs === 'function') {
|
|
123
|
+
try {
|
|
124
|
+
const typeData = typeIs();
|
|
125
|
+
if (typeData && typeData.toSwagger)
|
|
126
|
+
acc[key] = typeData.toSwagger();
|
|
127
|
+
}
|
|
128
|
+
catch (e) {
|
|
129
|
+
console.error(`Error converting ${key} to swagger:`, e);
|
|
96
130
|
}
|
|
97
131
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
132
|
+
else if (typeIs && typeof typeIs === 'object' && typeIs.toSwagger) {
|
|
133
|
+
try {
|
|
134
|
+
acc[key] = typeIs.toSwagger();
|
|
135
|
+
}
|
|
136
|
+
catch (e) {
|
|
137
|
+
console.error(`Error converting ${key} to swagger:`, e);
|
|
138
|
+
}
|
|
105
139
|
}
|
|
106
|
-
|
|
107
|
-
|
|
140
|
+
else if (typeIs && typeof typeIs === 'object') {
|
|
141
|
+
acc[key] = typeIs;
|
|
108
142
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
113
|
-
return acc;
|
|
114
|
-
}, {}),
|
|
143
|
+
return acc;
|
|
144
|
+
}, {}),
|
|
145
|
+
},
|
|
115
146
|
},
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
147
|
+
required: ['status', 'errorCode', 'message'],
|
|
148
|
+
};
|
|
149
|
+
(0, swagger_1.addScheme)({ name: code, data: swaggerSchema });
|
|
150
|
+
}
|
|
120
151
|
const key = status.toString();
|
|
121
152
|
if (!byStatus.has(key))
|
|
122
153
|
byStatus.set(key, []);
|
|
@@ -124,21 +155,43 @@ class RouterController {
|
|
|
124
155
|
});
|
|
125
156
|
const errorResponses = {};
|
|
126
157
|
byStatus.forEach((codes, status) => {
|
|
158
|
+
const buildErrorRef = (code) => {
|
|
159
|
+
if (errorPayloadKey && GlobalDto) {
|
|
160
|
+
const wrappedName = `${code}_ErrorEnvelope`;
|
|
161
|
+
const instance = new GlobalDto();
|
|
162
|
+
const globalScheme = typeof instance.generateScheme === 'function' ? instance.generateScheme() : null;
|
|
163
|
+
if (globalScheme) {
|
|
164
|
+
const autoInjectEntries = (0, AutoInject_1.getAutoInjectEntries)(GlobalDto);
|
|
165
|
+
const properties = Object.assign({}, globalScheme.properties);
|
|
166
|
+
const successKey = autoInjectEntries.find((e) => {
|
|
167
|
+
try {
|
|
168
|
+
return typeof e.factory({}) === 'boolean';
|
|
169
|
+
}
|
|
170
|
+
catch (_a) {
|
|
171
|
+
return false;
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
if (successKey && properties[successKey.key]) {
|
|
175
|
+
properties[successKey.key] = Object.assign(Object.assign({}, properties[successKey.key]), { example: false });
|
|
176
|
+
}
|
|
177
|
+
properties[errorPayloadKey] = { $ref: (0, generateSchemeRefWithName_1.default)(code) };
|
|
178
|
+
(0, swagger_1.addScheme)({ name: wrappedName, data: { type: 'object', properties } });
|
|
179
|
+
return { $ref: (0, generateSchemeRefWithName_1.default)(wrappedName) };
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
return { $ref: (0, generateSchemeRefWithName_1.default)(code) };
|
|
183
|
+
};
|
|
127
184
|
errorResponses[status] =
|
|
128
185
|
codes.length === 1
|
|
129
186
|
? {
|
|
130
187
|
description: codes[0],
|
|
131
|
-
content: {
|
|
132
|
-
'application/json': {
|
|
133
|
-
schema: { $ref: (0, generateSchemeRefWithName_1.default)(codes[0]) },
|
|
134
|
-
},
|
|
135
|
-
},
|
|
188
|
+
content: { 'application/json': { schema: buildErrorRef(codes[0]) } },
|
|
136
189
|
}
|
|
137
190
|
: {
|
|
138
191
|
description: codes.join(' | '),
|
|
139
192
|
content: {
|
|
140
193
|
'application/json': {
|
|
141
|
-
schema: { oneOf: codes.map((c) => (
|
|
194
|
+
schema: { oneOf: codes.map((c) => buildErrorRef(c)) },
|
|
142
195
|
},
|
|
143
196
|
},
|
|
144
197
|
};
|
|
@@ -274,7 +327,7 @@ class RouterController {
|
|
|
274
327
|
const swaggerPathInfo = this.generateSwaggerDefaultsSet(this, title || '', description || '', deprecated, path, method, body, bodyContentType, query, response, allErrors);
|
|
275
328
|
(0, swagger_1.addPaths)(swaggerPathInfo);
|
|
276
329
|
const factoryMiddlewares = registeredMiddlewares.map((factory) => factory(routeOptions));
|
|
277
|
-
this.expressRouter[method](path, ...factoryMiddlewares, ...middleware, (0, wrapper_1.default)(excute));
|
|
330
|
+
this.expressRouter[method](path, ...factoryMiddlewares, ...middleware, (0, wrapper_1.default)(excute, this.responseDto));
|
|
278
331
|
};
|
|
279
332
|
this.router = {
|
|
280
333
|
get: this.excute('get'),
|
|
@@ -294,6 +347,65 @@ class RouterController {
|
|
|
294
347
|
}
|
|
295
348
|
}
|
|
296
349
|
}
|
|
350
|
+
getEffectiveResponseDto() {
|
|
351
|
+
var _a;
|
|
352
|
+
if (this.responseDto === null)
|
|
353
|
+
return null;
|
|
354
|
+
if (this.responseDto)
|
|
355
|
+
return this.responseDto;
|
|
356
|
+
try {
|
|
357
|
+
const { getConfig, hasConfig } = require('@asapjs/common');
|
|
358
|
+
if (hasConfig()) {
|
|
359
|
+
const config = getConfig();
|
|
360
|
+
return ((_a = config.response) === null || _a === void 0 ? void 0 : _a.responseDto) || null;
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
catch (_b) { }
|
|
364
|
+
return null;
|
|
365
|
+
}
|
|
366
|
+
getResponseSchemaSuffix() {
|
|
367
|
+
var _a;
|
|
368
|
+
if (this.responseDto === null)
|
|
369
|
+
return '_Raw';
|
|
370
|
+
const GlobalDto = this.getEffectiveResponseDto();
|
|
371
|
+
if (!GlobalDto)
|
|
372
|
+
return '';
|
|
373
|
+
try {
|
|
374
|
+
const { getConfig, hasConfig } = require('@asapjs/common');
|
|
375
|
+
if (hasConfig()) {
|
|
376
|
+
const config = getConfig();
|
|
377
|
+
const defaultDto = (_a = config.response) === null || _a === void 0 ? void 0 : _a.responseDto;
|
|
378
|
+
if (defaultDto && GlobalDto !== defaultDto) {
|
|
379
|
+
return `_${GlobalDto.name}`;
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
}
|
|
383
|
+
catch (_b) { }
|
|
384
|
+
return '';
|
|
385
|
+
}
|
|
386
|
+
buildGlobalResponseSchema(innerSchema) {
|
|
387
|
+
const GlobalDto = this.getEffectiveResponseDto();
|
|
388
|
+
if (!GlobalDto) {
|
|
389
|
+
return innerSchema;
|
|
390
|
+
}
|
|
391
|
+
const instance = new GlobalDto();
|
|
392
|
+
const globalScheme = typeof instance.generateScheme === 'function' ? instance.generateScheme() : null;
|
|
393
|
+
const payloadKey = (0, ResponsePayload_1.getResponsePayloadKey)(GlobalDto);
|
|
394
|
+
if (!globalScheme) {
|
|
395
|
+
return innerSchema;
|
|
396
|
+
}
|
|
397
|
+
if (payloadKey) {
|
|
398
|
+
const properties = Object.assign({}, globalScheme.properties);
|
|
399
|
+
properties[payloadKey] = innerSchema;
|
|
400
|
+
return { type: 'object', properties };
|
|
401
|
+
}
|
|
402
|
+
return {
|
|
403
|
+
allOf: [
|
|
404
|
+
{ type: 'object', properties: globalScheme.properties },
|
|
405
|
+
innerSchema,
|
|
406
|
+
],
|
|
407
|
+
};
|
|
408
|
+
}
|
|
297
409
|
}
|
|
298
410
|
exports.default = RouterController;
|
|
299
411
|
const returnType = (type) => (Dto, innerType = 'body', isArray = false) => () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAkE;AAElE,qCAAqD;AACrD,wDAA+D;AAC/D,4DAA+D;AAC/D,kEAAqE;AACrE,wCAAiD;AACjD,8EAA8F;AAC9F,mGAA2E;AAC3E,yFAAiE;AACjE,+DAAuC;AACvC,0EAA0E;AAC1E,+DAAuC;AAiCvC,MAAqB,gBAAgB;IAMpC;QALO,aAAQ,GAAG,GAAG,CAAC;QAsBd,wBAAmB,GAAG,CAAC,GAAQ,EAAE,eAAgC,EAAE,EAAE,CAAC,CAAC;YAC9E,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE;gBACR,CAAC,eAAe,CAAC,EAAE;oBAClB,MAAM,EAAE,GAAG;iBACX;aACD;SACD,CAAC,CAAC;QAEK,yBAAoB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;YAC7C,KAAK,EAAE;gBACN,WAAW,EAAE,EAAE;gBACf,OAAO,EAAE;oBACR,kBAAkB,EAAE;wBACnB,MAAM,EAAE,GAAG;qBACX;iBACD;aACD;SACD,CAAC,CAAC;QA4DK,sBAAiB,GAAG,CAAC,GAAQ,EAAE,MAAc,EAAE,EAAE;YACxD,IAAI,CAAC,GAAG;gBAAE,OAAO,SAAS,CAAC;YAE3B,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACd,MAAM,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBACvE,MAAM,IAAI,GAAG,GAAG,IAAA,8BAAoB,EAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;gBACpE,IAAA,mBAAS,EAAC;oBACT,IAAI;oBACJ,IAAI,EACH,MAAM,KAAK,MAAM;wBAChB,CAAC,CAAC,GAAG;wBACL,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC;iBACvC,CAAC,CAAC;gBACH,OAAO;oBACN,IAAI,EAAE,IAAA,mCAAyB,EAAC,IAAI,CAAC;iBACrC,CAAC;YACH,CAAC;YAED,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACvB,OAAO,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;YAC5C,CAAC;YAED,OAAO,GAAG,CAAC;QACZ,CAAC,CAAC;QAEM,uBAAkB,GAAG,CAAC,OAAyB,EAAE,MAAc,EAAE,EAAE;;YAC1E,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACvE,MAAM,IAAI,GAAG,QAAQ,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;YAEpE,IAAA,mBAAS,EAAC;gBACT,IAAI;gBACJ,IAAI,EACH,MAAM,KAAK,MAAM;oBAChB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAA,IAAI,CAAC,SAAS,oDAAI,EAAE;oBACpD,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAA,IAAI,CAAC,SAAS,oDAAI,CAAC;aACtD,CAAC,CAAC;YAEH,OAAO;gBACN,IAAI,EAAE,IAAA,mCAAyB,EAAC,IAAI,CAAC;aACrC,CAAC;QACH,CAAC,CAAC;QAEM,yBAAoB,GAAG,CAAC,MAAkC,EAAE,EAAE;YACrE,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YAE9C,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjD,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,iCAAkB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE9E,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;YAE7C,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBAC/B,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;gBACpC,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;gBAChC,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC;gBACtC,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;gBAEpC,IAAK,YAAoB,CAAC,SAAS,IAAK,YAAoB,CAAC,cAAc,EAAE,CAAC;oBAC7E,MAAM,aAAa,GAAI,YAAoB,CAAC,cAAc,CAAC;oBAC3D,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACnD,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;wBACtB,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;4BAC5C,IAAI,CAAC;gCACJ,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC;gCAC1B,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS;oCAAE,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;4BACrE,CAAC;4BAAC,WAAM,CAAC,CAAA,CAAC;wBACX,CAAC;6BAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;4BACrE,IAAI,CAAC;gCAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;4BAAC,CAAC;4BAAC,WAAM,CAAC,CAAA,CAAC;wBAChD,CAAC;6BAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;4BACjD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;wBACnB,CAAC;wBACD,OAAO,GAAG,CAAC;oBACZ,CAAC,EACD,EAAyB,CACzB,CAAC;oBACF,MAAM,kBAAkB,mCACpB,aAAa,KAChB,UAAU,kCAAO,aAAa,CAAC,UAAU,KAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,MAC/F,CAAC;oBACF,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;gBACrD,CAAC;qBAAM,CAAC;oBACP,MAAM,aAAa,GAAG;wBACrB,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACX,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE;4BAC3C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;4BAC5C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE;4BAC7C,IAAI,EAAE;gCACL,IAAI,EAAE,QAAQ;gCACd,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACxC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;oCACtB,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;wCAC5C,IAAI,CAAC;4CACJ,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC;4CAC1B,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS;gDAAE,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;wCACrE,CAAC;wCAAC,OAAO,CAAC,EAAE,CAAC;4CACZ,OAAO,CAAC,KAAK,CAAC,oBAAoB,GAAG,cAAc,EAAE,CAAC,CAAC,CAAC;wCACzD,CAAC;oCACF,CAAC;yCAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;wCACrE,IAAI,CAAC;4CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;wCAAC,CAAC;wCAAC,OAAO,CAAC,EAAE,CAAC;4CACjD,OAAO,CAAC,KAAK,CAAC,oBAAoB,GAAG,cAAc,EAAE,CAAC,CAAC,CAAC;wCACzD,CAAC;oCACF,CAAC;yCAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;wCACjD,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;oCACnB,CAAC;oCACD,OAAO,GAAG,CAAC;gCACZ,CAAC,EACD,EAAyB,CACzB;6BACD;yBACD;wBACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC;qBAC5C,CAAC;oBACF,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;gBAChD,CAAC;gBAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC9C,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,MAAM,cAAc,GAA2B,EAAE,CAAC;YAClD,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBAClC,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;oBACtC,IAAI,eAAe,IAAI,SAAS,EAAE,CAAC;wBAClC,MAAM,WAAW,GAAG,GAAG,IAAI,gBAAgB,CAAC;wBAC5C,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;wBACjC,MAAM,YAAY,GAAG,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;wBACtG,IAAI,YAAY,EAAE,CAAC;4BAClB,MAAM,iBAAiB,GAAG,IAAA,iCAAoB,EAAC,SAAS,CAAC,CAAC;4BAC1D,MAAM,UAAU,qBAA6B,YAAY,CAAC,UAAU,CAAE,CAAC;4BACvE,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gCAC/C,IAAI,CAAC;oCAAC,OAAO,OAAO,CAAC,CAAC,OAAO,CAAC,EAAS,CAAC,KAAK,SAAS,CAAC;gCAAC,CAAC;gCAAC,WAAM,CAAC;oCAAC,OAAO,KAAK,CAAC;gCAAC,CAAC;4BAClF,CAAC,CAAC,CAAC;4BACH,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC9C,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,mCAAQ,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,KAAE,OAAO,EAAE,KAAK,GAAE,CAAC;4BAChF,CAAC;4BACD,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,IAAA,mCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC;4BACxE,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;4BACvE,OAAO,EAAE,IAAI,EAAE,IAAA,mCAAyB,EAAC,WAAW,CAAC,EAAE,CAAC;wBACzD,CAAC;oBACF,CAAC;oBACD,OAAO,EAAE,IAAI,EAAE,IAAA,mCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,CAAC,CAAC;gBAEF,cAAc,CAAC,MAAM,CAAC;oBACrB,KAAK,CAAC,MAAM,KAAK,CAAC;wBACjB,CAAC,CAAC;4BACA,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;4BACrB,OAAO,EAAE,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;yBACpE;wBACF,CAAC,CAAC;4BACA,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;4BAC9B,OAAO,EAAE;gCACR,kBAAkB,EAAE;oCACnB,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;iCACrD;6BACD;yBACD,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC;QACvB,CAAC,CAAC;QAEM,+BAA0B,GAAG,CACpC,MAAW,EACX,KAAa,EACb,WAAmB,EACnB,UAAmB,EACnB,IAAY,EACZ,MAAc,EACd,IAAS,EACT,eAAgC,EAChC,KAAU,EACV,QAAa,EACb,MAAkC,EACjC,EAAE;;YACH,MAAM,WAAW,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC5E,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACzC,CAAC,CAAC,WAAW;qBACV,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBACrE,IAAI,CAAC,GAAG,CAAC;gBACZ,CAAC,CAAC,WAAW,CAAC;YAEf,MAAM,UAAU,GAAwB,EAAE,CAAC;YAE3C,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;gBAC5C,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrB,UAAU,CAAC,IAAI,CAAC;wBACf,EAAE,EAAE,MAAM;wBACV,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;wBACxB,QAAQ,EAAE,IAAI;wBACd,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;qBAC1B,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAA2B;gBACtC,WAAW,EAAE,GAAG,MAAM,IAAI,QAAQ,EAAE;gBACpC,IAAI,EAAE,QAAQ;gBACd,MAAM;gBACN,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;gBAClB,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE,WAAW;gBACxB,UAAU;aACV,CAAC;YAEF,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxB,IAAI,CAAC;oBACJ,IAAI,IAAA,iBAAO,EAAC,IAAI,CAAC,EAAE,CAAC;wBACnB,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;wBAC5B,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;4BAC5C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;4BAChC,uDAAuD;4BACvD,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;gCACjE,MAAM,QAAQ,GAAG,IAAA,8BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCACjD,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;4BAChE,CAAC;4BACD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAC5C,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,EACpC,eAAe,CACf,CAAC;wBACH,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,MAAM,IAAI,GAAG,IAAI,EAAE,CAAC;wBACpB,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,EAAE,CAAC;4BAChD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAC5C,IAAI,CAAC,iBAAiB,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,oDAAI,EAAE,MAAM,CAAC,EACnD,eAAe,CACf,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACP,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAC5C,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,EACrC,eAAe,CACf,CAAC;wBACH,CAAC;oBACF,CAAC;gBACF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBACvD,CAAC;YACF,CAAC;YAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC;oBACJ,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC;oBAC7B,IAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;wBACnD,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;wBACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;4BAC5C,UAAU,CAAC,IAAI,CAAC;gCACf,EAAE,EAAE,OAAO;gCACX,IAAI,EAAE,GAAG;gCACT,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gCAC5B,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW;6BAC7C,CAAC,CAAC;wBACJ,CAAC,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;gBACxD,CAAC;YACF,CAAC;YAED,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC;oBACJ,IAAI,IAAA,iBAAO,EAAC,QAAQ,CAAC,EAAE,CAAC;wBACvB,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;wBAChC,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;4BAC5C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;4BAChC,uDAAuD;4BACvD,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;gCACjE,MAAM,QAAQ,GAAG,IAAA,8BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCACjD,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;4BAChE,CAAC;4BACD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;wBACxF,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;wBACxB,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,EAAE,CAAC;4BAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAC3C,IAAI,CAAC,iBAAiB,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,oDAAI,EAAE,UAAU,CAAC,CACvD,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACP,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAC3C,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAC7C,CAAC;wBACH,CAAC;oBACF,CAAC;gBACF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;oBAC1D,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;gBACvB,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;YACvB,CAAC;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACzD,MAAM,CAAC,SAAS,mCAAQ,MAAM,CAAC,SAAS,GAAK,cAAc,CAAE,CAAC;YAE9D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;YAChC,CAAC;YAED,OAAO,MAAM,CAAC;QACf,CAAC,CAAC;QAEK,WAAM,GAAG,CAAC,MAAyC,EAAE,EAAE,CAAC,CAAC,OAAoB,EAAE,EAAE;YACvF,MAAM,EACL,IAAI,EACJ,UAAU,GAAG,EAAE,EACf,MAAM,EACN,KAAK,EACL,WAAW,EACX,UAAU,GAAG,KAAK,EAClB,IAAI,EACJ,eAAe,GAAG,kBAAkB,EACpC,KAAK,EACL,QAAQ,EACR,MAAM,GACN,GAAgB,OAAO,CAAC;YAEzB,MAAM,YAAY,GAAG,OAA8B,CAAC;YACpD,MAAM,qBAAqB,GAAG,IAAA,gDAAwB,GAAE,CAAC;YAEzD,MAAM,sBAAsB,GAAG,IAAA,iDAAuB,EAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;YAC5F,MAAM,qBAAqB,GAAG,IAAA,iDAAuB,EACpD,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAgC,EACjD,YAAY,CACZ,CAAC;YACF,MAAM,SAAS,GAAG,IAAA,2CAAiB,EAAC;gBACnC,GAAG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;gBACjB,GAAG,sBAAsB;gBACzB,GAAG,qBAAqB;aACxB,CAAC,CAAC;YAEH,MAAM,eAAe,GAAG,IAAI,CAAC,0BAA0B,CACtD,IAAI,EACJ,KAAK,IAAI,EAAE,EACX,WAAW,IAAI,EAAE,EACjB,UAAU,EACV,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,eAAe,EACf,KAAK,EACL,QAAQ,EACR,SAAS,CACT,CAAC;YACF,IAAA,kBAAQ,EAAC,eAAe,CAAC,CAAC;YAE1B,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;YAEzF,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,kBAAkB,EAAE,GAAG,UAAU,EAAE,IAAA,iBAAO,EAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3G,CAAC,CAAC;QAEK,WAAM,GAAG;YACf,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACvB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;YACzB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC7B,CAAC;QAtcD,IAAI,CAAC,aAAa,GAAG,IAAA,gBAAa,GAAE,CAAC;IACtC,CAAC;IAES,cAAc;QACvB,MAAM,MAAM,GAA4B,IAAY,CAAC,MAAM,CAAC;QAC5D,IAAI,MAAM,EAAE,CAAC;YACZ,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,iCACrB,KAAK;oBACR,2EAA2E;oBAC3E,MAAM,EAAE,IAAA,sBAAc,EAAE,IAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IACjE,CAAC;YACJ,CAAC;QACF,CAAC;IACF,CAAC;IAsBO,uBAAuB;;QAC9B,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC3C,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC;QAC9C,IAAI,CAAC;YACJ,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC3D,IAAI,SAAS,EAAE,EAAE,CAAC;gBACjB,MAAM,MAAM,GAAG,SAAS,EAAS,CAAC;gBAClC,OAAO,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,KAAI,IAAI,CAAC;YAC7C,CAAC;QACF,CAAC;QAAC,WAAM,CAAC,CAAA,CAAC;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,uBAAuB;;QAC9B,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI;YAAE,OAAO,MAAM,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC;YACJ,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC3D,IAAI,SAAS,EAAE,EAAE,CAAC;gBACjB,MAAM,MAAM,GAAG,SAAS,EAAS,CAAC;gBAClC,MAAM,UAAU,GAAG,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,CAAC;gBAChD,IAAI,UAAU,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;oBAC5C,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBAC7B,CAAC;YACF,CAAC;QACF,CAAC;QAAC,WAAM,CAAC,CAAA,CAAC;QACV,OAAO,EAAE,CAAC;IACX,CAAC;IAEO,yBAAyB,CAAC,WAAgB;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtG,MAAM,UAAU,GAAG,IAAA,uCAAqB,EAAC,SAAS,CAAC,CAAC;QAEpD,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YAChB,MAAM,UAAU,qBAAQ,YAAY,CAAC,UAAU,CAAE,CAAC;YAClD,UAAU,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;YACrC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;QACvC,CAAC;QAED,OAAO;YACN,KAAK,EAAE;gBACN,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE;gBACvD,WAAW;aACX;SACD,CAAC;IACH,CAAC;CA2WD;AA9cD,mCA8cC;AA0BD,MAAM,UAAU,GACf,CAAC,IAAI,EAAE,EAAE,CACT,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,EAAE,OAAO,GAAG,KAAK,EAAE,EAAE,CAC7C,GAAG,EAAE;IACJ,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,OAAO;QACnB,CAAC,CAAC;YACA,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,GAAG;SACV;QACF,CAAC,CAAC,GAAG,CAAC;IACP,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC,CAAC;AACU,QAAA,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;AACpC,QAAA,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export type { InferMiddlewareRouteOptions } from '@asapjs/types';
|
|
2
|
-
export { Delete, Get, GlobalRouteOptions, IOptions, Post, Put } from './decorator';
|
|
2
|
+
export { AutoInject, Delete, ErrorPayload, Get, GlobalRouteOptions, IOptions, Post, Put, ResponsePayload } from './decorator';
|
|
3
|
+
export type { AutoInjectEntry } from './decorator';
|
|
3
4
|
export { default as RouterController, requestType, responseType } from './express/router';
|
|
4
5
|
export { HttpException } from './middleware/errorHandler';
|
|
5
6
|
export { RouterPlugin } from './plugin';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9H,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -3,12 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getSchemeNameFromRef = exports.generateSchemeRefWithName = exports.defineMiddleware = exports.defineRouterConfig = exports.defineConfig = exports.getSwaggerData = exports.addScheme = exports.addPaths = exports.RouterModule = exports.RouterPlugin = exports.HttpException = exports.responseType = exports.requestType = exports.RouterController = exports.Put = exports.Post = exports.Get = exports.Delete = void 0;
|
|
6
|
+
exports.getSchemeNameFromRef = exports.generateSchemeRefWithName = exports.defineMiddleware = exports.defineRouterConfig = exports.defineConfig = exports.getSwaggerData = exports.addScheme = exports.addPaths = exports.RouterModule = exports.RouterPlugin = exports.HttpException = exports.responseType = exports.requestType = exports.RouterController = exports.ResponsePayload = exports.Put = exports.Post = exports.Get = exports.ErrorPayload = exports.Delete = exports.AutoInject = void 0;
|
|
7
7
|
var decorator_1 = require("./decorator");
|
|
8
|
+
Object.defineProperty(exports, "AutoInject", { enumerable: true, get: function () { return decorator_1.AutoInject; } });
|
|
8
9
|
Object.defineProperty(exports, "Delete", { enumerable: true, get: function () { return decorator_1.Delete; } });
|
|
10
|
+
Object.defineProperty(exports, "ErrorPayload", { enumerable: true, get: function () { return decorator_1.ErrorPayload; } });
|
|
9
11
|
Object.defineProperty(exports, "Get", { enumerable: true, get: function () { return decorator_1.Get; } });
|
|
10
12
|
Object.defineProperty(exports, "Post", { enumerable: true, get: function () { return decorator_1.Post; } });
|
|
11
13
|
Object.defineProperty(exports, "Put", { enumerable: true, get: function () { return decorator_1.Put; } });
|
|
14
|
+
Object.defineProperty(exports, "ResponsePayload", { enumerable: true, get: function () { return decorator_1.ResponsePayload; } });
|
|
12
15
|
var router_1 = require("./express/router");
|
|
13
16
|
Object.defineProperty(exports, "RouterController", { enumerable: true, get: function () { return __importDefault(router_1).default; } });
|
|
14
17
|
Object.defineProperty(exports, "requestType", { enumerable: true, get: function () { return router_1.requestType; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,yCAA8H;AAArH,uGAAA,UAAU,OAAA;AAAE,mGAAA,MAAM,OAAA;AAAE,yGAAA,YAAY,OAAA;AAAE,gGAAA,GAAG,OAAA;AAAgC,iGAAA,IAAI,OAAA;AAAE,gGAAA,GAAG,OAAA;AAAE,4GAAA,eAAe,OAAA;AAExG,2CAA0F;AAAjF,2HAAA,OAAO,OAAoB;AAAE,qGAAA,WAAW,OAAA;AAAE,sGAAA,YAAY,OAAA;AAC/D,0DAA0D;AAAjD,6GAAA,aAAa,OAAA;AACtB,mCAAwC;AAA/B,sGAAA,YAAY,OAAA;AACrB,wCAAyD,CAAC,0CAA0C;AAA3F,sHAAA,OAAO,OAAgB;AAChC,qCAAgE;AAAvD,mGAAA,QAAQ,OAAA;AAAE,oGAAA,SAAS,OAAA;AAAE,yGAAA,cAAc,OAAA;AAC5C,qDAA2F;AAA/D,4GAAA,YAAY,OAAA;AAAE,kHAAA,kBAAkB,OAAA;AAC5D,6DAA4D;AAAnD,oHAAA,gBAAgB,OAAA;AACzB,+EAAyF;AAAhF,uJAAA,OAAO,OAA6B;AAC7C,qEAA+E;AAAtE,6IAAA,OAAO,OAAwB"}
|
package/dist/plugin.js
CHANGED
|
@@ -91,7 +91,7 @@ class RouterPlugin {
|
|
|
91
91
|
catch (err) {
|
|
92
92
|
res.status(500).send(err);
|
|
93
93
|
}
|
|
94
|
-
})));
|
|
94
|
+
}), null));
|
|
95
95
|
this.setupSwagger();
|
|
96
96
|
this.setupSequelizeRoutes();
|
|
97
97
|
this.setupConsoleRoutes();
|
|
@@ -122,7 +122,7 @@ class RouterPlugin {
|
|
|
122
122
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/docs/swagger.json`, (0, wrapper_1.default)((_a) => __awaiter(this, [_a], void 0, function* ({ req }) {
|
|
123
123
|
const swaggerData = (0, swagger_1.getSwaggerData)(req);
|
|
124
124
|
return swaggerData;
|
|
125
|
-
})));
|
|
125
|
+
}), null));
|
|
126
126
|
}
|
|
127
127
|
setupSequelizeRoutes() {
|
|
128
128
|
if (this.config.extensions.includes('@asapjs/sequelize')) {
|
|
@@ -130,12 +130,12 @@ class RouterPlugin {
|
|
|
130
130
|
const { modelsSync } = require('@asapjs/sequelize');
|
|
131
131
|
yield modelsSync();
|
|
132
132
|
return true;
|
|
133
|
-
})));
|
|
133
|
+
}), null));
|
|
134
134
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/docs/generate-dbml`, (0, wrapper_1.default)(() => __awaiter(this, void 0, void 0, function* () {
|
|
135
135
|
const { getDBMLData } = require('@asapjs/sequelize');
|
|
136
136
|
const data = yield getDBMLData();
|
|
137
137
|
return true;
|
|
138
|
-
})));
|
|
138
|
+
}), null));
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
setupConsoleRoutes() {
|
|
@@ -145,7 +145,7 @@ class RouterPlugin {
|
|
|
145
145
|
const result = yield getConsoleData();
|
|
146
146
|
console.log('result', result);
|
|
147
147
|
return { result };
|
|
148
|
-
})));
|
|
148
|
+
}), null));
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
initMiddlewares() {
|
package/dist/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/router/index.js
CHANGED
|
@@ -66,7 +66,7 @@ class RouterModule {
|
|
|
66
66
|
catch (err) {
|
|
67
67
|
res.status(500).send(err);
|
|
68
68
|
}
|
|
69
|
-
})));
|
|
69
|
+
}), null));
|
|
70
70
|
const options = {
|
|
71
71
|
swaggerOptions: {
|
|
72
72
|
url: `${this.config.basePath ? `/${this.config.basePath}` : ''}/docs/swagger.json`,
|
|
@@ -89,7 +89,7 @@ class RouterModule {
|
|
|
89
89
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/docs/swagger.json`, (0, wrapper_1.default)((_a) => __awaiter(this, [_a], void 0, function* ({ req }) {
|
|
90
90
|
const swaggerData = (0, swagger_1.getSwaggerData)(req);
|
|
91
91
|
return swaggerData;
|
|
92
|
-
})));
|
|
92
|
+
}), null));
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
95
|
common_1.logger.warn('@router SWAGGER useAuth is disabled! Please add config.swagger.useAuth & config.swagger.userObject');
|
|
@@ -97,19 +97,19 @@ class RouterModule {
|
|
|
97
97
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/docs/swagger.json`, (0, wrapper_1.default)((_a) => __awaiter(this, [_a], void 0, function* ({ req }) {
|
|
98
98
|
const swaggerData = (0, swagger_1.getSwaggerData)(req);
|
|
99
99
|
return swaggerData;
|
|
100
|
-
})));
|
|
100
|
+
}), null));
|
|
101
101
|
}
|
|
102
102
|
if (this.config.extensions.includes('@asapjs/sequelize')) {
|
|
103
103
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/sync`, (0, wrapper_1.default)(() => __awaiter(this, void 0, void 0, function* () {
|
|
104
104
|
const { modelsSync } = require('@asapjs/sequelize');
|
|
105
105
|
yield modelsSync();
|
|
106
106
|
return true;
|
|
107
|
-
})));
|
|
107
|
+
}), null));
|
|
108
108
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/docs/generate-dbml`, (0, wrapper_1.default)(() => __awaiter(this, void 0, void 0, function* () {
|
|
109
109
|
const { getDBMLData } = require('@asapjs/sequelize');
|
|
110
110
|
const data = yield getDBMLData();
|
|
111
111
|
return true;
|
|
112
|
-
})));
|
|
112
|
+
}), null));
|
|
113
113
|
}
|
|
114
114
|
if (this.config.extensions.includes('@asapjs/console')) {
|
|
115
115
|
this.app.get(`${this.config.basePath ? `/${this.config.basePath}` : ''}/console/data`, (0, wrapper_1.default)(() => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -117,7 +117,7 @@ class RouterModule {
|
|
|
117
117
|
const result = yield getConsoleData();
|
|
118
118
|
console.log('result', result);
|
|
119
119
|
return { result };
|
|
120
|
-
})));
|
|
120
|
+
}), null));
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
initMiddlewares() {
|
package/dist/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAmD;AACnD,4EAA2C;AAE3C,sDAA8B;AAC9B,8DAAqC;AACrC,gDAAwB;AACxB,4EAA2C;AAE3C,8EAAsD;AACtD,+DAAuC;AACvC,wCAA4C;AAC5C,2CAA2D;AAC3D,2DAA2D;AAE3D,MAAqB,YAAY;IAK/B,YAAY,OAAe;QACzB,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QAErB,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC;gBACH,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBAChE,IAAI,CAAC,iBAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC/B,iBAAQ,CAAC,QAAQ,CAAC,wBAAe,CAAC,CAAC;gBACrC,CAAC;gBACD,sBAAsB,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,KAAK,CAAC,gEAAgE,EAAE,KAAK,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;IAC7B,CAAC;IAEO,UAAU,CAAC,OAAe;;QAChC,MAAM,MAAM,GAAmB,iBAAO,CAAC,MAAM,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,OAAO,QAAQ,CAAC,CAAC,OAAO,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CACV,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,EAC5E,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,MAAM,CACpC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAC9D,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,oBAAoB,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CACV,eAAe,EACf,IAAA,iBAAO,EAAC,KAAqB,EAAE,0CAAhB,EAAE,GAAG,EAAE,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/wrapper.d.ts
CHANGED
|
@@ -27,6 +27,6 @@ export type ExecuteArgs<P = {}, Q = {}, B = {}, Context = GlobalMiddlewareContex
|
|
|
27
27
|
};
|
|
28
28
|
paging: PaginationQueryType;
|
|
29
29
|
} & Context;
|
|
30
|
-
export default function Wrapper(cb: (args: ExecuteArgs) => Promise<unknown
|
|
30
|
+
export default function Wrapper(cb: (args: ExecuteArgs) => Promise<unknown>, responseDtoClass?: (new () => any) | null): Callback;
|
|
31
31
|
export {};
|
|
32
32
|
//# sourceMappingURL=wrapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAK/D,KAAK,QAAQ,GAAG,CACf,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACpC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,IAAI,EAAE,GAAG,CAAC;SACV;KACD;CACD;AAGD,MAAM,WAAW,uBAAuB;CAAG;AAE3C,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,OAAO,GAAG,uBAAuB,IAAI;IACpF,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,CAAC,EAAE,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAClC,IAAI,EAAE,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACjC,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC/B,MAAM,EAAE,mBAAmB,CAAC;CAC5B,GAAG,OAAO,CAAC;AAEZ,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAE,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,QAAQ,CAwDhI"}
|
package/dist/utils/wrapper.js
CHANGED
|
@@ -46,7 +46,10 @@ exports.default = Wrapper;
|
|
|
46
46
|
const common_1 = require("@asapjs/common");
|
|
47
47
|
const error_1 = require("@asapjs/error");
|
|
48
48
|
const Sentry = __importStar(require("@sentry/node"));
|
|
49
|
-
|
|
49
|
+
const AutoInject_1 = require("../decorator/AutoInject");
|
|
50
|
+
const ErrorPayload_1 = require("../decorator/ErrorPayload");
|
|
51
|
+
const ResponsePayload_1 = require("../decorator/ResponsePayload");
|
|
52
|
+
function Wrapper(cb, responseDtoClass) {
|
|
50
53
|
return function _Wrapper(req, res, _next) {
|
|
51
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
55
|
try {
|
|
@@ -66,8 +69,9 @@ function Wrapper(cb) {
|
|
|
66
69
|
},
|
|
67
70
|
});
|
|
68
71
|
const output = yield cb(args);
|
|
69
|
-
if (output) {
|
|
70
|
-
|
|
72
|
+
if (output !== undefined) {
|
|
73
|
+
const finalResponse = applyGlobalResponse(output, req, responseDtoClass);
|
|
74
|
+
res.status(200).json(finalResponse);
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
77
|
catch (err) {
|
|
@@ -81,19 +85,74 @@ function Wrapper(cb) {
|
|
|
81
85
|
Sentry.captureException(err);
|
|
82
86
|
}
|
|
83
87
|
}
|
|
88
|
+
let errorBody;
|
|
89
|
+
let statusCode;
|
|
84
90
|
if (err instanceof error_1.HttpError) {
|
|
85
|
-
|
|
91
|
+
errorBody = err.toJSON();
|
|
92
|
+
statusCode = err.status;
|
|
86
93
|
}
|
|
87
94
|
else if (err && typeof err === 'object' && 'status' in err && 'message' in err) {
|
|
88
95
|
const { status, message } = err;
|
|
89
|
-
|
|
96
|
+
errorBody = new error_1.HttpError(status, 'HTTP_EXCEPTION', String(message)).toJSON();
|
|
97
|
+
statusCode = status;
|
|
90
98
|
}
|
|
91
99
|
else {
|
|
92
100
|
const message = err instanceof Error ? err.message : '알 수 없는 서버 오류가 발생했습니다.';
|
|
93
|
-
|
|
101
|
+
errorBody = new error_1.HttpError(500, 'INTERNAL_SERVER_ERROR', message).toJSON();
|
|
102
|
+
statusCode = 500;
|
|
94
103
|
}
|
|
104
|
+
const finalErrorResponse = applyGlobalErrorResponse(errorBody, req, responseDtoClass);
|
|
105
|
+
res.status(statusCode).json(finalErrorResponse);
|
|
95
106
|
}
|
|
96
107
|
});
|
|
97
108
|
};
|
|
98
109
|
}
|
|
110
|
+
function applyGlobalResponse(output, req, responseDtoClass) {
|
|
111
|
+
const DtoClass = resolveResponseDtoClass(responseDtoClass);
|
|
112
|
+
if (!DtoClass)
|
|
113
|
+
return output;
|
|
114
|
+
const autoInjectEntries = (0, AutoInject_1.getAutoInjectEntries)(DtoClass);
|
|
115
|
+
const payloadKey = (0, ResponsePayload_1.getResponsePayloadKey)(DtoClass);
|
|
116
|
+
const injected = {};
|
|
117
|
+
for (const { key, factory } of autoInjectEntries) {
|
|
118
|
+
injected[key] = factory(req);
|
|
119
|
+
}
|
|
120
|
+
if (payloadKey) {
|
|
121
|
+
return Object.assign(Object.assign({}, injected), { [payloadKey]: output });
|
|
122
|
+
}
|
|
123
|
+
if (typeof output === 'object' && output !== null) {
|
|
124
|
+
return Object.assign(Object.assign({}, injected), output);
|
|
125
|
+
}
|
|
126
|
+
return Object.assign(Object.assign({}, injected), { result: output });
|
|
127
|
+
}
|
|
128
|
+
function resolveResponseDtoClass(controllerDto) {
|
|
129
|
+
var _a;
|
|
130
|
+
if (controllerDto === null)
|
|
131
|
+
return null;
|
|
132
|
+
if (controllerDto)
|
|
133
|
+
return controllerDto;
|
|
134
|
+
if ((0, common_1.hasConfig)()) {
|
|
135
|
+
const config = (0, common_1.getConfig)();
|
|
136
|
+
return ((_a = config.response) === null || _a === void 0 ? void 0 : _a.responseDto) || null;
|
|
137
|
+
}
|
|
138
|
+
return null;
|
|
139
|
+
}
|
|
140
|
+
function applyGlobalErrorResponse(errorBody, req, responseDtoClass) {
|
|
141
|
+
const DtoClass = resolveResponseDtoClass(responseDtoClass);
|
|
142
|
+
if (!DtoClass)
|
|
143
|
+
return errorBody;
|
|
144
|
+
const errorPayloadKey = (0, ErrorPayload_1.getErrorPayloadKey)(DtoClass);
|
|
145
|
+
if (!errorPayloadKey)
|
|
146
|
+
return errorBody;
|
|
147
|
+
const autoInjectEntries = (0, AutoInject_1.getAutoInjectEntries)(DtoClass);
|
|
148
|
+
const injected = {};
|
|
149
|
+
for (const { key, factory } of autoInjectEntries) {
|
|
150
|
+
injected[key] = factory(req);
|
|
151
|
+
}
|
|
152
|
+
const successKey = Object.keys(injected).find((k) => typeof injected[k] === 'boolean');
|
|
153
|
+
if (successKey) {
|
|
154
|
+
injected[successKey] = false;
|
|
155
|
+
}
|
|
156
|
+
return Object.assign(Object.assign({}, injected), { [errorPayloadKey]: errorBody });
|
|
157
|
+
}
|
|
99
158
|
//# sourceMappingURL=wrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@asapjs/router",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.37",
|
|
4
4
|
"description": "Router and API layer for AsapJS",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -9,7 +9,8 @@
|
|
|
9
9
|
],
|
|
10
10
|
"scripts": {
|
|
11
11
|
"prebuild": "rm -rf dist",
|
|
12
|
-
"build": "tsc"
|
|
12
|
+
"build": "tsc",
|
|
13
|
+
"test": "npx jest --config jest.config.js --testPathPatterns='(global-response-dto|runtime-consistency|error-payload)'"
|
|
13
14
|
},
|
|
14
15
|
"author": "",
|
|
15
16
|
"license": "ISC",
|
|
@@ -18,10 +19,10 @@
|
|
|
18
19
|
"access": "public"
|
|
19
20
|
},
|
|
20
21
|
"dependencies": {
|
|
21
|
-
"@asapjs/common": "^1.0.0-alpha.
|
|
22
|
-
"@asapjs/error": "^1.0.0-alpha.
|
|
23
|
-
"@asapjs/sequelize": "^1.0.0-alpha.
|
|
24
|
-
"@asapjs/types": "^1.0.0-alpha.
|
|
22
|
+
"@asapjs/common": "^1.0.0-alpha.37",
|
|
23
|
+
"@asapjs/error": "^1.0.0-alpha.37",
|
|
24
|
+
"@asapjs/sequelize": "^1.0.0-alpha.37",
|
|
25
|
+
"@asapjs/types": "^1.0.0-alpha.37",
|
|
25
26
|
"@sentry/node": "^6.19.7",
|
|
26
27
|
"body-parser": "^1.20.3",
|
|
27
28
|
"cors": "^2.8.5",
|
|
@@ -43,5 +44,5 @@
|
|
|
43
44
|
"@types/swagger-ui-express": "^4.1.8",
|
|
44
45
|
"typescript": "^5.8.3"
|
|
45
46
|
},
|
|
46
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "549cb8d70521be419232501936648301da4d3d9d"
|
|
47
48
|
}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import type { NextFunction, Request, Response } from 'express';
|
|
2
|
-
declare global {
|
|
3
|
-
namespace Express {
|
|
4
|
-
interface Request {
|
|
5
|
-
user: any;
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
}
|
|
9
|
-
export interface JwtUserPayload {
|
|
10
|
-
[key: string]: any;
|
|
11
|
-
}
|
|
12
|
-
declare const jwtVerification: (auth?: boolean) => (req: Request, res: Response, next: NextFunction) => void;
|
|
13
|
-
export default jwtVerification;
|
|
14
|
-
//# sourceMappingURL=jwtVerification.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"jwtVerification.d.ts","sourceRoot":"","sources":["../../src/middleware/jwtVerification.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAK/D,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,IAAI,EAAE,GAAG,CAAC;SACV;KACD;CACD;AAED,MAAM,WAAW,cAAc;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACnB;AAED,QAAA,MAAM,eAAe,GACnB,OAAM,OAAe,MACrB,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,SA+B/C,CAAC;AAEH,eAAe,eAAe,CAAC"}
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const common_1 = require("@asapjs/common");
|
|
7
|
-
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
8
|
-
const errorHandler_1 = require("./errorHandler");
|
|
9
|
-
const jwtVerification = (auth = false) => (req, res, next) => {
|
|
10
|
-
const { authorization } = req.headers;
|
|
11
|
-
if (!authorization) {
|
|
12
|
-
if (auth === true) {
|
|
13
|
-
throw new errorHandler_1.HttpException(403, 'NO Token Provided');
|
|
14
|
-
}
|
|
15
|
-
next();
|
|
16
|
-
}
|
|
17
|
-
else {
|
|
18
|
-
const token = authorization.split(' ')[1];
|
|
19
|
-
jsonwebtoken_1.default.verify(token, (0, common_1.getConfig)().auth.jwt_access_token_secret, (err, decoded) => {
|
|
20
|
-
if (err && auth === true) {
|
|
21
|
-
if (err.message === 'invalid signature') {
|
|
22
|
-
return res.status(403).json({
|
|
23
|
-
error: true,
|
|
24
|
-
message: 'invaild signature. please use vaild endpoint',
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
return res.status(401).json({
|
|
28
|
-
error: true,
|
|
29
|
-
message: 'Unauthorized access. Please Refresh Token',
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
req.user = decoded;
|
|
33
|
-
next();
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
};
|
|
37
|
-
exports.default = jwtVerification;
|
|
38
|
-
//# sourceMappingURL=jwtVerification.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"jwtVerification.js","sourceRoot":"","sources":["../../src/middleware/jwtVerification.ts"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAG3C,gEAA+B;AAE/B,iDAA+C;AAc/C,MAAM,eAAe,GACpB,CAAC,OAAgB,KAAK,EAAE,EAAE,CAC1B,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACnD,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IACtC,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,4BAAa,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,sBAAG,CAAC,MAAM,CACT,KAAK,EACJ,IAAA,kBAAS,GAAU,CAAC,IAAI,CAAC,uBAAuB,EACjD,CAAC,GAAQ,EAAE,OAAY,EAAE,EAAE;YAC1B,IAAI,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAC1B,IAAI,GAAG,CAAC,OAAO,KAAK,mBAAmB,EAAE,CAAC;oBACzC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBAC3B,KAAK,EAAE,IAAI;wBACX,OAAO,EAAE,8CAA8C;qBACvD,CAAC,CAAC;gBACJ,CAAC;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC3B,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,2CAA2C;iBACpD,CAAC,CAAC;YACJ,CAAC;YACD,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;YACnB,IAAI,EAAE,CAAC;QACR,CAAC,CACD,CAAC;IACH,CAAC;AACF,CAAC,CAAC;AAEH,kBAAe,eAAe,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { MiddlewareRouteOptions } from '@asapjs/types';
|
|
2
|
-
export declare function setGlobalRouteDefaults(opts: MiddlewareRouteOptions): void;
|
|
3
|
-
export declare function getGlobalRouteDefaults(): Readonly<MiddlewareRouteOptions>;
|
|
4
|
-
//# sourceMappingURL=globalRouteDefaults.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"globalRouteDefaults.d.ts","sourceRoot":"","sources":["../../src/utils/globalRouteDefaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAI5D,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAEzE;AAED,wBAAgB,sBAAsB,IAAI,QAAQ,CAAC,sBAAsB,CAAC,CAEzE"}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setGlobalRouteDefaults = setGlobalRouteDefaults;
|
|
4
|
-
exports.getGlobalRouteDefaults = getGlobalRouteDefaults;
|
|
5
|
-
let defaults = {};
|
|
6
|
-
function setGlobalRouteDefaults(opts) {
|
|
7
|
-
defaults = Object.assign({}, opts);
|
|
8
|
-
}
|
|
9
|
-
function getGlobalRouteDefaults() {
|
|
10
|
-
return defaults;
|
|
11
|
-
}
|
|
12
|
-
//# sourceMappingURL=globalRouteDefaults.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"globalRouteDefaults.js","sourceRoot":"","sources":["../../src/utils/globalRouteDefaults.ts"],"names":[],"mappings":";;AAIA,wDAEC;AAED,wDAEC;AARD,IAAI,QAAQ,GAA2B,EAAE,CAAC;AAE1C,SAAgB,sBAAsB,CAAC,IAA4B;IAClE,QAAQ,qBAAQ,IAAI,CAAE,CAAC;AACxB,CAAC;AAED,SAAgB,sBAAsB;IACrC,OAAO,QAAQ,CAAC;AACjB,CAAC"}
|