olova 2.0.18 → 2.0.19

package/dist/Link.js

@@ -1,8 +1,7 @@
 import {
   Link,
   Link_default
-} from "./chunk-WNRULQF5.js";
-import "./chunk-TFRUFD5A.js";
+} from "./chunk-CYX762OE.js";
 export {
   Link,
   Link_default as default

package/dist/Router.js

@@ -2,9 +2,8 @@ import {
   Router,
   loadRoute,
   matchRoute
-} from "./chunk-4CH3KNWP.js";
-import "./chunk-7BXNTMPM.js";
-import "./chunk-TFRUFD5A.js";
+} from "./chunk-Y3CEUWVD.js";
+import "./chunk-LOK5UEME.js";
 export {
   Router,
   loadRoute,

package/dist/chunk-CYX762OE.js

@@ -0,0 +1,21 @@
+// Link.tsx
+import { jsx } from "react/jsx-runtime";
+function Link({ href, children, ...props }) {
+  const handleClick = (e) => {
+    if (e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
+    if (href.startsWith("http") || href.startsWith("//")) return;
+    e.preventDefault();
+    const currentUrl = window.location.pathname + window.location.search;
+    const targetUrl = href.startsWith("/") ? href : "/" + href;
+    if (currentUrl === targetUrl) return;
+    window.history.pushState({}, "", href);
+    window.dispatchEvent(new Event("pushstate"));
+  };
+  return /* @__PURE__ */ jsx("a", { href, onClick: handleClick, ...props, children });
+}
+var Link_default = Link;
+
+export {
+  Link,
+  Link_default
+};

package/dist/chunk-K6EDUQDD.js

@@ -0,0 +1,19 @@
+import {
+  RouterContext
+} from "./chunk-LOK5UEME.js";
+
+// useParams.ts
+import { useContext } from "react";
+function useParams() {
+  return useContext(RouterContext).params;
+}
+function usePath() {
+  return useContext(RouterContext).path;
+}
+var useParams_default = useParams;
+
+export {
+  useParams,
+  usePath,
+  useParams_default
+};

package/dist/chunk-LOK5UEME.js

@@ -0,0 +1,7 @@
+// context.ts
+import { createContext } from "react";
+var RouterContext = createContext({ params: {}, path: "/" });
+
+export {
+  RouterContext
+};

package/dist/{chunk-K2URQPLW.js → chunk-NEMX72XA.js}

@@ -1,16 +1,11 @@
-import {
-  __toESM,
-  require_react
-} from "./chunk-TFRUFD5A.js";
-
 // useSearchParams.ts
-var import_react = __toESM(require_react(), 1);
+import { useState, useEffect } from "react";
 function useSearchParams() {
-  const [searchParams, setSearchParams] = (0, import_react.useState)(() => {
+  const [searchParams, setSearchParams] = useState(() => {
     if (typeof window === "undefined") return new URLSearchParams();
     return new URLSearchParams(window.location.search);
   });
-  (0, import_react.useEffect)(() => {
+  useEffect(() => {
     if (typeof window === "undefined") return;
     const handleNavigation = () => {
       setSearchParams(new URLSearchParams(window.location.search));

package/dist/{chunk-RCRG2FBU.js → chunk-XGX5YRJV.js}

@@ -1,16 +1,11 @@
-import {
-  __toESM,
-  require_react
-} from "./chunk-TFRUFD5A.js";
-
 // usePathname.ts
-var import_react = __toESM(require_react(), 1);
+import { useState, useEffect } from "react";
 function usePathname() {
-  const [pathname, setPathname] = (0, import_react.useState)(() => {
+  const [pathname, setPathname] = useState(() => {
     if (typeof window === "undefined") return "/";
     return window.location.pathname;
   });
-  (0, import_react.useEffect)(() => {
+  useEffect(() => {
     if (typeof window === "undefined") return;
     const handleNavigation = () => {
       setPathname(window.location.pathname);

package/dist/{chunk-4CH3KNWP.js → chunk-Y3CEUWVD.js}

@@ -1,26 +1,22 @@
 import {
   RouterContext
-} from "./chunk-7BXNTMPM.js";
-import {
-  __toESM,
-  require_react
-} from "./chunk-TFRUFD5A.js";
+} from "./chunk-LOK5UEME.js";
 
 // Router.tsx
-var import_react = __toESM(require_react(), 1);
-import { routes } from "olova/routes";
+import React, { useState, useEffect } from "react";
+import { routes } from "virtual:olova-routes";
 function parseMarkdown(md) {
   return md.replace(/^### (.*$)/gim, "<h3>$1</h3>").replace(/^## (.*$)/gim, "<h2>$1</h2>").replace(/^# (.*$)/gim, "<h1>$1</h1>").replace(/\*\*\*(.*?)\*\*\*/g, "<strong><em>$1</em></strong>").replace(/\*\*(.*?)\*\*/g, "<strong>$1</strong>").replace(/\*(.*?)\*/g, "<em>$1</em>").replace(/```([\s\S]*?)```/g, "<pre><code>$1</code></pre>").replace(/`(.*?)`/g, "<code>$1</code>").replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2">$1</a>').replace(/\n\n/g, "</p><p>").replace(/\n/g, "<br>").replace(/^(.*)$/, "<p>$1</p>");
 }
 function HtmlContent({ html }) {
-  return import_react.default.createElement("div", {
+  return React.createElement("div", {
     dangerouslySetInnerHTML: { __html: html },
     className: "olova-html-content"
   });
 }
 function MarkdownContent({ markdown }) {
   const html = parseMarkdown(markdown);
-  return import_react.default.createElement("article", {
+  return React.createElement("article", {
     dangerouslySetInnerHTML: { __html: html },
     className: "olova-markdown-content"
   });
@@ -84,11 +80,11 @@ async function loadRoute(path) {
   return null;
 }
 function Router({ url, initialComponent, initialParams, onRouteChange }) {
-  const [path, setPath] = (0, import_react.useState)(() => normalizePath(url || (typeof window !== "undefined" ? window.location.pathname : "/")));
-  const [Component, setComponent] = (0, import_react.useState)(() => initialComponent || null);
-  const [params, setParams] = (0, import_react.useState)(() => initialParams || {});
-  const hasHydrated = import_react.default.useRef(false);
-  (0, import_react.useEffect)(() => {
+  const [path, setPath] = useState(() => normalizePath(url || (typeof window !== "undefined" ? window.location.pathname : "/")));
+  const [Component, setComponent] = useState(() => initialComponent || null);
+  const [params, setParams] = useState(() => initialParams || {});
+  const hasHydrated = React.useRef(false);
+  useEffect(() => {
     if (typeof window === "undefined") return;
     const handleNavigation = () => {
       const newPath = normalizePath(window.location.pathname);
@@ -102,7 +98,7 @@ function Router({ url, initialComponent, initialParams, onRouteChange }) {
       window.removeEventListener("pushstate", handleNavigation);
     };
   }, []);
-  (0, import_react.useEffect)(() => {
+  useEffect(() => {
     if (!hasHydrated.current && initialComponent && path === normalizePath(url || "")) {
       console.log(`[Router] Hydration skipped for: ${path}`);
       hasHydrated.current = true;
@@ -128,7 +124,7 @@ function Router({ url, initialComponent, initialParams, onRouteChange }) {
               onRouteChange(fallbackResult.metadata);
             }
           } else {
-            setComponent(() => () => import_react.default.createElement("div", null, "404 Not Found"));
+            setComponent(() => () => React.createElement("div", null, "404 Not Found"));
             setParams({});
             if (onRouteChange) {
               onRouteChange(void 0);
@@ -142,11 +138,11 @@ function Router({ url, initialComponent, initialParams, onRouteChange }) {
       isCancelled = true;
     };
   }, [path, onRouteChange]);
-  if (!Component) return import_react.default.createElement("div", null, "Loading...");
-  return import_react.default.createElement(
+  if (!Component) return React.createElement("div", null, "Loading...");
+  return React.createElement(
     RouterContext.Provider,
     { value: { params, path } },
-    import_react.default.createElement(Component, params)
+    React.createElement(Component, params)
   );
 }
 

package/dist/client.d.ts

@@ -0,0 +1,5 @@
+import React__default from 'react';
+
+declare function hydrate(RootLayout?: React__default.ComponentType<any>): Promise<void>;
+
+export { hydrate };

package/dist/client.js

@@ -0,0 +1,72 @@
+import {
+  Router,
+  loadRoute
+} from "./chunk-Y3CEUWVD.js";
+import "./chunk-LOK5UEME.js";
+
+// client.tsx
+import React from "react";
+import { hydrateRoot, createRoot } from "react-dom/client";
+async function hydrate(RootLayout) {
+  const hydrationData = window.__OLOVA_DATA__;
+  const url = window.location.pathname;
+  let Component;
+  let params = {};
+  if (hydrationData) {
+    const result = await loadRoute(url);
+    if (result) {
+      Component = result.module.default;
+      params = hydrationData.params;
+    }
+  }
+  if (!Component) {
+    const result = await loadRoute(url);
+    if (result) {
+      Component = result.module.default;
+      params = result.params;
+    } else {
+      const fallback = await loadRoute("/404");
+      if (fallback) {
+        Component = fallback.module.default;
+        params = fallback.params;
+      } else {
+        Component = () => React.createElement("div", null, "404 Not Found");
+      }
+    }
+  }
+  if (RootLayout) {
+    const App = React.createElement(
+      RootLayout,
+      null,
+      React.createElement(Router, {
+        url,
+        initialComponent: Component,
+        initialParams: params
+      })
+    );
+    if (hydrationData) {
+      hydrateRoot(document, App);
+    } else {
+      createRoot(document).render(App);
+    }
+  } else {
+    const root = document.getElementById("root");
+    if (root) {
+      const App = React.createElement(Router, {
+        url,
+        initialComponent: Component,
+        initialParams: params
+      });
+      if (hydrationData) {
+        hydrateRoot(root, App);
+      } else {
+        createRoot(root).render(App);
+      }
+    }
+  }
+}
+if (typeof window !== "undefined" && !window.__OLOVA_HYDRATE_MANUAL__) {
+}
+export {
+  hydrate
+};

package/dist/index.js

@@ -1,25 +1,24 @@
 import {
   Link
-} from "./chunk-WNRULQF5.js";
+} from "./chunk-CYX762OE.js";
 import {
   Router,
   loadRoute,
   matchRoute
-} from "./chunk-4CH3KNWP.js";
+} from "./chunk-Y3CEUWVD.js";
 import {
   useParams,
   usePath
-} from "./chunk-YVUSXRPM.js";
+} from "./chunk-K6EDUQDD.js";
 import {
   RouterContext
-} from "./chunk-7BXNTMPM.js";
+} from "./chunk-LOK5UEME.js";
 import {
   usePathname
-} from "./chunk-RCRG2FBU.js";
+} from "./chunk-XGX5YRJV.js";
 import {
   useSearchParams
-} from "./chunk-K2URQPLW.js";
-import "./chunk-TFRUFD5A.js";
+} from "./chunk-NEMX72XA.js";
 export {
   Link,
   Router,

package/dist/server.d.ts

@@ -0,0 +1,13 @@
+import React__default from 'react';
+import { Metadata } from './Router.js';
+
+declare function render(url: string, RootLayout?: React__default.ComponentType<any>): Promise<{
+    html: string;
+    hydrationData: {
+        params: {};
+        metadata: Metadata;
+    };
+}>;
+declare function renderShellWithMetadata(metadata: Metadata): string;
+
+export { render, renderShellWithMetadata };

package/dist/server.js

@@ -0,0 +1,87 @@
+import {
+  Router,
+  loadRoute
+} from "./chunk-Y3CEUWVD.js";
+import "./chunk-LOK5UEME.js";
+
+// server.tsx
+import React from "react";
+import { renderToString } from "react-dom/server";
+function renderShell(content, metadata) {
+  const title = metadata.title || "My Framework";
+  const description = metadata.description || "";
+  const head = `
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>${title}</title>
+    <meta name="description" content="${description}" />
+    ${metadata.keywords ? `<meta name="keywords" content="${Array.isArray(metadata.keywords) ? metadata.keywords.join(",") : metadata.keywords}" />` : ""}
+    ${metadata.robots ? `<meta name="robots" content="${metadata.robots}" />` : ""}
+    ${metadata.canonical ? `<link rel="canonical" href="${metadata.canonical}" />` : ""}
+    `;
+  return `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    ${head}
+  </head>
+  <body>
+    <div id="root">${content}</div>
+  </body>
+</html>`;
+}
+async function render(url, RootLayout) {
+  const result = await loadRoute(url);
+  let Component = void 0;
+  let params = {};
+  let metadata = {};
+  if (result) {
+    Component = result.module.default;
+    params = result.params;
+    metadata = result.metadata || {};
+  } else {
+    const fallback = await loadRoute("/404");
+    if (fallback) {
+      Component = fallback.module.default;
+      params = fallback.params;
+      metadata = fallback.metadata || {};
+    } else {
+      Component = () => React.createElement("div", null, "404 Not Found");
+    }
+  }
+  let appHtml;
+  if (RootLayout) {
+    const App = React.createElement(
+      RootLayout,
+      null,
+      React.createElement(Router, {
+        url,
+        initialComponent: Component,
+        initialParams: params
+      })
+    );
+    appHtml = "<!DOCTYPE html>" + renderToString(App);
+  } else {
+    const content = renderToString(
+      React.createElement(Router, {
+        url,
+        initialComponent: Component,
+        initialParams: params
+      })
+    );
+    appHtml = renderShell(content, metadata);
+  }
+  return {
+    html: appHtml,
+    hydrationData: {
+      params,
+      metadata
+    }
+  };
+}
+function renderShellWithMetadata(metadata) {
+  return renderShell("", metadata);
+}
+export {
+  render,
+  renderShellWithMetadata
+};

package/dist/useParams.js

@@ -2,9 +2,8 @@ import {
   useParams,
   useParams_default,
   usePath
-} from "./chunk-YVUSXRPM.js";
-import "./chunk-7BXNTMPM.js";
-import "./chunk-TFRUFD5A.js";
+} from "./chunk-K6EDUQDD.js";
+import "./chunk-LOK5UEME.js";
 export {
   useParams_default as default,
   useParams,

package/dist/usePathname.js

@@ -1,8 +1,7 @@
 import {
   usePathname,
   usePathname_default
-} from "./chunk-RCRG2FBU.js";
-import "./chunk-TFRUFD5A.js";
+} from "./chunk-XGX5YRJV.js";
 export {
   usePathname_default as default,
   usePathname

package/dist/useSearchParams.js

@@ -1,8 +1,7 @@
 import {
   useSearchParams,
   useSearchParams_default
-} from "./chunk-K2URQPLW.js";
-import "./chunk-TFRUFD5A.js";
+} from "./chunk-NEMX72XA.js";
 export {
   useSearchParams_default as default,
   useSearchParams

package/package.json

@@ -1,7 +1,7 @@
 
 {
   "name": "olova",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "description": "Olova framework core",
   "type": "module",
   "files": [
@@ -31,12 +31,24 @@
     "./Router": {
        "import": "./dist/Router.js",
        "types": "./dist/Router.d.ts"
+    },
+    "./client": {
+      "import": "./dist/client.js",
+      "types": "./dist/client.d.ts"
+    },
+    "./server": {
+      "import": "./dist/server.js",
+      "types": "./dist/server.d.ts"
     }
   },
   "scripts": {
-    "build": "tsup index.ts Link.tsx useSearchParams.ts usePathname.ts useParams.ts Router.tsx --format esm --dts --clean --external olova/routes react react-dom",
+    "build": "tsup index.ts Link.tsx useSearchParams.ts usePathname.ts useParams.ts Router.tsx server.tsx client.tsx --format esm --dts --clean --external virtual:olova-routes react react-dom react-dom/client react-dom/server",
     "prepublishOnly": "npm run build"
   },
+  "peerDependencies": {
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0"
+  },
   "devDependencies": {
     "tsup": "^8.0.0",
     "typescript": "^5.0.0",

package/dist/chunk-7BXNTMPM.js

@@ -1,12 +0,0 @@
-import {
-  __toESM,
-  require_react
-} from "./chunk-TFRUFD5A.js";
-
-// context.ts
-var import_react = __toESM(require_react(), 1);
-var RouterContext = (0, import_react.createContext)({ params: {}, path: "/" });
-
-export {
-  RouterContext
-};