refactor(isValidLevels): new function in utils to remove direct use o…

…f VALID_LEVELS
rollbar · Apr 15, 2021 · 61877d5 · 61877d5
1 parent 9709492
commit 61877d5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/src/error-boundary.js b/src/error-boundary.js
@@ -1,8 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import invariant from 'tiny-invariant';
-import VALID_LEVELS, { LEVEL_ERROR } from './constants';
+import { LEVEL_ERROR } from './constants';
 import { Context, getRollbarFromContext } from './provider';
+import * as utils from './utils';
 
 const INITIAL_ERROR_STATE = { hasError: false, error: null };
 
@@ -23,7 +24,7 @@ export class ErrorBoundary extends Component {
 
   constructor(props) {
     super(props);
-    invariant(VALID_LEVELS.includes(props.level), `${props.level} is not a valid level setting for Rollbar`);
+    invariant(utils.isValidLevel(props.level), `${props.level} is not a valid level setting for Rollbar`);
     this.state = { ...INITIAL_ERROR_STATE };
   }
 

diff --git a/src/hooks/use-rollbar-capture-event.js b/src/hooks/use-rollbar-capture-event.js
@@ -1,9 +1,10 @@
 import invariant from 'tiny-invariant';
-import VALID_LEVELS, { LEVEL_DEBUG, LEVEL_INFO, LEVEL_CRITICAL } from '../constants';
+import { LEVEL_INFO } from '../constants';
 import { useRollbar } from './use-rollbar';
+import { isValidLevel } from '../utils';
 
 export function useRollbarCaptureEvent(metadata, level = LEVEL_INFO) {
-  invariant(VALID_LEVELS[level] <= LEVEL_CRITICAL && VALID_LEVELS[level] >= LEVEL_DEBUG, '')
+  invariant(isValidLevel(level), `${level} is not a valid level setting for Rollbar`);
   const rollbar = useRollbar();
   useEffect(() => {
     rollbar.captureEvent(metadata, level);

diff --git a/src/hooks/use-rollbar-logs.js b/src/hooks/use-rollbar-logs.js
@@ -4,13 +4,14 @@
 
 import { useEffect, useLayoutEffect } from 'react';
 import invariant from 'tiny-invariant';
-import VALID_LEVELS, { LEVEL_DEBUG, LEVEL_INFO, LEVEL_WARN, LEVEL_ERROR, LEVEL_CRITICAL } from '../constants';
+import { LEVEL_DEBUG, LEVEL_INFO, LEVEL_WARN, LEVEL_ERROR, LEVEL_CRITICAL } from '../constants';
 import { useRollbar } from './use-rollbar';
+import { isValidLevel } from '../utils';
 
 const LOG = 'log';
 
 function useRollbarNotify(type, isLayout, ...args) {
-  invariant(type === LOG || VALID_LEVELS[type] >= LEVEL_DEBUG && VALID_LEVELS[type] <= LEVEL_CRITICAL, `cannot notify rollbar using method '${type}'`);
+  invariant(type === LOG || isValidLevel(type), `cannot notify rollbar using method '${type}'`);
   const rollbar = useRollbar();
   (isLayout ? useLayoutEffect : useEffect)(() => {
     rollbar[type](...args);

diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,7 @@
-import VALID_LEVELS, { LEVEL_DEBUG, LEVEL_INFO, LEVEL_WARN, LEVEL_ERROR, LEVEL_CRITICAL } from './constants';
-export { VALID_LEVELS, LEVEL_DEBUG, LEVEL_INFO, LEVEL_WARN, LEVEL_ERROR, LEVEL_CRITICAL }
+export { LEVEL_DEBUG, LEVEL_INFO, LEVEL_WARN, LEVEL_ERROR, LEVEL_CRITICAL } from './constants';
 export { historyContext } from './history-context';
 export { Provider } from './provider';
 export { ErrorBoundary } from './error-boundary';
 export { RollbarContext } from './rollbar-context';
+export { isValidLevel } from './utils';
 export * from './hooks';
diff --git a/src/utils.js b/src/utils.js
@@ -1,3 +1,7 @@
+import * as constants from './constants';
+
+const VALID_LEVELS = constants.default;
+
 export function value(val, defaultTo, ...args) {
   if (typeof val === 'function') {
     return val(...args);
@@ -8,3 +12,7 @@ export function value(val, defaultTo, ...args) {
 export function wrapValue(val, defaultAs) {
   return (defaultTo, ...args) => value(val, defaultAs === undefined ? defaultTo : defaultAs, ...args);
 }
+
+export function isValidLevel(level) {
+  return VALID_LEVELS[level] >= constants.LEVEL_DEBUG && VALID_LEVELS[level] <= constants.LEVEL_CRITICAL;
+}