support tokens that are not a function (#883)

electrode-io · Jul 30, 2018 · 839c838 · 839c838
1 parent c3cca42
commit 839c838
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/packages/electrode-react-webapp/lib/react/token-handlers.js b/packages/electrode-react-webapp/lib/react/token-handlers.js
@@ -245,9 +245,7 @@ module.exports = function setup(handlerContext /* , asyncTemplate */) {
         : `<script${context.user.scriptNonce}>${context.user.content.prefetch}</script>`;
     },
 
-    [META_TAGS_MARKER]: () => {
-      return iconStats;
-    },
+    [META_TAGS_MARKER]: iconStats,
 
     [CRITICAL_CSS_MARKER]: context => {
       return criticalCSS ? `<style${context.user.styleNonce}>${criticalCSS}</style>` : "";

diff --git a/packages/electrode-react-webapp/lib/renderer.js b/packages/electrode-react-webapp/lib/renderer.js
@@ -35,6 +35,14 @@ class Renderer {
 
         const tkFunc = handler.tokens[tk.id];
 
+        // not a function, just add it to output
+        if (typeof tkFunc !== "function") {
+          return xt => {
+            xt.context.output.add(tkFunc);
+            this._next(xt);
+          };
+        }
+
         // token function takes more than one argument, so pass in a callback for async
         if (tkFunc.length > 1) {
           return xt => tkFunc.call(tk, xt.context, () => this._next(xt));

diff --git a/packages/electrode-react-webapp/test/fixtures/test-render-context.html b/packages/electrode-react-webapp/test/fixtures/test-render-context.html
@@ -4,6 +4,7 @@
 <!--%{#./test/fixtures/string-only}-->
 <!--%{#./test/fixtures/return-undefined}-->
 <!--%{internal-test}-->
+<!--%{non-func-token}-->
 <!--%{#./test/fixtures/async-error}-->
 <!--%{#./test/fixtures/wants-next}-->
 <!--%{#./test/fixtures/return-undefined}-->

diff --git a/packages/electrode-react-webapp/test/spec/react-webapp.spec.js b/packages/electrode-react-webapp/test/spec/react-webapp.spec.js
@@ -51,7 +51,8 @@ describe("react-webapp", function() {
               },
               tokens: {
                 "internal-test": () => "\ninternal-test",
-                "test-not-found": () => "\nnot found"
+                "test-not-found": () => "\nnot found",
+                "non-func-token": ""
               }
             },
             defaultReactHandler

diff --git a/packages/electrode-react-webapp/test/spec/render-context.spec.js b/packages/electrode-react-webapp/test/spec/render-context.spec.js
@@ -28,7 +28,8 @@ describe("render-context", function() {
           internalHandler = context.getTokenHandler("internal-test-handler");
         },
         tokens: {
-          "internal-test": () => `\nbuilt-in for internal-test`
+          "internal-test": () => `\nbuilt-in for internal-test`,
+          "non-func-token": "\ntest non-func token"
         }
       }
     });
@@ -39,6 +40,7 @@ from async ok module
 from async error module
 from string only module
 built-in for internal-test
+test non-func token
 from async error module
 from wants next module<!-- unhandled token test-not-found -->
 from string only module