Merge pull request #105 from posthtml/milestone-1.6.1

Milestone 1.6.1

Author: Scrum

INDEX.md

@@ -43,7 +43,7 @@
 <dt><a href="#escapeHTML">escapeHTML(unescaped)</a> ⇒ <code>String</code></dt>
 <dd><p>Escape HTML characters with their respective entities</p>
 </dd>
-<dt><a href="#placeholders">placeholders(input, ctx, settings)</a> ⇒ <code>String</code></dt>
+<dt><a href="#placeholders">placeholders(input, ctx, settings, opts)</a> ⇒ <code>String</code></dt>
 <dd><p>Replace Expressions</p>
 </dd>
 <dt><a href="#getNextTag">getNextTag(nodes, i)</a> ⇒ <code>Array</code></dt>
@@ -200,7 +200,7 @@ Escape HTML characters with their respective entities
 
 <a name="placeholders"></a>
 
-## placeholders(input, ctx, settings) ⇒ <code>String</code>
+## placeholders(input, ctx, settings, opts) ⇒ <code>String</code>
 Replace Expressions
 
 **Kind**: global function  
@@ -211,6 +211,7 @@ Replace Expressions
 | input | <code>String</code> | Input |
 | ctx | <code>Object</code> | Context |
 | settings | <code>Array</code> | Settings |
+| opts | <code>Array</code> | Options |
 
 <a name="getNextTag"></a>
 

changelog.md

@@ -1,3 +1,12 @@
+## [1.6.1](https://github.com/posthtml/posthtml-expressions/compare/v1.6.0...v1.6.1) (2020-11-09)
+
+
+### Bug Fixes
+
+* check if key exists in locals as text, close [#102](https://github.com/posthtml/posthtml-expressions/issues/102) ([1d7596a](https://github.com/posthtml/posthtml-expressions/commit/1d7596a8a4d12fd29a74f03637057772a9b81d09))
+
+
+
 # [1.6.0](https://github.com/posthtml/posthtml-expressions/compare/v1.5.0...v1.6.0) (2020-10-30)
 
 

lib/index.js

@@ -182,7 +182,7 @@ function walk (opts, nodes) {
 
     // if we have a string, match and replace it
     if (typeof node === 'string') {
-      node = placeholders(node, ctx, delimitersSettings)
+      node = placeholders(node, ctx, delimitersSettings, opts)
       node = node
         .replace(unescapeDelimitersReplace, delimitersSettings[0].text[0])
         .replace(delimitersReplace, delimitersSettings[1].text[0])
@@ -196,14 +196,14 @@ function walk (opts, nodes) {
     if (node.attrs) {
       for (const key in node.attrs) {
         if (typeof node.attrs[key] === 'string') {
-          node.attrs[key] = placeholders(node.attrs[key], ctx, delimitersSettings)
+          node.attrs[key] = placeholders(node.attrs[key], ctx, delimitersSettings, opts)
           node.attrs[key] = node.attrs[key]
             .replace(unescapeDelimitersReplace, delimitersSettings[0].text[0])
             .replace(delimitersReplace, delimitersSettings[1].text[0])
         }
 
         // if key is parametr
-        const _key = placeholders(key, ctx, delimitersSettings)
+        const _key = placeholders(key, ctx, delimitersSettings, opts)
         if (key !== _key) {
           node.attrs[_key] = node.attrs[key]
           delete node.attrs[key]

lib/placeholders.js

@@ -32,10 +32,11 @@ function escapeHTML (unescaped) {
  * @param  {String} input Input
  * @param  {Object} ctx Context
  * @param  {Array}  settings Settings
+ * @param  {Array}  opts Options
  *
  * @return {String} input Replaced Input
  */
-function placeholders (input, ctx, settings) {
+function placeholders (input, ctx, settings, opts) {
   // Since we are matching multiple sets of delimiters, we need to run a loop
   // here to match each one.
   for (let i = 0; i < settings.length; i++) {
@@ -54,7 +55,13 @@ function placeholders (input, ctx, settings) {
       let value
 
       if (/\W+/.test(expression)) {
-        value = vm.runInContext(expression, ctx)
+        try {
+          value = vm.runInContext(expression, ctx)
+        } catch (error) {
+          if (opts.strictMode) {
+            throw new SyntaxError(error)
+          }
+        }
       } else if (Object.prototype.hasOwnProperty.call(ctx, expression)) {
         value = ctx[expression]
       }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "posthtml-expressions",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Expressions Plugin for PostHTML",
   "engines": {
     "node": ">=10"

package.json

@@ -1,3 +1,8 @@
 <if condition="key_not_exists">
   it works!
 </if>
+
+<if condition="key_not_exists">
+  {{ key_not_exists.foo }}
+  it works!
+</if>

test/fixtures/conditional_if_key_not_exists.html

@@ -66,7 +66,7 @@ test('Expressions - spacing', (t) => {
 
 test('Expressions - error', (t) => {
   return error('expression_error', (err) => {
-    t.is(err.message, 'Invalid or unexpected token')
+    t.is(err.message, 'SyntaxError: Invalid or unexpected token')
   })
 })