fix: #202 📌 omission normalizeChildren

chibivue-land · Jan 1, 2024 · e06483f · e06483f
1 parent 91676d0
commit e06483f
Show file tree

Hide file tree

Showing 25 changed files with 364 additions and 73 deletions.
diff --git a/book/impls/20_basic_virtual_dom/020_bit_flags/packages/runtime-core/vnode.ts b/book/impls/20_basic_virtual_dom/020_bit_flags/packages/runtime-core/vnode.ts
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (Array.isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/20_basic_virtual_dom/030_patch_keyed_children/examples/playground/src/main.ts b/book/impls/20_basic_virtual_dom/030_patch_keyed_children/examples/playground/src/main.ts
diff --git a/book/impls/20_basic_virtual_dom/030_patch_keyed_children/examples/playground/tsconfig.json b/book/impls/20_basic_virtual_dom/030_patch_keyed_children/examples/playground/tsconfig.json
diff --git a/book/impls/20_basic_virtual_dom/040_scheduler/packages/runtime-core/vnode.ts b/book/impls/20_basic_virtual_dom/040_scheduler/packages/runtime-core/vnode.ts
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (Array.isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/20_basic_virtual_dom/050_next_tick/packages/runtime-core/vnode.ts b/book/impls/20_basic_virtual_dom/050_next_tick/packages/runtime-core/vnode.ts
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,19 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (Array.isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/20_basic_virtual_dom/060_other_props/packages/runtime-core/vnode.ts b/book/impls/20_basic_virtual_dom/060_other_props/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/30_basic_reactivity_system/010_ref/packages/runtime-core/vnode.ts b/book/impls/30_basic_reactivity_system/010_ref/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/30_basic_reactivity_system/020_shallow_ref/packages/runtime-core/vnode.ts b/book/impls/30_basic_reactivity_system/020_shallow_ref/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/30_basic_reactivity_system/030_to_ref/packages/runtime-core/vnode.ts b/book/impls/30_basic_reactivity_system/030_to_ref/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/30_basic_reactivity_system/040_to_refs/packages/runtime-core/vnode.ts b/book/impls/30_basic_reactivity_system/040_to_refs/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/30_basic_reactivity_system/050_computed/packages/runtime-core/vnode.ts b/book/impls/30_basic_reactivity_system/050_computed/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }
diff --git a/book/impls/30_basic_reactivity_system/060_computed_setter/packages/runtime-core/vnode.ts b/book/impls/30_basic_reactivity_system/060_computed_setter/packages/runtime-core/vnode.ts
@@ -1,4 +1,4 @@
-import { isObject, isString } from "../shared";
+import { isArray, isObject, isString } from "../shared";
 import { ShapeFlags } from "../shared/shapeFlags";
 import { ComponentInternalInstance } from "./component";
 
@@ -48,6 +48,7 @@ export function createVNode(
     component: null,
     shapeFlag,
   };
+  normalizeChildren(vnode, children);
   return vnode;
 }
 
@@ -59,6 +60,20 @@ export function normalizeVNode(child: VNodeChild): VNode {
   }
 }
 
+export function normalizeChildren(vnode: VNode, children: unknown) {
+  let type = 0;
+  if (children == null) {
+    children = null;
+  } else if (isArray(children)) {
+    type = ShapeFlags.ARRAY_CHILDREN;
+  } else {
+    children = String(children);
+    type = ShapeFlags.TEXT_CHILDREN;
+  }
+  vnode.children = children as VNodeNormalizedChildren;
+  vnode.shapeFlag |= type;
+}
+
 export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
   return n1.type === n2.type && n1.key === n2.key;
 }