[CM2] Create theme/common/partials2

It contains new page partials like collection and facet.

So, if compilerVersion is 2:
- theme settings is overridden as zen
- partials2 is copied and registered

Also, introduce a serialize function in facet and collection.

- Previously facet model was using a 'presentationFacets' for making
templates' job easy. Now that logic is moved to a serialize function and
it is exported as a model method.
- Collection's serialize just maps its facets to their serialized
versions
- Although feels wrong, homepage model now requires collection model to
be able to serialize it for the homepage template to access collections'
facets in the same way as collection page does.

All this definitely inspires a serialization step of contentModel before
rendering.

Author: scriptype

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

@@ -116,12 +116,38 @@ function linkEntryFieldsToFacets(entry, facets) {
   })
 }
 
+function serialize(facet) {
+  return {
+    ...facet,
+    title: facet.key,
+    get keys() {
+      return Array.from(facet.map.keys())
+    },
+    get entries() {
+      return Array.from(facet.map, ([key, value]) => {
+        let linkedFacet
+        try {
+          linkedFacet = JSON.parse(key)
+        } catch { }
+        const slug = linkedFacet ? linkedFacet.slug : makeSlug(key)
+        return {
+          key: linkedFacet ? linkedFacet.title : key,
+          value,
+          slug
+        }
+      })
+    }
+  }
+}
+
 function Facet() {
   const addressSegment = 'by' // alt: browse, filter, view
 
   return {
     collectFacets,
 
+    serialize,
+
     linkEntryFieldsToFacets,
 
     create: (key, map, context) => {
@@ -141,27 +167,7 @@ function Facet() {
     afterEffects: (contentModel, facet) => {},
 
     render: (renderer, facets, { contentModel, settings, debug }) => {
-      const presentationFacets = facets.map(f => ({
-        ...f,
-        title: f.key,
-        get keys() {
-          return Array.from(f.map.keys())
-        },
-        get entries() {
-          return Array.from(f.map, ([key, value]) => {
-            let linkedFacet
-            try {
-              linkedFacet = JSON.parse(key)
-            } catch { }
-            const slug = linkedFacet ? linkedFacet.slug : makeSlug(key)
-            return {
-              key: linkedFacet ? linkedFacet.title : key,
-              value,
-              slug
-            }
-          })
-        }
-      }))
+      const presentationFacets = facets.map(serialize)
 
       // /by
       const renderAllFacetsPage = () => {

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

@@ -46,6 +46,13 @@ function locatePinnedEntries(entries) {
   }
 }
 
+function serialize(collection) {
+  return {
+    ...collection,
+    facets: collection.facets.map(models.facet().serialize)
+  }
+}
+
 const defaultSettings = {
   defaultCategoryName: '',
   collectionAliases: [],
@@ -72,6 +79,8 @@ module.exports = function Collection(settings = defaultSettings, contentTypes =
   }
 
   return {
+    serialize,
+
     match: node => {
       const hasCollectionIndex = node.children?.find(isCollectionIndexFile)
       const hasCollectionData = node.children?.find(childNode => isDataFile(childNode, node))
@@ -289,7 +298,7 @@ module.exports = function Collection(settings = defaultSettings, contentTypes =
               content: collection.content,
               data: {
                 ...contentModel,
-                collection,
+                collection: serialize(collection),
                 pagination: paginationData,
                 posts: pageOfPosts,
                 settings,

src/compiler/contentModel2/models/homepage.js

@@ -2,7 +2,8 @@ const { join, resolve } = require('path')
 const { isTemplateFile } = require('../helpers')
 const models = {
   _baseEntry: require('./_baseEntry'),
-  attachment: require('./attachment')
+  attachment: require('./attachment'),
+  collection: require('./collection')
 }
 
 const defaultSettings = {
@@ -72,6 +73,7 @@ module.exports = function Homepage(settings = defaultSettings) {
           content: homepage.content,
           data: {
             ...contentModel,
+            collections: contentModel.collections.map(models.collection().serialize),
             homepage,
             settings,
             debug

src/settings.js

@@ -70,6 +70,7 @@ module.exports = {
     }
     _settings = _.omit({
       ...userSettings,
+      theme: userSettings.compilerVersion === 1 ? _settings.theme : 'zen',
       site: {
         title: userSettings.title,
         description: userSettings.description,

src/theme/common/partials2/base/base-includes.hbs

@@ -0,0 +1 @@
+<script type="module" src="{{assetsPath}}/common/dictionary.js"></script>

src/theme/common/partials2/base/base-script.hbs

@@ -0,0 +1,3 @@
+{{#if (hasCustomScript)}}
+<script type="text/javascript" src="{{assetsPath}}/custom/script.js"></script>
+{{/if}}

src/theme/common/partials2/base/base-style.hbs

@@ -0,0 +1,7 @@
+{{#if (hasCustomStyle)}}
+<link rel="stylesheet" href="{{assetsPath}}/custom/style.css">
+{{/if}}
+
+{{#if (hasThemeSettings)}}
+<link rel="stylesheet" href="{{assetsPath}}/custom/theme-settings.css">
+{{/if}}

src/theme/common/partials2/base/custom-script.hbs

@@ -0,0 +1,18 @@
+{{#if (isEnabled "rss")}}
+  {{#if (isCategoryPage) }}
+    <link rel="alternate" type="application/rss+xml" title="{{settings.site.title}} {{category.name}} Feed" href="{{settings.site.url}}{{ category.permalink }}/feed.xml">
+  {{else}}
+    <link rel="alternate" type="application/rss+xml" title="{{settings.site.title}} Feed" href="{{settings.site.url}}/feed.xml">
+  {{/if}}
+{{/if}}
+
+{{#if (isEnabled "syntaxHighlighting")}}
+  <link rel="stylesheet" href="{{assetsPath}}/features/highlight/styles/default.min.css">
+  <script src="{{assetsPath}}/features/highlight/highlight.min.js"></script>
+  <script>hljs.highlightAll();</script>
+{{/if}}
+
+{{#if (isEnabled "search")}}
+  <link rel="stylesheet" href="{{assetsPath}}/features/search/search.css">
+  <script defer type="module" src="{{assetsPath}}/features/search/search.js"></script>
+{{/if}}