@tarojs/runtime 3.7.0-canary.1 → 3.7.0-canary.2

package/dist/runtime.h5.js

@@ -3,6 +3,8 @@
 var shared = require('@tarojs/shared');
 
 const PROPERTY_THRESHOLD = 2046;
+const TARO_RUNTIME = 'Taro runtime';
+const HOOKS_APP_ID = 'taro-app';
 const SET_DATA = '小程序 setData';
 const PAGE_INIT = '页面初始化';
 const ROOT_STR = 'root';
@@ -21,6 +23,9 @@ const FOCUS = 'focus';
 const VIEW = 'view';
 const STATIC_VIEW = 'static-view';
 const PURE_VIEW = 'pure-view';
+const PROPS = 'props';
+const DATASET = 'dataset';
+const OBJECT = 'object';
 const VALUE = 'value';
 const INPUT = 'input';
 const CHANGE = 'change';
@@ -32,6 +37,8 @@ const CONFIRM = 'confirm';
 const TIME_STAMP = 'timeStamp';
 const KEY_CODE = 'keyCode';
 const TOUCHMOVE = 'touchmove';
+const DATE = 'Date';
+const SET_TIMEOUT = 'setTimeout';
 const CATCHMOVE = 'catchMove';
 const CATCH_VIEW = 'catch-view';
 const COMMENT = 'comment';
@@ -47,13 +54,13 @@ const A = 'a';
 /**
  * 页面上下文切换时的行为
  */
-var CONTEXT_ACTIONS;
+exports.CONTEXT_ACTIONS = void 0;
 (function (CONTEXT_ACTIONS) {
     CONTEXT_ACTIONS["INIT"] = "0";
     CONTEXT_ACTIONS["RESTORE"] = "1";
     CONTEXT_ACTIONS["RECOVER"] = "2";
     CONTEXT_ACTIONS["DESTORY"] = "3";
-})(CONTEXT_ACTIONS || (CONTEXT_ACTIONS = {}));
+})(exports.CONTEXT_ACTIONS || (exports.CONTEXT_ACTIONS = {}));
 
 const observers = [];
 /** Match two TaroNodes by sid. */
