@tarojs/shared 4.0.7-alpha.1 → 4.0.7-alpha.3

package/dist/template.js

@@ -310,7 +310,6 @@ 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],
@@ -333,11 +332,16 @@ function isFunction(o) {
     return typeof o === 'function';
 }
 function isNumber(o) {
+    if (Number.isFinite)
+        return Number.isFinite(o);
     return typeof o === 'number';
 }
 function isBooleanStringLiteral(o) {
     return o === 'true' || o === 'false';
 }
+function isObjectStringLiteral(o) {
+    return o === '{}';
+}
 
 // 字符串简写
 exports.Shortcuts = void 0;
@@ -348,7 +352,6 @@ exports.Shortcuts = void 0;
     Shortcuts["NodeType"] = "nt";
     Shortcuts["NodeName"] = "nn";
     // Attrtibutes
-    Shortcuts["Sid"] = "sid";
     Shortcuts["Style"] = "st";
     Shortcuts["Class"] = "cl";
     Shortcuts["Src"] = "src";
@@ -684,13 +687,12 @@ function getComponentsAlias(origin) {
         StaticImage: origin.Image,
         StaticText: origin.Text,
         PureView: viewAttrs,
-        CatchView: viewAttrs,
-        ClickView: viewAttrs,
+        CatchView: viewAttrs
     };
     origin = Object.assign(Object.assign({}, origin), extraList);
     Object.keys(origin)
         .sort((a, b) => {
-        const reg = /^(Static|Pure|Catch|Click)*(View|Image|Text)$/;
+        const reg = /^(Static|Pure|Catch)*(View|Image|Text)$/;
         const isACommonly = reg.test(a);
         const isBCommonly = reg.test(b);
         if (isACommonly && isBCommonly) {
@@ -763,7 +765,6 @@ const weixinAdapter = {
 class BaseTemplate {
     constructor() {
         this._baseLevel = 0;
-        this._isUseXS = true;
         this.exportExpr = 'module.exports =';
         this.thirdPartyPatcher = {};
         this.supportXS = false;
@@ -783,26 +784,29 @@ class BaseTemplate {
             return template;
         };
         this.buildBaseComponentTemplate = (ext) => {
-            const data = !this.isSupportRecursive && this.isUseXS
+            const data = !this.isSupportRecursive && this.supportXS
                 ? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${"nn" /* 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.buildXsImportTemplate()}<template is="{{'tmpl_0_' + i.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" />`;
+${this.buildXsTemplate()}
+<template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`;
         };
         this.buildCustomComponentTemplate = (ext) => {
             const Adapter = this.Adapter;
-            const data = !this.isSupportRecursive && this.isUseXS
+            const data = !this.isSupportRecursive && this.supportXS
                 ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"nn" /* 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.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"sid" /* Shortcuts.Sid */}" />
-`;
+  ${this.buildXsTemplate()}
+  <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
+    <template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
+  </block>`;
         };
         this.buildXScript = () => {
             return `${this.exportExpr} {
@@ -811,6 +815,9 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
     return a === undefined ? b : a
   },
   c: ${this.buildXSTepFocus("nn" /* Shortcuts.NodeName */)},
+  d: function (a) {
+    return a === undefined ? {} : a
+  },
   e: function (n) {
     return 'tmpl_' + n + '_${"container" /* Shortcuts.Container */}'
   },
@@ -824,12 +831,6 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
     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)}}`}" `)
@@ -853,29 +854,30 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
                 }
                 for (let prop in component) {
                     if (hasOwn(component, prop)) {
+                        const propInCamelCase = toCamelCase(prop);
+                        const propAlias = componentAlias[propInCamelCase] || propInCamelCase;
                         let propValue = component[prop];
                         if (prop.startsWith('bind') || propValue === 'eh') {
                             propValue = 'eh';
                         }
                         else if (propValue === '') {
-                            const propInCamelCase = toCamelCase(prop);
-                            const propAlias = componentAlias[propInCamelCase] || propInCamelCase;
                             propValue = `i.${propAlias}`;
                         }
                         else if (isBooleanStringLiteral(propValue) || isNumber(+propValue)) {
-                            const propInCamelCase = toCamelCase(prop);
-                            const propAlias = componentAlias[propInCamelCase] || propInCamelCase;
                             // cursor 默认取最后输入框最后一位 fix #13809
                             if (prop === 'cursor') {
                                 propValue = `i.${componentAlias.value}?i.${componentAlias.value}.length:-1`;
                             }
-                            propValue = this.isUseXS
+                            propValue = this.supportXS
                                 ? `xs.b(i.${propAlias},${propValue})`
                                 : `i.${propAlias}===undefined?${propValue}:i.${propAlias}`;
                         }
+                        else if (isObjectStringLiteral(propValue)) {
+                            propValue = this.supportXS
+                                ? `xs.d(i.${propAlias})`
+                                : `i.${propAlias}===undefined?${propValue}:i.${propAlias}`;
+                        }
                         else {
-                            const propInCamelCase = toCamelCase(prop);
-                            const propAlias = componentAlias[propInCamelCase] || propInCamelCase;
                             propValue = `i.${propAlias}||${propValue || singleQuote('')}`;
                         }
                         prop = this.replacePropName(prop, propValue, compName, componentAlias);
@@ -913,11 +915,6 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
                             style: comp.style,
                             class: comp.class
                         };
-                        result['click-view'] = {
-                            style: comp.style,
-                            class: comp.class,
-                            bindtap: 'eh'
-                        };
                     }
                 }
                 if (compName === 'slot' || compName === 'slot-view') {
@@ -937,18 +934,21 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
     }
     buildBaseTemplate() {
         const Adapter = this.Adapter;
-        const data = !this.isSupportRecursive && this.isUseXS
+        const data = !this.isSupportRecursive && this.supportXS
             ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"nn" /* Shortcuts.NodeName */})`)}`
             : this.isSupportRecursive
                 ? this.dataKeymap('i:item')
                 : this.dataKeymap('i:item,c:1');
-        const xs = this.isUseXS
+        const xs = this.supportXS
             ? (this.isSupportRecursive
                 ? `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`
                 : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */}, '')`)
-            : `'tmpl_0_' + item.${"nn" /* Shortcuts.NodeName */}`;
-        return `${this.buildXsImportTemplate()}<template name="taro_tmpl">
-  <template is="{{${xs}}}" data="{{${data}}}" ${Adapter.for}="{{root.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"sid" /* Shortcuts.Sid */}" />
+            : "'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>
 </template>
 `;
     }
@@ -982,9 +982,16 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
             }
             const patchValue = patcher[attr];
             if (isBooleanStringLiteral(patchValue) || isNumber(patchValue) || isString(patchValue)) {
-                const propValue = this.isUseXS
-                    ? `xs.b(i.${toCamelCase(attr)},${patchValue})`
-                    : `i.${toCamelCase(attr)}===undefined?${patchValue}:i.${toCamelCase(attr)}`;
+                let propValue = '';
+                if (this.supportXS) {
+                    if (isObjectStringLiteral(patchValue)) {
+                        propValue = `xs.d(i.${toCamelCase(attr)})`;
+                    }
+                    propValue = `xs.b(i.${toCamelCase(attr)},${patchValue})`;
+                }
+                else {
+                    propValue = `i.${toCamelCase(attr)}===undefined?${patchValue}:i.${toCamelCase(attr)}`;
+                }
                 return str + ` ${attr}="{{${propValue}}}"`;
             }
             return str + ` ${attr}="{{i.${toCamelCase(attr)}}}"`;
@@ -996,22 +1003,21 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
             : this.buildStandardComponentTemplate(comp, level);
     }
     getChildrenTemplate(level) {
-        const { isSupportRecursive, isUseXS, Adapter } = this;
+        const { isSupportRecursive, supportXS } = this;
         const isLastRecursiveComp = !isSupportRecursive && level + 1 === this.baseLevel;
-        const isUnRecursiveXs = !this.isSupportRecursive && isUseXS;
-        const forAttribute = `${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"sid" /* Shortcuts.Sid */}"`;
+        const isUseXs = !this.isSupportRecursive && this.supportXS;
         if (isLastRecursiveComp) {
-            const data = isUnRecursiveXs
+            const data = isUseXs
                 ? `${this.dataKeymap('i:item,c:c,l:l')}`
                 : this.isSupportRecursive
                     ? this.dataKeymap('i:item')
                     : this.dataKeymap('i:item,c:c');
-            return isUseXS
-                ? `<template is="{{xs.e(${level})}}" data="{{${data}}}" ${forAttribute} />`
-                : `<template is="tmpl_${level}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" ${forAttribute} />`;
+            return supportXS
+                ? `<template is="{{xs.e(${level})}}" data="{{${data}}}" />`
+                : `<template is="tmpl_${level}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
         }
         else {
-            const data = isUnRecursiveXs
+            const data = isUseXs
                 // TODO: 此处直接 c+1，不是最优解，变量 c 的作用是监测组件嵌套的层级是否大于 baselevel
                 // 但目前的监测方法用于所有组件嵌套的总和，应该分开组件计算，单个组件嵌套层级大于 baselevel 时，再进入 comp 组件中进行新的嵌套
                 ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"nn" /* Shortcuts.NodeName */})`)}`
@@ -1021,15 +1027,15 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
             const xs = !this.isSupportRecursive
                 ? `xs.a(c, item.${"nn" /* Shortcuts.NodeName */}, l)`
                 : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`;
-            return isUseXS
-                ? `<template is="{{${xs}}}" data="{{${data}}}" ${forAttribute} />`
+            return supportXS
+                ? `<template is="{{${xs}}}" data="{{${data}}}" />`
                 : isSupportRecursive
-                    ? `<template is="{{'tmpl_0_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`
-                    : `<template is="{{'tmpl_' + c + '_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`;
+                    ? `<template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />`
+                    : `<template is="{{'tmpl_' + c + '_' + item.nn}}" data="{{${data}}}" />`;
         }
     }
     getChildren(comp, level) {
-        const { isSupportRecursive } = this;
+        const { isSupportRecursive, Adapter } = this;
         const nextLevel = isSupportRecursive ? 0 : level + 1;
         let child = this.getChildrenTemplate(nextLevel);
         if (isFunction(this.modifyLoopBody)) {
@@ -1038,7 +1044,9 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
         let children = this.voidElements.has(comp.nodeName)
             ? ''
             : `
-    ${indent(child, 6)}
+    <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
+      ${indent(child, 6)}
+    </block>
   `;
         if (isFunction(this.modifyLoopContainer)) {
             children = this.modifyLoopContainer(children, comp.nodeName);
@@ -1050,7 +1058,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
         const nodeName = comp.nodeName;
         const nodeAlias = comp.nodeAlias;
         const attrs = Object.assign({}, comp.attributes);
-        const templateName = this.isUseXS
+        const templateName = this.supportXS
             ? `xs.c(i, 'tmpl_${level}_')`
             : `i.focus ? 'tmpl_${level}_${nodeAlias}_focus' : 'tmpl_${level}_${nodeAlias}_blur'`;
         delete attrs.focus;
@@ -1080,7 +1088,6 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
             case 'slot':
             case 'slot-view':
             case 'catch-view':
-            case 'click-view':
             case 'static-view':
             case 'pure-view':
                 nodeName = 'view';
@@ -1116,7 +1123,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
 `;
     }
     buildThirdPartyTemplate(level, componentConfig) {
-        const { isSupportRecursive, isUseXS, nestElements } = this;
+        const { Adapter, isSupportRecursive, supportXS, nestElements } = this;
         const nextLevel = isSupportRecursive ? 0 : level + 1;
         let template = '';
         componentConfig.thirdPartyComponents.forEach((attrs, compName) => {
@@ -1129,7 +1136,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
   `;
             }
             else {
-                if (!isSupportRecursive && isUseXS && nestElements.has(compName) && level + 1 > nestElements.get(compName))
+                if (!isSupportRecursive && supportXS && nestElements.has(compName) && level + 1 > nestElements.get(compName))
                     return;
                 let child = this.getChildrenTemplate(nextLevel);
                 if (isFunction(this.modifyThirdPartyLoopBody)) {
@@ -1138,7 +1145,9 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
                 const children = this.voidElements.has(compName)
                     ? ''
                     : `
-    ${child}
+    <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
+      ${child}
+    </block>
   `;
                 template += `
 <template name="tmpl_${level}_${compName}">
@@ -1155,7 +1164,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
     <template is="tmpl_0_${this.componentsAlias['#text']._num}" data="{{${this.dataKeymap('i:i')}}}" />
   </block>
   <block ${this.Adapter.else}>
-    ${!this.isSupportRecursive && this.isUseXS ? '<comp i="{{i}}" l="{{l}}" />' : '<comp i="{{i}}" />'}
+    ${!this.isSupportRecursive && this.supportXS ? '<comp i="{{i}}" l="{{l}}" />' : '<comp i="{{i}}" />'}
   </block>`;
         return `
 <template name="tmpl_${level}_${"container" /* Shortcuts.Container */}">
@@ -1175,9 +1184,6 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortc
     buildXsTemplate(_filePath) {
         return '';
     }
-    buildXsImportTemplate(_filePath) {
-        return this.isUseXS ? this.buildXsTemplate(_filePath) + '\n' : '';
-    }
     mergeComponents(ctx, patch) {
         ctx.helper.recursiveMerge(this.internalComponents, patch);
     }
@@ -1238,7 +1244,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.isUseXS
+                template += this.supportXS
                     ? this.buildOptimizeFloor(i, components, this.baseLevel === i + 1)
                     : this.buildFloor(i, components, this.baseLevel === i + 1);
             }