feat(code): server exports

Refactor exports for more fine-grained control

capUtils.es.js

@@ -1,13 +1,19 @@
 import {
     deepEqual,
     mapStateToComponents,
+    mapStateToAttributes,
+    mapStateToHead,
     reducePropsToState,
+    renderAttributes,
     HEAD_TAG_NAMES
 } from './lib/capUtils';
 
 export {
     deepEqual,
     mapStateToComponents,
+    mapStateToAttributes,
+    mapStateToHead,
     reducePropsToState,
+    renderAttributes,
     HEAD_TAG_NAMES
 };

capUtils.js

@@ -3,4 +3,7 @@ var capUtils = require('./lib/capUtils');
 exports.deepEqual = capUtils.deepEqual;
 exports.reducePropsToState = capUtils.reducePropsToState;
 exports.mapStateToComponents = capUtils.mapStateToComponents;
+exports.mapStateToAttributes = capUtils.mapStateToAttributes;
+exports.mapStateToHead = capUtils.mapStateToHead;
+exports.renderAttributes = capUtils.renderAttributes;
 exports.HEAD_TAG_NAMES = capUtils.HEAD_TAG_NAMES;

server.es.js

@@ -1,2 +1,2 @@
-import { mapStateOnServer } from './lib/server';
-export { mapStateOnServer };
+import { mapStateOnServer, mapAttributeStateOnServer, mapComponentStateOnServer } from './lib/server';
+export { mapStateOnServer, mapAttributeStateOnServer, mapComponentStateOnServer };

server.js

@@ -1,2 +1,4 @@
 var server = require('./lib/server');
 exports.mapStateOnServer = server.mapStateOnServer;
+exports.mapAttributeStateOnServer = server.mapAttributeStateOnServer;
+exports.mapComponentStateOnServer = server.mapComponentStateOnServer;

src/CapUtils.js

@@ -25,55 +25,122 @@ const getComponentForTag = (type, tags, options) => {
     }
 };
 
