[CM2] Inject remaining settings deps into CM2

Author: scriptype

src/compiler/contentModel2/index.js

@@ -1,3 +1,5 @@
+const _ = require('lodash')
+const { resolve } = require('path')
 const { isTemplateFile } = require('./helpers')
 const models = {
   homepage: require('./models/homepage'),
@@ -90,61 +92,93 @@ const linkEntries = (contentModel) => {
   })
 }
 
-const root = (fsTree) => {
-  const contentModel = {
-    homepage: defaultHomepage(),
-    subpages: [],
-    collections: [],
-    assets: []
-  }
-
-  fsTree.forEach(node => {
-    if (isHomepage(node)) {
-      contentModel.homepage = models.homepage(node)
-      return
-    }
-
-    if (isSubpage(node)) {
-      return contentModel.subpages.push(
-        models.subpage(node)
-      )
+const defaultContentModelSettings = {
+  permalinkPrefix: '/',
+  out: resolve('.'),
+  defaultCategoryName: 'Unclassified',
+  assetsDirectory: 'assets',
+  pagesDirectory: 'pages',
+  homepageDirectory: 'homepage'
+}
+class ContentModel {
+  constructor(contentModelSettings = defaultContentModelSettings) {
+    this.settings = {
+      ...defaultContentModelSettings,
+      ...contentModelSettings
     }
 
-    if (isPagesDirectory(node)) {
-      return node.children.forEach(childNode => {
-        if (isSubpage(childNode)) {
-          contentModel.subpages.push(
-            models.subpage(childNode)
-          )
-        } else {
-          contentModel.assets.push(
-            models.asset(node)
-          )
-        }
-      })
-    }
+    this.collectionSettings = _.pick(
+      this.settings,
+      ['permalinkPrefix', 'out', 'defaultCategoryName']
+    )
+    this.subpageSettings = _.pick(
+      this.settings,
+      ['permalinkPrefix', 'out', 'pagesDirectory']
+    )
+    this.homepageSettings = _.pick(
+      this.settings,
+      ['permalinkPrefix', 'out', 'homepageDirectory']
+    )
+    this.assetSettings = _.pick(
+      this.settings,
+      ['permalinkPrefix', 'out', 'assetsDirectory']
+    )
+  }
 
-    if (isACollectionDirectory(node)) {
-      return contentModel.collections.push(
-        models.collection(node)
-      )
+  create(fileSystemTree) {
+    const contentModel = {
+      homepage: defaultHomepage(),
+      subpages: [],
+      collections: [],
+      assets: []
     }
 
-    if (isAssetsDirectory(node)) {
-      return contentModel.assets.push(
-        ...node.children.map(models.asset)
+    fileSystemTree.forEach(node => {
+      if (isHomepage(node)) {
+        contentModel.homepage = models.homepage(node, this.homepageSettings)
+        return
+      }
+
+      if (isSubpage(node)) {
+        return contentModel.subpages.push(
+          models.subpage(node, this.subpageSettings)
+        )
+      }
+
+      if (isPagesDirectory(node)) {
+        return node.children.forEach(childNode => {
+          if (isSubpage(childNode)) {
+            contentModel.subpages.push(
+              models.subpage(childNode, this.subpageSettings)
+            )
+          } else {
+            contentModel.assets.push(
+              models.asset(childNode, this.assetSettings)
+            )
+          }
+        })
+      }
+
+      if (isACollectionDirectory(node)) {
+        return contentModel.collections.push(
+          models.collection(node, this.collectionSettings)
+        )
+      }
+
+      if (isAssetsDirectory(node)) {
+        return contentModel.assets.push(
+          ...node.children.map(n => models.asset(n, this.assetSettings))
+        )
+      }
+
+      contentModel.assets.push(
+        models.asset(node, this.assetSettings)
       )
-    }
-
-    contentModel.assets.push(
-      models.asset(node)
-    )
-  })
+    })
 
-  linkEntries(contentModel)
-  return contentModel
+    linkEntries(contentModel)
+    return contentModel
+  }
 }
 
-module.exports = {
-  create: root
-}
+module.exports = ContentModel

src/compiler/contentModel2/models/asset.js

@@ -1,9 +1,11 @@
-const { join } = require('path')
-const Settings = require('../../../settings')
-
-function asset(node) {
-  const settings = Settings.getSettings()
+const { join, resolve } = require('path')
 
+const defaultSettings = {
+  permalinkPrefix: '/',
+  out: resolve('.'),
+  assetsDirectory: 'assets'
+}
+function asset(node, settings = defaultSettings) {
   const permalink = (
     settings.permalinkPrefix +
     [settings.assetsDirectory, node.name].join('/')

src/compiler/contentModel2/models/collection/index.js

@@ -1,8 +1,7 @@
-const { join } = require('path')
+const { join, resolve } = require('path')
 const _ = require('lodash')
 const frontMatter = require('front-matter')
 const makeSlug = require('slug')
-const Settings = require('../../../../settings')
 const { isTemplateFile, Markdown } = require('../../helpers')
 const models = {
   attachment: require('../attachment'),
@@ -33,9 +32,12 @@ function parseContent(node, content) {
   return Markdown.parse(content)
 }
 
-function collection(node) {
-  const settings = Settings.getSettings()
-
+const defaultSettings = {
+  permalinkPrefix: '/',
+  out: resolve('.'),
+  defaultCategoryName: 'Unclassified'
+}
+function collection(node, settings = defaultSettings) {
   function collectPostTags(post) {
     post.tags.forEach(postTag => {
       let collectionTag = tree.tags.find(t => t.name === postTag.name)

src/compiler/contentModel2/models/homepage.js

@@ -1,12 +1,14 @@
-const { join } = require('path')
-const Settings = require('../../../settings')
+const { join, resolve } = require('path')
 const models = {
   _baseEntry: require('./_baseEntry')
 }
 
-function homepage(node) {
-  const settings = Settings.getSettings()
-
+const defaultSettings = {
+  permalinkPrefix: '/',
+  out: resolve('.'),
+  homepageDirectory: 'homepage'
+}
+function homepage(node, settings = defaultSettings) {
   const baseEntryProps = models._baseEntry(node, ['index', 'homepage', 'home'])
 
   const pageContext = {

src/compiler/contentModel2/models/subpage.js

@@ -1,12 +1,14 @@
-const { join } = require('path')
-const Settings = require('../../../settings')
+const { join, resolve } = require('path')
 const models = {
   _baseEntry: require('./_baseEntry')
 }
 
-function subpage(node) {
-  const settings = Settings.getSettings()
-
+const defaultSettings = {
+  permalinkPrefix: '/',
+  out: resolve('.'),
+  pagesDirectory: 'pages'
+}
+function subpage(node, settings = defaultSettings) {
   const baseEntryProps = models._baseEntry(node, ['index', 'page'])
 
   const permalink = (

src/routines.js

@@ -1,3 +1,4 @@
+const _ = require('lodash')
 const Debug = require('./debug')
 const Settings = require('./settings')
 const Decorations = require('./decorations')
@@ -68,21 +69,41 @@ const run = async ({ mode, rootDirectory, refreshTheme, finishCallback }) => {
   await Dictionary.init()
   await SiteDirectory.create()
   await CNAME.create()
+
   const logger = {
     debug: Debug.debugLog
   }
   const { fileSystemTree, contentModel } = await new Compiler({
-    fileSystemParser: new FileSystemParser({
-      rootDirectory: settings.rootDirectory,
-      contentDirectory: settings.contentDirectory,
-      IGNORE_PATHS_REG_EXP: settings.IGNORE_PATHS_REG_EXP
-    }, logger),
-    contentModel: settings.compilerVersion === 2 ? ContentModel2 : ContentModel1,
-    renderer: settings.compilerVersion === 2 ? Rendering2 : Rendering1
+    fileSystemParser: new FileSystemParser(
+      _.pick(settings, [
+        'rootDirectory',
+        'contentDirectory',
+        'IGNORE_PATHS_REG_EXP'
+      ]),
+      logger
+    ),
+
+    contentModel: settings.compilerVersion === 2 ?
+      new ContentModel2(
+        _.pick(settings, [
+          'permalinkPrefix',
+          'out',
+          'defaultCategoryName',
+          'assetsDirectory',
+          'pagesDirectory',
+          'homepageDirectory'
+        ])
+      ) :
+      ContentModel1,
+
+    renderer: settings.compilerVersion === 2 ?
+      Rendering2 :
+      Rendering1
   }).compile()
   if (settings.compilerVersion === 1) {
     await Assets.copyAssets()
   }
+
   await finishCallback({
     settings,
     fileSystemTree,

src/tests/compiler/contentModel2.js

@@ -1,19 +1,21 @@
 const os = require('os')
 const test = require('tape')
-const settings = require('../../settings')
-const contentModel2 = require('../../compiler/contentModel2')
+const ContentModel2 = require('../../compiler/contentModel2')
 
 const FSTree = os.platform() === 'win32' ?
   require('../fixtures/contentModel2FSTreeWin32.json') :
   require('../fixtures/contentModel2FSTree.json')
 
 test('compiler/contentModel2', t => {
   t.test('exits 0', async () => {
-    await settings.init({
-      mode: 'build',
-      rootDirectory: '.'
+    const contentModel2 = new ContentModel2({
+      permalinkPrefix: '/my/crazy/url/schemes/',
+      out: '/somewhere/out/there/there/is/gotta/be/a',
+      defaultCategoryName: 'Unclassified',
+      assetsDirectory: 'azkaban',
+      pagesDirectory: 'stufflar',
+      homepageDirectory: 'prelude'
     })
-
     console.dir(
       contentModel2.create(FSTree).collections[0],
       { depth: null, colors: true }