Some more tests

PythonCoderAS · PythonCoderAS · commit abf9456da570 · 2022-08-18T11:27:03.000-04:00
diff --git a/src/node.ts b/src/node.ts
@@ -34,6 +34,7 @@ export class Node extends BaseNode implements ChildrenHolder, AttributeHolder {
     super();
     this.name = params.name;
     this.attributes = params.attributes || {};
+    this.value = params.value;
   }
 
   clone(): Node {
@@ -69,7 +70,7 @@ export class Node extends BaseNode implements ChildrenHolder, AttributeHolder {
       nodeString += `=${this.value}`;
     }
     Object.entries(this.attributes).forEach(([key, value]) => {
-      nodeString += ` ${key}="${value}"`;
+      nodeString += ` ${key}=${value}`;
     });
     nodeString += ']';
     this.children.forEach(child => {
diff --git a/src/parser.ts b/src/parser.ts
@@ -234,7 +234,7 @@ export default class Parser {
         }
         if (Object.keys(currentTagAttributes).length !== 0) {
           Object.entries(currentTagAttributes).forEach(([key, value]) => {
-            tagText += ` ${key}="${value}"`;
+            tagText += ` ${key}=${value}`;
           });
         }
         if (buildingAttributeName){
diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -70,4 +70,50 @@ describe("bbcode-ast tests", () => {
     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]");
   })
+
+  it("Should parse simple attributes", () => {
+    const parsed = defaultParser.parse("[color=red]Hello world![/color]")
+    expect(parsed.children.length).to.equal(1);
+    expect(parsed.children[0].name).to.equal("color");
+    expect((parsed.children[0] as Node).value).to.equal("red");
+    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.toString()).to.equal("[color=red]Hello world![/color]");
+  })
+
+  it("Should parse simple attributes with space and quotes", () => {
+    const parsed = defaultParser.parse('[spoiler="a spoiler"]Hello world![/spoiler]')
+    expect(parsed.children.length).to.equal(1);
+    expect(parsed.children[0].name).to.equal("spoiler");
+    expect((parsed.children[0] as Node).value).to.equal('"a spoiler"');
+    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.toString()).to.equal('[spoiler="a spoiler"]Hello world![/spoiler]');
+  })
+
+  it("Should parse complex attributes", () => {
+    const parsed = defaultParser.parse("[url=https://www.google.com][img align=right]https://i.imgur.com/oz0a7.jpg[/img][/url]")
+    expect(parsed.children.length).to.equal(1);
+    expect(parsed.children[0].name).to.equal("url");
+    expect((parsed.children[0] as Node).value).to.equal("https://www.google.com");
+    expect((parsed.children[0] as Node).children.length).to.equal(1);
+    expect((parsed.children[0] as Node).children[0].name).to.equal("img");
+    expect(((parsed.children[0] as Node).children[0] as Node).attributes).to.deep.equal({align: "right"});
+    expect((((parsed.children[0] as Node).children[0] as Node).children[0] as TextNode).text).to.equal("https://i.imgur.com/oz0a7.jpg");
+    expect(parsed.toString()).to.equal("[url=https://www.google.com][img align=right]https://i.imgur.com/oz0a7.jpg[/img][/url]");
+  })
+
+  it("Should parse complex attributes and quotes", () => {
+    const parsed = defaultParser.parse("[url=https://www.google.com][img align='right']https://i.imgur.com/oz0a7.jpg[/img][/url]")
+    expect(parsed.children.length).to.equal(1);
+    expect(parsed.children[0].name).to.equal("url");
+    expect((parsed.children[0] as Node).value).to.equal("https://www.google.com");
+    expect((parsed.children[0] as Node).children.length).to.equal(1);
+    expect((parsed.children[0] as Node).children[0].name).to.equal("img");
+    expect(((parsed.children[0] as Node).children[0] as Node).attributes).to.deep.equal({align: "'right'"});
+    expect((((parsed.children[0] as Node).children[0] as Node).children[0] as TextNode).text).to.equal("https://i.imgur.com/oz0a7.jpg");
+    expect(parsed.toString()).to.equal("[url=https://www.google.com][img align='right']https://i.imgur.com/oz0a7.jpg[/img][/url]");
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ export default class Parser {`
`234`	`234`	`}`
`235`	`235`	`if (Object.keys(currentTagAttributes).length !== 0) {`
`236`	`236`	`Object.entries(currentTagAttributes).forEach(([key, value]) => {`
`237`		- tagText += ` ${key}="${value}"`;
	`237`	+ tagText += ` ${key}=${value}`;
`238`	`238`	`});`
`239`	`239`	`}`
`240`	`240`	`if (buildingAttributeName){`