enhance custom decorators

Author: ruojianll

src/component.ts

@@ -11,7 +11,6 @@ import { build as optionInject } from './option/inject'
 import { build as optionEmit } from './option/emit'
 import { build as optionVModel } from './option/vmodel'
 import { build as optionAccessor } from './option/accessor'
-import { CustomRecords } from './custom/custom'
 import type { SetupContext } from 'vue';
 import type { OptionBuilder } from './optionBuilder'
 import type { VueCons } from './index'
@@ -89,13 +88,6 @@ function buildComponent(cons: Cons, arg: ComponentOption, extend?: any): any {
     }
     option.emits = emits
 
-
-
-    CustomRecords.forEach(rec => {
-        rec.creator.apply({}, [option, rec.key])
-    })
-
-
     arg.setup ??= function () { return {} }
 
     if (!option.setup) {
@@ -124,6 +116,10 @@ function buildComponent(cons: Cons, arg: ComponentOption, extend?: any): any {
         option.setup = setup
     }
 
+    slot.obtainMap('customDecorator').forEach((v) => {
+        v.creator.apply({}, [option, v.key])
+    })
+
     if (arg.options) {
         Object.assign(option, arg.options)
     }

src/custom/custom.ts

@@ -1,18 +1,22 @@
-import {compatibleMemberDecorator} from '../deco3/utils'
+import { obtainSlot } from '../utils'
+import { compatibleMemberDecorator } from '../deco3/utils'
 type Creator = { (options: any, key: string): void }
-interface Record {
+export interface Record {
     key: string
     creator: Creator
+    preserve: boolean
 }
 
-// const CustomDecorators: CustomDecorator[] = []
-export const CustomRecords: Record[] = []
-
-export function createDecorator(creator: Creator) {
+export function createDecorator(creator: Creator, opt?: {
+    preserve?: boolean
+}) {
     return compatibleMemberDecorator(function (proto: any, key: string) {
-        CustomRecords.push({
+        const slot = obtainSlot(proto)
+        const map = slot.obtainMap('customDecorator')
+        map.set(key, {
             key,
-            creator
+            creator,
+            preserve: !!opt?.preserve
         })
     })
 }

src/option/methodsAndHooks.ts

@@ -40,7 +40,7 @@ export function build(cons: Cons, optionBuilder: OptionBuilder) {
     const HookFunctions: Record<string, Function> = {}
     const MethodFunctions: Record<string, Function> = {}
     protoArr.forEach(proto => {
-        excludeNames(getValidNames(proto, (des, name) => {
+        let names = getValidNames(proto, (des, name) => {
 
             if (name === 'constructor') {
                 return false
@@ -50,7 +50,9 @@ export function build(cons: Cons, optionBuilder: OptionBuilder) {
                 return true
             }
             return false
-        }), slot).forEach(name => {
+        })
+        names = excludeNames(names, slot);
+        names.forEach(name => {
             if (HookNames.includes(name as any) || map.has(name)) {
 
                 HookFunctions[name] = proto[name]

src/utils.ts

@@ -7,6 +7,7 @@ import type { HookConfig } from "./option/methodsAndHooks";
 import type { VModelConfig } from "./option/vmodel";
 import type { WatchConfig } from "./option/watch";
 import type { SetupConfig } from './option/setup'
+import type { Record as CustomDecoratorRecord } from './custom/custom'
 import { compatibleMemberDecorator } from './deco3/utils';
 const SlotSymbol = Symbol('vue-facing-decorator-slot')
 
@@ -22,6 +23,7 @@ export type SlotMapTypes = {
     watch: Map<string, WatchConfig | WatchConfig[]>
     ref: Map<string, boolean>
     setup: Map<string, SetupConfig>
+    customDecorator: Map<string, CustomDecoratorRecord>
 }
 
 class Slot {
@@ -156,6 +158,16 @@ export function excludeNames(names: string[], slot: Slot) {
                 if (['watch', 'hooks', 'setup', 'emits'].includes(mapName)) {
                     continue
                 }
+                if (mapName === 'customDecorator') {
+                    const map = currSlot.obtainMap('customDecorator')
+                    if (map.has(name)) {
+                        if (!map.get(name)!.preserve) {
+                            return false
+                        }else{
+                            continue
+                        }
+                    }
+                }
                 const map = currSlot.names.get(mapName)!
                 if (map.has(name)) {
                     return false

test/custom/custom.ts

@@ -13,6 +13,8 @@ function CustomDeco(param?: String) {
         options.methods[key] = function (...args: any[]) {
             return `${old.apply(this, args)} ${param}`
         }
+    },{
+        preserve:true
     })
 }