serverstruct 0.1.0 → 0.2.0

package/README.md

@@ -1,3 +1,194 @@
-# Commandstruct
+# Serverstruct
 
-Type safe and modular servers with [Hono](https://github.com/honojs/hono).
+⚡️ Typesafe and modular servers with [Hono](https://github.com/honojs/hono).
+
+Serverstruct is a simple tool for building fast, modular and typesafe server applications.
+
+It provides structure to your Hono application without any limitations. It also supports dependency injection using [Hollywood DI](https://github.com/eriicafes/hollywood-di).
+
+## Installation
+
+Serverstruct requires you to install hono.
+
+```sh
+npm i serverstruct hono
+```
+
+To make use of dependency injection provided by serverstruct, also install hollywood-di.
+
+```sh
+npm i serverstruct hono hollywood-di
+```
+
+## Usage
+
+### A simple app
+
+```ts
+import { createRoute } from "serverstruct";
+
+const app = createRoute()
+  .route((app) => {
+    return app.get("/", (c) => c.text("Hello world!"));
+  })
+  .app();
+
+export default app;
+```
+
+### An app with subroutes
+
+```ts
+import { createRoute } from "serverstruct";
+
+// users routes
+const users = createRoute().route((app) => {
+  return app.get("/", (c) => c.text("users"));
+});
+
+// posts routes
+const posts = createRoute().route((app) => {
+  return app.get("/", (c) => c.text("posts"));
+});
+
+const app = createRoute()
+  .subroutes({ users, posts })
+  .route((app, container, routes) => {
+    return app
+      .get("/", (c) => c.text("Hello world!"))
+      .route("/users", routes.users)
+      .route("/posts", routes.posts);
+  })
+  .app();
+
+export default app;
+```
+
+## Route
+
+A route returns a new Hono app and may compose other routes with `subroutes<{ ... }>()`. If you intend to utilize dependency injection, a route can require it's dependencies with `use<{ ... }>()` and provide new dependencies with `provide({ ... })`. A route with dependencies can only be added as a subroute to another route if that route satisfies it's dependencies.
+
+```ts
+const auth = createRoute().route((app) => {
+  return app; // chain route handlers here
+});
+
+const users = createRoute().route((app) => {
+  return app; // chain route handlers here
+});
+
+const posts = createRoute().route((app) => {
+  return app; // chain route handlers here
+});
+
+const app = createRoute()
+  .subroutes({ auth, users, posts })
+  .route((app, container, routes) => {
+    return app
+      .route("/auth", routes.auth)
+      .route("/users", routes.users)
+      .route("/posts", routes.posts);
+  })
+  .app();
+```
+
+Subroutes are not automatically registered. You will have to manually add the route for the desired path. This also allows for Hono's type inference through method chaining.
+
+## Dependency Injection
+
+Serverstruct is designed to work with [Hollywood DI](https://github.com/eriicafes/hollywood-di). Routes can define their dependencies using `use`, and also register new tokens using `provide` which creates a child container.
+
+A root container can also be passed to the route. If no container is explicitly provided the first call to provide creates a root container and futher calls to provide will inherit from it.
+
+### Use
+
+Define route dependencies. The route can then only be used in a context that satisfies it's dependencies.
+
+You can only call `use` once and only before calling `provide`.
+
+```ts
+interface Counter {
+  count: number;
+  increment(): void;
+}
+
+const route = createRoute()
+  .use<{ counter: Counter }>()
+  .route((app, container) => {
+    return app.get("/", (c) => {
+      container.counter.increment();
+      return c.text(`Count is: ${container.counter.count}`);
+    });
+  });
+
+class LinearCounter {
+  public count = 0;
+  public increment() {
+    this.count++;
+  }
+}
+
+// as a subroute
+const app = createRoute()
+  .provide({ counter: LinearCounter }) // the main app provides the dependency
+  .subroutes({ countRoute: route })
+  .route((app, _, routes) => {
+    return app.route("/count", routes.countRoute);
+  })
+  .app();
+
+// or as the main app
+const container = Hollywood.create({ counter: LinearCounter }); // the container provides the dependency
+const app = route.app(container);
+```
+
+Calling `Route.app()` returns the Hono instance from the route, therefore if the route has dependencies (by calling `use`), a container that satisfies those dependencies must be provided as seen in the example above.
+
+### Provide
+
+Provide creates a new child container. Registered tokens can then be used in the route and in futher calls to `provide`. See more about register tokens in [Hollywood DI](https://github.com/eriicafes/hollywood-di#tokens).
+
+```ts
+import { defineInit } from "hollywood-di";
+import { createRoute } from "serverstruct";
+
+class Foo {}
+class Bar {
+  public static init = defineInit(Bar).args("foo");
+
+  constructor(public foo: Foo) {}
+}
+
+const route = createRoute()
+  .provide({
+    foo: Foo,
+    bar: Bar,
+  })
+  .route((app, container) => {
+    return app;
+  });
+```
+
+## Incremental Adoption
+
+Serverstruct can be added to an existing Hono app.
+
+```ts
+// routes/posts.ts
+export const postsRoute = createRoute().route((app) => {
+  return app.get("/", (c) => {
+    return c.text("posts");
+  });
+});
+
+import { Hono } from "hono";
+import { createRoute } from "serverstruct";
+import { postsRoute } from "./routes/posts";
+
+const app = new Hono();
+
+app.get("/", (c) => c.text("Hello world!"));
+app.route("/posts", postsRoute.app());
+
+export default app;
+```

package/dist/index.d.mts

@@ -1,57 +1,41 @@
-import { InitFactory, InstantiableConstructor, RegisterTokens, inferContainer, Hollywood, AnyHollywood } from 'hollywood-di';
-import { Env, Hono } from 'hono';
+import { AnyHollywood, HollywoodOf, RegisterTokens, InferContainer, ContainerOptions, Hollywood } from 'hollywood-di';
+import { Env, Schema, Hono } from 'hono';
+import { BlankEnv, BlankSchema } from 'hono/types';
 
-type IsAny<T> = unknown extends T & string ? true : false;
-type WithoutTrailingSlash<T extends string> = T extends `${infer P}/` ? P : T;
-type WithoutLeadingSlash<T extends string> = T extends `/${infer P}` ? P : T;
-type WithMinimumSlash<T extends string> = T extends "" ? "/" : T;
-type MergePath<P extends string, T extends string> = IsAny<T> extends true ? any : WithMinimumSlash<WithoutTrailingSlash<`${WithoutTrailingSlash<P>}/${WithoutLeadingSlash<T>}`>>;
+type Merge<T, To> = T & Omit<To, keyof T>;
+type IsEmptyObject<T> = keyof T extends never ? true : false;
+type KnownKey<T> = string extends T ? never : number extends T ? never : symbol extends T ? never : T;
+type KnownMappedKeys<T> = {
+    [K in keyof T as KnownKey<K>]: T[K];
+} & {};
 
-type Router<BasePath extends string = "/", Path extends string = "/", E extends Env = Env, S = {}> = Hono<E, S, MergePath<BasePath, Path>>;
-declare class ControllerDef<BasePath extends string = "/", Path extends string = "/", E extends Env = Env, S = {}, Out = S> {
-    path: Path;
-    route: (router: Router<BasePath, Path, E, S>) => Router<BasePath, Path, E, Out>;
-    constructor(path: Path, route: (router: Router<BasePath, Path, E, S>) => Router<BasePath, Path, E, Out>);
-    mountTo(parent: Hono<any, any, BasePath>): void;
-}
-type Controller<BasePath extends string, Path extends string, T extends Record<string, any> = {}, E extends Env = Env, S = {}, Out = S> = InitFactory<T, ControllerDef<BasePath, Path, E, S, Out>>;
-type inferController<T extends Controller<any, any, any, any, any>> = T extends Controller<infer BasePath, infer Path, any, infer E, any, infer Out> ? Router<BasePath, Path, E, Out> : never;
-type ControllerInit<T> = <U extends Record<string, any>>(constructor: InstantiableConstructor<T, U>) => U;
-type ControllerContext<TContainer, TRouter> = {
-    router: TRouter;
-    container: TContainer;
-    /**
-     * Initialize an instantiable constructor with the controller's container.
-     *
-     * Also automatically binds class methods to their instance using `auto-bind`.
-     */
-    init: ControllerInit<TContainer>;
-};
-type ControllerBuilder<BasePath extends string = "/", Path extends string = "/", T extends Record<string, any> = {}, E extends Env = Env, S = {}> = {
-    build<Out>(config: (ctx: ControllerContext<T, Router<BasePath, Path, E, S>>) => Router<BasePath, Path, E, Out>): Controller<BasePath, Path, T, E, S, Out>;
+type Subroute<T extends Record<string, any> = any> = {
+    app: (container: IsEmptyObject<T> extends true ? HollywoodOf<any> | undefined : HollywoodOf<T>) => Hono<any, any>;
 };
-declare function createController<BasePath extends string = "/", Path extends string = "/", T extends Record<string, any> = {}, E extends Env = Env, S = {}>(path: Path): ControllerBuilder<BasePath, Path, T, E, S>;
-
-interface Module<BasePath extends string, Path extends string, P extends Record<string, any>> {
-    path: Path;
-    tokens: RegisterTokens<any, P>;
-    controllers: Controller<MergePath<BasePath, Path>, any, P, any, any, any>[];
-    submodules?: Module<MergePath<BasePath, Path>, any, P>[];
+type Subroutes<TContainer extends Record<string, any> = any> = Record<string, Subroute<TContainer>>;
+type InferSubroutes<R extends Subroutes = {}> = {
+    [K in keyof R]: R[K] extends Route<any, infer App, any> ? App : never;
+} & {};
+declare class Route<Deps extends Record<string, any>, App extends Hono<any, any>, Routes extends Subroutes> {
+    private route;
+    private context;
+    constructor(route: (app: Hono<any, any>, container: any, routes: InferSubroutes<Routes>) => App, context: [
+        tokens: {
+            tokens: RegisterTokens<any, any>;
+            options?: ContainerOptions;
+        } | undefined,
+        routes: Subroutes<any>
+    ][]);
+    app(container: IsEmptyObject<Deps> extends true ? HollywoodOf<any> | undefined : HollywoodOf<Deps>): App;
+    app(container?: never): IsEmptyObject<Deps> extends true ? App : never;
 }
-interface ModuleConfig<BasePath extends string, Path extends string, T extends Record<string, any>, P extends Record<string, any>> {
-    tokens: RegisterTokens<T, P>;
-    controllers: Controller<MergePath<BasePath, Path>, any, inferContainer<Hollywood<T, Hollywood<P, any>>>, any, any, any>[];
-    submodules?: Module<MergePath<BasePath, Path>, any, inferContainer<Hollywood<T, Hollywood<P, any>>>>[];
-}
-type ModuleBuilder<BasePath extends string = "/", Path extends string = "/", P extends Record<string, any> = {}> = {
-    build<T extends Record<string, any> = {}>(config: ModuleConfig<BasePath, Path, T, P>): Module<BasePath, Path, P>;
-};
-declare function createModule<BasePath extends string = "/", Path extends string = "/", P extends Record<string, any> = {}>(path: Path): ModuleBuilder<BasePath, Path, P>;
-
-interface Serverstruct<Container extends AnyHollywood, BasePath extends string> {
-    modules(...modules: Module<BasePath, any, inferContainer<Container>>[]): this;
-    controllers(...controllers: Controller<BasePath, any, inferContainer<Container>, any, any, any>[]): this;
+declare class RouteBuilder<Deps extends Record<string, any>, Container extends AnyHollywood | undefined, E extends Env, S extends Schema, Routes extends Subroutes> {
+    private context;
+    use<T extends Container extends AnyHollywood ? never : Record<string, any>>(): Container extends AnyHollywood ? never : RouteBuilder<T, HollywoodOf<T>, E, S, Routes>;
+    provide<T extends Record<string, any> = {}>(tokens: RegisterTokens<T, Container extends AnyHollywood ? InferContainer<Container> : Deps>, options?: ContainerOptions): RouteBuilder<Deps, Container extends AnyHollywood ? Hollywood<T, InferContainer<Container>> : Hollywood<T, {}>, E, S, Routes>;
+    subroutes<T extends Subroutes<Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps>>(routes: T): RouteBuilder<Deps, Container, E, S, Merge<T, Routes> extends infer T_1 ? { [K in keyof T_1]: Merge<T, Routes>[K]; } : never>;
+    route<App extends Hono<any, any>>(fn: (app: Hono<E, S>, container: Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps, routes: InferSubroutes<Routes>) => App): Route<Deps, App, Routes>;
 }
-declare function serverstruct<App extends Hono<any, any, BasePath>, Container extends AnyHollywood, BasePath extends string = "/">(app: App, container: Container, _base?: BasePath): Serverstruct<Container, BasePath>;
+declare function createRoute<E extends Env = BlankEnv>(): RouteBuilder<{}, undefined, E, BlankSchema, {}>;
 
-export { Controller, ControllerContext, Module, ModuleConfig, Router, Serverstruct, createController, createModule, inferController, serverstruct };
+export { createRoute };

package/dist/index.d.ts

@@ -1,57 +1,41 @@
-import { InitFactory, InstantiableConstructor, RegisterTokens, inferContainer, Hollywood, AnyHollywood } from 'hollywood-di';
-import { Env, Hono } from 'hono';
+import { AnyHollywood, HollywoodOf, RegisterTokens, InferContainer, ContainerOptions, Hollywood } from 'hollywood-di';
+import { Env, Schema, Hono } from 'hono';
+import { BlankEnv, BlankSchema } from 'hono/types';
 
-type IsAny<T> = unknown extends T & string ? true : false;
-type WithoutTrailingSlash<T extends string> = T extends `${infer P}/` ? P : T;
-type WithoutLeadingSlash<T extends string> = T extends `/${infer P}` ? P : T;
-type WithMinimumSlash<T extends string> = T extends "" ? "/" : T;
-type MergePath<P extends string, T extends string> = IsAny<T> extends true ? any : WithMinimumSlash<WithoutTrailingSlash<`${WithoutTrailingSlash<P>}/${WithoutLeadingSlash<T>}`>>;
+type Merge<T, To> = T & Omit<To, keyof T>;
+type IsEmptyObject<T> = keyof T extends never ? true : false;
+type KnownKey<T> = string extends T ? never : number extends T ? never : symbol extends T ? never : T;
+type KnownMappedKeys<T> = {
+    [K in keyof T as KnownKey<K>]: T[K];
+} & {};
 
-type Router<BasePath extends string = "/", Path extends string = "/", E extends Env = Env, S = {}> = Hono<E, S, MergePath<BasePath, Path>>;
-declare class ControllerDef<BasePath extends string = "/", Path extends string = "/", E extends Env = Env, S = {}, Out = S> {
-    path: Path;
-    route: (router: Router<BasePath, Path, E, S>) => Router<BasePath, Path, E, Out>;
-    constructor(path: Path, route: (router: Router<BasePath, Path, E, S>) => Router<BasePath, Path, E, Out>);
-    mountTo(parent: Hono<any, any, BasePath>): void;
-}
-type Controller<BasePath extends string, Path extends string, T extends Record<string, any> = {}, E extends Env = Env, S = {}, Out = S> = InitFactory<T, ControllerDef<BasePath, Path, E, S, Out>>;
-type inferController<T extends Controller<any, any, any, any, any>> = T extends Controller<infer BasePath, infer Path, any, infer E, any, infer Out> ? Router<BasePath, Path, E, Out> : never;
-type ControllerInit<T> = <U extends Record<string, any>>(constructor: InstantiableConstructor<T, U>) => U;
-type ControllerContext<TContainer, TRouter> = {
-    router: TRouter;
-    container: TContainer;
-    /**
-     * Initialize an instantiable constructor with the controller's container.
-     *
-     * Also automatically binds class methods to their instance using `auto-bind`.
-     */
-    init: ControllerInit<TContainer>;
-};
-type ControllerBuilder<BasePath extends string = "/", Path extends string = "/", T extends Record<string, any> = {}, E extends Env = Env, S = {}> = {
-    build<Out>(config: (ctx: ControllerContext<T, Router<BasePath, Path, E, S>>) => Router<BasePath, Path, E, Out>): Controller<BasePath, Path, T, E, S, Out>;
+type Subroute<T extends Record<string, any> = any> = {
+    app: (container: IsEmptyObject<T> extends true ? HollywoodOf<any> | undefined : HollywoodOf<T>) => Hono<any, any>;
 };
-declare function createController<BasePath extends string = "/", Path extends string = "/", T extends Record<string, any> = {}, E extends Env = Env, S = {}>(path: Path): ControllerBuilder<BasePath, Path, T, E, S>;
-
-interface Module<BasePath extends string, Path extends string, P extends Record<string, any>> {
-    path: Path;
-    tokens: RegisterTokens<any, P>;
-    controllers: Controller<MergePath<BasePath, Path>, any, P, any, any, any>[];
-    submodules?: Module<MergePath<BasePath, Path>, any, P>[];
+type Subroutes<TContainer extends Record<string, any> = any> = Record<string, Subroute<TContainer>>;
+type InferSubroutes<R extends Subroutes = {}> = {
+    [K in keyof R]: R[K] extends Route<any, infer App, any> ? App : never;
+} & {};
+declare class Route<Deps extends Record<string, any>, App extends Hono<any, any>, Routes extends Subroutes> {
+    private route;
+    private context;
+    constructor(route: (app: Hono<any, any>, container: any, routes: InferSubroutes<Routes>) => App, context: [
+        tokens: {
+            tokens: RegisterTokens<any, any>;
+            options?: ContainerOptions;
+        } | undefined,
+        routes: Subroutes<any>
+    ][]);
+    app(container: IsEmptyObject<Deps> extends true ? HollywoodOf<any> | undefined : HollywoodOf<Deps>): App;
+    app(container?: never): IsEmptyObject<Deps> extends true ? App : never;
 }
-interface ModuleConfig<BasePath extends string, Path extends string, T extends Record<string, any>, P extends Record<string, any>> {
-    tokens: RegisterTokens<T, P>;
-    controllers: Controller<MergePath<BasePath, Path>, any, inferContainer<Hollywood<T, Hollywood<P, any>>>, any, any, any>[];
-    submodules?: Module<MergePath<BasePath, Path>, any, inferContainer<Hollywood<T, Hollywood<P, any>>>>[];
-}
-type ModuleBuilder<BasePath extends string = "/", Path extends string = "/", P extends Record<string, any> = {}> = {
-    build<T extends Record<string, any> = {}>(config: ModuleConfig<BasePath, Path, T, P>): Module<BasePath, Path, P>;
-};
-declare function createModule<BasePath extends string = "/", Path extends string = "/", P extends Record<string, any> = {}>(path: Path): ModuleBuilder<BasePath, Path, P>;
-
-interface Serverstruct<Container extends AnyHollywood, BasePath extends string> {
-    modules(...modules: Module<BasePath, any, inferContainer<Container>>[]): this;
-    controllers(...controllers: Controller<BasePath, any, inferContainer<Container>, any, any, any>[]): this;
+declare class RouteBuilder<Deps extends Record<string, any>, Container extends AnyHollywood | undefined, E extends Env, S extends Schema, Routes extends Subroutes> {
+    private context;
+    use<T extends Container extends AnyHollywood ? never : Record<string, any>>(): Container extends AnyHollywood ? never : RouteBuilder<T, HollywoodOf<T>, E, S, Routes>;
+    provide<T extends Record<string, any> = {}>(tokens: RegisterTokens<T, Container extends AnyHollywood ? InferContainer<Container> : Deps>, options?: ContainerOptions): RouteBuilder<Deps, Container extends AnyHollywood ? Hollywood<T, InferContainer<Container>> : Hollywood<T, {}>, E, S, Routes>;
+    subroutes<T extends Subroutes<Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps>>(routes: T): RouteBuilder<Deps, Container, E, S, Merge<T, Routes> extends infer T_1 ? { [K in keyof T_1]: Merge<T, Routes>[K]; } : never>;
+    route<App extends Hono<any, any>>(fn: (app: Hono<E, S>, container: Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps, routes: InferSubroutes<Routes>) => App): Route<Deps, App, Routes>;
 }
-declare function serverstruct<App extends Hono<any, any, BasePath>, Container extends AnyHollywood, BasePath extends string = "/">(app: App, container: Container, _base?: BasePath): Serverstruct<Container, BasePath>;
+declare function createRoute<E extends Env = BlankEnv>(): RouteBuilder<{}, undefined, E, BlankSchema, {}>;
 
-export { Controller, ControllerContext, Module, ModuleConfig, Router, Serverstruct, createController, createModule, inferController, serverstruct };
+export { createRoute };

package/dist/index.js

@@ -1,27 +1,8 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -34,100 +15,79 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  createController: () => createController,
-  createModule: () => createModule,
-  serverstruct: () => serverstruct
+  createRoute: () => createRoute
 });
 module.exports = __toCommonJS(src_exports);
-var import_hono2 = require("hono");
 
-// src/controller.ts
-var import_auto_bind = __toESM(require("auto-bind"));
+// src/route.ts
 var import_hollywood_di = require("hollywood-di");
 var import_hono = require("hono");
-var ControllerDef = class {
-  constructor(path, route) {
-    this.path = path;
+var Route = class {
+  constructor(route, context) {
     this.route = route;
+    this.context = context;
   }
-  mountTo(parent) {
-    const router = new import_hono.Hono();
-    const mountedRouter = this.route(router);
-    parent.route(this.path, mountedRouter);
+  app(container) {
+    var _a;
+    let currentContainer = container;
+    const resolvedRoutes = {};
+    for (const [tokens, subroutes] of this.context) {
+      let subContainer = currentContainer;
+      if (tokens && subContainer) {
+        subContainer = import_hollywood_di.Hollywood.createWithParent(
+          subContainer,
+          tokens.tokens,
+          tokens.options
+        );
+      } else if (tokens) {
+        subContainer = import_hollywood_di.Hollywood.create(tokens.tokens, tokens.options);
+      }
+      currentContainer = subContainer;
+      for (const [key, subroute] of Object.entries(subroutes)) {
+        resolvedRoutes[key] = subroute.app(subContainer);
+      }
+    }
+    const instances = (_a = currentContainer == null ? void 0 : currentContainer.instances) != null ? _a : {};
+    return this.route(
+      new import_hono.Hono(),
+      instances,
+      resolvedRoutes
+    );
   }
 };
-function createController(path) {
-  return {
-    build(config) {
-      return {
-        init(container) {
-          const init = (constructor) => {
-            const instance = import_hollywood_di.Hollywood.initConstructor(constructor, container);
-            return (0, import_auto_bind.default)(instance);
-          };
-          return new ControllerDef(path, (router) => config({ router, container, init }));
-        }
-      };
-    }
-  };
-}
-
-// src/module.ts
-function createModule(path) {
-  return {
-    build(config) {
-      return __spreadProps(__spreadValues({}, config), { path });
-    }
-  };
-}
-
-// src/index.ts
-function serverstruct(app, container, _base) {
-  return {
-    controllers(...controllers) {
-      registerControllers(app, container, controllers);
-      return this;
-    },
-    modules(...modules) {
-      for (const module2 of modules) {
-        registerModule(app, container, module2);
-      }
-      return this;
+var RouteBuilder = class {
+  constructor() {
+    this.context = [];
+  }
+  use() {
+    return this;
+  }
+  provide(tokens, options) {
+    this.context.push([{ tokens, options }, {}]);
+    return this;
+  }
+  subroutes(routes) {
+    if (!this.context.length)
+      this.context.push([void 0, routes]);
+    else {
+      const [, subroutes] = this.context[this.context.length - 1];
+      Object.assign(subroutes, routes);
     }
-  };
-}
-function registerControllers(app, container, controllers) {
-  for (const controllerInit of controllers) {
-    const controller = container.resolve(controllerInit);
-    controller.mountTo(app);
+    return this;
   }
-}
-function registerModule(app, container, module2) {
-  var _a;
-  const moduleContainer = container.createChild(module2.tokens);
-  const subapp = new import_hono2.Hono();
-  registerControllers(subapp, moduleContainer, module2.controllers);
-  for (const submodule of (_a = module2.submodules) != null ? _a : []) {
-    registerModule(subapp, moduleContainer, submodule);
+  route(fn) {
+    return new Route(fn, this.context);
   }
-  app.route(module2.path, subapp);
+};
+function createRoute() {
+  return new RouteBuilder();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createController,
-  createModule,
-  serverstruct
+  createRoute
 });

package/dist/index.mjs

@@ -1,99 +1,68 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
-// src/index.ts
-import { Hono as Hono2 } from "hono";
-
-// src/controller.ts
-import autoBind from "auto-bind";
-import { Hollywood } from "hollywood-di";
+// src/route.ts
+import {
+  Hollywood
+} from "hollywood-di";
 import { Hono } from "hono";
-var ControllerDef = class {
-  constructor(path, route) {
-    this.path = path;
+var Route = class {
+  constructor(route, context) {
     this.route = route;
+    this.context = context;
   }
-  mountTo(parent) {
-    const router = new Hono();
-    const mountedRouter = this.route(router);
-    parent.route(this.path, mountedRouter);
+  app(container) {
+    var _a;
+    let currentContainer = container;
+    const resolvedRoutes = {};
+    for (const [tokens, subroutes] of this.context) {
+      let subContainer = currentContainer;
+      if (tokens && subContainer) {
+        subContainer = Hollywood.createWithParent(
+          subContainer,
+          tokens.tokens,
+          tokens.options
+        );
+      } else if (tokens) {
+        subContainer = Hollywood.create(tokens.tokens, tokens.options);
+      }
+      currentContainer = subContainer;
+      for (const [key, subroute] of Object.entries(subroutes)) {
+        resolvedRoutes[key] = subroute.app(subContainer);
+      }
+    }
+    const instances = (_a = currentContainer == null ? void 0 : currentContainer.instances) != null ? _a : {};
+    return this.route(
+      new Hono(),
+      instances,
+      resolvedRoutes
+    );
   }
 };
-function createController(path) {
-  return {
-    build(config) {
-      return {
-        init(container) {
-          const init = (constructor) => {
-            const instance = Hollywood.initConstructor(constructor, container);
-            return autoBind(instance);
-          };
-          return new ControllerDef(path, (router) => config({ router, container, init }));
-        }
-      };
-    }
-  };
-}
-
-// src/module.ts
-function createModule(path) {
-  return {
-    build(config) {
-      return __spreadProps(__spreadValues({}, config), { path });
-    }
-  };
-}
-
-// src/index.ts
-function serverstruct(app, container, _base) {
-  return {
-    controllers(...controllers) {
-      registerControllers(app, container, controllers);
-      return this;
-    },
-    modules(...modules) {
-      for (const module of modules) {
-        registerModule(app, container, module);
-      }
-      return this;
+var RouteBuilder = class {
+  constructor() {
+    this.context = [];
+  }
+  use() {
+    return this;
+  }
+  provide(tokens, options) {
+    this.context.push([{ tokens, options }, {}]);
+    return this;
+  }
+  subroutes(routes) {
+    if (!this.context.length)
+      this.context.push([void 0, routes]);
+    else {
+      const [, subroutes] = this.context[this.context.length - 1];
+      Object.assign(subroutes, routes);
     }
-  };
-}
-function registerControllers(app, container, controllers) {
-  for (const controllerInit of controllers) {
-    const controller = container.resolve(controllerInit);
-    controller.mountTo(app);
+    return this;
   }
-}
-function registerModule(app, container, module) {
-  var _a;
-  const moduleContainer = container.createChild(module.tokens);
-  const subapp = new Hono2();
-  registerControllers(subapp, moduleContainer, module.controllers);
-  for (const submodule of (_a = module.submodules) != null ? _a : []) {
-    registerModule(subapp, moduleContainer, submodule);
+  route(fn) {
+    return new Route(fn, this.context);
   }
-  app.route(module.path, subapp);
+};
+function createRoute() {
+  return new RouteBuilder();
 }
 export {
-  createController,
-  createModule,
-  serverstruct
+  createRoute
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverstruct",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Type safe and modular servers with Hono",
   "private": false,
   "main": "./dist/index.js",
@@ -13,17 +13,9 @@
       "default": "./dist/index.js"
     }
   },
-  "scripts": {
-    "prebuild": "shx rm -rf dist",
-    "build": "tsc --noEmit && tsup src/index.ts --format esm,cjs --dts",
-    "release": "pnpm run build && changeset publish",
-    "watch": "vitest",
-    "test": "vitest run"
-  },
   "keywords": [
-    "command",
-    "cli",
-    "sade",
+    "hono",
+    "server",
     "hollywood-di",
     "typescript"
   ],
@@ -37,22 +29,25 @@
     "url": "https://github.com/eriicafes/serverstruct/issues"
   },
   "homepage": "https://github.com/eriicafes/serverstruct#readme",
-  "dependencies": {
-    "auto-bind": "^5.0.1"
-  },
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
-    "@hono/node-server": "^1.1.0",
     "@types/node": "^20.4.2",
-    "@types/supertest": "^2.0.12",
+    "@vitest/coverage-v8": "^1.6.0",
     "shx": "^0.3.4",
-    "supertest": "^6.3.3",
     "tsup": "^7.1.0",
     "typescript": "^5.1.6",
-    "vitest": "^0.33.0"
+    "vitest": "^1.6.0"
   },
   "peerDependencies": {
-    "hollywood-di": ">= 0.2.1",
-    "hono": ">= 3.3.0"
+    "hollywood-di": ">= 0.5.2",
+    "hono": ">= 4.0.0"
+  },
+  "scripts": {
+    "prebuild": "shx rm -rf dist",
+    "build": "tsc --noEmit && tsup src/index.ts --format esm,cjs --dts",
+    "release": "pnpm run build && changeset publish",
+    "watch": "vitest",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage"
   }
 }