Eval code after expressions resolve (#29)

* test feature - eval code after expressions resolve

* add integration test

Author: jescalan

README.md

@@ -94,6 +94,8 @@ Any of these plugins can be customized by passing options described below.
 | **minify** | Minifies the html output by removing excess spaces and line breaks | `false` |
 | **appendPlugins** | Adds a single plugin or array of plugins after all the defaults | |
 | **prependPlugins** | Adds a single plugin or array of plugins before all the defaults | |
+| **template** | Set this to `true` if you are trying to output a client-side template function. | false |
+| **locals** | Optionally set your locals as soon as expressions are evaluated. | |
 
 ### Markdown Rendering Functions
 

lib/index.js

@@ -9,6 +9,7 @@ let retext = require('reshape-retext')
 let beautify = require('reshape-beautify')
 let minify = require('reshape-minify')
 let reshapeParser = require('reshape-parser')
+let evalCode = require('reshape-eval-code')
 
 /**
  * Primary export, formats options and returns an object with intelligent
@@ -68,6 +69,9 @@ module.exports = function reshapeStandard (options = {}) {
     layouts(layoutsOpt),
     include(includeOpt),
     expressions(expressionsOpt),
+    // eval code here if it's a static view so that locals can be
+    // processed by content, retext, minifier, etc
+    (options.template ? x => x : evalCode(options.locals)),
     content(contentOpt),
     retext(options.retext || smartypants)
   ]

package.json

@@ -11,6 +11,7 @@
     "markdown-it": "^8.2.2",
     "reshape-beautify": "^0.1.2",
     "reshape-content": "^0.2.0",
+    "reshape-eval-code": "^0.3.2",
     "reshape-expressions": "^0.1.5",
     "reshape-include": "^1.0.0",
     "reshape-layouts": "^1.0.0",
@@ -21,7 +22,7 @@
     "sugarml": "^0.6.0"
   },
   "devDependencies": {
-    "ava": "^0.19.1",
+    "ava": "^0.20.0",
     "coveralls": "^2.13.1",
     "nyc": "^11.0.3",
     "reshape": "^0.4.0",

test/fixtures/index.sgr

@@ -0,0 +1 @@
+p(mdi) {{ "wow **amazing**" }}

test/index.js

@@ -2,6 +2,10 @@ const test = require('ava')
 const rewire = require('rewire')
 const standardRewired = rewire('..')
 const standard = require('..')
+const path = require('path')
+const fixtures = path.join(__dirname, 'fixtures')
+const reshape = require('reshape')
+const fs = require('fs')
 
 test('content options passed correctly', (t) => {
   const undo = standardRewired.__set__('content', (opts) => {
@@ -56,7 +60,7 @@ test('defaults come out right', (t) => {
   t.truthy(out.parser.name === 'SugarMLParser')
   t.truthy(Object.keys(out.locals).length === 0)
   t.truthy(out.filename === undefined)
-  t.truthy(out.plugins.length === 6)
+  t.truthy(out.plugins.length === 7)
 })
 
 test('content defaults', (t) => {
@@ -104,6 +108,21 @@ test('minify option', (t) => {
   t.truthy(out.plugins[out.plugins.length - 1].name === 'minifyPlugin')
 })
 
+test('locals option', (t) => {
+  const undo = standardRewired.__set__('evalCode', (opts) => {
+    t.truthy(opts === true)
+  })
+  standardRewired({ locals: true })
+  undo()
+})
+
+test('template option', (t) => {
+  const out = standard()
+  t.truthy(out.plugins[3].name === 'evalCodePlugin')
+  const out2 = standard({ template: true })
+  t.falsy(out2.plugins[3].name === 'evalCodePlugin')
+})
+
 test('appendPlugins option', (t) => {
   const out = standard({ appendPlugins: ['test'] })
   const out2 = standard({ appendPlugins: 'test' })
@@ -132,3 +151,12 @@ test('markdownPlugins option', (t) => {
   standardRewired({ markdownPlugins: plugins })
   undo()
 })
+
+test.only('integration', (t) => {
+  const markup = fs.readFileSync(path.join(fixtures, 'index.sgr'), 'utf8')
+  return reshape(standard())
+    .process(markup)
+    .then((res) => {
+      t.is(res.output().trim(), '<p>wow <strong>amazing</strong></p>')
+    })
+})