@tarojs/runtime 4.0.0-canary.9 → 4.0.1-alpha.0

package/dist/index.cjs.js

@@ -219,6 +219,16 @@ function throttle(fn, threshold = 250, scope) {
         }
     };
 }
+function debounce(fn, ms = 250, scope) {
+    let timer;
+    return function (...args) {
+        const context = scope || this;
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+            fn.apply(context, args);
+        }, ms);
+    };
+}
 
 const eventCenter = shared.hooks.call('getEventCenter', shared.Events);
 
@@ -227,7 +237,8 @@ const env = {
     document: process.env.TARO_PLATFORM === 'web' ? document : shared.EMPTY_OBJ
 };
 
-const getComputedStyle = process.env.TARO_PLATFORM === 'web' ? env.window.getComputedStyle : function (element) {
+// Note: 小程序端 vite 打包成 commonjs，const getComputedStyle = xxx 会报错，所以把 GetComputedStyle 改为 taroGetComputedStyleProvider
+const taroGetComputedStyleProvider = process.env.TARO_PLATFORM === 'web' ? env.window.getComputedStyle : function (element) {
     return element.style;
 };
 
@@ -418,11 +429,19 @@ const URLSearchParams = process.env.TARO_PLATFORM === 'web' ? env.window.URLSear
                 for (let pairs = query.split('&'), i = 0, length = pairs.length; i < length; i++) {
                     const value = pairs[i];
                     const index = value.indexOf('=');
-                    if (index > -1) {
-                        appendTo(dict, decode(value.slice(0, index)), decode(value.slice(index + 1)));
+                    // 针对不规范的 url 参数做容错处理，如：word=你%好
+                    try {
+                        if (index > -1) {
+                            appendTo(dict, decode(value.slice(0, index)), decode(value.slice(index + 1)));
+                        }
+                        else if (value.length) {
+                            appendTo(dict, decode(value), '');
+                        }
                     }
-                    else if (value.length) {
-                        appendTo(dict, decode(value), '');
+                    catch (err) {
+                        if (process.env.NODE_ENV !== 'production') {
+                            console.warn(`[Taro warn] URL 参数 ${value} decode 异常`);
+                        }
                     }
                 }
             }
@@ -641,7 +660,8 @@ class TaroURL {
     }
 }
 _TaroURL_hash = new WeakMap(), _TaroURL_hostname = new WeakMap(), _TaroURL_pathname = new WeakMap(), _TaroURL_port = new WeakMap(), _TaroURL_protocol = new WeakMap(), _TaroURL_search = new WeakMap();
-const URL = process.env.TARO_PLATFORM === 'web' ? env.window.URL : TaroURL;
+// Note: 小程序端 vite 打包成 commonjs，const URL = xxx 会报错，所以把 URL 改为 TaroURLProvider
+const TaroURLProvider = process.env.TARO_PLATFORM === 'web' ? env.window.URL : TaroURL;
 function parseUrl(url = '') {
     const result = {
         href: '',
@@ -714,7 +734,7 @@ class TaroLocation extends shared.Events {
         super();
         _TaroLocation_instances.add(this);
         /* private property */
-        _TaroLocation_url.set(this, new URL(INIT_URL));
+        _TaroLocation_url.set(this, new TaroURLProvider(INIT_URL));
         _TaroLocation_noCheckUrl.set(this, false);
         _TaroLocation_window.set(this, void 0);
         tslib.__classPrivateFieldSet(this, _TaroLocation_window, options.window, "f");
@@ -891,7 +911,7 @@ _TaroLocation_url = new WeakMap(), _TaroLocation_noCheckUrl = new WeakMap(), _Ta
         });
         const searchStr = searchArr.length > 0 ? '?' + searchArr.join('&') : '';
         const url = `${INIT_URL}${path.startsWith('/') ? path : '/' + path}${searchStr}`;
-        tslib.__classPrivateFieldSet(this, _TaroLocation_url, new URL(url), "f");
+        tslib.__classPrivateFieldSet(this, _TaroLocation_url, new TaroURLProvider(url), "f");
         this.trigger('__reset_history__', this.href);
     }
 }, _TaroLocation_getPreValue = function _TaroLocation_getPreValue() {
@@ -974,12 +994,12 @@ exports.now = void 0;
 let lastTime = 0;
 // https://gist.github.com/paulirish/1579671
 // https://gist.github.com/jalbam/5fe05443270fa6d8136238ec72accbc0
-const _raf = typeof requestAnimationFrame !== 'undefined' && requestAnimationFrame !== null ? requestAnimationFrame : function (callback) {
+const _raf = process.env.TARO_PLATFORM === 'web' ? requestAnimationFrame : function (callback) {
     const _now = exports.now();
     const nextTime = Math.max(lastTime + 16, _now); // First time will execute it immediately but barely noticeable and performance is gained.
     return setTimeout(function () { callback(lastTime = nextTime); }, nextTime - _now);
 };
-const _caf = typeof cancelAnimationFrame !== 'undefined' && cancelAnimationFrame !== null
+const _caf = process.env.TARO_PLATFORM === 'web'
     ? cancelAnimationFrame
     : function (seed) {
         // fix https://github.com/NervJS/taro/issues/7749
@@ -992,7 +1012,7 @@ class TaroWindow extends shared.Events {
         this.navigator = nav;
         this.requestAnimationFrame = _raf;
         this.cancelAnimationFrame = _caf;
-        this.getComputedStyle = getComputedStyle;
+        this.getComputedStyle = taroGetComputedStyleProvider;
         const globalProperties = [
             ...Object.getOwnPropertyNames(global || {}),
             ...Object.getOwnPropertySymbols(global || {})
@@ -1062,9 +1082,10 @@ class TaroWindow extends shared.Events {
         return clearTimeout(...args);
     }
 }
-const window$1 = process.env.TARO_PLATFORM === 'web' ? env.window : (env.window = new TaroWindow());
-const location = window$1.location;
-const history = window$1.history;
+// Note: 小程序端 vite 打包成 commonjs，const window = xxx 会报错，所以把 window 改为 taroWindowProvider，location 和 history 同理
+const taroWindowProvider = process.env.TARO_PLATFORM === 'web' ? env.window : (env.window = new TaroWindow());
+const taroLocationProvider = taroWindowProvider.location;
+const taroHistoryProvider = taroWindowProvider.history;
 
 // export const removeLeadingSlash = (str = '') => str.replace(/^\.?\//, '')
 // export const removeTrailingSearch = (str = '') => str.replace(/\?[\s\S]*$/, '')
@@ -1081,8 +1102,8 @@ const getHomePage = (path = '', basename = '', customRoutes = {}, entryPagePath
 };
 const getCurrentPage = (routerMode = 'hash', basename = '/') => {
     const pagePath = routerMode === 'hash'
-        ? location.hash.slice(1).split('?')[0]
-        : location.pathname;
+        ? taroLocationProvider.hash.slice(1).split('?')[0]
+        : taroLocationProvider.pathname;
     return addLeadingSlash(stripBasename(pagePath, basename));
 };
 
@@ -1299,6 +1320,7 @@ function hydrate(node) {
     // 初始化 SPECIAL_NODES
     SPECIAL_NODES || (SPECIAL_NODES = shared.hooks.call('getSpecialNodes'));
     const nodeName = node.nodeName;
+    let compileModeName = null;
     if (isText(node)) {
         return {
             sid: node.sid,
@@ -1330,11 +1352,14 @@ function hydrate(node) {
             propInCamelCase !== COMPILE_MODE) {
             data[propInCamelCase] = props[prop];
         }
-        if (nodeName === VIEW && propInCamelCase === CATCHMOVE && props[prop] !== false) {
+        if (process.env.TARO_ENV !== 'swan' &&
+            nodeName === VIEW &&
+            propInCamelCase === CATCHMOVE &&
+            props[prop] !== false) {
             data["nn" /* Shortcuts.NodeName */] = CATCH_VIEW;
         }
         if (propInCamelCase === COMPILE_MODE) {
-            data["nn" /* Shortcuts.NodeName */] = props[prop];
+            compileModeName = props[prop];
         }
     }
     // Children
@@ -1358,6 +1383,9 @@ function hydrate(node) {
             }
         }
     }
+    if (compileModeName !== null) {
+        data["nn" /* Shortcuts.NodeName */] = compileModeName;
+    }
     const resData = shared.hooks.call('transferHydrateData', data, node, componentAlias);
     return resData || data;
 }
@@ -1629,7 +1657,7 @@ class TaroNode extends TaroEventTarget {
                 : [],
             nextSibling: isReplace
                 ? refChild.nextSibling /** replaceChild */
-                : (refChild || null),
+                : (refChild || null), /** insertBefore & appendChild */
             previousSibling: newChild.previousSibling
         });
         return newChild;
@@ -2953,7 +2981,7 @@ function makeMap(str, expectsLowerCase) {
     for (let i = 0; i < list.length; i++) {
         map[list[i]] = true;
     }
-    return expectsLowerCase ? val => !!map[val.toLowerCase()] : val => !!map[val];
+    return val => !!map[val.toLowerCase()] ;
 }
 const specialMiniElements = {
     img: 'image',
@@ -2963,11 +2991,11 @@ const internalCompsList = Object.keys(shared.internalComponents)
     .map(i => i.toLowerCase())
     .join(',');
 // https://developers.weixin.qq.com/miniprogram/dev/component
-const isMiniElements = makeMap(internalCompsList, true);
+const isMiniElements = makeMap(internalCompsList);
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Inline_elements
-const isInlineElements = makeMap('a,i,abbr,iframe,select,acronym,slot,small,span,bdi,kbd,strong,big,map,sub,sup,br,mark,mark,meter,template,canvas,textarea,cite,object,time,code,output,u,data,picture,tt,datalist,var,dfn,del,q,em,s,embed,samp,b', true);
+const isInlineElements = makeMap('a,i,abbr,iframe,select,acronym,slot,small,span,bdi,kbd,strong,big,map,sub,sup,br,mark,mark,meter,template,canvas,textarea,cite,object,time,code,output,u,data,picture,tt,datalist,var,dfn,del,q,em,s,embed,samp,b');
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Block-level_elements
-const isBlockElements = makeMap('address,fieldset,li,article,figcaption,main,aside,figure,nav,blockquote,footer,ol,details,form,p,dialog,h1,h2,h3,h4,h5,h6,pre,dd,header,section,div,hgroup,table,dl,hr,ul,dt', true);
+const isBlockElements = makeMap('address,fieldset,li,article,figcaption,main,aside,figure,nav,blockquote,footer,ol,details,form,p,dialog,h1,h2,h3,h4,h5,h6,pre,dd,header,section,div,hgroup,table,dl,hr,ul,dt');
 
 const closingTagAncestorBreakers = {
     li: ['ul', 'ol', 'menu'],
@@ -3264,6 +3292,7 @@ function cloneNode(isDeep = false) {
     }
     for (const key in this) {
         const value = this[key];
+        // eslint-disable-next-line valid-typeof
         if ([PROPS, DATASET].includes(key) && typeof value === OBJECT) {
             newNode[key] = Object.assign({}, value);
         }
@@ -3292,9 +3321,7 @@ function contains(node) {
     return isContains;
 }
 
-const isWeb = process.env.TARO_PLATFORM === 'web';
-const isHarmony = process.env.TARO_PLATFORM === 'harmony' || process.env.TARO_ENV === 'harmony';
-if (!isWeb && !isHarmony) {
+if (process.env.TARO_PLATFORM !== 'web' && !(process.env.TARO_PLATFORM === 'harmony' || process.env.TARO_ENV === 'harmony')) {
     if (ENABLE_INNER_HTML) {
         TaroNode.extend('innerHTML', {
             set(html) {
@@ -3352,14 +3379,15 @@ class TaroEvent {
         this.defaultPrevented = true;
     }
     get target() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const cacheTarget = this.cacheTarget;
         if (!cacheTarget) {
             const target = Object.create(((_a = this.mpEvent) === null || _a === void 0 ? void 0 : _a.target) || null);
+            const currentEle = env.document.getElementById(((_b = target.dataset) === null || _b === void 0 ? void 0 : _b.sid) || target.id || null);
             // 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 (_d = this.mpEvent) === null || _d === void 0 ? void 0 : _d.detail) {
+            const element = env.document.getElementById(((_c = target.targetDataset) === null || _c === void 0 ? void 0 : _c.sid) || ((_d = target.dataset) === null || _d === void 0 ? void 0 : _d.sid) || target.id || null);
+            target.dataset = Object.assign(Object.assign({}, (currentEle !== null ? currentEle.dataset : shared.EMPTY_OBJ)), (element !== null ? element.dataset : shared.EMPTY_OBJ));
+            for (const key in (_e = this.mpEvent) === null || _e === void 0 ? void 0 : _e.detail) {
                 target[key] = this.mpEvent.detail[key];
             }
             this.cacheTarget = target;
@@ -3495,7 +3523,7 @@ class FormElement extends TaroElement {
             else if (event.type === INPUT) {
                 // Web 规范中表单组件的 value 应该跟着输入改变
                 // 只是改 this.props.value 的话不会进行 setData，因此这里修改 this.value。
-                // 只测试了 React、Vue、Vue3 input 组件的 onInput 事件，onChange 事件不确定有没有副作用，所以暂不修改。
+                // 只测试了 React、Vue3 input 组件的 onInput 事件，onChange 事件不确定有没有副作用，所以暂不修改。
                 this.value = val;
             }
         }
@@ -3503,8 +3531,10 @@ class FormElement extends TaroElement {
     }
 }
 
+var _Performance_instances, _Performance_parseTime;
 class Performance {
     constructor() {
+        _Performance_instances.add(this);
         this.recorder = new Map();
     }
     start(id) {
@@ -3513,18 +3543,32 @@ class Performance {
         }
         this.recorder.set(id, Date.now());
     }
-    stop(id) {
+    stop(id, now = Date.now()) {
         if (!options.debug) {
             return;
         }
-        const now = Date.now();
         const prev = this.recorder.get(id);
+        if (!(prev >= 0))
+            return;
         this.recorder.delete(id);
         const time = now - prev;
         // eslint-disable-next-line no-console
-        console.log(`${id} 时长： ${time}ms`);
+        console.log(`${id} 时长： ${time}ms 开始时间：${tslib.__classPrivateFieldGet(this, _Performance_instances, "m", _Performance_parseTime).call(this, prev)} 结束时间：${tslib.__classPrivateFieldGet(this, _Performance_instances, "m", _Performance_parseTime).call(this, now)}`);
+    }
+    delayStop(id, delay = 500) {
+        if (!options.debug) {
+            return;
+        }
+        return debounce((now = Date.now(), cb) => {
+            this.stop(id, now);
+            cb === null || cb === void 0 ? void 0 : cb();
+        }, delay);
     }
 }
+_Performance_instances = new WeakSet(), _Performance_parseTime = function _Performance_parseTime(time) {
+    const d = new Date(time);
+    return `${d.getHours()}:${d.getMinutes()}:${d.getSeconds()}.${`${d.getMilliseconds()}`.padStart(3, '0')}`;
+};
 const perf = new Performance();
 
 function findCustomWrapper(root, dataPathArr) {
@@ -3880,7 +3924,8 @@ function createDocument() {
     doc.body = body;
     return doc;
 }
-const document$1 = process.env.TARO_PLATFORM === 'web' ? env.document : (env.document = createDocument());
+// Note: 小程序端 vite 打包成 commonjs，const document = xxx 会报错，所以把 document 改为 taroDocumentProvider
+const taroDocumentProvider = process.env.TARO_PLATFORM === 'web' ? env.document : (env.document = createDocument());
 
 // for Vue3
 class SVGElement extends TaroElement {
@@ -3983,7 +4028,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
             setCurrentRouter(this);
             // 初始化当前页面的上下文信息
             if (process.env.TARO_PLATFORM !== 'web') {
-                window$1.trigger(exports.CONTEXT_ACTIONS.INIT, $taroPath);
+                taroWindowProvider.trigger(exports.CONTEXT_ACTIONS.INIT, $taroPath);
             }
             const mount = () => {
                 Current.app.mount(component, $taroPath, () => {
@@ -4011,7 +4056,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
             const $taroPath = this.$taroPath;
             // 销毁当前页面的上下文信息
             if (process.env.TARO_PLATFORM !== 'web') {
-                window$1.trigger(exports.CONTEXT_ACTIONS.DESTORY, $taroPath);
+                taroWindowProvider.trigger(exports.CONTEXT_ACTIONS.DESTORY, $taroPath);
             }
             // 触发onUnload生命周期
             safeExecute($taroPath, ONUNLOAD);
@@ -4045,7 +4090,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
                 setCurrentRouter(this);
                 // 恢复上下文信息
                 if (process.env.TARO_PLATFORM !== 'web') {
-                    window$1.trigger(exports.CONTEXT_ACTIONS.RECOVER, this.$taroPath);
+                    taroWindowProvider.trigger(exports.CONTEXT_ACTIONS.RECOVER, this.$taroPath);
                 }
                 // 触发生命周期
                 safeExecute(this.$taroPath, ON_SHOW, options);
@@ -4056,7 +4101,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
         [ONHIDE]() {
             // 缓存当前页面上下文信息
             if (process.env.TARO_PLATFORM !== 'web') {
-                window$1.trigger(exports.CONTEXT_ACTIONS.RESTORE, this.$taroPath);
+                taroWindowProvider.trigger(exports.CONTEXT_ACTIONS.RESTORE, this.$taroPath);
             }
             // 设置 Current 的 page 和 router
             if (Current.page === this) {
@@ -4069,6 +4114,11 @@ function createPageConfig(component, pageName, data, pageConfig) {
             eventCenter.trigger(getOnHideEventKey(id));
         }
     };
+    if (process.env.TARO_PLATFORM === 'web') {
+        config.getOpenerEventChannel = () => {
+            return shared.EventChannel.pageChannel;
+        };
+    }
     LIFECYCLES.forEach((lifecycle) => {
         let isDefer = false;
         lifecycle = lifecycle.replace(/^defer:/, () => {
@@ -4763,7 +4813,7 @@ function handleIntersectionObserverObjectPolyfill() {
      */
     function addEvent(node, event, fn, opt_useCapture) {
         if (shared.isFunction(node.addEventListener)) {
-            node.addEventListener(event, fn, opt_useCapture || false);
+            node.addEventListener(event, fn, opt_useCapture );
         }
         else if (shared.isFunction(node.attachEvent)) {
             node.attachEvent('on' + event, fn);
@@ -4779,7 +4829,7 @@ function handleIntersectionObserverObjectPolyfill() {
      */
     function removeEvent(node, event, fn, opt_useCapture) {
         if (shared.isFunction(node.removeEventListener)) {
-            node.removeEventListener(event, fn, opt_useCapture || false);
+            node.removeEventListener(event, fn, opt_useCapture );
         }
         else if (shared.isFunction(node.detatchEvent)) {
             node.detatchEvent('on' + event, fn);
@@ -5016,11 +5066,11 @@ if (process.env.SUPPORT_TARO_POLYFILL !== 'disabled' && process.env.TARO_PLATFOR
     handlePolyfill();
 }
 
-Object.defineProperty(exports, 'Events', {
+Object.defineProperty(exports, "Events", {
   enumerable: true,
   get: function () { return shared.Events; }
 });
-Object.defineProperty(exports, 'hooks', {
+Object.defineProperty(exports, "hooks", {
   enumerable: true,
   get: function () { return shared.hooks; }
 });
@@ -5084,7 +5134,7 @@ exports.TaroNode = TaroNode;
 exports.TaroRootElement = TaroRootElement;
 exports.TaroText = TaroText;
 exports.UID = UID;
-exports.URL = URL;
+exports.URL = TaroURLProvider;
 exports.URLSearchParams = URLSearchParams;
 exports.VALUE = VALUE;
 exports.VIEW = VIEW;
@@ -5096,14 +5146,15 @@ exports.createEvent = createEvent;
 exports.createPageConfig = createPageConfig;
 exports.createRecursiveComponentConfig = createRecursiveComponentConfig;
 exports.customWrapperCache = customWrapperCache;
-exports.document = document$1;
+exports.debounce = debounce;
+exports.document = taroDocumentProvider;
 exports.env = env;
 exports.eventCenter = eventCenter;
 exports.eventHandler = eventHandler;
 exports.eventSource = eventSource;
 exports.extend = extend;
 exports.getComponentsAlias = getComponentsAlias;
-exports.getComputedStyle = getComputedStyle;
+exports.getComputedStyle = taroGetComputedStyleProvider;
 exports.getCurrentInstance = getCurrentInstance;
 exports.getCurrentPage = getCurrentPage;
 exports.getHomePage = getHomePage;
@@ -5114,7 +5165,7 @@ exports.getPageInstance = getPageInstance;
 exports.getPath = getPath;
 exports.handlePolyfill = handlePolyfill;
 exports.hasBasename = hasBasename;
-exports.history = history;
+exports.history = taroHistoryProvider;
 exports.hydrate = hydrate;
 exports.incrementId = incrementId;
 exports.injectPageInstance = injectPageInstance;
@@ -5123,11 +5174,12 @@ exports.isElement = isElement;
 exports.isHasExtractProp = isHasExtractProp;
 exports.isParentBinded = isParentBinded;
 exports.isText = isText;
-exports.location = location;
+exports.location = taroLocationProvider;
 exports.navigator = nav;
 exports.nextTick = nextTick;
 exports.options = options;
 exports.parseUrl = parseUrl;
+exports.perf = perf;
 exports.removePageInstance = removePageInstance;
 exports.requestAnimationFrame = _raf;
 exports.safeExecute = safeExecute;
@@ -5137,5 +5189,5 @@ exports.stripBasename = stripBasename;
 exports.stripSuffix = stripSuffix;
 exports.stripTrailing = stripTrailing;
 exports.throttle = throttle;
-exports.window = window$1;
+exports.window = taroWindowProvider;
 //# sourceMappingURL=index.cjs.js.map