@asapjs/router 0.10.27 → 0.10.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAU,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAUrD,KAAK,eAAe,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AAClE,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC;CACb;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,MAAM,EAAE,UAAU,CAAC;CACpB;AAUD,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAC5B,QAAQ,SAAO;IAEf,aAAa,EAAE,aAAa,CAAC;;IAMpC,SAAS,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAU,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAUrD,KAAK,eAAe,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AAClE,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC;CACb;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,MAAM,EAAE,UAAU,CAAC;CACpB;AAUD,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAC5B,QAAQ,SAAO;IAEf,aAAa,EAAE,aAAa,CAAC;;IAMpC,SAAS,CAAC,cAAc;IAUxB,OAAO,CAAC,mBAAmB,CAOxB;IAEH,OAAO,CAAC,oBAAoB,CASzB;IAEH,OAAO,CAAC,iBAAiB,CAmBvB;IAEF,OAAO,CAAC,kBAAkB,CAkBxB;IAEF,OAAO,CAAC,0BAA0B,CAwFhC;IAEK,MAAM,WAAY,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,eAAe,WAAW,UA8BlF;IAEK,MAAM;uBAhC4D,WAAW;wBAAX,WAAW;uBAAX,WAAW;0BAAX,WAAW;MAqClF;CACH;AAED,UAAU,aAAa,CAAC,CAAC;IACvB,QAAQ,CAAC,CAAC;CACX;AAED,KAAK,qBAAqB,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9C,KAAK,oBAAoB,GACrB;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,IAAI,EAAE,GAAG,CAAC;CACX,GACD,SAAS,GACT,IAAI,CAAC;AAET,KAAK,cAAc,GAAG,MAAM,oBAAoB,CAAC;AAqBjD,eAAO,MAAM,WAAW,QAjBb,cAAc,GAAG,CAAC,GAAG,IAAI,cAAc,qBAAqB,YAAY,OAAO,KAAK,cAiB/C,CAAC;AACjD,eAAO,MAAM,YAAY,QAlBd,cAAc,GAAG,CAAC,GAAG,IAAI,cAAc,qBAAqB,YAAY,OAAO,KAAK,cAkB7C,CAAC;AAEnD,UAAU,IAAI;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClC,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACjC,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACnC,IAAI,CAAC,EAAE,IAAI,CAAC;CACb"}
|
package/dist/express/router.js
CHANGED
|
@@ -141,9 +141,13 @@ class RouterController {
|
|
|
141
141
|
};
|
|
142
142
|
this.excute = (method) => (options) => {
|
|
143
143
|
const { path, middleware = [], auth = false, excute, title, body, bodyContentType = 'application/json', query, response, } = options;
|
|
144
|
+
// 'excute' is a function that returns the actual method to be called.
|
|
145
|
+
// If the 'excute' property is already a function (not wrapped in another function),
|
|
146
|
+
// it will be called immediately. Otherwise, the function returned by 'excute' will be called.
|
|
147
|
+
const routeMethod = typeof excute === 'function' && excute.length === 0 ? excute() : excute;
|
|
144
148
|
const swaggerPathInfo = this.generateSwaggerDefaultsSet(this, title || '', path, method, body, bodyContentType, query, response);
|
|
145
149
|
(0, swagger_1.addPaths)(swaggerPathInfo);
|
|
146
|
-
this.expressRouter[method](path, (0, jwtVerification_1.default)(auth), ...middleware, (0, wrapper_1.default)(
|
|
150
|
+
this.expressRouter[method](path, (0, jwtVerification_1.default)(auth), ...middleware, (0, wrapper_1.default)(routeMethod));
|
|
147
151
|
};
|
|
148
152
|
this.router = {
|
|
149
153
|
get: this.excute('get'),
|
|
@@ -154,13 +158,11 @@ class RouterController {
|
|
|
154
158
|
this.expressRouter = (0, express_1.Router)();
|
|
155
159
|
}
|
|
156
160
|
registerRoutes() {
|
|
157
|
-
var _a, _b;
|
|
158
161
|
const routes = this.routes;
|
|
159
162
|
console.log('>>>>routes', routes);
|
|
160
163
|
if (routes) {
|
|
161
164
|
for (const route of routes) {
|
|
162
|
-
|
|
163
|
-
this.excute(route.method)(Object.assign(Object.assign({}, route), { excute: (_b = route === null || route === void 0 ? void 0 : route.excute) === null || _b === void 0 ? void 0 : _b.call(route) }));
|
|
165
|
+
this.excute(route.method)(route);
|
|
164
166
|
}
|
|
165
167
|
}
|
|
166
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":";;;;;;AAEA,qCAAqD;AAErD,wCAAiD;AACjD,oFAA4D;AAC5D,+DAAuC;AACvC,+DAAuC;AACvC,yFAAiE;AACjE,mGAA2E;AA8B3E,MAAqB,gBAAgB;IAKnC;QAJO,aAAQ,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@asapjs/router",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.28",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"winston": "^3.6.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@asapjs/core": "^0.10.
|
|
26
|
+
"@asapjs/core": "^0.10.28",
|
|
27
27
|
"@asapjs/sequelize": "^0.10.20",
|
|
28
28
|
"@types/body-parser": "^1.19.2",
|
|
29
29
|
"@types/cors": "^2.8.12",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"@types/swagger-ui-express": "^4.1.3",
|
|
34
34
|
"typescript": "^4.6.2"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "f1fefb3c8b04159509f3728a97f5dd08e87a9135"
|
|
37
37
|
}
|