normalize options within flow

deroqin · Apr 5, 2020 · 3bdad3c · 3bdad3c
1 parent f2f6f2c
commit 3bdad3c
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/lib/services/scanner.js b/lib/services/scanner.js
@@ -10,9 +10,6 @@ const {
 } = require('../utils/fp')
 
 
-
-const defaultOptions = {}
-
 const defaultMeta = {
   bundle: false,
   recursive: true,
@@ -21,18 +18,12 @@ const defaultMeta = {
   preload: false,
 }
 
-const parseOptionExtensions = ({ extensions }) => ({
-  extensions: Array.isArray(extensions) ? extensions : extensions.split(','),
-})
-
-const parseOptions = options => ({
-  ...options,
-  ...parseOptionExtensions(options),
-})
-
-module.exports = async function scanner(inputOptions, metaParser) {
-  const options = parseOptions({ ...defaultOptions, ...inputOptions })
+function normalizeOptions({ options }) {
+  const { extensions } = options
+  options.extensions = Array.isArray(extensions) ? extensions : extensions.split(',')
+}
 
+module.exports = async function scanner(options, metaParser) {  
   return await pipeAsync(
     x => {
       x.options = options;
@@ -41,6 +32,7 @@ module.exports = async function scanner(inputOptions, metaParser) {
       x.tree = { meta: { untouched: true }, root: true, dir: [] }
     },
     // createRoot, // dir => ({ dir, ...root })
+    normalizeOptions,
     generateFileTree, // => dir
     removeUnderscoredDirs, // _private => false
     defineFiles, // file => ({ isLayout, isReset, isIndex, isFallback })