From: Evan You <yyx990803@gmail.com>
Date: Sat, 28 Sep 2019 05:35:49 +0000 (-0400)
Subject: refactor: simplify slot extraneous child check
X-Git-Tag: v3.0.0-alpha.0~674
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a792d697a351b215069b61c3c21304972d767634;p=thirdparty%2Fvuejs%2Fcore.git

refactor: simplify slot extraneous child check
---

diff --git a/packages/compiler-core/src/transforms/vSlot.ts b/packages/compiler-core/src/transforms/vSlot.ts
index 7ba344f2c4..cf6a51fef7 100644
--- a/packages/compiler-core/src/transforms/vSlot.ts
+++ b/packages/compiler-core/src/transforms/vSlot.ts
@@ -66,57 +66,54 @@ export function buildSlots(
   // 2. Iterate through children and check for template slots
   //    <template v-slot:foo="{ prop }">
   let hasTemplateSlots = false
+  let extraneousChild: ChildNode | undefined = undefined
   const seenSlotNames = new Set<string>()
-  const nonSlotChildren: ChildNode[] = []
   for (let i = 0; i < children.length; i++) {
     const child = children[i]
+    let slotDir
     if (
       child.type === NodeTypes.ELEMENT &&
-      child.tagType === ElementTypes.TEMPLATE
+      child.tagType === ElementTypes.TEMPLATE &&
+      (slotDir = child.props.find(isVSlot))
     ) {
-      const { props, children, loc: nodeLoc } = child
-      const slotDir = props.find(isVSlot)
-      if (slotDir) {
-        hasTemplateSlots = true
-        const { arg: slotName, exp: slotProps, loc: dirLoc } = slotDir
-        if (explicitDefaultSlot) {
-          // already has on-component default slot - this is incorrect usage.
-          context.onError(
-            createCompilerError(ErrorCodes.X_MIXED_SLOT_USAGE, dirLoc)
-          )
-          break
-        } else {
-          // check duplicate slot names
-          if (
-            !slotName ||
-            (slotName.type === NodeTypes.SIMPLE_EXPRESSION && slotName.isStatic)
-          ) {
-            const name = slotName ? slotName.content : `default`
-            if (seenSlotNames.has(name)) {
-              context.onError(
-                createCompilerError(ErrorCodes.X_DUPLICATE_SLOT_NAMES, dirLoc)
-              )
-              continue
-            }
-            seenSlotNames.add(name)
+      hasTemplateSlots = true
+      const { children, loc: nodeLoc } = child
+      const { arg: slotName, exp: slotProps, loc: dirLoc } = slotDir
+      if (explicitDefaultSlot) {
+        // already has on-component default slot - this is incorrect usage.
+        context.onError(
+          createCompilerError(ErrorCodes.X_MIXED_SLOT_USAGE, dirLoc)
+        )
+        break
+      } else {
+        // check duplicate slot names
+        if (
+          !slotName ||
+          (slotName.type === NodeTypes.SIMPLE_EXPRESSION && slotName.isStatic)
+        ) {
+          const name = slotName ? slotName.content : `default`
+          if (seenSlotNames.has(name)) {
+            context.onError(
+              createCompilerError(ErrorCodes.X_DUPLICATE_SLOT_NAMES, dirLoc)
+            )
+            continue
           }
-          slots.push(
-            buildSlot(slotName || `default`, slotProps, children, nodeLoc)
-          )
+          seenSlotNames.add(name)
         }
-      } else {
-        nonSlotChildren.push(child)
+        slots.push(
+          buildSlot(slotName || `default`, slotProps, children, nodeLoc)
+        )
       }
-    } else {
-      nonSlotChildren.push(child)
+    } else if (!extraneousChild) {
+      extraneousChild = child
     }
   }
 
-  if (hasTemplateSlots && nonSlotChildren.length) {
+  if (hasTemplateSlots && extraneousChild) {
     context.onError(
       createCompilerError(
         ErrorCodes.X_EXTRANEOUS_NON_SLOT_CHILDREN,
-        nonSlotChildren[0].loc
+        extraneousChild.loc
       )
     )
   }