@tarojs/shared 3.8.0-canary.0 → 4.0.0-alpha.2

package/dist/template.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const DEFAULT_EMPTY_ARRAY = '[]';
 const NO_DEFAULT_VALUE = '';
 const DEFAULT_TRUE = '!0';
@@ -48,7 +46,7 @@ const Text = {
     space: NO_DEFAULT_VALUE,
     decode: DEFAULT_FALSE
 };
-const Button = Object.assign({ size: singleQuote('default'), type: NO_DEFAULT_VALUE, plain: DEFAULT_FALSE, disabled: NO_DEFAULT_VALUE, loading: DEFAULT_FALSE, 'form-type': NO_DEFAULT_VALUE, 'open-type': NO_DEFAULT_VALUE, 'hover-class': singleQuote('button-hover'), 'hover-stop-propagation': DEFAULT_FALSE, 'hover-start-time': '20', 'hover-stay-time': '70', name: NO_DEFAULT_VALUE }, touchEvents);
+const Button = Object.assign({ size: singleQuote('default'), type: NO_DEFAULT_VALUE, plain: DEFAULT_FALSE, disabled: NO_DEFAULT_VALUE, loading: DEFAULT_FALSE, 'form-type': NO_DEFAULT_VALUE, 'open-type': NO_DEFAULT_VALUE, 'hover-class': singleQuote('button-hover'), 'hover-stop-propagation': DEFAULT_FALSE, 'hover-start-time': '20', 'hover-stay-time': '70', name: NO_DEFAULT_VALUE, bindagreeprivacyauthorization: NO_DEFAULT_VALUE }, touchEvents);
 const Checkbox = {
     value: NO_DEFAULT_VALUE,
     disabled: NO_DEFAULT_VALUE,
@@ -345,6 +343,20 @@ 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["Style"] = "st";
+    Shortcuts["Class"] = "cl";
+    Shortcuts["Src"] = "src";
+})(exports.Shortcuts || (exports.Shortcuts = {}));
+
 var PLATFORM_TYPE;
 (function (PLATFORM_TYPE) {
     PLATFORM_TYPE["MINI"] = "mini";
@@ -368,7 +380,7 @@ var PLATFORM_TYPE;
     },
     quickapp: {
         type: PLATFORM_TYPE.QUICK
-    }
+    },
 });
 
 class Events {
@@ -576,6 +588,7 @@ new TaroHooks({
         return this.call('getMiniLifecycle', defaultMiniLifecycle);
     }),
     getLifecycle: TaroHook(HOOK_TYPE.SINGLE, (instance, lifecycle) => instance[lifecycle]),
+    modifyRecursiveComponentConfig: TaroHook(HOOK_TYPE.SINGLE, (defaultConfig) => defaultConfig),
     getPathIndex: TaroHook(HOOK_TYPE.SINGLE, indexOfNode => `[${indexOfNode}]`),
     getEventCenter: TaroHook(HOOK_TYPE.SINGLE, Events => new Events()),
     isBubbleEvents: TaroHook(HOOK_TYPE.SINGLE, eventName => {
@@ -607,6 +620,7 @@ new TaroHooks({
     createPullDownComponent: TaroHook(HOOK_TYPE.SINGLE),
     getDOMNode: TaroHook(HOOK_TYPE.SINGLE),
     modifyHydrateData: TaroHook(HOOK_TYPE.SINGLE),
+    transferHydrateData: TaroHook(HOOK_TYPE.SINGLE),
     modifySetAttrPayload: TaroHook(HOOK_TYPE.SINGLE),
     modifyRmAttrPayload: TaroHook(HOOK_TYPE.SINGLE),
     onAddEvent: TaroHook(HOOK_TYPE.SINGLE),
@@ -629,9 +643,13 @@ new TaroHooks({
         node.dispatchEvent(e);
     }),
     dispatchTaroEventFinish: TaroHook(HOOK_TYPE.MULTI),
+    modifyTaroEventReturn: TaroHook(HOOK_TYPE.SINGLE, () => undefined),
     modifyDispatchEvent: TaroHook(HOOK_TYPE.MULTI),
     initNativeApi: TaroHook(HOOK_TYPE.MULTI),
-    patchElement: TaroHook(HOOK_TYPE.MULTI)
+    patchElement: TaroHook(HOOK_TYPE.MULTI),
+    modifyAddEventListener: TaroHook(HOOK_TYPE.SINGLE),
+    modifyRemoveEventListener: TaroHook(HOOK_TYPE.SINGLE),
+    getMemoryLevel: TaroHook(HOOK_TYPE.SINGLE),
 });
 
 function toDashed(s) {
@@ -750,6 +768,7 @@ class BaseTemplate {
         this.exportExpr = 'module.exports =';
         this.thirdPartyPatcher = {};
         this.supportXS = false;
+        this.isXMLSupportRecursiveReference = true;
         this.Adapter = weixinAdapter;
         /** 组件列表 */
         this.internalComponents = internalComponents;
@@ -759,28 +778,32 @@ class BaseTemplate {
         this.voidElements = voidElements;
         /** 可以递归调用自身的组件 */
         this.nestElements = nestElements;
-        this.buildPageTemplate = (baseTempPath) => {
+        this.buildPageTemplate = (baseTempPath, _page) => {
             const template = `<import src="${baseTempPath}"/>
 <template is="taro_tmpl" data="{{${this.dataKeymap('root:root')}}}" />`;
             return template;
         };
         this.buildBaseComponentTemplate = (ext) => {
             const data = !this.isSupportRecursive && this.supportXS
-                ? this.dataKeymap('i:i,c:1,l:l')
+                ? 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.buildXsTemplate()}
 <template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`;
         };
         this.buildCustomComponentTemplate = (ext) => {
             const Adapter = this.Adapter;
             const data = !this.isSupportRecursive && this.supportXS
-                ? `${this.dataKeymap('i:item,c:1,l:\'\'')}`
+                ? `${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.buildXsTemplate()}
   <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
     <template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
   </block>`;
@@ -908,7 +931,7 @@ class BaseTemplate {
     buildBaseTemplate() {
         const Adapter = this.Adapter;
         const data = !this.isSupportRecursive && this.supportXS
-            ? `${this.dataKeymap('i:item,c:1,l:\'\'')}`
+            ? `${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');
@@ -933,10 +956,10 @@ class BaseTemplate {
                 if (value.indexOf('-') > -1) {
                     value = `:${value}`;
                 }
-                return str + `bind${value}="eh" `;
+                return str + ` bind${value}="eh"`;
             }
             else if (attr.startsWith('bind')) {
-                return str + `${attr}="eh" `;
+                return str + ` ${attr}="eh"`;
             }
             else if (attr.startsWith('on')) {
                 // react, vue3
@@ -945,22 +968,22 @@ class BaseTemplate {
                     // 兼容如 vant 某些组件的 bind:a-b 这类属性
                     value = `:${value}`;
                 }
-                return str + `bind${value}="eh" `;
+                return str + ` bind${value}="eh"`;
             }
             else if (attr === 'class') {
-                return str + `class="{{i.${"cl" /* Shortcuts.Class */}}}" `;
+                return str + ` class="{{i.${"cl" /* Shortcuts.Class */}}}"`;
             }
             else if (attr === 'style') {
-                return str + `style="{{i.${"st" /* Shortcuts.Style */}}}" `;
+                return str + ` style="{{i.${"st" /* Shortcuts.Style */}}}"`;
             }
             const patchValue = patcher[attr];
             if (isBooleanStringLiteral(patchValue) || isNumber(patchValue) || isString(patchValue)) {
                 const propValue = this.supportXS
                     ? `xs.b(i.${toCamelCase(attr)},${patchValue})`
                     : `i.${toCamelCase(attr)}===undefined?${patchValue}:i.${toCamelCase(attr)}`;
-                return str + `${attr}="{{${propValue}}}" `;
+                return str + ` ${attr}="{{${propValue}}}"`;
             }
-            return str + `${attr}="{{i.${toCamelCase(attr)}}}" `;
+            return str + ` ${attr}="{{i.${toCamelCase(attr)}}}"`;
         }, '');
     }
     buildComponentTemplate(comp, level) {
@@ -984,6 +1007,8 @@ class BaseTemplate {
         }
         else {
             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 */})`)}`
                 : this.isSupportRecursive
                     ? `${this.dataKeymap('i:item')}`
@@ -1106,13 +1131,16 @@ class BaseTemplate {
                 if (isFunction(this.modifyThirdPartyLoopBody)) {
                     child = this.modifyThirdPartyLoopBody(child, compName);
                 }
-                template += `
-<template name="tmpl_${level}_${compName}">
-  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+                const children = this.voidElements.has(compName)
+                    ? ''
+                    : `
     <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
       ${child}
     </block>
-  </${compName}>
+  `;
+                template += `
+<template name="tmpl_${level}_${compName}">
+  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${compName}>
 </template>
   `;
             }
@@ -1142,7 +1170,7 @@ class BaseTemplate {
     getAttrValue(value, _key, _nodeName) {
         return `{${value}}`;
     }
-    buildXsTemplate() {
+    buildXsTemplate(_filePath) {
         return '';
     }
     mergeComponents(ctx, patch) {
@@ -1269,6 +1297,7 @@ class UnRecursiveTemplate extends BaseTemplate {
         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; });
         const containerLevel = this.baseLevel - 1;
+        // l >= containerLevel 是为了避免 baselevel 倒数两三层几层组件恰好不是 listA 中的组件，而最后一个组件又刚好是 listA 的组件，导致出现 l >= baselevel 却没有走入新的嵌套循环的问题 #14883
         return `function (l, n, s) {
     var a = ${JSON.stringify(listA)}
     var b = ${JSON.stringify(listB)}
@@ -1283,7 +1312,7 @@ class UnRecursiveTemplate extends BaseTemplate {
       }
       l = depth
     }
-    if (l === ${containerLevel}) {
+    if (l >= ${containerLevel}) {
       return 'tmpl_${containerLevel}_${"container" /* Shortcuts.Container */}'
     }
     return 'tmpl_' + l + '_' + n