feat: better check-if-undefined

LuXDAmore · Dec 9, 2019 · c74b8b0 · c74b8b0
1 parent 9b0272d
commit c74b8b0
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/lib/module.js b/lib/module.js
@@ -24,10 +24,18 @@ const moduleName = 'apis-to-file'
         requests: [],
         axios: {},
     }
-;
+    , checkIfUndefinedAndReturnDifferentData = (
+        check,
+        value,
+    ) => {
+
+        return typeof check === 'undefined'
+            ? value
+            : check
+        ;
 
-// [GitHub](https://github.com/nuxt/nuxt.js/issues/123#issuecomment-272246782)
-// Gitignore
+    }
+;
 
 export default async function(
     moduleOptions,
@@ -111,12 +119,14 @@ export default async function(
                         ),
                 );
 
-                const request = requests[ index ]
-                    , key = request.field || index
-                    , emptyValue = typeof request.emptyValue !== 'undefined' ? request.emptyValue : []
+                const {
+                        field: key = index,
+                        emptyValue = [],
+                        pathToData,
+                    } = requests[ index ]
                     , value = (
-                        request.pathToData
-                            ? request.pathToData
+                        pathToData
+                            ? pathToData
                                 .split(
                                     '.',
                                 )
@@ -126,12 +136,18 @@ export default async function(
                                         key,
                                     ) => (
                                         typeof acc !== 'undefined' && acc !== null
-                                            ? acc[ key ] || emptyValue
+                                            ? checkIfUndefinedAndReturnDifferentData(
+                                                acc[ key ],
+                                                emptyValue
+                                            )
                                             : acc || {}
                                     ),
                                     data || {},
                                 )
-                            : data || emptyValue
+                            : checkIfUndefinedAndReturnDifferentData(
+                                data,
+                                emptyValue
+                            )
                     )
                 ;