@@ -117,7 +124,7 @@ class MutationObserver {
     constructor(callback) {
         {
             if (process.env.NODE_ENV !== 'production') {
-                console.warn('[Taro Warning] 若要使用 MutationObserver，请在 Taro 编译配置中设置 \'mini.enableMutationObserver: true\'');
+                console.warn('[Taro Warning] 若要使用 MutationObserver，请在 Taro 编译配置中设置 \'mini.runtime.enableMutationObserver: true\'');
             }
             this.core = {
                 observe: shared.noop,
@@ -191,15 +198,15 @@ function isHasExtractProp(el) {
  */
 function isParentBinded(node, type) {
     var _a;
-    let res = false;
-    while ((node === null || node === void 0 ? void 0 : node.parentElement) && node.parentElement._path !== ROOT_STR) {
-        if ((_a = node.parentElement.__handlers[type]) === null || _a === void 0 ? void 0 : _a.length) {
-            res = true;
-            break;
+    while ((node = (node === null || node === void 0 ? void 0 : node.parentElement) || null)) {
+        if (!node || node.nodeName === ROOT_STR || node.nodeName === 'root-portal') {
+            return false;
+        }
+        else if ((_a = node.__handlers[type]) === null || _a === void 0 ? void 0 : _a.length) {
+            return true;
         }
-        node = node.parentElement;
     }
-    return res;
+    return false;
 }
 function shortcutAttr(key) {
     switch (key) {
@@ -349,6 +356,7 @@ let componentsAlias;
  * it's a vnode traverser and modifier: that's exactly what Taro's doing in here.
  */
 function hydrate(node) {
+    var _a;
     if (!componentsAlias) {
         // 初始化 componentsAlias
         componentsAlias = getComponentsAlias();
@@ -360,8 +368,9 @@ function hydrate(node) {
     const nodeName = node.nodeName;
     if (isText(node)) {
         return {
+            sid: node.sid,
             ["v" /* Shortcuts.Text */]: node.nodeValue,
-            ["nn" /* Shortcuts.NodeName */]: componentsAlias[nodeName]._num
+            ["nn" /* Shortcuts.NodeName */]: ((_a = componentsAlias[nodeName]) === null || _a === void 0 ? void 0 : _a._num) || '8'
         };
     }
     const data = {
@@ -407,7 +416,7 @@ function hydrate(node) {
     if (cssText !== '' && nodeName !== 'swiper-item') {
         data["st" /* Shortcuts.Style */] = cssText;
     }
-    shared.hooks.call('modifyHydrateData', data);
+    shared.hooks.call('modifyHydrateData', data, node);
     const nn = data["nn" /* Shortcuts.NodeName */];
     const componentAlias = componentsAlias[nn];
     if (componentAlias) {
@@ -419,7 +428,8 @@ function hydrate(node) {
             }
         }
     }
-    return data;
+    const resData = shared.hooks.call('transferHydrateData', data, node, componentAlias);
+    return resData || data;
 }
 
 class TaroEventTarget {
@@ -984,7 +994,7 @@ function setStyle(newVal, styleKey) {
     if (old === newVal)
         return;
     !this._pending && recordCss(this);
-    if (shared.isNull(newVal) || shared.isUndefined(newVal)) {
+    if (shared.isNull(newVal) || shared.isUndefined(newVal) || newVal === '') {
         this._usedStyleProp.delete(styleKey);
         delete this._value[styleKey];
     }
@@ -1430,6 +1440,7 @@ class TaroElement extends TaroNode {
             sideEffect = false;
             delete options.sideEffect;
         }
+        shared.hooks.call('modifyAddEventListener', this, sideEffect, getComponentsAlias);
         if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
             const componentsAlias = getComponentsAlias();
             const alias = componentsAlias[name]._num;
@@ -1444,6 +1455,7 @@ class TaroElement extends TaroNode {
         super.removeEventListener(type, handler);
         const name = this.nodeName;
         const SPECIAL_NODES = shared.hooks.call('getSpecialNodes');
+        shared.hooks.call('modifyRemoveEventListener', this, sideEffect, getComponentsAlias);
         if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
             const componentsAlias = getComponentsAlias();
             const value = isHasExtractProp(this) ? `static-${name}` : `pure-${name}`;
@@ -1522,13 +1534,14 @@ class TaroEvent {
         this.defaultPrevented = true;
     }
     get target() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const cacheTarget = this.cacheTarget;
         if (!cacheTarget) {
             const target = Object.create(((_a = this.mpEvent) === null || _a === void 0 ? void 0 : _a.target) || null);
-            const element = env.document.getElementById(target.id);
+            // Note：优先判断冒泡场景alipay的targetDataset的sid, 不然冒泡场景target属性吐出不对，其余拿取当前绑定id
+            const element = env.document.getElementById(((_b = target.targetDataset) === null || _b === void 0 ? void 0 : _b.sid) || ((_c = target.dataset) === null || _c === void 0 ? void 0 : _c.sid) || target.id || null);
             target.dataset = element !== null ? element.dataset : shared.EMPTY_OBJ;
-            for (const key in (_b = this.mpEvent) === null || _b === void 0 ? void 0 : _b.detail) {
+            for (const key in (_d = this.mpEvent) === null || _d === void 0 ? void 0 : _d.detail) {
                 target[key] = this.mpEvent.detail[key];
             }
             this.cacheTarget = target;
@@ -1539,19 +1552,19 @@ class TaroEvent {
         }
     }
     get currentTarget() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const cacheCurrentTarget = this.cacheCurrentTarget;
         if (!cacheCurrentTarget) {
             const doc = env.document;
             const currentTarget = Object.create(((_a = this.mpEvent) === null || _a === void 0 ? void 0 : _a.currentTarget) || null);
-            const element = doc.getElementById(currentTarget.id);
-            const targetElement = doc.getElementById(((_c = (_b = this.mpEvent) === null || _b === void 0 ? void 0 : _b.target) === null || _c === void 0 ? void 0 : _c.id) || null);
+            const element = doc.getElementById(((_b = currentTarget.dataset) === null || _b === void 0 ? void 0 : _b.sid) || currentTarget.id || null);
+            const targetElement = doc.getElementById(((_e = (_d = (_c = this.mpEvent) === null || _c === void 0 ? void 0 : _c.target) === null || _d === void 0 ? void 0 : _d.dataset) === null || _e === void 0 ? void 0 : _e.sid) || ((_g = (_f = this.mpEvent) === null || _f === void 0 ? void 0 : _f.target) === null || _g === void 0 ? void 0 : _g.id) || null);
             if (element === null || (element && element === targetElement)) {
                 this.cacheCurrentTarget = this.target;
                 return this.target;
             }
             currentTarget.dataset = element.dataset;
-            for (const key in (_d = this.mpEvent) === null || _d === void 0 ? void 0 : _d.detail) {
+            for (const key in (_h = this.mpEvent) === null || _h === void 0 ? void 0 : _h.detail) {
                 currentTarget[key] = this.mpEvent.detail[key];
             }
             this.cacheCurrentTarget = currentTarget;
@@ -2300,7 +2313,15 @@ class AnchorElement extends TaroElement {
     }
 }
 
-class CustomWrapperElement extends TaroElement {
+class TransferElement extends TaroElement {
+    constructor(dataName) {
+        super();
+        this.dataName = dataName;
+        this.isTransferElement = true;
+    }
+    get _path() {
+        return this.dataName;
+    }
 }
 
 class TaroDocument extends TaroElement {
@@ -2323,8 +2344,9 @@ class TaroDocument extends TaroElement {
             case nodeName === A:
                 element = new AnchorElement();
                 break;
-            case nodeName === CUSTOM_WRAPPER:
-                element = new CustomWrapperElement();
+            case nodeName === 'page-meta':
+            case nodeName === 'navigation-bar':
+                element = new TransferElement(shared.toCamelCase(nodeName));
                 break;
             default:
                 element = new TaroElement();
@@ -2466,17 +2488,17 @@ class History extends shared.Events {
             __classPrivateFieldGet(this, _History_instances, "m", _History_reset).call(this, href);
         }, null);
         // 切换上下文行为
-        this.on(CONTEXT_ACTIONS.INIT, () => {
+        this.on(exports.CONTEXT_ACTIONS.INIT, () => {
             __classPrivateFieldGet(this, _History_instances, "m", _History_reset).call(this);
         }, null);
-        this.on(CONTEXT_ACTIONS.RESTORE, (pageId) => {
+        this.on(exports.CONTEXT_ACTIONS.RESTORE, (pageId) => {
             cache$1.set(pageId, {
                 location: __classPrivateFieldGet(this, _History_location, "f"),
                 stack: __classPrivateFieldGet(this, _History_stack, "f").slice(),
                 cur: __classPrivateFieldGet(this, _History_cur, "f")
             });
         }, null);
-        this.on(CONTEXT_ACTIONS.RECOVER, (pageId) => {
+        this.on(exports.CONTEXT_ACTIONS.RECOVER, (pageId) => {
             if (cache$1.has(pageId)) {
                 const ctx = cache$1.get(pageId);
                 __classPrivateFieldSet(this, _History_location, ctx.location, "f");
@@ -2484,7 +2506,7 @@ class History extends shared.Events {
                 __classPrivateFieldSet(this, _History_cur, ctx.cur, "f");
             }
         }, null);
-        this.on(CONTEXT_ACTIONS.DESTORY, (pageId) => {
+        this.on(exports.CONTEXT_ACTIONS.DESTORY, (pageId) => {
             cache$1.delete(pageId);
         }, null);
         __classPrivateFieldGet(this, _History_instances, "m", _History_reset).call(this);
@@ -2580,15 +2602,15 @@ class Location extends shared.Events {
             __classPrivateFieldSet(this, _Location_noCheckUrl, false, "f");
         }, null);
         // 切换上下文行为
-        this.on(CONTEXT_ACTIONS.INIT, () => {
+        this.on(exports.CONTEXT_ACTIONS.INIT, () => {
             __classPrivateFieldGet(this, _Location_instances, "m", _Location_reset).call(this);
         }, null);
-        this.on(CONTEXT_ACTIONS.RESTORE, (pageId) => {
+        this.on(exports.CONTEXT_ACTIONS.RESTORE, (pageId) => {
             cache.set(pageId, {
                 lastHref: this.href,
             });
         }, null);
-        this.on(CONTEXT_ACTIONS.RECOVER, (pageId) => {
+        this.on(exports.CONTEXT_ACTIONS.RECOVER, (pageId) => {
             // 数据恢复时，不需要执行跳转
             if (cache.has(pageId)) {
                 const ctx = cache.get(pageId);
@@ -2597,7 +2619,7 @@ class Location extends shared.Events {
                 __classPrivateFieldSet(this, _Location_noCheckUrl, false, "f");
             }
         }, null);
-        this.on(CONTEXT_ACTIONS.DESTORY, (pageId) => {
+        this.on(exports.CONTEXT_ACTIONS.DESTORY, (pageId) => {
             cache.delete(pageId);
         }, null);
     }
@@ -2855,24 +2877,24 @@ if (process.env.TARO_ENV && !true) {
         initEvent() {
             const _location = this.location;
             const _history = this.history;
-            this.on(CONTEXT_ACTIONS.INIT, (pageId) => {
+            this.on(exports.CONTEXT_ACTIONS.INIT, (pageId) => {
                 // 页面onload，为该页面建立新的上下文信息
-                _location.trigger(CONTEXT_ACTIONS.INIT, pageId);
+                _location.trigger(exports.CONTEXT_ACTIONS.INIT, pageId);
             }, null);
-            this.on(CONTEXT_ACTIONS.RECOVER, (pageId) => {
+            this.on(exports.CONTEXT_ACTIONS.RECOVER, (pageId) => {
                 // 页面onshow，恢复当前页面的上下文信息
-                _location.trigger(CONTEXT_ACTIONS.RECOVER, pageId);
-                _history.trigger(CONTEXT_ACTIONS.RECOVER, pageId);
+                _location.trigger(exports.CONTEXT_ACTIONS.RECOVER, pageId);
+                _history.trigger(exports.CONTEXT_ACTIONS.RECOVER, pageId);
             }, null);
-            this.on(CONTEXT_ACTIONS.RESTORE, (pageId) => {
+            this.on(exports.CONTEXT_ACTIONS.RESTORE, (pageId) => {
                 // 页面onhide，缓存当前页面的上下文信息
-                _location.trigger(CONTEXT_ACTIONS.RESTORE, pageId);
-                _history.trigger(CONTEXT_ACTIONS.RESTORE, pageId);
+                _location.trigger(exports.CONTEXT_ACTIONS.RESTORE, pageId);
+                _history.trigger(exports.CONTEXT_ACTIONS.RESTORE, pageId);
             }, null);
-            this.on(CONTEXT_ACTIONS.DESTORY, (pageId) => {
+            this.on(exports.CONTEXT_ACTIONS.DESTORY, (pageId) => {
                 // 页面onunload，清除当前页面的上下文信息
-                _location.trigger(CONTEXT_ACTIONS.DESTORY, pageId);
-                _history.trigger(CONTEXT_ACTIONS.DESTORY, pageId);
+                _location.trigger(exports.CONTEXT_ACTIONS.DESTORY, pageId);
+                _history.trigger(exports.CONTEXT_ACTIONS.DESTORY, pageId);
             }, null);
         }
         get document() {
@@ -3074,8 +3096,19 @@ function createPageConfig(component, pageName, data, pageConfig) {
         }
     };
     LIFECYCLES.forEach((lifecycle) => {
+        let isDefer = false;
+        lifecycle = lifecycle.replace(/^defer:/, () => {
+            isDefer = true;
+            return '';
+        });
         config[lifecycle] = function () {
-            return safeExecute(this.$taroPath, lifecycle, ...arguments);
+            const exec = () => safeExecute(this.$taroPath, lifecycle, ...arguments);
+            if (isDefer) {
+                hasLoaded.then(exec);
+            }
+            else {
+                return exec();
+            }
         };
     });
     // onShareAppMessage 和 onShareTimeline 一样，会影响小程序右上方按钮的选项，因此不能默认注册。
@@ -3114,7 +3147,8 @@ function createComponentConfig(component, componentName, data) {
         [ATTACHED]() {
             var _a;
             perf.start(PAGE_INIT);
-            const path = getPath(id, { id: ((_a = this.getPageId) === null || _a === void 0 ? void 0 : _a.call(this)) || pageId() });
+            this.pageIdCache = ((_a = this.getPageId) === null || _a === void 0 ? void 0 : _a.call(this)) || pageId();
+            const path = getPath(id, { id: this.pageIdCache });
             Current.app.mount(component, path, () => {
                 componentElement = env.document.getElementById(path);
                 shared.ensure(componentElement !== null, '没有找到组件实例。');
@@ -3123,7 +3157,7 @@ function createComponentConfig(component, componentName, data) {
             });
         },
         [DETACHED]() {
-            const path = getPath(id, { id: this.getPageId() });
+            const path = getPath(id, { id: this.pageIdCache });
             Current.app.unmount(path, () => {
                 instances.delete(path);
                 if (componentElement) {
@@ -3173,7 +3207,7 @@ function createRecursiveComponentConfig(componentName) {
             }
         }
         : shared.EMPTY_OBJ;
-    return Object.assign({ properties: {
+    return shared.hooks.call('modifyRecursiveComponentConfig', Object.assign({ properties: {
             i: {
                 type: Object,
                 value: {
@@ -3189,7 +3223,7 @@ function createRecursiveComponentConfig(componentName) {
             virtualHost: !isCustomWrapper
         }, methods: {
             eh: eventHandler
-        } }, lifeCycles);
+        } }, lifeCycles), { isCustomWrapper });
 }
 
 const TIMEOUT = 100;
@@ -3239,37 +3273,91 @@ Object.defineProperty(exports, 'hooks', {
   enumerable: true,
   get: function () { return shared.hooks; }
 });
+exports.A = A;
+exports.APP = APP;
+exports.BEHAVIORS = BEHAVIORS;
+exports.BODY = BODY;
+exports.CATCHMOVE = CATCHMOVE;
+exports.CATCH_VIEW = CATCH_VIEW;
+exports.CHANGE = CHANGE;
+exports.CLASS = CLASS;
+exports.COMMENT = COMMENT;
+exports.CONFIRM = CONFIRM;
+exports.CONTAINER = CONTAINER;
+exports.CURRENT_TARGET = CURRENT_TARGET;
+exports.CUSTOM_WRAPPER = CUSTOM_WRAPPER;
 exports.Current = Current;
+exports.DATASET = DATASET;
+exports.DATE = DATE;
+exports.DOCUMENT_ELEMENT_NAME = DOCUMENT_ELEMENT_NAME;
+exports.DOCUMENT_FRAGMENT = DOCUMENT_FRAGMENT;
+exports.EVENT_CALLBACK_RESULT = EVENT_CALLBACK_RESULT;
+exports.EXTERNAL_CLASSES = EXTERNAL_CLASSES;
+exports.FOCUS = FOCUS;
 exports.FormElement = FormElement;
+exports.HEAD = HEAD;
+exports.HOOKS_APP_ID = HOOKS_APP_ID;
+exports.HTML = HTML;
 exports.History = History;
+exports.ID = ID;
+exports.INPUT = INPUT;
+exports.KEY_CODE = KEY_CODE;
 exports.Location = Location;
 exports.MutationObserver = MutationObserver;
+exports.OBJECT = OBJECT;
+exports.ON_HIDE = ON_HIDE;
+exports.ON_LOAD = ON_LOAD;
+exports.ON_READY = ON_READY;
+exports.ON_SHOW = ON_SHOW;
+exports.OPTIONS = OPTIONS;
+exports.PAGE_INIT = PAGE_INIT;
+exports.PROPERTY_THRESHOLD = PROPERTY_THRESHOLD;
+exports.PROPS = PROPS;
+exports.PURE_VIEW = PURE_VIEW;
+exports.ROOT_STR = ROOT_STR;
+exports.SET_DATA = SET_DATA;
+exports.SET_TIMEOUT = SET_TIMEOUT;
+exports.STATIC_VIEW = STATIC_VIEW;
+exports.STYLE = STYLE;
 exports.SVGElement = SVGElement;
 exports.Style = Style;
+exports.TARGET = TARGET;
+exports.TARO_RUNTIME = TARO_RUNTIME;
+exports.TIME_STAMP = TIME_STAMP;
+exports.TOUCHMOVE = TOUCHMOVE;
+exports.TYPE = TYPE;
 exports.TaroElement = TaroElement;
 exports.TaroEvent = TaroEvent;
 exports.TaroNode = TaroNode;
 exports.TaroRootElement = TaroRootElement;
 exports.TaroText = TaroText;
+exports.UID = UID;
 exports.URL = URL;
 exports.URLSearchParams = URLSearchParams;
+exports.VALUE = VALUE;
+exports.VIEW = VIEW;
 exports.addLeadingSlash = addLeadingSlash;
 exports.cancelAnimationFrame = _caf;
 exports.createComponentConfig = createComponentConfig;
 exports.createEvent = createEvent;
 exports.createPageConfig = createPageConfig;
 exports.createRecursiveComponentConfig = createRecursiveComponentConfig;
+exports.env = env;
 exports.eventCenter = eventCenter;
 exports.eventHandler = eventHandler;
 exports.eventSource = eventSource;
 exports.getComputedStyle = getComputedStyle;
 exports.getCurrentInstance = getCurrentInstance;
+exports.getOnHideEventKey = getOnHideEventKey;
+exports.getOnReadyEventKey = getOnReadyEventKey;
+exports.getOnShowEventKey = getOnShowEventKey;
 exports.getPageInstance = getPageInstance;
 exports.getPath = getPath;
 exports.history = history;
 exports.hydrate = hydrate;
 exports.incrementId = incrementId;
 exports.injectPageInstance = injectPageInstance;
+exports.isHasExtractProp = isHasExtractProp;
 exports.location = location;
 exports.navigator = nav;
 exports.nextTick = nextTick;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/runtime",
-  "version": "3.7.0-canary.1",
+  "version": "3.7.0-canary.2",
   "description": "taro runtime for mini apps.",
   "main:h5": "dist/runtime.h5.js",
   "main": "dist/runtime.esm.js",
@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "lodash-es": "4.17.21",
-    "@tarojs/shared": "3.7.0-canary.1"
+    "@tarojs/shared": "3.7.0-canary.2"
   },
   "devDependencies": {
-    "@rollup/plugin-buble": "^0.21.3",
+    "@rollup/plugin-buble": "^1.0.3",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-typescript": "^11.1.0",
     "@vue/runtime-core": "3.2.41",
@@ -37,7 +37,7 @@
     "typescript": "^4.7.4"
   },
   "scripts": {
-    "prebuild": "rimraf ./dist",
+    "prebuild": "rimraf --impl=move-remove ./dist",
     "build": "pnpm run rollup",
     "dev": "pnpm run rollup --environment TARGET:esm -w",
     "rollup": "rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript --bundleConfigAsCjs",