Updated get options logic

Author: barshan23

lib/options.js

@@ -377,36 +377,39 @@ module.exports = {
       }
     ];
 
-    // Filter options based on criteria
-    if (_.isObject(criteria)) {
-      const externalDefault = typeof criteria.external === 'boolean' ? criteria.external : true,
-        usageDefault = ['CONVERSION'];
+    optsArray = _.filter(optsArray, (option) => {
+      if (option.disabled) { return false; }
 
-      typeof criteria.external === 'boolean' && (optsArray = _.filter(optsArray, { external: externalDefault }));
-      (!_.isArray(criteria.usage) || _.isEmpty(criteria.usage)) && (criteria.usage = usageDefault);
+      if (_.isObject(criteria)) {
+        const externalDefault = typeof criteria.external === 'boolean' ? criteria.external : true,
+          usageDefault = ['CONVERSION'];
 
-      if (_.isArray(criteria.usage)) {
-        let tempOptsArray = [];
+        (!_.isArray(criteria.usage) || _.isEmpty(criteria.usage)) && (criteria.usage = usageDefault);
 
-        _.forEach(criteria.usage, (usageCriteria) => {
-          tempOptsArray = _.concat(tempOptsArray, _.filter(optsArray, (option) => {
-            return _.includes(option.usage, usageCriteria);
-          }));
-        });
-        optsArray = tempOptsArray;
-      }
+        if (option.external !== externalDefault) {
+          return false;
+        }
 
-      if (_.has(criteria, 'moduleVersion')) {
-        optsArray = _.filter(optsArray, (option) => {
-          return _.includes(option.supportedModuleVersion, criteria.moduleVersion);
-        });
-      }
-      else {
-        optsArray = _.filter(optsArray, (option) => {
-          return _.includes(option.supportedModuleVersion, MODULE_VERSION.V1);
-        });
+        if (_.isArray(criteria.usage)) {
+          /**
+           * We return return a option if any of the criteria.usage value matches with what is
+           * available in option.usage
+           */
+          if (_.difference(criteria.usage, option.usage).length === criteria.usage.length) {
+            return false;
+          }
+        }
+
+        // Setting default value
+        criteria.moduleVersion = _.has(criteria, 'moduleVersion') ? criteria.moduleVersion : MODULE_VERSION.V1;
+
+        if (!_.includes(option.supportedModuleVersion, criteria.moduleVersion)) {
+          return false;
+        }
       }
-    }
+
+      return true;
+    });
 
     if (mode === 'use') {
       // options to be used as default kv-pairs
@@ -425,10 +428,6 @@ module.exports = {
       return defOptions;
     }
 
-    // options to be used as documentation
-    return _.filter(optsArray, (opt) => {
-      // only return options that are not disabled
-      return opt.disabled !== true;
-    });
+    return optsArray;
   }
 };