@tarojs/shared 4.0.6-alpha.0 → 4.0.7-alpha.0

package/dist/template.js

@@ -310,6 +310,7 @@ const voidElements = new Set([
 const nestElements = new Map([
     ['view', -1],
     ['catch-view', -1],
+    ['click-view', -1],
     ['cover-view', -1],
     ['static-view', -1],
     ['pure-view', -1],
@@ -342,14 +343,15 @@ function isBooleanStringLiteral(o) {
 exports.Shortcuts = void 0;
 (function (Shortcuts) {
     Shortcuts["Container"] = "container";
-    Shortcuts["Childnodes"] = "cn";
+    Shortcuts["Childnodes"] = "c";
     Shortcuts["Text"] = "v";
     Shortcuts["NodeType"] = "nt";
-    Shortcuts["NodeName"] = "nn";
+    Shortcuts["NodeName"] = "n";
     // Attrtibutes
     Shortcuts["Style"] = "st";
-    Shortcuts["Class"] = "cl";
+    Shortcuts["Class"] = "l";
     Shortcuts["Src"] = "src";
+    Shortcuts["Sid"] = "s";
 })(exports.Shortcuts || (exports.Shortcuts = {}));
 
 var PLATFORM_TYPE;
@@ -682,12 +684,13 @@ function getComponentsAlias(origin) {
         StaticImage: origin.Image,
         StaticText: origin.Text,
         PureView: viewAttrs,
-        CatchView: viewAttrs
+        CatchView: viewAttrs,
+        ClickView: viewAttrs,
     };
     origin = Object.assign(Object.assign({}, origin), extraList);
     Object.keys(origin)
         .sort((a, b) => {
-        const reg = /^(Static|Pure|Catch)*(View|Image|Text)$/;
+        const reg = /^(Static|Pure|Catch|Click)*(View|Image|Text)$/;
         const isACommonly = reg.test(a);
         const isBCommonly = reg.test(b);
         if (isACommonly && isBCommonly) {
@@ -741,7 +744,7 @@ function indent(str, size) {
 */
 const styles = {
     style: `i.${"st" /* Shortcuts.Style */}`,
-    class: `i.${"cl" /* Shortcuts.Class */}`
+    class: `i.${"l" /* Shortcuts.Class */}`
 };
 const events = {
     bindtap: 'eh'
@@ -760,6 +763,7 @@ const weixinAdapter = {
 class BaseTemplate {
     constructor() {
         this._baseLevel = 0;
+        this._isUseXS = true;
         this.exportExpr = 'module.exports =';
         this.thirdPartyPatcher = {};
         this.supportXS = false;
@@ -779,29 +783,26 @@ class BaseTemplate {
             return template;
         };
         this.buildBaseComponentTemplate = (ext) => {
-            const data = !this.isSupportRecursive && this.supportXS
-                ? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${"nn" /* Shortcuts.NodeName */})`)
+            const data = !this.isSupportRecursive && this.isUseXS
+                ? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${"n" /* Shortcuts.NodeName */})`)
                 : this.isSupportRecursive
                     ? this.dataKeymap('i:i')
                     : this.dataKeymap('i:i,c:1');
             // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
             return `<import src="./base${ext}" />
-${this.buildXsTemplate()}
-<template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`;
+${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + i.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" />`;
         };
         this.buildCustomComponentTemplate = (ext) => {
             const Adapter = this.Adapter;
-            const data = !this.isSupportRecursive && this.supportXS
-                ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"nn" /* Shortcuts.NodeName */})`)}`
+            const data = !this.isSupportRecursive && this.isUseXS
+                ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"n" /* Shortcuts.NodeName */})`)}`
                 : this.isSupportRecursive
                     ? this.dataKeymap('i:item')
                     : this.dataKeymap('i:item,c:1');
             // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
             return `<import src="./base${ext}" />
-  ${this.buildXsTemplate()}
-  <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
-    <template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
-  </block>`;
+${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${Adapter.for}="{{i.${"c" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"s" /* Shortcuts.Sid */}" />
+`;
         };
         this.buildXScript = () => {
             return `${this.exportExpr} {
@@ -809,7 +810,7 @@ ${this.buildXsTemplate()}
   b: function (a, b) {
     return a === undefined ? b : a
   },
-  c: ${this.buildXSTepFocus("nn" /* Shortcuts.NodeName */)},
+  c: ${this.buildXSTepFocus("n" /* Shortcuts.NodeName */)},
   e: function (n) {
     return 'tmpl_' + n + '_${"container" /* Shortcuts.Container */}'
   },
@@ -823,6 +824,12 @@ ${this.buildXsTemplate()}
     get baseLevel() {
         return this._baseLevel;
     }
+    set isUseXS(isUse) {
+        this._isUseXS = this.supportXS && isUse;
+    }
+    get isUseXS() {
+        return this._isUseXS;
+    }
     buildAttribute(attrs, nodeName) {
         return Object.keys(attrs)
             .map(k => `${k}="${k.startsWith('bind') || k.startsWith('on') || k.startsWith('catch') ? attrs[k] : `{${this.getAttrValue(attrs[k], k, nodeName)}}`}" `)
@@ -862,7 +869,7 @@ ${this.buildXsTemplate()}
                             if (prop === 'cursor') {
                                 propValue = `i.${componentAlias.value}?i.${componentAlias.value}.length:-1`;
                             }
-                            propValue = this.supportXS
+                            propValue = this.isUseXS
                                 ? `xs.b(i.${propAlias},${propValue})`
                                 : `i.${propAlias}===undefined?${propValue}:i.${propAlias}`;
                         }
@@ -906,6 +913,11 @@ ${this.buildXsTemplate()}
                             style: comp.style,
                             class: comp.class
                         };
+                        result['click-view'] = {
+                            style: comp.style,
+                            class: comp.class,
+                            bindtap: 'eh'
+                        };
                     }
                 }
                 if (compName === 'slot' || compName === 'slot-view') {
@@ -925,21 +937,18 @@ ${this.buildXsTemplate()}
     }
     buildBaseTemplate() {
         const Adapter = this.Adapter;
-        const data = !this.isSupportRecursive && this.supportXS
-            ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"nn" /* Shortcuts.NodeName */})`)}`
+        const data = !this.isSupportRecursive && this.isUseXS
+            ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"n" /* Shortcuts.NodeName */})`)}`
             : this.isSupportRecursive
                 ? this.dataKeymap('i:item')
                 : this.dataKeymap('i:item,c:1');
-        const xs = this.supportXS
+        const xs = this.isUseXS
             ? (this.isSupportRecursive
-                ? `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`
-                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */}, '')`)
-            : "'tmpl_0_' + item.nn";
-        return `${this.buildXsTemplate()}
-<template name="taro_tmpl">
-  <block ${Adapter.for}="{{root.cn}}" ${Adapter.key}="sid">
-    <template is="{{${xs}}}" data="{{${data}}}" />
-  </block>
+                ? `xs.a(0, item.${"n" /* Shortcuts.NodeName */})`
+                : `xs.a(0, item.${"n" /* Shortcuts.NodeName */}, '')`)
+            : `'tmpl_0_' + item.${"n" /* Shortcuts.NodeName */}`;
+        return `${this.buildXsImportTemplate()}<template name="taro_tmpl">
+  <template is="{{${xs}}}" data="{{${data}}}" ${Adapter.for}="{{root.${"c" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"s" /* Shortcuts.Sid */}" />
 </template>
 `;
     }
@@ -966,14 +975,14 @@ ${this.buildXsTemplate()}
                 return str + ` bind${value}="eh"`;
             }
             else if (attr === 'class') {
-                return str + ` class="{{i.${"cl" /* Shortcuts.Class */}}}"`;
+                return str + ` class="{{i.${"l" /* Shortcuts.Class */}}}"`;
             }
             else if (attr === 'style') {
                 return str + ` style="{{i.${"st" /* Shortcuts.Style */}}}"`;
             }
             const patchValue = patcher[attr];
             if (isBooleanStringLiteral(patchValue) || isNumber(patchValue) || isString(patchValue)) {
-                const propValue = this.supportXS
+                const propValue = this.isUseXS
                     ? `xs.b(i.${toCamelCase(attr)},${patchValue})`
                     : `i.${toCamelCase(attr)}===undefined?${patchValue}:i.${toCamelCase(attr)}`;
                 return str + ` ${attr}="{{${propValue}}}"`;
@@ -987,39 +996,40 @@ ${this.buildXsTemplate()}
             : this.buildStandardComponentTemplate(comp, level);
     }
     getChildrenTemplate(level) {
-        const { isSupportRecursive, supportXS } = this;
+        const { isSupportRecursive, isUseXS, Adapter } = this;
         const isLastRecursiveComp = !isSupportRecursive && level + 1 === this.baseLevel;
-        const isUseXs = !this.isSupportRecursive && this.supportXS;
+        const isUnRecursiveXs = !this.isSupportRecursive && isUseXS;
+        const forAttribute = `${Adapter.for}="{{i.${"c" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"s" /* Shortcuts.Sid */}"`;
         if (isLastRecursiveComp) {
-            const data = isUseXs
+            const data = isUnRecursiveXs
                 ? `${this.dataKeymap('i:item,c:c,l:l')}`
                 : this.isSupportRecursive
                     ? this.dataKeymap('i:item')
                     : this.dataKeymap('i:item,c:c');
-            return supportXS
-                ? `<template is="{{xs.e(${level})}}" data="{{${data}}}" />`
-                : `<template is="tmpl_${level}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
+            return isUseXS
+                ? `<template is="{{xs.e(${level})}}" data="{{${data}}}" ${forAttribute} />`
+                : `<template is="tmpl_${level}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" ${forAttribute} />`;
         }
         else {
-            const data = isUseXs
+            const data = isUnRecursiveXs
                 // TODO: 此处直接 c+1，不是最优解，变量 c 的作用是监测组件嵌套的层级是否大于 baselevel
                 // 但目前的监测方法用于所有组件嵌套的总和，应该分开组件计算，单个组件嵌套层级大于 baselevel 时，再进入 comp 组件中进行新的嵌套
-                ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"nn" /* Shortcuts.NodeName */})`)}`
+                ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"n" /* Shortcuts.NodeName */})`)}`
                 : this.isSupportRecursive
                     ? `${this.dataKeymap('i:item')}`
                     : `${this.dataKeymap('i:item,c:c+1')}`;
             const xs = !this.isSupportRecursive
-                ? `xs.a(c, item.${"nn" /* Shortcuts.NodeName */}, l)`
-                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`;
-            return supportXS
-                ? `<template is="{{${xs}}}" data="{{${data}}}" />`
+                ? `xs.a(c, item.${"n" /* Shortcuts.NodeName */}, l)`
+                : `xs.a(0, item.${"n" /* Shortcuts.NodeName */})`;
+            return isUseXS
+                ? `<template is="{{${xs}}}" data="{{${data}}}" ${forAttribute} />`
                 : isSupportRecursive
