@extk/expressive 0.3.1 → 0.4.0

package/dist/index.d.mts

@@ -1,10 +1,10 @@
-import winston, { Logger as Logger$1 } from 'winston';
 import * as express from 'express';
-import { RequestHandler, Request } from 'express';
+import express__default, { RequestHandler, Request } from 'express';
 import * as express_serve_static_core from 'express-serve-static-core';
 import { RouteParameters } from 'express-serve-static-core';
-import * as morgan from 'morgan';
-import * as helmet from 'helmet';
+import winston, { Logger as Logger$1 } from 'winston';
+import { HelmetOptions } from 'helmet';
+import morgan from 'morgan';
 
 type ExpressRoute = string;
 type ExpressLocalsObj = Record<string, any>;
@@ -162,6 +162,23 @@ type SwaggerConfig = {
     security?: AuthMethod[];
 };
 
+type SwaggerOptions = {
+    path?: ExpressRoute;
+    doc: SwaggerConfig;
+};
+declare class ServerBuilder {
+    private app;
+    private container;
+    constructor(app: express__default.Express, container: Container);
+    get(): express__default.Express;
+    withHelmet(options?: Readonly<HelmetOptions>): this;
+    withQs(): this;
+    withMorgan(format?: string, // TODO: FormatFn
+    options?: Parameters<typeof morgan>[1]): this;
+    withSwagger(swagger: SwaggerOptions, ...handlers: ExpressHandler[]): this;
+    withDefaults(swagger: SwaggerOptions): express__default.Express;
+}
+
 declare class ApiError extends Error {
     readonly code: string;
     readonly httpStatusCode: number;
@@ -206,27 +223,16 @@ declare class UserUnauthorizedError extends ApiError {
     constructor(message?: string);
 }
 
-declare function parsePositiveInteger<T>(v: T, defaultValue: number, max?: number): number;
-declare function parseIdOrFail(v: unknown): number;
-declare function slugify(text: string): string;
-declare function getTmpDir(): string;
-declare function getTmpPath(...steps: string[]): string;
-declare function parseDefaultPagination(query: PaginationQuery): Pagination;
-declare function createReqSnapshot(req: Request & {
-    user?: {
-        id?: string | number;
-    };
-}): ReqSnapshot;
-
-declare function isDev(): boolean;
-declare function isProd(): boolean;
-declare function getEnvVar(configName: string): string;
-type Env = 'dev' | 'prod' | OtherString;
-
-declare const createLogger: (options?: winston.LoggerOptions) => winston.Logger;
-declare const getDefaultFileLogger: (name?: string) => winston.Logger;
-declare const getDefaultConsoleLogger: (name?: string) => winston.Logger;
-
+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;
+    get(): SwaggerConfig;
+}
 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;
@@ -250,6 +256,27 @@ declare const SWG: {
     };
 };
 
