honox 0.1.2 → 0.1.4

package/README.md

@@ -466,6 +466,25 @@ export const POST = createRoute(zValidator('form', schema), async (c) => {
 })
 ```
 
+Alternatively, you can use a `_middleware.(ts|tsx)` file in a directory to have that middleware applied to the current route, as well as all child routes. Middleware is ran in the order that it is listed within the array.
+
+An equivilant example to the previous Hono-style middleware configuration is as follows:
+
+```tsx
+// /app/_middleware.ts
+import { createRoute } from 'honox/factory'
+import { z } from 'zod'
+import { zValidator } from '@hono/zod-validator'
+
+const schema = z.object({
+  name: z.string().max(10),
+})
+
+export default createRoute(zValidator('form', schema), ...<more-middleware>)
+```
+
+Note that is some scenarios, auto-complete for the request body within the route may be lost depending on how the middleware was written.
+
 ### Using Tailwind CSS
 
 Given that HonoX is Vite-centric, if you wish to utilize [Tailwind CSS](https://tailwindcss.com/), simply adhere to the official instructions.
@@ -648,11 +667,44 @@ const entry = './app/server.ts'
 
 export default defineConfig(() => {
   return {
-    plugins: [honox(), devServer({ entry }), ssg({ entry })],
+    plugins: [honox(), ssg({ entry })],
   }
 })
 ```
 
