@extk/expressive 0.8.0 → 0.10.0

package/dist/index.d.mts

@@ -1,13 +1,14 @@
 import * as express from 'express';
 import express__default, { RequestHandler } from 'express';
 import * as express_serve_static_core from 'express-serve-static-core';
-import { RouteParameters } from 'express-serve-static-core';
+import { RouteParameters, Query } from 'express-serve-static-core';
 import { HelmetOptions } from 'helmet';
 import morgan from 'morgan';
+import { SwaggerUiOptions, SwaggerOptions } from 'swagger-ui-express';
 
 type ExpressRoute = string;
 type ExpressLocalsObj = Record<string, any>;
-type ExpressHandler = RequestHandler<RouteParameters<ExpressRoute>, any, any, qs.ParsedQs, ExpressLocalsObj[]>;
+type ExpressHandler = RequestHandler<RouteParameters<ExpressRoute>, any, any, Query, ExpressLocalsObj>;
 type PaginationQuery = {
     limit?: string | number;
     page?: string | number;
@@ -187,25 +188,68 @@ type SwaggerConfig = {
     security?: AuthMethod[];
 };
 
-type SwaggerOptions = {
-    path?: ExpressRoute;
-    config: SwaggerConfig;
+declare class SwaggerBuilder {
+    private swaggerDoc;
+    constructor(swaggerDoc: SwaggerConfig);
+    withInfo(info: SwaggerConfig['info']): this;
+    withServers(servers: Servers): this;
+    withSecuritySchemes(schemes: Record<string, SecurityScheme>): this;
+    withSchemas(schemas: Record<string, Schema>): this;
+    withDefaultSecurity(globalAuthMethods: AuthMethod[]): this;
+}
+declare function singleFileSchema(field?: string, required?: boolean): Content;
+declare function formDataSchema(schema: Schema): Content;
+declare function jsonSchema(schema: Schema): Content;
+declare function jsonSchemaRef(name: string): Content;
+declare function param(inP: Param['in'], id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare function pathParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare function queryParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare function headerParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare const SWG: {
+    param: typeof param;
+    pathParam: typeof pathParam;
+    queryParam: typeof queryParam;
+    headerParam: typeof headerParam;
+    formDataSchema: typeof formDataSchema;
+    jsonSchema: typeof jsonSchema;
+    jsonSchemaRef: typeof jsonSchemaRef;
+    singleFileSchema: typeof singleFileSchema;
+    security: (name: string) => AuthMethod;
+    securitySchemes: {
+        readonly BasicAuth: () => SecurityScheme;
+        readonly BearerAuth: () => SecurityScheme;
+        readonly ApiKeyAuth: (headerName: string) => SecurityScheme;
+        readonly OpenID: (openIdConnectUrl: string) => SecurityScheme;
+        readonly OAuth2: (authorizationUrl: string, tokenUrl: string, scopes: Record<string, string>) => SecurityScheme;
+    };
+};
+
+type SwaggerRef = {
+    doc: SwaggerConfig | null;
+};
+type ExpressiveSwaggerOptions = {
+    path: ExpressRoute;
+    uiOpts?: SwaggerUiOptions;
+    options?: SwaggerOptions;
+    customCss?: string;
+    customfavIcon?: string;
+    swaggerUrl?: string;
+    customSiteTitle?: string;
 };
 declare class ServerBuilder {
     private app;
     private container;
-    constructor(app: express__default.Express, container: Container);
+    private swaggerRef;
+    constructor(app: express__default.Express, container: Container, swaggerRef: SwaggerRef);
     build(): express__default.Express;
     withHelmet(options?: Readonly<HelmetOptions>): this;
-    withQs(): this;
-    withMorgan(format?: string, // TODO: FormatFn
-    options?: Parameters<typeof morgan>[1]): this;
+    withMorgan(format?: string | morgan.FormatFn, options?: Parameters<typeof morgan>[1]): this;
     withRoutes(routes: express__default.Router): this;
     /**
      * Helper function for fluent design
      */
     with(fn: (app: express__default.Express, container: Container) => void): this;
-    withSwagger(swagger: SwaggerOptions, ...handlers: ExpressHandler[]): this;
+    withSwagger(configure: (builder: SwaggerBuilder) => void, opts: ExpressiveSwaggerOptions, ...handlers: ExpressHandler[]): this;
 }
 
 declare class ApiError extends Error {
@@ -252,43 +296,6 @@ declare class UserUnauthorizedError extends ApiError {
     constructor(message?: string);
 }
 
-declare class SwaggerBuilder {
-    private swaggerDoc;
-    constructor(swaggerDoc: SwaggerConfig);
-    withInfo(info: SwaggerConfig['info']): this;
-    withServers(servers: Servers): this;
-    withSecuritySchemes(schemes: Record<string, SecurityScheme>): this;
-    withSchemas(schemas: Record<string, Schema>): this;
-    withDefaultSecurity(globalAuthMethods: AuthMethod[]): this;
-    build(): SwaggerConfig;
-}
-declare function singleFileSchema(field?: string, required?: boolean): Content;
-declare function formDataSchema(schema: Schema): Content;
-declare function jsonSchema(schema: Schema): Content;
-declare function jsonSchemaRef(name: string): Content;
-declare function param(inP: Param['in'], id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare function pathParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare function queryParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare function headerParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare const SWG: {
-    param: typeof param;
-    pathParam: typeof pathParam;
-    queryParam: typeof queryParam;
-    headerParam: typeof headerParam;
-    formDataSchema: typeof formDataSchema;
-    jsonSchema: typeof jsonSchema;
-    jsonSchemaRef: typeof jsonSchemaRef;
-    singleFileSchema: typeof singleFileSchema;
-    security: (name: string) => AuthMethod;
-    securitySchemes: {
-        readonly BasicAuth: () => SecurityScheme;
-        readonly BearerAuth: () => SecurityScheme;
-        readonly ApiKeyAuth: (headerName: string) => SecurityScheme;
-        readonly OpenID: (openIdConnectUrl: string) => SecurityScheme;
-        readonly OAuth2: (authorizationUrl: string, tokenUrl: string, scopes: Record<string, string>) => SecurityScheme;
-    };
-};
-
 declare function parsePositiveInteger<T>(v: T, defaultValue: number, max?: number): number;
 declare function parseIdOrFail(v: unknown): number;
 declare function slugify(text: string): string;
@@ -317,7 +324,6 @@ declare class ApiResponse<T = undefined> {
 }
 
 declare function bootstrap(container: Container): {
-    swaggerBuilder: () => SwaggerBuilder;
     silently: (fn: () => Promise<void> | void) => Promise<void>;
     getGlobalNotFoundMiddleware: (content?: string) => (_req: express.Request, res: express.Response, _next: express.NextFunction) => void;
     getApiNotFoundMiddleware: () => (req: express.Request, res: express.Response, _next: express.NextFunction) => void;
@@ -348,4 +354,4 @@ declare function bootstrap(container: Container): {
     };
 };
 
-export { type AlertHandler, ApiError, ApiErrorResponse, ApiResponse, type AuthMethod, BadRequestError, type Container, type Content, type ContentType, DuplicateError, type Env, type ExpressHandler, type ExpressLocalsObj, type ExpressRoute, FileTooBigError, ForbiddenError, type HttpMethod, InternalError, InvalidCredentialsError, InvalidFileTypeError, type Logger, NotFoundError, type OtherString, type OtherUnknown, type Pagination, type PaginationQuery, type Param, type PathItem, SWG, type Schema, SchemaValidationError, type SecurityScheme, type Servers, type SwaggerConfig, TokenExpiredError, TooManyRequestsError, UserUnauthorizedError, bootstrap, getEnvVar, getTmpDir, getTmpPath, isDev, isProd, parseDefaultPagination, parseIdOrFail, parsePositiveInteger, slugify };
+export { type AlertHandler, ApiError, ApiErrorResponse, ApiResponse, type AuthMethod, BadRequestError, type Container, type Content, type ContentType, DuplicateError, type Env, type ExpressHandler, type ExpressLocalsObj, type ExpressRoute, FileTooBigError, ForbiddenError, type HttpMethod, InternalError, InvalidCredentialsError, InvalidFileTypeError, type Logger, NotFoundError, type OtherString, type OtherUnknown, type Pagination, type PaginationQuery, type Param, type PathItem, SWG, type Schema, SchemaValidationError, type SecurityScheme, type Servers, SwaggerBuilder, type SwaggerConfig, TokenExpiredError, TooManyRequestsError, UserUnauthorizedError, bootstrap, getEnvVar, getTmpDir, getTmpPath, isDev, isProd, parseDefaultPagination, parseIdOrFail, parsePositiveInteger, slugify };

package/dist/index.d.ts

@@ -1,13 +1,14 @@
 import * as express from 'express';
 import express__default, { RequestHandler } from 'express';
 import * as express_serve_static_core from 'express-serve-static-core';
-import { RouteParameters } from 'express-serve-static-core';
+import { RouteParameters, Query } from 'express-serve-static-core';
 import { HelmetOptions } from 'helmet';
 import morgan from 'morgan';
+import { SwaggerUiOptions, SwaggerOptions } from 'swagger-ui-express';
 
 type ExpressRoute = string;
 type ExpressLocalsObj = Record<string, any>;
-type ExpressHandler = RequestHandler<RouteParameters<ExpressRoute>, any, any, qs.ParsedQs, ExpressLocalsObj[]>;
+type ExpressHandler = RequestHandler<RouteParameters<ExpressRoute>, any, any, Query, ExpressLocalsObj>;
 type PaginationQuery = {
     limit?: string | number;
     page?: string | number;
@@ -187,25 +188,68 @@ type SwaggerConfig = {
     security?: AuthMethod[];
 };
 
-type SwaggerOptions = {
-    path?: ExpressRoute;
-    config: SwaggerConfig;
+declare class SwaggerBuilder {
+    private swaggerDoc;
+    constructor(swaggerDoc: SwaggerConfig);
+    withInfo(info: SwaggerConfig['info']): this;
+    withServers(servers: Servers): this;
+    withSecuritySchemes(schemes: Record<string, SecurityScheme>): this;
+    withSchemas(schemas: Record<string, Schema>): this;
+    withDefaultSecurity(globalAuthMethods: AuthMethod[]): this;
+}
+declare function singleFileSchema(field?: string, required?: boolean): Content;
+declare function formDataSchema(schema: Schema): Content;
+declare function jsonSchema(schema: Schema): Content;
+declare function jsonSchemaRef(name: string): Content;
+declare function param(inP: Param['in'], id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare function pathParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare function queryParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare function headerParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
+declare const SWG: {
+    param: typeof param;
+    pathParam: typeof pathParam;
+    queryParam: typeof queryParam;
+    headerParam: typeof headerParam;
+    formDataSchema: typeof formDataSchema;
+    jsonSchema: typeof jsonSchema;
+    jsonSchemaRef: typeof jsonSchemaRef;
+    singleFileSchema: typeof singleFileSchema;
+    security: (name: string) => AuthMethod;
+    securitySchemes: {
+        readonly BasicAuth: () => SecurityScheme;
+        readonly BearerAuth: () => SecurityScheme;
+        readonly ApiKeyAuth: (headerName: string) => SecurityScheme;
+        readonly OpenID: (openIdConnectUrl: string) => SecurityScheme;
+        readonly OAuth2: (authorizationUrl: string, tokenUrl: string, scopes: Record<string, string>) => SecurityScheme;
+    };
+};
+
+type SwaggerRef = {
+    doc: SwaggerConfig | null;
+};
+type ExpressiveSwaggerOptions = {
+    path: ExpressRoute;
+    uiOpts?: SwaggerUiOptions;
+    options?: SwaggerOptions;
+    customCss?: string;
+    customfavIcon?: string;
+    swaggerUrl?: string;
+    customSiteTitle?: string;
 };
 declare class ServerBuilder {
     private app;
     private container;
-    constructor(app: express__default.Express, container: Container);
+    private swaggerRef;
+    constructor(app: express__default.Express, container: Container, swaggerRef: SwaggerRef);
     build(): express__default.Express;
     withHelmet(options?: Readonly<HelmetOptions>): this;
-    withQs(): this;
-    withMorgan(format?: string, // TODO: FormatFn
-    options?: Parameters<typeof morgan>[1]): this;
+    withMorgan(format?: string | morgan.FormatFn, options?: Parameters<typeof morgan>[1]): this;
     withRoutes(routes: express__default.Router): this;
     /**
      * Helper function for fluent design
      */
     with(fn: (app: express__default.Express, container: Container) => void): this;
-    withSwagger(swagger: SwaggerOptions, ...handlers: ExpressHandler[]): this;
+    withSwagger(configure: (builder: SwaggerBuilder) => void, opts: ExpressiveSwaggerOptions, ...handlers: ExpressHandler[]): this;
 }
 
 declare class ApiError extends Error {
@@ -252,43 +296,6 @@ declare class UserUnauthorizedError extends ApiError {
     constructor(message?: string);
 }
 
-declare class SwaggerBuilder {
-    private swaggerDoc;
-    constructor(swaggerDoc: SwaggerConfig);
-    withInfo(info: SwaggerConfig['info']): this;
-    withServers(servers: Servers): this;
-    withSecuritySchemes(schemes: Record<string, SecurityScheme>): this;
-    withSchemas(schemas: Record<string, Schema>): this;
-    withDefaultSecurity(globalAuthMethods: AuthMethod[]): this;
-    build(): SwaggerConfig;
-}
-declare function singleFileSchema(field?: string, required?: boolean): Content;
-declare function formDataSchema(schema: Schema): Content;
-declare function jsonSchema(schema: Schema): Content;
-declare function jsonSchemaRef(name: string): Content;
-declare function param(inP: Param['in'], id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare function pathParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare function queryParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare function headerParam(id: string, schema: Schema, required?: boolean, description?: string, name?: string): Param;
-declare const SWG: {
-    param: typeof param;
-    pathParam: typeof pathParam;
-    queryParam: typeof queryParam;
-    headerParam: typeof headerParam;
-    formDataSchema: typeof formDataSchema;
-    jsonSchema: typeof jsonSchema;
-    jsonSchemaRef: typeof jsonSchemaRef;
-    singleFileSchema: typeof singleFileSchema;
-    security: (name: string) => AuthMethod;
-    securitySchemes: {
-        readonly BasicAuth: () => SecurityScheme;
-        readonly BearerAuth: () => SecurityScheme;
-        readonly ApiKeyAuth: (headerName: string) => SecurityScheme;
-        readonly OpenID: (openIdConnectUrl: string) => SecurityScheme;
-        readonly OAuth2: (authorizationUrl: string, tokenUrl: string, scopes: Record<string, string>) => SecurityScheme;
-    };
-};
-
 declare function parsePositiveInteger<T>(v: T, defaultValue: number, max?: number): number;
 declare function parseIdOrFail(v: unknown): number;
 declare function slugify(text: string): string;
@@ -317,7 +324,6 @@ declare class ApiResponse<T = undefined> {
 }
 
 declare function bootstrap(container: Container): {
-    swaggerBuilder: () => SwaggerBuilder;
     silently: (fn: () => Promise<void> | void) => Promise<void>;
     getGlobalNotFoundMiddleware: (content?: string) => (_req: express.Request, res: express.Response, _next: express.NextFunction) => void;
     getApiNotFoundMiddleware: () => (req: express.Request, res: express.Response, _next: express.NextFunction) => void;
@@ -348,4 +354,4 @@ declare function bootstrap(container: Container): {
     };
 };
 
-export { type AlertHandler, ApiError, ApiErrorResponse, ApiResponse, type AuthMethod, BadRequestError, type Container, type Content, type ContentType, DuplicateError, type Env, type ExpressHandler, type ExpressLocalsObj, type ExpressRoute, FileTooBigError, ForbiddenError, type HttpMethod, InternalError, InvalidCredentialsError, InvalidFileTypeError, type Logger, NotFoundError, type OtherString, type OtherUnknown, type Pagination, type PaginationQuery, type Param, type PathItem, SWG, type Schema, SchemaValidationError, type SecurityScheme, type Servers, type SwaggerConfig, TokenExpiredError, TooManyRequestsError, UserUnauthorizedError, bootstrap, getEnvVar, getTmpDir, getTmpPath, isDev, isProd, parseDefaultPagination, parseIdOrFail, parsePositiveInteger, slugify };
+export { type AlertHandler, ApiError, ApiErrorResponse, ApiResponse, type AuthMethod, BadRequestError, type Container, type Content, type ContentType, DuplicateError, type Env, type ExpressHandler, type ExpressLocalsObj, type ExpressRoute, FileTooBigError, ForbiddenError, type HttpMethod, InternalError, InvalidCredentialsError, InvalidFileTypeError, type Logger, NotFoundError, type OtherString, type OtherUnknown, type Pagination, type PaginationQuery, type Param, type PathItem, SWG, type Schema, SchemaValidationError, type SecurityScheme, type Servers, SwaggerBuilder, type SwaggerConfig, TokenExpiredError, TooManyRequestsError, UserUnauthorizedError, bootstrap, getEnvVar, getTmpDir, getTmpPath, isDev, isProd, parseDefaultPagination, parseIdOrFail, parsePositiveInteger, slugify };

package/dist/index.js

@@ -63,7 +63,6 @@ module.exports = __toCommonJS(index_exports);
 var import_express = __toESM(require("express"));
 var import_helmet = __toESM(require("helmet"));
 var import_morgan = __toESM(require("morgan"));
-var import_qs = __toESM(require("qs"));
 var import_swagger_ui_express = __toESM(require("swagger-ui-express"));
 
 // src/swagger.ts
@@ -91,9 +90,6 @@ var SwaggerBuilder = class {
     this.swaggerDoc.security = globalAuthMethods;
     return this;
   }
-  build() {
-    return this.swaggerDoc;
-  }
 };
 var securitySchemes = {
   BasicAuth: () => ({
@@ -211,28 +207,22 @@ var SWG = {
 
 // src/expressive.ts
 var ServerBuilder = class {
-  constructor(app, container) {
+  constructor(app, container, swaggerRef) {
     this.app = app;
     this.container = container;
+    this.swaggerRef = swaggerRef;
   }
   build() {
+    this.swaggerRef.doc = null;
     return this.app;
   }
   withHelmet(options) {
     this.app.use((0, import_helmet.default)(options ?? {}));
     return this;
   }
-  withQs() {
-    this.app.set("query parser", function(str) {
-      return import_qs.default.parse(str, { decoder(s) {
-        return decodeURIComponent(s);
-      } });
-    });
-    return this;
-  }
   withMorgan(format, options) {
     this.app.use((0, import_morgan.default)(
-      format ?? ":req[x-real-ip] :method :url :status :res[content-length] - :response-time ms",
+      format ?? ":remote-addr :method :url :status :res[content-length] - :response-time ms",
       options ?? { stream: { write: (message) => {
         this.container.logger.info(message.trim());
       } } }
@@ -250,18 +240,45 @@ var ServerBuilder = class {
     fn(this.app, this.container);
     return this;
   }
-  withSwagger(swagger, ...handlers) {
-    this.app.use(swagger.path ?? "/api-docs", ...handlers, import_swagger_ui_express.default.serve, import_swagger_ui_express.default.setup(swagger.config, {
-      customSiteTitle: swagger.config.info?.title
-    }));
+  withSwagger(configure, opts, ...handlers) {
+    const config = this.swaggerRef.doc;
+    if (!config) throw new Error("withSwagger must be called before build()");
+    configure(new SwaggerBuilder(config));
+    const { path: path2, uiOpts, options, customCss, customfavIcon, swaggerUrl, customSiteTitle } = opts;
+    const uiOptsWithDefaults = {
+      customSiteTitle: config.info?.title,
+      ...uiOpts
+    };
+    this.app.use(
+      path2,
+      ...handlers,
+      import_swagger_ui_express.default.serve,
+      import_swagger_ui_express.default.setup(
+        config,
+        uiOptsWithDefaults,
+        options,
+        customCss,
+        customfavIcon,
+        swaggerUrl,
+        customSiteTitle
+      )
+    );
     return this;
   }
 };
-function buildExpressive(container, swaggerDoc) {
+function buildExpressive(container) {
+  const swaggerRef = {
+    doc: {
+      openapi: "3.1.0",
+      info: {},
+      paths: {},
+      components: {}
+    }
+  };
   return {
     expressiveServer(configs) {
       const app = configs?.app ?? (0, import_express.default)();
-      return new ServerBuilder(app, container);
+      return new ServerBuilder(app, container, swaggerRef);
     },
     expressiveRouter(configs) {
       const router = import_express.default.Router();
@@ -304,10 +321,12 @@ function buildExpressive(container, swaggerDoc) {
           } else {
             pathItem.parameters.push(...tryParsePathParameters(route));
           }
-          if (!swaggerDoc.paths[route]) {
-            swaggerDoc.paths[route] = {};
+          if (swaggerRef.doc) {
+            if (!swaggerRef.doc.paths[route]) {
+              swaggerRef.doc.paths[route] = {};
+            }
+            swaggerRef.doc.paths[route][context.method] = pathItem;
           }
-          swaggerDoc.paths[route][context.method] = pathItem;
           return router;
         }
       };
@@ -545,17 +564,9 @@ var ApiResponse = class {
 
 // src/index.ts
 function bootstrap(container) {
-  const swaggerDoc = {
-    openapi: "3.1.0",
-    // TODO
-    info: {},
-    paths: {},
-    components: {}
-  };
   return {
-    ...buildExpressive(container, swaggerDoc),
+    ...buildExpressive(container),
     ...buildMiddleware(container),
-    swaggerBuilder: () => new SwaggerBuilder(swaggerDoc),
     silently: async (fn) => {
       try {
         await fn();

package/dist/index.mjs

@@ -2,7 +2,6 @@
 import express from "express";
 import helmet from "helmet";
 import morgan from "morgan";
-import qs from "qs";
 import swaggerUi from "swagger-ui-express";
 
 // src/swagger.ts
@@ -30,9 +29,6 @@ var SwaggerBuilder = class {
     this.swaggerDoc.security = globalAuthMethods;
     return this;
   }
-  build() {
-    return this.swaggerDoc;
-  }
 };
 var securitySchemes = {
   BasicAuth: () => ({
@@ -150,28 +146,22 @@ var SWG = {
 
 // src/expressive.ts
 var ServerBuilder = class {
-  constructor(app, container) {
+  constructor(app, container, swaggerRef) {
     this.app = app;
     this.container = container;
+    this.swaggerRef = swaggerRef;
   }
   build() {
+    this.swaggerRef.doc = null;
     return this.app;
   }
   withHelmet(options) {
     this.app.use(helmet(options ?? {}));
     return this;
   }
-  withQs() {
-    this.app.set("query parser", function(str) {
-      return qs.parse(str, { decoder(s) {
-        return decodeURIComponent(s);
-      } });
-    });
-    return this;
-  }
   withMorgan(format, options) {
     this.app.use(morgan(
-      format ?? ":req[x-real-ip] :method :url :status :res[content-length] - :response-time ms",
+      format ?? ":remote-addr :method :url :status :res[content-length] - :response-time ms",
       options ?? { stream: { write: (message) => {
         this.container.logger.info(message.trim());
       } } }
@@ -189,18 +179,45 @@ var ServerBuilder = class {
     fn(this.app, this.container);
     return this;
   }
-  withSwagger(swagger, ...handlers) {
-    this.app.use(swagger.path ?? "/api-docs", ...handlers, swaggerUi.serve, swaggerUi.setup(swagger.config, {
-      customSiteTitle: swagger.config.info?.title
-    }));
+  withSwagger(configure, opts, ...handlers) {
+    const config = this.swaggerRef.doc;
+    if (!config) throw new Error("withSwagger must be called before build()");
+    configure(new SwaggerBuilder(config));
+    const { path: path2, uiOpts, options, customCss, customfavIcon, swaggerUrl, customSiteTitle } = opts;
+    const uiOptsWithDefaults = {
+      customSiteTitle: config.info?.title,
+      ...uiOpts
+    };
+    this.app.use(
+      path2,
+      ...handlers,
+      swaggerUi.serve,
+      swaggerUi.setup(
+        config,
+        uiOptsWithDefaults,
+        options,
+        customCss,
+        customfavIcon,
+        swaggerUrl,
+        customSiteTitle
+      )
+    );
     return this;
   }
 };
-function buildExpressive(container, swaggerDoc) {
+function buildExpressive(container) {
+  const swaggerRef = {
+    doc: {
+      openapi: "3.1.0",
+      info: {},
+      paths: {},
+      components: {}
+    }
+  };
   return {
     expressiveServer(configs) {
       const app = configs?.app ?? express();
-      return new ServerBuilder(app, container);
+      return new ServerBuilder(app, container, swaggerRef);
     },
     expressiveRouter(configs) {
       const router = express.Router();
@@ -243,10 +260,12 @@ function buildExpressive(container, swaggerDoc) {
           } else {
             pathItem.parameters.push(...tryParsePathParameters(route));
           }
-          if (!swaggerDoc.paths[route]) {
-            swaggerDoc.paths[route] = {};
+          if (swaggerRef.doc) {
+            if (!swaggerRef.doc.paths[route]) {
+              swaggerRef.doc.paths[route] = {};
+            }
+            swaggerRef.doc.paths[route][context.method] = pathItem;
           }
-          swaggerDoc.paths[route][context.method] = pathItem;
           return router;
         }
       };
@@ -484,17 +503,9 @@ var ApiResponse = class {
 
 // src/index.ts
 function bootstrap(container) {
-  const swaggerDoc = {
-    openapi: "3.1.0",
-    // TODO
-    info: {},
-    paths: {},
-    components: {}
-  };
   return {
-    ...buildExpressive(container, swaggerDoc),
+    ...buildExpressive(container),
     ...buildMiddleware(container),
-    swaggerBuilder: () => new SwaggerBuilder(swaggerDoc),
     silently: async (fn) => {
       try {
         await fn();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@extk/expressive",
-    "version": "0.8.0",
+    "version": "0.10.0",
     "type": "commonjs",
     "publishConfig": {
         "access": "public"
@@ -25,7 +25,7 @@
         "lint": "eslint ./"
     },
     "devDependencies": {
-        "@extk/eslint-config": "^0.2.1",
+        "@extk/eslint-config": "^0.3.0",
         "@extk/tsconfig": "0.1.1",
         "@types/chance": "^1.1.7",
         "@types/express": "^5.0.1",
@@ -33,7 +33,7 @@
         "@types/node": "^20.9.3",
         "@types/swagger-ui-express": "^4.1.8",
         "chance": "^1.1.13",
-        "eslint": "^9.36.0",
+        "eslint": "^10.0.3",
         "tsup": "^8.5.0",
         "tsx": "^4.20.3",
         "typescript": "^5.9.2"
@@ -45,7 +45,6 @@
         "dotenv": "^17.1.0",
         "helmet": "^8.0.0",
         "morgan": "^1.10.0",
-        "qs": "^6.14.1",
         "swagger-ui-express": "^5.0.1"
     },
     "author": "",