@extk/expressive 0.9.0 → 0.10.0

package/README.md

@@ -107,7 +107,6 @@ addRoute(
 // 3. Build the Express app
 const app = expressiveServer()
   .withHelmet()
-  .withQs()
   .withMorgan()
   .withRoutes(router)
   .withSwagger(
@@ -271,7 +270,6 @@ import z from 'zod';
 
 const app = expressiveServer()
   .withHelmet()
-  .withQs()
   .withMorgan()
   .withSwagger(
     b => b

package/dist/index.d.mts

@@ -1,14 +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;
@@ -243,9 +243,7 @@ declare class ServerBuilder {
     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

package/dist/index.d.ts

@@ -1,14 +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;
@@ -243,9 +243,7 @@ declare class ServerBuilder {
     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

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
@@ -221,18 +220,9 @@ var ServerBuilder = class {
     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",
-      // TODO: ip or x-real-ip; also, default to json?
+      format ?? ":remote-addr :method :url :status :res[content-length] - :response-time ms",
       options ?? { stream: { write: (message) => {
         this.container.logger.info(message.trim());
       } } }

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
@@ -160,18 +159,9 @@ var ServerBuilder = class {
     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",
-      // TODO: ip or x-real-ip; also, default to json?
+      format ?? ":remote-addr :method :url :status :res[content-length] - :response-time ms",
       options ?? { stream: { write: (message) => {
         this.container.logger.info(message.trim());
       } } }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@extk/expressive",
-    "version": "0.9.0",
+    "version": "0.10.0",
     "type": "commonjs",
     "publishConfig": {
         "access": "public"
@@ -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": "",