@tarojs/shared 3.5.0-beta.1 → 3.5.0-beta.4

package/dist/template.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const DEFAULT_EMPTY_ARRAY = '[]';
 const NO_DEFAULT_VALUE = '';
-const DEFAULT_TRUE = 'true';
-const DEFAULT_FALSE = 'false';
+const DEFAULT_TRUE = '!0';
+const DEFAULT_FALSE = '!1';
 const touchEvents = {
     bindTouchStart: NO_DEFAULT_VALUE,
     bindTouchMove: NO_DEFAULT_VALUE,
@@ -600,6 +600,45 @@ function capitalize(s) {
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 const hasOwn = (val, key) => hasOwnProperty.call(val, key);
 (new Date()).getTime().toString();
+function getComponentsAlias(origin) {
+    const mapping = {};
+    const viewAttrs = origin.View;
+    const extraList = {
+        '#text': {},
+        StaticView: viewAttrs,
+        StaticImage: origin.Image,
+        StaticText: origin.Text,
+        PureView: viewAttrs,
+        CatchView: viewAttrs
+    };
+    origin = Object.assign(Object.assign({}, origin), extraList);
+    Object.keys(origin)
+        .sort((a, b) => {
+        const reg = /^(Static|Pure|Catch)*(View|Image|Text)$/;
+        if (reg.test(a)) {
+            return -1;
+        }
+        else if (reg.test(b)) {
+            return 1;
+        }
+        else {
+            return a >= b ? 1 : -1;
+        }
+    })
+        .forEach((key, num) => {
+        const obj = {
+            _num: String(num)
+        };
+        Object.keys(origin[key])
+            .filter(attr => !(/^bind/.test(attr)) && !['focus', 'blur'].includes(attr))
+            .sort()
+            .forEach((attr, index) => {
+            obj[toCamelCase(attr)] = 'p' + index;
+        });
+        mapping[toDashed(key)] = obj;
+    });
+    return mapping;
+}
 function indent(str, size) {
     return str.split('\n')
         .map((line, index) => {
@@ -698,7 +737,7 @@ class BaseTemplate {
             .map(k => `${k}="${k.startsWith('bind') || k.startsWith('on') || k.startsWith('catch') ? attrs[k] : `{${this.getAttrValue(attrs[k], k, nodeName)}}`}" `)
             .join('');
     }
-    replacePropName(name, value, _componentName) {
+    replacePropName(name, value, _componentName, _componentAlias) {
         if (value === 'eh')
             return name.toLowerCase();
         return name;
@@ -710,6 +749,7 @@ class BaseTemplate {
                 let component = components[key];
                 const compName = toDashed(key);
                 const newComp = Object.create(null);
+                const componentAlias = this.componentsAlias[compName];
                 if (isFunction(this.modifyCompProps)) {
                     component = this.modifyCompProps(compName, component);
                 }
@@ -720,17 +760,23 @@ class BaseTemplate {
                             propValue = 'eh';
                         }
                         else if (propValue === '') {
-                            propValue = `i.${toCamelCase(prop)}`;
+                            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;
                             propValue = this.supportXS
-                                ? `xs.b(i.${toCamelCase(prop)},${propValue})`
-                                : `i.${toCamelCase(prop)}===undefined?${propValue}:i.${toCamelCase(prop)}`;
+                                ? `xs.b(i.${propAlias},${propValue})`
+                                : `i.${propAlias}===undefined?${propValue}:i.${propAlias}`;
                         }
                         else {
-                            propValue = `i.${toCamelCase(prop)}||${propValue || singleQuote('')}`;
+                            const propInCamelCase = toCamelCase(prop);
+                            const propAlias = componentAlias[propInCamelCase] || propInCamelCase;
+                            propValue = `i.${propAlias}||${propValue || singleQuote('')}`;
                         }
-                        prop = this.replacePropName(prop, propValue, compName);
+                        prop = this.replacePropName(prop, propValue, compName, componentAlias);
                         newComp[prop] = propValue;
                     }
                 }
@@ -859,31 +905,34 @@ class BaseTemplate {
     }
     buildFocusComponentTemplte(comp, level) {
         const children = this.getChildren(comp, level);
+        const nodeName = comp.nodeName;
+        const nodeAlias = comp.nodeAlias;
         const attrs = Object.assign({}, comp.attributes);
         const templateName = this.supportXS
             ? `xs.c(i, 'tmpl_${level}_')`
-            : `i.focus ? 'tmpl_${level}_${comp.nodeName}_focus' : 'tmpl_${level}_${comp.nodeName}_blur'`;
+            : `i.focus ? 'tmpl_${level}_${nodeAlias}_focus' : 'tmpl_${level}_${nodeAlias}_blur'`;
         delete attrs.focus;
         let res = `
-<template name="tmpl_${level}_${comp.nodeName}">
+<template name="tmpl_${level}_${nodeAlias}">
   <template is="{{${templateName}}}" data="{{${this.dataKeymap('i:i')}${children ? ',cid:cid' : ''}}}" />
 </template>
 
-<template name="tmpl_${level}_${comp.nodeName}_focus">
-  <${comp.nodeName} ${this.buildAttribute(comp.attributes, comp.nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${comp.nodeName}>
+<template name="tmpl_${level}_${nodeAlias}_focus">
+  <${nodeName} ${this.buildAttribute(comp.attributes, nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
 </template>
 
-<template name="tmpl_${level}_${comp.nodeName}_blur">
-  <${comp.nodeName} ${this.buildAttribute(attrs, comp.nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${comp.nodeName}>
+<template name="tmpl_${level}_${nodeAlias}_blur">
+  <${nodeName} ${this.buildAttribute(attrs, nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
 </template>
 `;
         if (isFunction(this.modifyTemplateResult)) {
-            res = this.modifyTemplateResult(res, comp.nodeName, level, children);
+            res = this.modifyTemplateResult(res, nodeName, level, children);
         }
         return res;
     }
     buildStandardComponentTemplate(comp, level) {
         const children = this.getChildren(comp, level);
+        const nodeAlias = comp.nodeAlias;
         let nodeName = '';
         switch (comp.nodeName) {
             case 'slot':
@@ -904,7 +953,7 @@ class BaseTemplate {
                 break;
         }
         let res = `
-<template name="tmpl_${level}_${comp.nodeName}">
+<template name="tmpl_${level}_${nodeAlias}">
   <${nodeName} ${this.buildAttribute(comp.attributes, comp.nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
 </template>
 `;
@@ -915,7 +964,7 @@ class BaseTemplate {
     }
     buildPlainTextTemplate(level) {
         return `
-<template name="tmpl_${level}_#text">
+<template name="tmpl_${level}_${this.componentsAlias['#text']._num}">
   <block>{{i.${"v" /* Text */}}}</block>
 </template>
 `;
@@ -1025,6 +1074,7 @@ class RecursiveTemplate extends BaseTemplate {
         this.buildTemplate = (componentConfig) => {
             let template = this.buildBaseTemplate();
             if (!this.miniComponents) {
+                this.componentsAlias = getComponentsAlias(this.internalComponents);
                 this.miniComponents = this.createMiniComponents(this.internalComponents);
             }
             const ZERO_FLOOR = 0;
@@ -1032,7 +1082,8 @@ class RecursiveTemplate extends BaseTemplate {
                 .filter(c => componentConfig.includes.size && !componentConfig.includeAll ? componentConfig.includes.has(c) : true);
             template = components.reduce((current, nodeName) => {
                 const attributes = this.miniComponents[nodeName];
-                return current + this.buildComponentTemplate({ nodeName, attributes }, ZERO_FLOOR);
+                const nodeAlias = this.componentsAlias[nodeName]._num;
+                return current + this.buildComponentTemplate({ nodeName, nodeAlias, attributes }, ZERO_FLOOR);
             }, template);
             template += this.buildPlainTextTemplate(ZERO_FLOOR);
             template += this.buildThirdPartyTemplate(ZERO_FLOOR, componentConfig);
@@ -1049,6 +1100,7 @@ class UnRecursiveTemplate extends BaseTemplate {
         this.buildTemplate = (componentConfig) => {
             this.componentConfig = componentConfig;
             if (!this.miniComponents) {
+                this.componentsAlias = getComponentsAlias(this.internalComponents);
                 this.miniComponents = this.createMiniComponents(this.internalComponents);
             }
             const components = Object.keys(this.miniComponents)
@@ -1073,7 +1125,8 @@ class UnRecursiveTemplate extends BaseTemplate {
             return this.buildContainerTemplate(level, restart);
         let template = components.reduce((current, nodeName) => {
             const attributes = this.miniComponents[nodeName];
-            return current + this.buildComponentTemplate({ nodeName, attributes }, level);
+            const nodeAlias = this.componentsAlias[nodeName]._num;
+            return current + this.buildComponentTemplate({ nodeName, nodeAlias, attributes }, level);
         }, '');
         template += this.buildPlainTextTemplate(level);
         template += this.buildThirdPartyTemplate(level, this.componentConfig);
@@ -1098,7 +1151,8 @@ class UnRecursiveTemplate extends BaseTemplate {
                 }
             }
             const attributes = this.miniComponents[nodeName];
-            return current + this.buildComponentTemplate({ nodeName, attributes }, level);
+            const nodeAlias = this.componentsAlias[nodeName]._num;
+            return current + this.buildComponentTemplate({ nodeName, nodeAlias, attributes }, level);
         }, '');
         if (level === 0)
             template += this.buildPlainTextTemplate(level);
@@ -1121,9 +1175,12 @@ class UnRecursiveTemplate extends BaseTemplate {
                 isLoopCompsSet.delete(comp);
             }
         });
+        const componentsAlias = this.componentsAlias;
+        const listA = Array.from(isLoopCompsSet).map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
+        const listB = hasMaxComps.map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
         return `function (l, n, s) {
-    var a = ${JSON.stringify(Array.from(isLoopCompsSet))}
-    var b = ${JSON.stringify(hasMaxComps)}
+    var a = ${JSON.stringify(listA)}
+    var b = ${JSON.stringify(listB)}
     if (a.indexOf(n) === -1) {
       l = 0
     }
@@ -1144,8 +1201,10 @@ class UnRecursiveTemplate extends BaseTemplate {
             if (max > 1)
                 hasMaxComps.push(comp);
         });
+        const componentsAlias = this.componentsAlias;
+        const listA = hasMaxComps.map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
         return `f: function (l, n) {
-    var b = ${JSON.stringify(hasMaxComps)}
+    var b = ${JSON.stringify(listA)}
     if (b.indexOf(n) > -1) {
       if (l) l += ','
       l += n