chore: update

Author: edison1105

packages/runtime-core/src/component.ts

@@ -381,7 +381,7 @@ export interface GenericComponentInstance {
   /**
    * @internal
    */
-  getRawProps: () => Record<string, any> | null
+  getKeysFromRawProps: () => string[] | undefined
 
   // exposed properties via expose()
   exposed: Record<string, any> | null
@@ -735,7 +735,7 @@ export function createComponentInstance(
 
     // props default value
     propsDefaults: null,
-    getRawProps: null!,
+    getKeysFromRawProps: null!, // to be set immediately
 
     // inheritAttrs
     inheritAttrs: type.inheritAttrs,
@@ -783,7 +783,10 @@ export function createComponentInstance(
   }
   instance.root = parent ? parent.root : instance
   instance.emit = emit.bind(null, instance)
-  instance.getRawProps = () => instance.vnode.props
+  instance.getKeysFromRawProps = () => {
+    const { props } = instance.vnode
+    if (props) return Object.keys(props)
+  }
 
   // apply custom element special handling
   if (vnode.ce) {

packages/runtime-core/src/helpers/useModel.ts

@@ -65,17 +65,17 @@ export function useModel(
         ) {
           return
         }
-        const rawProps = i.getRawProps()
+        const rawPropKeys = i.getKeysFromRawProps()
         if (
           !(
-            rawProps &&
+            rawPropKeys &&
             // check if parent has passed v-model
-            (name in rawProps ||
-              camelizedName in rawProps ||
-              hyphenatedName in rawProps) &&
-            (`onUpdate:${name}` in rawProps ||
-              `onUpdate:${camelizedName}` in rawProps ||
-              `onUpdate:${hyphenatedName}` in rawProps)
+            (rawPropKeys.includes(name) ||
+              rawPropKeys.includes(camelizedName) ||
+              rawPropKeys.includes(hyphenatedName)) &&
+            (rawPropKeys.includes(`onUpdate:${name}`) ||
+              rawPropKeys.includes(`onUpdate:${camelizedName}`) ||
+              rawPropKeys.includes(`onUpdate:${hyphenatedName}`))
           )
         ) {
           // no v-model, local update

packages/runtime-vapor/src/component.ts

@@ -285,7 +285,7 @@ export class VaporComponentInstance implements GenericComponentInstance {
   props: Record<string, any>
   attrs: Record<string, any>
   propsDefaults: Record<string, any> | null
-  getRawProps: () => Record<string, any>
+  getKeysFromRawProps: () => string[] | undefined
 
   slots: StaticSlots
 
@@ -395,17 +395,7 @@ export class VaporComponentInstance implements GenericComponentInstance {
     } else {
       this.props = this.attrs = EMPTY_OBJ
     }
-    this.getRawProps = () => {
-      const keys = getKeysFromRawProps(this.rawProps)
-      return keys.reduce(
-        (props, key) => {
-          // TODO
-          props[key] = null
-          return props
-        },
-        {} as Record<string, any>,
-      )
-    }
+    this.getKeysFromRawProps = () => getKeysFromRawProps(this.rawProps)
 
     // init slots
     this.rawSlots = rawSlots || EMPTY_OBJ