+If you want to include client side scripts and assets:
+
+```ts
+// vite.config.ts
+import ssg from '@hono/vite-ssg'
+import honox from 'honox/vite'
+import client from 'honox/vite/client'
+import { defineConfig } from 'vite'
+
+const entry = './app/server.ts'
+
+export default defineConfig(({ mode }) => {
+  if (mode === 'client') {
+    return {
+      plugins: [client()],
+    }
+  } else {
+    return {
+      build: {
+        emptyOutDir: false,
+      },
+      plugins: [honox(), ssg({ entry })],
+    }
+  }
+})
+```
+
+Build command (including a client):
+
+```txt
+vite build --mode client && vite build
+```
+
 You can also deploy it to Cloudflare Pages.
 
 ```txt

package/dist/client/runtime.js

@@ -1,5 +1,15 @@
 import { Suspense, use } from "hono/jsx/dom";
 const buildCreateChildrenFn = (createElement) => {
+  const createElementFromHTMLElement = async (element) => {
+    const props = {
+      children: await createChildren(element.childNodes)
+    };
+    const attributes = element.attributes;
+    for (let i = 0; i < attributes.length; i++) {
+      props[attributes[i].name] = attributes[i].value;
+    }
+    return createElement(element.nodeName, props);
+  };
   const createChildren = async (childNodes) => {
     const children = [];
     for (let i = 0; i < childNodes.length; i++) {
@@ -32,11 +42,7 @@ const buildCreateChildrenFn = (createElement) => {
           } else if (child2.nodeType === 3) {
             fallback.push(child2.textContent);
           } else {
-            fallback.push(
-              await createElement(child2.nodeName, {
-                children: await createChildren(child2.childNodes)
-              })
-            );
+            fallback.push(await createElementFromHTMLElement(child2));
           }
         }
         const fallbackTemplates = document.querySelectorAll(
@@ -65,11 +71,7 @@ const buildCreateChildrenFn = (createElement) => {
           })
         );
       } else {
-        children.push(
-          await createElement(child.nodeName, {
-            children: await createChildren(child.childNodes)
-          })
-        );
+        children.push(await createElementFromHTMLElement(child));
       }
     }
     return children;

package/dist/server/server.d.ts

@@ -21,12 +21,16 @@ type NotFoundFile = {
 type ErrorFile = {
     default: ErrorHandler;
 };
+type MiddlewareFile = {
+    default: MiddlewareHandler[];
+};
 type InitFunction<E extends Env = Env> = (app: Hono<E>) => void;
 type ServerOptions<E extends Env = Env> = {
     ROUTES?: Record<string, RouteFile>;
     RENDERER?: Record<string, RendererFile>;
     NOT_FOUND?: Record<string, NotFoundFile>;
     ERROR?: Record<string, ErrorFile>;
+    MIDDLEWARE?: Record<string, MiddlewareFile>;
     root?: string;
     app?: Hono<E>;
     init?: InitFunction<E>;

package/dist/server/server.js

@@ -29,36 +29,49 @@ const createApp = (options) => {
     eager: true
   });
   const rendererList = listByDirectory(RENDERER_FILE);
-  const applyRenderer = (app2, rendererFile) => {
-    const renderer = RENDERER_FILE[rendererFile];
-    const rendererDefault = renderer["default"];
-    if (rendererDefault) {
-      app2.all("*", rendererDefault);
-    }
-  };
+  const MIDDLEWARE_FILE = options?.MIDDLEWARE ?? import.meta.glob("/app/routes/**/_middleware.(ts|tsx)", {
+    eager: true
+  });
+  const middlewareList = listByDirectory(MIDDLEWARE_FILE);
   const ROUTES_FILE = options?.ROUTES ?? import.meta.glob("/app/routes/**/[!_]*.(ts|tsx|mdx)", {
     eager: true
   });
   const routesMap = sortDirectoriesByDepth(groupByDirectory(ROUTES_FILE));
+  const getPaths = (currentDirectory, fileList) => {
+    let paths = fileList[currentDirectory] ?? [];
+    const getChildPaths = (childDirectories) => {
+      paths = fileList[childDirectories.join("/")];
+      if (!paths) {
+        childDirectories.pop();
+        if (childDirectories.length) {
+          getChildPaths(childDirectories);
+        }
+      }
+      return paths ?? [];
+    };
+    const renderDirPaths = currentDirectory.split("/");
+    paths = getChildPaths(renderDirPaths);
+    paths.sort((a, b) => a.split("/").length - b.split("/").length);
+    return paths;
+  };
   for (const map of routesMap) {
     for (const [dir, content] of Object.entries(map)) {
       const subApp = new Hono();
-      let rendererPaths = rendererList[dir] ?? [];
-      const getRendererPaths = (paths) => {
-        rendererPaths = rendererList[paths.join("/")];
-        if (!rendererPaths) {
-          paths.pop();
-          if (paths.length) {
-            getRendererPaths(paths);
-          }
-        }
-        return rendererPaths ?? [];
-      };
-      const dirPaths = dir.split("/");
-      rendererPaths = getRendererPaths(dirPaths);
-      rendererPaths.sort((a, b) => a.split("/").length - b.split("/").length);
+      const rendererPaths = getPaths(dir, rendererList);
       rendererPaths.map((path) => {
-        applyRenderer(subApp, path);
+        const renderer = RENDERER_FILE[path];
+        const rendererDefault = renderer.default;
+        if (rendererDefault) {
+          subApp.all("*", rendererDefault);
+        }
+      });
+      const middlewarePaths = getPaths(dir, middlewareList);
+      middlewarePaths.map((path) => {
+        const middleware = MIDDLEWARE_FILE[path];
+        const middlewareDefault = middleware.default;
+        if (middlewareDefault) {
+          subApp.use(...middlewareDefault);
+        }
       });
       let rootPath = dir.replace(rootRegExp, "");
       rootPath = filePathToPath(rootPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honox",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {
@@ -99,7 +99,7 @@
     "@babel/parser": "^7.23.6",
     "@babel/traverse": "^7.23.6",
     "@babel/types": "^7.23.6",
-    "@hono/vite-dev-server": "^0.5.0"
+    "@hono/vite-dev-server": "^0.7.0"
   },
   "peerDependencies": {
     "hono": ">=4.*"
@@ -113,7 +113,7 @@
     "@types/node": "^20.10.5",
     "eslint": "^8.56.0",
     "glob": "^10.3.10",
-    "hono": "^4.0.3",
+    "hono": "^4.0.5",
     "np": "7.7.0",
     "prettier": "^3.1.1",
     "publint": "^0.2.7",

package/dist/server/factory/factory.d.ts

@@ -1,19 +0,0 @@
-import * as hono_types from 'hono/types';
-import * as hono from 'hono';
-import { Env, Hono } from 'hono';
-
-declare const createRoute: {
-    <I extends hono.Input = {}>(handler1: hono_types.H<Env, any, I>): [hono_types.H<Env, any, I>];
-    <I_1 extends hono.Input = {}, I2 extends hono.Input = I_1, R extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_1, R>, handler2: hono_types.H<Env, any, I2, R>): [hono_types.H<Env, any, I_1, R>, hono_types.H<Env, any, I2, R>];
-    <I_2 extends hono.Input = {}, I2_1 extends hono.Input = I_2, I3 extends hono.Input = I_2 & I2_1, R_1 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_2, R_1>, handler2: hono_types.H<Env, any, I2_1, R_1>, handler3: hono_types.H<Env, any, I3, R_1>): [hono_types.H<Env, any, I_2, R_1>, hono_types.H<Env, any, I2_1, R_1>, hono_types.H<Env, any, I3, R_1>];
-    <I_3 extends hono.Input = {}, I2_2 extends hono.Input = I_3, I3_1 extends hono.Input = I_3 & I2_2, I4 extends hono.Input = I_3 & I2_2 & I3_1, R_2 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_3, R_2>, handler2: hono_types.H<Env, any, I2_2, R_2>, handler3: hono_types.H<Env, any, I3_1, R_2>, handler4: hono_types.H<Env, any, I4, R_2>): [hono_types.H<Env, any, I_3, R_2>, hono_types.H<Env, any, I2_2, R_2>, hono_types.H<Env, any, I3_1, R_2>, hono_types.H<Env, any, I4, R_2>];
-    <I_4 extends hono.Input = {}, I2_3 extends hono.Input = I_4, I3_2 extends hono.Input = I_4 & I2_3, I4_1 extends hono.Input = I_4 & I2_3 & I3_2, I5 extends hono.Input = I_4 & I2_3 & I3_2 & I4_1, R_3 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_4, R_3>, handler2: hono_types.H<Env, any, I2_3, R_3>, handler3: hono_types.H<Env, any, I3_2, R_3>, handler4: hono_types.H<Env, any, I4_1, R_3>, handler5: hono_types.H<Env, any, I5, R_3>): [hono_types.H<Env, any, I_4, R_3>, hono_types.H<Env, any, I2_3, R_3>, hono_types.H<Env, any, I3_2, R_3>, hono_types.H<Env, any, I4_1, R_3>, hono_types.H<Env, any, I5, R_3>];
-    <I_5 extends hono.Input = {}, I2_4 extends hono.Input = I_5, I3_3 extends hono.Input = I_5 & I2_4, I4_2 extends hono.Input = I_5 & I2_4 & I3_3, I5_1 extends hono.Input = I_5 & I2_4 & I3_3 & I4_2, I6 extends hono.Input = I_5 & I2_4 & I3_3 & I4_2 & I5_1, R_4 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_5, R_4>, handler2: hono_types.H<Env, any, I2_4, R_4>, handler3: hono_types.H<Env, any, I3_3, R_4>, handler4: hono_types.H<Env, any, I4_2, R_4>, handler5: hono_types.H<Env, any, I5_1, R_4>, handler6: hono_types.H<Env, any, I6, R_4>): [hono_types.H<Env, any, I_5, R_4>, hono_types.H<Env, any, I2_4, R_4>, hono_types.H<Env, any, I3_3, R_4>, hono_types.H<Env, any, I4_2, R_4>, hono_types.H<Env, any, I5_1, R_4>, hono_types.H<Env, any, I6, R_4>];
-    <I_6 extends hono.Input = {}, I2_5 extends hono.Input = I_6, I3_4 extends hono.Input = I_6 & I2_5, I4_3 extends hono.Input = I_6 & I2_5 & I3_4, I5_2 extends hono.Input = I_6 & I2_5 & I3_4 & I4_3, I6_1 extends hono.Input = I_6 & I2_5 & I3_4 & I4_3 & I5_2, I7 extends hono.Input = I_6 & I2_5 & I3_4 & I4_3 & I5_2 & I6_1, R_5 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_6, R_5>, handler2: hono_types.H<Env, any, I2_5, R_5>, handler3: hono_types.H<Env, any, I3_4, R_5>, handler4: hono_types.H<Env, any, I4_3, R_5>, handler5: hono_types.H<Env, any, I5_2, R_5>, handler6: hono_types.H<Env, any, I6_1, R_5>, handler7: hono_types.H<Env, any, I7, R_5>): [hono_types.H<Env, any, I_6, R_5>, hono_types.H<Env, any, I2_5, R_5>, hono_types.H<Env, any, I3_4, R_5>, hono_types.H<Env, any, I4_3, R_5>, hono_types.H<Env, any, I5_2, R_5>, hono_types.H<Env, any, I6_1, R_5>, hono_types.H<Env, any, I7, R_5>];
-    <I_7 extends hono.Input = {}, I2_6 extends hono.Input = I_7, I3_5 extends hono.Input = I_7 & I2_6, I4_4 extends hono.Input = I_7 & I2_6 & I3_5, I5_3 extends hono.Input = I_7 & I2_6 & I3_5 & I4_4, I6_2 extends hono.Input = I_7 & I2_6 & I3_5 & I4_4 & I5_3, I7_1 extends hono.Input = I_7 & I2_6 & I3_5 & I4_4 & I5_3 & I6_2, I8 extends hono.Input = I_7 & I2_6 & I3_5 & I4_4 & I5_3 & I6_2 & I7_1, R_6 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_7, R_6>, handler2: hono_types.H<Env, any, I2_6, R_6>, handler3: hono_types.H<Env, any, I3_5, R_6>, handler4: hono_types.H<Env, any, I4_4, R_6>, handler5: hono_types.H<Env, any, I5_3, R_6>, handler6: hono_types.H<Env, any, I6_2, R_6>, handler7: hono_types.H<Env, any, I7_1, R_6>, handler8: hono_types.H<Env, any, I8, R_6>): [hono_types.H<Env, any, I_7, R_6>, hono_types.H<Env, any, I2_6, R_6>, hono_types.H<Env, any, I3_5, R_6>, hono_types.H<Env, any, I4_4, R_6>, hono_types.H<Env, any, I5_3, R_6>, hono_types.H<Env, any, I6_2, R_6>, hono_types.H<Env, any, I7_1, R_6>, hono_types.H<Env, any, I8, R_6>];
-    <I_8 extends hono.Input = {}, I2_7 extends hono.Input = I_8, I3_6 extends hono.Input = I_8 & I2_7, I4_5 extends hono.Input = I_8 & I2_7 & I3_6, I5_4 extends hono.Input = I_8 & I2_7 & I3_6 & I4_5, I6_3 extends hono.Input = I_8 & I2_7 & I3_6 & I4_5 & I5_4, I7_2 extends hono.Input = I_8 & I2_7 & I3_6 & I4_5 & I5_4 & I6_3, I8_1 extends hono.Input = I_8 & I2_7 & I3_6 & I4_5 & I5_4 & I6_3 & I7_2, I9 extends hono.Input = I_8 & I2_7 & I3_6 & I4_5 & I5_4 & I6_3 & I7_2 & I8_1, R_7 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_8, R_7>, handler2: hono_types.H<Env, any, I2_7, R_7>, handler3: hono_types.H<Env, any, I3_6, R_7>, handler4: hono_types.H<Env, any, I4_5, R_7>, handler5: hono_types.H<Env, any, I5_4, R_7>, handler6: hono_types.H<Env, any, I6_3, R_7>, handler7: hono_types.H<Env, any, I7_2, R_7>, handler8: hono_types.H<Env, any, I8_1, R_7>, handler9: hono_types.H<Env, any, I9, R_7>): [hono_types.H<Env, any, I_8, R_7>, hono_types.H<Env, any, I2_7, R_7>, hono_types.H<Env, any, I3_6, R_7>, hono_types.H<Env, any, I4_5, R_7>, hono_types.H<Env, any, I5_4, R_7>, hono_types.H<Env, any, I6_3, R_7>, hono_types.H<Env, any, I7_2, R_7>, hono_types.H<Env, any, I8_1, R_7>, hono_types.H<Env, any, I9, R_7>];
-    <I_9 extends hono.Input = {}, I2_8 extends hono.Input = I_9, I3_7 extends hono.Input = I_9 & I2_8, I4_6 extends hono.Input = I_9 & I2_8 & I3_7, I5_5 extends hono.Input = I_9 & I2_8 & I3_7 & I4_6, I6_4 extends hono.Input = I_9 & I2_8 & I3_7 & I4_6 & I5_5, I7_3 extends hono.Input = I_9 & I2_8 & I3_7 & I4_6 & I5_5 & I6_4, I8_2 extends hono.Input = I_9 & I2_8 & I3_7 & I4_6 & I5_5 & I6_4 & I7_3, I9_1 extends hono.Input = I_9 & I2_8 & I3_7 & I4_6 & I5_5 & I6_4 & I7_3 & I8_2, I10 extends hono.Input = I_9 & I2_8 & I3_7 & I4_6 & I5_5 & I6_4 & I7_3 & I8_2 & I9_1, R_8 extends hono_types.HandlerResponse<any> = any>(handler1: hono_types.H<Env, any, I_9, R_8>, handler2: hono_types.H<Env, any, I2_8, R_8>, handler3: hono_types.H<Env, any, I3_7, R_8>, handler4: hono_types.H<Env, any, I4_6, R_8>, handler5: hono_types.H<Env, any, I5_5, R_8>, handler6: hono_types.H<Env, any, I6_4, R_8>, handler7: hono_types.H<Env, any, I7_3, R_8>, handler8: hono_types.H<Env, any, I8_2, R_8>, handler9: hono_types.H<Env, any, I9_1, R_8>, handler10: hono_types.H<Env, any, I10, R_8>): [hono_types.H<Env, any, I_9, R_8>, hono_types.H<Env, any, I2_8, R_8>, hono_types.H<Env, any, I3_7, R_8>, hono_types.H<Env, any, I4_6, R_8>, hono_types.H<Env, any, I5_5, R_8>, hono_types.H<Env, any, I6_4, R_8>, hono_types.H<Env, any, I7_3, R_8>, hono_types.H<Env, any, I8_2, R_8>, hono_types.H<Env, any, I9_1, R_8>, hono_types.H<Env, any, I10, R_8>];
-};
-declare const createHono: () => Hono<Env, hono_types.BlankSchema, "/">;
-
-export { createHono, createRoute };

package/dist/server/factory/factory.js

@@ -1,11 +0,0 @@
-import { Hono } from "hono";
-import { createFactory } from "hono/factory";
-const factory = createFactory();
-const createRoute = factory.createHandlers;
-const createHono = () => {
-  return new Hono();
-};
-export {
-  createHono,
-  createRoute
-};

package/dist/server/factory/index.d.ts

@@ -1,3 +0,0 @@
-export { createHono, createRoute } from './factory.js';
-import 'hono/types';
-import 'hono';

package/dist/server/factory/index.js

@@ -1,5 +0,0 @@
-import { createRoute, createHono } from "./factory.js";
-export {
-  createHono,
-  createRoute
-};

package/dist/vite/watch-reload.d.ts

@@ -1,5 +0,0 @@
-import { Plugin } from 'vite';
-
-declare function reloadOnAdd(): Plugin;
-
-export { reloadOnAdd };

package/dist/vite/watch-reload.js

@@ -1,17 +0,0 @@
-function restartOnAddUnlink() {
-  return {
-    name: "restart-on-add-unlink",
-    configureServer(server) {
-      server.watcher.add("/app/**");
-      server.watcher.on("add", async () => {
-        await server.restart();
-      });
-      server.watcher.on("unlink", async () => {
-        await server.restart();
-      });
-    }
-  };
-}
-export {
-  restartOnAddUnlink
-};