Drop Node 6 support.

.travis.yml

@@ -10,9 +10,6 @@ script: "npm run test:coverage"
 
 jobs:
   include:
-    - language: node_js
-      node_js: 6
-      script: "npm run test"
     - language: node_js
       node_js: node
       script: "npm run test:coverage"

package.json

@@ -24,7 +24,8 @@
     "test": "mocha",
     "test:coverage": "nyc npm test",
     "coveralls": "cat ./coverage/lcov.info |./node_modules/.bin/coveralls",
-    "lint": "./node_modules/.bin/eslint src"
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
   },
   "repository": {
     "type": "git",
@@ -54,8 +55,7 @@
     "decimal.js": "^10.2.0",
     "js-yaml": "^3.13.1",
     "json-schema-deref-sync": "^0.13.0",
-    "object.values": "^1.1.1",
-    "swagger-parser": "^6.0.5"
+    "swagger-parser": "^9.0.1"
   },
   "devDependencies": {
     "ajv-keywords": "^3.4.1",
@@ -70,11 +70,14 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "lodash.get": "^4.4.2",
-    "mocha": "^6.2.2",
-    "nyc": "^15.0.0",
-    "uuid": "^3.3.3"
+    "mocha": "^6.2.3",
+    "nyc": "^15.0.1",
+    "uuid": "^3.4.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
+  },
+  "engines": {
+    "node": ">=8"
   }
 }

src/customKeywords/files.js

