@mpxjs/core 2.9.66 → 2.9.69-beta.0

package/src/platform/export/inject.js

@@ -0,0 +1,68 @@
+import { callWithErrorHandling, isFunction, isObject, warn } from '@mpxjs/utils'
+import { currentInstance } from '../../core/proxy'
+
+const providesMap = {
+  /** 全局 scope */
+  __app: Object.create(null),
+  /** 页面 scope */
+  __pages: Object.create(null)
+}
+
+global.__mpxProvidesMap = providesMap
+
+/** @internal createApp() 初始化应用层 scope provide */
+export function initAppProvides (appOptions) {
+  const provideOpt = appOptions.provide
+  if (provideOpt) {
+    const provided = isFunction(provideOpt)
+      ? callWithErrorHandling(provideOpt.bind(appOptions), appOptions, 'createApp provide function')
+      : provideOpt
+    if (isObject(provided)) {
+      providesMap.__app = provided
+    } else {
+      warn('App provides must be an object or a function that returns an object.')
+    }
+  }
+}
+
+function resolvePageId (context) {
+  if (context && isFunction(context.getPageId)) {
+    return context.getPageId()
+  }
+}
+
+function resolvePageProvides (context) {
+  const pageId = resolvePageId(context)
+  return providesMap.__pages[pageId] || (providesMap.__pages[pageId] = Object.create(null))
+}
+
+export function provide (key, value) {
+  const instance = currentInstance
+  if (!instance) {
+    warn('provide() can only be used inside setup().')
+    return
+  }
+  // 小程序无法实现组件父级引用，所以 provide scope 设置为组件所在页面
+  const provides = resolvePageProvides(instance.target)
+  provides[key] = value
+}
+
+export function inject (key, defaultValue, treatDefaultAsFactory = false) {
+  const instance = currentInstance
+  if (!instance) {
+    warn('inject() can only be used inside setup()')
+    return
+  }
+  const provides = resolvePageProvides(instance.target)
+  if (key in provides) {
+    return provides[key]
+  } else if (key in providesMap.__app) {
+    return providesMap.__app[key]
+  } else if (arguments.length > 1) {
+    return treatDefaultAsFactory && isFunction(defaultValue)
+      ? defaultValue.call(instance && instance.target)
+      : defaultValue
+  } else {
+    warn(`injection "${String(key)}" not found.`)
+  }
+}

package/src/platform/export/inject.web.js

@@ -0,0 +1 @@
+export { provide, inject } from 'vue'

package/src/platform/patch/builtInKeysMap.js

@@ -24,6 +24,8 @@ if (__mpx_mode__ === 'web') {
     'initData',
     'watch',
     'computed',
+    'provide',
+    'inject',
     'mpxCustomKeysForBlend',
     'mpxConvertMode',
     'mpxFileResource',

package/src/platform/patch/{ali/getDefaultOptions.js → getDefaultOptions.ali.js}

@@ -1,7 +1,7 @@
-import MpxProxy from '../../../core/proxy'
-import builtInKeysMap from '../builtInKeysMap'
-import mergeOptions from '../../../core/mergeOptions'
-import { error, diffAndCloneA, hasOwn, noop } from '@mpxjs/utils'
+import MpxProxy from '../../core/proxy'
+import builtInKeysMap from './builtInKeysMap'
+import mergeOptions from '../../core/mergeOptions'
+import { error, diffAndCloneA, hasOwn, noop, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 
 function transformApiForProxy (context, currentInject) {
   const rawSetData = context.setData.bind(context)
@@ -100,12 +100,25 @@ function filterOptions (options, type) {
       if (!hasOwn(newOptions, 'props')) {
         newOptions.props = Object.assign({}, options.props, options.properties)
       }
-    } else if (key === 'methods' && type === 'page') {
-      Object.assign(newOptions, options[key])
+    } else if (key === 'methods') {
+      const newMethods = wrapMethodsWithErrorHandling(options[key])
+      if (type === 'page') {
+        // 构造器为Page时抽取所有methods方法到顶层
+        Object.assign(newOptions, newMethods)
+      } else {
+        newOptions[key] = newMethods
+      }
+    } else if (key === 'behaviors') {
+      newOptions.mixins = options[key]
     } else {
       newOptions[key] = options[key]
     }
   })
+  if (newOptions.relations) {
+    // ali relations 需要设置 options.relations = true
+    newOptions.options = newOptions.options || {}
+    newOptions.options.relations = true
+  }
   return newOptions
 }