fix: correct status ranges and merge bug

Author: effervescentia

package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "colorette": "2.0.19",
+    "lodash.merge": "4.6.2",
     "pino": "8.7.0",
     "pino-http": "8.2.1",
     "pino-pretty": "9.1.1",
@@ -22,6 +23,7 @@
     "@commitlint/cli": "17.1.2",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@types/chai": "4.3.3",
+    "@types/lodash.merge": "^4.6.7",
     "@types/mocha": "9.1.1",
     "@voiceflow/commitlint-config": "2.0.0",
     "@voiceflow/eslint-config": "7.0.0",

src/http.logger.ts

@@ -9,12 +9,12 @@ import { createJSONConfig } from './json.logger';
 import { LogFormat } from './log-format.enum';
 import { LogLevel } from './log-level.enum';
 import { LoggerOptions } from './logger-options.interface';
-import { getColorizer, isErrorStatus, isWarnStatus } from './utils';
+import { getColorizer, isErrorResponse, isWarnResponse } from './utils';
 
 export const createHTTPConfig = ({ format, level }: LoggerOptions): Options => ({
   customLogLevel: (_req, res) => {
-    if (isWarnStatus(res)) return LogLevel.WARN;
-    if (res.err || isErrorStatus(res)) return LogLevel.ERROR;
+    if (isWarnResponse(res)) return LogLevel.WARN;
+    if (isErrorResponse(res)) return LogLevel.ERROR;
     return LogLevel.INFO;
   },
 

src/logger.ts

@@ -1,3 +1,5 @@
+import _merge from 'lodash.merge';
+
 import { createDetailedLogger } from './detailed.logger';
 import { createInlineLogger } from './inline.logger';
 import { createJSONLogger } from './json.logger';
@@ -11,7 +13,7 @@ export const DEFAULT_OPTIONS: LoggerOptions = {
 };
 
 export const createLogger = (options: Partial<LoggerOptions> = {}) => {
-  const { format, level } = { ...DEFAULT_OPTIONS, ...options };
+  const { format, level } = _merge({}, DEFAULT_OPTIONS, options);
 
   switch (format) {
     case LogFormat.DETAILED:

src/utils.ts

@@ -2,10 +2,10 @@ import { ServerResponse } from 'node:http';
 
 import { green, red, yellow } from 'colorette';
 
-export const isWarnStatus = (res: ServerResponse) => res.statusCode >= 400 && res.statusCode < 499;
-export const isErrorStatus = (res: ServerResponse) => res.statusCode >= 500 && res.statusCode < 599;
+export const isWarnResponse = (res: ServerResponse) => res.statusCode >= 400 && res.statusCode <= 499;
+export const isErrorResponse = (res: ServerResponse) => res.err || (res.statusCode >= 500 && res.statusCode <= 599);
 export const getColorizer = (res: ServerResponse) => {
-  if (isWarnStatus(res)) return yellow;
-  if (res.err || isErrorStatus(res)) return red;
+  if (isWarnResponse(res)) return yellow;
+  if (isErrorResponse(res)) return red;
   return green;
 };

yarn.lock

@@ -812,6 +812,18 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/lodash.merge@^4.6.7":
+  version "4.6.7"
+  resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.7.tgz#0af6555dd8bc6568ef73e5e0d820a027362946b1"
+  integrity sha512-OwxUJ9E50gw3LnAefSHJPHaBLGEKmQBQ7CZe/xflHkyy/wH2zVyEIAKReHvVrrn7zKdF58p16We9kMfh7v0RRQ==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
+  version "4.14.189"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.189.tgz#975ff8c38da5ae58b751127b19ad5e44b5b7f6d2"
+  integrity sha512-kb9/98N6X8gyME9Cf7YaqIMvYGnBSWqEci6tiettE6iJWH1XdJz/PO8LB0GtLCG7x8dU3KWhZT+lA1a35127tA==
+
 "@types/minimatch@*":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -6021,7 +6033,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.merge@^4.6.2:
+lodash.merge@4.6.2, lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==