Merge pull request #82 from ekhaled/events-in-conditions

Parse event dispatchers inside if blocks
KatChaotic · Sep 8, 2021 · 4abe1ac · 4abe1ac
2 parents 4e02b7d + 3947738
commit 4abe1ac
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/lib/v3/script.js b/lib/v3/script.js
@@ -366,6 +366,17 @@ class ScriptParser extends EventEmitter {
                 return;
             }
 
+            if (node.type === 'IfStatement') {
+                if (node.consequent) {
+                    this.parseBodyRecursively(node.consequent, parseContext, level + 1);
+                }
+                if (node.alternate) {
+                    this.parseBodyRecursively(node.alternate, parseContext, level + 1);
+                }
+
+                return;
+            }
+
             if (node.type === 'VariableDeclaration' && parseContext.scopeType !== SCOPE_MARKUP) {
                 this.parseVariableDeclarations(node, parseContext, level, 'private');
 

diff --git a/test/svelte3/integration/events/event.dispatcher.default.svelte b/test/svelte3/integration/events/event.dispatcher.default.svelte
@@ -2,6 +2,17 @@
     import { createEventDispatcher } from 'svelte';
 
     const dispatch = createEventDispatcher();
-    
+
     dispatch('notify', 'data');
+
+    function someFunc(cond){
+        dispatch('start', 'data');
+        if(cond){
+            dispatch('end', 'data');
+        }else if(!cond){
+        	dispatch('running', 'data');
+        }else{
+         	dispatch('failed', 'data')
+        }
+    }
 </script>
diff --git a/test/svelte3/integration/events/events.spec.js b/test/svelte3/integration/events/events.spec.js
@@ -94,7 +94,7 @@ describe('SvelteDoc v3 - Events', () => {
             expect(doc, 'Document should be provided').to.exist;
             expect(doc.events, 'Document events should be parsed').to.exist;
 
-            expect(doc.events.length).to.equal(1);
+            expect(doc.events.length).to.equal(5);
             const event = doc.events[0];
 
             expect(event, 'Event should be a valid entity').to.exist;
@@ -106,7 +106,27 @@ describe('SvelteDoc v3 - Events', () => {
 
             const location = event.locations[0];
 
-            expect(location, 'Location should be correct identified').is.deep.equals({ start: 126, end: 134 });
+            expect(location, 'Location should be correct identified').is.deep.equals({ start: 122, end: 130 });
+
+            const event1 = doc.events[1];
+            expect(event1, 'Event should be a valid entity').to.exist;
+            expect(event1.name).to.equal('start');
+            expect(event1.visibility).to.equal('public');
+
+            const event2 = doc.events[2];
+            expect(event2, 'Event should be a valid entity').to.exist;
+            expect(event2.name).to.equal('end');
+            expect(event2.visibility).to.equal('public');
+
+            const event3= doc.events[3];
+            expect(event3, 'Event should be a valid entity').to.exist;
+            expect(event3.name).to.equal('running');
+            expect(event3.visibility).to.equal('public');
+
+            const event4 = doc.events[4];
+            expect(event4, 'Event should be a valid entity').to.exist;
+            expect(event4.name).to.equal('failed');
+            expect(event4.visibility).to.equal('public');
 
             done();
         }).catch(e => {