johankit-runtime 0.5.6 → 0.5.7
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/src/core/middleware/upload.d.ts +2 -0
- package/dist/src/core/middleware/upload.d.ts.map +1 -0
- package/dist/src/core/middleware/upload.js +34 -0
- package/dist/src/core/middleware/upload.js.map +1 -0
- package/dist/src/core/parse/routes.d.ts +5 -0
- package/dist/src/core/parse/routes.d.ts.map +1 -1
- package/dist/src/core/parse/routes.js +11 -2
- package/dist/src/core/parse/routes.js.map +1 -1
- package/dist/src/core/routes.d.ts.map +1 -1
- package/dist/src/core/routes.js +8 -2
- package/dist/src/core/routes.js.map +1 -1
- package/package.json +3 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/upload.js"],"names":[],"mappings":"AAqBA,wDAWC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
const multer = require('multer');
|
|
2
|
+
const path = require('path');
|
|
3
|
+
function parseSize(size) {
|
|
4
|
+
const match = String(size).toLowerCase().match(/(\d+)(kb|mb|gb)/);
|
|
5
|
+
if (!match)
|
|
6
|
+
return 10 * 1024 * 1024;
|
|
7
|
+
const value = Number(match[1]);
|
|
8
|
+
const unit = match[2];
|
|
9
|
+
if (unit === 'kb')
|
|
10
|
+
return value * 1024;
|
|
11
|
+
if (unit === 'mb')
|
|
12
|
+
return value * 1024 * 1024;
|
|
13
|
+
if (unit === 'gb')
|
|
14
|
+
return value * 1024 * 1024 * 1024;
|
|
15
|
+
return value;
|
|
16
|
+
}
|
|
17
|
+
const storage = multer.diskStorage({
|
|
18
|
+
destination: path.join(process.cwd(), 'uploads'),
|
|
19
|
+
filename: (req, file, cb) => {
|
|
20
|
+
cb(null, Date.now() + '-' + file.originalname);
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
function buildUploadMiddleware(config) {
|
|
24
|
+
if (!config)
|
|
25
|
+
return null;
|
|
26
|
+
const limits = { fileSize: parseSize(config.size) };
|
|
27
|
+
const upload = multer({ storage, limits });
|
|
28
|
+
if (config.quantity === 1) {
|
|
29
|
+
return upload.single(config.field);
|
|
30
|
+
}
|
|
31
|
+
return upload.array(config.field, config.quantity);
|
|
32
|
+
}
|
|
33
|
+
module.exports = { buildUploadMiddleware };
|
|
34
|
+
//# sourceMappingURL=upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/core/middleware/upload.js"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,SAAS,SAAS,CAAC,IAAI;IACrB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAClE,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,GAAG,IAAI,CAAC;IACvC,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC;IAC9C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IACrD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IACjC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC;IAChD,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QAC1B,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,qBAAqB,CAAC,MAAM;IACnC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,qBAAqB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../../src/core/parse/routes.js"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../../src/core/parse/routes.js"],"names":[],"mappings":"AAAA;;;;;;;;;EAkCC"}
|
|
@@ -11,11 +11,20 @@ function parseRouter(fn) {
|
|
|
11
11
|
return null;
|
|
12
12
|
const path = routeMatch[1].trim();
|
|
13
13
|
const methodMatch = doc.match(/@method\s+([^\s]+)/);
|
|
14
|
-
const method = methodMatch ? methodMatch[1].trim().toLowerCase() :
|
|
14
|
+
const method = methodMatch ? methodMatch[1].trim().toLowerCase() : 'get';
|
|
15
|
+
const uploadMatch = doc.match(/@upload\s+([^\s]+)(?:\s+(\d+))?(?:\s+(\d+(?:kb|mb|gb)))?/i);
|
|
16
|
+
let upload = null;
|
|
17
|
+
if (uploadMatch) {
|
|
18
|
+
const field = uploadMatch[1];
|
|
19
|
+
const quantity = uploadMatch[2] ? Number(uploadMatch[2]) : 1;
|
|
20
|
+
const size = uploadMatch[3] || '10mb';
|
|
21
|
+
upload = { field, quantity, size };
|
|
22
|
+
}
|
|
15
23
|
return {
|
|
16
24
|
path,
|
|
17
25
|
method,
|
|
18
|
-
handler: fn
|
|
26
|
+
handler: fn,
|
|
27
|
+
upload
|
|
19
28
|
};
|
|
20
29
|
}
|
|
21
30
|
module.exports = { parseRouter };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../../src/core/parse/routes.js"],"names":[],"mappings":"AAAA,SAAS,WAAW,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../../src/core/parse/routes.js"],"names":[],"mappings":"AAAA,SAAS,WAAW,CAAC,EAAE;IACrB,IAAI,OAAO,EAAE,KAAK,UAAU;QAAE,OAAO,IAAI,CAAC;IAE1C,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACrD,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAExB,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAE7B,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAElC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzE,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAE3F,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC;QAEtC,MAAM,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,OAAO;QACL,IAAI;QACJ,MAAM;QACN,OAAO,EAAE,EAAE;QACX,MAAM;KACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/core/routes.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/core/routes.js"],"names":[],"mappings":"AAqCA,kEAoCC"}
|
package/dist/src/core/routes.js
CHANGED
|
@@ -2,6 +2,7 @@ const path = require('path');
|
|
|
2
2
|
const { registerRoutes: routesDecorators } = require('./register/decorators');
|
|
3
3
|
const { createRuntimeContext } = require('./context');
|
|
4
4
|
const { resolveMiddlewares, runMiddlewares } = require('./middleware/run');
|
|
5
|
+
const { buildUploadMiddleware } = require('./middleware/upload');
|
|
5
6
|
const { log } = console;
|
|
6
7
|
function sanitize(value) {
|
|
7
8
|
const cache = new WeakSet();
|
|
@@ -20,7 +21,7 @@ function sanitize(value) {
|
|
|
20
21
|
}
|
|
21
22
|
const result = {};
|
|
22
23
|
for (const key in val) {
|
|
23
|
-
if (Object.
|
|
24
|
+
if (Object.prototypehasOwnProperty.call(val, key)) {
|
|
24
25
|
result[key] = transform(val[key]);
|
|
25
26
|
}
|
|
26
27
|
}
|
|
@@ -34,7 +35,11 @@ const registerRoutes = async (app, pkg) => {
|
|
|
34
35
|
if (routes.length === 0)
|
|
35
36
|
return;
|
|
36
37
|
routes.forEach(route => {
|
|
37
|
-
|
|
38
|
+
const uploadMw = buildUploadMiddleware(route.upload);
|
|
39
|
+
const handlers = [];
|
|
40
|
+
if (uploadMw)
|
|
41
|
+
handlers.push(uploadMw);
|
|
42
|
+
handlers.push(async (req, res, next) => {
|
|
38
43
|
const context = createRuntimeContext({ req, res, pkg });
|
|
39
44
|
const middlewares = await resolveMiddlewares(pkg.folder, context);
|
|
40
45
|
try {
|
|
@@ -50,6 +55,7 @@ const registerRoutes = async (app, pkg) => {
|
|
|
50
55
|
next(err);
|
|
51
56
|
}
|
|
52
57
|
});
|
|
58
|
+
app[route.method](`/${pkg.folder}/${route.path}`, ...handlers);
|
|
53
59
|
log(`${pkg.name ?? pkg.folder} registered decorator route [${route.method.toUpperCase()}] /${pkg.folder}/${route.path}`);
|
|
54
60
|
});
|
|
55
61
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/core/routes.js"],"names":[],"mappings":"AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC9E,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACtD,MAAM,EAAE,kBAAkB,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/core/routes.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "johankit-runtime",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.7",
|
|
4
4
|
"description": "A pluggable runtime for any back-end",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
"cors": "^2.8.5",
|
|
20
20
|
"express": "^4.22.1",
|
|
21
21
|
"js-yaml": "^4.1.0",
|
|
22
|
-
"mdsvex": "^0.12.6"
|
|
22
|
+
"mdsvex": "^0.12.6",
|
|
23
|
+
"multer": "^2.0.2"
|
|
23
24
|
},
|
|
24
25
|
"devDependencies": {
|
|
25
26
|
"@types/express": "^4.17.21",
|