pwi-plata-type 0.4.193 → 0.4.194
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/__BUILD__/bin/plata-api.js +2 -2
- package/__BUILD__/bin/plata-api.js.map +1 -1
- package/__BUILD__/bin/plata-swagger.js +6 -5
- package/__BUILD__/bin/plata-swagger.js.map +1 -1
- package/__BUILD__/libs/custom.js +4 -3
- package/__BUILD__/libs/custom.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/plata-api.ts +2 -2
- package/src/bin/plata-swagger.ts +8 -5
- package/src/libs/custom.ts +5 -4
|
@@ -79,7 +79,7 @@ const main = async () => {
|
|
|
79
79
|
if (process.argv.includes('--hot'))
|
|
80
80
|
Plata.FastPromise(() => hot_reload_1.HotReload.setupHotReloadWorker());
|
|
81
81
|
const projectRoutesPromise = Plata.FastPromise(() => loadRoutesFromProject());
|
|
82
|
-
const { app, express } = await getCustomExpress();
|
|
82
|
+
const { app, express, router } = await getCustomExpress();
|
|
83
83
|
app.disable('x-powered-by');
|
|
84
84
|
const apiRoots = Plata.config._PLATA_API_ROOT ?? '/api';
|
|
85
85
|
app.use(express.json({ limit: Plata.config._PLATA_API_JSON_SIZE ?? '100kb' }));
|
|
@@ -93,7 +93,7 @@ const main = async () => {
|
|
|
93
93
|
return;
|
|
94
94
|
}
|
|
95
95
|
{
|
|
96
|
-
const result = await buildExpressRouter(requiredRoutes,
|
|
96
|
+
const result = await buildExpressRouter(requiredRoutes, router);
|
|
97
97
|
if (result.errorID !== undefined) {
|
|
98
98
|
console.log(result);
|
|
99
99
|
await cluster.send({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plata-api.js","sourceRoot":"","sources":["../../src/bin/plata-api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAqD;AACrD,mDAA8C;AAEvC,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IAC3B,MAAM,OAAO,GAAG,IAAI,6BAAmB,EAAE,CAAA;IAEzC,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;QAEtB,IAAI,OAAO,GAAuB,SAAS,CAAA;QAE3C,IAAI,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,IAAI,SAAS,CAAA;QAC3D,CAAC;QAED,MAAM,eAAe,GAA2D,OAAO,CAAC,iBAAiB,CAAC,CAAA;QAE1G,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC9B,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,sBAAS,CAAC,qBAAqB,EAAE,CAAC,CAC7D;QAED,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAA;QAEtC,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QAED,CAAC;YACG,MAAM,QAAQ,GAAQ,EAAE,CAAA;YAExB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACjB,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAA;gBAChC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;oBACjD,IAAI,CAAC,KAAK,IAAI,EAAG,CAAC;wBACd,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;wBACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;oBACnB,CAAC;gBACL,CAAC,CAAC,CAAC,CAAA;YACP,CAAC,CAAC,CAAA;YAEF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC/B,CAAC;QAGD,MAAM,OAAO,CAAC,aAAa,CAAC;YACxB,IAAI,EAAE,mBAAmB;YACzB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM;YAC/B,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;YACvB,OAAO,EAAE,OAAO;SACnB,CAAC,CAAA;IACN,CAAC;SAAM,CAAC;QACJ,IAAI,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,mBAAmB,EAAE,CAAC;YAC1D,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,gBAAgB,GAAC,CAAA;YAC3D,MAAM,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,GAAG,wDAAa,gBAAgB,GAAC,CAAA;YACpF,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,YAAY,GAAC,CAAA;YAEnD,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC9B,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,sBAAS,CAAC,oBAAoB,EAAE,CAAC,CAC5D;YAED,MAAM,oBAAoB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC,CAAA;YAC7E,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"plata-api.js","sourceRoot":"","sources":["../../src/bin/plata-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,21 +9,22 @@ exports.toProjectSwagger = toProjectSwagger;
|
|
|
9
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
10
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
11
11
|
const router_1 = require("++/libs/router");
|
|
12
|
-
const
|
|
12
|
+
const custom_1 = require("++/libs/custom");
|
|
13
13
|
async function dumpRoutes() {
|
|
14
14
|
const requiredRoutes = await (0, router_1.loadRoutesFromProject)();
|
|
15
15
|
if (requiredRoutes.errorID !== undefined) {
|
|
16
16
|
console.log(requiredRoutes);
|
|
17
17
|
process.exit(1);
|
|
18
18
|
}
|
|
19
|
-
const router = await (0,
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
const { router } = await (0, custom_1.getCustomExpress)();
|
|
20
|
+
const buildedRouter = await (0, router_1.buildExpressRouter)(requiredRoutes, router);
|
|
21
|
+
if (buildedRouter.errorID !== undefined) {
|
|
22
|
+
console.log(buildedRouter);
|
|
22
23
|
process.exit(1);
|
|
23
24
|
}
|
|
24
25
|
const dumpedRoutes = [];
|
|
25
26
|
const regex = /:(.*?)\??\//g;
|
|
26
|
-
for (const r of
|
|
27
|
+
for (const r of buildedRouter.routes) {
|
|
27
28
|
if (r.swaggerHide) {
|
|
28
29
|
continue;
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plata-swagger.js","sourceRoot":"","sources":["../../src/bin/plata-swagger.ts"],"names":[],"mappings":";;;;;;AAKA,
|
|
1
|
+
{"version":3,"file":"plata-swagger.js","sourceRoot":"","sources":["../../src/bin/plata-swagger.ts"],"names":[],"mappings":";;;;;;AAKA,gCAgDC;AAED,4CAaC;AApED,0DAA4B;AAC5B,sDAAwB;AACxB,2CAA0E;AAC1E,2CAAiD;AAE1C,KAAK,UAAU,UAAU;IAC5B,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAqB,GAAE,CAAA;IAEpD,IAAI,cAAc,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yBAAgB,GAAE,CAAA;IAG3C,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAkB,EAAC,cAAc,EAAE,MAAM,CAAC,CAAA;IAEtE,IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAED,MAAM,YAAY,GAAuB,EAAE,CAAA;IAC3C,MAAM,KAAK,GAAG,cAAc,CAAA;IAE5B,KAAK,MAAM,CAAC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACnC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YAChB,SAAQ;QACZ,CAAC;QAED,CAAC,CAAC,IAAI,GAAG,mBAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAEhE,MAAM,iBAAiB,GAAgC,EAAE,CAAA;QACzD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QAE1C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACvB,iBAAiB,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC;gBAC5B,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;gBACjC,EAAE,EAAE,MAAM;gBACV,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAA;QACN,CAAC;QAED,YAAY,CAAC,IAAI,CAAC;YACd,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC;YACzC,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,MAAM,EAAE,iBAAiB;SAC5B,CAAC,CAAA;IACN,CAAC;IAED,OAAO,YAAY,CAAA;AACvB,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,IAAY,EAAE,OAAY;IAC7D,IAAI,CAAC;QACD,MAAM,CAAC,GAAG,mBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QAEzD,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YACpB,iBAAE,CAAC,SAAS,CAAC,mBAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAClD,iBAAE,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QACzD,CAAC;IAEL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;AACL,CAAC;AAEM,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IAC3B,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAA;IAEjC,MAAM,cAAc,GAAG,mBAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,aAAa,CAAC,CAAA;IAE5E,MAAM,KAAK,GAAqB;QAC5B,aAAa,EAAE,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAChE,KAAK,EAAE;YACH,MAAM,EAAE,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;YAClE,IAAI,EAAE,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAC9D,QAAQ,EAAE,OAAO,CAAC,mBAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;SACzE;KACJ,CAAA;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAGzB,MAAM,QAAQ,GAAoB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAEnE,KAAI,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YAC/B,MAAM,gBAAgB,CAClB,mBAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI,OAAO,CAAC,EAChF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CACvB,CAAA;QACL,CAAC;IACL,CAAC;IAED,MAAM,gBAAgB,CAClB,aAAa,EACb,KAAK,CAAC,aAAa,CACtB,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAEnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAA;AAnCY,QAAA,IAAI,QAmChB"}
|
package/__BUILD__/libs/custom.js
CHANGED
|
@@ -40,11 +40,12 @@ exports.getCustomExpress = getCustomExpress;
|
|
|
40
40
|
const express_1 = __importDefault(require("express"));
|
|
41
41
|
async function getCustomExpress() {
|
|
42
42
|
const app = (0, express_1.default)();
|
|
43
|
+
const router = express_1.default.Router();
|
|
43
44
|
return Promise.resolve(`${'@@/custom/express'}`).then(s => __importStar(require(s))).then(r => {
|
|
44
45
|
if (r?.custom !== undefined) {
|
|
45
|
-
return { app
|
|
46
|
+
return { app, express: express_1.default, router: r.custom(router) };
|
|
46
47
|
}
|
|
47
|
-
return ({ app, express: express_1.default });
|
|
48
|
-
}, () => ({ app, express: express_1.default }));
|
|
48
|
+
return ({ app, express: express_1.default, router });
|
|
49
|
+
}, () => ({ app, express: express_1.default, router }));
|
|
49
50
|
}
|
|
50
51
|
//# sourceMappingURL=custom.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/libs/custom.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/libs/custom.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,4CAcC;AAhBD,sDAA0C;AAEnC,KAAK,UAAU,gBAAgB;IAClC,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAA;IACrB,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;IAE/B,OAAO,mBAAO,mBAA0B,wCAAE,IAAI,CAC1C,CAAC,CAAC,EAAE;QACA,IAAI,CAAC,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAP,iBAAO,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAA;QACrD,CAAC;QAED,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,EAAP,iBAAO,EAAE,MAAM,EAAE,CAAC,CAAA;IACrC,CAAC,EACD,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAP,iBAAO,EAAE,MAAM,EAAE,CAAC,CACnC,CAAA;AACL,CAAC"}
|
package/package.json
CHANGED
package/src/bin/plata-api.ts
CHANGED
|
@@ -59,7 +59,7 @@ export const main = async () => {
|
|
|
59
59
|
;
|
|
60
60
|
|
|
61
61
|
const projectRoutesPromise = Plata.FastPromise(() => loadRoutesFromProject())
|
|
62
|
-
const { app, express } = await getCustomExpress()
|
|
62
|
+
const { app, express, router } = await getCustomExpress()
|
|
63
63
|
|
|
64
64
|
app.disable('x-powered-by')
|
|
65
65
|
|
|
@@ -82,7 +82,7 @@ export const main = async () => {
|
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
{
|
|
85
|
-
const result = await buildExpressRouter(requiredRoutes,
|
|
85
|
+
const result = await buildExpressRouter(requiredRoutes, router)
|
|
86
86
|
|
|
87
87
|
if (result.errorID !== undefined) {
|
|
88
88
|
console.log(result)
|
package/src/bin/plata-swagger.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from 'node:path'
|
|
2
2
|
import fs from 'node:fs'
|
|
3
3
|
import { buildExpressRouter, loadRoutesFromProject } from "++/libs/router"
|
|
4
|
-
import
|
|
4
|
+
import { getCustomExpress } from '++/libs/custom'
|
|
5
5
|
|
|
6
6
|
export async function dumpRoutes() {
|
|
7
7
|
const requiredRoutes = await loadRoutesFromProject()
|
|
@@ -11,17 +11,20 @@ export async function dumpRoutes() {
|
|
|
11
11
|
process.exit(1)
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
const router = await
|
|
14
|
+
const { router } = await getCustomExpress()
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
|
|
17
|
+
const buildedRouter = await buildExpressRouter(requiredRoutes, router)
|
|
18
|
+
|
|
19
|
+
if (buildedRouter.errorID !== undefined) {
|
|
20
|
+
console.log(buildedRouter)
|
|
18
21
|
process.exit(1)
|
|
19
22
|
}
|
|
20
23
|
|
|
21
24
|
const dumpedRoutes: SwaggerGen.Route[] = []
|
|
22
25
|
const regex = /:(.*?)\??\//g
|
|
23
26
|
|
|
24
|
-
for (const r of
|
|
27
|
+
for (const r of buildedRouter.routes) {
|
|
25
28
|
if (r.swaggerHide) {
|
|
26
29
|
continue
|
|
27
30
|
}
|
package/src/libs/custom.ts
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import express, { Express } from 'express'
|
|
2
2
|
|
|
3
|
-
export async function getCustomExpress(): Promise<{app: Express, express: typeof import('express')}> {
|
|
3
|
+
export async function getCustomExpress(): Promise<{app: Express, express: typeof import('express'), router: express.Router}> {
|
|
4
4
|
const app = express()
|
|
5
|
+
const router = express.Router()
|
|
5
6
|
|
|
6
7
|
return import('@@/custom/express' as any).then(
|
|
7
8
|
r => {
|
|
8
9
|
if (r?.custom !== undefined) {
|
|
9
|
-
return { app: r.custom(
|
|
10
|
+
return { app, express, router: r.custom(router) }
|
|
10
11
|
}
|
|
11
12
|
|
|
12
|
-
return ({ app, express })
|
|
13
|
+
return ({ app, express, router })
|
|
13
14
|
},
|
|
14
|
-
() => ({ app, express })
|
|
15
|
+
() => ({ app, express, router })
|
|
15
16
|
)
|
|
16
17
|
}
|