feat: Drop lodash dependencies.

Author: Shogun

lib/index.js

@@ -14,9 +14,9 @@ const ajv_1 = __importDefault(require("ajv"));
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const http_errors_1 = __importStar(require("http-errors"));
 const http_status_codes_1 = require("http-status-codes");
-const lodash_upperfirst_1 = __importDefault(require("lodash.upperfirst"));
 const statuses_1 = __importDefault(require("statuses"));
 const properties_1 = require("./properties");
+const utils_1 = require("./utils");
 const validation_1 = require("./validation");
 var properties_2 = require("./properties");
 exports.addAdditionalProperties = properties_2.addAdditionalProperties;
@@ -65,13 +65,13 @@ function handleErrors(error, request, reply) {
         }
     }
     else if (code === 'INVALID_CONTENT_TYPE' || code === 'FST_ERR_CTP_INVALID_MEDIA_TYPE') {
-        error = http_errors_1.default(http_status_codes_1.UNSUPPORTED_MEDIA_TYPE, lodash_upperfirst_1.default(validation_1.validationMessagesFormatters.contentType()));
+        error = http_errors_1.default(http_status_codes_1.UNSUPPORTED_MEDIA_TYPE, utils_1.upperFirst(validation_1.validationMessagesFormatters.contentType()));
     }
     else if (code === 'FST_ERR_CTP_EMPTY_JSON_BODY') {
-        error = http_errors_1.default(http_status_codes_1.BAD_REQUEST, lodash_upperfirst_1.default(validation_1.validationMessagesFormatters.jsonEmpty()));
+        error = http_errors_1.default(http_status_codes_1.BAD_REQUEST, utils_1.upperFirst(validation_1.validationMessagesFormatters.jsonEmpty()));
     }
     else if (code === 'MALFORMED_JSON' || error.message === 'Invalid JSON' || error.stack.includes('at JSON.parse')) {
-        error = http_errors_1.default(http_status_codes_1.BAD_REQUEST, lodash_upperfirst_1.default(validation_1.validationMessagesFormatters.json()));
+        error = http_errors_1.default(http_status_codes_1.BAD_REQUEST, utils_1.upperFirst(validation_1.validationMessagesFormatters.json()));
     }
     // Get the status code
     let { statusCode, headers } = error;

lib/utils.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function upperFirst(source) {
+    // tslint:disable-next-line strict-type-predicates
+    if (typeof source !== 'string' || !source.length) {
+        return source;
+    }
+    return source[0].toUpperCase() + source.substring(1);
+}
+exports.upperFirst = upperFirst;
+function get(target, path) {
+    const tokens = path.split('.').map((t) => t.trim());
+    for (const token of tokens) {
+        if (typeof target === 'undefined' || target === null) {
+            // We're supposed to be still iterating, but the chain is over - Return undefined
+            target = undefined;
+            break;
+        }
+        const index = token.match(/^(\d+)|(?:\[(\d+)\])$/);
+        if (index) {
+            target = target[parseInt(index[1] || index[2], 10)];
+        }
+        else {
+            target = target[token];
+        }
+    }
+    return target;
+}
+exports.get = get;

lib/validation.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const http_errors_1 = __importDefault(require("http-errors"));
 const http_status_codes_1 = require("http-status-codes");
