Finally fix test cases

Author: PythonCoderAS

src/index.ts

@@ -3,6 +3,6 @@ import Parser from "./parser";
 export * from "./node";
 export { default as Parser } from "./parser";
 
-const defaultTags = ["b", "u", "i", "s", "center", "right", "color", "size", "yt", "list", "url", "img", "spoiler", "code"]
+const defaultTags = ["b", "u", "i", "s", "center", "right", "color", "size", "yt", "list", "*", "url", "img", "spoiler", "code"]
 const defaultParser = new Parser(defaultTags, false);
 export default defaultParser;

src/node.ts

@@ -129,9 +129,13 @@ export class RootNode extends BaseNode implements ChildrenHolder {
 }
 
 export class ListItemNode extends RootNode {
-  name = "ListItemNode";
+  name = "*";
 
   toString(): string {
     return "[*]" + super.toString();
   }
+
+  clone(): ListItemNode {
+    return new ListItemNode(this.children.map(child => child.clone()));
+  }
 }

src/parser.ts

@@ -79,15 +79,16 @@ export default class Parser {
         // We have to be building a tag or tag data.
         if (buildingTagName) {
           // We're building the tag's name.
-          if (nextCharacter === "*" && !currentTagName) {
+          if (nextCharacter === "*" && !currentTagName && !buildingClosingTag) {
             // This is a list node closing tag.
             const lastStackElement = currentStack[currentStack.length - 1];
-            if (lastStackElement instanceof ListItemNode) {
+            if (lastStackElement.name === "*") {
               // We finished the last list item.
               currentStack.pop();
               const previousStackElement = currentStack[currentStack.length - 1];
               previousStackElement.addChild(lastStackElement);
             }
+            currentTagName += nextCharacter;
           } else if (nextCharacter === "/" && !currentTagName) {
             buildingClosingTag = true;
           } else if ((["]", " ", "="].includes(nextCharacter))){
@@ -96,7 +97,7 @@ export default class Parser {
               if (this.supportedTagNames.includes(this.caseSensitive ? currentTagName : currentTagName.toLowerCase()) && (!buildingCode || currentTagName === "code")) {
                 // The tag name is valid.
                 if (nextCharacter === "]"){
-                  if (currentTagName === "*"){
+                  if (currentTagName === "*" && !buildingClosingTag) {
                     // This is a list node opening tag.
                     const listNode = new ListItemNode();
                     currentStack.push(listNode);
@@ -108,7 +109,7 @@ export default class Parser {
                     let lastElement = currentStack.pop()!;
                     if (currentTagName === "list"){
                       // List tag. If the last element is a list item, we need to add it to the previous element.
-                      if (lastElement instanceof ListItemNode){
+                      if (lastElement.name === "*"){
                         const previousElement = currentStack.pop()!;
                         previousElement.addChild(lastElement);
                         lastElement = previousElement;

tests/index.test.ts

@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import defaultParser, {Node, TextNode} from "../src/index";
+import defaultParser, {ListItemNode, Node, TextNode} from "../src/index";
 
 describe("bbcode-ast tests", () => {
   it("Should parse tag-free text", () => {
@@ -54,4 +54,20 @@ describe("bbcode-ast tests", () => {
     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]");
   })
+
+  it("Should parse list tags", () => {
+    const parsed = defaultParser.parse("[list][*]Hello world![*]Hello world![/list]")
+    expect(parsed.children.length).to.equal(1);
+    expect(parsed.children[0].name).to.equal("list");
+    expect((parsed.children[0] as Node).children.length).to.equal(2);
+    expect((parsed.children[0] as Node).children[0].name).to.equal("*");
+    expect(((parsed.children[0] as Node).children[0] as ListItemNode).children.length).to.equal(1);
+    expect(((parsed.children[0] as Node).children[0] as ListItemNode).children[0].name).to.equal("TextNode");
+    expect((((parsed.children[0] as Node).children[0] as ListItemNode).children[0] as TextNode).text).to.equal("Hello world!");
+    expect((parsed.children[0] as Node).children[1].name).to.equal("*");
+    expect(((parsed.children[0] as Node).children[1] as ListItemNode).children.length).to.equal(1);
+    expect(((parsed.children[0] as Node).children[1] as ListItemNode).children[0].name).to.equal("TextNode");
+    expect((((parsed.children[0] as Node).children[1] as ListItemNode).children[0] as TextNode).text).to.equal("Hello world!");
+    expect(parsed.toString()).to.equal("[list][*]Hello world![*]Hello world![/list]");
+  })
 })