@uxf/router 11.111.2 → 11.119.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@uxf/router",
-    "version": "11.111.2",
+    "version": "11.119.2",
     "description": "UXF Router",
     "author": "UXFans <dev@uxf.cz>",
     "homepage": "https://gitlab.com/uxf-npm/router#readme",
@@ -26,12 +26,12 @@
         "true-case-path": "2.2.1"
     },
     "peerDependencies": {
-        "@uxf/core": "11.111.2",
+        "@uxf/core": "11.114.0",
         "next": ">= 12",
         "superstruct": "^2.0.2"
     },
     "devDependencies": {
-        "@uxf/core": "11.111.2",
+        "@uxf/core": "11.114.0",
         "next": "16.1.6",
         "superstruct": "^2.0.2"
     }

package/router.js

@@ -39,7 +39,6 @@ function createRouter(routes, routerOptions) {
             throw new Error(`Route '${String(route)}' not found.`);
         }
         const restParams = {};
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         Object.keys(params !== null && params !== void 0 ? params : empty_object_1.EMPTY_OBJECT).forEach((key) => {
             const value = params[key];
             const segment = `[${key}]`;
@@ -132,7 +131,6 @@ function createRouter(routes, routerOptions) {
                 pathname: typeof routes[route].path === "string"
                     ? routes[route].path
                     : routes[route].path[(_a = options === null || options === void 0 ? void 0 : options.locale) !== null && _a !== void 0 ? _a : (0, throw_error_1.throwError)("Locale is required")],
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                 query: params !== null && params !== void 0 ? params : null,
             };
         },

package/routes-check/routes-check.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.routesCheck = routesCheck;
 const throw_error_1 = require("@uxf/core/utils/throw-error");
+const fs_1 = require("fs");
 const path_1 = require("path");
 const process_1 = require("process");
 const true_case_path_1 = require("true-case-path");
@@ -19,6 +20,33 @@ function fileExists(path) {
         }
     }
 }
+function findAppRoute(dir, parts) {
+    if (parts.length === 0) {
+        if (fileExists((0, path_1.join)(dir, "page.ts")) || fileExists((0, path_1.join)(dir, "route.ts"))) {
+            return true;
+        }
+    }
+    else {
+        if (findAppRoute((0, path_1.join)(dir, parts[0]), parts.slice(1))) {
+            return true;
+        }
+    }
+    let entries;
+    try {
+        entries = (0, fs_1.readdirSync)(dir);
+    }
+    catch {
+        return false;
+    }
+    for (const entry of entries) {
+        if (entry.startsWith("(") && entry.endsWith(")")) {
+            if (findAppRoute((0, path_1.join)(dir, entry), parts)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
 let hasError = false;
 function routesCheck(routes, options) {
     Object.entries(routes).forEach(([routeName, routeDefinition]) => {
@@ -40,10 +68,7 @@ function routesCheck(routes, options) {
             if (fileExists(pagePath)) {
                 return;
             }
-            if (fileExists((0, path_1.join)(options.appDir, ...pathParts, "page.ts"))) {
-                return;
-            }
-            if (fileExists((0, path_1.join)(options.appDir, ...pathParts, "route.ts"))) {
+            if (findAppRoute(options.appDir, pathParts)) {
                 return;
             }
             throw new Error("Invalid");

package/routes-check/routes-check.test.js

@@ -13,6 +13,8 @@ describe("routesCheck", () => {
             app1: { path: "/app-directory" },
             app2: { path: "/app-directory/[param]" },
             app3: { path: "/api" },
+            app4: { path: "/grouped-route" }, // page lives inside a (group) folder
+            app5: { path: "/nested/deep" }, // page lives inside nested (group) folders
         }, {
             shouldProcessExit: false,
             appDir: (0, path_1.join)(__dirname, "__test__", "app"),