@tarojs/runtime 3.7.0-alpha.2 → 3.7.0-alpha.3

package/dist/runtime.esm.d.ts

@@ -6,17 +6,19 @@ import { Component as Vue3Component } from "@vue/runtime-core";
 import { Component, ComponentClass } from "react";
 import { CombinedVueInstance } from "vue/types/vue";
 declare let document: any;
-declare class ClassList extends Set<string> {
+declare class ClassList {
     private el;
+    private tokenList;
     constructor(className: string, el: TaroElement);
     get value(): string;
-    add(s: string): this;
     get length(): number;
-    remove(s: string): void;
-    toggle(s: string): void;
-    replace(s1: string, s2: string): void;
-    contains(s: string): boolean;
+    add(): void;
+    remove(): void;
+    contains(token: string): boolean;
+    toggle(token: string, force: boolean): boolean;
+    replace(token: string, replacement_token: string): void;
     toString(): string;
+    private checkTokenIsValid;
     private _update;
 }
 interface Attributes {
@@ -129,6 +131,8 @@ declare function createEvent(event: MpEvent | string, node?: TaroElement): TaroE
 // 小程序的事件代理回调函数
 declare function eventHandler(event: MpEvent): any;
 declare class FormElement extends TaroElement {
+    get type(): string;
+    set type(val: string);
     get value(): string | boolean | number | any[];
     set value(val: string | boolean | number | any[]);
     dispatchEvent(event: TaroEvent): boolean;
@@ -405,7 +409,7 @@ declare class History extends Events {
     constructor(location: LocationType.Location, options: Options$0);
     /* public property */
     get length(): number;
-    get state(): HistoryState;
+    get state(): Record<string, any> | null;
     /* public method */
     go(delta: number): void;
     back(): void;
@@ -578,7 +582,7 @@ declare class MutationObserver {
     takeRecords(): MutationRecord[];
     static record(record: MutationRecord): void;
 }
-interface Instance<T> extends Component<T>, Show, PageInstance {
+interface Instance<T = Record<string, any>> extends Component<T>, Show, PageInstance {
     tid?: string;
     $forceUpdate?(): void;
     $nextTick?(cb: () => void): void;
@@ -587,7 +591,7 @@ interface Instance<T> extends Component<T>, Show, PageInstance {
 interface VueAppInstance extends ComponentOptions<VueCtor> {
     $options: AppInstance;
 }
-type VueInstance<M, P> = CombinedVueInstance<VueCtor, Record<string, any>, M, P, Record<never, any>> & VueInternal;
+type VueInstance<M = Record<string, any>, P = Record<string, any>> = CombinedVueInstance<VueCtor, Record<string, any>, M, P, Record<never, any>> & VueInternal;
 interface VueInternal {
     _render(): VNode;
     _update(vnode: VNode, hyrate: boolean): void;
@@ -595,13 +599,13 @@ interface VueInternal {
 interface PageProps {
     tid?: string;
 }
-interface ReactPageComponent<T> extends ComponentClass<T>, PageInstance {
+interface ReactPageComponent<T = PageProps> extends ComponentClass<T>, PageInstance {
 }
-interface ReactPageInstance<T> extends Component<T>, PageInstance {
+interface ReactPageInstance<T = PageProps> extends Component<T>, PageInstance {
     componentDidShow?(): void;
     componentDidHide?(): void;
 }
-interface ReactAppInstance<T> extends Component<T>, AppInstance {
+interface ReactAppInstance<T = AppInstance> extends Component<T>, AppInstance {
 }
 interface PageLifeCycle extends Show {
     eh?(event: MpEvent): void;
@@ -639,6 +643,8 @@ interface PageInstance extends PageLifeCycle {
     path?: string;
     /** 页面的组件选项 */
     options?: Record<string, unknown>;
+    /** 页面渲染引擎类型 */
+    renderer?: "webview" | "skyline";
 }
 interface Show {
     componentDidShow?(): void;
@@ -686,6 +692,7 @@ declare function removePageInstance(id: string): void;
 declare function addLeadingSlash(path?: string): string;
 declare function safeExecute(path: string, lifecycle: string, ...args: unknown[]): any;
 declare function stringify(obj?: Record<string, unknown>): string;
+declare function getPath(id: string, options?: Record<string, unknown>): string;
 declare function createPageConfig(component: any, pageName?: string, data?: Record<string, unknown>, pageConfig?: PageConfig): PageInstance;
 declare function createComponentConfig(component: React.ComponentClass, componentName?: string, data?: Record<string, unknown>): any;
 declare function createRecursiveComponentConfig(componentName?: string): any;
@@ -700,4 +707,4 @@ declare const nextTick: (cb: Func, ctx?: Record<string, any>) => void;
 declare const options: Options;
 declare const incrementId: () => () => string;
 export { hooks } from '@tarojs/shared';
-export { document, getComputedStyle, History, Location, nav as navigator, _caf as cancelAnimationFrame, now, _raf as requestAnimationFrame, parseUrl, URL, URLSearchParams, history, location, window, TaroElement, createEvent, eventHandler, TaroEvent, FormElement, TaroNode, TaroRootElement, Style, SVGElement, TaroText, MutationObserver, Current, getCurrentInstance, eventSource, addLeadingSlash, createComponentConfig, createPageConfig, createRecursiveComponentConfig, getPageInstance, injectPageInstance, removePageInstance, safeExecute, stringify, EventsType, eventCenter, Events, hydrate, nextTick, options, incrementId, Instance, VueAppInstance, VueInstance, PageProps, ReactPageComponent, ReactPageInstance, ReactAppInstance, PageLifeCycle, PageInstance, AppInstance, Attributes, EventOptions, MpEvent, EventListenerOptions, AddEventListenerOptions, EventHandler, MpInstance, MiniElementData, MiniData, HydratedData, UpdatePayloadValue, DataTree, UpdatePayload, Options$0 as Options, Func, Ctx };
+export { document, getComputedStyle, History, Location, nav as navigator, _caf as cancelAnimationFrame, now, _raf as requestAnimationFrame, parseUrl, URL, URLSearchParams, history, location, window, TaroElement, createEvent, eventHandler, TaroEvent, FormElement, TaroNode, TaroRootElement, Style, SVGElement, TaroText, MutationObserver, Current, getCurrentInstance, eventSource, addLeadingSlash, createComponentConfig, createPageConfig, createRecursiveComponentConfig, getPageInstance, getPath, injectPageInstance, removePageInstance, safeExecute, stringify, EventsType, eventCenter, Events, hydrate, nextTick, options, incrementId, Instance, VueAppInstance, VueInstance, PageProps, ReactPageComponent, ReactPageInstance, ReactAppInstance, PageLifeCycle, PageInstance, AppInstance, Attributes, EventOptions, MpEvent, EventListenerOptions, AddEventListenerOptions, EventHandler, MpInstance, MiniElementData, MiniData, HydratedData, UpdatePayloadValue, DataTree, UpdatePayload, Options$0 as Options, Func, Ctx };

package/dist/runtime.esm.js

@@ -283,46 +283,90 @@ function getComponentsAlias() {
     return componentsAlias$1;
 }
 
-class ClassList extends Set {
+class ClassList {
     constructor(className, el) {
-        super();
-        className.trim().split(/\s+/).forEach(super.add.bind(this));
+        this.tokenList = [];
         this.el = el;
+        className.trim().split(/\s+/).forEach(token => this.tokenList.push(token));
     }
     get value() {
-        return [...this].filter(v => v !== '').join(' ');
-    }
-    add(s) {
-        super.add(s);
-        this._update();
-        return this;
+        return this.toString();
     }
     get length() {
-        return this.size;
+        return this.tokenList.length;
+    }
+    add() {
+        let index = 0;
+        let updated = false;
+        const tokens = arguments;
+        const length = tokens.length;
+        const tokenList = this.tokenList;
+        do {
+            const token = tokens[index];
+            if (this.checkTokenIsValid(token) && !~tokenList.indexOf(token)) {
+                tokenList.push(token);
+                updated = true;
+            }
+        } while (++index < length);
+        if (updated) {
+            this._update();
+        }
+    }
+    remove() {
+        let i = 0;
+        let updated = false;
+        const tokens = arguments;
+        const length = tokens.length;
+        const tokenList = this.tokenList;
+        do {
+            const token = tokens[i] + '';
+            if (!this.checkTokenIsValid(token))
+                continue;
+            const index = tokenList.indexOf(token);
+            if (~tokenList.indexOf(token)) {
+                tokenList.splice(index, 1);
+                updated = true;
+            }
+        } while (++i < length);
+        if (updated) {
+            this._update();
+        }
     }
-    remove(s) {
-        super.delete(s);
-        this._update();
+    contains(token) {
+        if (!this.checkTokenIsValid(token))
+            return false;
+        return !!~this.tokenList.indexOf(token);
     }
-    toggle(s) {
-        if (super.has(s)) {
-            super.delete(s);
+    toggle(token, force) {
+        const result = this.contains(token);
+        const method = result ? force !== true && 'remove' : force !== false && 'add';
+        if (method) {
+            // @ts-ignore
+            this[method](token);
+        }
+        if (force === true || force === false) {
+            return force;
         }
         else {
-            super.add(s);
+            return !result;
         }
-        this._update();
-    }
-    replace(s1, s2) {
-        super.delete(s1);
-        super.add(s2);
-        this._update();
     }
-    contains(s) {
-        return super.has(s);
+    replace(token, replacement_token) {
+        if (!this.checkTokenIsValid(token) || !this.checkTokenIsValid(replacement_token))
+            return;
+        const index = this.tokenList.indexOf(token);
+        if (~index) {
+            this.tokenList.splice(index, 1, replacement_token);
+            this._update();
+        }
     }
     toString() {
-        return this.value;
+        return this.tokenList.filter(v => v !== '').join(' ');
+    }
+    checkTokenIsValid(token) {
+        if (token === '' || /\s/.test(token))
+            return false;
+        return true;
     }
     _update() {
         this.el.className = this.value;
@@ -803,7 +847,8 @@ const styleProperties = [
     'widows',
     'width',
     'zIndex',
-    'pointerEvents'
+    'pointerEvents',
+    'aspectRatio'
     /** 非常用 style */
     // 'azimuth',
     // 'backfaceVisibility',
@@ -971,10 +1016,12 @@ function setStyle(newVal, styleKey) {
     }
     !this._pending && enqueueUpdate(this);
 }
-function initStyle(ctor) {
+function initStyle(ctor, styleProperties) {
     const properties = {};
     for (let i = 0; i < styleProperties.length; i++) {
         const styleKey = styleProperties[i];
+        if (ctor[styleKey])
+            return;
         properties[styleKey] = {
             get() {
                 const val = this._value[styleKey];
@@ -1085,7 +1132,17 @@ class Style {
         return value;
     }
 }
-initStyle(Style);
+initStyle(Style, styleProperties);
+hooks.tap('injectNewStyleProperties', (newStyleProperties) => {
+    if (isArray(newStyleProperties)) {
+        initStyle(Style, newStyleProperties);
+    }
+    else {
+        if (typeof newStyleProperties !== 'string')
+            return;
+        initStyle(Style, [newStyleProperties]);
+    }
+});
 
 function returnTrue() {
     return true;
@@ -1104,7 +1161,9 @@ function treeToArray(root, predict) {
 }
 function following(el, root) {
     const firstChild = el.firstChild;
-    if (firstChild) {
+    const isElmentTypeValid = el.nodeType === 1 /* NodeType.ELEMENT_NODE */ || el.nodeType === 9 /* NodeType.DOCUMENT_NODE */;
+    // 如果当前 el 不是 element 或 document 元素，则可以直接不递归他的子元素了
+    if (firstChild && isElmentTypeValid) {
         return firstChild;
     }
     let current = el;
@@ -1345,10 +1404,10 @@ class TaroElement extends TaroNode {
         });
     }
     getElementsByClassName(className) {
+        const classNames = className.trim().split(/\s+/);
         return treeToArray(this, (el) => {
             const classList = el.classList;
-            const classNames = className.trim().split(/\s+/);
-            return classNames.every(c => classList.has(c));
+            return classNames.every(c => classList.contains(c));
         });
     }
     dispatchEvent(event) {
@@ -2458,7 +2517,8 @@ function eventHandler(event) {
         const dispatch = () => {
             const e = createEvent(event, node);
             hooks.call('modifyTaroEvent', e, node);
-            node.dispatchEvent(e);
+            hooks.call('dispatchTaroEvent', e, node);
+            hooks.call('dispatchTaroEventFinish', e, node);
         };
         if (hooks.isExist('batchedEventUpdates')) {
             const type = event.type;
@@ -2488,6 +2548,13 @@ function eventHandler(event) {
 }
 
 class FormElement extends TaroElement {
+    get type() {
+        var _a;
+        return (_a = this.props[TYPE]) !== null && _a !== void 0 ? _a : '';
+    }
+    set type(val) {
+        this.setAttribute(TYPE, val);
+    }
     get value() {
         // eslint-disable-next-line dot-notation
         const val = this.props[VALUE];
@@ -2594,7 +2661,7 @@ class TaroRootElement extends TaroElement {
     }
     performUpdate(initRender = false, prerender) {
         this.pendingUpdate = true;
-        const ctx = this.ctx;
+        const ctx = hooks.call('proxyToRaw', this.ctx);
         setTimeout(() => {
             const setDataMark = `${SET_DATA} 开始时间戳 ${Date.now()}`;
             perf.start(setDataMark);
@@ -2747,6 +2814,8 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
+/* global Reflect, Promise */
+
 
 function __classPrivateFieldGet(receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
@@ -2879,6 +2948,12 @@ _URLSearchParams_dict = new WeakMap();
 
 var _URL_hash, _URL_hostname, _URL_pathname, _URL_port, _URL_protocol, _URL_search;
 class URL {
+    static createObjectURL() {
+        throw new Error('Oops, not support URL.createObjectURL() in miniprogram.');
+    }
+    static revokeObjectURL() {
+        throw new Error('Oops, not support URL.revokeObjectURL() in miniprogram.');
+    }
     constructor(url, base) {
         /* private property */
         _URL_hash.set(this, '');
@@ -2898,12 +2973,6 @@ class URL {
         __classPrivateFieldSet(this, _URL_protocol, protocol, "f");
         __classPrivateFieldSet(this, _URL_search, new URLSearchParams(search), "f");
     }
-    static createObjectURL() {
-        throw new Error('Oops, not support URL.createObjectURL() in miniprogram.');
-    }
-    static revokeObjectURL() {
-        throw new Error('Oops, not support URL.revokeObjectURL() in miniprogram.');
-    }
     /* public property */
     get protocol() {
         return __classPrivateFieldGet(this, _URL_protocol, "f");
@@ -3333,7 +3402,7 @@ class History extends Events {
         return __classPrivateFieldGet(this, _History_stack, "f").length;
     }
     get state() {
-        return __classPrivateFieldGet(this, _History_stack, "f")[__classPrivateFieldGet(this, _History_cur, "f")];
+        return __classPrivateFieldGet(this, _History_stack, "f")[__classPrivateFieldGet(this, _History_cur, "f")].state;
     }
     /* public method */
     go(delta) {
@@ -3829,7 +3898,7 @@ function getOnHideEventKey(path) {
 function createPageConfig(component, pageName, data, pageConfig) {
     // 小程序 Page 构造器是一个傲娇小公主，不能把复杂的对象挂载到参数上
     const id = pageName !== null && pageName !== void 0 ? pageName : `taro_page_${pageId()}`;
-    const [ONLOAD, ONUNLOAD, ONREADY, ONSHOW, ONHIDE, LIFECYCLES, SIDE_EFFECT_LIFECYCLES] = hooks.call('getMiniLifecycleImpl').page;
+    const [ONLOAD, ONUNLOAD, ONREADY, ONSHOW, ONHIDE, LIFECYCLES, SIDE_EFFECT_LIFECYCLES,] = hooks.call('getMiniLifecycleImpl').page;
     let pageElement = null;
     let unmounting = false;
     let prepareMountList = [];
@@ -3964,7 +4033,8 @@ function createPageConfig(component, pageName, data, pageConfig) {
         var _a;
         if (component[lifecycle] ||
             ((_a = component.prototype) === null || _a === void 0 ? void 0 : _a[lifecycle]) ||
-            component[lifecycle.replace(/^on/, 'enable')]) {
+            component[lifecycle.replace(/^on/, 'enable')] ||
+            (pageConfig === null || pageConfig === void 0 ? void 0 : pageConfig[lifecycle.replace(/^on/, 'enable')])) {
             config[lifecycle] = function (...args) {
                 var _a;
                 const target = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.target;
@@ -4076,18 +4146,27 @@ function createRecursiveComponentConfig(componentName) {
         } }, lifeCycles);
 }
 
+const TIMEOUT = 100;
 const nextTick = (cb, ctx) => {
-    var _a, _b, _c;
+    const beginTime = Date.now();
     const router = Current.router;
     const timerFunc = () => {
         setTimeout(function () {
             ctx ? cb.call(ctx) : cb();
         }, 1);
     };
-    if (router !== null) {
-        let pageElement = null;
-        const path = router.$taroPath;
-        pageElement = env.document.getElementById(path);
+    if (router === null)
+        return timerFunc();
+    const path = router.$taroPath;
+    /**
+     * 三种情况
+     *   1. 调用 nextTick 时，pendingUpdate 已经从 true 变为 false（即已更新完成），那么需要光等 100ms
+     *   2. 调用 nextTick 时，pendingUpdate 为 true，那么刚好可以搭上便车
+     *   3. 调用 nextTick 时，pendingUpdate 还是 false，框架仍未启动更新逻辑，这时最多轮询 100ms，等待 pendingUpdate 变为 true。
+     */
+    function next() {
+        var _a, _b, _c;
+        const pageElement = env.document.getElementById(path);
         if (pageElement === null || pageElement === void 0 ? void 0 : pageElement.pendingUpdate) {
             if (isWebPlatform()) {
                 // eslint-disable-next-line dot-notation
@@ -4099,14 +4178,15 @@ const nextTick = (cb, ctx) => {
                 pageElement.enqueueUpdateCallback(cb, ctx);
             }
         }
-        else {
+        else if (Date.now() - beginTime > TIMEOUT) {
             timerFunc();
         }
+        else {
+            setTimeout(() => next(), 20);
+        }
     }
-    else {
-        timerFunc();
-    }
+    next();
 };
 
-export { Current, FormElement, History, Location, MutationObserver, SVGElement, Style, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, URL, URLSearchParams, addLeadingSlash, _caf as cancelAnimationFrame, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, document$1 as document, eventCenter, eventHandler, eventSource, getComputedStyle, getCurrentInstance, getPageInstance, history, hydrate, incrementId, injectPageInstance, location, nav as navigator, nextTick, now, options, parseUrl, removePageInstance, _raf as requestAnimationFrame, safeExecute, stringify, window$1 as window };
+export { Current, FormElement, History, Location, MutationObserver, SVGElement, Style, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, URL, URLSearchParams, addLeadingSlash, _caf as cancelAnimationFrame, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, document$1 as document, eventCenter, eventHandler, eventSource, getComputedStyle, getCurrentInstance, getPageInstance, getPath, history, hydrate, incrementId, injectPageInstance, location, nav as navigator, nextTick, now, options, parseUrl, removePageInstance, _raf as requestAnimationFrame, safeExecute, stringify, window$1 as window };
 //# sourceMappingURL=runtime.esm.js.map