@@ -2,7 +2,7 @@ var Ajv = require('ajv');
 const fileNameField = 'fieldname';
 
 function missingElements(superSet, subset) {
-    let missingElements = [];
+    const missingElements = [];
     subset.every(function (subsetElement) {
         if (!superSet.includes(subsetElement)) {
             missingElements.push(subsetElement);
@@ -17,7 +17,7 @@ module.exports = {
     validate: function filesValidation(schema, data) {
         filesValidation.errors = [];
         const dataFileName = data.map((element) => { return element[fileNameField] });
-        let missingFiles = missingElements(dataFileName, schema.required);
+        const missingFiles = missingElements(dataFileName, schema.required);
         if (missingFiles.length > 0) {
             filesValidation.errors.push(new Ajv.ValidationError({
                 keyword: 'files',
@@ -28,8 +28,8 @@ module.exports = {
         }
 
         // Check that only the optional files exists
-        let allFiles = schema.required.concat(schema.optional);
-        let extraFiles = missingElements(allFiles, dataFileName);
+        const allFiles = schema.required.concat(schema.optional);
+        const extraFiles = missingElements(allFiles, dataFileName);
         if (extraFiles.length > 0) {
             filesValidation.errors.push(new Ajv.ValidationError({
                 keyword: 'files',

src/data_structures/tree.js

@@ -10,6 +10,7 @@ class Node {
         this.value = value;
         this.childrenAsKeyValue = {};
     }
+
     /**
      * Add child to the node.
      * @param node - The node which going to be the child.
@@ -18,6 +19,7 @@ class Node {
     addChild(node, key){
         this.childrenAsKeyValue[key] = node;
     }
+
     /**
      * Override node data by other node by reference.
      * @param node - The node which going to use to take his data.
@@ -28,6 +30,7 @@ class Node {
             this.childrenAsKeyValue = node.childrenAsKeyValue;
         }
     };
+
     /**
      * Get node value.
      * @return The value of the node.

src/parsers/open-api2.js

@@ -14,7 +14,7 @@ module.exports = {
 };
 
 function buildPathParameters(parameters, pathParameters) {
-    let localParameters = parameters.filter(function (parameter) {
+    const localParameters = parameters.filter(function (parameter) {
         return parameter.in !== 'body';
     }).concat(pathParameters);
     return localParameters;
@@ -46,15 +46,15 @@ function getValidatedBodySchema(bodySchema) {
 }
 
 function buildHeadersValidation(responses, contentTypes, statusCode, options) {
-    let headers = get(responses, `[${statusCode}].headers`);
+    const headers = get(responses, `[${statusCode}].headers`);
     if (!headers && !contentTypes) return;
 
     const defaultAjvOptions = {
         allErrors: true,
         coerceTypes: 'array'
     };
     const ajvOptions = Object.assign({}, defaultAjvOptions, options.ajvConfigParams);
-    let ajv = new Ajv(ajvOptions);
+    const ajv = new Ajv(ajvOptions);
 
     ajvUtils.addCustomKeyword(ajv, options.formats, options.keywords);
 
@@ -67,7 +67,7 @@ function buildHeadersValidation(responses, contentTypes, statusCode, options) {
 
     if (headers) {
         Object.keys(headers).forEach(key => {
-            let headerObj = Object.assign({}, headers[key]);
+            const headerObj = Object.assign({}, headers[key]);
             const headerName = key.toLowerCase();
             delete headerObj.name;
             ajvHeadersSchema.properties[headerName] = headerObj;
@@ -84,31 +84,31 @@ function buildAjvValidator(ajvConfigBody, formats, keywords){
         allErrors: true
     };
     const ajvOptions = Object.assign({}, defaultAjvOptions, ajvConfigBody);
-    let ajv = new Ajv(ajvOptions);
+    const ajv = new Ajv(ajvOptions);
 
     ajvUtils.addCustomKeyword(ajv, formats, keywords);
     return ajv;
 }
 
 function buildResponseBodyValidation(responses, swaggerDefinitions, originalSwagger, currentPath, currentMethod, statusCode, options) {
-    let schema = get(responses, `[${statusCode}].schema`);
+    const schema = get(responses, `[${statusCode}].schema`);
     if (!schema) return;
 
-    let ajv = buildAjvValidator(options.ajvConfigBody, options.formats, options.keywords);
+    const ajv = buildAjvValidator(options.ajvConfigBody, options.formats, options.keywords);
 
     if (schema.discriminator) {
-        let referenceName = originalSwagger.paths[currentPath][currentMethod].responses[statusCode].schema['$ref'];
+        const referenceName = originalSwagger.paths[currentPath][currentMethod].responses[statusCode].schema.$ref;
         return buildInheritance(schema.discriminator, swaggerDefinitions, originalSwagger, ajv, referenceName);
     } else {
         return new Validators.SimpleValidator(ajv.compile(schema));
     }
 }
 
 function buildRequestBodyValidation(schema, swaggerDefinitions, originalSwagger, currentPath, currentMethod, options) {
-    let ajv = buildAjvValidator(options.ajvConfigBody, options.formats, options.keywords);
+    const ajv = buildAjvValidator(options.ajvConfigBody, options.formats, options.keywords);
 
     if (schema.discriminator) {
-        let referenceName = originalSwagger.paths[currentPath][currentMethod].parameters.filter(function (parameter) { return parameter.in === 'body' })[0].schema['$ref'];
+        const referenceName = originalSwagger.paths[currentPath][currentMethod].parameters.filter(function (parameter) { return parameter.in === 'body' })[0].schema.$ref;
         return buildInheritance(schema.discriminator, swaggerDefinitions, originalSwagger, ajv, referenceName);
     } else {
         return new Validators.SimpleValidator(ajv.compile(schema));
@@ -124,7 +124,7 @@ function buildInheritance(discriminator, dereferencedDefinitions, swagger, ajv,
     Object.keys(swagger.definitions).forEach(key => {
         if (swagger.definitions[key].allOf) {
             swagger.definitions[key].allOf.forEach(element => {
-                if (element['$ref'] && element['$ref'] === referenceName) {
+                if (element.$ref && element.$ref === referenceName) {
                     inheritsObject[key] = ajv.compile(dereferencedDefinitions[key]);
                     inheritsObject.inheritance.push(key);
                 }

src/parsers/open-api3.js

@@ -86,28 +86,27 @@ function handleBodyValidation(
     validationType,
     { ajvConfigBody, formats, keywords }
 ) {
-
     if (!dereferencedBodySchema) {
-        return
+        return;
     }
 
     if (dereferencedBodySchema.discriminator && !referencedBodySchema) {
-        return
+        return;
     }
 
     const defaultAjvOptions = {
         allErrors: true
     };
 
     const ajvOptions = Object.assign({}, defaultAjvOptions, ajvConfigBody);
-    let ajv = new Ajv(ajvOptions);
+    const ajv = new Ajv(ajvOptions);
 
     ajvUtils.addCustomKeyword(ajv, formats, keywords);
 
     if (dereferencedBodySchema.discriminator) {
-        let referencedSchemas = referenced.components.schemas;
-        let dereferencedSchemas = dereferenced.components.schemas;
-        let referenceName = referencedBodySchema['$ref'];
+        const referencedSchemas = referenced.components.schemas;
+        const dereferencedSchemas = dereferenced.components.schemas;
+        const referenceName = referencedBodySchema.$ref;
 
         return buildV3Inheritance(referencedSchemas, dereferencedSchemas, ajv, referenceName);
     } else {
@@ -119,31 +118,31 @@ function handleBodyValidation(
 }
 
 function buildPathParameters(parameters, pathParameters) {
-    let allParameters = [].concat(parameters, pathParameters);
-    let localParameters = allParameters.map(handleSchema);
+    const allParameters = [].concat(parameters, pathParameters);
+    const localParameters = allParameters.map(handleSchema);
     return localParameters;
 }
 
 function handleSchema(data) {
-    let clonedData = cloneDeep(data);
-    let schema = data.schema;
+    const clonedData = cloneDeep(data);
+    const schema = data.schema;
     if (schema) {
-        delete clonedData['schema'];
+        delete clonedData.schema;
         Object.assign(clonedData, schema);
     }
     return clonedData;
 }
 
 function buildHeadersValidation(responses, statusCode, { ajvConfigParams, formats, keywords, contentTypeValidation }) {
-    let headers = get(responses, `[${statusCode}].headers`);
+    const headers = get(responses, `[${statusCode}].headers`);
     if (!headers) return;
 
     const defaultAjvOptions = {
         allErrors: true,
         coerceTypes: 'array'
     };
     const ajvOptions = Object.assign({}, defaultAjvOptions, ajvConfigParams);
-    let ajv = new Ajv(ajvOptions);
+    const ajv = new Ajv(ajvOptions);
 
     ajvUtils.addCustomKeyword(ajv, formats, keywords);
 
@@ -156,7 +155,7 @@ function buildHeadersValidation(responses, statusCode, { ajvConfigParams, format
     };
 
     Object.keys(headers).forEach(key => {
-        let headerObj = Object.assign({}, headers[key].schema);
+        const headerObj = Object.assign({}, headers[key].schema);
         const headerName = key.toLowerCase();
         delete headerObj.name;
         delete headerObj.required;
@@ -214,8 +213,8 @@ function buildV3Inheritance(referencedSchemas, dereferencedSchemas, ajv, referen
         }
 
         const options = currentSchema.oneOf.map((refObject) => {
-            let option = findKey(currentSchema.discriminator.mapping, (value) => (value === refObject['$ref']));
-            const ref = getKeyFromRef(refObject['$ref']);
+            const option = findKey(currentSchema.discriminator.mapping, (value) => (value === refObject.$ref));
+            const ref = getKeyFromRef(refObject.$ref);
             return { option: option || ref, ref };
         });
         discriminatorObject.allowedValues = options.map((option) => option.option);

src/utils/schema-preprocessor.js

@@ -7,7 +7,7 @@ function makeOptionalAttributesNullable(bodySchema) {
         return;
     }
 
-    for (let schemaEntry of bodySchema) {
+    for (const schemaEntry of bodySchema) {
         if (schemaEntry && schemaEntry.schema) {
             _processSchemaEntry(schemaEntry.schema);
         }
@@ -26,7 +26,7 @@ function _processSchemaEntry(schema) {
 
     const properties = schema.properties;
     for (const property in properties) {
-        if (properties.hasOwnProperty(property)) {
+        if (Object.prototype.hasOwnProperty.call(properties, property)) {
             if (!schema.required || schema.required.indexOf(property) === -1) {
                 if (!Array.isArray(properties[property].type)) {
                     properties[property].type = [properties[property].type, 'null'];

src/utils/schemaUtils.js

@@ -1,4 +1,3 @@
-const values = require('object.values');
 const fs = require('fs');
 const yaml = require('js-yaml');
 const path = require('path');
@@ -8,10 +7,6 @@ const schemaLoaders = require('./schemaLoaders');
 
 const { readOnly, writeOnly, validationTypes, allDataTypes } = require('./common');
 
-if (!Object.values) {
-    values.shim();
-}
-
 const DEFAULT_REQUEST_CONTENT_TYPE = 'application/json';
 const DEFAULT_RESPONSE_CONTENT_TYPE = 'application/json';
 

src/validators/DiscriminatorValidator.js

@@ -26,7 +26,7 @@ function findSchemaValidation(tree, data) {
 }
 
 function discriminator(schemas, data) {
-    let schema = findSchemaValidation.call(this, schemas, data);
+    const schema = findSchemaValidation.call(this, schemas, data);
     let result = false;
     if (schema) {
         result = schema(data);

src/validators/OneOfValidator.js

@@ -8,7 +8,7 @@ class OneOfValidator extends Validator {
     }
 }
 function oneOf(schemas, data) {
-    let schema = schemas[data[schemas.discriminator]];
+    const schema = schemas[data[schemas.discriminator]];
     let result = false;
     if (schema) {
         result = schema(data);

src/validators/ResponseValidator.js

@@ -8,8 +8,8 @@ class ResponseValidator extends Validator {
     }
 }
 function responseValidator(response, data) {
-    let bodySchema = response.body;
-    let headersSchema = response.headers;
+    const bodySchema = response.body;
+    const headersSchema = response.headers;
     let bodyValidationResult = true, bodyValidationErrors = [],
         headersValidationResult = true, headersValidationErrors = [];
     if (bodySchema) {
@@ -35,7 +35,7 @@ function responseValidator(response, data) {
         headersValidationErrors = headersSchema.errors ? addErrorPrefix(headersSchema.errors, 'headers') : [];
     }
 
-    let errors = bodyValidationErrors.concat(headersValidationErrors);
+    const errors = bodyValidationErrors.concat(headersValidationErrors);
     this.errors = errors.length === 0 ? null : errors;
 
     return bodyValidationResult && headersValidationResult;

src/validators/SimpleValidator.js

@@ -8,7 +8,7 @@ class SimpleValidator extends Validator {
 }
 
 function simple(ajvValidate, data) {
-    let result = ajvValidate(data);
+    const result = ajvValidate(data);
     this.errors = ajvValidate.errors;
 
     return result;

src/validators/validator-utils.js

@@ -4,7 +4,7 @@ module.exports = {
 };
 
 function allowedValuesError(discriminator, allowedValues) {
-    let error = new Error('should be equal to one of the allowed values');
+    const error = new Error('should be equal to one of the allowed values');
     error.dataPath = '.' + discriminator;
     error.keyword = 'enum';
     error.params = {