-const mapStateToComponents = (
+const mapStateToAttributes = (
+    {bodyAttributes, htmlAttributes},
+    componentOptions
+) => {
+    const components = {
+        bodyAttributes: [],
+        htmlAttributes: []
+    };
+
+    if (bodyAttributes) {
+        components.bodyAttributes = getComponentForTag(
+            ATTRIBUTE_NAMES.BODY,
+            bodyAttributes,
+            componentOptions
+        );
+    }
+
+    if (htmlAttributes) {
+        components.htmlAttributes = getComponentForTag(
+            ATTRIBUTE_NAMES.HTML,
+            htmlAttributes,
+            componentOptions
+        );
+    }
+
+    return components;
+};
+
+const mapStateToHead = (
     {
         baseTag,
-        bodyAttributes,
-        htmlAttributes,
         linkTags,
         metaTags,
         noscriptTags,
         scriptTags,
         styleTags,
-        title = "",
+        title,
         titleAttributes
     },
     componentOptions
-) => ({
-    base: getComponentForTag(HEAD_TAG_NAMES.BASE, baseTag, componentOptions),
-    bodyAttributes: getComponentForTag(
-        ATTRIBUTE_NAMES.BODY,
-        bodyAttributes,
-        componentOptions
-    ),
-    htmlAttributes: getComponentForTag(
-        ATTRIBUTE_NAMES.HTML,
-        htmlAttributes,
-        componentOptions
-    ),
-    link: getComponentForTag(HEAD_TAG_NAMES.LINK, linkTags, componentOptions),
-    meta: getComponentForTag(HEAD_TAG_NAMES.META, metaTags, componentOptions),
-    noscript: getComponentForTag(
-        HEAD_TAG_NAMES.NOSCRIPT,
-        noscriptTags,
-        componentOptions
-    ),
-    script: getComponentForTag(
-        HEAD_TAG_NAMES.SCRIPT,
-        scriptTags,
-        componentOptions
-    ),
-    style: getComponentForTag(
-        HEAD_TAG_NAMES.STYLE,
-        styleTags,
-        componentOptions
-    ),
-    title: getComponentForTag(
-        HEAD_TAG_NAMES.TITLE,
-        {title, titleAttributes},
-        componentOptions
-    )
-});
+) => {
+    const components = {
+        base: [],
+        link: [],
+        meta: [],
+        noscript: [],
+        script: [],
+        style: [],
+        title: []
+    };
+
+    if (baseTag) {
+        components.base = getComponentForTag(
+            HEAD_TAG_NAMES.BASE,
+            baseTag,
+            componentOptions
+        );
+    }
+
+    if (linkTags) {
+        components.link = getComponentForTag(
+            HEAD_TAG_NAMES.LINK,
+            linkTags,
+            componentOptions
+        );
+    }
+
+    if (metaTags) {
+        components.meta = getComponentForTag(
+            HEAD_TAG_NAMES.META,
+            metaTags,
+            componentOptions
+        );
+    }
+
+    if (noscriptTags) {
+        components.noscript = getComponentForTag(
+            HEAD_TAG_NAMES.NOSCRIPT,
+            noscriptTags,
+            componentOptions
+        );
+    }
+
+    if (scriptTags) {
+        components.script = getComponentForTag(
+            HEAD_TAG_NAMES.SCRIPT,
+            scriptTags,
+            componentOptions
+        );
+    }
+
+    if (styleTags) {
+        components.style = getComponentForTag(
+            HEAD_TAG_NAMES.STYLE,
+            styleTags,
+            componentOptions
+        );
+    }
+
+    if (title) {
+        components.title = getComponentForTag(
+            HEAD_TAG_NAMES.TITLE,
+            {title: title || "", titleAttributes},
+            componentOptions
+        );
+    }
+
+    return components;
+};
+
+const mapStateToComponents = (state, options) => {
+    return Object.assign(
+        mapStateToAttributes(state, options),
+        mapStateToHead(state, options)
+    );
+};
 
 const renderAttributes = ({htmlAttributes, bodyAttributes}) => {
     updateAttributes(TAG_NAMES.BODY, bodyAttributes);
@@ -83,6 +150,8 @@ const renderAttributes = ({htmlAttributes, bodyAttributes}) => {
 export {
     reducePropsToState,
     mapStateToComponents,
+    mapStateToAttributes,
+    mapStateToHead,
     deepEqual,
     renderAttributes,
     HEAD_TAG_NAMES

src/HelmetServerUtils.js

@@ -111,7 +111,14 @@ const getMethodsForTag = (type, tags, encode, componentOptions) => {
     }
 };
 
-const mapStateOnServer = (
+const mapStateOnServer = (state, options = {}) => {
+    return Object.assign(
+        mapAttributeStateOnServer(state, options),
+        mapComponentStateOnServer(state, options)
+    );
+};
+
+const mapComponentStateOnServer = (
     {
         baseTag,
         bodyAttributes,
@@ -128,18 +135,6 @@ const mapStateOnServer = (
     componentOptions = {}
 ) => ({
     base: getMethodsForTag(TAG_NAMES.BASE, baseTag, encode, componentOptions),
-    bodyAttributes: getMethodsForTag(
-        ATTRIBUTE_NAMES.BODY,
-        bodyAttributes,
-        encode,
-        componentOptions
-    ),
-    htmlAttributes: getMethodsForTag(
-        ATTRIBUTE_NAMES.HTML,
-        htmlAttributes,
-        encode,
-        componentOptions
-    ),
     link: getMethodsForTag(TAG_NAMES.LINK, linkTags, encode, componentOptions),
     meta: getMethodsForTag(TAG_NAMES.META, metaTags, encode, componentOptions),
     noscript: getMethodsForTag(
@@ -186,4 +181,4 @@ const mapAttributeStateOnServer = (
     )
 });
 
-export {mapStateOnServer, mapAttributeStateOnServer};
+export {mapStateOnServer, mapAttributeStateOnServer, mapComponentStateOnServer};