@dcloudio/uni-mp-toutiao 3.0.0-alpha-3031220220222001 → 3.0.0-alpha-3040020220225001

package/dist/uni.api.esm.js

@@ -1,8 +1,22 @@
-import { isArray, hasOwn, isString, isPlainObject, isObject, capitalize, toRawType, makeMap, isPromise, isFunction, extend } from '@vue/shared';
-import { injectHook } from 'vue';
+import { isArray, hasOwn, isString, isPlainObject, isObject, capitalize, toRawType, makeMap, isFunction, isPromise, remove, extend } from '@vue/shared';
 
-//App
-const ON_LAUNCH = 'onLaunch';
+let vueApp;
+const createVueAppHooks = [];
+/**
+ * 提供 createApp 的回调事件，方便三方插件接收 App 对象，处理挂靠全局 mixin 之类的逻辑
+ * @param hook
+ */
+function onCreateVueApp(hook) {
+    // TODO 每个 nvue 页面都会触发
+    if (vueApp) {
+        return hook(vueApp);
+    }
+    createVueAppHooks.push(hook);
+}
+function invokeCreateVueAppHook(app) {
+    vueApp = app;
+    createVueAppHooks.forEach((hook) => hook(app));
+}
 
 const eventChannels = {};
 const eventChannelStack = [];
@@ -40,19 +54,61 @@ const navigateTo = {
     },
 };
 
-tt.appLaunchHooks = [];
-function onAppLaunch(hook) {
-    const app = getApp({ allowDefault: true });
-    if (app && app.$vm) {
-        return injectHook(ON_LAUNCH, hook, app.$vm.$);
-    }
-    tt.appLaunchHooks.push(hook);
-}
-
 function getBaseSystemInfo() {
   return tt.getSystemInfoSync()
 }
 
+const E = function () {
+    // Keep this empty so it's easier to inherit from
+    // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)
+};
+E.prototype = {
+    on: function (name, callback, ctx) {
+        var e = this.e || (this.e = {});
+        (e[name] || (e[name] = [])).push({
+            fn: callback,
+            ctx: ctx,
+        });
+        return this;
+    },
+    once: function (name, callback, ctx) {
+        var self = this;
+        function listener() {
+            self.off(name, listener);
+            callback.apply(ctx, arguments);
+        }
+        listener._ = callback;
+        return this.on(name, listener, ctx);
+    },
+    emit: function (name) {
+        var data = [].slice.call(arguments, 1);
+        var evtArr = ((this.e || (this.e = {}))[name] || []).slice();
+        var i = 0;
+        var len = evtArr.length;
+        for (i; i < len; i++) {
+            evtArr[i].fn.apply(evtArr[i].ctx, data);
+        }
+        return this;
+    },
+    off: function (name, callback) {
+        var e = this.e || (this.e = {});
+        var evts = e[name];
+        var liveEvents = [];
+        if (evts && callback) {
+            for (var i = 0, len = evts.length; i < len; i++) {
+                if (evts[i].fn !== callback && evts[i].fn._ !== callback)
+                    liveEvents.push(evts[i]);
+            }
+        }
+        // Remove event from queue to prevent memory leak
+        // Suggested by https://github.com/lazd
+        // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910
+        liveEvents.length ? (e[name] = liveEvents) : delete e[name];
+        return this;
+    },
+};
+var E$1 = E;
+
 function validateProtocolFail(name, msg) {
     console.warn(`${name}: ${msg}`);
 }
@@ -189,6 +245,30 @@ function isBoolean(...args) {
     return args.some((elem) => elem.toLowerCase() === 'boolean');
 }
 
+function tryCatch(fn) {
+    return function () {
+        try {
+            return fn.apply(fn, arguments);
+        }
+        catch (e) {
+            // TODO
+            console.error(e);
+        }
+    };
+}
+
+function getApiCallbacks(args) {
+    const apiCallbacks = {};
+    for (const name in args) {
+        const fn = args[name];
+        if (isFunction(fn)) {
+            apiCallbacks[name] = tryCatch(fn);
+            delete args[name];
+        }
+    }
+    return apiCallbacks;
+}
+
 const HOOK_SUCCESS = 'success';
 const HOOK_FAIL = 'fail';
 const HOOK_COMPLETE = 'complete';
