@loopback/express 4.1.0 → 5.0.0
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/express.server.js +6 -6
- package/dist/express.server.js.map +1 -1
- package/dist/group-sorter.js +2 -2
- package/dist/group-sorter.js.map +1 -1
- package/dist/index.js +10 -10
- package/dist/index.js.map +1 -1
- package/dist/middleware-interceptor.js +5 -5
- package/dist/middleware-interceptor.js.map +1 -1
- package/dist/middleware.js +18 -10
- package/dist/middleware.js.map +1 -1
- package/dist/providers/invoke-middleware.provider.js +8 -8
- package/dist/providers/invoke-middleware.provider.js.map +1 -1
- package/dist/types.js +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +15 -15
- package/src/middleware.ts +16 -9
package/dist/express.server.js
CHANGED
|
@@ -8,8 +8,8 @@ exports.ExpressServer = void 0;
|
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const core_1 = require("@loopback/core");
|
|
10
10
|
const http_server_1 = require("@loopback/http-server");
|
|
11
|
-
const debug_1 =
|
|
12
|
-
const express_1 =
|
|
11
|
+
const debug_1 = tslib_1.__importDefault(require("debug"));
|
|
12
|
+
const express_1 = tslib_1.__importDefault(require("express"));
|
|
13
13
|
const middleware_1 = require("./middleware");
|
|
14
14
|
const middleware_registry_1 = require("./middleware-registry");
|
|
15
15
|
const types_1 = require("./types");
|
|
@@ -82,10 +82,10 @@ let ExpressServer = class ExpressServer extends middleware_registry_1.BaseMiddle
|
|
|
82
82
|
return (0, types_1.getMiddlewareContext)(request);
|
|
83
83
|
}
|
|
84
84
|
};
|
|
85
|
-
ExpressServer =
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
85
|
+
ExpressServer = tslib_1.__decorate([
|
|
86
|
+
tslib_1.__param(0, (0, core_1.inject)(core_1.CoreBindings.APPLICATION_CONFIG.deepProperty('express'))),
|
|
87
|
+
tslib_1.__param(1, (0, core_1.inject)(core_1.CoreBindings.APPLICATION_INSTANCE)),
|
|
88
|
+
tslib_1.__metadata("design:paramtypes", [Object, core_1.Context])
|
|
89
89
|
], ExpressServer);
|
|
90
90
|
exports.ExpressServer = ExpressServer;
|
|
91
91
|
//# sourceMappingURL=express.server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.server.js","sourceRoot":"","sources":["../src/express.server.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAMwB;AACxB,uDAA4E;AAC5E
|
|
1
|
+
{"version":3,"file":"express.server.js","sourceRoot":"","sources":["../src/express.server.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAMwB;AACxB,uDAA4E;AAC5E,0DAAiC;AACjC,8DAA8B;AAC9B,6CAAiD;AACjD,+DAA6D;AAC7D,mCAAyE;AAEzE,MAAM,KAAK,GAAG,IAAA,eAAY,EAAC,qBAAqB,CAAC,CAAC;AAgBlD;;GAEG;AACH,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,4CAAsB;IAcvD,YAEqB,MAA4B,EAE/C,MAAgB;;QAEhB,KAAK,CAAC,MAAM,CAAC,CAAC;QAJK,WAAM,GAAN,MAAM,CAAsB;QAK/C,IAAI,CAAC,KAAK,GAAG,mBAAY,CAAC,MAAM,CAAC;QACjC,IAAI,QAAQ,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,mCAAI,EAAE,CAAC;QACtC,gCAAgC;QAChC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,QAAQ;YAAE,QAAQ,GAAG,GAAG,GAAG,QAAQ,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,IAAI,CAAC,UAAU,GAAG,IAAA,iBAAO,GAAE,CAAC;QAC5B,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;YACpB,KAAK,MAAM,CAAC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;gBAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7C;SACF;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAE1D,4DAA4D;QAC5D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAA,gCAAmB,EAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACH,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACH,IAAI,GAAG;QACL,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,SAAS;YAAE,OAAO,SAAS,CAAC;QACjC,SAAS,GAAG,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QACtC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;;QACT,OAAO,MAAA,IAAI,CAAC,UAAU,0CAAE,GAAG,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC9B,KAAK,CAAC,+BAA+B,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,OAAgB;QACnC,OAAO,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AArFY,aAAa;IAerB,mBAAA,IAAA,aAAM,EAAC,mBAAY,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAA;IAE/D,mBAAA,IAAA,aAAM,EAAC,mBAAY,CAAC,oBAAoB,CAAC,CAAA;qDACjC,cAAO;GAlBP,aAAa,CAqFzB;AArFY,sCAAa"}
|
package/dist/group-sorter.js
CHANGED
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.sortListOfGroups = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
|
-
const debug_1 =
|
|
10
|
-
const toposort_1 =
|
|
9
|
+
const debug_1 = tslib_1.__importDefault(require("debug"));
|
|
10
|
+
const toposort_1 = tslib_1.__importDefault(require("toposort"));
|
|
11
11
|
const debug = (0, debug_1.default)('loopback:middleware');
|
|
12
12
|
/**
|
|
13
13
|
* Sort the groups by their relative order
|
package/dist/group-sorter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-sorter.js","sourceRoot":"","sources":["../src/group-sorter.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE
|
|
1
|
+
{"version":3,"file":"group-sorter.js","sourceRoot":"","sources":["../src/group-sorter.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,0DAAiC;AACjC,gEAAgC;AAChC,MAAM,KAAK,GAAG,IAAA,eAAY,EAAC,qBAAqB,CAAC,CAAC;AAClD;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,GAAG,aAAyB;IAC3D,IAAI,KAAK,CAAC,OAAO,EAAE;QACjB,KAAK,CACH,sBAAsB,EACtB,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACtD,CAAC;KACH;IACD,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;QAClC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;YACtB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAwB,EAAE,KAAK,EAAE,EAAE;gBAChD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC5B,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;iBAC3B;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,EAAE,SAAS,CAAC,CAAC;SACf;KACF;IACD,MAAM,MAAM,GAAG,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC;IAC/B,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,4CAqBC"}
|
package/dist/index.js
CHANGED
|
@@ -22,14 +22,14 @@ const tslib_1 = require("tslib");
|
|
|
22
22
|
*
|
|
23
23
|
* @packageDocumentation
|
|
24
24
|
*/
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
25
|
+
tslib_1.__exportStar(require("./express.application"), exports);
|
|
26
|
+
tslib_1.__exportStar(require("./express.server"), exports);
|
|
27
|
+
tslib_1.__exportStar(require("./group-sorter"), exports);
|
|
28
|
+
tslib_1.__exportStar(require("./keys"), exports);
|
|
29
|
+
tslib_1.__exportStar(require("./middleware"), exports);
|
|
30
|
+
tslib_1.__exportStar(require("./middleware-interceptor"), exports);
|
|
31
|
+
tslib_1.__exportStar(require("./middleware-registry"), exports);
|
|
32
|
+
tslib_1.__exportStar(require("./mixins/middleware.mixin"), exports);
|
|
33
|
+
tslib_1.__exportStar(require("./providers/invoke-middleware.provider"), exports);
|
|
34
|
+
tslib_1.__exportStar(require("./types"), exports);
|
|
35
35
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;AAEhE;;;;;;;;;;;;;;;;GAgBG;AACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;AAEhE;;;;;;;;;;;;;;;;GAgBG;AACH,gEAAsC;AACtC,2DAAiC;AACjC,yDAA+B;AAC/B,iDAAuB;AACvB,uDAA6B;AAC7B,mEAAyC;AACzC,gEAAsC;AACtC,oEAA0C;AAC1C,iFAAuD;AACvD,kDAAwB"}
|
|
@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.createMiddlewareInterceptorBinding = exports.registerExpressMiddlewareInterceptor = exports.buildName = exports.defineInterceptorProvider = exports.ExpressMiddlewareInterceptorProvider = exports.createInterceptor = exports.toInterceptor = exports.executeExpressRequestHandler = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const core_1 = require("@loopback/core");
|
|
10
|
-
const assert_1 =
|
|
11
|
-
const debug_1 =
|
|
12
|
-
const on_finished_1 =
|
|
10
|
+
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
11
|
+
const debug_1 = tslib_1.__importDefault(require("debug"));
|
|
12
|
+
const on_finished_1 = tslib_1.__importDefault(require("on-finished"));
|
|
13
13
|
const util_1 = require("util");
|
|
14
14
|
const keys_1 = require("./keys");
|
|
15
15
|
const debug = (0, debug_1.default)('loopback:middleware');
|
|
@@ -174,9 +174,9 @@ class ExpressMiddlewareInterceptorProvider {
|
|
|
174
174
|
};
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
|
-
|
|
177
|
+
tslib_1.__decorate([
|
|
178
178
|
core_1.inject.binding(),
|
|
179
|
-
|
|
179
|
+
tslib_1.__metadata("design:type", core_1.Binding)
|
|
180
180
|
], ExpressMiddlewareInterceptorProvider.prototype, "binding", void 0);
|
|
181
181
|
exports.ExpressMiddlewareInterceptorProvider = ExpressMiddlewareInterceptorProvider;
|
|
182
182
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-interceptor.js","sourceRoot":"","sources":["../src/middleware-interceptor.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAkBwB;AACxB,
|
|
1
|
+
{"version":3,"file":"middleware-interceptor.js","sourceRoot":"","sources":["../src/middleware-interceptor.ts"],"names":[],"mappings":"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"}
|
package/dist/middleware.js
CHANGED
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.toExpressMiddleware = exports.invokeExpressMiddleware = exports.MiddlewareView = exports.invokeMiddleware = exports.createMiddlewareBinding = exports.registerMiddleware = exports.asMiddleware = exports.registerExpressMiddleware = exports.createMiddleware = exports.toMiddleware = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const core_1 = require("@loopback/core");
|
|
10
|
-
const debug_1 =
|
|
10
|
+
const debug_1 = tslib_1.__importDefault(require("debug"));
|
|
11
11
|
const group_sorter_1 = require("./group-sorter");
|
|
12
12
|
const keys_1 = require("./keys");
|
|
13
13
|
const middleware_interceptor_1 = require("./middleware-interceptor");
|
|
@@ -264,17 +264,25 @@ exports.invokeExpressMiddleware = invokeExpressMiddleware;
|
|
|
264
264
|
* @param ctx - Context object to discover registered middleware
|
|
265
265
|
*/
|
|
266
266
|
function toExpressMiddleware(ctx) {
|
|
267
|
-
return
|
|
267
|
+
return (req, res, next) => {
|
|
268
268
|
const middlewareCtx = new types_1.MiddlewareContext(req, res, ctx);
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
269
|
+
new Promise((resolve, reject) => {
|
|
270
|
+
// eslint-disable-next-line no-void
|
|
271
|
+
void (async () => {
|
|
272
|
+
try {
|
|
273
|
+
const result = await invokeMiddleware(middlewareCtx);
|
|
274
|
+
resolve(result);
|
|
275
|
+
}
|
|
276
|
+
catch (err) {
|
|
277
|
+
reject(err);
|
|
278
|
+
}
|
|
279
|
+
})();
|
|
280
|
+
})
|
|
281
|
+
.then(result => {
|
|
282
|
+
if (result !== res)
|
|
272
283
|
next();
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
catch (err) {
|
|
276
|
-
next(err);
|
|
277
|
-
}
|
|
284
|
+
})
|
|
285
|
+
.catch(next);
|
|
278
286
|
};
|
|
279
287
|
}
|
|
280
288
|
exports.toExpressMiddleware = toExpressMiddleware;
|
package/dist/middleware.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAiBwB;AACxB
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.InvokeMiddlewareProvider = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const core_1 = require("@loopback/core");
|
|
10
|
-
const debug_1 =
|
|
10
|
+
const debug_1 = tslib_1.__importDefault(require("debug"));
|
|
11
11
|
const keys_1 = require("../keys");
|
|
12
12
|
const middleware_1 = require("../middleware");
|
|
13
13
|
const types_1 = require("../types");
|
|
@@ -57,14 +57,14 @@ let InvokeMiddlewareProvider = class InvokeMiddlewareProvider {
|
|
|
57
57
|
return (0, middleware_1.invokeMiddleware)(middlewareCtx, optionsOrHandlers);
|
|
58
58
|
}
|
|
59
59
|
};
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
60
|
+
tslib_1.__decorate([
|
|
61
|
+
tslib_1.__param(0, core_1.inject.binding()),
|
|
62
|
+
tslib_1.__param(1, (0, core_1.config)()),
|
|
63
|
+
tslib_1.__metadata("design:type", Function),
|
|
64
|
+
tslib_1.__metadata("design:paramtypes", [core_1.Binding, Object]),
|
|
65
|
+
tslib_1.__metadata("design:returntype", Function)
|
|
66
66
|
], InvokeMiddlewareProvider, "value", null);
|
|
67
|
-
InvokeMiddlewareProvider =
|
|
67
|
+
InvokeMiddlewareProvider = tslib_1.__decorate([
|
|
68
68
|
(0, core_1.extensionPoint)(types_1.DEFAULT_MIDDLEWARE_CHAIN)
|
|
69
69
|
], InvokeMiddlewareProvider);
|
|
70
70
|
exports.InvokeMiddlewareProvider = InvokeMiddlewareProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-middleware.provider.js","sourceRoot":"","sources":["../../src/providers/invoke-middleware.provider.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAMwB;AACxB
|
|
1
|
+
{"version":3,"file":"invoke-middleware.provider.js","sourceRoot":"","sources":["../../src/providers/invoke-middleware.provider.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAMwB;AACxB,0DAAiC;AACjC,kCAAiD;AACjD,8CAAwE;AACxE,oCAMkB;AAClB,MAAM,KAAK,GAAG,IAAA,eAAY,EAAC,0BAA0B,CAAC,CAAC;AAEvD;;GAEG;AAEH,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACnC,MAAM,CAAC,KAAK;IACV;;OAEG;IAEH,OAAkC;IAElC;;OAEG;IAEH,iBAA0C;QACxC,KAAK,EAAE,gCAAwB;QAC/B,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,+BAAwB,CAAC;KAC7D;QAED,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC1B,KAAK,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;QACzC,MAAM,kBAAkB,GAAqB,CAC3C,aAAgC,EAChC,iBAAqE,EACrE,EAAE;;YACF,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;gBACpC,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;aACtD;YACD,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAClC,IAAI,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;YAC3B,MAAM,aAAa,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;YAC7C,KAAK;gBACH,MAAA,KAAK,aAAL,KAAK,cAAL,KAAK,GACL,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,eAAQ,CAAC,eAAe,CAAC,mCACzC,cAAc,CAAC,KAAK,CAAC;YACvB,MAAM,iBAAiB,GAAG;gBACxB,GAAG,OAAO;gBACV,KAAK;gBACL,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,cAAc,CAAC,aAAa;aAC7D,CAAC;YACF,KAAK,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QACvD,CAAC,CAAC;QACF,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,aAAgC,EAChC,iBAAqE;QAErE,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YACpC,OAAO,IAAA,oCAAuB,EAAC,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC;SACrE;QACD,OAAO,IAAA,6BAAgB,EAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AApDC;IAIG,mBAAA,aAAM,CAAC,OAAO,EAAE,CAAA;IAMhB,mBAAA,IAAA,aAAM,GAAE,CAAA;;6CALA,cAAO;;2CAoCjB;AA1CU,wBAAwB;IADpC,IAAA,qBAAc,EAAC,gCAAwB,CAAC;GAC5B,wBAAwB,CAqDpC;AArDY,4DAAwB"}
|
package/dist/types.js
CHANGED
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.MiddlewareGroups = exports.MIDDLEWARE_CONTEXT = exports.DEFAULT_MIDDLEWARE_CHAIN = exports.MiddlewareChain = exports.getMiddlewareContext = exports.MiddlewareContext = exports.Router = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
9
|
const core_1 = require("@loopback/core");
|
|
10
|
-
const on_finished_1 =
|
|
10
|
+
const on_finished_1 = tslib_1.__importDefault(require("on-finished"));
|
|
11
11
|
const keys_1 = require("./keys");
|
|
12
12
|
var express_1 = require("express");
|
|
13
13
|
Object.defineProperty(exports, "Router", { enumerable: true, get: function () { return express_1.Router; } });
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAUwB;AAExB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,iCAAiC;AACjC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAUwB;AAExB,sEAAqC;AACrC,iCAA0C;AAE1C,mCAAiE;AAAtC,iGAAA,MAAM,OAAA;AAgBjC;;;GAGG;AACH,MAAa,iBAAkB,SAAQ,cAAO;IAM5C;;;;;;OAMG;IACH,YACkB,OAAgB,EAChB,QAAkB,EAClC,MAAgB,EAChB,IAAa;QAEb,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QALJ,YAAO,GAAP,OAAO,CAAS;QAChB,aAAQ,GAAR,QAAQ,CAAU;QAdpC;;WAEG;QACH,qBAAgB,GAAG,KAAK,CAAC;QAgBvB,IAAI,CAAC,KAAK,GAAG,mBAAY,CAAC,OAAO,CAAC;QAElC,0EAA0E;QAC1E,oEAAoE;QACpE,8DAA8D;QAC7D,OAAe,CAAC,0BAAkB,CAAC,GAAG,IAAI,CAAC;QAE5C,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC7B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7B,uEAAuE;YACvE,2BAA2B;YAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAES,aAAa;QACrB,IAAI,CAAC,IAAI,CAAC,yBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;CACF;AAxCD,8CAwCC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAElC,OAAiB;IACjB,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IACtC,8DAA8D;IAC9D,OAAQ,OAAe,CAAC,0BAAkB,CAAC,CAAC;AAC9C,CAAC;AAND,oDAMC;AAmDD;;;GAGG;AACH,MAAa,eAAgB,SAAQ,8BAA0C;CAAG;AAAlF,0CAAkF;AAOlF;;GAEG;AACU,QAAA,wBAAwB,GAAG,yBAAyB,CAAC;AAwKlE;;;GAGG;AACU,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;AAE5E;;GAEG;AACH,IAAiB,gBAAgB,CAgBhC;AAhBD,WAAiB,gBAAgB;IAC/B;;OAEG;IACU,qBAAI,GAAG,MAAM,CAAC;IAE3B;;OAEG;IACU,yBAAQ,GAAG,SAAS,CAAC;IAElC;;OAEG;IACU,2BAAU,GAAG,YAAY,CAAC;IAC1B,wBAAO,GAAG,iBAAA,UAAU,CAAC;AACpC,CAAC,EAhBgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAgBhC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loopback/express",
|
|
3
3
|
"description": "Integrate with Express and expose middleware infrastructure for sequence and interceptors",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "5.0.0",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"loopback-extension",
|
|
7
7
|
"loopback"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"directory": "packages/express"
|
|
18
18
|
},
|
|
19
19
|
"engines": {
|
|
20
|
-
"node": "
|
|
20
|
+
"node": "14 || 16 || 17 || 18"
|
|
21
21
|
},
|
|
22
22
|
"scripts": {
|
|
23
23
|
"build": "lb-tsc",
|
|
@@ -37,32 +37,32 @@
|
|
|
37
37
|
"!*/__tests__"
|
|
38
38
|
],
|
|
39
39
|
"peerDependencies": {
|
|
40
|
-
"@loopback/core": "^
|
|
40
|
+
"@loopback/core": "^4.0.0"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@loopback/http-server": "^
|
|
43
|
+
"@loopback/http-server": "^4.0.0",
|
|
44
44
|
"@types/body-parser": "^1.19.2",
|
|
45
45
|
"@types/express": "^4.17.13",
|
|
46
46
|
"@types/express-serve-static-core": "^4.17.28",
|
|
47
47
|
"@types/http-errors": "^1.8.2",
|
|
48
|
-
"body-parser": "^1.
|
|
49
|
-
"debug": "^4.3.
|
|
50
|
-
"express": "^4.
|
|
48
|
+
"body-parser": "^1.20.0",
|
|
49
|
+
"debug": "^4.3.4",
|
|
50
|
+
"express": "^4.18.1",
|
|
51
51
|
"http-errors": "^2.0.0",
|
|
52
|
-
"on-finished": "^2.
|
|
52
|
+
"on-finished": "^2.4.1",
|
|
53
53
|
"toposort": "^2.0.2",
|
|
54
|
-
"tslib": "^2.
|
|
54
|
+
"tslib": "^2.4.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@loopback/build": "^
|
|
58
|
-
"@loopback/core": "^
|
|
59
|
-
"@loopback/testlab": "^
|
|
57
|
+
"@loopback/build": "^9.0.0",
|
|
58
|
+
"@loopback/core": "^4.0.0",
|
|
59
|
+
"@loopback/testlab": "^5.0.0",
|
|
60
60
|
"@types/debug": "^4.1.7",
|
|
61
|
-
"@types/node": "^12.20.
|
|
61
|
+
"@types/node": "^12.20.50",
|
|
62
62
|
"@types/on-finished": "^2.3.1",
|
|
63
63
|
"@types/toposort": "^2.0.3",
|
|
64
64
|
"source-map-support": "^0.5.21",
|
|
65
|
-
"typescript": "~4.
|
|
65
|
+
"typescript": "~4.6.4"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "61453a3d7a16f9f37875a3f2c2a071568eb3e3af"
|
|
68
68
|
}
|
package/src/middleware.ts
CHANGED
|
@@ -353,16 +353,23 @@ export function invokeExpressMiddleware(
|
|
|
353
353
|
* @param ctx - Context object to discover registered middleware
|
|
354
354
|
*/
|
|
355
355
|
export function toExpressMiddleware(ctx: Context): ExpressRequestHandler {
|
|
356
|
-
return
|
|
356
|
+
return (req, res, next) => {
|
|
357
357
|
const middlewareCtx = new MiddlewareContext(req, res, ctx);
|
|
358
358
|
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
359
|
+
new Promise((resolve, reject) => {
|
|
360
|
+
// eslint-disable-next-line no-void
|
|
361
|
+
void (async () => {
|
|
362
|
+
try {
|
|
363
|
+
const result = await invokeMiddleware(middlewareCtx);
|
|
364
|
+
resolve(result);
|
|
365
|
+
} catch (err) {
|
|
366
|
+
reject(err);
|
|
367
|
+
}
|
|
368
|
+
})();
|
|
369
|
+
})
|
|
370
|
+
.then(result => {
|
|
371
|
+
if (result !== res) next();
|
|
372
|
+
})
|
|
373
|
+
.catch(next);
|
|
367
374
|
};
|
|
368
375
|
}
|