-                    ? `<template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />`
-                    : `<template is="{{'tmpl_' + c + '_' + item.nn}}" data="{{${data}}}" />`;
+                    ? `<template is="{{'tmpl_0_' + item.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`
+                    : `<template is="{{'tmpl_' + c + '_' + item.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`;
         }
     }
     getChildren(comp, level) {
-        const { isSupportRecursive, Adapter } = this;
+        const { isSupportRecursive } = this;
         const nextLevel = isSupportRecursive ? 0 : level + 1;
         let child = this.getChildrenTemplate(nextLevel);
         if (isFunction(this.modifyLoopBody)) {
@@ -1028,9 +1038,7 @@ ${this.buildXsTemplate()}
         let children = this.voidElements.has(comp.nodeName)
             ? ''
             : `
-    <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
-      ${indent(child, 6)}
-    </block>
+    ${indent(child, 6)}
   `;
         if (isFunction(this.modifyLoopContainer)) {
             children = this.modifyLoopContainer(children, comp.nodeName);
@@ -1042,7 +1050,7 @@ ${this.buildXsTemplate()}
         const nodeName = comp.nodeName;
         const nodeAlias = comp.nodeAlias;
         const attrs = Object.assign({}, comp.attributes);
-        const templateName = this.supportXS
+        const templateName = this.isUseXS
             ? `xs.c(i, 'tmpl_${level}_')`
             : `i.focus ? 'tmpl_${level}_${nodeAlias}_focus' : 'tmpl_${level}_${nodeAlias}_blur'`;
         delete attrs.focus;
@@ -1052,11 +1060,11 @@ ${this.buildXsTemplate()}
 </template>
 
 <template name="tmpl_${level}_${nodeAlias}_focus">
-  <${nodeName} ${this.buildAttribute(comp.attributes, nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
+  <${nodeName} ${this.buildAttribute(comp.attributes, nodeName)} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${nodeName}>
 </template>
 
 <template name="tmpl_${level}_${nodeAlias}_blur">
-  <${nodeName} ${this.buildAttribute(attrs, nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
+  <${nodeName} ${this.buildAttribute(attrs, nodeName)} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${nodeName}>
 </template>
 `;
         if (isFunction(this.modifyTemplateResult)) {
@@ -1072,6 +1080,7 @@ ${this.buildXsTemplate()}
             case 'slot':
             case 'slot-view':
             case 'catch-view':
+            case 'click-view':
             case 'static-view':
             case 'pure-view':
                 nodeName = 'view';
@@ -1091,7 +1100,7 @@ ${this.buildXsTemplate()}
         }
         let res = `
 <template name="tmpl_${level}_${nodeAlias}">
-  <${nodeName} ${this.buildAttribute(comp.attributes, comp.nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
+  <${nodeName} ${this.buildAttribute(comp.attributes, comp.nodeName)} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${nodeName}>
 </template>
 `;
         if (isFunction(this.modifyTemplateResult)) {
@@ -1107,20 +1116,20 @@ ${this.buildXsTemplate()}
 `;
     }
     buildThirdPartyTemplate(level, componentConfig) {
-        const { Adapter, isSupportRecursive, supportXS, nestElements } = this;
+        const { isSupportRecursive, isUseXS, nestElements } = this;
         const nextLevel = isSupportRecursive ? 0 : level + 1;
         let template = '';
         componentConfig.thirdPartyComponents.forEach((attrs, compName) => {
             if (compName === 'custom-wrapper') {
                 template += `
 <template name="tmpl_${level}_${compName}">
-  <${compName} i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  <${compName} i="{{i}}" l="{{l}}" id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">
   </${compName}>
 </template>
   `;
             }
             else {
-                if (!isSupportRecursive && supportXS && nestElements.has(compName) && level + 1 > nestElements.get(compName))
+                if (!isSupportRecursive && isUseXS && nestElements.has(compName) && level + 1 > nestElements.get(compName))
                     return;
                 let child = this.getChildrenTemplate(nextLevel);
                 if (isFunction(this.modifyThirdPartyLoopBody)) {
@@ -1129,13 +1138,11 @@ ${this.buildXsTemplate()}
                 const children = this.voidElements.has(compName)
                     ? ''
                     : `
-    <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
-      ${child}
-    </block>
+    ${child}
   `;
                 template += `
 <template name="tmpl_${level}_${compName}">
-  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${compName}>
+  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${compName}>
 </template>
   `;
             }
@@ -1144,11 +1151,11 @@ ${this.buildXsTemplate()}
     }
     // 最后一层的 comp 需要引用 container 进行重新的模版循环，其他情况不需要 container
     buildContainerTemplate(level) {
-        const tmpl = `<block ${this.Adapter.if}="{{i.nn === '${this.componentsAlias['#text']._num}'}}">
+        const tmpl = `<block ${this.Adapter.if}="{{i.${"n" /* Shortcuts.NodeName */} === '${this.componentsAlias['#text']._num}'}}">
     <template is="tmpl_0_${this.componentsAlias['#text']._num}" data="{{${this.dataKeymap('i:i')}}}" />
   </block>
   <block ${this.Adapter.else}>
-    ${!this.isSupportRecursive && this.supportXS ? '<comp i="{{i}}" l="{{l}}" />' : '<comp i="{{i}}" />'}
+    ${!this.isSupportRecursive && this.isUseXS ? '<comp i="{{i}}" l="{{l}}" />' : '<comp i="{{i}}" />'}
   </block>`;
         return `
 <template name="tmpl_${level}_${"container" /* Shortcuts.Container */}">
@@ -1168,6 +1175,9 @@ ${this.buildXsTemplate()}
     buildXsTemplate(_filePath) {
         return '';
     }
+    buildXsImportTemplate(_filePath) {
+        return this.isUseXS ? this.buildXsTemplate(_filePath) + '\n' : '';
+    }
     mergeComponents(ctx, patch) {
         ctx.helper.recursiveMerge(this.internalComponents, patch);
     }
@@ -1179,10 +1189,10 @@ ${this.buildXsTemplate()}
     return 'tmpl_' + l + '_' + n
   }`;
     }
-    buildXSTepFocus(nn) {
+    buildXSTepFocus(n) {
         return `function(i, prefix) {
     var s = i.focus !== undefined ? 'focus' : 'blur'
-    return prefix + i.${nn} + '_' + s
+    return prefix + i.${n} + '_' + s
   }`;
     }
     buildXSTmpExtra() {
@@ -1228,7 +1238,7 @@ class UnRecursiveTemplate extends BaseTemplate {
                 .filter(c => componentConfig.includes.size && !componentConfig.includeAll ? componentConfig.includes.has(c) : true);
             let template = this.buildBaseTemplate();
             for (let i = 0; i < this.baseLevel; i++) {
-                template += this.supportXS
+                template += this.isUseXS
                     ? this.buildOptimizeFloor(i, components, this.baseLevel === i + 1)
                     : this.buildFloor(i, components, this.baseLevel === i + 1);
             }