fix: potential problem with default options (#235)

gajus · Feb 24, 2019 · 0e39c78 · 0e39c78
1 parent 23b3560
commit 0e39c78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/getClassName.js b/src/getClassName.js
@@ -87,10 +87,10 @@ const getClassNameFromMultipleImports = (
 export default (styleNameValue: string, styleModuleImportMap: StyleModuleImportMapType, options?: GetClassNameOptionsType): string => {
   const styleModuleImportMapKeys = Object.keys(styleModuleImportMap);
 
-  const handleMissingStyleName = options && options.handleMissingStyleName ||
-    optionsDefaults.handleMissingStyleName;
-
-  const autoResolveMultipleImports = options && options.autoResolveMultipleImports;
+  const {
+    handleMissingStyleName = optionsDefaults.handleMissingStyleName,
+    autoResolveMultipleImports = optionsDefaults.autoResolveMultipleImports
+  } = options || {};
 
   if (!styleNameValue) {
     return '';

diff --git a/src/index.js b/src/index.js
@@ -211,8 +211,10 @@ export default ({
           return;
         }
 
-        const handleMissingStyleName = stats.opts && stats.opts.handleMissingStyleName || optionsDefaults.handleMissingStyleName;
-        const autoResolveMultipleImports = stats.opts && stats.opts.autoResolveMultipleImports || optionsDefaults.autoResolveMultipleImports;
+        const {
+          handleMissingStyleName = optionsDefaults.handleMissingStyleName,
+          autoResolveMultipleImports = optionsDefaults.autoResolveMultipleImports
+        } = stats.opts || {};
 
         for (const attribute of attributes) {
           const destinationName = attributeNames[attribute.name.name];