@mybricks/to-code-taro 1.1.2 → 1.1.4

package/dist/esm/utils/templates/index.js

@@ -43,6 +43,7 @@ export var getUiComponentCode = function getUiComponentCode(params, config) {
     resultStyle = params.resultStyle,
     dataCode = params.dataCode,
     slotsCode = params.slotsCode,
+    childrenUi = params.childrenUi,
     _params$eventHandlers = params.eventHandlers,
     eventHandlers = _params$eventHandlers === void 0 ? {} : _params$eventHandlers;
   var isRoot = config.checkIsRoot();
@@ -79,7 +80,13 @@ export var getUiComponentCode = function getUiComponentCode(params, config) {
   // 添加插槽
   if (slotsCode) {
     ui += "\n".concat(indent2, "slots={{\n").concat(slotsCode).concat(indent2, "}}");
-  } else {}
-  ui += "\n".concat(indent, "/>");
+  }
+  if (childrenUi) {
+    ui += "\n".concat(indent, ">");
+    ui += "\n".concat(childrenUi);
+    ui += "\n".concat(indent, "</WithCom>");
+  } else {
+    ui += "\n".concat(indent, "/>");
+  }
   return ui;
 };

package/dist/esm/utils/templates/renderManager.d.ts

@@ -10,5 +10,9 @@ export declare class RenderManager {
      * 生成所有 render 函数的 definition 代码
      */
     toCode(indent: string): string;
+    /**
+     * 转义字符串并创建能够匹配任意空白符的正则
+     */
+    private createFlexibleRegex;
     genRenderRef(slotId: string, renderId: string, indent: string): string;
 }

package/dist/esm/utils/templates/renderManager.js

