feat: allow masking objects with backslash

Author: mochja

lib/compiler.js

@@ -1,6 +1,7 @@
 var util = require('./util')
-var TERMINALS = { ',': 1, '/': 2, '(': 3, ')': 4, '*': 5 }
+var TERMINALS = { ',': 1, '/': 2, '(': 3, ')': 4 }
 var ESCAPE_CHAR = '\\'
+var WILDCARD_CHAR = '*'
 
 module.exports = compile
 
@@ -46,13 +47,15 @@ function scan (text) {
 
   for (; i < len; i++) {
     ch = text.charAt(i)
-    if (ch === ESCAPE_CHAR) {
+    if (ch === ESCAPE_CHAR && !escape) {
       escape = true
       continue
     }
-    if (TERMINALS[ch] && escape !== true) {
+    if (TERMINALS[ch] && !escape) {
       maybePushName()
       tokens.push({ tag: ch })
+    } else if (ch === WILDCARD_CHAR && !name.length && !escape) {
+      tokens.push({ tag: ch, value: ch })
     } else {
       name += ch
     }
@@ -98,9 +101,11 @@ function _buildTree (tokens, parent) {
 
 function _addToken (token, props) {
   var prop = { type: token.type }
-  if (token.tag === '*') prop.filter = true
   if (!util.isEmpty(token.properties)) {
     prop.properties = token.properties
   }
-  props[token.value || token.tag] = prop
+  if (token.tag === WILDCARD_CHAR) {
+    prop.filter = true
+  }
+  props[token.value] = prop
 }

test/compiler-test.js

@@ -152,9 +152,19 @@ tests = {
         '*': { type: 'object' },
         '(': { type: 'object' },
         ')': { type: 'object' },
-        ',': { type: 'object' },
+        ',': { type: 'object' }
       }
     }
+  },
+  '\\\\': {
+    '\\': {
+      type: 'object'
+    }
+  },
+  'foo*bar': {
+    'foo*bar': {
+      type: 'object'
+    }
   }
 }
 

test/index-test.js

@@ -211,6 +211,17 @@ tests = [{
     '*': 101,
     some: 'visible'
   }
+}, {
+  m: 'some,\\\\',
+  o: {
+    '\\': 120,
+    beta: 'hidden',
+    some: 'visible'
+  },
+  e: {
+    '\\': 120,
+    some: 'visible'
+  }
 }]
 
 describe('json-mask', function () {