Add tests and fix bugs

PythonCoderAS · PythonCoderAS · commit b8935e213b47 · 2022-08-18T10:11:15.000-04:00
diff --git a/src/parser.ts b/src/parser.ts
@@ -66,6 +66,7 @@ export default class Parser {
             // We've already built some text. Add it as a text node.
             const textNode = new TextNode(currentText);
             currentStack[currentStack.length - 1].addChild(textNode);
+            currentText = "";
           }
         } else {
           // We're building text, and we found a character other than "[".
@@ -85,6 +86,8 @@ export default class Parser {
               const previousStackElement = currentStack[currentStack.length - 1];
               previousStackElement.addChild(lastStackElement);
             }
+          } else if (nextCharacter === "/" && !currentTagName) {
+            buildingClosingTag = true;
           } else if ((["]", " ", "="].includes(nextCharacter))){
             // We found a character that signifies the end of the tag name.
               // First, we determine if it is a valid tag name.
@@ -113,6 +116,10 @@ export default class Parser {
                       throw new Error(`Expected closing tag for '${currentTagName}', found '${lastElement.name}'.`);
                     } else {
                       currentStack[currentStack.length - 1].addChild(lastElement);
+                      buildingText = true;
+                      buildingClosingTag = false;
+                      buildingTagName = false;
+                      currentTagName = "";
                     }
                   } else {
                     // Simple tag, there are no attributes or values. We push a tag to the stack and continue.
diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -19,4 +19,18 @@ describe("bbcode-ast tests", () => {
     expect(((parsed.children[0] as Node).children[0] as TextNode).text).to.equal("Hello world!");
     expect(parsed.toString()).to.equal("[b]Hello world![/b]");
   })
+
+  it("Should parse multiple simple tags", () => {
+    const parsed = defaultParser.parse("[b]Hello world![/b][i]Hello world![/i]")
+    expect(parsed.children.length).to.equal(2);
+    expect(parsed.children[0].name).to.equal("b");
+    expect((parsed.children[0] as Node).children.length).to.equal(1);
+    expect((parsed.children[0] as Node).children[0].name).to.equal("TextNode");
+    expect(((parsed.children[0] as Node).children[0] as TextNode).text).to.equal("Hello world!");
+    expect(parsed.children[1].name).to.equal("i");
+    expect((parsed.children[1] as Node).children.length).to.equal(1);
+    expect((parsed.children[1] as Node).children[0].name).to.equal("TextNode");
+    expect(((parsed.children[1] as Node).children[0] as TextNode).text).to.equal("Hello world!");
+    expect(parsed.toString()).to.equal("[b]Hello world![/b][i]Hello world![/i]");
+  })
 })