@@ -33,6 +33,7 @@ export var RenderManager = /*#__PURE__*/function () {
   }, {
     key: "toCode",
     value: function toCode(indent) {
+      var _this = this;
       if (this._renders.size === 0) {
         return "";
       }
@@ -71,14 +72,15 @@ export var RenderManager = /*#__PURE__*/function () {
           children.forEach(function (child) {
             if (child.type === "com") {
               var varName = "".concat(child.id, "_JSX");
-              var comJsx = child.ui.trim();
+              var comJsx = child.ui; // 保持原始字符串（包含可能的 Fragment 或 View 包裹）
               comVars[child.id] = varName;
               code += "".concat(indent).concat(indent2, "const ").concat(varName, " = (\n");
-              code += "".concat(indent).concat(indent3).concat(comJsx, "\n");
+              // 内部定义时 trim 掉外层缩进，保持变量内容整洁
+              code += "".concat(indent).concat(indent3).concat(comJsx.trim(), "\n");
               code += "".concat(indent).concat(indent2, ");\n");
 
-              // 替换渲染结构中的组件调用为变量引用
-              var pattern = new RegExp("<WithCom\\s+[^>]*id=['\"]".concat(child.id, "['\"][\\s\\S]*?/>|<WithCom\\s+[^>]*id=['\"]").concat(child.id, "['\"][\\s\\S]*?>[\\s\\S]*?</WithCom>"), 'g');
+              // 优化：使用宽容空白匹配正则
+              var pattern = _this.createFlexibleRegex(comJsx.trim());
               modifiedRenderCode = modifiedRenderCode.replace(pattern, "{".concat(varName, "}"));
             }
           });
@@ -123,6 +125,17 @@ export var RenderManager = /*#__PURE__*/function () {
       });
       return code;
     }
+
+    /**
+     * 转义字符串并创建能够匹配任意空白符的正则
+     */
+  }, {
+    key: "createFlexibleRegex",
+    value: function createFlexibleRegex(str) {
+      var escaped = str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // 转义正则元字符
+      .replace(/\s+/g, '\\s+'); // 将所有空白符替换为 \s+
+      return new RegExp(escaped, 'g');
+    }
   }, {
     key: "genRenderRef",
     value: function genRenderRef(slotId, renderId, indent) {

package/dist/esm/utils/templates/scene.js

@@ -8,6 +8,7 @@ export var genRootDefineCode = function genRootDefineCode(indent, utilsPackageNa
   var hasJsModules = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   // 使用 useAppContext 获取 comRefs / $vars / $fxs / appContext
   var code = "".concat(indent, "const {comRefs, $vars, $fxs, appContext} = useAppContext();\n");
+  code += "".concat(indent, "usePageLife();\n");
   // 如果有 JS 计算组件，需要初始化 comModules
   if (hasJsModules) {
     code += "".concat(indent, "const comModules = jsModules({ createJSHandle });\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mybricks/to-code-taro",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "To code for Taro",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/dist/esm/generate/utils/commonDir.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"commonDir.d.ts","sourceRoot":"","sources":["commonDir.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE;QACd,MAAM,EAAE,MAAM,MAAM,CAAC;KACtB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAchF"}

package/dist/esm/handleCom.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleCom.d.ts","sourceRoot":"","sources":["handleCom.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,GAAG,GAAG,GAAG,CAAC;AACtB,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC;AAClC,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC;AAWlC;;GAEG;AACH,eAAO,MAAM,SAAS,QAAS,GAAG,UAAU,eAAe,KAAG,eAuC7D,CAAC;AAmPF,eAAe,SAAS,CAAC"}

package/dist/esm/handleDom.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleDom.d.ts","sourceRoot":"","sources":["handleDom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,aAAa,EAAuD,MAAM,SAAS,CAAC;AAG7F,KAAK,GAAG,GAAG,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAC;AAEvD,UAAU,eAAgB,SAAQ,UAAU;IAC1C,yBAAyB,EAAE,CAAC,OAAO,aAAa,CAAC,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC;IAC5E,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,KAAK,IAAI,CAAC;IAC9E,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,SAAS,QAAS,GAAG,UAAU,eAAe,KAAG,eAwBtD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/esm/handleGlobal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleGlobal.d.ts","sourceRoot":"","sources":["handleGlobal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEpE,UAAU,kBAAkB;IAC1B,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB;AAED,QAAA,MAAM,YAAY,WACR,kBAAkB,UAClB,gBAAgB,KACvB,aAAa,EAuKf,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/esm/utils/config/content/converter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAkB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA4DlF;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,gBAAgB,EAAE,GAAG,SAAS,GAAG,IAAI,EAC7C,YAAY,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAA4C,EAC9E,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,UAAU,KAAK,MAAM,GAAG,SAAS,GAC7G,gBAAgB,GAAG,IAAI,CAiCzB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,gBAAgB,EAAE,GAAG,SAAS,GAAG,IAAI,EAC7C,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,GAAG,IAAI,CAMf"}

package/dist/esm/utils/config/content/pageConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pageConfig.d.ts","sourceRoot":"","sources":["pageConfig.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgCH;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,CAAC,EAAE,GAAG,GAAG,MAAM,CAoCtE"}

package/dist/esm/utils/config/content/saveBase64Image.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"saveBase64Image.d.ts","sourceRoot":"","sources":["saveBase64Image.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA4D7C;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,QAAQ,GAAG,UAAU,EAC3B,UAAU,CAAC,EAAE,aAAa,EAAE,GAC3B,MAAM,GAAG,SAAS,CAwBpB"}

package/dist/esm/utils/config/content/tabBarConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tabBarConfig.d.ts","sourceRoot":"","sources":["tabBarConfig.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAI/D;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,EACzB,YAAY,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAA4C,EAC9E,UAAU,CAAC,EAAE,aAAa,EAAE,GAC3B,gBAAgB,GAAG,IAAI,CAsBzB;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,GAAE,MAAa,GACpB,MAAM,CAiBR;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,EACzB,MAAM,EAAE,gBAAgB,GACvB,MAAM,CAYR"}

package/dist/esm/utils/logic/handleProcess.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleProcess.d.ts","sourceRoot":"","sources":["handleProcess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,mBAAoB,SAAQ,UAAU;IACrD,yBAAyB,EAAE,CAAC,OAAO,aAAa,CAAC,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC;IAC5E,SAAS,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,KAAK,IAAI,CAAC;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAsBD,eAAO,MAAM,aAAa,UACjB,QAAQ,WAAW,UAAU,CAAC,qBAAqB,CAAC,CAAC,EAAE,SAAS,CAAC,UAChE,mBAAmB,WA8N5B,CAAC"}

package/dist/esm/utils/logic/processChildren.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"processChildren.d.ts","sourceRoot":"","sources":["processChildren.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAK3C,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,aAChB,EAAE,CAAC,UAAU,CAAC,UAChB,GAAG,KACV,WA2DF,CAAC"}

package/dist/esm/utils/templates/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,CAAC;AAEvB,gBAAgB;AAChB,eAAO,MAAM,oBAAoB,QAAS,MAAM,KAAG,MAGlD,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,iBAAiB,cAAe,MAAM,kBAAkB,MAAM,oBAAoB,MAAM,KAAG,MAKvG,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,MAK1C,CAAC;AAUF,2BAA2B;AAC3B,eAAO,MAAM,kBAAkB,WACrB;IACN,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;IACX,WAAW,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;IAC7D,sCAAsC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,UACO;IACN,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,KACA,MAiDF,CAAC"}

package/dist/esm/utils/templates/renderManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderManager.d.ts","sourceRoot":"","sources":["renderManager.ts"],"names":[],"mappings":"AAEA,mBAAmB;AACnB,qBAAa,aAAa;IACxB,gGAAgG;IAChG,OAAO,CAAC,QAAQ,CAAoJ;IAEpK;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM;IAI/I;;OAEG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IA0F9B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;CAIvE"}