-const get = require("lodash.get");
+const utils_1 = require("./utils");
 function niceJoin(array, lastSeparator = ' and ', separator = ', ') {
     switch (array.length) {
         case 0:
@@ -122,7 +122,7 @@ function convertValidationErrors(section, data, validationErrors) {
                 break;
             case 'pattern':
                 const pattern = e.params.pattern;
-                const value = get(data, key);
+                const value = utils_1.get(data, key);
                 if (pattern === '.+' && !value) {
                     message = exports.validationMessagesFormatters.presentString();
                 }

package.json

@@ -26,7 +26,7 @@
   "types": "types/index.d.ts",
   "scripts": {
     "lint": "tslint --project tsconfig.test.json -t stylish src/*.ts test/*.ts",
-    "test": "jest test --coverage --coverageReporters=html --coverageReporters=text",
+    "test": "jest test --verbose --coverage --coverageReporters=html --coverageReporters=text",
     "ci": "yarn lint && jest --coverage --coverageThreshold='{\"global\":{\"branches\":90,\"functions\":90,\"lines\":90,\"statements\":90}}' --ci --coverageReporters=json",
     "prebuild": "rm -rf lib/* types/* && yarn lint",
     "build": "tsc -p .",
@@ -38,16 +38,12 @@
     "fastify-plugin": "^1.6.0",
     "http-errors": "^1.7.3",
     "http-status-codes": "^1.4.0",
-    "lodash.get": "^4.4.2",
-    "lodash.upperfirst": "^4.3.1",
     "statuses": "^1.5.0"
   },
   "devDependencies": {
     "@cowtech/tslint-config": "^5.13.0",
     "@types/http-errors": "^1.6.2",
     "@types/jest": "^24.0.23",
-    "@types/lodash.get": "^4.4.6",
-    "@types/lodash.upperfirst": "^4.3.6",
     "@types/node": "^12.12.8",
     "@types/statuses": "^1.5.0",
     "fastify": "^2.10.0",

src/index.ts

@@ -4,10 +4,10 @@ import fastifyPlugin from 'fastify-plugin'
 import { IncomingMessage, Server, ServerResponse } from 'http'
 import createError, { HttpError, InternalServerError, NotFound } from 'http-errors'
 import { BAD_REQUEST, INTERNAL_SERVER_ERROR, UNSUPPORTED_MEDIA_TYPE } from 'http-status-codes'
-import upperFirst from 'lodash.upperfirst'
 import statuses from 'statuses'
 import { FastifyDecoratedRequest, GenericObject, NodeError, RequestSection } from './interfaces'
 import { addAdditionalProperties, serializeError } from './properties'
+import { upperFirst } from './utils'
 import { addResponseValidation, convertValidationErrors, validationMessagesFormatters } from './validation'
 
 export * from './interfaces'

src/utils.ts

@@ -0,0 +1,29 @@
+export function upperFirst(source: any): string {
+  // tslint:disable-next-line strict-type-predicates
+  if (typeof source !== 'string' || !source.length) {
+    return source
+  }
+
+  return source[0].toUpperCase() + source.substring(1)
+}
+
+export function get<T>(target: any, path: string): T {
+  const tokens = path.split('.').map((t: string) => t.trim())
+
+  for (const token of tokens) {
+    if (typeof target === 'undefined' || target === null) {
+      // We're supposed to be still iterating, but the chain is over - Return undefined
+      target = undefined
+      break
+    }
+
+    const index = token.match(/^(\d+)|(?:\[(\d+)\])$/)
+    if (index) {
+      target = target[parseInt(index[1] || index[2], 10)]
+    } else {
+      target = target[token]
+    }
+  }
+
+  return target
+}

src/validation.ts

@@ -9,7 +9,7 @@ import {
   ValidationFormatter,
   Validations
 } from './interfaces'
-import get = require('lodash.get')
+import { get } from './utils'
 
 export function niceJoin(array: Array<string>, lastSeparator: string = ' and ', separator: string = ', '): string {
   switch (array.length) {
@@ -145,7 +145,7 @@ export function convertValidationErrors(
         break
       case 'pattern':
         const pattern = e.params.pattern
-        const value = get(data, key) as string
+        const value = get<string>(data, key)
 
         if (pattern === '.+' && !value) {
           message = validationMessagesFormatters.presentString()

test/utils.spec.ts

@@ -0,0 +1,30 @@
+import { get, upperFirst } from '../src/utils'
+
+describe('Utils', function(): void {
+  describe('.upperFirst', function(): void {
+    it('should correctly convert strings', function(): void {
+      expect(upperFirst('abc')).toEqual('Abc')
+      expect(upperFirst('aBC')).toEqual('ABC')
+      expect(upperFirst('')).toEqual('')
+      expect(upperFirst(3)).toEqual(3)
+    })
+  })
+
+  describe('.get', function(): void {
+    it('should correctly return paths', function(): void {
+      const target = {
+        a: [{ b: { c: 1 } }],
+        b: null
+      }
+
+      expect(get(target, 'a')).toEqual([{ b: { c: 1 } }])
+      expect(get(target, 'b.c')).toBeUndefined()
+      expect(get(target, 'a.0.b')).toEqual({ c: 1 })
+      expect(get(target, 'a.0.b.c')).toEqual(1)
+      expect(get(target, 'a.[0].b')).toEqual({ c: 1 })
+      expect(get(target, 'a.[2].b')).toBeUndefined()
+      expect(get(target, 'a.[2]a.b')).toBeUndefined()
+      expect(get(target, 'a.0.c.e.f')).toBeUndefined()
+    })
+  })
+})

types/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function upperFirst(source: any): string;
+export declare function get<T>(target: any, path: string): T;