deco stage 3

Author: ruojianll

package.json

@@ -27,7 +27,7 @@
   },
   "author": "",
   "license": "MIT",
-  "types": "dist/index.d.ts",
+
   "peerDependencies": {
     "vue": "^3.0.0"
   },

src/deco3/utils.ts

@@ -32,7 +32,8 @@ export function compatibleClassDecorator(deco: Function) {
 export function compatibleMemberDecorator(deco: Function) {
     return function (arg: any, ctx: DecoratorContext | string) {
         if (typeof ctx === 'object') {//stage 3
-            const proto = Compatible.fakePrototype ??= {}
+            const proto = Compatible.fakePrototype ??= {};
+            proto[ctx.name!] = arg
             return deco(proto, ctx.name)
         } else {
             return deco(arg, ctx)

src/index.ts

@@ -31,21 +31,15 @@ export type VueCons<T = {}> = {
 
 export const Base = class {
     constructor(optionBuilder: OptionBuilder, vueInstance: any) {
-
         const props = optionBuilder.props
-
         if (props) {
             Object.keys(props).forEach(key => {
                 (this as any)[key] = vueInstance[key];
             })
         }
-        (global as any).kkk = this
-        console.log('base', (this as any).prop)
-        console.log('base', (global as any).kkk.prop)
-        setTimeout(() => {
-            console.log('base', (global as any).kkk.prop)
-        }, 0);
+
     }
+
 } as VueCons
 
 export const Vue = Base

src/option/data.ts

@@ -4,15 +4,16 @@ import { makeObject, obtainSlot, excludeNames, getValidNames } from '../utils'
 
 export function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, _propNames?: string[]) {
     optionBuilder.data ??= {}
-    console.log('build1')
-    const sample = new cons(optionBuilder, vueInstance)
-    // console.log('in build',sample)
-    // let names = getValidNames(sample, (des) => {
-    //     return !!des.enumerable
-    // })
 
-    // const slot = obtainSlot(cons.prototype)
-    // names = excludeNames(names, slot)
+    const sample = new cons(optionBuilder,vueInstance)
 
-    // Object.assign(optionBuilder.data, makeObject(names, sample))
+    let names = getValidNames(sample, (des) => {
+        return !!des.enumerable
+    })
+
+
+    const slot = obtainSlot(cons.prototype)
+    names = excludeNames(names, slot)
+    console.log(names)
+    Object.assign(optionBuilder.data, makeObject(names, sample))
 }

src/option/watch.ts

@@ -13,6 +13,7 @@ export interface WatchConfig {
 type Option = Omit<WatchConfig, 'handler' | 'key'>
 export function decorator(key: string, option?: Option) {
     return compatibleMemberDecorator(function (proto: any, name: string) {
+        console.log('watch deco',proto,name,option)
         const slot = obtainSlot(proto)
         const map = slot.obtainMap('watch');
         const opt = Object.assign({}, option ?? {}, {

test/option/data.ts

@@ -6,14 +6,14 @@ import { mount } from '@vue/test-utils'
 
 @Component
 class Comp extends Base {
-    constructor(a:any,b:any){
-        super(a,b)
-        console.log("be",(global as any).kkk===this)
-    }
+    // constructor(a:any,b:any){
+    //     super(a,b)
+    //     console.log("be",(global as any).kkk===this)
+    // }
     data = 'data value'
     @Prop
     prop!: string
-    fieldInitProp = this.prop
+    // fieldInitProp = this.prop //not work
 }
 
 const CompContext = toNative(Comp) as any
@@ -28,9 +28,9 @@ describe('option data',
             }).vm
 
             expect('function').to.equal(typeof CompContext?.data)
-            // expect('data value').to.equal(CompContext.data().data)
-            // expect(2).to.equal(Object.keys(CompContext.data()).length)
-            expect('prop test').to.equal(vm.fieldInitProp)
+            expect('data value').to.equal(CompContext.data().data)
+            expect(1).to.equal(Object.keys(CompContext.data()).length)
+            // expect('prop test').to.equal(vm.fieldInitProp)
         })
     }
 )

test/option/watch.ts

@@ -42,7 +42,7 @@ class Comp extends Base {
     }
 }
 const CompContext = toNative(Comp) as any
-
+console.log(CompContext)
 describe('decorator Watch',
     () => {
         it('default', () => {

test/test.ts

@@ -1,23 +1,23 @@
 require('jsdom-global/keys.js').push('SVGElement')
 require('jsdom-global')()
-// import './internal/utils'
-// import './component'
-// import './option/setup'
+import './internal/utils'
+import './component'
+import './option/setup'
 import './option/data'
-// import './option/methods'
-// import './option/computed'
-// import './option/emit'
-// import './option/ref'
-// import './option/props'
-// import './option/watch'
-// import './option/inject'
-// import './option/vmodel'
-// import './option/accessor'
-// import './feature/hooks'
-// import './feature/classExtends'
-// import './feature/componentExtends'
-// import './feature/extends'
-// import './feature/mixinsFunction'
+import './option/methods'
+import './option/computed'
+import './option/emit'
+import './option/ref'
+import './option/props'
+import './option/watch'
+import './option/inject'
+import './option/vmodel'
+import './option/accessor'
+import './feature/hooks'
+import './feature/classExtends'
+import './feature/componentExtends'
+import './feature/extends'
+import './feature/mixinsFunction'
 
 
-// import './tsx/attributeTypes'
+import './tsx/attributeTypes'