serverstruct 0.1.1 → 0.3.0

package/README.md

@@ -1,3 +1,211 @@
-# 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 with Hono and [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 { createModule } from "serverstruct";
+
+const app = createModule()
+  .route((app) => {
+    return app.get("/", (c) => c.text("Hello world!"));
+  })
+  .app();
+
+export default app;
+```
+
+### An app with submodules
+
+```ts
+import { createModule } from "serverstruct";
+
+// users routes
+const users = createModule().route((app) => {
+  return app.get("/", (c) => c.text("users"));
+});
+
+// posts routes
+const posts = createModule().route((app) => {
+  return app.get("/", (c) => c.text("posts"));
+});
+
+const app = createModule()
+  .submodules({ users, posts })
+  .route((app, container, modules) => {
+    return app
+      .get("/", (c) => c.text("Hello world!"))
+      .route("/users", modules.users)
+      .route("/posts", modules.posts);
+  })
+  .app();
+
+export default app;
+```
+
+## Module
+
+A module is a Hono app that may require dependencies or provide dependencies of it's own. A module may compose other submodules. A module with dependencies can only be used as a submodule to another module if that module satisfies it's dependencies.
+
+```ts
+import { createModule } from "serverstruct";
+
+const auth = createModule().route((app) => {
+  return app; // chain route handlers here
+});
+
+const users = createModule().route((app) => {
+  return app; // chain route handlers here
+});
+
+const app = createModule()
+  .submodules({ auth, users })
+  .route((app, container, modules) => {
+    return app.route("/auth", modules.auth).route("/users", modules.users);
+  })
+  .app();
+```
+
+Submodules are not automatically added to the Hono app, you will have to manually mount each route. This helps in preserving Hono's type inference through method chaining.
+
+You may also pass a custom Hono app to createModule.
+
+```ts
+import { Hono } from "hono";
+import { createModule } from "serverstruct";
+
+const auth = createModule(new Hono().basePath("/auth")).route((app) => {
+  return app; // chain route handlers here
+});
+
+const users = createModule(new Hono().basePath("/users")).route((app) => {
+  return app; // chain route handlers here
+});
+
+const app = createModule()
+  .submodules({ auth, users })
+  .route((app, container, modules) => {
+    return app.route("", modules.auth).route("", modules.users);
+  })
+  .app();
+```
+
+## Dependency Injection
+
+Serverstruct is designed to work with [Hollywood DI](https://github.com/eriicafes/hollywood-di). Modules can define their dependencies using `use`, and also register new tokens using `provide`.
+
+A root container can also be passed to a module. 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 module dependencies. The module 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
+import { Hollywood } from "hollywood-di";
+import { createModule } from "serverstruct";
+
+interface Counter {
+  count: number;
+  increment(): void;
+}
+
+const countModule = createModule()
+  .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 submodule
+const app = createModule()
+  .provide({ counter: LinearCounter })
+  .submodules({ count: countModule })
+  .route((app, _, modules) => {
+    return app.route("", modules.count);
+  })
+  .app();
+
+// or as the main app
+const container = Hollywood.create({ counter: LinearCounter });
+const app = countModule.app(container);
+```
+
+Calling `Module.app()` returns the Hono app, so if the module 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 module and in futher calls to `provide`. See more about register tokens in [Hollywood DI](https://github.com/eriicafes/hollywood-di#tokens).
+
+```ts
+import { createModule } from "serverstruct";
+
+class Foo {}
+class Bar {
+  constructor(public ctx: { foo: Foo }) {}
+}
+
+const module = createModule()
+  .provide({
+    foo: Foo,
+    bar: Bar,
+  })
+  .module((app, container) => {
+    return app;
+  });
+```
+
+## Incremental Adoption
+
+Serverstruct can be added to an existing Hono app.
+
+```ts
+// modules/posts.ts
+import { createModule } from "serverstruct";
+
+export const postsModule = createModule().route((app) => {
+  return app.get("/", (c) => {
+    return c.text("posts");
+  });
+});
+
+// main.ts
+import { Hono } from "hono";
+import { postsModule } from "./modules/posts";
+
+const app = new Hono();
+
+app.get("/", (c) => c.text("Hello world!"));
+app.route("/posts", postsModule.app());
+
+export default app;
+```

package/dist/index.d.mts

@@ -1,57 +1,46 @@
-import { InitFactory, InstantiableConstructor, RegisterTokens, inferContainer, Hollywood, AnyHollywood } from 'hollywood-di';
-import { Env, Hono } from 'hono';
+import { HollywoodOf, AnyHollywood, RegisterTokens, InferContainer, ContainerOptions, Hollywood } from 'hollywood-di';
+import { Hono } from 'hono';
 
-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 Spread<T> = {
+    [K in keyof T]: T[K];
+} & {};
+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 SubModule<T extends Record<string, any> = any> = {
+    app: (container: IsEmptyObject<T> extends true ? HollywoodOf<any> | undefined : HollywoodOf<T>) => Hono<any, 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 SubModules<TContainer extends Record<string, any> = any> = Record<string, SubModule<TContainer>>;
+type InferSubModules<R extends SubModules = {}> = {
+    [K in keyof R]: R[K] extends Module<infer App, any, any> ? App : never;
+} & {};
+declare class Module<App extends Hono<any, any, any>, Deps extends Record<string, any>, Modules extends SubModules> {
+    private _context;
+    private _route;
+    constructor(_context: [
+        tokens: {
+            tokens: RegisterTokens<any, any>;
+            options?: ContainerOptions;
+        } | undefined,
+        routes: SubModules<any>
+    ][], _route: (container: Deps, modules: InferSubModules<Modules>) => App);
+    app(container: IsEmptyObject<Deps> extends true ? HollywoodOf<any> | undefined : HollywoodOf<Deps>): App;
+    app(): 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 ModuleBuilder<App extends Hono<any, any, any>, Deps extends Record<string, any>, Modules extends SubModules, Container extends AnyHollywood | undefined> {
+    private app;
+    constructor(app: App);
+    private context;
+    use<T extends Container extends AnyHollywood ? never : Record<string, any>>(): Container extends AnyHollywood ? never : ModuleBuilder<App, T, Modules, HollywoodOf<T>>;
+    provide<T extends Record<string, any> = {}>(tokens: RegisterTokens<T, Container extends AnyHollywood ? InferContainer<Container> : Deps>, options?: ContainerOptions): ModuleBuilder<App, Deps, Modules, Container extends AnyHollywood ? Hollywood<T, InferContainer<Container>> : Hollywood<T, {}>>;
+    submodules<T extends SubModules<Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps>>(modules: T): ModuleBuilder<App, Deps, Spread<Merge<T, Modules>>, Container>;
+    route<T extends Hono<any, any, any>>(fn: (app: App, container: Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps, modules: InferSubModules<Modules>) => T): Module<T, Deps, Modules>;
 }
-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 createModule<App extends Hono<any, any, any> = Hono>(app: App): ModuleBuilder<App, {}, {}, undefined>;
+declare function createModule(): ModuleBuilder<Hono, {}, {}, undefined>;
 
-export { Controller, ControllerContext, Module, ModuleConfig, Router, Serverstruct, createController, createModule, inferController, serverstruct };
+export { createModule };

package/dist/index.d.ts

@@ -1,57 +1,46 @@
-import { InitFactory, InstantiableConstructor, RegisterTokens, inferContainer, Hollywood, AnyHollywood } from 'hollywood-di';
-import { Env, Hono } from 'hono';
+import { HollywoodOf, AnyHollywood, RegisterTokens, InferContainer, ContainerOptions, Hollywood } from 'hollywood-di';
+import { Hono } from 'hono';
 
-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 Spread<T> = {
+    [K in keyof T]: T[K];
+} & {};
+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 SubModule<T extends Record<string, any> = any> = {
+    app: (container: IsEmptyObject<T> extends true ? HollywoodOf<any> | undefined : HollywoodOf<T>) => Hono<any, 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 SubModules<TContainer extends Record<string, any> = any> = Record<string, SubModule<TContainer>>;
+type InferSubModules<R extends SubModules = {}> = {
+    [K in keyof R]: R[K] extends Module<infer App, any, any> ? App : never;
+} & {};
+declare class Module<App extends Hono<any, any, any>, Deps extends Record<string, any>, Modules extends SubModules> {
+    private _context;
+    private _route;
+    constructor(_context: [
+        tokens: {
+            tokens: RegisterTokens<any, any>;
+            options?: ContainerOptions;
+        } | undefined,
+        routes: SubModules<any>
+    ][], _route: (container: Deps, modules: InferSubModules<Modules>) => App);
+    app(container: IsEmptyObject<Deps> extends true ? HollywoodOf<any> | undefined : HollywoodOf<Deps>): App;
+    app(): 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 ModuleBuilder<App extends Hono<any, any, any>, Deps extends Record<string, any>, Modules extends SubModules, Container extends AnyHollywood | undefined> {
+    private app;
+    constructor(app: App);
+    private context;
+    use<T extends Container extends AnyHollywood ? never : Record<string, any>>(): Container extends AnyHollywood ? never : ModuleBuilder<App, T, Modules, HollywoodOf<T>>;
+    provide<T extends Record<string, any> = {}>(tokens: RegisterTokens<T, Container extends AnyHollywood ? InferContainer<Container> : Deps>, options?: ContainerOptions): ModuleBuilder<App, Deps, Modules, Container extends AnyHollywood ? Hollywood<T, InferContainer<Container>> : Hollywood<T, {}>>;
+    submodules<T extends SubModules<Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps>>(modules: T): ModuleBuilder<App, Deps, Spread<Merge<T, Modules>>, Container>;
+    route<T extends Hono<any, any, any>>(fn: (app: App, container: Container extends AnyHollywood ? KnownMappedKeys<InferContainer<Container>> : Deps, modules: InferSubModules<Modules>) => T): Module<T, Deps, Modules>;
 }
-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 createModule<App extends Hono<any, any, any> = Hono>(app: App): ModuleBuilder<App, {}, {}, undefined>;
+declare function createModule(): ModuleBuilder<Hono, {}, {}, undefined>;
 
-export { Controller, ControllerContext, Module, ModuleConfig, Router, Serverstruct, createController, createModule, inferController, serverstruct };
+export { createModule };

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,83 @@ 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
+var index_exports = {};
+__export(index_exports, {
+  createModule: () => createModule
 });
-module.exports = __toCommonJS(src_exports);
-var import_hono2 = require("hono");
+module.exports = __toCommonJS(index_exports);
 
-// src/controller.ts
-var import_auto_bind = __toESM(require("auto-bind"));
+// src/module.ts
 var import_hollywood_di = require("hollywood-di");
 var import_hono = require("hono");
-var ControllerDef = class {
-  constructor(path, route) {
-    this.path = path;
-    this.route = route;
+var Module = class {
+  constructor(_context, _route) {
+    this._context = _context;
+    this._route = _route;
   }
-  mountTo(parent) {
-    const router = new import_hono.Hono();
-    const mountedRouter = this.route(router);
-    parent.route(this.path, mountedRouter);
+  app(container) {
+    let currentContainer = container;
+    const resolvedModules = {};
+    for (const [tokens, submodules] 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, submodule] of Object.entries(submodules)) {
+        resolvedModules[key] = submodule.app(subContainer);
+      }
+    }
+    const instances = currentContainer?.instances ?? {};
+    return this._route(
+      instances,
+      resolvedModules
+    );
   }
 };
-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 ModuleBuilder = class {
+  constructor(app) {
+    this.app = app;
+    this.context = [];
+  }
+  use() {
+    return this;
+  }
+  provide(tokens, options) {
+    this.context.push([{ tokens, options }, {}]);
+    return this;
+  }
+  submodules(modules) {
+    if (!this.context.length) this.context.push([void 0, modules]);
+    else {
+      const [, submodules] = this.context[this.context.length - 1];
+      Object.assign(submodules, modules);
     }
-  };
-}
-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 Module(this.context, (container, modules) => {
+      return fn(
+        this.app,
+        container,
+        modules
+      );
+    });
   }
-  app.route(module2.path, subapp);
+};
+function createModule(app) {
+  return new ModuleBuilder(app ?? new import_hono.Hono());
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createController,
-  createModule,
-  serverstruct
+  createModule
 });

package/dist/index.mjs

@@ -1,99 +1,72 @@
-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/module.ts
+import {
+  Hollywood
+} from "hollywood-di";
 import { Hono } from "hono";
-var ControllerDef = class {
-  constructor(path, route) {
-    this.path = path;
-    this.route = route;
+var Module = class {
+  constructor(_context, _route) {
+    this._context = _context;
+    this._route = _route;
   }
-  mountTo(parent) {
-    const router = new Hono();
-    const mountedRouter = this.route(router);
-    parent.route(this.path, mountedRouter);
+  app(container) {
+    let currentContainer = container;
+    const resolvedModules = {};
+    for (const [tokens, submodules] 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, submodule] of Object.entries(submodules)) {
+        resolvedModules[key] = submodule.app(subContainer);
+      }
+    }
+    const instances = currentContainer?.instances ?? {};
+    return this._route(
+      instances,
+      resolvedModules
+    );
   }
 };
-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 ModuleBuilder = class {
+  constructor(app) {
+    this.app = app;
+    this.context = [];
+  }
+  use() {
+    return this;
+  }
+  provide(tokens, options) {
+    this.context.push([{ tokens, options }, {}]);
+    return this;
+  }
+  submodules(modules) {
+    if (!this.context.length) this.context.push([void 0, modules]);
+    else {
+      const [, submodules] = this.context[this.context.length - 1];
+      Object.assign(submodules, modules);
     }
-  };
-}
-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 Module(this.context, (container, modules) => {
+      return fn(
+        this.app,
+        container,
+        modules
+      );
+    });
   }
-  app.route(module.path, subapp);
+};
+function createModule(app) {
+  return new ModuleBuilder(app ?? new Hono());
 }
 export {
-  createController,
-  createModule,
-  serverstruct
+  createModule
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverstruct",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "Type safe and modular servers with Hono",
   "private": false,
   "main": "./dist/index.js",
@@ -14,9 +14,8 @@
     }
   },
   "keywords": [
-    "command",
-    "cli",
-    "sade",
+    "hono",
+    "server",
     "hollywood-di",
     "typescript"
   ],
@@ -30,29 +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",
+    "@changesets/cli": "^2.27.12",
+    "@types/node": "^20.17.17",
+    "@vitest/coverage-v8": "^3.0.5",
     "shx": "^0.3.4",
-    "supertest": "^6.3.3",
-    "tsup": "^7.1.0",
-    "typescript": "^5.1.6",
-    "vitest": "^0.33.0"
+    "tsup": "^8.3.6",
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.5"
   },
   "peerDependencies": {
-    "hollywood-di": ">= 0.2.1",
-    "hono": ">= 3.3.0"
+    "hollywood-di": ">= 0.6.1",
+    "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": "vitest run",
+    "test:coverage": "vitest run --coverage"
   }
 }

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# serverstruct
-
-## 0.1.1
-
-### Patch Changes
-
-- 609146c: Bump CI node version to v18