+declare function parsePositiveInteger<T>(v: T, defaultValue: number, max?: number): number;
+declare function parseIdOrFail(v: unknown): number;
+declare function slugify(text: string): string;
+declare function getTmpDir(): string;
+declare function getTmpPath(...steps: string[]): string;
+declare function parseDefaultPagination(query: PaginationQuery): Pagination;
+declare function createReqSnapshot(req: Request & {
+    user?: {
+        id?: string | number;
+    };
+}): ReqSnapshot;
+
+declare function isDev(): boolean;
+declare function isProd(): boolean;
+declare function getEnvVar(configName: string): string;
+type Env = 'dev' | 'prod' | OtherString;
+
+declare const createLogger: (options?: winston.LoggerOptions) => winston.Logger;
+declare const getDefaultFileLogger: (name?: string) => winston.Logger;
+declare const getDefaultConsoleLogger: (name?: string) => winston.Logger;
+
 declare class ApiErrorResponse<T = undefined> {
     readonly status = "error";
     readonly message: string;
@@ -265,134 +292,20 @@ declare class ApiResponse<T = undefined> {
 }
 
 declare function bootstrap(container: Container): {
-    notFoundMiddleware: (_req: express.Request, res: express.Response, _next: express.NextFunction) => void;
+    swaggerBuilder: () => SwaggerBuilder;
     silently: (fn: () => Promise<void>, reqSnapshot?: ReqSnapshot) => void;
+    notFoundMiddleware: (_req: express.Request, res: express.Response, _next: express.NextFunction) => void;
     getErrorHandlerMiddleware: (errorMapper?: (err: Error & Record<string, unknown>) => ApiError | null | undefined) => (err: Error & Record<string, unknown>, req: express.Request, res: express.Response, _next: express.NextFunction) => Promise<void>;
-    swaggerBuilder: () => {
-        readonly withInfo: (info: SwaggerConfig["info"]) => {
-            readonly withInfo: /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withServers: (servers: Servers) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withSchemas: (schemas: Record<string, Schema>) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly get: () => SwaggerConfig;
-    };
-    expressiveServer(configs?: {
+    expressiveServer: (configs?: {
         app?: express.Express;
-    }): {
-        readonly get: () => express.Express;
-        readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => {
-            readonly get: () => express.Express;
-            readonly withHelmet: /*elided*/ any;
-            readonly withQs: () => /*elided*/ any;
-            readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => /*elided*/ any;
-            readonly withSwagger: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }, ...handlers: ExpressHandler[]) => /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly withQs: () => {
-            readonly get: () => express.Express;
-            readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => /*elided*/ any;
-            readonly withQs: /*elided*/ any;
-            readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => /*elided*/ any;
-            readonly withSwagger: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }, ...handlers: ExpressHandler[]) => /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => {
-            readonly get: () => express.Express;
-            readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => /*elided*/ any;
-            readonly withQs: () => /*elided*/ any;
-            readonly withMorgan: /*elided*/ any;
-            readonly withSwagger: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }, ...handlers: ExpressHandler[]) => /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly withSwagger: (swagger: {
-            path?: ExpressRoute;
-            doc: SwaggerConfig;
-        }, ...handlers: ExpressHandler[]) => {
-            readonly get: () => express.Express;
-            readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => /*elided*/ any;
-            readonly withQs: () => /*elided*/ any;
-            readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => /*elided*/ any;
-            readonly withSwagger: /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly defaults: {
-            readonly get: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }) => express.Express;
-        };
-    };
-    expressiveRouter(configs: {
+    }) => ServerBuilder;
+    expressiveRouter: (configs: {
         oapi?: {
             tags?: string[];
             servers?: Servers;
             security?: AuthMethod[];
         };
-    }): {
+    }) => {
         router: express_serve_static_core.Router;
         addRoute(context: {
             method: HttpMethod;

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-import winston, { Logger as Logger$1 } from 'winston';
 import * as express from 'express';
-import { RequestHandler, Request } from 'express';
+import express__default, { RequestHandler, Request } from 'express';
 import * as express_serve_static_core from 'express-serve-static-core';
 import { RouteParameters } from 'express-serve-static-core';
-import * as morgan from 'morgan';
-import * as helmet from 'helmet';
+import winston, { Logger as Logger$1 } from 'winston';
+import { HelmetOptions } from 'helmet';
+import morgan from 'morgan';
 
 type ExpressRoute = string;
 type ExpressLocalsObj = Record<string, any>;
@@ -162,6 +162,23 @@ type SwaggerConfig = {
     security?: AuthMethod[];
 };
 
+type SwaggerOptions = {
+    path?: ExpressRoute;
+    doc: SwaggerConfig;
+};
+declare class ServerBuilder {
+    private app;
+    private container;
+    constructor(app: express__default.Express, container: Container);
+    get(): express__default.Express;
+    withHelmet(options?: Readonly<HelmetOptions>): this;
+    withQs(): this;
+    withMorgan(format?: string, // TODO: FormatFn
+    options?: Parameters<typeof morgan>[1]): this;
+    withSwagger(swagger: SwaggerOptions, ...handlers: ExpressHandler[]): this;
+    withDefaults(swagger: SwaggerOptions): express__default.Express;
+}
+
 declare class ApiError extends Error {
     readonly code: string;
     readonly httpStatusCode: number;
@@ -206,27 +223,16 @@ declare class UserUnauthorizedError extends ApiError {
     constructor(message?: string);
 }
 
-declare function parsePositiveInteger<T>(v: T, defaultValue: number, max?: number): number;
-declare function parseIdOrFail(v: unknown): number;
-declare function slugify(text: string): string;
-declare function getTmpDir(): string;
-declare function getTmpPath(...steps: string[]): string;
-declare function parseDefaultPagination(query: PaginationQuery): Pagination;
-declare function createReqSnapshot(req: Request & {
-    user?: {
-        id?: string | number;
-    };
-}): ReqSnapshot;
-
-declare function isDev(): boolean;
-declare function isProd(): boolean;
-declare function getEnvVar(configName: string): string;
-type Env = 'dev' | 'prod' | OtherString;
-
-declare const createLogger: (options?: winston.LoggerOptions) => winston.Logger;
-declare const getDefaultFileLogger: (name?: string) => winston.Logger;
-declare const getDefaultConsoleLogger: (name?: string) => winston.Logger;
-
+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;
+    get(): SwaggerConfig;
+}
 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;
@@ -250,6 +256,27 @@ declare const SWG: {
     };
 };
 
+declare function parsePositiveInteger<T>(v: T, defaultValue: number, max?: number): number;
+declare function parseIdOrFail(v: unknown): number;
+declare function slugify(text: string): string;
+declare function getTmpDir(): string;
+declare function getTmpPath(...steps: string[]): string;
+declare function parseDefaultPagination(query: PaginationQuery): Pagination;
+declare function createReqSnapshot(req: Request & {
+    user?: {
+        id?: string | number;
+    };
+}): ReqSnapshot;
+
+declare function isDev(): boolean;
+declare function isProd(): boolean;
+declare function getEnvVar(configName: string): string;
+type Env = 'dev' | 'prod' | OtherString;
+
+declare const createLogger: (options?: winston.LoggerOptions) => winston.Logger;
+declare const getDefaultFileLogger: (name?: string) => winston.Logger;
+declare const getDefaultConsoleLogger: (name?: string) => winston.Logger;
+
 declare class ApiErrorResponse<T = undefined> {
     readonly status = "error";
     readonly message: string;
@@ -265,134 +292,20 @@ declare class ApiResponse<T = undefined> {
 }
 
 declare function bootstrap(container: Container): {
-    notFoundMiddleware: (_req: express.Request, res: express.Response, _next: express.NextFunction) => void;
+    swaggerBuilder: () => SwaggerBuilder;
     silently: (fn: () => Promise<void>, reqSnapshot?: ReqSnapshot) => void;
+    notFoundMiddleware: (_req: express.Request, res: express.Response, _next: express.NextFunction) => void;
     getErrorHandlerMiddleware: (errorMapper?: (err: Error & Record<string, unknown>) => ApiError | null | undefined) => (err: Error & Record<string, unknown>, req: express.Request, res: express.Response, _next: express.NextFunction) => Promise<void>;
-    swaggerBuilder: () => {
-        readonly withInfo: (info: SwaggerConfig["info"]) => {
-            readonly withInfo: /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withServers: (servers: Servers) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withSchemas: (schemas: Record<string, Schema>) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: /*elided*/ any;
-            readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly withDefaultSecurity: (globalAuthMethods: AuthMethod[]) => {
-            readonly withInfo: (info: SwaggerConfig["info"]) => /*elided*/ any;
-            readonly withServers: (servers: Servers) => /*elided*/ any;
-            readonly withSecuritySchemes: (schemes: Record<string, SecurityScheme>) => /*elided*/ any;
-            readonly withSchemas: (schemas: Record<string, Schema>) => /*elided*/ any;
-            readonly withDefaultSecurity: /*elided*/ any;
-            readonly get: () => SwaggerConfig;
-        };
-        readonly get: () => SwaggerConfig;
-    };
-    expressiveServer(configs?: {
+    expressiveServer: (configs?: {
         app?: express.Express;
-    }): {
-        readonly get: () => express.Express;
-        readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => {
-            readonly get: () => express.Express;
-            readonly withHelmet: /*elided*/ any;
-            readonly withQs: () => /*elided*/ any;
-            readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => /*elided*/ any;
-            readonly withSwagger: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }, ...handlers: ExpressHandler[]) => /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly withQs: () => {
-            readonly get: () => express.Express;
-            readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => /*elided*/ any;
-            readonly withQs: /*elided*/ any;
-            readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => /*elided*/ any;
-            readonly withSwagger: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }, ...handlers: ExpressHandler[]) => /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => {
-            readonly get: () => express.Express;
-            readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => /*elided*/ any;
-            readonly withQs: () => /*elided*/ any;
-            readonly withMorgan: /*elided*/ any;
-            readonly withSwagger: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }, ...handlers: ExpressHandler[]) => /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly withSwagger: (swagger: {
-            path?: ExpressRoute;
-            doc: SwaggerConfig;
-        }, ...handlers: ExpressHandler[]) => {
-            readonly get: () => express.Express;
-            readonly withHelmet: (options?: Readonly<helmet.HelmetOptions>) => /*elided*/ any;
-            readonly withQs: () => /*elided*/ any;
-            readonly withMorgan: (format?: string, options?: Parameters<typeof morgan>[1]) => /*elided*/ any;
-            readonly withSwagger: /*elided*/ any;
-            readonly defaults: {
-                readonly get: (swagger: {
-                    path?: ExpressRoute;
-                    doc: SwaggerConfig;
-                }) => express.Express;
-            };
-        };
-        readonly defaults: {
-            readonly get: (swagger: {
-                path?: ExpressRoute;
-                doc: SwaggerConfig;
-            }) => express.Express;
-        };
-    };
-    expressiveRouter(configs: {
+    }) => ServerBuilder;
+    expressiveRouter: (configs: {
         oapi?: {
             tags?: string[];
             servers?: Servers;
             security?: AuthMethod[];
         };
-    }): {
+    }) => {
         router: express_serve_static_core.Router;
         addRoute(context: {
             method: HttpMethod;

package/dist/index.js

@@ -71,36 +71,33 @@ var import_qs = __toESM(require("qs"));
 var import_swagger_ui_express = __toESM(require("swagger-ui-express"));
 
 // src/swagger.ts
-var buildSwaggerBuilder = (swaggerDoc) => {
-  return {
-    swaggerBuilder: () => {
-      return {
-        withInfo(info) {
-          swaggerDoc.info = info;
-          return this;
-        },
-        withServers(servers) {
-          swaggerDoc.servers = servers;
-          return this;
-        },
-        withSecuritySchemes(schemes) {
-          swaggerDoc.components.securitySchemes = schemes;
-          return this;
-        },
-        withSchemas(schemas) {
-          swaggerDoc.components.schemas = schemas;
-          return this;
-        },
-        withDefaultSecurity(globalAuthMethods) {
-          swaggerDoc.security = globalAuthMethods;
-          return this;
-        },
-        get() {
-          return swaggerDoc;
-        }
-      };
-    }
-  };
+var SwaggerBuilder = class {
+  constructor(swaggerDoc) {
+    this.swaggerDoc = swaggerDoc;
+  }
+  withInfo(info) {
+    this.swaggerDoc.info = info;
+    return this;
+  }
+  withServers(servers) {
+    this.swaggerDoc.servers = servers;
+    return this;
+  }
+  withSecuritySchemes(schemes) {
+    this.swaggerDoc.components.securitySchemes = schemes;
+    return this;
+  }
+  withSchemas(schemas) {
+    this.swaggerDoc.components.schemas = schemas;
+    return this;
+  }
+  withDefaultSecurity(globalAuthMethods) {
+    this.swaggerDoc.security = globalAuthMethods;
+    return this;
+  }
+  get() {
+    return this.swaggerDoc;
+  }
 };
 var securitySchemes = {
   BasicAuth: () => ({
@@ -190,48 +187,50 @@ var SWG = {
 };
 
 // src/expressive.ts
+var ServerBuilder = class {
+  constructor(app, container) {
+    this.app = app;
+    this.container = container;
+  }
+  get() {
+    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",
+      options ?? { stream: { write: (message) => {
+        this.container.logger.info(message.trim());
+      } } }
+    ));
+    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.doc, {
+      customSiteTitle: swagger.doc.info?.title
+    }));
+    return this;
+  }
+  withDefaults(swagger) {
+    return this.withHelmet().withQs().withMorgan().withSwagger(swagger).get();
+  }
+};
 function buildExpressive(container, swaggerDoc) {
   return {
     expressiveServer(configs) {
       const app = configs?.app ?? (0, import_express.default)();
-      const result = {
-        get() {
-          return app;
-        },
-        withHelmet(options) {
-          app.use((0, import_helmet.default)(options ?? {}));
-          return this;
-        },
-        withQs() {
-          app.set("query parser", function(str) {
-            return import_qs.default.parse(str, { decoder(s) {
-              return decodeURIComponent(s);
-            } });
-          });
-          return this;
-        },
-        withMorgan(format, options) {
-          app.use((0, import_morgan.default)(
-            format ?? ":req[x-real-ip] :method :url :status :res[content-length] - :response-time ms",
-            options ?? { stream: { write(message) {
-              container.logger.info(message.trim());
-            } } }
-          ));
-          return this;
-        },
-        withSwagger(swagger, ...handlers) {
-          app.use(swagger.path ?? "/api-docs", ...handlers, import_swagger_ui_express.default.serve, import_swagger_ui_express.default.setup(swagger.doc, {
-            customSiteTitle: swagger.doc.info?.title
-          }));
-          return this;
-        },
-        defaults: {
-          get(swagger) {
-            return result.withHelmet().withQs().withMorgan().withSwagger(swagger).get();
-          }
-        }
-      };
-      return result;
+      return new ServerBuilder(app, container);
     },
     expressiveRouter(configs) {
       const router = import_express.default.Router();
@@ -277,22 +276,8 @@ function buildExpressive(container, swaggerDoc) {
   };
 }
 
-// src/env.ts
-var import_dotenv = __toESM(require("dotenv"));
-import_dotenv.default.config();
-function isDev() {
-  return getEnvVar("ENV") === "dev";
-}
-function isProd() {
-  return getEnvVar("ENV") === "prod";
-}
-function getEnvVar(configName) {
-  const config = process.env[configName];
-  if (!config) {
-    throw new Error(`Missing config '${configName}'`);
-  }
-  return config;
-}
+// src/common.ts
+var import_path = __toESM(require("path"));
 
 // src/errors.ts
 var ApiError = class extends Error {
@@ -371,21 +356,7 @@ var UserUnauthorizedError = class extends ApiError {
   }
 };
 
-// src/response/ApiErrorResponse.ts
-var ApiErrorResponse = class {
-  status = "error";
-  message;
-  errorCode;
-  errors;
-  constructor(message, errorCode, errors) {
-    this.message = message;
-    this.errorCode = errorCode;
-    this.errors = errors;
-  }
-};
-
 // src/common.ts
-var import_path = __toESM(require("path"));
 function parsePositiveInteger(v, defaultValue, max) {
   const value = Number(v);
   return Number.isInteger(value) && value > 0 && (!max || value <= max) ? value : defaultValue;
@@ -421,10 +392,43 @@ function createReqSnapshot(req) {
   };
 }
 
-// src/middleware/errorHandlerMiddleware.ts
-var buildErrorHandlerMiddleware = (container) => {
+// src/env.ts
+var import_dotenv = __toESM(require("dotenv"));
+import_dotenv.default.config();
+function isDev() {
+  return getEnvVar("ENV") === "dev";
+}
+function isProd() {
+  return getEnvVar("ENV") === "prod";
+}
+function getEnvVar(configName) {
+  const config = process.env[configName];
+  if (!config) {
+    throw new Error(`Missing config '${configName}'`);
+  }
+  return config;
+}
+
+// src/response/ApiErrorResponse.ts
+var ApiErrorResponse = class {
+  status = "error";
+  message;
+  errorCode;
+  errors;
+  constructor(message, errorCode, errors) {
+    this.message = message;
+    this.errorCode = errorCode;
+    this.errors = errors;
+  }
+};
+
+// src/middleware.ts
+var buildMiddleware = (container) => {
   const { logger, alertHandler } = container;
   return {
+    notFoundMiddleware: (_req, res, _next) => {
+      res.status(404).send("\xAF\\_(\u30C4)_/\xAF").end();
+    },
     getErrorHandlerMiddleware: (errorMapper) => {
       return async (err, req, res, _next) => {
         let finalError;
@@ -457,11 +461,6 @@ var buildErrorHandlerMiddleware = (container) => {
   };
 };
 
-// src/middleware/notFoundMiddleware.ts
-var notFoundMiddleware = (_req, res, _next) => {
-  res.status(404).send("\xAF\\_(\u30C4)_/\xAF").end();
-};
-
 // src/logger.ts
 var import_winston = __toESM(require("winston"));
 var import_winston_daily_rotate_file = __toESM(require("winston-daily-rotate-file"));
@@ -540,9 +539,8 @@ function bootstrap(container) {
   };
   return {
     ...buildExpressive(container, swaggerDoc),
-    ...buildSwaggerBuilder(swaggerDoc),
-    ...buildErrorHandlerMiddleware(container),
-    notFoundMiddleware,
+    ...buildMiddleware(container),
+    swaggerBuilder: () => new SwaggerBuilder(swaggerDoc),
     silently: (fn, reqSnapshot) => {
       fn().catch((e) => {
         if (container.alertHandler && e instanceof Error) {

package/dist/index.mjs

@@ -6,36 +6,33 @@ import qs from "qs";
 import swaggerUi from "swagger-ui-express";
 
 // src/swagger.ts
-var buildSwaggerBuilder = (swaggerDoc) => {
-  return {
-    swaggerBuilder: () => {
-      return {
-        withInfo(info) {
-          swaggerDoc.info = info;
-          return this;
-        },
-        withServers(servers) {
-          swaggerDoc.servers = servers;
-          return this;
-        },
-        withSecuritySchemes(schemes) {
-          swaggerDoc.components.securitySchemes = schemes;
-          return this;
-        },
-        withSchemas(schemas) {
-          swaggerDoc.components.schemas = schemas;
-          return this;
-        },
-        withDefaultSecurity(globalAuthMethods) {
-          swaggerDoc.security = globalAuthMethods;
-          return this;
-        },
-        get() {
-          return swaggerDoc;
-        }
-      };
-    }
-  };
+var SwaggerBuilder = class {
+  constructor(swaggerDoc) {
+    this.swaggerDoc = swaggerDoc;
+  }
+  withInfo(info) {
+    this.swaggerDoc.info = info;
+    return this;
+  }
+  withServers(servers) {
+    this.swaggerDoc.servers = servers;
+    return this;
+  }
+  withSecuritySchemes(schemes) {
+    this.swaggerDoc.components.securitySchemes = schemes;
+    return this;
+  }
+  withSchemas(schemas) {
+    this.swaggerDoc.components.schemas = schemas;
+    return this;
+  }
+  withDefaultSecurity(globalAuthMethods) {
+    this.swaggerDoc.security = globalAuthMethods;
+    return this;
+  }
+  get() {
+    return this.swaggerDoc;
+  }
 };
 var securitySchemes = {
   BasicAuth: () => ({
@@ -125,48 +122,50 @@ var SWG = {
 };
 
 // src/expressive.ts
+var ServerBuilder = class {
+  constructor(app, container) {
+    this.app = app;
+    this.container = container;
+  }
+  get() {
+    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",
+      options ?? { stream: { write: (message) => {
+        this.container.logger.info(message.trim());
+      } } }
+    ));
+    return this;
+  }
+  withSwagger(swagger, ...handlers) {
+    this.app.use(swagger.path ?? "/api-docs", ...handlers, swaggerUi.serve, swaggerUi.setup(swagger.doc, {
+      customSiteTitle: swagger.doc.info?.title
+    }));
+    return this;
+  }
+  withDefaults(swagger) {
+    return this.withHelmet().withQs().withMorgan().withSwagger(swagger).get();
+  }
+};
 function buildExpressive(container, swaggerDoc) {
   return {
     expressiveServer(configs) {
       const app = configs?.app ?? express();
-      const result = {
-        get() {
-          return app;
-        },
-        withHelmet(options) {
-          app.use(helmet(options ?? {}));
-          return this;
-        },
-        withQs() {
-          app.set("query parser", function(str) {
-            return qs.parse(str, { decoder(s) {
-              return decodeURIComponent(s);
-            } });
-          });
-          return this;
-        },
-        withMorgan(format, options) {
-          app.use(morgan(
-            format ?? ":req[x-real-ip] :method :url :status :res[content-length] - :response-time ms",
-            options ?? { stream: { write(message) {
-              container.logger.info(message.trim());
-            } } }
-          ));
-          return this;
-        },
-        withSwagger(swagger, ...handlers) {
-          app.use(swagger.path ?? "/api-docs", ...handlers, swaggerUi.serve, swaggerUi.setup(swagger.doc, {
-            customSiteTitle: swagger.doc.info?.title
-          }));
-          return this;
-        },
-        defaults: {
-          get(swagger) {
-            return result.withHelmet().withQs().withMorgan().withSwagger(swagger).get();
-          }
-        }
-      };
-      return result;
+      return new ServerBuilder(app, container);
     },
     expressiveRouter(configs) {
       const router = express.Router();
@@ -212,22 +211,8 @@ function buildExpressive(container, swaggerDoc) {
   };
 }
 
-// src/env.ts
-import dotenv from "dotenv";
-dotenv.config();
-function isDev() {
-  return getEnvVar("ENV") === "dev";
-}
-function isProd() {
-  return getEnvVar("ENV") === "prod";
-}
-function getEnvVar(configName) {
-  const config = process.env[configName];
-  if (!config) {
-    throw new Error(`Missing config '${configName}'`);
-  }
-  return config;
-}
+// src/common.ts
+import path from "path";
 
 // src/errors.ts
 var ApiError = class extends Error {
@@ -306,21 +291,7 @@ var UserUnauthorizedError = class extends ApiError {
   }
 };
 
-// src/response/ApiErrorResponse.ts
-var ApiErrorResponse = class {
-  status = "error";
-  message;
-  errorCode;
-  errors;
-  constructor(message, errorCode, errors) {
-    this.message = message;
-    this.errorCode = errorCode;
-    this.errors = errors;
-  }
-};
-
 // src/common.ts
-import path from "path";
 function parsePositiveInteger(v, defaultValue, max) {
   const value = Number(v);
   return Number.isInteger(value) && value > 0 && (!max || value <= max) ? value : defaultValue;
@@ -356,10 +327,43 @@ function createReqSnapshot(req) {
   };
 }
 
-// src/middleware/errorHandlerMiddleware.ts
-var buildErrorHandlerMiddleware = (container) => {
+// src/env.ts
+import dotenv from "dotenv";
+dotenv.config();
+function isDev() {
+  return getEnvVar("ENV") === "dev";
+}
+function isProd() {
+  return getEnvVar("ENV") === "prod";
+}
+function getEnvVar(configName) {
+  const config = process.env[configName];
+  if (!config) {
+    throw new Error(`Missing config '${configName}'`);
+  }
+  return config;
+}
+
+// src/response/ApiErrorResponse.ts
+var ApiErrorResponse = class {
+  status = "error";
+  message;
+  errorCode;
+  errors;
+  constructor(message, errorCode, errors) {
+    this.message = message;
+    this.errorCode = errorCode;
+    this.errors = errors;
+  }
+};
+
+// src/middleware.ts
+var buildMiddleware = (container) => {
   const { logger, alertHandler } = container;
   return {
+    notFoundMiddleware: (_req, res, _next) => {
+      res.status(404).send("\xAF\\_(\u30C4)_/\xAF").end();
+    },
     getErrorHandlerMiddleware: (errorMapper) => {
       return async (err, req, res, _next) => {
         let finalError;
@@ -392,11 +396,6 @@ var buildErrorHandlerMiddleware = (container) => {
   };
 };
 
-// src/middleware/notFoundMiddleware.ts
-var notFoundMiddleware = (_req, res, _next) => {
-  res.status(404).send("\xAF\\_(\u30C4)_/\xAF").end();
-};
-
 // src/logger.ts
 import winston from "winston";
 import DailyRotateFile from "winston-daily-rotate-file";
@@ -475,9 +474,8 @@ function bootstrap(container) {
   };
   return {
     ...buildExpressive(container, swaggerDoc),
-    ...buildSwaggerBuilder(swaggerDoc),
-    ...buildErrorHandlerMiddleware(container),
-    notFoundMiddleware,
+    ...buildMiddleware(container),
+    swaggerBuilder: () => new SwaggerBuilder(swaggerDoc),
     silently: (fn, reqSnapshot) => {
       fn().catch((e) => {
         if (container.alertHandler && e instanceof Error) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@extk/expressive",
-    "version": "0.3.1",
+    "version": "0.4.0",
     "type": "commonjs",
     "publishConfig": {
         "access": "public"