jcc-express-mvc 1.6.1 → 1.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Application/Application.d.ts.map +1 -1
- package/lib/Application/Application.js +0 -1
- package/lib/Error/AppErrorHandler.d.ts.map +1 -1
- package/lib/Error/AppErrorHandler.js +1 -2
- package/lib/Error/DisplayErrorCode.d.ts.map +1 -1
- package/lib/Error/DisplayErrorCode.js +1 -2
- package/lib/Inertia/index.d.ts.map +1 -1
- package/lib/Inertia/index.js +5 -1
- package/lib/Interface/index.d.ts +1 -0
- package/lib/Interface/index.d.ts.map +1 -1
- package/lib/Request/request.d.ts +2 -0
- package/lib/Request/request.d.ts.map +1 -1
- package/lib/Request/request.js +5 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/Application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAQnE,qBAAa,WAAY,SAAQ,kBAAkB;IACjD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAyB;IACnC,QAAQ,EAAE,MAAM,CAAY;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAM;IACxC,OAAO,CAAC,OAAO,CAAW;;IAU1B,iBAAiB,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,IAAI;IAc5E,IAAI,IAAI,IAAI;IAUZ,OAAO,CAAC,YAAY;IAIb,OAAO;IAKR,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/Application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAQnE,qBAAa,WAAY,SAAQ,kBAAkB;IACjD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAyB;IACnC,QAAQ,EAAE,MAAM,CAAY;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAM;IACxC,OAAO,CAAC,OAAO,CAAW;;IAU1B,iBAAiB,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,IAAI;IAc5E,IAAI,IAAI,IAAI;IAUZ,OAAO,CAAC,YAAY;IAIb,OAAO;IAKR,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1B,MAAM,CAAC,aAAa;CAGrB"}
|
|
@@ -59,7 +59,6 @@ class Application extends ExpressApplication_1.ExpressApplication {
|
|
|
59
59
|
//
|
|
60
60
|
RouteBuilder_1.RouteBuilder.setServiceContainer(this);
|
|
61
61
|
await routeServiceProvider.loadRoutes(this.configRoutes);
|
|
62
|
-
console.log(RouteBuilder_1.RouteBuilder.routeList);
|
|
63
62
|
const server = new Server_1.Server(this);
|
|
64
63
|
server.server(Number(Config_1.config.get("PORT", "5500")));
|
|
65
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;CAyBjB"}
|
|
@@ -46,8 +46,7 @@ class AppErrorHandler {
|
|
|
46
46
|
let error = { ...err };
|
|
47
47
|
if (err.type === error_1.VALIDATION_ERROR) {
|
|
48
48
|
error.message = err.message;
|
|
49
|
-
if (req.
|
|
50
|
-
!req.headers["x-inertia"]) {
|
|
49
|
+
if (req.isApi()) {
|
|
51
50
|
return res.status(422).json({ errors: err.message });
|
|
52
51
|
}
|
|
53
52
|
return res.status(422).redirectBack();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisplayErrorCode.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/DisplayErrorCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACvD,qBAAa,YAAa,SAAQ,gBAAgB;IAChD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"DisplayErrorCode.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Error/DisplayErrorCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACvD,qBAAa,YAAa,SAAQ,gBAAgB;IAChD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CACT,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,UAAU;IAuCjB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;CAGxD"}
|
|
@@ -21,8 +21,7 @@ class DisplayError extends ErrorHightLight_1.ErrorHighLighter {
|
|
|
21
21
|
const [actualPath, startLine, endLine] = pathParts[lastIndex].split(/\:/);
|
|
22
22
|
pathParts[lastIndex] = actualPath;
|
|
23
23
|
//if request is an API request, return JSON response
|
|
24
|
-
if (req.
|
|
25
|
-
!req.headers["x-inertia"]) {
|
|
24
|
+
if (req.isApi()) {
|
|
26
25
|
return res.status(500).json({
|
|
27
26
|
stack: pathParts.join("/").trim() + ` on line ${startLine}:${endLine}`,
|
|
28
27
|
error: ` ${message} `,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Inertia/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Inertia/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhE,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAiED,eAAO,MAAM,OAAO,GAAI,SAAS,cAAc,WAzC9B,UAAU,OAAO,WAAW,QAAQ,OAAO,SA0CxB,CAAC"}
|
package/lib/Inertia/index.js
CHANGED
|
@@ -8,10 +8,14 @@ class InertiaMiddleware {
|
|
|
8
8
|
...(res.locals.error?.email ? res.locals.error : {}),
|
|
9
9
|
};
|
|
10
10
|
const auth = { ...req.user };
|
|
11
|
+
let getFlash = req.flash() || { type: "" };
|
|
12
|
+
const type = Object.keys(getFlash).length > 0 ? Object.keys(getFlash)[0] : "";
|
|
11
13
|
const flash = {
|
|
12
|
-
message:
|
|
14
|
+
message: type ? getFlash[type][0] : "",
|
|
13
15
|
status: res.statusCode,
|
|
16
|
+
type,
|
|
14
17
|
};
|
|
18
|
+
getFlash = {};
|
|
15
19
|
return { ...props, auth, flash, errors };
|
|
16
20
|
}
|
|
17
21
|
inertia(options) {
|
package/lib/Interface/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Interface/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,cAAc,CAAC;CACzE;AAED,MAAM,WAAW,UAAW,SAAQ,OAAO;IACzC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChC,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,KAAK,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IACrC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC;IACxD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC5D,EAAE,EAAE,MAAM,CAAC;IACX;;;;KAIC;IACD,QAAQ,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAA;KAAE,CAAC;IAErD;;;KAGC;IACD,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Interface/index.ts"],"names":[],"mappings":"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"}
|
package/lib/Request/request.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { AppResponse, AppRequest } from "../Interface";
|
|
|
6
6
|
* @param {Object} response - The HTTP response object.
|
|
7
7
|
*/
|
|
8
8
|
export declare class HttpRequest {
|
|
9
|
+
private request;
|
|
9
10
|
constructor(request: AppRequest, response: AppResponse);
|
|
10
11
|
/**
|
|
11
12
|
* Sets up validation error handling and adds validation methods to the request object.
|
|
@@ -13,5 +14,6 @@ export declare class HttpRequest {
|
|
|
13
14
|
* @param {Object} response - The HTTP response object.
|
|
14
15
|
*/
|
|
15
16
|
private validationErrors;
|
|
17
|
+
private isApi;
|
|
16
18
|
}
|
|
17
19
|
//# sourceMappingURL=request.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Request/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Request/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAIvD;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAa;gBAChB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW;IAMtD;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,KAAK;CAGd"}
|
package/lib/Request/request.js
CHANGED
|
@@ -11,6 +11,8 @@ const error_1 = require("../Error/Constants/error");
|
|
|
11
11
|
*/
|
|
12
12
|
class HttpRequest {
|
|
13
13
|
constructor(request, response) {
|
|
14
|
+
this.request = request;
|
|
15
|
+
request.isApi = this.isApi.bind(this);
|
|
14
16
|
this.validationErrors(request, response);
|
|
15
17
|
}
|
|
16
18
|
/**
|
|
@@ -31,5 +33,8 @@ class HttpRequest {
|
|
|
31
33
|
request.validate = async (validationData) => (0, Validation_1.validateRequest)(error_1.VALIDATION_ERROR, request, validationData);
|
|
32
34
|
return;
|
|
33
35
|
}
|
|
36
|
+
isApi() {
|
|
37
|
+
return this.request.path.startsWith("/api");
|
|
38
|
+
}
|
|
34
39
|
}
|
|
35
40
|
exports.HttpRequest = HttpRequest;
|