zyket 1.1.9 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyket",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/services/express/Express.js

@@ -33,7 +33,7 @@ module.exports = class Express extends Service {
 
     const corsOptions = await this.#loadCorsOrCreateDefault();
 
-    this.#app.use(cors(corsOptions));
+    if(corsOptions) this.#app.use(cors(corsOptions));
 
     // Swagger setup
     const swaggerOptions = {
@@ -171,7 +171,7 @@ module.exports = class Express extends Service {
       this.#container.get('logger').info("No CORS configuration found. Creating default config/cors.js");
       fs.mkdirSync(path.join(process.cwd(), "config"), { recursive: true });
       this.#container.get('template-manager').installFile('default/config/cors', corsConfigPath);
-      corsOptions = { origin: '*' };
+      corsOptions = false;
     }
     return corsOptions;
   }
@@ -185,9 +185,21 @@ module.exports = class Express extends Service {
       routePath = routePath.replaceAll('index', '/');
       routePath = routePath.replaceAll('//', '/');
       routePath = routePath.replace(/\[([^\]]+)\]/g, ':$1');
-      
+
       return new route(routePath);
     });
+
+    routes.sort((a, b) => {
+      const aSegments = a.path.split('/').filter(Boolean);
+      const bSegments = b.path.split('/').filter(Boolean);
+      const aDynCount = aSegments.filter(s => s.startsWith(':')).length;
+      const bDynCount = bSegments.filter(s => s.startsWith(':')).length;
+      if (aDynCount !== bDynCount) return aDynCount - bDynCount;
+      const aFirstDyn = aSegments.findIndex(s => s.startsWith(':'));
+      const bFirstDyn = bSegments.findIndex(s => s.startsWith(':'));
+      return (bFirstDyn === -1 ? Infinity : bFirstDyn) - (aFirstDyn === -1 ? Infinity : aFirstDyn);
+    });
+
     return routes;
   }