Add tests and fix bugs

PythonCoderAS · PythonCoderAS · commit 00a93604a5b4 · 2022-08-18T10:23:33.000-04:00
diff --git a/src/node.ts b/src/node.ts
@@ -42,7 +42,15 @@ export class Node extends BaseNode implements ChildrenHolder, AttributeHolder {
     return node;
   }
 
-  addChild(child: Node): void {
+  addChild(child: BaseNode): void {
+    if (child instanceof TextNode){
+      const previousChild = this.children[this.children.length - 1];
+      if (previousChild instanceof TextNode){
+        // We flatten the text nodes.
+        previousChild.text += child.text;
+        return;
+      }
+    }
     this.children.push(child.clone());
   }
 
@@ -99,7 +107,15 @@ export class RootNode extends BaseNode implements ChildrenHolder {
     this.children = children;
   }
 
-  addChild(child: Node): void {
+  addChild(child: BaseNode): void {
+    if (child instanceof TextNode){
+      const previousChild = this.children[this.children.length - 1];
+      if (previousChild instanceof TextNode){
+        // We flatten the text nodes.
+        previousChild.text += child.text;
+        return;
+      }
+    }
     this.children.push(child.clone());
   }
 
diff --git a/src/parser.ts b/src/parser.ts
@@ -37,6 +37,8 @@ export default class Parser {
     let buildingAttributeName = false;
     // Represents whether we're building the opening or closing tag.
     let buildingClosingTag = false;
+    // Represents whether we're building a code tag. Ignore bbcode inside the code tag.
+    let buildingCode = false;
     // Represents whether we're in a quote. In that case, ignore all spaces.
     let quoted = false;
     // Represents the name of the current tag we're building.
@@ -91,7 +93,7 @@ export default class Parser {
           } 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.
-              if (this.supportedTagNames.includes(this.caseSensitive ? currentTagName : currentTagName.toLowerCase())) {
+              if (this.supportedTagNames.includes(this.caseSensitive ? currentTagName : currentTagName.toLowerCase()) && (!buildingCode || currentTagName === "code")) {
                 // The tag name is valid.
                 if (nextCharacter === "]"){
                   if (currentTagName === "*"){
@@ -127,6 +129,9 @@ export default class Parser {
                     currentStack.push(currentTag);
                     buildingTagName = false;
                     buildingText = true;
+                    if (currentTagName.toLowerCase() === "code"){
+                      buildingCode = true;
+                    }
                     currentTagName = "";
                   }
                 } else if (nextCharacter === "="){
@@ -143,7 +148,7 @@ export default class Parser {
               // We treat it as text.
               buildingText = true;
               buildingTagName = false;
-              currentText += "[" + currentTagName;
+              currentText += (buildingClosingTag ? "[/" : "[") + currentTagName + nextCharacter;
             }
           } else {
             // We're still building the tag's name.
diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -33,4 +33,25 @@ describe("bbcode-ast tests", () => {
     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]");
   })
+
+  it("Should parse nested tags", () => {
+    const parsed = defaultParser.parse("[b][i]Hello world![/i][/b]")
+    expect(parsed.children.length).to.equal(1);
+    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("i");
+    expect(((parsed.children[0] as Node).children[0] as Node).children.length).to.equal(1);
+    expect((((parsed.children[0] as Node).children[0] as Node).children[0] as TextNode).text).to.equal("Hello world!");
+    expect(parsed.toString()).to.equal("[b][i]Hello world![/i][/b]");
+  })
+
+  it("Should parse code tags and ignore content", () => {
+    const parsed = defaultParser.parse("[code][b]Hello world![/b][/code]")
+    expect(parsed.children.length).to.equal(1);
+    expect(parsed.children[0].name).to.equal("code");
+    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("[b]Hello world![/b]");
+    expect(parsed.toString()).to.equal("[code][b]Hello world![/b][/code]");
+  })
 })
