@tarojs/runtime 4.0.7-alpha.0 → 4.0.7-alpha.2

package/dist/index.d.ts

@@ -29,6 +29,6 @@ export { nextTick } from "./next-tick.js";
 export { options } from "./options.js";
 export * from "./perf.js";
 export * from "./utils/index.js";
-export * from "./instance-3211dc5e.js";
+export * from "./instance-4c64b022.js";
 export * from "./index-26658829.js";
 export * from "./polyfill/index.js";

package/dist/runtime.esm.d.ts

@@ -68,7 +68,7 @@ interface MiniElementData {
     [Shortcuts.Class]?: string;
     [Shortcuts.Style]?: string;
     uid?: string;
-    [Shortcuts.Sid]: string;
+    sid: string;
     [key: string]: unknown;
 }
 interface MiniTextData {
@@ -163,7 +163,7 @@ interface RemoveChildOptions {
 }
 declare class TaroNode extends TaroEventTarget {
     uid: string;
-    [Shortcuts.Sid]: string;
+    sid: string;
     nodeType: NodeType;
     nodeName: string;
     parentNode: TaroNode | null;

package/dist/runtime.esm.js

@@ -113,9 +113,9 @@ class MutationObserverImpl {
         return this.records.splice(0, this.records.length);
     }
 }
-/** Match two TaroNodes by [Shortcuts.Sid]. */
+/** Match two TaroNodes by sid. */
 const sidMatches = (observerTarget, target) => {
-    return !!observerTarget && observerTarget["s" /* Shortcuts.Sid */] === (target === null || target === void 0 ? void 0 : target["s" /* Shortcuts.Sid */]);
+    return !!observerTarget && observerTarget.sid === (target === null || target === void 0 ? void 0 : target.sid);
 };
 const isConcerned = (record, options) => {
     const { characterData, characterDataOldValue, attributes, attributeOldValue, childList } = options;
@@ -1175,7 +1175,7 @@ function shortcutAttr(key) {
         case ID:
             return UID;
         case CLASS:
-            return "l" /* Shortcuts.Class */;
+            return "cl" /* Shortcuts.Class */;
         default:
             return key;
     }
@@ -1292,7 +1292,7 @@ class ClassList {
 
 class EventSource extends Map {
     removeNode(child) {
-        const { ["s" /* Shortcuts.Sid */]: sid, uid } = child;
+        const { sid, uid } = child;
         this.delete(sid);
         if (uid !== sid && uid)
             this.delete(uid);
@@ -1323,26 +1323,26 @@ function hydrate(node) {
     let compileModeName = null;
     if (isText(node)) {
         return {
-            ["s" /* Shortcuts.Sid */]: node["s" /* Shortcuts.Sid */],
+            sid: node.sid,
             ["v" /* Shortcuts.Text */]: node.nodeValue,
-            ["n" /* Shortcuts.NodeName */]: ((_a = componentsAlias[nodeName]) === null || _a === void 0 ? void 0 : _a._num) || '8'
+            ["nn" /* Shortcuts.NodeName */]: ((_a = componentsAlias[nodeName]) === null || _a === void 0 ? void 0 : _a._num) || '8'
         };
     }
     const data = {
-        ["n" /* Shortcuts.NodeName */]: nodeName,
-        ["s" /* Shortcuts.Sid */]: node["s" /* Shortcuts.Sid */]
+        ["nn" /* Shortcuts.NodeName */]: nodeName,
+        sid: node.sid
     };
-    if (node.uid !== node["s" /* Shortcuts.Sid */]) {
+    if (node.uid !== node.sid) {
         data.uid = node.uid;
     }
     if (!node.isAnyEventBinded() && SPECIAL_NODES.indexOf(nodeName) > -1) {
-        data["n" /* Shortcuts.NodeName */] = `static-${nodeName}`;
+        data["nn" /* Shortcuts.NodeName */] = `static-${nodeName}`;
         if (nodeName === VIEW && !isHasExtractProp(node)) {
-            data["n" /* Shortcuts.NodeName */] = PURE_VIEW;
+            data["nn" /* Shortcuts.NodeName */] = PURE_VIEW;
         }
     }
     if (nodeName === VIEW && node.isOnlyClickBinded()) {
-        data["n" /* Shortcuts.NodeName */] = CLICK_VIEW;
+        data["nn" /* Shortcuts.NodeName */] = CLICK_VIEW;
     }
     const { props } = node;
     for (const prop in props) {
@@ -1359,26 +1359,26 @@ function hydrate(node) {
             nodeName === VIEW &&
             propInCamelCase === CATCHMOVE &&
             props[prop] !== false) {
-            data["n" /* Shortcuts.NodeName */] = CATCH_VIEW;
+            data["nn" /* Shortcuts.NodeName */] = CATCH_VIEW;
         }
         if (propInCamelCase === COMPILE_MODE) {
             compileModeName = props[prop];
         }
     }
     // Children
-    data["c" /* Shortcuts.Childnodes */] = node.childNodes.filter(node => !isComment(node)).map(hydrate);
+    data["cn" /* Shortcuts.Childnodes */] = node.childNodes.filter(node => !isComment(node)).map(hydrate);
     if (node.className !== '') {
-        data["l" /* Shortcuts.Class */] = node.className;
+        data["cl" /* Shortcuts.Class */] = node.className;
     }
     const cssText = node.cssText;
     if (cssText !== '' && nodeName !== 'swiper-item') {
         data["st" /* Shortcuts.Style */] = cssText;
     }
     hooks.call('modifyHydrateData', data, node);
-    const n = data["n" /* Shortcuts.NodeName */];
-    const componentAlias = componentsAlias[n];
+    const nn = data["nn" /* Shortcuts.NodeName */];
+    const componentAlias = componentsAlias[nn];
     if (componentAlias) {
-        data["n" /* Shortcuts.NodeName */] = componentAlias._num;
+        data["nn" /* Shortcuts.NodeName */] = componentAlias._num;
         for (const prop in data) {
             if (prop in componentAlias) {
                 data[componentAlias[prop]] = data[prop];
@@ -1387,7 +1387,7 @@ function hydrate(node) {
         }
     }
     if (compileModeName !== null) {
-        data["n" /* Shortcuts.NodeName */] = compileModeName;
+        data["nn" /* Shortcuts.NodeName */] = compileModeName;
     }
     const resData = hooks.call('transferHydrateData', data, node, componentAlias);
     return resData || data;
@@ -1472,7 +1472,7 @@ class TaroEventTarget {
     }
 }
 
-const CHILDNODES = "c" /* Shortcuts.Childnodes */;
+const CHILDNODES = "cn" /* Shortcuts.Childnodes */;
 const nodeId = incrementId();
 class TaroNode extends TaroEventTarget {
     constructor() {
@@ -1481,8 +1481,8 @@ class TaroNode extends TaroEventTarget {
         this.childNodes = [];
         this.hydrate = (node) => () => hydrate(node);
         this.uid = '_' + nodeId(); // dom 节点 id，开发者可修改
-        this["s" /* Shortcuts.Sid */] = this.uid; // dom 节点全局唯一 id，不可被修改
-        eventSource.set(this["s" /* Shortcuts.Sid */], this);
+        this.sid = this.uid; // dom 节点全局唯一 id，不可被修改
+        eventSource.set(this.sid, this);
     }
     updateChildNodes(isClean) {
         const cleanChildNodes = () => [];
@@ -1637,13 +1637,13 @@ class TaroNode extends TaroEventTarget {
                 // insertBefore 有两种更新模式
                 // 比方说有 A B C 三个节点，现在要在 C 前插入 D
                 // 1. 插入 D，然后更新整个父节点的 childNodes 数组
-                // setData({ c: [A, B, D, C] })
+                // setData({ cn: [A, B, D, C] })
                 // 2. 插入 D，然后更新 D 以及 D 之后每个节点的数据
                 // setData ({
-                //   c.[2]: D,
-                //   c.[3]: C,
+                //   cn.[2]: D,
+                //   cn.[3]: C,
                 // })
-                // 由于微信解析 ’c.[2]‘ 这些路径的时候也需要消耗时间，
+                // 由于微信解析 ’cn.[2]‘ 这些路径的时候也需要消耗时间，
                 // 所以根据 insertBefore 插入的位置来做不同的处理
                 const mark = childNodesLength * 2 / 3;
                 if (mark > index) {
@@ -2231,8 +2231,8 @@ class TaroElement extends TaroNode {
                 this.style.cssText = value;
                 break;
             case ID:
-                if (this.uid !== this["s" /* Shortcuts.Sid */]) {
-                    // eventSource[Shortcuts.Sid] 永远保留，直到组件卸载
+                if (this.uid !== this.sid) {
+                    // eventSource[sid] 永远保留，直到组件卸载
                     // eventSource[uid] 可变
                     eventSource.delete(this.uid);
                 }
@@ -2276,14 +2276,14 @@ class TaroElement extends TaroNode {
                 // catchMove = true: catch-view
                 // catchMove = false: view or static-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
                     value: value ? catchViewAlias : (this.isAnyEventBinded() ? viewAlias : staticViewAlias)
                 });
             }
             else if (isPureView && isHasExtractProp(this)) {
                 // pure-view => static-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
                     value: staticViewAlias
                 });
             }
@@ -2335,14 +2335,14 @@ class TaroElement extends TaroNode {
             if (qualifiedNameInCamelCase === CATCHMOVE) {
                 // catch-view => view or static-view or pure-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
                     value: this.isAnyEventBinded() ? viewAlias : (isHasExtractProp(this) ? staticViewAlias : pureViewAlias)
                 });
             }
             else if (isStaticView && !isHasExtractProp(this)) {
                 // static-view => pure-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
                     value: pureViewAlias
                 });
             }
@@ -2411,7 +2411,7 @@ class TaroElement extends TaroNode {
             const componentsAlias = getComponentsAlias();
             const alias = componentsAlias[name]._num;
             this.enqueueUpdate({
-                path: `${this._path}.${"n" /* Shortcuts.NodeName */}`,
+                path: `${this._path}.${"nn" /* Shortcuts.NodeName */}`,
                 value: alias
             });
         }
@@ -2427,7 +2427,7 @@ class TaroElement extends TaroNode {
             const value = isHasExtractProp(this) ? `static-${name}` : `pure-${name}`;
             const valueAlias = componentsAlias[value]._num;
             this.enqueueUpdate({
-                path: `${this._path}.${"n" /* Shortcuts.NodeName */}`,
+                path: `${this._path}.${"nn" /* Shortcuts.NodeName */}`,
                 value: valueAlias
             });
         }
@@ -3391,9 +3391,9 @@ class TaroEvent {
         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["s" /* Shortcuts.Sid */]) || target.id || 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(((_c = target.targetDataset) === null || _c === void 0 ? void 0 : _c["s" /* Shortcuts.Sid */]) || ((_d = target.dataset) === null || _d === void 0 ? void 0 : _d["s" /* Shortcuts.Sid */]) || target.id || null);
+            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 : EMPTY_OBJ)), (element !== null ? element.dataset : EMPTY_OBJ));
             for (const key in (_e = this.mpEvent) === null || _e === void 0 ? void 0 : _e.detail) {
                 target[key] = this.mpEvent.detail[key];
@@ -3411,8 +3411,8 @@ class TaroEvent {
         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(((_b = currentTarget.dataset) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.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["s" /* Shortcuts.Sid */]) || ((_g = (_f = this.mpEvent) === null || _f === void 0 ? void 0 : _f.target) === null || _g === void 0 ? void 0 : _g.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;
@@ -3470,7 +3470,7 @@ function eventHandler(event) {
     event.currentTarget = event.currentTarget || event.target || Object.assign({}, event);
     hooks.call('modifyMpEventImpl', event);
     const currentTarget = event.currentTarget;
-    const id = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a["s" /* Shortcuts.Sid */] /** sid */) || currentTarget.id /** uid */ || ((_b = event.detail) === null || _b === void 0 ? void 0 : _b.id) || '';
+    const id = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a.sid /** sid */) || currentTarget.id /** uid */ || ((_b = event.detail) === null || _b === void 0 ? void 0 : _b.id) || '';
     const node = env.document.getElementById(id);
     if (node) {
         const dispatch = () => {
@@ -3580,7 +3580,7 @@ _Performance_instances = new WeakSet(), _Performance_parseTime = function _Perfo
 const perf = new Performance();
 
 function findCustomWrapper(root, dataPathArr) {
-    // ['root', 'c', '[0]'] remove 'root' => ['c', '[0]']
+    // ['root', 'cn', '[0]'] remove 'root' => ['cn', '[0]']
     const list = dataPathArr.slice(1);
     let currentData = root;
     let customWrapper;
@@ -3589,8 +3589,8 @@ function findCustomWrapper(root, dataPathArr) {
         const key = item
             // '[0]' => '0'
             .replace(/^\[(.+)\]$/, '$1')
-            // 'c' => 'Shortcuts.Childnodes'
-            .replace(/\bc\b/g, 'childNodes');
+            // 'cn' => 'childNodes'
+            .replace(/\bcn\b/g, 'childNodes');
         currentData = currentData[key];
         if (isArray(currentData)) {
             currentData = currentData.filter(el => !isComment(el));
@@ -3598,7 +3598,7 @@ function findCustomWrapper(root, dataPathArr) {
         if (isUndefined(currentData))
             return true;
         if (currentData.nodeName === CUSTOM_WRAPPER) {
-            const res = customWrapperCache.get(currentData["s" /* Shortcuts.Sid */]);
+            const res = customWrapperCache.get(currentData.sid);
             if (res) {
                 customWrapper = res;
                 splitedPath = dataPathArr.slice(i + 2).join('.');
@@ -3656,11 +3656,11 @@ class TaroRootElement extends TaroElement {
             perf.start(setDataMark);
             const data = Object.create(null);
             const resetPaths = new Set(initRender
-                ? [`root.${"c" /* Shortcuts.Childnodes */}.[0]`, `root.${"c" /* Shortcuts.Childnodes */}[0]`]
+                ? ['root.cn.[0]', 'root.cn[0]']
                 : []);
             while (this.updatePayloads.length > 0) {
                 const { path, value } = this.updatePayloads.shift();
-                if (path.endsWith("c" /* Shortcuts.Childnodes */)) {
+                if (path.endsWith("cn" /* Shortcuts.Childnodes */)) {
                     resetPaths.add(path);
                 }
                 data[path] = value;
@@ -4235,7 +4235,7 @@ function createRecursiveComponentConfig(componentName) {
         ? {
             [ATTACHED]() {
                 var _a, _b;
-                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a["s" /* Shortcuts.Sid */]) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.Sid */]);
+                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a.sid) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b.sid);
                 if (isString(componentId)) {
                     customWrapperCache.set(componentId, this);
                     const el = env.document.getElementById(componentId);
@@ -4246,7 +4246,7 @@ function createRecursiveComponentConfig(componentName) {
             },
             [DETACHED]() {
                 var _a, _b;
-                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a["s" /* Shortcuts.Sid */]) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.Sid */]);
+                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a.sid) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b.sid);
                 if (isString(componentId)) {
                     customWrapperCache.delete(componentId);
                     const el = env.document.getElementById(componentId);
@@ -4261,7 +4261,7 @@ function createRecursiveComponentConfig(componentName) {
             i: {
                 type: Object,
                 value: {
-                    ["n" /* Shortcuts.NodeName */]: getComponentsAlias$1(internalComponents)[VIEW]._num
+                    ["nn" /* Shortcuts.NodeName */]: getComponentsAlias$1(internalComponents)[VIEW]._num
                 }
             },
             l: {