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

package/dist/template.d.ts

@@ -50,6 +50,7 @@ export declare const events: {
 export declare class BaseTemplate {
     protected _baseLevel: number;
     protected _isUseXS: boolean;
+    protected _isUseCompileMode: boolean;
     protected exportExpr: string;
     protected isSupportRecursive: boolean;
     protected miniComponents: Components;
@@ -73,6 +74,8 @@ export declare class BaseTemplate {
     componentsAlias: any;
     set baseLevel(lv: number);
     get baseLevel(): number;
+    set isUseCompileMode(isUse: boolean);
+    get isUseCompileMode(): boolean;
     set isUseXS(isUse: boolean);
     get isUseXS(): boolean;
     private buildAttribute;
@@ -103,7 +106,7 @@ export declare class BaseTemplate {
     mergeComponents(ctx: any, patch: Record<string, Record<string, string>>): void;
     mergeThirdPartyComponents(patch: Record<string, Record<string, string>>): void;
     protected buildXSTmplName(): string;
-    protected buildXSTepFocus(n: string): string;
+    protected buildXSTepFocus(nn: string): string;
     protected buildXSTmpExtra(): string;
 }
 export declare class RecursiveTemplate extends BaseTemplate {

package/dist/template.js

@@ -326,34 +326,6 @@ const nestElements = new Map([
     ['swiper-item', 4],
 ]);
 
-function isString(o) {
-    return typeof o === 'string';
-}
-function isFunction(o) {
-    return typeof o === 'function';
-}
-function isNumber(o) {
-    return typeof o === 'number';
-}
-function isBooleanStringLiteral(o) {
-    return o === 'true' || o === 'false';
-}
-
-// 字符串简写
-exports.Shortcuts = void 0;
-(function (Shortcuts) {
-    Shortcuts["Container"] = "container";
-    Shortcuts["Childnodes"] = "c";
-    Shortcuts["Text"] = "v";
-    Shortcuts["NodeType"] = "nt";
-    Shortcuts["NodeName"] = "n";
-    // Attrtibutes
-    Shortcuts["Style"] = "st";
-    Shortcuts["Class"] = "l";
-    Shortcuts["Src"] = "src";
-    Shortcuts["Sid"] = "s";
-})(exports.Shortcuts || (exports.Shortcuts = {}));
-
 var PLATFORM_TYPE;
 (function (PLATFORM_TYPE) {
     PLATFORM_TYPE["MINI"] = "mini";
@@ -362,6 +334,7 @@ var PLATFORM_TYPE;
     PLATFORM_TYPE["HARMONY"] = "harmony";
     PLATFORM_TYPE["QUICK"] = "quickapp";
 })(PLATFORM_TYPE || (PLATFORM_TYPE = {}));
+const COMPILE_MODE_IDENTIFIER_PREFIX = 'f';
 ({
     h5: {
         type: PLATFORM_TYPE.WEB
@@ -380,6 +353,34 @@ var PLATFORM_TYPE;
     },
 });
 
+function isString(o) {
+    return typeof o === 'string';
+}
+function isFunction(o) {
+    return typeof o === 'function';
+}
+function isNumber(o) {
+    return typeof o === 'number';
+}
+function isBooleanStringLiteral(o) {
+    return o === 'true' || o === 'false';
+}
+
+// 字符串简写
+exports.Shortcuts = void 0;
+(function (Shortcuts) {
+    Shortcuts["Container"] = "container";
+    Shortcuts["Childnodes"] = "cn";
+    Shortcuts["Text"] = "v";
+    Shortcuts["NodeType"] = "nt";
+    Shortcuts["NodeName"] = "nn";
+    // Attrtibutes
+    Shortcuts["Sid"] = "sid";
+    Shortcuts["Style"] = "st";
+    Shortcuts["Class"] = "cl";
+    Shortcuts["Src"] = "src";
+})(exports.Shortcuts || (exports.Shortcuts = {}));
+
 class Events {
     constructor(opts) {
         var _a;
@@ -744,7 +745,7 @@ function indent(str, size) {
 */
 const styles = {
     style: `i.${"st" /* Shortcuts.Style */}`,
-    class: `i.${"l" /* Shortcuts.Class */}`
+    class: `i.${"cl" /* Shortcuts.Class */}`
 };
 const events = {
     bindtap: 'eh'
@@ -764,6 +765,7 @@ class BaseTemplate {
     constructor() {
         this._baseLevel = 0;
         this._isUseXS = true;
+        this._isUseCompileMode = false;
         this.exportExpr = 'module.exports =';
         this.thirdPartyPatcher = {};
         this.supportXS = false;
@@ -784,24 +786,24 @@ class BaseTemplate {
         };
         this.buildBaseComponentTemplate = (ext) => {
             const data = !this.isSupportRecursive && this.isUseXS
-                ? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${"n" /* Shortcuts.NodeName */})`)
+                ? 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.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" />`;
+${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + i.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" />`;
         };
         this.buildCustomComponentTemplate = (ext) => {
             const Adapter = this.Adapter;
             const data = !this.isSupportRecursive && this.isUseXS
-                ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"n" /* Shortcuts.NodeName */})`)}`
+                ? `${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.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${Adapter.for}="{{i.${"c" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"s" /* Shortcuts.Sid */}" />
+${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"sid" /* Shortcuts.Sid */}" />
 `;
         };
         this.buildXScript = () => {
@@ -810,7 +812,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
   b: function (a, b) {
     return a === undefined ? b : a
   },
-  c: ${this.buildXSTepFocus("n" /* Shortcuts.NodeName */)},
+  c: ${this.buildXSTepFocus("nn" /* Shortcuts.NodeName */)},
   e: function (n) {
     return 'tmpl_' + n + '_${"container" /* Shortcuts.Container */}'
   },
@@ -824,6 +826,12 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
     get baseLevel() {
         return this._baseLevel;
     }
+    set isUseCompileMode(isUse) {
+        this._isUseCompileMode = isUse;
+    }
+    get isUseCompileMode() {
+        return this._isUseCompileMode;
+    }
     set isUseXS(isUse) {
         this._isUseXS = this.supportXS && isUse;
     }
@@ -938,17 +946,17 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
     buildBaseTemplate() {
         const Adapter = this.Adapter;
         const data = !this.isSupportRecursive && this.isUseXS
-            ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"n" /* Shortcuts.NodeName */})`)}`
+            ? `${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
             ? (this.isSupportRecursive
-                ? `xs.a(0, item.${"n" /* Shortcuts.NodeName */})`
-                : `xs.a(0, item.${"n" /* Shortcuts.NodeName */}, '')`)
-            : `'tmpl_0_' + item.${"n" /* Shortcuts.NodeName */}`;
+                ? `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.${"c" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"s" /* Shortcuts.Sid */}" />
+  <template is="{{${xs}}}" data="{{${data}}}" ${Adapter.for}="{{root.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"sid" /* Shortcuts.Sid */}" />
 </template>
 `;
     }
@@ -975,7 +983,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
                 return str + ` bind${value}="eh"`;
             }
             else if (attr === 'class') {
-                return str + ` class="{{i.${"l" /* Shortcuts.Class */}}}"`;
+                return str + ` class="{{i.${"cl" /* Shortcuts.Class */}}}"`;
             }
             else if (attr === 'style') {
                 return str + ` style="{{i.${"st" /* Shortcuts.Style */}}}"`;
@@ -996,10 +1004,10 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
             : this.buildStandardComponentTemplate(comp, level);
     }
     getChildrenTemplate(level) {
-        const { isSupportRecursive, isUseXS, Adapter } = this;
+        const { isSupportRecursive, isUseXS, Adapter, isUseCompileMode = true } = this;
         const isLastRecursiveComp = !isSupportRecursive && level + 1 === this.baseLevel;
         const isUnRecursiveXs = !this.isSupportRecursive && isUseXS;
-        const forAttribute = `${Adapter.for}="{{i.${"c" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"s" /* Shortcuts.Sid */}"`;
+        const forAttribute = `${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="${"sid" /* Shortcuts.Sid */}"`;
         if (isLastRecursiveComp) {
             const data = isUnRecursiveXs
                 ? `${this.dataKeymap('i:item,c:c,l:l')}`
@@ -1014,18 +1022,20 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
             const data = isUnRecursiveXs
                 // TODO: 此处直接 c+1，不是最优解，变量 c 的作用是监测组件嵌套的层级是否大于 baselevel
                 // 但目前的监测方法用于所有组件嵌套的总和，应该分开组件计算，单个组件嵌套层级大于 baselevel 时，再进入 comp 组件中进行新的嵌套
-                ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"n" /* Shortcuts.NodeName */})`)}`
+                ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"nn" /* Shortcuts.NodeName */})`)}`
                 : this.isSupportRecursive
                     ? `${this.dataKeymap('i:item')}`
                     : `${this.dataKeymap('i:item,c:c+1')}`;
             const xs = !this.isSupportRecursive
-                ? `xs.a(c, item.${"n" /* Shortcuts.NodeName */}, l)`
-                : `xs.a(0, item.${"n" /* Shortcuts.NodeName */})`;
+                ? `xs.a(c, item.${"nn" /* Shortcuts.NodeName */}, l)`
+                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`;
             return isUseXS
                 ? `<template is="{{${xs}}}" data="{{${data}}}" ${forAttribute} />`
                 : isSupportRecursive
-                    ? `<template is="{{'tmpl_0_' + item.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`
-                    : `<template is="{{'tmpl_' + c + '_' + item.${"n" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`;
+                    ? `<template is="{{'tmpl_0_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`
+                    : isUseCompileMode
+                        ? `<template is="{{'tmpl_' + (item.${"nn" /* Shortcuts.NodeName */}[0]==='${COMPILE_MODE_IDENTIFIER_PREFIX}' ? 0 : c) + '_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`
+                        : `<template is="{{'tmpl_' + c + '_' + item.${"nn" /* Shortcuts.NodeName */}}}" data="{{${data}}}" ${forAttribute} />`;
         }
     }
     getChildren(comp, level) {
@@ -1060,11 +1070,11 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
 </template>
 
 <template name="tmpl_${level}_${nodeAlias}_focus">
-  <${nodeName} ${this.buildAttribute(comp.attributes, nodeName)} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${nodeName}>
+  <${nodeName} ${this.buildAttribute(comp.attributes, nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
 </template>
 
 <template name="tmpl_${level}_${nodeAlias}_blur">
-  <${nodeName} ${this.buildAttribute(attrs, nodeName)} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${nodeName}>
+  <${nodeName} ${this.buildAttribute(attrs, nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
 </template>
 `;
         if (isFunction(this.modifyTemplateResult)) {
@@ -1100,7 +1110,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
         }
         let res = `
 <template name="tmpl_${level}_${nodeAlias}">
-  <${nodeName} ${this.buildAttribute(comp.attributes, comp.nodeName)} id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">${children}</${nodeName}>
+  <${nodeName} ${this.buildAttribute(comp.attributes, comp.nodeName)} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${nodeName}>
 </template>
 `;
         if (isFunction(this.modifyTemplateResult)) {
@@ -1123,7 +1133,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
             if (compName === 'custom-wrapper') {
                 template += `
 <template name="tmpl_${level}_${compName}">
-  <${compName} i="{{i}}" l="{{l}}" id="{{i.uid||i.${"s" /* Shortcuts.Sid */}}}" data-${"s" /* Shortcuts.Sid */}="{{i.${"s" /* Shortcuts.Sid */}}}">
+  <${compName} i="{{i}}" ${!isSupportRecursive && isUseXS ? 'l="{{l}}"' : ''} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
   </${compName}>
 </template>
   `;
@@ -1142,7 +1152,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
   `;
                 template += `
 <template name="tmpl_${level}_${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}>
+  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${compName}>
 </template>
   `;
             }
@@ -1151,7 +1161,7 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
     }
     // 最后一层的 comp 需要引用 container 进行重新的模版循环，其他情况不需要 container
     buildContainerTemplate(level) {
-        const tmpl = `<block ${this.Adapter.if}="{{i.${"n" /* Shortcuts.NodeName */} === '${this.componentsAlias['#text']._num}'}}">
+        const tmpl = `<block ${this.Adapter.if}="{{i.nn === '${this.componentsAlias['#text']._num}'}}">
     <template is="tmpl_0_${this.componentsAlias['#text']._num}" data="{{${this.dataKeymap('i:i')}}}" />
   </block>
   <block ${this.Adapter.else}>
@@ -1189,10 +1199,10 @@ ${this.buildXsImportTemplate()}<template is="{{'tmpl_0_' + item.${"n" /* Shortcu
     return 'tmpl_' + l + '_' + n
   }`;
     }
-    buildXSTepFocus(n) {
+    buildXSTepFocus(nn) {
         return `function(i, prefix) {
     var s = i.focus !== undefined ? 'focus' : 'blur'
-    return prefix + i.${n} + '_' + s
+    return prefix + i.${nn} + '_' + s
   }`;
     }
     buildXSTmpExtra() {