[improvement] rewrite with typescript (#604)

build/compiler.js

@@ -33,6 +33,9 @@ gulp.task('compile-ts', () =>
   gulp
     .src([src + '/**/*.ts'])
     .pipe(tsProject())
+    .on('error', (err) => {
+      console.log(err);
+    })
     .pipe(gulp.dest(dist))
 );
 gulp.task('compile-json', () => copy('json'));

dist/action-sheet/index.js

@@ -1,43 +1,39 @@
-import { create } from '../common/create';
-
-create({
-  props: {
-    show: Boolean,
-    title: String,
-    cancelText: String,
-    zIndex: {
-      type: Number,
-      value: 100
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        show: Boolean,
+        title: String,
+        cancelText: String,
+        zIndex: {
+            type: Number,
+            value: 100
+        },
+        actions: {
+            type: Array,
+            value: []
+        },
+        overlay: {
+            type: Boolean,
+            value: true
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true
+        }
     },
-    actions: {
-      type: Array,
-      value: []
-    },
-    overlay: {
-      type: Boolean,
-      value: true
-    },
-    closeOnClickOverlay: {
-      type: Boolean,
-      value: true
+    methods: {
+        onSelect(event) {
+            const { index } = event.currentTarget.dataset;
+            const item = this.data.actions[index];
+            if (item && !item.disabled && !item.loading) {
+                this.$emit('select', item);
+            }
+        },
+        onCancel() {
+            this.$emit('cancel');
+        },
+        onClose() {
+            this.$emit('close');
+        }
     }
-  },
-
-  methods: {
-    onSelect(event) {
-      const { index } = event.currentTarget.dataset;
-      const item = this.data.actions[index];
-      if (item && !item.disabled && !item.loading) {
-        this.$emit('select', item);
-      }
-    },
-
-    onCancel() {
-      this.$emit('cancel');
-    },
-
-    onClose() {
-      this.$emit('close');
-    }
-  }
 });

dist/area/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     value: {
       type: String,

dist/badge-group/index.js

@@ -1,60 +1,49 @@
-import { create } from '../common/create';
-
-create({
-  relations: {
-    '../badge/index': {
-      type: 'descendant',
-
-      linked(target) {
-        this.data.badges.push(target);
-        this.setActive();
-      },
-
-      unlinked(target) {
-        this.data.badges = this.data.badges.filter(item => item !== target);
-        this.setActive();
-      }
+import { VantComponent } from '../common/component';
+VantComponent({
+    relations: {
+        '../badge/index': {
+            type: 'descendant',
+            linked(target) {
+                this.data.badges.push(target);
+                this.setActive();
+            },
+            unlinked(target) {
+                this.data.badges = this.data.badges.filter(item => item !== target);
+                this.setActive();
+            }
+        }
+    },
+    props: {
+        active: {
+            type: Number,
+            value: 0,
+            observer: 'setActive'
+        }
+    },
+    data: {
+        badges: []
+    },
+    beforeCreate() {
+        this.currentActive = -1;
+    },
+    methods: {
+        setActive(badge) {
+            let { active } = this.data;
+            const { badges } = this.data;
+            if (badge) {
+                active = badges.indexOf(badge);
+            }
+            if (active === this.currentActive) {
+                return;
+            }
+            if (this.currentActive !== -1 && badges[this.currentActive]) {
+                this.$emit('change', active);
+                badges[this.currentActive].setActive(false);
+            }
+            if (badges[active]) {
+                badges[active].setActive(true);
+                this.currentActive = active;
+            }
+        }
     }
-  },
-
-  props: {
-    active: {
-      type: Number,
-      value: 0,
-      observer: 'setActive'
-    }
-  },
-
-  data: {
-    badges: []
-  },
-
-  created() {
-    this.currentActive = -1;
-  },
-
-  methods: {
-    setActive(badge) {
-      let { active } = this.data;
-      const { badges } = this.data;
-
-      if (badge) {
-        active = badges.indexOf(badge);
-      }
-
-      if (active === this.currentActive) {
-        return;
-      }
-
-      if (this.currentActive !== -1 && badges[this.currentActive]) {
-        this.$emit('change', active);
-        badges[this.currentActive].setActive(false);
-      }
-
-      if (badges[active]) {
-        badges[active].setActive(true);
-        this.currentActive = active;
-      }
-    }
-  }
 });

dist/badge/index.js

@@ -1,27 +1,23 @@
-import { create } from '../common/create';
-
-create({
-  relations: {
-    '../badge-group/index': {
-      type: 'ancestor'
-    }
-  },
-
-  props: {
-    info: Number,
-    title: String
-  },
-
-  methods: {
-    onClick() {
-      const group = this.getRelationNodes('../badge-group/index')[0];
-      if (group) {
-        group.setActive(this);
-      }
+import { VantComponent } from '../common/component';
+VantComponent({
+    relations: {
+        '../badge-group/index': {
+            type: 'ancestor'
+        }
     },
-
-    setActive(active) {
-      this.setData({ active });
+    props: {
+        info: Number,
+        title: String
+    },
+    methods: {
+        onClick() {
+            const group = this.getRelationNodes('../badge-group/index')[0];
+            if (group) {
+                group.setActive(this);
+            }
+        },
+        setActive(active) {
+            this.setData({ active });
+        }
     }
-  }
 });

dist/button/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
 
-create({
+VantComponent({
   mixins: [button],
 
   props: {

dist/card/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: [
     'thumb-class',
     'title-class',

dist/cell-group/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     border: {
       type: Boolean,

dist/cell/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: [
     'title-class',
     'label-class',

dist/col/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../row/index': {
       type: 'ancestor'

dist/common/component.js

@@ -0,0 +1,48 @@
+import { basic } from '../mixins/basic';
+import { observe } from '../mixins/observer/index';
+function VantComponent(sfc) {
+    const options = {};
+    // map props to properties
+    if (sfc.props) {
+        options.properties = sfc.props;
+    }
+    // map mixins to behaviors
+    if (sfc.mixins) {
+        options.behaviors = sfc.mixins;
+    }
+    // copy methods
+    if (sfc.methods) {
+        options.methods = sfc.methods;
+    }
+    if (sfc.beforeCreate) {
+        options.created = sfc.beforeCreate;
+    }
+    if (sfc.created) {
+        options.attached = sfc.created;
+    }
+    if (sfc.mounted) {
+        options.ready = sfc.mounted;
+    }
+    if (sfc.destroyed) {
+        options.detached = sfc.destroyed;
+    }
+    // map classes to externalClasses
+    options.externalClasses = sfc.classes || [];
+    // add default externalClasses
+    options.externalClasses.push('custom-class');
+    // add default behaviors
+    options.behaviors = sfc.mixins || [];
+    options.behaviors.push(basic);
+    // add default options
+    options.options = {
+        multipleSlots: true,
+        addGlobalClass: true
+    };
+    // map field to form-field behavior
+    if (sfc.field) {
+        options.behaviors.push('wx://form-field');
+    }
+    observe(sfc, options);
+    Component(options);
+}
+export { VantComponent };

dist/common/create.js

@@ -1,40 +0,0 @@
-import { basic } from '../mixins/basic';
-import { observe } from '../mixins/observer/index';
-
-export function create(sfc) {
-  // map props to properties
-  if (sfc.props) {
-    sfc.properties = sfc.props;
-    delete sfc.props;
-  }
-
-  // map mixins to behaviors
-  if (sfc.mixins) {
-    sfc.behaviors = sfc.mixins;
-    delete sfc.mixins;
-  }
-
-  // map classes to externalClasses
-  sfc.externalClasses = sfc.classes || [];
-  delete sfc.classes;
-
-  // add default externalClasses
-  sfc.externalClasses.push('custom-class');
-
-  // add default behaviors
-  sfc.behaviors = sfc.behaviors || [];
-  sfc.behaviors.push(basic);
-
-  // add default options
-  sfc.options = sfc.options || {};
-  sfc.options.multipleSlots = true;
-  sfc.options.addGlobalClass = true;
-
-  // map field to form-field behavior
-  if (sfc.field) {
-    sfc.behaviors.push('wx://form-field');
-  }
-
-  observe(sfc);
-  Component(sfc);
-};

dist/dialog/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     title: String,
     message: String,

dist/field/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   classes: ['input-class'],

dist/icon/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     info: null,
     name: String,

dist/loading/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     size: {
       type: String,

dist/mixins/observer/index.js

@@ -1,14 +1,14 @@
 import { behavior } from './behavior';
 import { observeProps } from './props';
 
-export function observe(sfc) {
+export function observe(sfc, options) {
   if (sfc.computed) {
-    sfc.behaviors.push(behavior);
-    sfc.methods = sfc.methods || {};
-    sfc.methods.$options = () => sfc;
+    options.behaviors.push(behavior);
+    options.methods = options.methods || {};
+    options.methods.$options = () => sfc;
 
-    if (sfc.properties) {
-      observeProps(sfc.properties);
+    if (options.properties) {
+      observeProps(options.properties);
     }
   }
 }

dist/nav-bar/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: ['title-class'],
 
   props: {

dist/notice-bar/index.js

@@ -1,9 +1,9 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
 const FONT_COLOR = '#f60';
 const BG_COLOR = '#fff7cc';
 
-create({
+VantComponent({
   props: {
     text: {
       type: String,

dist/notify/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     text: String,
     color: {

dist/overlay/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     show: Boolean,
     mask: Boolean,
@@ -14,6 +14,9 @@ create({
   methods: {
     onClick() {
       this.$emit('click');
-    }
+    },
+
+    // for prevent touchmove
+    noop() {}
   }
 });

dist/overlay/index.wxml

@@ -3,5 +3,5 @@
   custom-class="van-overlay"
   custom-style="z-index: {{ zIndex }}; {{ mask ? 'background-color: rgba(0, 0, 0, .7);' : '' }}; {{ customStyle }}"
   bind:tap="onClick"
-  catch:touchmove
+  catch:touchmove="noop"
 />

dist/panel/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: ['footer-class'],
 
   props: {

dist/popup/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { transition } from '../mixins/transition';
 
-create({
+VantComponent({
   mixins: [transition(false)],
 
   props: {

dist/progress/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     inactive: {
       type: Boolean,

dist/row/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../col/index': {
       type: 'descendant',

dist/search/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   classes: ['cancel-class'],

dist/slider/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { touch } from '../mixins/touch';
 
-create({
+VantComponent({
   mixins: [touch],
 
   props: {

dist/stepper/index.js

@@ -1,10 +1,10 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
 // Note that the bitwise operators and shift operators operate on 32-bit ints
 // so in that case, the max safe integer is 2^31-1, or 2147483647
 const MAX = 2147483647;
 
-create({
+VantComponent({
   field: true,
 
   classes: [

dist/steps/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     icon: String,
     steps: {

dist/submit-bar/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: [
     'price-class',
     'button-class'

dist/switch-cell/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   props: {

dist/switch/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   classes: ['node-class'],

dist/tab/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     disabled: {
       type: Boolean,

dist/tabbar-item/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     info: null,
     icon: String,

dist/tabbar/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     active: {
       type: Number,

dist/tabs/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../tab/index': {
       type: 'descendant',

dist/tag/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     type: String,
     mark: Boolean,

dist/toast/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     show: Boolean,
     mask: Boolean,
@@ -29,6 +29,9 @@ create({
       this.setData({
         show: false
       });
-    }
+    },
+
+    // for prevent touchmove
+    noop() {}
   }
 });

dist/toast/index.wxml

@@ -10,7 +10,7 @@
 >
   <view
     class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
-    catch:touchmove
+    catch:touchmove="noop"
   >
     <!-- text only -->
     <view wx:if="{{ type === 'text' }}">{{ message }}</view>

dist/transition/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { transition } from '../mixins/transition';
 
-create({
+VantComponent({
   mixins: [transition(true)],
 
   props: {

dist/tree-select/index.js

@@ -1,8 +1,8 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
 const ITEM_HEIGHT = 44;
 
-create({
+VantComponent({
   props: {
     items: {
       type: Array,

packages/action-sheet/index.ts

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     show: Boolean,
     title: String,
@@ -24,7 +24,7 @@ create({
   },
 
   methods: {
-    onSelect(event) {
+    onSelect(event: Weapp.Event) {
       const { index } = event.currentTarget.dataset;
       const item = this.data.actions[index];
       if (item && !item.disabled && !item.loading) {

packages/area/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     value: {
       type: String,

packages/badge-group/index.ts

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../badge/index': {
       type: 'descendant',
@@ -29,7 +29,7 @@ create({
     badges: []
   },
 
-  created() {
+  beforeCreate() {
     this.currentActive = -1;
   },
 

packages/badge/index.ts

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../badge-group/index': {
       type: 'ancestor'

packages/button/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
 
-create({
+VantComponent({
   mixins: [button],
 
   props: {

packages/card/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: [
     'thumb-class',
     'title-class',

packages/cell-group/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     border: {
       type: Boolean,

packages/cell/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: [
     'title-class',
     'label-class',

packages/col/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../row/index': {
       type: 'ancestor'

packages/common/component.ts

@@ -0,0 +1,74 @@
+import { basic } from '../mixins/basic';
+import { observe } from '../mixins/observer/index';
+import {
+  VantComponentOptions,
+  CombinedComponentInstance
+} from '../../types/index';
+
+function VantComponent<Props, Data, Methods>(
+  sfc: VantComponentOptions<
+    Props,
+    Data,
+    Methods,
+    CombinedComponentInstance<Props, Data, Methods>
+  >
+): void {
+  const options: any = {};
+
+  // map props to properties
+  if (sfc.props) {
+    options.properties = sfc.props;
+  }
+
+  // map mixins to behaviors
+  if (sfc.mixins) {
+    options.behaviors = sfc.mixins;
+  }
+
+  // copy methods
+  if (sfc.methods) {
+    options.methods = sfc.methods;
+  }
+
+  if (sfc.beforeCreate) {
+    options.created = sfc.beforeCreate;
+  }
+
+  if (sfc.created) {
+    options.attached = sfc.created;
+  }
+
+  if (sfc.mounted) {
+    options.ready = sfc.mounted;
+  }
+
+  if (sfc.destroyed) {
+    options.detached = sfc.destroyed;
+  }
+
+  // map classes to externalClasses
+  options.externalClasses = sfc.classes || [];
+
+  // add default externalClasses
+  options.externalClasses.push('custom-class');
+
+  // add default behaviors
+  options.behaviors = sfc.mixins || [];
+  options.behaviors.push(basic);
+
+  // add default options
+  options.options = {
+    multipleSlots: true,
+    addGlobalClass: true
+  };
+
+  // map field to form-field behavior
+  if (sfc.field) {
+    options.behaviors.push('wx://form-field');
+  }
+
+  observe(sfc, options);
+  Component(options);
+}
+
+export { VantComponent };

packages/common/create.js

@@ -1,40 +0,0 @@
-import { basic } from '../mixins/basic';
-import { observe } from '../mixins/observer/index';
-
-export function create(sfc) {
-  // map props to properties
-  if (sfc.props) {
-    sfc.properties = sfc.props;
-    delete sfc.props;
-  }
-
-  // map mixins to behaviors
-  if (sfc.mixins) {
-    sfc.behaviors = sfc.mixins;
-    delete sfc.mixins;
-  }
-
-  // map classes to externalClasses
-  sfc.externalClasses = sfc.classes || [];
-  delete sfc.classes;
-
-  // add default externalClasses
-  sfc.externalClasses.push('custom-class');
-
-  // add default behaviors
-  sfc.behaviors = sfc.behaviors || [];
-  sfc.behaviors.push(basic);
-
-  // add default options
-  sfc.options = sfc.options || {};
-  sfc.options.multipleSlots = true;
-  sfc.options.addGlobalClass = true;
-
-  // map field to form-field behavior
-  if (sfc.field) {
-    sfc.behaviors.push('wx://form-field');
-  }
-
-  observe(sfc);
-  Component(sfc);
-};

packages/dialog/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     title: String,
     message: String,

packages/field/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   classes: ['input-class'],

packages/icon/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     info: null,
     name: String,

packages/loading/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     size: {
       type: String,

packages/mixins/observer/index.js

@@ -1,14 +1,14 @@
 import { behavior } from './behavior';
 import { observeProps } from './props';
 
-export function observe(sfc) {
+export function observe(sfc, options) {
   if (sfc.computed) {
-    sfc.behaviors.push(behavior);
-    sfc.methods = sfc.methods || {};
-    sfc.methods.$options = () => sfc;
+    options.behaviors.push(behavior);
+    options.methods = options.methods || {};
+    options.methods.$options = () => sfc;
 
-    if (sfc.properties) {
-      observeProps(sfc.properties);
+    if (options.properties) {
+      observeProps(options.properties);
     }
   }
 }

packages/nav-bar/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: ['title-class'],
 
   props: {

packages/notice-bar/index.js

@@ -1,9 +1,9 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
 const FONT_COLOR = '#f60';
 const BG_COLOR = '#fff7cc';
 
-create({
+VantComponent({
   props: {
     text: {
       type: String,

packages/notify/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     text: String,
     color: {

packages/overlay/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     show: Boolean,
     mask: Boolean,

packages/panel/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: ['footer-class'],
 
   props: {

packages/popup/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { transition } from '../mixins/transition';
 
-create({
+VantComponent({
   mixins: [transition(false)],
 
   props: {

packages/progress/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     inactive: {
       type: Boolean,

packages/row/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../col/index': {
       type: 'descendant',

packages/search/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   classes: ['cancel-class'],

packages/slider/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { touch } from '../mixins/touch';
 
-create({
+VantComponent({
   mixins: [touch],
 
   props: {

packages/stepper/index.js

@@ -1,10 +1,10 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
 // Note that the bitwise operators and shift operators operate on 32-bit ints
 // so in that case, the max safe integer is 2^31-1, or 2147483647
 const MAX = 2147483647;
 
-create({
+VantComponent({
   field: true,
 
   classes: [

packages/steps/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     icon: String,
     steps: {

packages/submit-bar/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   classes: [
     'price-class',
     'button-class'

packages/switch-cell/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   props: {

packages/switch/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   field: true,
 
   classes: ['node-class'],

packages/tab/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     disabled: {
       type: Boolean,

packages/tabbar-item/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     info: null,
     icon: String,

packages/tabbar/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     active: {
       type: Number,

packages/tabs/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   relations: {
     '../tab/index': {
       type: 'descendant',

packages/tag/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     type: String,
     mark: Boolean,

packages/toast/index.js

@@ -1,6 +1,6 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
-create({
+VantComponent({
   props: {
     show: Boolean,
     mask: Boolean,

packages/transition/index.js

@@ -1,7 +1,7 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 import { transition } from '../mixins/transition';
 
-create({
+VantComponent({
   mixins: [transition(true)],
 
   props: {

packages/tree-select/index.js

@@ -1,8 +1,8 @@
-import { create } from '../common/create';
+import { VantComponent } from '../common/component';
 
 const ITEM_HEIGHT = 44;
 
-create({
+VantComponent({
   props: {
     items: {
       type: Array,

tsconfig.json

@@ -1,8 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "module": "commonjs",
-    "removeComments": true,
+    "target": "es6",
     "noImplicitThis": true,
     "noImplicitUseStrict": true
   },

types/index.d.ts

@@ -1,10 +1,11 @@
+/// <reference path="./weapp.d.ts" />
 import { Vue } from './vue';
-import { Weapp } from './weapp';
 
+type Mixins = any[];
+type ExternalClasses = string[];
 type LooseObject = {
   [key: string]: any;
 };
-type Mixins = any[];
 type Relations<Instance> = {
   [key: string]: {
     type: string;
@@ -12,13 +13,13 @@ type Relations<Instance> = {
     unlinked?: (this: Instance, target?: any) => void;
   }
 };
-type ExternalClasses = string[];
-
-
+type RecordProps<T> = {
+  [K in keyof T]: any
+}
 
 export type CombinedComponentInstance<Props, Data, Methods> = Vue &
   LooseObject &
-  Weapp.Component & { data: Data & Props } & Methods;
+  Weapp.Component & { data: Data & RecordProps<Props> } & Methods;
 
 export type VantComponentOptions<Props, Data, Methods, Instance> = {
   data?: Data;

types/weapp.d.ts

@@ -36,7 +36,3 @@ declare namespace Weapp {
     detail: any;
   }
 }
-
-export {
-  Weapp
-};