refactor

vuejs · Apr 30, 2024 · 94ab8ce · 94ab8ce
1 parent 6e0f54a
commit 94ab8ce
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/packages/compiler-vapor/src/ir.ts b/packages/compiler-vapor/src/ir.ts
@@ -83,11 +83,25 @@ export interface ForIRNode extends BaseIRNode {
 export interface IRProp extends Omit<DirectiveTransformResult, 'value'> {
   values: SimpleExpressionNode[]
 }
-export interface IRDynamicProps {
+
+export enum DynamicPropsKind {
+  EXPRESSION, // v-bind="value"
+  ATTRIBUTE, // v-bind:[foo]="value"
+}
+
+export type IRPropsStatic = IRProp[]
+export interface IRPropsDynamicExpression {
+  kind: DynamicPropsKind.EXPRESSION
   value: SimpleExpressionNode
   handler?: boolean
 }
-export type IRProps = IRProp[] | IRProp | IRDynamicProps
+export interface IRPropsDynamicAttribute extends IRProp {
+  kind: DynamicPropsKind.ATTRIBUTE
+}
+export type IRProps =
+  | IRPropsStatic
+  | IRPropsDynamicAttribute
+  | IRPropsDynamicExpression
 
 export interface SetPropIRNode extends BaseIRNode {
   type: IRNodeTypes.SET_PROP

diff --git a/packages/compiler-vapor/src/transforms/transformElement.ts b/packages/compiler-vapor/src/transforms/transformElement.ts
@@ -24,9 +24,11 @@ import type {
 } from '../transform'
 import {
   DynamicFlag,
+  DynamicPropsKind,
   IRNodeTypes,
   type IRProp,
   type IRProps,
+  type IRPropsDynamicAttribute,
   type VaporDirectiveNode,
 } from '../ir'
 import { EMPTY_EXPRESSION } from './utils'
@@ -205,7 +207,10 @@ function buildProps(
         if (prop.exp) {
           dynamicExpr.push(prop.exp)
           pushMergeArg()
-          dynamicArgs.push({ value: prop.exp })
+          dynamicArgs.push({
+            kind: DynamicPropsKind.EXPRESSION,
+            value: prop.exp,
+          })
         } else {
           context.options.onError(
             createCompilerError(ErrorCodes.X_V_BIND_NO_EXPRESSION, prop.loc),
@@ -218,7 +223,11 @@ function buildProps(
           if (isComponent) {
             dynamicExpr.push(prop.exp)
             pushMergeArg()
-            dynamicArgs.push({ value: prop.exp, handler: true })
+            dynamicArgs.push({
+              kind: DynamicPropsKind.EXPRESSION,
+              value: prop.exp,
+              handler: true,
+            })
           } else {
             context.registerEffect(
               [prop.exp],
@@ -245,7 +254,11 @@ function buildProps(
       if (isComponent && !result.key.isStatic) {
         // v-bind:[name]="value" or v-on:[name]="value"
         pushMergeArg()
-        dynamicArgs.push(normalizeIRProp(result))
+        dynamicArgs.push(
+          extend(resolveDirectiveResult(result), {
+            kind: DynamicPropsKind.ATTRIBUTE,
+          }) as IRPropsDynamicAttribute,
+        )
       } else {
         // other static props
         results.push(result)
@@ -304,7 +317,7 @@ function dedupeProperties(results: DirectiveTransformResult[]): IRProp[] {
   const deduped: IRProp[] = []
 
   for (const result of results) {
-    const prop = normalizeIRProp(result)
+    const prop = resolveDirectiveResult(result)
     // dynamic keys are always allowed
     if (!prop.key.isStatic) {
       deduped.push(prop)
@@ -314,7 +327,7 @@ function dedupeProperties(results: DirectiveTransformResult[]): IRProp[] {
     const existing = knownProps.get(name)
     if (existing) {
       if (name === 'style' || name === 'class') {
-        mergeAsArray(existing, prop)
+        mergePropValues(existing, prop)
       }
       // unexpected duplicate, should have emitted error during parse
     } else {
@@ -325,11 +338,14 @@ function dedupeProperties(results: DirectiveTransformResult[]): IRProp[] {
   return deduped
 }
 
-function normalizeIRProp(prop: DirectiveTransformResult): IRProp {
-  return extend({}, prop, { value: undefined, values: [prop.value] })
+function resolveDirectiveResult(prop: DirectiveTransformResult): IRProp {
+  return extend({}, prop, {
+    value: undefined,
+    values: [prop.value],
+  })
 }
 
-function mergeAsArray(existing: IRProp, incoming: IRProp) {
+function mergePropValues(existing: IRProp, incoming: IRProp) {
   const newValues = incoming.values
   existing.values.push(...newValues)
 }