From: daiwei <daiwei521@126.com>
Date: Wed, 22 Jan 2025 07:05:01 +0000 (+0800)
Subject: wip: v-skip
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac5005f0c33184e54e8b41a521e991bb0a634786;p=thirdparty%2Fvuejs%2Fcore.git

wip: v-skip
---

diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index 42466168e9..b5b5e8cd3e 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -92,6 +92,7 @@ export enum ErrorCodes {
   X_KEEP_ALIVE_INVALID_CHILDREN,
   X_V_SKIP_NO_EXPRESSION,
   X_V_SKIP_ON_TEMPLATE,
+  X_V_SKIP_UNEXPECTED_SLOT,
 
   // generic errors
   X_PREFIX_ID_NOT_SUPPORTED,
@@ -183,6 +184,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
   [ErrorCodes.X_VNODE_HOOKS]: `@vnode-* hooks in templates are no longer supported. Use the vue: prefix instead. For example, @vnode-mounted should be changed to @vue:mounted. @vnode-* hooks support has been removed in 3.4.`,
   [ErrorCodes.X_V_SKIP_NO_EXPRESSION]: `v-skip is missing expression.`,
   [ErrorCodes.X_V_SKIP_ON_TEMPLATE]: `v-skip cannot be used on <template> or <slot> tags.`,
+  [ErrorCodes.X_V_SKIP_UNEXPECTED_SLOT]: `v-skip directive requires the component to have a default slot without slot props`,
 
   // generic errors
   [ErrorCodes.X_PREFIX_ID_NOT_SUPPORTED]: `"prefixIdentifiers" option is not supported in this build of compiler.`,
diff --git a/packages/compiler-core/src/transforms/vSkip.ts b/packages/compiler-core/src/transforms/vSkip.ts
index ac96f8e3b2..d1568ef6be 100644
--- a/packages/compiler-core/src/transforms/vSkip.ts
+++ b/packages/compiler-core/src/transforms/vSkip.ts
@@ -1,7 +1,10 @@
 import {
+  ElementTypes,
   type IfBranchNode,
   NodeTypes,
   type SimpleExpressionNode,
+  type SlotsExpression,
+  type TemplateChildNode,
   createConditionalExpression,
   createSimpleExpression,
 } from '../ast'
@@ -23,16 +26,15 @@ import { validateBrowserExpression } from '../validateExpression'
 export const transformSkip: NodeTransform = createStructuralDirectiveTransform(
   'skip',
   (node, dir, context) => {
+    const loc = dir.exp ? dir.exp.loc : node.loc
     if (isTemplateNode(node) || isSlotOutlet(node)) {
-      const loc = dir.exp ? dir.exp.loc : node.loc
       context.onError(createCompilerError(ErrorCodes.X_V_SKIP_ON_TEMPLATE, loc))
       return
     }
 
     if (!dir.exp || !(dir.exp as SimpleExpressionNode).content.trim()) {
-      const loc = dir.exp ? dir.exp.loc : node.loc
       context.onError(
-        createCompilerError(ErrorCodes.X_V_SKIP_NO_EXPRESSION, dir.loc),
+        createCompilerError(ErrorCodes.X_V_SKIP_NO_EXPRESSION, loc),
       )
       dir.exp = createSimpleExpression(`true`, false, loc)
     }
@@ -46,13 +48,43 @@ export const transformSkip: NodeTransform = createStructuralDirectiveTransform(
     }
 
     return () => {
+      let children: TemplateChildNode[] = []
+      // for components, extract default slot without props
+      // if not found, throw an error
+      if (node.tagType === ElementTypes.COMPONENT) {
+        const codegenNode = node.codegenNode!
+        if (codegenNode.type === NodeTypes.VNODE_CALL) {
+          const genChildren = codegenNode.children! as SlotsExpression
+          if (genChildren.type === NodeTypes.JS_OBJECT_EXPRESSION) {
+            const prop = genChildren.properties.find(
+              p =>
+                p.type === NodeTypes.JS_PROPERTY &&
+                p.key.type === NodeTypes.SIMPLE_EXPRESSION &&
+                p.key.content === 'default' &&
+                p.value.params === undefined,
+            )
+            if (prop) {
+              children = prop.value.returns as TemplateChildNode[]
+            } else {
+              context.onError(
+                createCompilerError(ErrorCodes.X_V_SKIP_UNEXPECTED_SLOT, loc),
+              )
+            }
+          }
+        }
+      }
+      // for plain elements, take all children
+      else {
+        children = node.children
+      }
       const consequent: IfBranchNode = {
         type: NodeTypes.IF_BRANCH,
         loc: node.loc,
         condition: undefined,
-        children: node.children,
+        children,
         userKey: findProp(node, `key`),
       }
+
       const alternate: IfBranchNode = {
         type: NodeTypes.IF_BRANCH,
         loc: node.loc,
@@ -60,6 +92,7 @@ export const transformSkip: NodeTransform = createStructuralDirectiveTransform(
         children: [node],
         userKey: findProp(node, `key`),
       }
+
       node.codegenNode = createConditionalExpression(
         dir.exp!,
         createCodegenNodeForBranch(consequent, 0, context),