@vaadin/hilla-file-router 24.5.0-beta3 → 24.5.0-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-file-router",
-  "version": "24.5.0-beta3",
+  "version": "24.5.0-beta5",
   "description": "Hilla file-based router",
   "main": "index.js",
   "module": "index.js",
@@ -79,9 +79,9 @@
     "type-fest": "^4.9.0"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-utils": "24.5.0-beta3",
-    "@vaadin/hilla-react-auth": "24.5.0-beta3",
-    "@vaadin/hilla-react-signals": "24.5.0-beta3",
+    "@vaadin/hilla-generator-utils": "24.5.0-beta5",
+    "@vaadin/hilla-react-auth": "24.5.0-beta5",
+    "@vaadin/hilla-react-signals": "24.5.0-beta5",
     "react": "^18.2.0",
     "rollup": "^4.12.0",
     "typescript": "5.6.2"

package/runtime/createMenuItems.js

@@ -2,7 +2,7 @@ function __REGISTER__(feature, vaadinObj = window.Vaadin ??= {}) {
   vaadinObj.registrations ??= [];
   vaadinObj.registrations.push({
     is: feature ? `${"@vaadin/hilla-file-router"}/${feature}` : "@vaadin/hilla-file-router",
-    version: "24.5.0-beta3"
+    version: "24.5.0-beta5"
   });
 }
 import { signal } from "@vaadin/hilla-react-signals";

package/vite-plugin/applyLayouts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyLayouts.d.ts","sourceRoot":"","sources":["../src/vite-plugin/applyLayouts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAmBH;;;;;;GAMG;AACH,wBAA8B,YAAY,CACxC,SAAS,EAAE,SAAS,SAAS,EAAE,EAC/B,WAAW,EAAE,GAAG,GACf,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAS/B"}
+{"version":3,"file":"applyLayouts.d.ts","sourceRoot":"","sources":["../src/vite-plugin/applyLayouts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AA+CH;;;;;;GAMG;AACH,wBAA8B,YAAY,CACxC,SAAS,EAAE,SAAS,SAAS,EAAE,EAC/B,WAAW,EAAE,GAAG,GACf,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAW/B"}

package/vite-plugin/applyLayouts.js

@@ -13,14 +13,34 @@ function enableFlowLayout(route) {
     children: route.children.map(enableFlowLayout)
   } : routeWithFlowLayout;
 }
