gemi 0.2.2 → 0.3.2

package/dist/app/App.d.ts

@@ -15,8 +15,8 @@ interface RenderParams {
     serverManifest: Record<string, any>;
 }
 interface AppParams {
-    viewRouter: new (app: App) => ViewRouter;
-    apiRouter: new (app: App) => ApiRouter;
+    viewRouter: new () => ViewRouter;
+    apiRouter: new () => ApiRouter;
     plugins?: (new () => Plugin)[];
     middlewareAliases?: Record<string, new () => Middleware>;
     root: ComponentType;
@@ -44,16 +44,16 @@ export declare class App {
         kind: string;
         data?: undefined;
         headers?: undefined;
-        status?: undefined;
     } | {
         kind: string;
-        data: any;
-        headers: any;
-        status: any;
+        data: {};
+        headers: {
+            "Set-Cookie": string;
+        };
     } | {
         kind: string;
         data: {
-            [x: string]: Record<string, any>;
+            [x: string]: any;
             pageData?: undefined;
             auth?: undefined;
             routeManifest?: undefined;
@@ -61,14 +61,14 @@ export declare class App {
             componentTree?: undefined;
         };
         meta: any[];
-        headers: Record<string, any>;
+        headers: {};
         head?: undefined;
         status?: undefined;
     } | {
         kind: string;
         data: {
             pageData: {
-                [x: string]: Record<string, any>;
+                [x: string]: any;
             };
             auth: {
                 user: any;
@@ -80,11 +80,9 @@ export declare class App {
                 currentPath: string;
                 is404: boolean;
             };
-            componentTree: (string[] | {
-                [x: string]: ComponentTree;
-            })[];
+            componentTree: ([string, [string, [string, [string, [string, [string, [string, [string, [string, [string, [string, any[]][]][]][]][]][]][]][]][]][]][]] | (string | any[])[])[];
         };
-        head: Record<string, Record<string, any>[]>;
+        head: {};
         headers: {
             "Content-Type": string;
             "Cache-Control": string;

package/dist/app/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../app/App.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAGV,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAM3C,OAAO,EAAE,aAAa,EAA2B,MAAM,OAAO,CAAC;AAE/D,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACrC;AAoCD,UAAU,SAAS;IACjB,UAAU,EAAE,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC;IACzC,SAAS,EAAE,KAAK,GAAG,EAAE,GAAG,KAAK,SAAS,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAC;IACzD,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,cAAc,CAGf;IACP,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,aAAa,CAAgC;IAC9C,IAAI,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAgB;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAM;IAC7D,UAAU,SAAK;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,IAAI,CAAgB;gBAEhB,MAAM,EAAE,SAAS;IAU7B,OAAO,CAAC,OAAO;IAqCR,SAAS;IAIT,gBAAgB;IAIvB,OAAO,CAAC,gBAAgB;YA6DV,eAAe;IAyDvB,aAAa,CAAC,GAAG,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuJ1B,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY;IAyGpD,OAAO,CAAC,sBAAsB,CAGtB;IACR,OAAO,CAAC,mBAAmB,CAEzB;IACF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,SAAS;sBAdH,eAAe,WACV,MAAM,GAAG,MAAM;mBAES,eAAe;oBAI5C,eAAe,QACb,MAAM,UACJ,MAAM;MASd;CACH"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../app/App.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAGV,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAS3C,OAAO,EAAE,aAAa,EAA2B,MAAM,OAAO,CAAC;AAE/D,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACrC;AAED,UAAU,SAAS;IACjB,UAAU,EAAE,UAAU,UAAU,CAAC;IACjC,SAAS,EAAE,UAAU,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAC;IACzD,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,cAAc,CAGf;IACP,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,aAAa,CAAgC;IAC9C,IAAI,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAgB;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAM;IAC7D,UAAU,SAAK;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,IAAI,CAAgB;gBAEhB,MAAM,EAAE,SAAS;IAU7B,OAAO,CAAC,OAAO;IAkCR,SAAS;IAIT,gBAAgB;IAIvB,OAAO,CAAC,gBAAgB;YA6DV,eAAe;IAsDvB,aAAa,CAAC,GAAG,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA2J1B,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY;IA2GpD,OAAO,CAAC,sBAAsB,CAGtB;IACR,OAAO,CAAC,mBAAmB,CAEzB;IACF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,SAAS;sBAdH,eAAe,WACV,MAAM,GAAG,MAAM;mBAES,eAAe;oBAI5C,eAAe,QACb,MAAM,UACJ,MAAM;MASd;CACH"}

package/dist/app/createComponentTree.d.ts

@@ -0,0 +1,4 @@
+import { ComponentTree } from "../client/types";
+import { ViewChildren } from "../http/ViewRouter";
+export declare function createComponentTree(routes: ViewChildren): ComponentTree;
+//# sourceMappingURL=createComponentTree.d.ts.map

package/dist/app/createComponentTree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createComponentTree.d.ts","sourceRoot":"","sources":["../../app/createComponentTree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,aAAa,CAoBvE"}

package/dist/app/createFlatViewRoutes.d.ts

@@ -0,0 +1,6 @@
+import { ViewChildren, ViewRouteExec } from "../http/ViewRouter";
+export declare function createFlatViewRoutes(routes: ViewChildren): Record<string, {
+    exec: ViewRouteExec[];
+    middleware: (string | any)[];
+}>;
+//# sourceMappingURL=createFlatViewRoutes.d.ts.map

package/dist/app/createFlatViewRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createFlatViewRoutes.d.ts","sourceRoot":"","sources":["../../app/createFlatViewRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY;UAG7C,aAAa,EAAE;gBAAc,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE;GA8CxD"}

package/dist/app/createRouteManifest.d.ts

@@ -0,0 +1,3 @@
+import { ViewChildren } from "../http/ViewRouter";
+export declare function createRouteManifest(routes: ViewChildren): Record<string, string[]>;
+//# sourceMappingURL=createRouteManifest.d.ts.map

package/dist/app/createRouteManifest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createRouteManifest.d.ts","sourceRoot":"","sources":["../../app/createRouteManifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,4BAiCvD"}

package/dist/app/index.js

@@ -1311,111 +1311,115 @@ class RequestBreakerError extends Error {
 import {AsyncLocalStorage} from "async_hooks";
 var requestContext = new AsyncLocalStorage;
 
-// app/flattenViewRoutes.ts
-function flattenViewRoutes(routes, app) {
-  const flatRoutes = {};
-  const routeManifest = {};
+// client/helpers/flattenComponentTree.ts
+function flattenComponentTree(componentTree) {
+  let out = [];
+  for (const [root, branches] of componentTree) {
+    out.push(root, ...flattenComponentTree(branches).flat());
+  }
+  return Array.from(new Set(out));
+}
+
+// app/createComponentTree.ts
+function createComponentTree(routes) {
   const componentTree = [];
-  for (const [rootPath, viewConfigOrViewRouter] of Object.entries(routes)) {
-    let children;
-    let rootHandler = async () => ({});
-    let rootMiddleware = [];
-    let layoutViewPath = null;
-    if ("prepare" in viewConfigOrViewRouter) {
-      const result2 = viewConfigOrViewRouter.prepare();
-      children = result2.children;
-      rootHandler = result2.exec;
-      flatRoutes[rootPath] = {
-        exec: [rootHandler],
-        middleware: result2.middlewares
-      };
-      if (Object.keys(children).length > 0) {
-        layoutViewPath = result2.viewPath;
+  for (const [_2, routeHandler] of Object.entries(routes)) {
+    if ("prepare" in routeHandler) {
+      const { viewPath, children } = routeHandler.prepare();
+      if (Object.entries(children).length > 0) {
+        const branch = createComponentTree(children);
+        componentTree.push([viewPath, branch]);
       } else {
-        routeManifest[rootPath] = [result2.viewPath];
-        componentTree.push([result2.viewPath]);
+        componentTree.push([viewPath, []]);
       }
     } else {
-      const router = new viewConfigOrViewRouter(app);
-      const middlewares = router.middlewares.map((alias) => {
-        if (app.middlewareAliases?.[alias]) {
-          const middleware = new app.middlewareAliases[alias];
-          return middleware.run;
-        }
-      }).filter(Boolean);
-      rootMiddleware.push(router.middleware, ...middlewares);
-      children = router.routes;
+      const router = new routeHandler;
+      const branch = createComponentTree(router.routes);
+      componentTree.push(...branch);
     }
-    const result = flattenViewRoutes(children, app);
-    if (layoutViewPath) {
-      componentTree.push({ [layoutViewPath]: result.componentTree });
-    } else {
-      componentTree.push(...result.componentTree);
-    }
-    for (const [path, handlers] of Object.entries(result.flatRoutes)) {
-      const subPath = path === "/" ? "" : path;
-      const _rootPath = rootPath === "/" ? "" : rootPath;
-      const finalPath = `${_rootPath}${subPath}` === "" ? "/" : `${_rootPath}${subPath}`;
-      flatRoutes[finalPath] = {
-        exec: [rootHandler, ...handlers.exec],
-        middleware: [...rootMiddleware, ...handlers.middleware]
-      };
-      if (layoutViewPath) {
-        routeManifest[finalPath] = [
-          layoutViewPath,
-          ...result.routeManifest[path] ?? []
-        ];
+  }
+  return componentTree;
+}
+
+// app/createFlatViewRoutes.ts
+function createFlatViewRoutes(routes) {
+  const flatRoutes = {};
+  for (const [routePath, viewConfigOrViewRouter] of Object.entries(routes)) {
+    if ("prepare" in viewConfigOrViewRouter) {
+      const route = viewConfigOrViewRouter.prepare();
+      if (Object.entries(route.children).length > 0) {
+        const result = createFlatViewRoutes(route.children);
+        if (route.kind === "view") {
+          flatRoutes[routePath] = {
+            exec: [route.exec],
+            middleware: route.middlewares
+          };
+        }
+        for (const [path, { exec, middleware }] of Object.entries(result)) {
+          const key = routePath === "/" ? path : `${routePath}${path}`;
+          const _key = path === "/" && routePath !== "/" ? routePath : key;
+          flatRoutes[_key] = {
+            exec,
+            middleware: [...route.middlewares, ...middleware]
+          };
+        }
       } else {
-        routeManifest[finalPath] = [...result.routeManifest[path] ?? []];
+        flatRoutes[routePath] = {
+          exec: [route.exec],
+          middleware: route.middlewares
+        };
+      }
+    } else {
+      const router = new viewConfigOrViewRouter;
+      const result = createFlatViewRoutes(router.routes);
+      for (const [path, { exec, middleware }] of Object.entries(result)) {
+        const key = routePath === "/" ? path : `${routePath}${path}`;
+        const _key = path === "/" && routePath !== "/" ? routePath : key;
+        flatRoutes[_key] = {
+          exec,
+          middleware: [...router.middlewares, ...middleware]
+        };
       }
     }
   }
-  return {
-    flatRoutes,
-    routeManifest,
-    componentTree
-  };
+  return flatRoutes;
 }
 
-// client/helpers/flattenComponentTree.ts
-function flattenComponentTree(componentTree) {
-  const out = [];
-  for (const section of componentTree.flat()) {
-    if (typeof section === "string") {
-      out.push(section);
+// app/createRouteManifest.ts
+function createRouteManifest(routes) {
+  const routeManifest = {};
+  for (const [routePath, routeHandler] of Object.entries(routes)) {
+    if ("prepare" in routeHandler) {
+      const { viewPath, children, kind } = routeHandler.prepare();
+      if (kind === "view") {
+        routeManifest[routePath] = [viewPath];
+      }
+      if (Object.entries(children).length > 0) {
+        const manifest = createRouteManifest(children);
+        for (const [path, viewPaths] of Object.entries(manifest)) {
+          const key = routePath === "/" ? path : `${routePath}${path}`;
+          const _key = path === "/" && routePath !== "/" ? routePath : key;
+          routeManifest[_key] = [viewPath, ...viewPaths];
+        }
+      } else {
+        routeManifest[routePath] = [viewPath];
+      }
     } else {
-      for (const [key, value] of Object.entries(section)) {
-        out.push(key);
-        out.push(...flattenComponentTree(value));
+      const router = new routeHandler;
+      const manifest = createRouteManifest(router.routes);
+      for (const [path, viewPaths] of Object.entries(manifest)) {
+        const key = routePath === "/" ? path : `${routePath}${path}`;
+        const _key = path === "/" && routePath !== "/" ? routePath : key;
+        routeManifest[_key] = viewPaths;
       }
     }
   }
-  return out;
+  return routeManifest;
 }
 
 // app/App.ts
 import {renderToReadableStream} from "react-dom/server.browser";
 import {createElement, Fragment} from "react";
-var prepareViewData = function(result) {
-  return result.reduce((acc, next) => {
-    return {
-      pageData: {
-        ...acc.pageData,
-        ...next.data
-      },
-      headers: {
-        ...acc.headers,
-        ...next.headers
-      },
-      head: {
-        ...acc.head,
-        title: next?.head?.title ?? acc.head?.title ?? "Gemi App",
-        meta: [...acc.head?.meta ?? [], ...next?.head?.meta ?? []],
-        link: [...acc.head?.link ?? [], ...next?.head?.link ?? []]
-      }
-    };
-  }, { pageData: {}, headers: {}, head: {} });
-};
 
 class App {
   flatViewRoutes = {};
@@ -1462,10 +1466,9 @@ class App {
         };
       }
     }
-    const { flatRoutes, routeManifest, componentTree } = flattenViewRoutes(viewRouters, this);
-    this.componentTree = componentTree;
-    this.routeManifest = routeManifest;
-    this.flatViewRoutes = flatRoutes;
+    this.flatViewRoutes = createFlatViewRoutes(viewRouters);
+    this.componentTree = createComponentTree(viewRouters);
+    this.routeManifest = createRouteManifest(viewRouters);
     this.flatApiRoutes = this.flattenApiRoutes(apiRouters);
   }
   printName() {
@@ -1542,7 +1545,12 @@ class App {
         middlewares = handler.middleware;
       }
     }
-    const reqWithMiddlewares = middlewares.reduce((acc, middleware) => {
+    const reqWithMiddlewares = middlewares.map((middleware) => {
+      if (typeof middleware === "string") {
+        return new this.middlewareAliases[middleware]().run;
+      }
+      return middleware;
+    }).reduce((acc, middleware) => {
       return async (req2, ctx) => {
         return {
           ...await acc(req2, ctx),
@@ -1551,21 +1559,12 @@ class App {
       };
     }, (_req, _ctx) => Promise.resolve({}));
     const reqCtx = new Map;
-    const result = await requestContext.run(reqCtx, async () => {
+    const data = await requestContext.run(reqCtx, async () => {
       await reqWithMiddlewares(req, reqCtx);
       return await Promise.all(handlers.map((fn) => fn(req, params, this)));
     });
-    let is404 = false;
-    for (const res of result) {
-      const [data] = Object.values(res.data ?? {});
-      if (data?.status === 404) {
-        is404 = true;
-        break;
-      }
-    }
     return {
-      is404,
-      result,
+      data,
       currentPathName,
       params,
       user: reqCtx.get("user") ?? null
@@ -1600,11 +1599,12 @@ class App {
                   ...err.payload.api
                 };
               }
+              throw err;
             }
             if (exec) {
-              let result = {};
+              let data = {};
               try {
-                result = await exec(req, params, this);
+                data = await exec(req, params, this);
               } catch (err) {
                 if (err instanceof RequestBreakerError) {
                   return {
@@ -1612,18 +1612,16 @@ class App {
                     ...err.payload.api
                   };
                 }
+                throw err;
               }
-              const { data, cookies = {}, headers, status } = result;
               return {
                 kind: "api",
                 data,
                 headers: {
-                  ...headers,
-                  "Set-Cookie": Object.entries(cookies).map(([name, config]) => {
+                  "Set-Cookie": Object.entries({}).map(([name, config]) => {
                     return `${name}=${config.value}; HttpOnly; SameSite=Strict; Path=/; Max-Age=${config.maxAge}`;
                   }).join(", ")
-                },
-                status
+                }
               };
             }
           });
@@ -1652,16 +1650,21 @@ class App {
           headers: {}
         };
       }
-      const { result, params, currentPathName, is404, user } = pageData;
-      const data = prepareViewData(result);
+      const { data, params, currentPathName, user } = pageData;
+      const viewData = data.reduce((acc, data2) => {
+        return {
+          ...acc,
+          ...data2
+        };
+      }, {});
       if (url.searchParams.get("json")) {
         return {
           kind: "viewData",
           data: {
-            [url.pathname]: data.pageData
+            [url.pathname]: viewData
           },
           meta: [],
-          headers: data.headers
+          headers: {}
         };
       }
       let cookieHeaders = {};
@@ -1675,7 +1678,7 @@ class App {
         kind: "view",
         data: {
           pageData: {
-            [url.pathname]: data.pageData
+            [url.pathname]: viewData
           },
           auth: { user },
           routeManifest: this.routeManifest,
@@ -1683,19 +1686,18 @@ class App {
             pathname: currentPathName,
             params,
             currentPath: url.pathname,
-            is404
+            is404: false
           },
-          componentTree: [["404"], ...this.componentTree]
+          componentTree: [["404", []], ...this.componentTree]
         },
-        head: data.head,
+        head: {},
         headers: {
-          ...data.headers,
           "Content-Type": "text/html",
           "Cache-Control": user ? "private, no-cache, no-store, max-age=0, must-revalidate" : "public, max-age=864000, must-revalidate",
           ETag: this.appId,
           ...cookieHeaders
         },
-        status: is404 ? 404 : 200
+        status: 200
       };
     }
   }
@@ -1735,7 +1737,10 @@ class App {
       let appDir = null;
       const template = (viewName, path) => `"${viewName}": () => import("${path}")`;
       const templates = [];
-      for (const fileName of flattenComponentTree(this.componentTree)) {
+      for (const fileName of [
+        "404",
+        ...flattenComponentTree(this.componentTree)
+      ]) {
         if (!manifest) {
           appDir = `${process.env.APP_DIR}`;
           const mod = await import(`${appDir}/views/${fileName}.tsx`);
@@ -1756,7 +1761,6 @@ class App {
         children: [
           styles,
           createElement(this.Root, {
-            head,
             data,
             viewImportMap
           })
@@ -1774,9 +1778,8 @@ class App {
       });
     }
     if (result.kind === "api") {
-      const { data, headers, status } = result;
+      const { data, headers } = result;
       return new Response(JSON.stringify(data), {
-        status,
         headers: {
           "Content-Type": "application/json",
           ...headers

package/dist/client/ClientRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../client/ClientRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,aAAa,EACnB,MAAM,OAAO,CAAC;AAkHf,eAAO,MAAM,YAAY,UAAW;IAClC,aAAa,CAAC,EAAE,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,UAAU,EAAE,cAAc,GAAG,CAAC,CAAC;CAChC,4CA2BA,CAAC"}
+{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../client/ClientRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,aAAa,EACnB,MAAM,OAAO,CAAC;AAkFf,eAAO,MAAM,YAAY,UAAW;IAClC,aAAa,CAAC,EAAE,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,UAAU,EAAE,cAAc,GAAG,CAAC,CAAC;CAChC,4CA2BA,CAAC"}

package/dist/client/ClientRouterContext.d.ts

@@ -22,6 +22,7 @@ interface ClientRouterProviderProps {
 export declare const ClientRouterProvider: (props: PropsWithChildren<ClientRouterProviderProps>) => import("react/jsx-runtime").JSX.Element;
 export declare function useLocation(): Location;
 export declare function useParams(): Record<string, string>;
+export declare function useViewData(): void;
 export declare function useRouter(): {
     push: (to: To, state?: any) => Promise<void>;
 };

package/dist/client/ClientRouterContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouterContext.d.ts","sourceRoot":"","sources":["../../client/ClientRouterContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,EAAE,EACP,KAAK,QAAQ,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,EAOL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,UAAU,wBAAwB;IAChC,kBAAkB,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACxD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,mBAAmB,mDAE/B,CAAC;AAEF,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,eAAO,MAAM,oBAAoB,UACxB,kBAAkB,yBAAyB,CAAC,4CA2GpD,CAAC;AAUF,wBAAgB,WAAW,aAU1B;AAED,wBAAgB,SAAS,2BAGxB;AAED,wBAAgB,SAAS;eAGJ,EAAE,UAAU,GAAG;EAsBnC;AAED,eAAO,MAAM,IAAI,UACR,KAAK,eAAe,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,EAAE,CAAA;CAAE,4CA0BxD,CAAC"}
+{"version":3,"file":"ClientRouterContext.d.ts","sourceRoot":"","sources":["../../client/ClientRouterContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,EAAE,EACP,KAAK,QAAQ,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,EAOL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,UAAU,wBAAwB;IAChC,kBAAkB,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACxD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,mBAAmB,mDAE/B,CAAC;AAEF,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,eAAO,MAAM,oBAAoB,UACxB,kBAAkB,yBAAyB,CAAC,4CA2GpD,CAAC;AAUF,wBAAgB,WAAW,aAU1B;AAED,wBAAgB,SAAS,2BAGxB;AAED,wBAAgB,WAAW,SAAK;AAEhC,wBAAgB,SAAS;eAGJ,EAAE,UAAU,GAAG;EAsBnC;AAED,eAAO,MAAM,IAAI,UACR,KAAK,eAAe,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,EAAE,CAAA;CAAE,4CA0BxD,CAAC"}

package/dist/client/helpers/flattenComponentTree.d.ts

@@ -1,3 +1,3 @@
 import type { ComponentTree } from "../types";
-export declare function flattenComponentTree(componentTree: ComponentTree): any[];
+export declare function flattenComponentTree(componentTree: ComponentTree): string[];
 //# sourceMappingURL=flattenComponentTree.d.ts.map

package/dist/client/helpers/flattenComponentTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flattenComponentTree.d.ts","sourceRoot":"","sources":["../../../client/helpers/flattenComponentTree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,aAAa,SAahE"}
+{"version":3,"file":"flattenComponentTree.d.ts","sourceRoot":"","sources":["../../../client/helpers/flattenComponentTree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAM3E"}

package/dist/client/index.js

@@ -573,7 +573,7 @@ const ClientRouterProvider = (props) => {
     params
   } = props;
   const [parameters, setParameters] = useState(params);
-  const pageDataRef = useRef(pageData);
+  const pageDataRef = useRef(structuredClone(pageData));
   const scrollHistoryRef = useRef(/* @__PURE__ */ new Map());
   const initalViewEntries = is404 ? ["404"] : routeManifest[pathname] ?? ["404"];
   const viewEntriesSubject = useRef(new Subject(initalViewEntries));
@@ -29364,18 +29364,11 @@ if (process.env.NODE_ENV === "production") {
 }
 var clientExports = client.exports;
 function flattenComponentTree(componentTree) {
-  const out = [];
-  for (const section of componentTree.flat()) {
-    if (typeof section === "string") {
-      out.push(section);
-    } else {
-      for (const [key, value] of Object.entries(section)) {
-        out.push(key);
-        out.push(...flattenComponentTree(value));
-      }
-    }
+  let out = [];
+  for (const [root, branches] of componentTree) {
+    out.push(root, ...flattenComponentTree(branches).flat());
   }
-  return out;
+  return Array.from(new Set(out));
 }
 let viewImportMap = null;
 if (typeof window !== "undefined") {
@@ -29413,26 +29406,12 @@ const Route = (props) => {
 };
 const Routes = (props) => {
   const { componentTree } = props;
-  return /* @__PURE__ */ jsx(Suspense, { children: componentTree.map((node, i) => {
-    if (typeof node === "undefined") {
-      return null;
-    }
-    if (typeof node === "string") {
-      return /* @__PURE__ */ jsx(Route, { componentPath: node }, node);
-    }
-    if (Array.isArray(node)) {
-      const [path, subtree2] = node;
-      if (subtree2) {
-        return /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsx(Route, { componentPath: path, children: /* @__PURE__ */ jsx(Routes, { componentTree: subtree2 }) }, i) }, path);
-      } else {
-        return /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsx(Route, { componentPath: path }, i) }, path);
-      }
-    }
-    const [[first, subtree]] = Object.entries(node);
-    if (subtree) {
-      return /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsx(Route, { componentPath: String(first), children: /* @__PURE__ */ jsx(Routes, { componentTree: subtree }) }, i) }, first);
+  return /* @__PURE__ */ jsx(Suspense, { children: componentTree.map((node) => {
+    const [path, subtree] = node;
+    if (subtree.length > 0) {
+      return /* @__PURE__ */ jsx(Route, { componentPath: path, children: /* @__PURE__ */ jsx(Routes, { componentTree: subtree }) }, path);
     }
-    return /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsx(Route, { componentPath: String(first) }, i) }, first);
+    return /* @__PURE__ */ jsx(Route, { componentPath: path }, path);
   }) });
 };
 const ClientRouter = (props) => {

package/dist/client/types.d.ts

@@ -1,4 +1,4 @@
-type ComponentTreeBranch = Record<string, ComponentTree>;
-export type ComponentTree = (string[] | ComponentTreeBranch)[];
+type ComponentBranch = [string, ComponentBranch[]];
+export type ComponentTree = ComponentBranch[];
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/client/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../client/types.ts"],"names":[],"mappings":"AAAA,KAAK,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AACzD,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,GAAG,mBAAmB,CAAC,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../client/types.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;AACnD,MAAM,MAAM,aAAa,GAAG,eAAe,EAAE,CAAC"}

package/dist/http/ApiRouter.d.ts

@@ -1,53 +1,41 @@
-import type { Controller } from "./Controller";
+import { Controller } from "./Controller";
 import { type MiddlewareReturnType } from "./Router";
 import type { App } from "../app/App";
+import { HttpRequest } from "./HttpRequest";
 type ControllerMethods<T extends new (app: App) => Controller> = {
     [K in keyof InstanceType<T>]: InstanceType<T>[K] extends Function ? K : never;
 }[keyof InstanceType<T>];
-type DataResponse = {
-    data: any;
-    status: number;
-    headers: Record<string, string>;
-    cookies: Record<string, string>;
-};
+type DataResponse = any;
 type ErrorResponse = {
     error: any;
-    status: number;
-    headers: Record<string, string>;
-    cookies: Record<string, string>;
+};
+type ApiHandler<T extends new (app: App) => Controller, U = {}> = {
+    method: string;
+    exec: (req: Request, params: Record<string, any>, app: App) => Promise<Partial<DataResponse> | ErrorResponse>;
 };
 export type ApiRouteExec = (req: Request, params: Record<string, string>) => Promise<DataResponse | ErrorResponse>;
 type ApiRouteConfig = {
     method: string;
     exec: ApiRouteExec;
 };
+type CallbackHandler<T> = (req: HttpRequest) => Promise<T> | T;
 export type ApiRouteChildren = Record<string, ApiRouteConfig | ApiRouteConfig[] | (new (app: App) => ApiRouter)>;
 export declare class ApiRouter {
     routes: Record<string, any>;
     middlewares: string[];
     constructor();
-    middleware(req: Request): MiddlewareReturnType;
+    middleware(_req: Request): MiddlewareReturnType;
     private handleRequest;
-    protected get<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): {
-        method: string;
-        exec: (req: Request, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
-    };
-    protected post<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): {
-        method: string;
-        exec: (req: Request, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
-    };
-    protected patch<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): {
-        method: string;
-        exec: (req: Request, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
-    };
-    protected put<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): {
-        method: string;
-        exec: (req: Request, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
-    };
-    protected delete<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): {
-        method: string;
-        exec: (req: Request, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
-    };
+    protected get<T>(controller: CallbackHandler<T>): ApiHandler<any>;
+    protected get<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): ApiHandler<T>;
+    protected post<T>(controller: CallbackHandler<T>): ApiHandler<any>;
+    protected post<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): ApiHandler<T>;
+    protected put<T>(controller: CallbackHandler<T>): ApiHandler<any>;
+    protected put<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): ApiHandler<T>;
+    protected delete<T>(controller: CallbackHandler<T>): ApiHandler<any>;
+    protected delete<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): ApiHandler<T>;
+    protected patch<T>(controller: CallbackHandler<T>): ApiHandler<any>;
+    protected patch<T extends new (app: App) => Controller>(controller: T, methodName: ControllerMethods<T>): ApiHandler<T>;
 }
 export {};
 //# sourceMappingURL=ApiRouter.d.ts.map

package/dist/http/ApiRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApiRouter.d.ts","sourceRoot":"","sources":["../../http/ApiRouter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,KAAK,iBAAiB,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,IAAI;KAC9D,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,KAAK;CAC9E,CAAC,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzB,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAYF,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC3B,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC,CAAC;AAE3C,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CACnC,MAAM,EACN,cAAc,GAAG,cAAc,EAAE,GAAG,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,SAAS,CAAC,CAClE,CAAC;AAEF,qBAAa,SAAS;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACjC,WAAW,EAAE,MAAM,EAAE,CAAM;;IAI3B,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,oBAAoB;IAErD,OAAO,CAAC,aAAa;IAkCrB,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EAClD,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;IAMlC,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACnD,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;IAMlC,SAAS,CAAC,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACpD,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;IAMlC,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EAClD,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;IAMlC,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACrD,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;CAKnC"}
+{"version":3,"file":"ApiRouter.d.ts","sourceRoot":"","sources":["../../http/ApiRouter.ts"],"names":[],"mappings":"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"}

package/dist/http/Controller.d.ts

@@ -1,8 +1,9 @@
 import { App } from "../app/App";
 import type { HttpRequest } from "./HttpRequest";
 export declare class Controller {
-    app: App;
+    private app;
     requests: Record<string, typeof HttpRequest<any>>;
+    static kind: "controller";
     constructor(app: App);
 }
 //# sourceMappingURL=Controller.d.ts.map

package/dist/http/Controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Controller.d.ts","sourceRoot":"","sources":["../../http/Controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,qBAAa,UAAU;IAGF,GAAG,EAAE,GAAG;IAF3B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAM;gBAEpC,GAAG,EAAE,GAAG;CAC5B"}
+{"version":3,"file":"Controller.d.ts","sourceRoot":"","sources":["../../http/Controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,qBAAa,UAAU;IAKT,OAAO,CAAC,GAAG;IAJvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAM;IAEvD,MAAM,CAAC,IAAI,eAAyB;gBAEhB,GAAG,EAAE,GAAG;CAC7B"}

package/dist/http/ViewRouter.d.ts

@@ -4,30 +4,30 @@ import type { App } from "../app/App";
 type ControllerMethods<T extends new () => Controller> = {
     [K in keyof InstanceType<T>]: InstanceType<T>[K] extends Function ? K : never;
 }[keyof InstanceType<T>];
-type ViewHandler<T extends new () => Controller> = [
-    controller: T,
-    method: ControllerMethods<T>
-];
+type ViewHandler<T extends new () => Controller> = [controller: T, method: ControllerMethods<T>] | ((req: Request) => Promise<any> | any);
 type ViewPrepare = {
     exec: (req: Request, params: Record<string, string>) => any;
     viewPath: string;
     children: ViewChildren;
     middlewares: any[];
+    kind: "view" | "layout";
 };
 type ViewConfig = {
     prepare: (_middlewares?: any[]) => ViewPrepare;
-    middlewares: (middlewares: any[]) => {
-        prepare: () => ViewPrepare;
-    };
+    middleware: (middlewares: any[]) => ViewConfig;
 };
-export type ViewChildren = Record<string, ViewConfig | (new (app: App) => ViewRouter)>;
+export type ViewChildren = Record<string, ViewConfig | (new () => ViewRouter)>;
 export type ViewRouteExec = (req: Request, params: Record<string, string>, app: App) => any;
 export declare class ViewRouter {
     routes: ViewChildren;
     middlewares: string[];
-    constructor();
     middleware(req: Request): MiddlewareReturnType;
-    protected view<T extends new (app: App) => Controller>(viewPath: string, handler?: ViewHandler<T>, children?: ViewChildren): ViewConfig;
+    protected layout<T extends new (app: App) => Controller>(viewPath: string): ViewConfig;
+    protected layout<T extends new (app: App) => Controller>(viewPath: string, children?: ViewChildren): ViewConfig;
+    protected layout<T extends new (app: App) => Controller>(viewPath: string, handler: ViewHandler<T>): ViewConfig;
+    protected view<T extends new (app: App) => Controller>(viewPath: string): ViewConfig;
+    protected view<T extends new (app: App) => Controller>(viewPath: string, children?: ViewChildren): ViewConfig;
+    protected view<T extends new (app: App) => Controller>(viewPath: string, handler: ViewHandler<T>): ViewConfig;
 }
 export {};
 //# sourceMappingURL=ViewRouter.d.ts.map

package/dist/http/ViewRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ViewRouter.d.ts","sourceRoot":"","sources":["../../http/ViewRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,KAAK,iBAAiB,CAAC,CAAC,SAAS,UAAU,UAAU,IAAI;KACtD,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,KAAK;CAC9E,CAAC,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzB,KAAK,WAAW,CAAC,CAAC,SAAS,UAAU,UAAU,IAAI;IACjD,UAAU,EAAE,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;CAC7B,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,GAAG,EAAE,CAAC;CACpB,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,WAAW,CAAC;IAC/C,WAAW,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK;QACnC,OAAO,EAAE,MAAM,WAAW,CAAC;KAC5B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,MAAM,CAC/B,MAAM,EACN,UAAU,GAAG,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC,CAC5C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,GAAG,EAAE,GAAG,KACL,GAAG,CAAC;AAET,qBAAa,UAAU;IACd,MAAM,EAAE,YAAY,CAAM;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAM;;IAG3B,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,oBAAoB;IAErD,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACnD,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EACxB,QAAQ,GAAE,YAAiB,GAC1B,UAAU;CA8Bd"}
+{"version":3,"file":"ViewRouter.d.ts","sourceRoot":"","sources":["../../http/ViewRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,KAAK,iBAAiB,CAAC,CAAC,SAAS,UAAU,UAAU,IAAI;KACtD,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,KAAK;CAC9E,CAAC,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzB,KAAK,WAAW,CAAC,CAAC,SAAS,UAAU,UAAU,IAC3C,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAC7C,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;AAE3C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC;CACzB,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,WAAW,CAAC;IAC/C,UAAU,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,UAAU,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,UAAU,UAAU,CAAC,CAAC,CAAC;AAE/E,MAAM,MAAM,aAAa,GAAG,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,GAAG,EAAE,GAAG,KACL,GAAG,CAAC;AAET,qBAAa,UAAU;IACd,MAAM,EAAE,YAAY,CAAM;IAC1B,WAAW,EAAE,MAAM,EAAE,CAAM;IAE3B,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,oBAAoB;IAErD,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACrD,QAAQ,EAAE,MAAM,GACf,UAAU;IACb,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,YAAiB,GAC1B,UAAU;IACb,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACrD,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GACtB,UAAU;IAmDb,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACnD,QAAQ,EAAE,MAAM,GACf,UAAU;IACb,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACnD,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,YAAiB,GAC1B,UAAU;IACb,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,EACnD,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GACtB,UAAU;CAkDd"}

package/dist/http/index.js

@@ -22,6 +22,7 @@ var __require = createRequire(import.meta.url);
 class Controller {
   app;
   requests = {};
+  static kind = "controller";
   constructor(app) {
     this.app = app;
   }
@@ -225,34 +226,33 @@ class HttpRequest {
 }
 
 // http/ApiRouter.ts
+var isController = function(controller) {
+  return "kind" in controller && controller.kind === "controller";
+};
+
 class ApiRouter {
   routes = {};
   middlewares = [];
   constructor() {
   }
-  middleware(req) {
+  middleware(_req) {
   }
   handleRequest(controller, methodName) {
     return (method) => {
       return {
         method,
         exec: async (req, params, app) => {
-          const controllerInstance = new controller(app);
-          const handler = controllerInstance[methodName].bind(controllerInstance);
-          const Req = controllerInstance.requests[methodName] ?? HttpRequest;
-          const httpRequest = new Req(req);
-          const {
-            data,
-            status = method === "post" ? 201 : 200,
-            headers = {},
-            cookies = {}
-          } = await handler(httpRequest, params);
-          return {
-            data,
-            status,
-            headers,
-            cookies
-          };
+          let handler = (_req, params2) => Promise.resolve({});
+          let httpRequest = new HttpRequest(req);
+          if (isController(controller)) {
+            const controllerInstance = new controller(app);
+            const Req = controllerInstance.requests[methodName] ?? HttpRequest;
+            httpRequest = new Req(req);
+            handler = controllerInstance[methodName].bind(controllerInstance);
+          } else if (typeof controller === "function") {
+            handler = (req2) => controller(new HttpRequest(req2));
+          }
+          return await handler(httpRequest, params);
         }
       };
     };
@@ -265,10 +265,6 @@ class ApiRouter {
     const handler = this.handleRequest(controller, methodName);
     return handler("post");
   }
-  patch(controller, methodName) {
-    const handler = this.handleRequest(controller, methodName);
-    return handler("patch");
-  }
   put(controller, methodName) {
     const handler = this.handleRequest(controller, methodName);
     return handler("put");
@@ -277,39 +273,89 @@ class ApiRouter {
     const handler = this.handleRequest(controller, methodName);
     return handler("delete");
   }
+  patch(controller, methodName) {
+    const handler = this.handleRequest(controller, methodName);
+    return handler("patch");
+  }
 }
 // http/ViewRouter.ts
 class ViewRouter {
   routes = {};
   middlewares = [];
-  constructor() {
-  }
   middleware(req) {
   }
-  view(viewPath, handler, children = {}) {
+  layout(viewPath, handler, children = {}) {
     function prepare(middlewares = []) {
+      let _children = children;
+      if (handler && handler.constructor === Object) {
+        _children = handler;
+      }
       return {
         exec: async (req, params, app) => {
-          if (!handler) {
-            return { data: { [viewPath]: {} }, headers: {}, head: {} };
+          let _handler = () => Promise.resolve({
+            data: { [viewPath]: {} },
+            headers: {},
+            head: {}
+          });
+          if (typeof handler === "function") {
+            _handler = handler;
           }
-          const [controller, methodName] = handler;
-          const instance = new controller(app);
-          const method = instance[methodName].bind(instance);
-          const { data, headers = {}, head = {} } = await method(req, params);
-          return { data: { [viewPath]: data }, headers, head };
+          if (Array.isArray(handler)) {
+            const [controller, methodName] = handler;
+            const instance = new controller(app);
+            _handler = instance[methodName].bind(instance);
+          }
+          const data = await _handler(req, params);
+          return { [viewPath]: data };
         },
-        children,
+        children: _children,
         viewPath,
-        middlewares
+        middlewares,
+        kind: "layout"
       };
     }
     return {
       prepare,
-      middlewares: (middlewares) => {
-        prepare:
-          ;
+      middleware: (middlewares) => ({
+        prepare: () => prepare(middlewares)
+      })
+    };
+  }
+  view(viewPath, handler, children = {}) {
+    function prepare(middlewares = []) {
+      let _children = children;
+      if (handler && handler.constructor === Object) {
+        _children = handler;
       }
+      return {
+        exec: async (req, params, app) => {
+          let _handler = () => Promise.resolve({
+            data: { [viewPath]: {} },
+            headers: {},
+            head: {}
+          });
+          if (typeof handler === "function") {
+            _handler = handler;
+          }
+          if (Array.isArray(handler)) {
+            const [controller, methodName] = handler;
+            const instance = new controller(app);
+            _handler = instance[methodName].bind(instance);
+          }
+          const data = await _handler(req, params);
+          return { [viewPath]: data };
+        },
+        children: _children,
+        viewPath,
+        middlewares,
+        kind: "view"
+      };
+    }
+    return {
+      prepare,
+      middleware: (middlewares) => ({
+        prepare: () => prepare(middlewares)
+      })
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemi",
-  "version": "0.2.2",
+  "version": "0.3.2",
   "devDependencies": {
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
@@ -10,7 +10,8 @@
     "@types/react": "^18.2.61",
     "@types/react-dom": "^18.2.19",
     "eslint": "^8.57.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^1.6.0"
   },
   "bin": {
     "gemi": "./dist/bin/gemi"
@@ -36,7 +37,8 @@
     "build:bin": "bun build --compile ./bin/gemi.ts --external vite --external react-dom --external react/jsx-runtime --outfile ./dist/bin/gemi",
     "build:client": "vite build",
     "build:types": "tsc",
-    "build:client-types": "tsc -p tsconfig.browser.json"
+    "build:client-types": "tsc -p tsconfig.browser.json",
+    "test": "vitest"
   },
   "dependencies": {
     "@react-email/components": "^0.0.19",