refactor: 更新class style类型

Author: agileago

src/simple-props/composables.ts

@@ -1,10 +1,5 @@
-import {
-  camelize,
-  type CSSProperties,
-  getCurrentInstance,
-  useAttrs,
-  useSlots,
-} from 'vue'
+import { camelize, getCurrentInstance, useAttrs, useSlots } from 'vue'
+import type { ClassAndStyleProps } from '@/type'
 
 export function camelizePropKey(p: string | symbol): string | symbol {
   if (typeof p === 'string') {
@@ -46,7 +41,6 @@ export function useProps<T>(): T {
         } else {
           return Reflect.get(getProps(), key, receiver)
         }
-        return Reflect.get(getProps(), key, receiver)
       },
       ownKeys() {
         return [
@@ -85,12 +79,7 @@ function getSlotName(p: PropertyKey) {
     return p.slice(6).replace(/^[A-Z]/, (s) => s.toLowerCase())
 }
 
-export interface ClassAndStyle {
-  class?: string
-  style?: CSSProperties
-}
-
-export function useClassAndStyle(): ClassAndStyle {
+export function useClassAndStyle(): ClassAndStyleProps {
   const instance = getCurrentInstance()
   if (!instance) {
     throw new Error('useClassAndStyle must be called inside setup()')

src/simple-props/index.ts

@@ -5,11 +5,7 @@ import {
 import type { ComponentType, FunctionalComponent } from './types'
 import { useProps } from './composables'
 
-export {
-  type ClassAndStyle,
-  useClassAndStyle,
-  camelizePropKey,
-} from './composables'
+export { useClassAndStyle, camelizePropKey } from './composables'
 export * from './types'
 
 export function defineComponent<T extends Record<any, any>>(

src/type.ts

@@ -73,7 +73,7 @@ export type ComponentSlots<T extends { props: any }> = NonNullable<
 /** 为了阻止ts把不相关的类也解析到metadata数据中，用这个工具类型包装一下类 */
 export type ClassType<T> = T
 
-export type ClassAndStyleProps = {
+export interface ClassAndStyleProps {
   class?: any
   style?: StyleValue
   [name: string]: any