Fix/102 self closing tags (#103)

* 3.0.2

* fixes #102 - Close event not fired for selfClosing tags

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sax-wasm",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/justinwilaby/sax-wasm.git"

src/js/__test__/jsx.spec.ts

@@ -37,8 +37,8 @@ describe('When parsing JSX, the SaxWasm', () => {
     </Component>`));
 
     deepStrictEqual(_event,SaxEventType.CloseTag);
-    deepStrictEqual(_data[0].name,'SignIn');
-    deepStrictEqual(_data[1].name,'User');
+    deepStrictEqual(_data[0].name,'User');
+    deepStrictEqual(_data[1].name,'SignIn');
     deepStrictEqual(_data[2].name,'Component');
   });
 

src/js/__test__/tag.spec.ts

@@ -73,6 +73,25 @@ describe('SaxWasm', () => {
     deepEqual(g.selfClosing, false);
   });
 
+  it('should report selfClosing tags correctly when there is a space after the slash', () => {
+    parser.events = SaxEventType.CloseTag;
+
+    parser.write(Buffer.from(`<Div>
+	<Div type="JS" viewName="myapp.view.Home" />
+	<Div type="JSON" viewName="myapp.view.Home" />
+	<Div type="HTML" viewName="myapp.view.Home" />
+	<Div type="Template" viewName="myapp.view.Home" />
+
+	<AnotherSelfClosingDiv type="Template" viewName="myapp.view.Home" />
+</Div>`));
+    const [, div, div2, div3, div4, div5] = _data;
+    deepEqual(div.selfClosing, true);
+    deepEqual(div2.selfClosing, true);
+    deepEqual(div3.selfClosing, true);
+    deepEqual(div4.selfClosing, true);
+    deepEqual(div5.selfClosing, false);
+  });
+
   it('should handle the BOM', () => {
     parser.events = SaxEventType.OpenTag;
     parser.write(Buffer.from('\uFEFF<div></div>'));

src/sax/parser.rs

@@ -1009,7 +1009,17 @@ impl<'a> SAXParser<'a> {
             self.event_handler.handle_event(Event::OpenTag, Entity::Tag(&tag_box));
             self.dispatched.push(Dispatched::Tag(tag_box));
         }
-        self.tags.push(tag);
+
+        if self.events[Event::CloseTag] && self_closing {
+            tag.hydrate(self.source_ptr);
+            let tag_box = Box::new(tag.clone());
+            self.event_handler.handle_event(Event::CloseTag, Entity::Tag(&tag_box));
+            self.dispatched.push(Dispatched::Tag(tag_box));
+        }
+
+        if !self_closing {
+            self.tags.push(tag);
+        }
 
         self.state = State::BeginWhitespace;
     }
@@ -1565,4 +1575,35 @@ the plugin
 
         Ok(())
     }
+    #[test]
+    fn test_self_closing_tag() -> Result<()> {
+        let event_handler = TextEventHandler::new();
+        let mut sax = SAXParser::new(&event_handler);
+        let mut events = [false; 10];
+        events[Event::CloseTag] = true;
+        sax.events = events;
+        let str = r#"
+        <Div>
+            <Div type="JS" viewName="myapp.view.Home" />
+            <Div type="JSON" viewName="myapp.view.Home" />
+            <Div type="HTML" viewName="myapp.view.Home" />
+            <Div type="Template" viewName="myapp.view.Home" />
+
+            <!-- This one will be correctly "closed" -->
+            <AnotherSelfClosingDiv type="Template" viewName="myapp.view.Home" />
+        </Div>"#;
+
+        sax.write(str.as_bytes());
+        sax.identity();
+
+        let tags = event_handler.tags.borrow();
+        assert_eq!(tags.len(), 6);
+        assert_eq!(tags[0].self_closing, true);
+        assert_eq!(tags[1].self_closing, true);
+        assert_eq!(tags[2].self_closing, true);
+        assert_eq!(tags[3].self_closing, true);
+        assert_eq!(tags[4].self_closing, true);
+        assert_eq!(tags[5].self_closing, false);
+        Ok(())
+    }
 }