cr fixes (will be squashed after another cr)

Leonidas-from-XIV · May 22, 2019 · f074644 · f074644
1 parent 19a4c2f
commit f074644
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/parser.coffee b/src/parser.coffee
@@ -145,7 +145,10 @@ class exports.Parser extends events.EventEmitter
           obj = obj[charkey]
 
       if (isEmpty obj)
-        obj = @options.emptyTag?() ? (if @options.emptyTag != '' then @options.emptyTag else emptyStr)
+        if typeof @options.emptyTag == 'function'
+          obj = @options.emptyTag()
+        else
+          obj = if @options.emptyTag != '' then @options.emptyTag else emptyStr
 
       if @options.validator?
         xpath = "/" + (node["#name"] for node in stack).concat(nodeName).join("/")

diff --git a/test/parser.test.coffee b/test/parser.test.coffee
@@ -72,7 +72,7 @@ module.exports =
     # determine number of items in object
     equ Object.keys(r.sample.tagcasetest[0]).length, 3)
 
-  'test parse with empty objects and functions': skeleton({emptyTag: ()=> new Object()}, (r)->
+  'test parse with empty objects and functions': skeleton({emptyTag: ()=> ({})}, (r)->
     console.log 'Result object: ' + util.inspect r, false, 10
     bool = r.sample.emptytestanother[0] is r.sample.emptytest[0]
     equ bool, false)