structure

deroqin · Apr 5, 2020 · b7d310f · b7d310f
1 parent 03b42b0
commit b7d310f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/lib/services/flow/assignMeta.js b/lib/services/flow/assignMeta.js
@@ -23,6 +23,16 @@ function applyMetaToTree({tree, defaultMeta}) {
   }(tree, defaultMeta)
 }
 
+function defineDefaultMeta(payload){  
+  payload.defaultMeta = {
+    bundle: false,
+    recursive: true,
+    'precache-order': false,
+    'precache-proximity': true,
+    preload: false,
+  }  
+}
+
 /**
  * mergeMeta
  * @param {Object} meta
@@ -62,4 +72,4 @@ function mergeMeta({ meta = {}, filepath, isLayout, dir }, { ...dirMeta }) {
   return meta
 }
 
-module.exports = { applyMetaToFiles, applyMetaToTree }
+module.exports = { applyMetaToFiles, applyMetaToTree, defineDefaultMeta }
diff --git a/lib/services/flow/misc.js b/lib/services/flow/misc.js
@@ -45,5 +45,9 @@ const removeNonSvelteFiles = payload => walkAsyncTree(payload, file => {
   return isPage || isNormalDir || file.isLayout || file.isFallback
 })
 
+function normalizeOptions({ options }) {
+  const { extensions } = options
+  options.extensions = Array.isArray(extensions) ? extensions : extensions.split(',')
+}
 
-module.exports = { addPath, addId, removeUnderscoredDirs, removeNonSvelteFiles, defineFiles }
+module.exports = { addPath, addId, removeUnderscoredDirs, removeNonSvelteFiles, defineFiles, normalizeOptions }
diff --git a/lib/services/scanner.js b/lib/services/scanner.js
@@ -1,38 +1,23 @@
 const { attachComponent } = require('./flow/attachComponent')
-const { applyMetaToFiles, applyMetaToTree } = require('./flow/assignMeta')
+const { applyMetaToFiles, applyMetaToTree, defineDefaultMeta } = require('./flow/assignMeta')
 const { generateFileTree } = require('./flow/generateFileTree')
-const { addPath, addId, removeUnderscoredDirs, removeNonSvelteFiles, defineFiles } = require('./flow/misc')
+const { addPath, addId, removeUnderscoredDirs, removeNonSvelteFiles, defineFiles, normalizeOptions } = require('./flow/misc')
 const template = require('./flow/createTemplate')
-
 const { pipeAsync } = require('../utils/fp')
 
-
-const defaultMeta = {
-  bundle: false,
-  recursive: true,
-  'precache-order': false,
-  'precache-proximity': true,
-  preload: false,
-}
-
-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;
       x.metaParser = metaParser;
-      x.defaultMeta = defaultMeta;
       x.tree = { meta: { untouched: true }, root: true, dir: [] }
     },
     normalizeOptions,
     generateFileTree, // => dir
     removeUnderscoredDirs, // _private => false
     defineFiles, // file => ({ isLayout, isReset, isIndex, isFallback })
     removeNonSvelteFiles, // remove _file.svelte, keep dirs, layouts & resets
+    defineDefaultMeta,
     applyMetaToFiles,
     applyMetaToTree,
     addPath, // ... => ({ path, ... })