olova 2.0.59 → 2.0.60

package/dist/olova.js

@@ -190,7 +190,7 @@ function generateRouteTree(routes, notFoundPages, layouts, loadingPages, errorPa
   };
   const routeNames = [];
   const routeImports = routes.map((route) => {
-    const relativePath = stripImportExtension("./" + path4.relative(srcDir, route.component).replace(/\\/g, "/"));
+    const relativePath = stripImportExtension("./app/" + path4.relative(srcDir, route.component).replace(/\\/g, "/"));
     const moduleName = getRouteName2(route.component, "RouteModule");
     const lazyName = getRouteName2(route.component, "Route");
     routeNames.push({ moduleName, lazyName, eager: true });
@@ -198,7 +198,7 @@ function generateRouteTree(routes, notFoundPages, layouts, loadingPages, errorPa
   }).join("\n");
   const notFoundNames = [];
   const notFoundImports = notFoundPages.map((nf) => {
-    const relativePath = stripImportExtension("./" + path4.relative(srcDir, nf.filePath).replace(/\\/g, "/"));
+    const relativePath = stripImportExtension("./app/" + path4.relative(srcDir, nf.filePath).replace(/\\/g, "/"));
     if (nf.hasMetadata) {
       const moduleName = getRouteName2(nf.filePath, "NotFoundModule");
       notFoundNames.push(moduleName);
@@ -212,7 +212,7 @@ function generateRouteTree(routes, notFoundPages, layouts, loadingPages, errorPa
   }).join("\n");
   const layoutNames = [];
   const layoutImports = layouts.map((layout) => {
-    const relativePath = stripImportExtension("./" + path4.relative(srcDir, layout.filePath).replace(/\\/g, "/"));
+    const relativePath = stripImportExtension("./app/" + path4.relative(srcDir, layout.filePath).replace(/\\/g, "/"));
     if (layout.hasMetadata) {
       const moduleName = getRouteName2(layout.filePath, "LayoutModule");
       layoutNames.push(moduleName);
@@ -226,7 +226,7 @@ function generateRouteTree(routes, notFoundPages, layouts, loadingPages, errorPa
   }).join("\n");
   const loadingNames = [];
   const loadingImports = loadingPages.map((lp) => {
-    const relativePath = stripImportExtension("./" + path4.relative(srcDir, lp.filePath).replace(/\\/g, "/"));
+    const relativePath = stripImportExtension("./app/" + path4.relative(srcDir, lp.filePath).replace(/\\/g, "/"));
     const importName = getRouteName2(lp.filePath, "Loading");
     loadingNames.push(importName);
     if (lp.hasDefault) return `import ${importName} from '${relativePath}';`;
@@ -235,7 +235,7 @@ function generateRouteTree(routes, notFoundPages, layouts, loadingPages, errorPa
   }).join("\n");
   const errorNames = [];
   const errorImports = errorPages.map((ep) => {
-    const relativePath = stripImportExtension("./" + path4.relative(srcDir, ep.filePath).replace(/\\/g, "/"));
+    const relativePath = stripImportExtension("./app/" + path4.relative(srcDir, ep.filePath).replace(/\\/g, "/"));
     const importName = getRouteName2(ep.filePath, "Error");
     errorNames.push(importName);
     if (ep.hasDefault) return `import ${importName} from '${relativePath}';`;
@@ -244,7 +244,7 @@ function generateRouteTree(routes, notFoundPages, layouts, loadingPages, errorPa
   }).join("\n");
   const middlewareNames = [];
   const middlewareImports = middlewares.map((mw) => {
-    const relativePath = stripImportExtension("./" + path4.relative(srcDir, mw.filePath).replace(/\\/g, "/"));
+    const relativePath = stripImportExtension("./app/" + path4.relative(srcDir, mw.filePath).replace(/\\/g, "/"));
     const importName = getRouteName2(mw.filePath, "Middleware");
     middlewareNames.push(importName);
     if (mw.hasDefault) return `import ${importName} from '${relativePath}';`;
@@ -474,14 +474,12 @@ export type {
 `;
 }
 var RESERVED_NAMES = /* @__PURE__ */ new Set([
-  "index",
+  "page",
   "layout",
   "loading",
   "error",
-  "404",
+  "not-found",
   "middleware",
-  "App",
-  "main",
   "route.tree"
 ]);
 function scanDirectory(dir, rootDir, extensions, routes, notFoundPages, layouts, loadingPages, errorPages, middlewares, isRoot = false) {
@@ -523,15 +521,13 @@ function scanDirectory(dir, rootDir, extensions, routes, notFoundPages, layouts,
           path: isRoot ? "/" : routePath,
           filePath: fullPath
         });
-      } else if (baseName === "404" && extensions.includes(ext)) {
+      } else if ((baseName === "not-found" || baseName === "404") && extensions.includes(ext)) {
         const relativeParts = path4.relative(rootDir, dir).split(path4.sep).filter(Boolean);
         const filteredParts = relativeParts.filter((p) => !isRouteGroup(p));
         const pathPrefix = isRoot ? "" : "/" + filteredParts.join("/");
         notFoundPages.push({ pathPrefix: pathPrefix || "", filePath: fullPath });
-      } else if (isRoot && baseName === "App" && extensions.includes(ext)) {
-        routes.push({ path: "/", filePath: fullPath, isDynamic: false, params: [] });
-      } else if (!isRoot && baseName === "index" && extensions.includes(ext)) {
-        const relativePath = path4.relative(rootDir, path4.dirname(fullPath));
+      } else if (baseName === "page" && extensions.includes(ext)) {
+        const relativePath = path4.relative(rootDir, dir);
         const { routePath, params } = pathToRoute(relativePath, path4.sep);
         routes.push({ path: routePath, filePath: fullPath, isDynamic: params.length > 0, params });
       } else if (!RESERVED_NAMES.has(baseName) && !baseName.endsWith(".d") && !baseName.startsWith("_") && extensions.includes(ext)) {
@@ -566,7 +562,7 @@ function scanRoutes(rootDir, extensions) {
 
 // src/plugin/index.ts
 function olovaRouter(options = {}) {
-  const rootDir = options.rootDir || "src";
+  const rootDir = options.rootDir || "src/app";
   const extensions = options.extensions || [".tsx", ".ts", ".mdx"];
   const packageName = options.packageName || "olovastart";
   let config;
@@ -645,7 +641,7 @@ function olovaRouter(options = {}) {
       };
     });
     const content = generateRouteTree(routeConfigs, notFoundConfigs, layoutConfigs, loadingConfigs, errorConfigs, middlewareConfigs, absoluteRootDir, packageName);
-    const treePath = path4.resolve(absoluteRootDir, "route.tree.ts");
+    const treePath = path4.resolve(config.root, "src", "route.tree.ts");
     const existing = fs3.existsSync(treePath) ? fs3.readFileSync(treePath, "utf-8") : "";
     if (existing !== content) {
       fs3.writeFileSync(treePath, content);
@@ -659,9 +655,9 @@ function olovaRouter(options = {}) {
       if (filename.includes("route.tree.ts")) return;
       const ext = path4.extname(filename);
       const isConfiguredExtension = extensions.includes(ext);
-      const isIndexFile = filename.includes("index") && isConfiguredExtension;
-      const isAppFile = filename.includes("App") && isConfiguredExtension;
+      const isPageFile = filename.includes("page") && isConfiguredExtension;
       const is404File = filename.includes("404") && isConfiguredExtension;
+      const isNotFoundFile = filename.includes("not-found") && isConfiguredExtension;
       const isLayoutFile = filename.includes("layout") && isConfiguredExtension;
       const isLoadingFile = filename.includes("loading") && isConfiguredExtension;
       const isErrorFile = filename.includes("error") && isConfiguredExtension;
@@ -669,8 +665,8 @@ function olovaRouter(options = {}) {
       const isDirectory = !filename.includes(".");
       const isDynamicSegment = filename.includes("[");
       const isRenameEvent = eventType === "rename";
-      if (isIndexFile || isAppFile || is404File || isLayoutFile || isLoadingFile || isErrorFile || isMiddlewareFile || isDirectory || isDynamicSegment || isRenameEvent) {
-        if (isIndexFile && filename) {
+      if (isPageFile || is404File || isNotFoundFile || isLayoutFile || isLoadingFile || isErrorFile || isMiddlewareFile || isDirectory || isDynamicSegment || isRenameEvent) {
+        if (isPageFile && filename) {
           const fullPath = path4.join(absoluteRootDir, filename);
           if (fs3.existsSync(fullPath)) {
             const stat = fs3.statSync(fullPath);