+function layoutExists(layoutPaths, path) {
+  const splitPath = path.split("/");
+  return layoutPaths.some((layout) => {
+    if (layout.length === 0) {
+      return true;
+    }
+    const splitLayout = layout.split("/");
+    if (splitLayout.length > splitPath.length) {
+      return false;
+    }
+    for (let i = 0; i < splitLayout.length; i++) {
+      if (splitPath[i] !== splitLayout[i]) {
+        return false;
+      }
+    }
+    return true;
+  });
+}
 async function applyLayouts(routeMeta, layoutsFile) {
   if (!existsSync(layoutsFile)) {
     return routeMeta;
   }
   const layoutContents = await readFile(layoutsFile, "utf-8");
   const availableLayouts = JSON.parse(layoutContents);
-  const layoutPaths = new Set(availableLayouts.map((layout) => stripLeadingSlash(layout.path)));
-  return routeMeta.map((route) => layoutPaths.has(stripLeadingSlash(route.path)) ? enableFlowLayout(route) : route);
+  const layoutPaths = availableLayouts.map((layout) => stripLeadingSlash(layout.path));
+  return routeMeta.map(
+    (route) => layoutExists(layoutPaths, stripLeadingSlash(route.path)) ? enableFlowLayout(route) : route
+  );
 }
 export {
   applyLayouts as default

package/vite-plugin/applyLayouts.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/vite-plugin/applyLayouts.ts"],
-  "sourcesContent": ["import { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport type { RouteMeta } from './collectRoutesFromFS.js';\n\n/**\n * The information about a particular server-side layout.\n */\nexport type LayoutMeta = Readonly<{\n  path: string;\n}>;\n\nfunction stripLeadingSlash(path: string) {\n  return path.startsWith('/') ? path.slice(1) : path;\n}\n\nfunction enableFlowLayout(route: RouteMeta): RouteMeta {\n  const routeWithFlowLayout = {\n    ...route,\n    flowLayout: true,\n  };\n  return route.children\n    ? {\n        ...routeWithFlowLayout,\n        children: route.children.map(enableFlowLayout),\n      }\n    : routeWithFlowLayout;\n}\n\n/**\n * Enables Flow layout flag on the matching routes based on the information from the layouts JSON file.\n *\n * @param routeMeta - The routes tree to process.\n * @param layoutsFile - The server layouts JSON file.\n * @returns Processed routes tree.\n */\nexport default async function applyLayouts(\n  routeMeta: readonly RouteMeta[],\n  layoutsFile: URL,\n): Promise<readonly RouteMeta[]> {\n  if (!existsSync(layoutsFile)) {\n    return routeMeta;\n  }\n  const layoutContents = await readFile(layoutsFile, 'utf-8');\n  const availableLayouts: readonly LayoutMeta[] = JSON.parse(layoutContents);\n  const layoutPaths = new Set(availableLayouts.map((layout) => stripLeadingSlash(layout.path)));\n\n  return routeMeta.map((route) => (layoutPaths.has(stripLeadingSlash(route.path)) ? enableFlowLayout(route) : route));\n}\n"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAC3B,SAAS,gBAAgB;AAUzB,SAAS,kBAAkB,MAAc;AACvC,SAAO,KAAK,WAAW,GAAG,IAAI,KAAK,MAAM,CAAC,IAAI;AAChD;AAEA,SAAS,iBAAiB,OAA6B;AACrD,QAAM,sBAAsB;AAAA,IAC1B,GAAG;AAAA,IACH,YAAY;AAAA,EACd;AACA,SAAO,MAAM,WACT;AAAA,IACE,GAAG;AAAA,IACH,UAAU,MAAM,SAAS,IAAI,gBAAgB;AAAA,EAC/C,IACA;AACN;AASA,eAAO,aACL,WACA,aAC+B;AAC/B,MAAI,CAAC,WAAW,WAAW,GAAG;AAC5B,WAAO;AAAA,EACT;AACA,QAAM,iBAAiB,MAAM,SAAS,aAAa,OAAO;AAC1D,QAAM,mBAA0C,KAAK,MAAM,cAAc;AACzE,QAAM,cAAc,IAAI,IAAI,iBAAiB,IAAI,CAAC,WAAW,kBAAkB,OAAO,IAAI,CAAC,CAAC;AAE5F,SAAO,UAAU,IAAI,CAAC,UAAW,YAAY,IAAI,kBAAkB,MAAM,IAAI,CAAC,IAAI,iBAAiB,KAAK,IAAI,KAAM;AACpH;",
+  "sourcesContent": ["import { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport type { RouteMeta } from './collectRoutesFromFS.js';\n\n/**\n * The information about a particular server-side layout.\n */\nexport type LayoutMeta = Readonly<{\n  path: string;\n}>;\n\nfunction stripLeadingSlash(path: string) {\n  return path.startsWith('/') ? path.slice(1) : path;\n}\n\nfunction enableFlowLayout(route: RouteMeta): RouteMeta {\n  const routeWithFlowLayout = {\n    ...route,\n    flowLayout: true,\n  };\n  return route.children\n    ? {\n        ...routeWithFlowLayout,\n        children: route.children.map(enableFlowLayout),\n      }\n    : routeWithFlowLayout;\n}\n\n/**\n * Check if there is a layout available that can handle the given path.\n * Layouts match the starting parts of the path so '/' will match all paths\n * and '/home' matches '/home' anything with the start path '/home/*'\n *\n * @param layoutPaths - available layout paths\n * @param path - to check for layout\n */\nfunction layoutExists(layoutPaths: string[], path: string) {\n  const splitPath: string[] = path.split('/');\n\n  return layoutPaths.some((layout) => {\n    if (layout.length === 0) {\n      return true;\n    }\n    const splitLayout: string[] = layout.split('/');\n    if (splitLayout.length > splitPath.length) {\n      return false;\n    }\n    for (let i = 0; i < splitLayout.length; i++) {\n      if (splitPath[i] !== splitLayout[i]) {\n        return false;\n      }\n    }\n    return true;\n  });\n}\n\n/**\n * Enables Flow layout flag on the matching routes based on the information from the layouts JSON file.\n *\n * @param routeMeta - The routes tree to process.\n * @param layoutsFile - The server layouts JSON file.\n * @returns Processed routes tree.\n */\nexport default async function applyLayouts(\n  routeMeta: readonly RouteMeta[],\n  layoutsFile: URL,\n): Promise<readonly RouteMeta[]> {\n  if (!existsSync(layoutsFile)) {\n    return routeMeta;\n  }\n  const layoutContents = await readFile(layoutsFile, 'utf-8');\n  const availableLayouts: readonly LayoutMeta[] = JSON.parse(layoutContents);\n  const layoutPaths = availableLayouts.map((layout) => stripLeadingSlash(layout.path));\n\n  return routeMeta.map((route) =>\n    layoutExists(layoutPaths, stripLeadingSlash(route.path)) ? enableFlowLayout(route) : route,\n  );\n}\n"],
+  "mappings": "AAAA,SAAS,kBAAkB;AAC3B,SAAS,gBAAgB;AAUzB,SAAS,kBAAkB,MAAc;AACvC,SAAO,KAAK,WAAW,GAAG,IAAI,KAAK,MAAM,CAAC,IAAI;AAChD;AAEA,SAAS,iBAAiB,OAA6B;AACrD,QAAM,sBAAsB;AAAA,IAC1B,GAAG;AAAA,IACH,YAAY;AAAA,EACd;AACA,SAAO,MAAM,WACT;AAAA,IACE,GAAG;AAAA,IACH,UAAU,MAAM,SAAS,IAAI,gBAAgB;AAAA,EAC/C,IACA;AACN;AAUA,SAAS,aAAa,aAAuB,MAAc;AACzD,QAAM,YAAsB,KAAK,MAAM,GAAG;AAE1C,SAAO,YAAY,KAAK,CAAC,WAAW;AAClC,QAAI,OAAO,WAAW,GAAG;AACvB,aAAO;AAAA,IACT;AACA,UAAM,cAAwB,OAAO,MAAM,GAAG;AAC9C,QAAI,YAAY,SAAS,UAAU,QAAQ;AACzC,aAAO;AAAA,IACT;AACA,aAAS,IAAI,GAAG,IAAI,YAAY,QAAQ,KAAK;AAC3C,UAAI,UAAU,CAAC,MAAM,YAAY,CAAC,GAAG;AACnC,eAAO;AAAA,MACT;AAAA,IACF;AACA,WAAO;AAAA,EACT,CAAC;AACH;AASA,eAAO,aACL,WACA,aAC+B;AAC/B,MAAI,CAAC,WAAW,WAAW,GAAG;AAC5B,WAAO;AAAA,EACT;AACA,QAAM,iBAAiB,MAAM,SAAS,aAAa,OAAO;AAC1D,QAAM,mBAA0C,KAAK,MAAM,cAAc;AACzE,QAAM,cAAc,iBAAiB,IAAI,CAAC,WAAW,kBAAkB,OAAO,IAAI,CAAC;AAEnF,SAAO,UAAU;AAAA,IAAI,CAAC,UACpB,aAAa,aAAa,kBAAkB,MAAM,IAAI,CAAC,IAAI,iBAAiB,KAAK,IAAI;AAAA,EACvF;AACF;",
   "names": []
 }