use of lodash isnill

use of isnill to simplify flow

Author: LuisTejedaS

lib/30XUtils/inputValidation.js

@@ -10,43 +10,36 @@ module.exports = {
   validateSpec: function (spec) {
 
     // Checking for the all the required properties in the specification
-    if (!spec.hasOwnProperty('openapi')) {
+    if (_.isNil(spec.openapi)) {
       return {
         result: false,
         reason: 'Specification must contain a semantic version number of the OAS specification'
       };
     }
 
-    if (!spec.hasOwnProperty('paths')) {
+    if (_.isNil(spec.paths)) {
       return {
         result: false,
         reason: 'Specification must contain Paths Object for the available operational paths'
       };
     }
 
-    if (!spec.hasOwnProperty('info')) {
+    if (_.isNil(spec.info)) {
       return {
         result: false,
         reason: 'Specification must contain an Info Object for the meta-data of the API'
       };
     }
 
-    if (_.isEmpty(spec.info)) {
-      return {
-        result: false,
-        reason: 'Specification must contain a valid not null info'
-      };
-    }
-
     if (!spec.info.hasOwnProperty('$ref')) {
-      if (!spec.info.hasOwnProperty('title') || !spec.info.title) {
+      if (_.isNil(spec.info.title)) {
         return {
           result: false,
           reason: 'Specification must contain a title in order to generate a collection'
         };
       }
 
-      if (!spec.info.hasOwnProperty('version') || !spec.info.version) {
+      if (_.isNil(spec.info.version)) {
         return {
           result: false,
           reason: 'Specification must contain a semantic version number of the API in the Info Object'

lib/31XUtils/inputValidation31X.js

@@ -11,52 +11,45 @@ module.exports = {
    */
   validateSpec: function (spec, options) {
     const includeWebhooksOption = options.includeWebhooks;
-    if (!spec.hasOwnProperty('openapi')) {
+    if (_.isNil(spec.openapi)) {
       return {
         result: false,
         reason: 'Specification must contain a semantic version number of the OAS specification'
       };
     }
 
-    if (!spec.hasOwnProperty('info')) {
+    if (_.isNil(spec.info)) {
       return {
         result: false,
         reason: 'Specification must contain an Info Object for the meta-data of the API'
       };
     }
 
-    if (_.isEmpty(spec.info)) {
-      return {
-        result: false,
-        reason: 'Specification must contain a valid not null info'
-      };
-    }
-
     if (!spec.info.hasOwnProperty('$ref')) {
-      if (!spec.info.hasOwnProperty('title') || !spec.info.title) {
+      if (_.isNil(spec.info.title)) {
         return {
           result: false,
           reason: 'Specification must contain a title in order to generate a collection'
         };
       }
 
-      if (!spec.info.hasOwnProperty('version') || !spec.info.version) {
+      if (_.isNil(spec.info.version)) {
         return {
           result: false,
           reason: 'Specification must contain a semantic version number of the API in the Info Object'
         };
       }
     }
 
-    if (!spec.hasOwnProperty('paths') && !includeWebhooksOption) {
+    if (_.isNil(spec.paths) && !includeWebhooksOption) {
       return {
         result: false,
         reason: 'Specification must contain Paths Object for the available operational paths'
       };
     }
 
-    if (includeWebhooksOption && !spec.hasOwnProperty('paths') &&
-      !spec.hasOwnProperty('webhooks') && !spec.hasOwnProperty('components')) {
+    if (includeWebhooksOption && _.isNil(spec.paths) &&
+      _.isNil(spec.webhooks) && _.isNil(spec.components)) {
       return {
         result: false,
         reason: 'Specification must contain either Paths, Webhooks or Components sections'

test/unit/31Xsupport/schemaUtils31X.test.js

@@ -31,7 +31,7 @@ describe('parseSpec method', function () {
     let fileContent = fs.readFileSync(invalid31xFolder + '/invalid-null-info.json', 'utf8');
     const parsedSpec = concreteUtils.parseSpec(fileContent, { includeWebhooks: false });
     expect(parsedSpec.result).to.be.false;
-    expect(parsedSpec.reason).to.equal('Specification must contain a valid not null info');
+    expect(parsedSpec.reason).to.equal('Specification must contain an Info Object for the meta-data of the API');
   });
 
   it('should return false and Spec must contain information version', function () {

test/unit/base.test.js

@@ -1151,7 +1151,8 @@ describe('CONVERT FUNCTION TESTS ', function() {
         {}, (err, conversionResult) => {
           expect(err).to.be.null;
           expect(conversionResult.result).to.equal(false);
-          expect(conversionResult.reason).to.equal('Specification must contain a valid not null info');
+          expect(conversionResult.reason)
+            .to.equal('Specification must contain an Info Object for the meta-data of the API');
           done();
         });
     });