refactor: more appropriate naming for vnode

lishiwen · lishiwen · commit f0914e4e5411 · 2022-07-04T11:52:35.000+08:00
diff --git a/lib/m-vue.cjs.js b/lib/m-vue.cjs.js
@@ -93,10 +93,10 @@ function processElement(vnode, container) {
 function processComponent(vnode, container) {
     mountComponent(vnode, container);
 }
-function mountComponent(vnode, container) {
-    const instance = createComponentInstance(vnode);
+function mountComponent(initialVNode, container) {
+    const instance = createComponentInstance(initialVNode);
     setupComponent(instance);
-    setupRenderEffect(instance, container, vnode);
+    setupRenderEffect(instance, container, initialVNode);
 }
 function mountElement(vnode, container) {
     // vnode type -> div/span
@@ -126,10 +126,10 @@ function addAttrs(vnode, container) {
         }
     }
 }
-function setupRenderEffect(instance, container, vnode) {
+function setupRenderEffect(instance, container, initialVNode) {
     const subTree = instance.render.call(instance.proxy);
     patch(subTree, container);
-    vnode.el = subTree.el;
+    initialVNode.el = subTree.el;
 }
 
 function createApp(rootComponent) {
diff --git a/lib/m-vue.esm.js b/lib/m-vue.esm.js
@@ -89,10 +89,10 @@ function processElement(vnode, container) {
 function processComponent(vnode, container) {
     mountComponent(vnode, container);
 }
-function mountComponent(vnode, container) {
-    const instance = createComponentInstance(vnode);
+function mountComponent(initialVNode, container) {
+    const instance = createComponentInstance(initialVNode);
     setupComponent(instance);
-    setupRenderEffect(instance, container, vnode);
+    setupRenderEffect(instance, container, initialVNode);
 }
 function mountElement(vnode, container) {
     // vnode type -> div/span
@@ -122,10 +122,10 @@ function addAttrs(vnode, container) {
         }
     }
 }
-function setupRenderEffect(instance, container, vnode) {
+function setupRenderEffect(instance, container, initialVNode) {
     const subTree = instance.render.call(instance.proxy);
     patch(subTree, container);
-    vnode.el = subTree.el;
+    initialVNode.el = subTree.el;
 }
 
 function createApp(rootComponent) {
diff --git a/src/runtime-core/render.ts b/src/runtime-core/render.ts
@@ -23,10 +23,10 @@ function processComponent(vnode, container) {
     mountComponent(vnode, container);
 }
 
-function mountComponent(vnode, container) {
-    const instance = createComponentInstance(vnode);
+function mountComponent(initialVNode, container) {
+    const instance = createComponentInstance(initialVNode);
     setupComponent(instance);
-    setupRenderEffect(instance, container, vnode);
+    setupRenderEffect(instance, container, initialVNode);
 }
 
 function mountElement(vnode: any, container: any) {
@@ -62,9 +62,9 @@ function addAttrs(vnode, container) {
     }
 }
 
-function setupRenderEffect(instance, container, vnode) {
+function setupRenderEffect(instance, container, initialVNode) {
     const subTree = instance.render.call(instance.proxy);
     patch(subTree, container);
 
-    vnode.el = subTree.el;
+    initialVNode.el = subTree.el;
 }

Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,10 @@ function processElement(vnode, container) {`
`93`	`93`	`function processComponent(vnode, container) {`
`94`	`94`	`mountComponent(vnode, container);`
`95`	`95`	`}`
`96`		`-function mountComponent(vnode, container) {`
`97`		`- const instance = createComponentInstance(vnode);`
	`96`	`+function mountComponent(initialVNode, container) {`
	`97`	`+ const instance = createComponentInstance(initialVNode);`
`98`	`98`	`setupComponent(instance);`
`99`		`- setupRenderEffect(instance, container, vnode);`
	`99`	`+ setupRenderEffect(instance, container, initialVNode);`
`100`	`100`	`}`
`101`	`101`	`function mountElement(vnode, container) {`
`102`	`102`	`// vnode type -> div/span`
`@@ -126,10 +126,10 @@ function addAttrs(vnode, container) {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`-function setupRenderEffect(instance, container, vnode) {`
	`129`	`+function setupRenderEffect(instance, container, initialVNode) {`
`130`	`130`	`const subTree = instance.render.call(instance.proxy);`
`131`	`131`	`patch(subTree, container);`
`132`		`- vnode.el = subTree.el;`
	`132`	`+ initialVNode.el = subTree.el;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`function createApp(rootComponent) {`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,10 @@ function processElement(vnode, container) {`
`89`	`89`	`function processComponent(vnode, container) {`
`90`	`90`	`mountComponent(vnode, container);`
`91`	`91`	`}`
`92`		`-function mountComponent(vnode, container) {`
`93`		`- const instance = createComponentInstance(vnode);`
	`92`	`+function mountComponent(initialVNode, container) {`
	`93`	`+ const instance = createComponentInstance(initialVNode);`
`94`	`94`	`setupComponent(instance);`
`95`		`- setupRenderEffect(instance, container, vnode);`
	`95`	`+ setupRenderEffect(instance, container, initialVNode);`
`96`	`96`	`}`
`97`	`97`	`function mountElement(vnode, container) {`
`98`	`98`	`// vnode type -> div/span`
`@@ -122,10 +122,10 @@ function addAttrs(vnode, container) {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`-function setupRenderEffect(instance, container, vnode) {`
	`125`	`+function setupRenderEffect(instance, container, initialVNode) {`
`126`	`126`	`const subTree = instance.render.call(instance.proxy);`
`127`	`127`	`patch(subTree, container);`
`128`		`- vnode.el = subTree.el;`
	`128`	`+ initialVNode.el = subTree.el;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`function createApp(rootComponent) {`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ function processComponent(vnode, container) {`
`23`	`23`	`mountComponent(vnode, container);`
`24`	`24`	`}`
`25`	`25`
`26`		`-function mountComponent(vnode, container) {`
`27`		`- const instance = createComponentInstance(vnode);`
	`26`	`+function mountComponent(initialVNode, container) {`
	`27`	`+ const instance = createComponentInstance(initialVNode);`
`28`	`28`	`setupComponent(instance);`
`29`		`- setupRenderEffect(instance, container, vnode);`
	`29`	`+ setupRenderEffect(instance, container, initialVNode);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`function mountElement(vnode: any, container: any) {`
`@@ -62,9 +62,9 @@ function addAttrs(vnode, container) {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`-function setupRenderEffect(instance, container, vnode) {`
	`65`	`+function setupRenderEffect(instance, container, initialVNode) {`
`66`	`66`	`const subTree = instance.render.call(instance.proxy);`
`67`	`67`	`patch(subTree, container);`
`68`	`68`
`69`		`- vnode.el = subTree.el;`
	`69`	`+ initialVNode.el = subTree.el;`
`70`	`70`	`}`