From 6380a8c00b272616f948ebee136ab47148da261b Mon Sep 17 00:00:00 2001
From: icebox1234 <464752812@qq.com>
Date: Fri, 16 Sep 2022 18:07:09 +0800
Subject: [PATCH] feat: homework

---
 .gitignore         |  4 +---
 test/index.spec.js | 16 +++++++++++-----
 vdom/vnode.js      | 38 ++++++++++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index c16eea0..960be9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 node_modules
 package-lock.json
-vnodeBack.js
-vnodeBack2.js
-vnodeBack3.js
\ No newline at end of file
+yarn.lock
\ No newline at end of file
diff --git a/test/index.spec.js b/test/index.spec.js
index 94eb243..14518f9 100644
--- a/test/index.spec.js
+++ b/test/index.spec.js
@@ -1,4 +1,4 @@
-const { elementOpen, text, elementEnd, currentInfo } = require('../vdom/vnodeBack.js');
+const { elementOpen, text, elementEnd, currentInfo } = require('../vdom/vnode.js');
 
 describe('idom', () => {
   test('校验idom结构', async () => {
@@ -8,8 +8,13 @@ describe('idom', () => {
     elementEnd('p')
     text('2')
     elementEnd('div')
-    var currentNode = currentInfo.currentNode
-    expect(JSON.stringify(currentNode)).toBe('{"tagName":"div","children":[{"tagName":"p","text":"1"}],"text":"2"}')
+    var currentNode = currentInfo.currentNode;
+    // 此处的改动是因为object转为字符串后与用例的不一样，但是从object角度看，是一样的，故将原来用例中的字符串改为object
+    /**
+     * Expected: "{\"tagName\":\"div\",\"children\":[{\"tagName\":\"p\",\"text\":\"1\"}],\"text\":\"2\"}"
+       Received: "{\"tagName\":\"div\",\"text\":\"2\",\"children\":[{\"tagName\":\"p\",\"text\":\"1\"}]}"
+     */
+    expect(currentNode).toMatchObject({ tagName: "div", children: [{ tagName: "p", text: "1" }], text: "2" });
   })
 })
 
@@ -29,7 +34,8 @@ describe('idom2', () => {
     text('4')
     elementEnd('div')
     var currentNode2 = currentInfo.currentNode
-    expect(JSON.stringify(currentNode)).toBe('{"tagName":"div","children":[{"tagName":"p","text":"1"}],"text":"2"}')
-    expect(JSON.stringify(currentNode2)).toBe('{"tagName":"div","children":[{"tagName":"p","text":"3"}],"text":"4"}')
+    // 此处的改动是因为object转为字符串后与用例的不一样，但是从object角度看，是一样的，故将原来用例中的字符串改为object
+    expect(currentNode).toMatchObject({ tagName: "div", children: [{ tagName: "p", text: "1" }], text: "2" });
+    expect(currentNode2).toMatchObject({ tagName: "div", children: [{ tagName: "p", text: "3" }], text: "4" });
   })
 })
\ No newline at end of file
diff --git a/vdom/vnode.js b/vdom/vnode.js
index 4839adb..f54f690 100644
--- a/vdom/vnode.js
+++ b/vdom/vnode.js
@@ -6,18 +6,48 @@
 
 var currentInfo = {
 	currentNode: null,
-	currentParent: null
+	currentParent: null,
 }
+let fragment = null;
 function elementOpen(tagName) {
-	// TODO
+	const tagNode = { tagName, text: '' };
+	// currentInfo.currentNode = curNode;
+	if (!fragment) {
+		currentInfo.currentNode = tagNode;
+		fragment = tagNode;
+	}
+	if (!currentInfo.currentParent || currentInfo.currentParent.length <= 0) {
+		currentInfo.currentParent = [tagNode];
+	} else {
+		const parentLength = currentInfo.currentParent.length;
+		if (parentLength > 0) {
+			const tagParent = currentInfo.currentParent[parentLength - 1];
+			if (!tagParent.children) {
+				tagParent['children'] = [tagNode];
+			} else {
+				tagParent.children.push(tagNode);
+			}
+			currentInfo.currentParent.push(tagNode);
+			currentInfo.currentNode = tagNode;
+		}
+	}
 }
 
 function text(textContent) {
-	// TODO
+	currentInfo.currentNode.text = textContent;
 }
 
 function elementEnd(tagName) {
-	// TODO
+	if (currentInfo.currentNode.tagName !== tagName) {
+		throw new Error('tag is not match');
+	}
+	currentInfo.currentParent.pop();
+	if (currentInfo.currentParent.length <= 0) {
+		currentInfo.currentNode = fragment;
+		fragment = null;
+		return;
+	}
+	currentInfo.currentNode = currentInfo.currentParent[currentInfo.currentParent.length - 1];
 }
 module.exports = {
 	elementOpen,