improve utils.ts

Author: ruojianll

src/identity.ts

@@ -8,6 +8,7 @@ export type IdentityType = {
 type AssertIs<O, T extends O> = T
 
 export interface Identity<T extends IdentityType = IdentityType> {
+    [index: string | number | symbol]: any
     [IdentitySymbol]: T
 }
 

src/option/data.ts

@@ -1,10 +1,10 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { makeObject, filterNames, getValidOwnPropertyNames } from '../utils'
+import { filterNames, getValidOwnPropertyNames } from '../utils'
 import { obtainSlot } from '../slot'
 export function build(cons: VueCons, optionBuilder: OptionBuilder, vueInstance: any) {
     optionBuilder.data ??= {}
-    const sample = new cons(optionBuilder, vueInstance) as any
+    const sample = new cons(optionBuilder, vueInstance)
     let names = getValidOwnPropertyNames(sample, (des, name) => {
         return !!des.enumerable
             && !optionBuilder.methods?.[name]
@@ -15,5 +15,10 @@ export function build(cons: VueCons, optionBuilder: OptionBuilder, vueInstance:
     //provide, user may access field directly
     //customDecorator
     names = filterNames(names, slot, ['provide', 'customDecorator'])
-    Object.assign(optionBuilder.data, makeObject(names, sample))
+    Object.assign(optionBuilder.data,
+        names.reduce<Record<string, any>>((pv, cv) => {
+            pv[cv] = sample[cv]
+            return pv
+        }, {})
+    )
 }

src/utils.ts

@@ -3,32 +3,33 @@ import { compatibleMemberDecorator, compatibleClassDecorator } from './deco3/uti
 import { type VueCons, Base } from './class';
 import { getSlot, type Slot, type SlotMapNames } from './slot'
 
-export function makeObject(names: string[], obj: any) {
-    return names.reduce<Record<string, any>>((pv, cv) => {
-        pv[cv] = obj[cv]
-        return pv
-    }, {})
+export function getPrototypeOf(proto: Identity): Identity | null {
+    const p = Object.getPrototypeOf(proto)
+    if (!(p instanceof Base)) {
+        return null
+    }
+    return p
 }
 
-export function toComponentReverse(obj: any) {
-    const arr: any[] = []
-    let curr = obj
+export function toComponentReverse(proto: Identity) {
+    const arr: Identity[] = []
+    let curr: Identity | null = proto
     do {
         arr.unshift(curr)
-        curr = Object.getPrototypeOf(curr)
-    } while (curr.constructor !== Base && !getSlot(curr))
+        curr = getPrototypeOf(curr)
+    } while (curr !== null && !getSlot(curr))
     return arr
 }
 
-export function getSuperSlot(obj: any) {
-    let curr = Object.getPrototypeOf(obj)
+export function getSuperSlot(proto: Identity) {
+    let curr = getPrototypeOf(proto)
 
-    while (curr.constructor !== Base) {
+    while (curr !== null) {
         const slot = getSlot(curr)
         if (slot) {
             return slot
         }
-        curr = Object.getPrototypeOf(curr)
+        curr = getPrototypeOf(proto)
     }
     return null
 }