@@ -419,9 +499,11 @@ function removeInterceptorHook(interceptors, interceptor) {
     if (!interceptors || !interceptor) {
         return;
     }
-    Object.keys(interceptor).forEach((hook) => {
-        if (isFunction(interceptor[hook])) {
-            removeHook(interceptors[hook], interceptor[hook]);
+    Object.keys(interceptor).forEach((name) => {
+        const hooks = interceptors[name];
+        const hook = interceptor[name];
+        if (isArray(hooks) && isFunction(hook)) {
+            remove(hooks, hook);
         }
     });
 }
@@ -444,15 +526,6 @@ function dedupeHooks(hooks) {
     }
     return res;
 }
-function removeHook(hooks, hook) {
-    if (!hooks) {
-        return;
-    }
-    const index = hooks.indexOf(hook);
-    if (index !== -1) {
-        hooks.splice(index, 1);
-    }
-}
 const addInterceptor = defineSyncApi(API_ADD_INTERCEPTOR, (method, interceptor) => {
     if (typeof method === 'string' && isPlainObject(interceptor)) {
         mergeInterceptorHook(scopedInterceptors[method] || (scopedInterceptors[method] = {}), interceptor);
@@ -511,58 +584,7 @@ const EmitProtocol = [
     },
 ];
 
-const E = function () {
-    // Keep this empty so it's easier to inherit from
-    // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)
-};
-E.prototype = {
-    on: function (name, callback, ctx) {
-        var e = this.e || (this.e = {});
-        (e[name] || (e[name] = [])).push({
-            fn: callback,
-            ctx: ctx,
-        });
-        return this;
-    },
-    once: function (name, callback, ctx) {
-        var self = this;
-        function listener() {
-            self.off(name, listener);
-            callback.apply(ctx, arguments);
-        }
-        listener._ = callback;
-        return this.on(name, listener, ctx);
-    },
-    emit: function (name) {
-        var data = [].slice.call(arguments, 1);
-        var evtArr = ((this.e || (this.e = {}))[name] || []).slice();
-        var i = 0;
-        var len = evtArr.length;
-        for (i; i < len; i++) {
-            evtArr[i].fn.apply(evtArr[i].ctx, data);
-        }
-        return this;
-    },
-    off: function (name, callback) {
-        var e = this.e || (this.e = {});
-        var evts = e[name];
-        var liveEvents = [];
-        if (evts && callback) {
-            for (var i = 0, len = evts.length; i < len; i++) {
-                if (evts[i].fn !== callback && evts[i].fn._ !== callback)
-                    liveEvents.push(evts[i]);
-            }
-        }
-        // Remove event from queue to prevent memory leak
-        // Suggested by https://github.com/lazd
-        // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910
-        liveEvents.length ? (e[name] = liveEvents) : delete e[name];
-        return this;
-    },
-};
-var Emitter = E;
-
-const emitter = new Emitter();
+const emitter = new E$1();
 const $on = defineSyncApi(API_ON, (name, callback) => {
     emitter.on(name, callback);
     return () => emitter.off(name, callback);
@@ -584,6 +606,72 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
     emitter.emit(name, ...args);
 }, EmitProtocol);
 
+let cid = '';
+/**
+ * @private
+ * @param args
+ */
+function invokePushCallback(args) {
+    if (args.type === 'clientId') {
+        cid = args.cid;
+        invokeGetPushCidCallbacks(cid);
+    }
+    else if (args.type === 'pushMsg') {
+        onPushMessageCallbacks.forEach((callback) => {
+            callback({ data: args.message });
+        });
+    }
+}
+const getPushCidCallbacks = [];
+function invokeGetPushCidCallbacks(cid) {
+    getPushCidCallbacks.forEach((callback) => {
+        callback(cid);
+    });
+    getPushCidCallbacks.length = 0;
+}
+function getPushCid(args) {
+    if (!isPlainObject(args)) {
+        args = {};
+    }
+    const { success, fail, complete } = getApiCallbacks(args);
+    const hasSuccess = isFunction(success);
+    const hasFail = isFunction(fail);
+    const hasComplete = isFunction(complete);
+    getPushCidCallbacks.push((cid) => {
+        let res;
+        if (cid) {
+            res = { errMsg: 'getPushCid:ok', cid };
+            hasSuccess && success(res);
+        }
+        else {
+            res = { errMsg: 'getPushCid:fail' };
+            hasFail && fail(res);
+        }
+        hasComplete && complete(res);
+    });
+    if (cid) {
+        Promise.resolve().then(() => invokeGetPushCidCallbacks(cid));
+    }
+}
+const onPushMessageCallbacks = [];
+// 不使用 defineOnApi 实现，是因为 defineOnApi 依赖 UniServiceJSBridge ，该对象目前在小程序上未提供，故简单实现
+const onPushMessage = (fn) => {
+    if (onPushMessageCallbacks.indexOf(fn) === -1) {
+        onPushMessageCallbacks.push(fn);
+    }
+};
+const offPushMessage = (fn) => {
+    if (!fn) {
+        onPushMessageCallbacks.length = 0;
+    }
+    else {
+        const index = onPushMessageCallbacks.indexOf(fn);
+        if (index > -1) {
+            onPushMessageCallbacks.splice(index, 1);
+        }
+    }
+};
+
 const SYNC_API_RE = /^\$|getLocale|setLocale|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64/;
 const CONTEXT_API_RE = /^create|Manager$/;
 // Context例外情况
@@ -768,10 +856,15 @@ const baseApis = {
     interceptors,
     addInterceptor,
     removeInterceptor,
-    onAppLaunch,
+    onCreateVueApp,
+    invokeCreateVueAppHook,
     getLocale,
     setLocale,
     onLocaleChange,
+    getPushCid,
+    onPushMessage,
+    offPushMessage,
+    invokePushCallback,
 };
 function initUni(api, protocols) {
     const wrapper = initWrapper(protocols);

package/dist/uni.mp.esm.js

@@ -1,5 +1,5 @@
-import { isPlainObject, isArray, hasOwn, isFunction, extend, camelize, isObject } from '@vue/shared';
-import { injectHook, ref, nextTick, findComponentPropsData, toRaw, updateProps, invalidateJob, getExposeProxy, pruneComponentPropsCache } from 'vue';
+import { camelize, isPlainObject, isArray, hasOwn, isFunction, extend, isObject } from '@vue/shared';
+import { ref, nextTick, findComponentPropsData, toRaw, updateProps, invalidateJob, getExposeProxy, pruneComponentPropsCache } from 'vue';
 
 const ON_READY$1 = 'onReady';
 
@@ -88,6 +88,25 @@ const ON_REACH_BOTTOM = 'onReachBottom';
 const ON_PULL_DOWN_REFRESH = 'onPullDownRefresh';
 const ON_ADD_TO_FAVORITES = 'onAddToFavorites';
 
+const customizeRE = /:/g;
+function customizeEvent(str) {
+    return camelize(str.replace(customizeRE, '-'));
+}
+
+function hasLeadingSlash(str) {
+    return str.indexOf('/') === 0;
+}
+function addLeadingSlash(str) {
+    return hasLeadingSlash(str) ? str : '/' + str;
+}
+const invokeArrayFns = (fns, arg) => {
+    let ret;
+    for (let i = 0; i < fns.length; i++) {
+        ret = fns[i](arg);
+    }
+    return ret;
+};
+
 const encode = encodeURIComponent;
 function stringifyQuery(obj, encodeStr = encode) {
     const res = obj
@@ -108,20 +127,6 @@ function stringifyQuery(obj, encodeStr = encode) {
     return res ? `?${res}` : '';
 }
 
-function hasLeadingSlash(str) {
-    return str.indexOf('/') === 0;
-}
-function addLeadingSlash(str) {
-    return hasLeadingSlash(str) ? str : '/' + str;
-}
-const invokeArrayFns = (fns, arg) => {
-    let ret;
-    for (let i = 0; i < fns.length; i++) {
-        ret = fns[i](arg);
-    }
-    return ret;
-};
-
 class EventChannel {
     constructor(id, events) {
         this.id = id;
@@ -185,11 +190,13 @@ class EventChannel {
     }
 }
 
-const MINI_PROGRAM_PAGE_RUNTIME_HOOKS = {
-    onPageScroll: 1,
-    onShareAppMessage: 1 << 1,
-    onShareTimeline: 1 << 2,
-};
+const MINI_PROGRAM_PAGE_RUNTIME_HOOKS = /*#__PURE__*/ (() => {
+    return {
+        onPageScroll: 1,
+        onShareAppMessage: 1 << 1,
+        onShareTimeline: 1 << 2,
+    };
+})();
 
 const eventChannels = {};
 const eventChannelStack = [];
@@ -357,13 +364,6 @@ function initRuntimeHooks(mpOptions, runtimeHooks) {
     });
 }
 
-tt.appLaunchHooks = [];
-function injectAppLaunchHooks(appInstance) {
-    tt.appLaunchHooks.forEach((hook) => {
-        injectHook(ON_LAUNCH, hook, appInstance);
-    });
-}
-
 const HOOKS = [
     ON_SHOW,
     ON_HIDE,
@@ -388,9 +388,8 @@ function parseApp(instance, parseAppOptions) {
                 mpInstance: this,
                 slots: [],
             });
-            injectAppLaunchHooks(internalInstance);
             ctx.globalData = this.globalData;
-            instance.$callHook(ON_LAUNCH, extend({ app: { mixin: internalInstance.appContext.app.mixin } }, options));
+            instance.$callHook(ON_LAUNCH, options);
         },
     };
     initLocale(instance);
@@ -854,14 +853,10 @@ function initCreatePage(parseOptions) {
 
 const MPPage = Page;
 const MPComponent = Component;
-const customizeRE = /:/g;
-function customize(str) {
-    return camelize(str.replace(customizeRE, '-'));
-}
 function initTriggerEvent(mpInstance) {
     const oldTriggerEvent = mpInstance.triggerEvent;
     mpInstance.triggerEvent = function (event, ...args) {
-        return oldTriggerEvent.apply(mpInstance, [customize(event), ...args]);
+        return oldTriggerEvent.apply(mpInstance, [customizeEvent(event), ...args]);
     };
 }
 function initHook(name, options, isComponent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "3.0.0-alpha-3031220220222001",
+  "version": "3.0.0-alpha-3040020220225001",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {
@@ -22,11 +22,11 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3031220220222001",
-    "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3031220220222001",
-    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3031220220222001",
-    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3031220220222001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3031220220222001",
-    "@vue/compiler-core": "3.2.26"
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3040020220225001",
+    "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3040020220225001",
+    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3040020220225001",
+    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3040020220225001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3040020220225001",
+    "@vue/compiler-core": "3.2.31"
   }
 }