pwi-plata-type 0.3.3 → 0.3.4

package/bin/plata-swagger-gen.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 import fs from 'node:fs'
-import { loadExpressRoutes } from '../libs/routes.js'
+import { buildExpressRouter } from '../libs/routes.js'
 import { PlataResultado, PlataDirs, PlataFiles, PlataError } from '../libs/tools.js'
 
 interface dumpParameter { 
@@ -106,41 +106,36 @@ function loadSwaggerFiles(): swaggerFiles {
 }
 
 async function dumpRotas(): Promise<dumpRoute[]> {
-    const rotas = await loadExpressRoutes()
+    const rotas = await buildExpressRouter()
     const rotasMetodos: dumpRoute[] = []
     const regex = /:(.*?)\??\//g
-    for (const r of rotas) {
-        const expressRouter = await r.exports()
 
-        if (expressRouter.swaggerHide) {
+    if (rotas._routes === undefined) return []
+
+    for (const r of rotas._routes) {
+        if (r.swaggerHide) {
             continue
         }
 
-        for (const layer of expressRouter.stack) {
-            if (layer.route === undefined) continue
-
-            const httpLayerRoute = path.normalize(`${r.httpRoute}/${layer.route.path}/`)
-
-            for (const metodo in layer.route.methods) {
-                const urlParms = httpLayerRoute.match(regex) ?? []
-                const routeParams: dumpParameter[] = []
-
-                for (const p of urlParms) {
-                    routeParams.push({
-                        name: p.replace(regex, '$1'),
-                        required: p[p.length - 2] !== '?',
-                        in: 'path',
-                        type: 'string'
-                    })
-                }
-
-                rotasMetodos.push({
-                    httpRoute: httpLayerRoute.replace(regex, '{$1}/'),
-                    params: routeParams,
-                    metodo,
-                })
-            }
+        r.path = path.normalize(`${r.path ?? '/'}/`).replace(/\\/g, '/')
+
+        const routeParams: dumpParameter[] = []
+        const urlParms = r.path.match(regex) ?? []
+
+        for (const p of urlParms) {
+            routeParams.push({
+                name: p.replace(regex, '$1'),
+                required: p[p.length - 2] !== '?',
+                in: 'path',
+                type: 'string'
+            })
         }
+
+        rotasMetodos.push({
+            httpRoute: r.path.replace(regex, '{$1}/'),
+            metodo: r.method,
+            params: routeParams,        
+        })
     }
 
     return rotasMetodos

package/libs/routes.ts

@@ -69,7 +69,8 @@ export type PlataRouterMethods = (
 export interface _PlataRoute {    
     path?: string,
     method: HttpMethods
-    handlers: PlataRequestHandler[]
+    handlers: PlataRequestHandler[],
+    swaggerHide?: boolean
 }
 export interface PlataRouterExtras {
     swaggerHide?: boolean
@@ -235,8 +236,9 @@ export async function loadExpressRoutes(): Promise<PlataRequiredRoute[]> {
     }
 }
 
-export async function buildExpressRouter(): Promise<Router> {
-    const router = Router()
+export async function buildExpressRouter(): Promise<_Router> {
+    const router = Router() as _Router
+    router._routes = []
     router.use(express.json())
 
     const routes = await loadExpressRoutes()
@@ -249,14 +251,20 @@ export async function buildExpressRouter(): Promise<Router> {
         for (let i = 0; i < pr._routes.length; i++) {
             const prr = pr._routes[i];
 
-            if (prr.path === undefined) {
-                (router as any)[prr.method](r.httpRoute, ...prr.handlers.map(PlataRoute))
-            } else {
-                (router as any)[prr.method](
-                    path.normalize(`${r.httpRoute}/${prr.path}`).replace(/\\/g, '/'),
-                    ...prr.handlers.map(PlataRoute)
-                )
+            let httpPath = r.httpRoute
+            
+            if (prr.path !== undefined) {
+                httpPath = path.normalize(`${r.httpRoute}/${prr.path}`).replace(/\\/g, '/')
             }
+
+            router[prr.method](httpPath, ...prr.handlers.map(PlataRoute))
+
+            router._routes.push({
+                path: httpPath,
+                method: prr.method,
+                handlers: [],
+                swaggerHide: prr.swaggerHide
+            })
         }
     }
 

package/libs/swagger.ts

@@ -1,5 +1,4 @@
 import swaggerUi from 'swagger-ui-express'
-import { Router } from 'express'
 import path from 'node:path'
 import { PlataRouterBuilder, PlataRequestHandler } from './routes.js';
 import { PlataFiles, PlataDirs } from "./tools.js";
@@ -35,7 +34,7 @@ export namespace PlataSwagger {
                 const metodo = path.normalize(path.basename(docPath))
                 const httpPath = path.normalize(
                     path.dirname(docPath.replace(PlataDirs.getProjectDirSwaggerRotas(), ''))
-                )
+                ).replace(/\\/g, '/')
 
                 const header = PlataFiles.readJsonSync(path.join(docPath, 'header.json'))
                 const body = PlataFiles.readJsonSync(path.join(docPath, 'body.json'))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "type": "module",
     "main": "index.ts",
     "bin": {