@mpxjs/core 2.9.0-beta.0 → 2.9.0-beta.2

package/@types/index.d.ts

@@ -8,7 +8,7 @@
 /// <reference path="./node.d.ts" />
 
 // @ts-ignore
-import type { GetComputedType } from '@mpxjs/store'
+import { GetComputedType } from '@mpxjs/store'
 
 // @ts-ignore
 export * from '@mpxjs/store'
@@ -42,7 +42,7 @@ interface PropOpt {
 }
 
 interface Properties {
-  [key: string]: PropType | PropOpt
+  [key: string]: WechatMiniprogram.Component.AllProperty
 }
 
 interface Methods {
@@ -96,6 +96,7 @@ interface Mixin<D, P, C, M> {
   properties?: P
   computed?: C
   methods?: M
+
   [index: string]: any
 }
 
@@ -108,14 +109,16 @@ interface Context {
   triggerEvent: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['triggerEvent']
   refs: ObjectOf<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>
   asyncRefs: ObjectOf<Promise<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>>
+
   forceUpdate (params?: object, callback?: () => void): void
+
   selectComponent: ReplaceWxComponentIns['selectComponent']
   selectAllComponents: ReplaceWxComponentIns['selectAllComponents']
   createSelectorQuery: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createSelectorQuery']
   createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver']
 }
 
-interface ComponentOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes & WechatMiniprogram.Component.OtherOption>{
+interface ComponentOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes & WechatMiniprogram.Component.OtherOption> {
   data?: D
   properties?: P
   computed?: C
@@ -137,11 +140,11 @@ type PageOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>> =
   ComponentOpt<D, P, C, M, Mi, S>
   & Partial<WechatMiniprogram.Page.ILifetime>
 
-type ThisTypedPageOpt<D extends AnyObject, P, C, M, Mi extends Array<any>, S extends Record<any, any>, O = {}> =
+type ThisTypedPageOpt<D extends Data, P extends Properties, C, M extends Methods, Mi extends Array<any>, S extends Record<any, any>, O = {}> =
   PageOpt<D, P, C, M, Mi, S>
   & ThisType<ComponentIns<D, P, C, M, Mi, S, O>> & O
 
-type ThisTypedComponentOpt<D extends AnyObject, P, C, M, Mi extends Array<any>, S extends Record<any, any>, O = {}> =
+type ThisTypedComponentOpt<D extends Data, P extends Properties, C, M extends Methods, Mi extends Array<any>, S extends Record<any, any>, O = {}> =
   ComponentOpt<D, P, C, M, Mi, S>
   & ThisType<ComponentIns<D, P, C, M, Mi, S, O>> & O
 
@@ -169,13 +172,17 @@ type MpxComProps<O> = { $rawOptions: O }
 
 export interface MpxComponentIns {
   $refs: ObjectOf<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>
-  $asyncRefs : ObjectOf<Promise<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>>
+  $asyncRefs: ObjectOf<Promise<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>>
   $set: typeof set
   $remove: typeof del
   $delete: typeof del
+
   $watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
+
   $forceUpdate (params?: object, callback?: () => void): void
+
   $nextTick (fn: () => void): void
+
   $i18n: {
     locale: string
     fallbackLocale: string
@@ -184,6 +191,7 @@ export interface MpxComponentIns {
   $tc: typeof tc
   $te: typeof te
   $tm: typeof tm
+
   [k: string]: any
 }
 
@@ -193,17 +201,16 @@ interface ReplaceWxComponentIns {
   selectAllComponents (selector: string): Array<ComponentIns<{}, {}, {}, {}, []>>
 }
 
-type WxComponentIns<D extends AnyObject> =
-  ReplaceWxComponentIns
-  & WechatMiniprogram.Component.InstanceProperties
-  & WechatMiniprogram.Component.InstanceMethods<D>
+type WxComponentIns<D extends Data = {}, P extends Properties = {}, M extends Methods = {}> =
+  Omit<WechatMiniprogram.Component.Instance<D, P, M>, 'selectComponent' | 'selectAllComponents'>
+  & ReplaceWxComponentIns
 
-type ComponentIns<D extends AnyObject, P, C, M, Mi extends Array<any>, S extends Record<any, any> = {}, O = {}> =
+type ComponentIns<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], S extends Record<any, any> = {}, O = {}> =
   GetDataType<D> & UnboxMixinsField<Mi, 'data'> &
   M & UnboxMixinsField<Mi, 'methods'> & { [K in keyof S]: S[K] extends Ref<infer V> ? V : S[K] } &
   GetPropsType<P & UnboxMixinsField<Mi, 'properties'>> &
   GetComputedType<C & UnboxMixinsField<Mi, 'computed'>> &
-  WxComponentIns<D> & MpxComponentIns & MpxComProps<O>
+  WxComponentIns<D, P, M> & MpxComponentIns & MpxComProps<O>
 
 interface CreateConfig {
   customCtor: any
@@ -486,7 +493,7 @@ export function reactive<T extends object> (target: T): Reactive<T>
 
 export function isReactive (value: unknown): boolean
 
-export function markRaw<T extends object>(value: T): T
+export function markRaw<T extends object> (value: T): T
 
 export function shallowReactive<T extends object> (target: T): ShallowReactive<T>
 
@@ -566,6 +573,7 @@ export function onBeforeUnmount (callback: () => void): void
 export function onUnmounted (callback: () => void): void
 
 export function onLoad<T extends Record<string, string | undefined>> (callback: (query: T) => void): void
+
 // wechat dose not have generics
 // export function onLoad (callback: WechatMiniprogram.Page.ILifetime['onLoad']): void
 
@@ -592,7 +600,7 @@ export function onTabItemTap (callback: WechatMiniprogram.Page.ILifetime['onTabI
 export function onSaveExitState (callback: () => void): void
 
 // get instance
-export function getCurrentInstance<T extends MpxComponentIns> (): T
+export function getCurrentInstance<T extends ComponentIns<{}, {}, {}>> (): T
 
 // I18n
 export function useI18n<Options extends {
@@ -612,8 +620,7 @@ type InferDefaults<T> = {
   [K in keyof T]?: InferDefault<T, NotUndefined<T[K]>>
 }
 
-type InferDefault<P, T> = T extends
-  | null
+type InferDefault<P, T> = T extends | null
   | number
   | string
   | boolean

package/@types/node.d.ts

@@ -12,19 +12,21 @@ declare let process: {
   env: EnvType
 }
 
- declare namespace __WebpackModuleApi {
-
+declare namespace __WebpackModuleApi {
   interface RequireContext {
-    keys(): string[];
+    keys (): string[];
+
     (id: string): any;
-    <T>(id: string): T;
-    resolve(id: string): string;
+
+    <T> (id: string): T;
+
+    resolve (id: string): string;
+
     /** The module id of the context module. This may be useful for module.hot.accept. */
     id: string;
   }
 }
 
-declare namespace require {
-  export function context(path: string, deep?: boolean, filter?: RegExp, mode?: 'sync' | 'eager' | 'weak' | 'lazy' | 'lazy-once'): __WebpackModuleApi.RequireContext;
-  export function async<T>(path: string): Promise<T>
+interface Require {
+  context (path: string, deep?: boolean, filter?: RegExp, mode?: 'sync' | 'eager' | 'weak' | 'lazy' | 'lazy-once'): __WebpackModuleApi.RequireContext
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.0-beta.0",
+  "version": "2.9.0-beta.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
     "mpx"
   ],
   "author": "donghongping",
-  "license": "Apache",
+  "license": "Apache-2.0",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
   "directories": {
@@ -19,9 +19,9 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.15",
+    "@mpxjs/utils": "^2.9.0-beta.1",
     "lodash": "^4.1.1",
-    "miniprogram-api-typings": "^3.0.2"
+    "miniprogram-api-typings": "^3.10.0"
   },
   "peerDependencies": {
     "@mpxjs/api-proxy": "^2.7.44",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "67b611aeae99f916d46ca8d5d9ed784ddf53f05c"
+  "gitHead": "2d61bab77c50eccb7470b9b9bd644e7bd6510467"
 }

package/src/platform/builtInMixins/pageRouteMixin.js

@@ -4,6 +4,19 @@ export default function pageRouteMixin (mixinType) {
     return {
       beforeCreate () {
         this.route = this.$options.__mpxPageRoute || ''
+      },
+      methods: {
+        getOpenerEventChannel () {
+          const router = global.__mpxRouter
+          const eventChannel = router && router.eventChannelMap[this.route]
+          return eventChannel || {}
+        }
+      }
+    }
+  }
+  return {
+    methods: {
+      getOpenerEventChannel () {
       }
     }
   }

package/src/platform/builtInMixins/proxyEventMixin.web.js

@@ -18,11 +18,6 @@ export default function proxyEventMixin () {
         const originValue = valuePath.reduce((acc, cur) => acc[cur], $event.detail)
         const value = filterMethod ? (innerFilter[filterMethod] ? innerFilter[filterMethod](originValue) : typeof this[filterMethod] === 'function' && this[filterMethod]) : originValue
         setByPath(this, expr, value)
-      },
-      getOpenerEventChannel () {
-        const router = this.$root.$options && this.$root.$options.router
-        const eventChannel = router && router.__mpxAction && router.__mpxAction.eventChannel
-        return eventChannel
       }
     }
   }

package/src/platform/patch/web/getDefaultOptions.js

@@ -81,7 +81,7 @@ export function getDefaultOptions (type, { rawOptions = {} }) {
       if (this.__mpxProxy) this.__mpxProxy.callHook(UNMOUNTED)
     },
     serverPrefetch () {
-      if (this.__mpxProxy) this.__mpxProxy.callHook(SERVERPREFETCH)
+      if (this.__mpxProxy) return this.__mpxProxy.callHook(SERVERPREFETCH)
     }
   }]
   // 为了在builtMixin中可以使用某些rootMixin实现的特性（如数据响应等），此处builtInMixin在rootMixin之后执行，但是当builtInMixin使用存在对应内建生命周期的目标平台声明周期写法时，可能会出现用户生命周期比builtInMixin中的生命周期先执行的情况，为了避免这种情况发生，builtInMixin应该尽可能使用内建生命周期来编写

package/src/vuePlugin.js

@@ -25,7 +25,7 @@ export default function install (Vue) {
   Vue.prototype.createSelectorQuery = function () {
     return webApi.createSelectorQuery().in(this)
   }
-  Vue.prototype.createIntersectionObserver = function (component, options) {
-    return webApi.createIntersectionObserver(component, options)
+  Vue.prototype.createIntersectionObserver = function (options) {
+    return webApi.createIntersectionObserver(this, options)
   }
 }