olovastart 0.0.13 → 0.0.14

package/dist/olova.cjs

@@ -148,31 +148,21 @@ function generateRouteTree(routes, notFoundPages, layouts, srcDir) {
   };
   const routeImports = routes.map((route, index) => {
     const relativePath = "./" + path5__default.default.relative(srcDir, route.component).replace(/\\/g, "/").replace(/\.tsx?$/, "");
-    const importName = getRouteName2(route.component, index, "Route");
-    const moduleName = importName + "Module";
-    const hasInlineMetadata = !!route.metadataSource;
-    if (route.hasMetadata && !hasInlineMetadata || route.hasRoute || route.hasGetStaticPaths) {
-      return "import * as " + moduleName + " from '" + relativePath + "';";
-    } else if (route.hasDefault) {
-      return "const " + importName + " = lazy(() => import('" + relativePath + "'));";
-    } else if (route.namedExport) {
-      return "const " + importName + " = lazy(() => import('" + relativePath + "').then(module => ({ default: module." + route.namedExport + " })));";
-    } else {
-      return "import " + importName + " from '" + relativePath + "';";
-    }
+    const moduleName = getRouteName2(route.component, index, "RouteModule");
+    return `import * as ${moduleName} from '${relativePath}';`;
   }).join("\n");
   const notFoundImports = notFoundPages.map((nf, index) => {
     const relativePath = "./" + path5__default.default.relative(srcDir, nf.filePath).replace(/\\/g, "/").replace(/\.tsx?$/, "");
     const importName = getRouteName2(nf.filePath, index, "NotFound");
     const moduleName = importName + "Module";
     if (nf.hasMetadata) {
-      return "import * as " + moduleName + " from '" + relativePath + "';";
+      return `import * as ${moduleName} from '${relativePath}';`;
     } else if (nf.hasDefault) {
-      return "import " + importName + " from '" + relativePath + "';";
+      return `import ${importName} from '${relativePath}';`;
     } else if (nf.namedExport) {
-      return "import { " + nf.namedExport + " as " + importName + " } from '" + relativePath + "';";
+      return `import { ${nf.namedExport} as ${importName} } from '${relativePath}';`;
     } else {
-      return "import " + importName + " from '" + relativePath + "';";
+      return `import ${importName} from '${relativePath}';`;
     }
   }).join("\n");
   const layoutImports = layouts.map((layout, index) => {
@@ -180,54 +170,103 @@ function generateRouteTree(routes, notFoundPages, layouts, srcDir) {
     const importName = getRouteName2(layout.filePath, index, "Layout");
     const moduleName = importName + "Module";
     if (layout.hasMetadata) {
-      return "import * as " + moduleName + " from '" + relativePath + "';";
+      return `import * as ${moduleName} from '${relativePath}';`;
     } else if (layout.hasDefault) {
-      return "import " + importName + " from '" + relativePath + "';";
+      return `import ${importName} from '${relativePath}';`;
     } else if (layout.namedExport) {
-      return "import { " + layout.namedExport + " as " + importName + " } from '" + relativePath + "';";
+      return `import { ${layout.namedExport} as ${importName} } from '${relativePath}';`;
     } else {
-      return "import " + importName + " from '" + relativePath + "';";
+      return `import ${importName} from '${relativePath}';`;
     }
   }).join("\n");
   const routeObjects = routes.map((route, index) => {
-    const importName = getRouteName2(route.component, index, "Route");
-    const moduleName = importName + "Module";
-    const usesModule = route.hasMetadata && !route.metadataSource || route.hasRoute || route.hasGetStaticPaths;
-    const component = usesModule ? moduleName + ".default" : importName;
+    const moduleName = getRouteName2(route.component, index, "RouteModule");
+    const component = `${moduleName}.default`;
     let metadata = "";
     if (route.metadataSource) {
-      metadata = ", metadata: " + route.metadataSource;
+      metadata = `,
+    metadata: ${route.metadataSource}`;
     } else if (route.hasMetadata) {
-      metadata = ", metadata: " + moduleName + ".metadata";
+      metadata = `,
+    metadata: ${moduleName}.metadata`;
     }
     let getStaticPaths = "";
     if (route.hasGetStaticPaths) {
-      getStaticPaths = ", getStaticPaths: " + moduleName + ".getStaticPaths";
+      getStaticPaths = `,
+    getStaticPaths: ${moduleName}.getStaticPaths`;
     }
-    return "  { path: '" + route.path + "', component: " + component + metadata + getStaticPaths + " }";
+    return `  {
+    path: '${route.path}',
+    component: ${component}${metadata}${getStaticPaths}
+  }`;
   }).join(",\n");
   const notFoundObjects = notFoundPages.map((nf, index) => {
     const importName = getRouteName2(nf.filePath, index, "NotFound");
     const moduleName = importName + "Module";
-    const component = nf.hasMetadata ? moduleName + ".default" : importName;
-    const metadata = nf.hasMetadata ? ", metadata: " + moduleName + ".metadata" : "";
-    return "  { pathPrefix: '" + nf.pathPrefix + "', component: " + component + metadata + " }";
+    const component = nf.hasMetadata ? `${moduleName}.default` : importName;
+    const metadata = nf.hasMetadata ? `,
+    metadata: ${moduleName}.metadata` : "";
+    return `  {
+    pathPrefix: '${nf.pathPrefix}',
+    component: ${component}${metadata}
+  }`;
   }).join(",\n");
   const layoutObjects = layouts.map((layout, index) => {
     const importName = getRouteName2(layout.filePath, index, "Layout");
     const moduleName = importName + "Module";
-    const component = layout.hasMetadata ? moduleName + ".default" : importName;
-    const metadata = layout.hasMetadata ? ", metadata: " + moduleName + ".metadata" : "";
-    return "  { path: '" + layout.path + "', layout: " + component + metadata + ", children: [] }";
+    const component = layout.hasMetadata ? `${moduleName}.default` : importName;
+    const metadata = layout.hasMetadata ? `,
+    metadata: ${moduleName}.metadata` : "";
+    return `  {
+    path: '${layout.path}',
+    layout: ${component}${metadata},
+    children: []
+  }`;
   }).join(",\n");
-  const routePaths = routes.length > 0 ? routes.map((r) => "'" + r.path + "'").join(" | ") : "never";
+  const routePaths = routes.length > 0 ? routes.map((r) => `'${r.path}'`).join(" | ") : "never";
   const allImports = [routeImports, notFoundImports, layoutImports].filter(Boolean).join("\n");
-  const usesLazy = routes.some((route) => {
-    const hasInlineMetadata = !!route.metadataSource;
-    const usesModule = route.hasMetadata && !hasInlineMetadata || route.hasRoute || route.hasGetStaticPaths;
-    return !usesModule && (route.hasDefault || route.namedExport);
-  });
-  return "// Auto-generated by olova-router - DO NOT EDIT\n// This file is auto-updated when you add/remove route folders\n\nimport { createLink, OlovaRouter, useRouter, useParams, useSearchParams, usePathname, Outlet } from 'olovastart/router';\n" + (usesLazy ? "import { lazy } from 'react';\n" : "") + allImports + "\n\nexport const routes = [\n" + (routeObjects || "") + "\n];\n\nexport const notFoundPages = [\n" + (notFoundObjects || "") + "\n];\n\nexport const layouts = [\n" + (layoutObjects || "") + "\n];\n\nexport type RoutePaths = " + routePaths + ";\n\nexport const Link = createLink<RoutePaths>();\nexport { OlovaRouter, useRouter, useParams, useSearchParams, usePathname, Outlet };\nexport type { NotFoundPageConfig, SearchParams, SetSearchParamsOptions, LayoutRoute, Metadata } from 'olovastart/router';\n";
+  return `/* prettier-ignore-start */
+
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+/**
+ * This file was automatically generated by Olova Router.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source route files
+ * and regenerate this file by running the dev server or build command.
+ *
+ * @generated
+ */
+
+import { createLink, OlovaRouter, useRouter, useParams, useSearchParams, usePathname, Outlet } from 'olovastart/router';
+${allImports}
+
+// Route Tree Definition
+export const routes = [
+${routeObjects}
+];
+
+export const notFoundPages = [
+${notFoundObjects}
+];
+
+export const layouts = [
+${layoutObjects}
+];
+
+// Type-safe route paths
+export type RoutePaths = ${routePaths};
+
+// Exports
+export const Link = createLink<RoutePaths>();
+export { OlovaRouter, useRouter, useParams, useSearchParams, usePathname, Outlet };
+export type { NotFoundPageConfig, SearchParams, SetSearchParamsOptions, LayoutRoute, Metadata } from 'olovastart/router';
+
+/* prettier-ignore-end */
+`;
 }
 function scanDirectory(dir, rootDir, extensions, routes, notFoundPages, layouts, isRoot = false) {
   if (!fs3__default.default.existsSync(dir)) return;