pwi-plata-type 0.4.153 → 0.4.155

package/__BUILD__/libs/router.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildExpressRouter = exports.loadRoutesFromProject = exports.Internals = void 0;
+exports.buildExpressRouter = exports.loadRoutesFromProject = exports.processRoutes = exports.Internals = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const custom_1 = require("./custom");
 var Internals;
@@ -92,12 +92,11 @@ var Internals;
     }
     Internals.buildRequestHandler = buildRequestHandler;
 })(Internals || (exports.Internals = Internals = {}));
-async function loadRoutesFromProject() {
-    const routes = await require('@@/routes/*.*');
-    if (routes.errorID !== undefined) {
-        return routes;
-    }
-    let rs = routes.map(route => {
+function processRoutes(routes) {
+    const indexRoutes = [];
+    const normalRoutes = [];
+    for (let i = routes.length - 1; i >= 0; i--) {
+        const route = routes[i];
         const r = {
             ...route,
             exports: route.exports.default,
@@ -110,18 +109,22 @@ async function loadRoutesFromProject() {
                 .replace(/\{(.*?)\}/g, ':$1')
                 .replace(/\[(.*?)\]/g, ':$1?')).replace(/\\/g, '/'),
         };
-        return r;
-    });
-    rs = rs.sort((x, y) => {
-        if (x.name === 'index') {
-            if (y.name === 'index') {
-                return +(x.httpRoute.length > y.httpRoute.length);
-            }
-            return -1;
+        if (r.name === 'index') {
+            indexRoutes.push(r);
+            continue;
         }
-        return +(x.name > y.name);
-    });
-    return rs;
+        normalRoutes.push(r);
+    }
+    normalRoutes.unshift(...indexRoutes.sort((x, y) => x.httpRoute.length - y.httpRoute.length));
+    return normalRoutes;
+}
+exports.processRoutes = processRoutes;
+async function loadRoutesFromProject() {
+    const routes = await require('@@/routes/*.*');
+    if (routes.errorID !== undefined) {
+        return routes;
+    }
+    return processRoutes(routes);
 }
 exports.loadRoutesFromProject = loadRoutesFromProject;
 async function buildExpressRouter(requiredRoutes) {

package/__BUILD__/libs/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/libs/router.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,qCAA2C;AAE3C,IAAiB,SAAS,CAsGzB;AAtGD,WAAiB,SAAS;IACtB,SAAgB,iBAAiB,CAAC,SAAiB;QAC/C,MAAM,MAAM,GAAwB;YAChC,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;SAC5B,CAAA;QAED,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;YACrB,GAAG,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE;gBACxB,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;oBAClC,OAAO,YAAY,CAAC,IAAI,CAAC,CAAA;iBAC5B;gBAED,IAAI,IAAI,KAAK,MAAM,EAAE;oBACjB,OAAO,YAAY,CAAA;iBACtB;gBAED,OAAO,CAAC,iBAAiD,EAAE,GAAG,QAAiC,EAAE,EAAE;oBAC/F,IAAI,QAAQ,GAAuB,SAAS,CAAA;oBAE5C,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;wBACvC,QAAQ,GAAG,iBAAiB,CAAA;qBAC/B;yBAAM;wBACH,QAAQ,GAAG,CAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAE,CAAA;qBAChD;oBAED,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;wBACrB,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACvB,QAAQ;wBACR,IAAI,EAAE,QAAQ;qBACjB,CAAC,CAAA;gBACN,CAAC,CAAA;YACL,CAAC;YAED,GAAG,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;gBAC/B,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;oBAClC,YAAY,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;iBAC7B;gBAED,OAAO,IAAI,CAAA;YACf,CAAC;SACJ,CAAmB,CAAA;IACxB,CAAC;IA3Ce,2BAAiB,oBA2ChC,CAAA;IAEY,qCAA2B,GAAG,KAAK,EAAC,IAAoB,EAAE,IAAqB,EAAE,IAAU,EAAE,KAAiC,EAAE,EAAE;QAC3I,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,OAAO;SACV;QAGD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAChC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAC9E,CAAC,CAAC,CAAA;IAEN,CAAC,CAAA;IAED,SAAgB,mBAAmB,CAAC,CAAkD;QAClF,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAA6B,CAAA;SACxE;QAED,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC5B,MAAM,IAAI,GAAG,GAAqB,CAAA;YAClC,MAAM,IAAI,GAAG,GAAsB,CAAA;YAEnC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBACzB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aAClC;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aACpC;YAED,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;gBACrC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAA;aAC7B;YAED,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS,EAAE;gBACvC,IAAI,CAAC,kBAAkB,GAAG,CAAC,QAAQ,EAAE,EAAE;oBACnC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBACxC,CAAC,CAAA;aACJ;YAED,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC5B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;aAC3B;YAED,IAAI,CAAC,IAAI,GAAG,CAAC,IAAU,EAAE,EAAE;gBACvB,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,UAAA,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;gBAC3F,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC7B,CAAC,CAAA;YAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE;gBACjB,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,UAAA,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA,CAAA,CAAC,CAAC,CAAA;gBAC3F,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YAC9B,CAAC,CAAA;YAED,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAC9B,CAAC,CAAA;IACL,CAAC;IA3Ce,6BAAmB,sBA2ClC,CAAA;AACL,CAAC,EAtGgB,SAAS,yBAAT,SAAS,QAsGzB;AAEM,KAAK,UAAU,qBAAqB;IACvC,MAAM,MAAM,GAAoD,MAAM,OAAO,CAAC,eAAe,CAAC,CAAA;IAE9F,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;QAC9B,OAAO,MAAM,CAAA;KAChB;IAED,IAAI,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,CAAC,GAAyB;YAC5B,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO;YAC9B,SAAS,EAAE,mBAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ;iBACnC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;iBACxB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;iBACjD,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;iBACrB,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;iBAC3B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;iBACpB,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC;iBAC5B,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CACjC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACxB,CAAA;QAED,OAAO,CAAC,CAAA;IACZ,CAAC,CAAC,CAAA;IAEF,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;YACpB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBACpB,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;aACpD;YAED,OAAO,CAAC,CAAC,CAAA;SACZ;QAED,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,CAAA;AACb,CAAC;AAtCD,sDAsCC;AAEM,KAAK,UAAU,kBAAkB,CAAC,cAAsC;IAC3E,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAgB,GAA0B,CAAA;IAE/D,MAAM,CAAC,MAAM,GAAG,EAAE,CAAA;IAClB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAA;IAE1B,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE;QAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QAEnE,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;QACvB,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,CAAA;QAEjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YAEvB,IAAI,QAAQ,GAAG,CAAC,CAAC,SAAS,CAAA;YAE1B,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC1B,QAAQ,GAAG,mBAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;aAC7E;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAA;YAEpF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,EAAE;gBACZ,WAAW,EAAE,WAAW;aAC3B,CAAC,CAAA;SACL;KACJ;IAED,OAAO,MAAM,CAAA;AACjB,CAAC;AAjCD,gDAiCC"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/libs/router.ts"],"names":[],"mappings":"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"}

package/__BUILD__/scripts/post-install/api.js

@@ -18,7 +18,7 @@ async function install(tools, projectPackageJson) {
     projectPackageJson.scripts.start = 'plata-runtime + plata-api';
     projectPackageJson.scripts.dev = 'plata-runtime + plata-api --hot';
     projectPackageJson.scripts.create = 'plata-runtime --skip-recompile + plata-create';
-    projectPackageJson.scripts.build = 'npx tsc -p . && plata-runtime + plata-build';
+    projectPackageJson.scripts.build = 'tsc -p . && plata-runtime + plata-build';
     projectPackageJson.scripts['gen:swagger'] = 'plata-runtime + plata-swagger';
     projectPackageJson.main = undefined;
     await Promise.all(promises);

package/__BUILD__/scripts/post-install/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/scripts/post-install/api.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,OAAO,CAAC,KAAuB,EAAE,kBAAuB;IAC1E,MAAM,QAAQ,GAAoB,EAAE,CAAA;IAEpC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAA;IACnD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAE/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;IAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IAE1C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;IAEpD,kBAAkB,CAAC,OAAO,CAAC,KAAK,GAAG,2BAA2B,CAAA;IAC9D,kBAAkB,CAAC,OAAO,CAAC,GAAG,GAAG,iCAAiC,CAAA;IAClE,kBAAkB,CAAC,OAAO,CAAC,MAAM,GAAG,+CAA+C,CAAA;IACnF,kBAAkB,CAAC,OAAO,CAAE,KAAK,GAAG,6CAA6C,CAAA;IACjF,kBAAkB,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,+BAA+B,CAAA;IAE3E,kBAAkB,CAAC,IAAI,GAAG,SAAS,CAAA;IAEnC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE3B,OAAO,kBAAkB,CAAA;AAE7B,CAAC;AA9BD,0BA8BC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/scripts/post-install/api.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,OAAO,CAAC,KAAuB,EAAE,kBAAuB;IAC1E,MAAM,QAAQ,GAAoB,EAAE,CAAA;IAEpC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAA;IACnD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAE/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;IAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IAE1C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;IAEpD,kBAAkB,CAAC,OAAO,CAAC,KAAK,GAAG,2BAA2B,CAAA;IAC9D,kBAAkB,CAAC,OAAO,CAAC,GAAG,GAAG,iCAAiC,CAAA;IAClE,kBAAkB,CAAC,OAAO,CAAC,MAAM,GAAG,+CAA+C,CAAA;IACnF,kBAAkB,CAAC,OAAO,CAAE,KAAK,GAAG,yCAAyC,CAAA;IAC7E,kBAAkB,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,+BAA+B,CAAA;IAE3E,kBAAkB,CAAC,IAAI,GAAG,SAAS,CAAA;IAEnC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE3B,OAAO,kBAAkB,CAAA;AAE7B,CAAC;AA9BD,0BA8BC"}

package/__BUILD__/scripts/post-install/cluster.js

@@ -15,7 +15,7 @@ async function install(tools, projectPackageJson) {
     promises.push(tools.syncFileToDest('tsconfig.json'));
     projectPackageJson.scripts.start = 'plata-runtime + plata-cluster';
     projectPackageJson.scripts.create = 'plata-runtime --skip-recompile + plata-create';
-    projectPackageJson.scripts.build = 'npx tsc -p . && plata-runtime + plata-build';
+    projectPackageJson.scripts.build = 'tsc -p . && plata-runtime + plata-build';
     projectPackageJson.main = undefined;
     await Promise.all(promises);
     return projectPackageJson;

package/__BUILD__/scripts/post-install/cluster.js.map

@@ -1 +1 @@
-{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../src/scripts/post-install/cluster.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,OAAO,CAAC,KAAuB,EAAE,kBAAuB;IAC1E,MAAM,QAAQ,GAAoB,EAAE,CAAA;IAEpC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAA;IACnD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAE/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;IAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IAE1C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;IAEpD,kBAAkB,CAAC,OAAO,CAAC,KAAK,GAAG,+BAA+B,CAAA;IAClE,kBAAkB,CAAC,OAAO,CAAC,MAAM,GAAG,+CAA+C,CAAA;IACnF,kBAAkB,CAAC,OAAO,CAAE,KAAK,GAAG,6CAA6C,CAAA;IAEjF,kBAAkB,CAAC,IAAI,GAAG,SAAS,CAAA;IAEnC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE3B,OAAO,kBAAkB,CAAA;AAE7B,CAAC;AA1BD,0BA0BC"}
+{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../src/scripts/post-install/cluster.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,OAAO,CAAC,KAAuB,EAAE,kBAAuB;IAC1E,MAAM,QAAQ,GAAoB,EAAE,CAAA;IAEpC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAA;IACnD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IAE/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAA;IAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IAE1C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;IACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;IAEpD,kBAAkB,CAAC,OAAO,CAAC,KAAK,GAAG,+BAA+B,CAAA;IAClE,kBAAkB,CAAC,OAAO,CAAC,MAAM,GAAG,+CAA+C,CAAA;IACnF,kBAAkB,CAAC,OAAO,CAAE,KAAK,GAAG,yCAAyC,CAAA;IAE7E,kBAAkB,CAAC,IAAI,GAAG,SAAS,CAAA;IAEnC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE3B,OAAO,kBAAkB,CAAA;AAE7B,CAAC;AA1BD,0BA0BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.4.153",
+    "version": "0.4.155",
     "main": "__BUILD__/index",
     "types": "src/@types/exported.d.ts",
     "bin": {

package/src/libs/router.ts

@@ -106,14 +106,13 @@ export namespace Internals {
     }
 }
 
-export async function loadRoutesFromProject(): PlataPromise<Router.RequiredRoute[]> {
-    const routes: RequiredFolder<{default: Router.RouterBuilder}> = await require('@@/routes/*.*')
+export function processRoutes(routes: RequiredInterface<{default: Router.RouterBuilder}>[]): Router.RequiredRoute[] {
+    const indexRoutes: Router.RequiredRoute[] = []
+    const normalRoutes: Router.RequiredRoute[] = []
 
-    if (routes.errorID !== undefined) {
-        return routes
-    }
+    for (let i = routes.length - 1; i >= 0; i--) {
+        const route = routes[i]
 
-    let rs = routes.map(route => {
         const r: Router.RequiredRoute = {
             ...route,
             exports: route.exports.default,
@@ -126,24 +125,29 @@ export async function loadRoutesFromProject(): PlataPromise<Router.RequiredRoute
                 .replace(/\{(.*?)\}/g, ':$1')
                 .replace(/\[(.*?)\]/g, ':$1?')
             ).replace(/\\/g, '/'),
+        } 
+
+        if (r.name === 'index') {
+            indexRoutes.push(r)
+            continue
         }
 
-        return r
-    })
+        normalRoutes.push(r)
+    }
+ 
+    normalRoutes.unshift(...indexRoutes.sort((x, y) => x.httpRoute.length - y.httpRoute.length))
 
-    rs = rs.sort((x, y) => {
-        if (x.name === 'index') {
-            if (y.name === 'index') {
-                return +(x.httpRoute.length > y.httpRoute.length)
-            }
+    return normalRoutes
+}
 
-            return -1
-        } 
+export async function loadRoutesFromProject(): PlataPromise<Router.RequiredRoute[]> {
+    const routes: RequiredFolder<{default: Router.RouterBuilder}> = await require('@@/routes/*.*')
 
-        return +(x.name > y.name)
-    })
+    if (routes.errorID !== undefined) {
+        return routes
+    }
 
-    return rs
+   return processRoutes(routes)
 }
 
 export async function buildExpressRouter(requiredRoutes: Router.RequiredRoute[]): PlataPromise<Router.Router> {    

package/src/scripts/post-install/api.ts

@@ -21,7 +21,7 @@ export async function install(tools: PlataFs.CliTools, projectPackageJson: any)
     projectPackageJson.scripts.start = 'plata-runtime + plata-api'
     projectPackageJson.scripts.dev = 'plata-runtime + plata-api --hot'
     projectPackageJson.scripts.create = 'plata-runtime --skip-recompile + plata-create'
-    projectPackageJson.scripts. build = 'npx tsc -p . && plata-runtime + plata-build'
+    projectPackageJson.scripts. build = 'tsc -p . && plata-runtime + plata-build'
     projectPackageJson.scripts['gen:swagger'] = 'plata-runtime + plata-swagger'
     //projectPackageJson.scripts['plata:reload'] = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-reload.ts`
     projectPackageJson.main = undefined

package/src/scripts/post-install/cluster.ts

@@ -18,7 +18,7 @@ export async function install(tools: PlataFs.CliTools, projectPackageJson: any)
 
     projectPackageJson.scripts.start = 'plata-runtime + plata-cluster'
     projectPackageJson.scripts.create = 'plata-runtime --skip-recompile + plata-create'
-    projectPackageJson.scripts. build = 'npx tsc -p . && plata-runtime + plata-build'
+    projectPackageJson.scripts. build = 'tsc -p . && plata-runtime + plata-build'
 
     projectPackageJson.main = undefined
 

package/src/tests/router.test.ts

@@ -0,0 +1,45 @@
+import { describe, it, before } from "node:test"
+import assert from "node:assert"
+import { PlataRoutes } from ".."
+import { loadRuntimeLibs } from "../bin/runtime/_setupRuntime"
+
+
+describe('Plata Switch', () => {
+    const plataPromise = (async () => {
+        const g = global as any
+    
+        g.Plata = await loadRuntimeLibs()
+    })()
+
+    const exports = { default: async (r) => r }
+
+    before(async () => {
+        await plataPromise
+    })
+
+    it('Ordem dos index', async () => {
+        const routes = PlataRoutes.processRoutes([
+            {
+                exports,
+                filePath: '/v1/controle/index.js',
+                name: 'index'
+            },
+            {
+                exports,
+                filePath: '/v1/controle/update.js',
+                name: 'update'
+            },
+            {
+                exports,
+                filePath: '/v1/index.js',
+                name: 'index'
+            },
+        ])
+
+        assert.deepStrictEqual(routes.map(r => r.httpRoute), [
+            '/v1/',
+            '/v1/controle/',
+            '/v1/controle/update',
+        ])
+    })
+})