fix(env-expect.js): improve RegExp support; better debugging experience

Xunnamius · Jan 4, 2021 · aff191d · aff191d
1 parent c9fa2b4
commit aff191d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/env-expect.js b/env-expect.js
@@ -92,10 +92,14 @@ module.exports = {
             )
           )
         };
-      } else if (typeof rule.name == 'string') {
-        rule.name = RegExp(rule.name);
+      } else if (typeof rule.name == 'string' || rule.name instanceof RegExp) {
+        rule.name = rule.name instanceof RegExp ? rule.name : RegExp(rule.name);
         rule.value =
-          typeof rule.value == 'string' ? RegExp(rule.value) : DEFAULT_VALUE_REGEX[0];
+          typeof rule.value == 'string'
+            ? RegExp(rule.value)
+            : rule.value instanceof RegExp
+            ? rule.value
+            : DEFAULT_VALUE_REGEX[0];
 
         normalizedRule = {
           operation: 'or',
@@ -152,6 +156,7 @@ module.exports = {
           )
         };
       } else {
+        debug('::normalize BAD RULE ENCOUNTERED = %O', rule);
         throw new IllegalEnvironmentError(
           `bad rule encountered${
             fromPkg ? ' in ./package.json "env-expect"' : ''