dung13890
diff --git a/‎src/setup.ts
Lines changed: 12 additions & 5 deletions b/‎src/setup.ts
Lines changed: 12 additions & 5 deletions
diff --git a/‎src/types/vue.ts
Lines changed: 3 additions & 17 deletions b/‎src/types/vue.ts
Lines changed: 3 additions & 17 deletions
diff --git a/‎test/setup.spec.js
Lines changed: 32 additions & 0 deletions b/‎test/setup.spec.js
Lines changed: 32 additions & 0 deletions
@@ -82,21 +82,28 @@ export function mixin(Vue: VueConstructor) {
       'attrs', // confirmed in rfc
       // 'listeners', // very likely
     ];
-    const method = [
+    const methodWithoutReturn = [
       // 'on',  // very likely
       // 'once', // very likely
       // 'off', // very likely
       'emit', // confirmed in rfc
       // 'forceUpdate',
       // 'destroy'
     ];
-    props.forEach(key =>
-      proxy(ctx, key, () => vm[key], function() {
+    props.forEach(key => {
+      proxy(ctx, key, () => vm[`$${key}`], function() {
         Vue.util.warn(`Cannot assign to '${key}' because it is a read-only property`, vm);
+      });
+    });
+    methodWithoutReturn.forEach(key =>
+      proxy(ctx, key, () => {
+        const vmKey = `$${key}`;
+        return (...args: any[]) => {
+          const fn: Function = vm[vmKey];
+          fn.apply(vm, args);
+        };
       })
     );
-    method.forEach(key => proxy(ctx, key, () => vm[key]));
-
     if (process.env.NODE_ENV === 'test') {
       (ctx as any)._vm = vm;
     }
 
@@ -1,25 +1,11 @@
-import Vue, { ComponentOptions, VNode } from 'vue/';
-import { NormalizedScopedSlot } from 'vue/types/vnode';
+import Vue, { VNode } from 'vue/';
 
 export interface Context {
-  readonly el: Element;
-  readonly options: ComponentOptions<Vue>;
   readonly parent: Vue;
   readonly root: Vue;
-  readonly children: Vue[];
   readonly refs: { [key: string]: Vue | Element | Vue[] | Element[] };
   readonly slots: { [key: string]: VNode[] | undefined };
-  readonly scopedSlots: { [key: string]: NormalizedScopedSlot | undefined };
-  readonly isServer: boolean;
-  readonly ssrContext: any;
-  readonly vnode: VNode;
-  readonly attrs: Record<string, string>; //
-  readonly listeners: Record<string, Function | Function[]>;
+  readonly attrs: Record<string, string>;
 
-  on(event: string | string[], callback: Function): this;
-  once(event: string | string[], callback: Function): this;
-  off(event?: string | string[], callback?: Function): this;
-  emit(event: string, ...args: any[]): this;
-  forceUpdate(): void;
-  destroy(): void;
+  emit(event: string, ...args: any[]): void;
 }
@@ -11,6 +11,38 @@ describe('setup', () => {
     warn.mockRestore();
   });
 
+  it('should reveive props as first params', done => {
+    new Vue({
+      props: ['a'],
+      setup(props) {
+        expect(props.a).toBe(1);
+        done();
+      },
+      propsData: {
+        a: 1,
+      },
+    });
+  });
+
+  it('should reveive context second params', done => {
+    new Vue({
+      setup(_, ctx) {
+        expect(ctx).toBeDefined();
+        expect('parent' in ctx).toBe(true);
+        expect(ctx).toEqual(
+          expect.objectContaining({
+            root: expect.any(Object),
+            refs: expect.any(Object),
+            slots: expect.any(Object),
+            attrs: expect.any(Object),
+            emit: expect.any(Function),
+          })
+        );
+        done();
+      },
+    });
+  });
+
   it('warn for exist property(data)', () => {
     new Vue({
       data() {