@mybricks/to-code-taro 1.0.2 → 1.0.4

package/dist/esm/utils/index.js

@@ -1,345 +1,12 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import pxtransform from "./pxtransform";
-
-// 临时类型定义，实际使用时应该从 code-next 导入
-
-/** 导入依赖收集、解析 */
-export var ImportManager = /*#__PURE__*/function () {
-  function ImportManager(_config) {
-    _classCallCheck(this, ImportManager);
-    _defineProperty(this, "_imports", {});
-    this._config = _config;
-  }
-
-  /** 添加依赖 */
-  _createClass(ImportManager, [{
-    key: "addImport",
-    value: function addImport(_ref) {
-      var packageName = _ref.packageName,
-        dependencyNames = _ref.dependencyNames,
-        importType = _ref.importType;
-      if (!packageName) {
-        return;
-      }
-      var _imports = this._imports;
-      if (!_imports[packageName]) {
-        _imports[packageName] = {};
-      }
-
-      // 对于 module 类型且 dependencyNames 为空的情况，使用特殊标记
-      if (importType === "module" && dependencyNames.length === 0) {
-        _imports[packageName]["__module__"] = {
-          importType: "module"
-        };
-      } else {
-        dependencyNames.forEach(function (dependencyName) {
-          _imports[packageName][dependencyName] = {
-            importType: importType
-          };
-        });
-      }
-    }
-
-    /** 依赖解析为code */
-  }, {
-    key: "toCode",
-    value: function toCode() {
-      var indent = indentation(this._config.codeStyle.indent);
-      return Object.entries(this._imports).reduce(function (pre, _ref2) {
-        var _dependencies$__modul;
-        var _ref3 = _slicedToArray(_ref2, 2),
-          packageName = _ref3[0],
-          dependencies = _ref3[1];
-        var defaultDependency = "";
-        var namedDependencies = "";
-        var moduleDependency = "";
-        var dependencyEntries = Object.entries(dependencies);
-
-        // 检查是否有 module 类型的导入（如 import './index.less'）
-        // 通过检查 __module__ 标记或依赖项中的 module 类型
-        var hasModuleType = ((_dependencies$__modul = dependencies["__module__"]) === null || _dependencies$__modul === void 0 ? void 0 : _dependencies$__modul.importType) === "module" || dependencyEntries.some(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            importType = _ref5[1].importType;
-          return importType === "module";
-        });
-        if (hasModuleType) {
-          // module 类型：直接生成 import 'packageName'，不再处理其他依赖
-          return pre + "import '".concat(packageName, "';\n");
-        }
-
-        /** 超过三项换行 */
-        // 排除 __module__ 标记
-        var validEntries = dependencyEntries.filter(function (_ref6) {
-          var _ref7 = _slicedToArray(_ref6, 1),
-            key = _ref7[0];
-          return key !== "__module__";
-        });
-        var wrap = validEntries.length > 3;
-        validEntries.forEach(function (_ref8, index) {
-          var _ref9 = _slicedToArray(_ref8, 2),
-            dependencyName = _ref9[0],
-            importType = _ref9[1].importType;
-          if (importType === "default") {
-            defaultDependency = dependencyName;
-          } else if (importType === "named") {
-            if (wrap) {
-              namedDependencies += "".concat(indent).concat(dependencyName, ",\n");
-            } else {
-              namedDependencies += "".concat(index ? ", " : "").concat(dependencyName);
-            }
-          }
-        });
-        if (namedDependencies) {
-          if (wrap) {
-            namedDependencies = "{\n".concat(namedDependencies, "}");
-          } else {
-            namedDependencies = "{ ".concat(namedDependencies, " }");
-          }
-          if (defaultDependency) {
-            defaultDependency += ", ";
-          }
-        }
-        return pre + "import ".concat(defaultDependency).concat(namedDependencies, " from '").concat(packageName, "';\n");
-      }, "");
-    }
-  }]);
-  return ImportManager;
-}();
-
-/** 将第一个字符转大写 */
-export var firstCharToUpperCase = function firstCharToUpperCase(str) {
-  return str.charAt(0).toUpperCase() + str.slice(1);
-};
-
-/** 将第一个字符转小写 */
-export var firstCharToLowerCase = function firstCharToLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1);
-};
-
-/** 缩进 */
-export var indentation = function indentation(level) {
-  return " ".repeat(level);
-};
-
-/** 驼峰转中划线 */
-export var camelToKebab = function camelToKebab(str) {
-  return str.replace(/([A-Z])/g, "-$1").toLowerCase();
-};
-
-/** 中划线转驼峰 */
-export var kebabToCamel = function kebabToCamel(str) {
-  return str.replace(/-([a-z])/g, function (_, char) {
-    return char.toUpperCase();
-  });
-};
-
-/** 转换根节点样式 */
-export var convertRootStyle = function convertRootStyle(style) {
-  var rootStyle = {};
-  Object.entries(style || {}).forEach(function (_ref10) {
-    var _ref11 = _slicedToArray(_ref10, 2),
-      key = _ref11[0],
-      value = _ref11[1];
-    // 忽略一些不需要的属性
-    if (key === "_new" || key === "themesId" || key === "visibility" || key === "styleAry") {
-      return;
-    }
-    if (key === "layout") {
-      if (_typeof(value) === "object" && value !== null) {
-        // 处理 layout 对象，动态转换所有属性
-        var layoutObj = value;
-        Object.entries(layoutObj).forEach(function (_ref12) {
-          var _ref13 = _slicedToArray(_ref12, 2),
-            lKey = _ref13[0],
-            lValue = _ref13[1];
-          if (lKey === "position") {
-            if (lValue === "smart") {
-              rootStyle["position"] = "absolute";
-            } else if (lValue !== "inherit") {
-              rootStyle["position"] = lValue;
-            }
-          } else {
-            // 所有布局属性转为小驼峰（React 行内样式使用 camelCase）
-            var camelLayoutKey = kebabToCamel(lKey);
-            rootStyle[camelLayoutKey] = pxtransform(lValue);
-          }
-        });
-      } else if (value === "flex-row") {
-        rootStyle["display"] = "flex";
-        rootStyle["flexDirection"] = "row";
-      } else if (value === "flex-column") {
-        rootStyle["display"] = "flex";
-        rootStyle["flexDirection"] = "column";
-      } else if (value === "smart") {
-        // 处理 layout: 'smart'
-        rootStyle["position"] = "relative";
-      }
-      return;
-    }
-
-    // 根样式转换，统一转为小驼峰（React 行内样式使用 camelCase）
-    // 如果 key 已经是 kebab-case，转换为 camelCase；如果已经是 camelCase，保持不变
-    var camelKey = key.includes('-') ? kebabToCamel(key) : key;
-    if (typeof value === "string" || typeof value === "number") {
-      rootStyle[camelKey] = pxtransform(value);
-    }
-  });
-  return rootStyle;
-};
-
-/** 转换组件样式为 Taro/React 样式 */
-export var convertComponentStyle = function convertComponentStyle(style) {
-  var resultStyle = {};
-  var rootStyle = convertRootStyle(style);
-  if (style.styleAry) {
-    // 处理样式数组
-    style.styleAry.forEach(function (_ref14) {
-      var css = _ref14.css,
-        selector = _ref14.selector;
-      var transformedCss = {};
-      Object.entries(css).forEach(function (_ref15) {
-        var _ref16 = _slicedToArray(_ref15, 2),
-          cssKey = _ref16[0],
-          cssValue = _ref16[1];
-        if (cssKey === "layout") {
-          if (_typeof(cssValue) === "object" && cssValue !== null) {
-            var layoutObj = cssValue;
-            Object.entries(layoutObj).forEach(function (_ref17) {
-              var _ref18 = _slicedToArray(_ref17, 2),
-                lKey = _ref18[0],
-                lValue = _ref18[1];
-              if (lKey === "position") {
-                if (lValue === "smart") {
-                  transformedCss["position"] = "absolute";
-                } else if (lValue !== "inherit") {
-                  transformedCss["position"] = lValue;
-                }
-              } else {
-                // 布局属性转为小驼峰（React 行内样式使用 camelCase）
-                transformedCss[kebabToCamel(lKey)] = lValue;
-              }
-            });
-          } else if (cssValue === "flex-row") {
-            transformedCss["display"] = "flex";
-            transformedCss["flexDirection"] = "row";
-          } else if (cssValue === "flex-column") {
-            transformedCss["display"] = "flex";
-            transformedCss["flexDirection"] = "column";
-          } else if (cssValue === "smart") {
-            transformedCss["position"] = "relative";
-          }
-        } else {
-          // CSS 属性转为小驼峰（React 行内样式使用 camelCase）
-          // 如果 cssKey 已经是 kebab-case，转换为 camelCase；如果已经是 camelCase，保持不变
-          var camelKey = cssKey.includes('-') ? kebabToCamel(cssKey) : cssKey;
-          transformedCss[camelKey] = pxtransform(cssValue);
-        }
-      });
-      resultStyle[selector] = transformedCss;
-    });
-  }
-  resultStyle["root"] = rootStyle;
-  return resultStyle;
-};
-
-/** 转换 styleAry 为 CSS 字符串 */
-export var convertStyleAryToCss = function convertStyleAryToCss(styleAry, parentSelector) {
-  if (!Array.isArray(styleAry)) return "";
-  var prefix = parentSelector ? ".".concat(parentSelector, " ") : "";
-  return styleAry.map(function (_ref19) {
-    var selector = _ref19.selector,
-      css = _ref19.css;
-    if (!selector || !css) return "";
-
-    // 处理选择器，如果是以 > 开头，处理空格
-    var finalSelector = selector;
-    if (finalSelector.startsWith(">")) {
-      finalSelector = "".concat(prefix).concat(finalSelector);
-    } else {
-      finalSelector = "".concat(prefix).concat(finalSelector);
-    }
-    var transformedCss = {};
-    Object.entries(css).forEach(function (_ref20) {
-      var _ref21 = _slicedToArray(_ref20, 2),
-        key = _ref21[0],
-        value = _ref21[1];
-      if (key === "layout") {
-        if (_typeof(value) === "object" && value !== null) {
-          var layoutObj = value;
-          Object.entries(layoutObj).forEach(function (_ref22) {
-            var _ref23 = _slicedToArray(_ref22, 2),
-              lKey = _ref23[0],
-              lValue = _ref23[1];
-            if (lKey === "position") {
-              if (lValue === "smart") {
-                transformedCss["position"] = "absolute";
-              } else if (lValue !== "inherit") {
-                transformedCss["position"] = lValue;
-              }
-            } else {
-              transformedCss[kebabToCamel(lKey)] = lValue;
-            }
-          });
-        } else if (value === "flex-row") {
-          transformedCss["display"] = "flex";
-          transformedCss["flexDirection"] = "row";
-        } else if (value === "flex-column") {
-          transformedCss["display"] = "flex";
-          transformedCss["flexDirection"] = "column";
-        } else if (value === "smart") {
-          transformedCss["position"] = "relative";
-        }
-      } else {
-        transformedCss[kebabToCamel(key)] = value;
-      }
-    });
-    var cssString = Object.entries(transformedCss).map(function (_ref24) {
-      var _ref25 = _slicedToArray(_ref24, 2),
-        key = _ref25[0],
-        value = _ref25[1];
-      // 使用通用工具转换驼峰为中划线
-      var kebabKey = camelToKebab(key);
-      var formattedValue = typeof value === "number" ? "".concat(value, "px") : value;
-      return "  ".concat(kebabKey, ": ").concat(formattedValue, ";");
-    }).join("\n");
-    return "".concat(finalSelector, " {\n").concat(cssString, "\n}");
-  }).join("\n\n");
-};
-
-/** 生成对象代码 */
-export var genObjectCode = function genObjectCode(object, config) {
-  var initialIndent = config.initialIndent,
-    indentSize = config.indentSize;
-  var keys = Object.keys(object);
-  if (keys.length === 0) return "{}";
-  var result = "{\n";
-  keys.forEach(function (key, idx) {
-    var value = object[key];
-    var formattedValue;
-    if (Array.isArray(value)) {
-      formattedValue = JSON.stringify(value);
-    } else if (value && _typeof(value) === "object") {
-      formattedValue = genObjectCode(value, {
-        initialIndent: initialIndent + indentSize,
-        indentSize: indentSize
-      });
-    } else if (typeof value === "string") {
-      formattedValue = JSON.stringify(value);
-    } else {
-      formattedValue = String(value);
-    }
-    result += indentation(initialIndent + indentSize) + "".concat(JSON.stringify(key), ": ").concat(formattedValue);
-    if (idx < keys.length - 1) result += ",";
-    result += "\n";
-  });
-  result += indentation(initialIndent) + "}";
-  return result;
-};
-
-// 导出 code 目录下的函数
-export { getUiComponentCode } from "./code";
-export { getRootComponentClassName } from "./getComponentClassName";
+export * from "./style/types";
+export * from "./common/ImportManager";
+export * from "./common/string";
+export * from "./common/helper";
+export * from "./common/object";
+export * from "./style/color";
+export * from "./style/converter";
+export { default as pxtransform } from "./style/pxtransform";
+export { getRootComponentClassName } from "./style/getComponentClassName";
+
+// 导出 templates 目录下的函数 (原 code 目录)
+export { getUiComponentCode } from "./templates";

package/dist/{cjs/utils → esm/utils/logic}/handleProcess.d.ts

@@ -1,5 +1,5 @@
-import { ImportManager } from "./index";
-import type { BaseConfig } from "../toCodeTaro";
+import { ImportManager } from "../common/ImportManager";
+import type { BaseConfig } from "../../toCodeTaro";
 export interface HandleProcessConfig extends BaseConfig {
     addParentDependencyImport: (typeof ImportManager)["prototype"]["addImport"];
     getParams: () => Record<string, string>;

package/dist/esm/utils/{handleProcess.js → logic/handleProcess.js}

@@ -1,6 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { indentation, genObjectCode } from "./index";
+
+import { indentation } from "../common/helper";
+import { genObjectCode } from "../common/object";
 /**
  * 判断是否是 JS 计算组件
  */
@@ -117,15 +119,42 @@ export var handleProcess = function handleProcess(event, config) {
     }
     if (componentType === "js") {
       if (category === "scene") {
-        var _config$getPageId;
+        var _targetScene$deps, _config$getPageId;
+        var _sceneId = props.meta.model.data._sceneId;
+        var targetScene = config.getSceneById(_sceneId);
+        var isPopup = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.type) === 'popup' || (targetScene === null || targetScene === void 0 || (_targetScene$deps = targetScene.deps) === null || _targetScene$deps === void 0 ? void 0 : _targetScene$deps.some(function (dep) {
+          return dep.namespace === 'mybricks.taro.popup';
+        }));
+        var controllerName = isPopup ? "popupRouter" : "pageRouter";
         config.addParentDependencyImport({
           packageName: config.getComponentPackageName(),
-          dependencyNames: ["page"],
+          dependencyNames: [controllerName],
           importType: "named"
         });
-        var _sceneId = props.meta.model.data._sceneId;
         var operateName = props.meta.model.data.openType === "redirect" ? "replace" : "open";
-        code += "".concat(indent, "/** \u6253\u5F00 ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "page.").concat(operateName, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, _sceneId)) || _sceneId, "\", ").concat(nextValue, ")");
+        code += "".concat(indent, "/** \u6253\u5F00 ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode).concat(controllerName, ".").concat(operateName, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, _sceneId)) || _sceneId, "\", ").concat(nextValue, ")");
+      } else if (category === "frameOutput") {
+        var _pinProxies;
+        // 场景/弹窗输出（commit/cancel/apply/close）
+        var currentScene = config.getCurrentScene();
+        // pinProxies 的结构在不同数据/版本里不完全一致，这里按最小字段兼容
+        var pinProxy = currentScene === null || currentScene === void 0 || (_pinProxies = currentScene.pinProxies) === null || _pinProxies === void 0 ? void 0 : _pinProxies["".concat(props.meta.id, "-").concat(props.id)];
+        if (pinProxy !== null && pinProxy !== void 0 && pinProxy.frameId && pinProxy !== null && pinProxy !== void 0 && pinProxy.pinId) {
+          var method = pinProxy.pinId;
+          var _controllerName = config.isPopup ? "popupRouter" : "pageRouter";
+          config.addParentDependencyImport({
+            packageName: config.getComponentPackageName(),
+            dependencyNames: [_controllerName],
+            importType: "named"
+          });
+
+          // 仅支持 Page 内置的四种输出方法
+          if (["commit", "cancel", "apply", "close"].includes(method)) {
+            var sceneId = pinProxy.frameId || (currentScene === null || currentScene === void 0 ? void 0 : currentScene.id);
+            var argCode = nextValue ? ", ".concat(nextValue) : "";
+            code += "".concat(indent, "/** ").concat(props.meta.title, " \u8F93\u51FA ").concat(method, " */") + "\n".concat(indent).concat(nextCode).concat(_controllerName, ".").concat(method, "(\"").concat(sceneId, "\"").concat(argCode, ")");
+          }
+        }
       } else if (category === "normal") {
         var componentNameWithId = getComponentNameWithId(props, config, event);
         code += "".concat(indent, "/** \u8C03\u7528 ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode).concat(componentNameWithId, "(").concat(runType === "input" ? nextValue : "", ")");
@@ -251,6 +280,7 @@ var getNextCode = function getNextCode(props, config, isSameScope, event) {
 var getNextValue = function getNextValue(props, config, event) {
   var paramSource = props.paramSource;
   var nextValue = paramSource.map(function (param) {
+    var _param$meta;
     if (param.type === "params") {
       var params = config.getParams();
       return params[param.id];
@@ -258,21 +288,24 @@ var getNextValue = function getNextValue(props, config, event) {
       return JSON.stringify(param.value);
     }
     var componentNameWithId = getComponentNameWithId(param, config, event);
-    if (param.connectId) {
-      return "".concat(componentNameWithId, "_").concat(param.connectId, ".").concat(param.id);
+    // 变量组件直接返回 Subject，不加 .id 后缀
+    if ((_param$meta = param.meta) !== null && _param$meta !== void 0 && (_param$meta = _param$meta.def) !== null && _param$meta !== void 0 && (_param$meta = _param$meta.namespace) !== null && _param$meta !== void 0 && _param$meta.includes(".var")) {
+      return "".concat(componentNameWithId, "_result");
     }
     return "".concat(componentNameWithId, "_result.").concat(param.id);
   });
   return nextValue.join(", ");
 };
 var getNextValueWithParam = function getNextValueWithParam(param, config, event) {
+  var _param$meta2;
   if (param.type === "params") {
     var params = config.getParams();
     return params[param.id];
   }
   var componentNameWithId = getComponentNameWithId(param, config, event);
-  if (param.connectId) {
-    return "".concat(componentNameWithId, "_").concat(param.connectId, ".").concat(param.id);
+  // 变量组件直接返回 Subject
+  if ((_param$meta2 = param.meta) !== null && _param$meta2 !== void 0 && (_param$meta2 = _param$meta2.def) !== null && _param$meta2 !== void 0 && (_param$meta2 = _param$meta2.namespace) !== null && _param$meta2 !== void 0 && _param$meta2.includes(".var")) {
+    return "".concat(componentNameWithId, "_result");
   }
   return "".concat(componentNameWithId, "_result.").concat(param.id);
 };

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

@@ -0,0 +1,12 @@
+import type { UI } from "../../toCodeTaro";
+export type ChildResult = {
+    ui: string;
+    js: string;
+    cssContent: string;
+    slots: string[];
+    scopeSlots: string[];
+};
+/**
+ * 统一处理子节点（com, dom, module）
+ */
+export declare const processChildren: (children: UI["children"], config: any) => ChildResult;

package/dist/esm/utils/logic/processChildren.js

@@ -0,0 +1,48 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import handleCom from "../../handleCom";
+import handleDom from "../../handleDom";
+import handleModule from "../../handleModule";
+/**
+ * 统一处理子节点（com, dom, module）
+ */
+export var processChildren = function processChildren(children, config) {
+  var uiCode = "";
+  var jsCode = "";
+  var cssContent = "";
+  var slots = [];
+  var scopeSlots = [];
+  children.forEach(function (child) {
+    var result;
+    if (child.type === "com") {
+      result = handleCom(child, config);
+    } else if (child.type === "module") {
+      result = handleModule(child, config);
+    } else {
+      result = handleDom(child, config);
+    }
+    if (result) {
+      if (result.ui) {
+        uiCode += (uiCode ? "\n" : "") + result.ui;
+      }
+      if (result.js) {
+        jsCode += result.js;
+      }
+      if (result.cssContent) {
+        cssContent += (cssContent ? "\n" : "") + result.cssContent;
+      }
+      if (result.slots) {
+        slots.push.apply(slots, _toConsumableArray(result.slots));
+      }
+      if (result.scopeSlots) {
+        scopeSlots.push.apply(scopeSlots, _toConsumableArray(result.scopeSlots));
+      }
+    }
+  });
+  return {
+    ui: uiCode,
+    js: jsCode,
+    cssContent: cssContent,
+    slots: slots,
+    scopeSlots: scopeSlots
+  };
+};

package/dist/esm/utils/style/color.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 将 rgba 或 rgb 颜色转换为 hex 颜色
+ */
+export declare function colorToHex(color: string): string;

package/dist/esm/utils/style/color.js

@@ -0,0 +1,17 @@
+/**
+ * 将 rgba 或 rgb 颜色转换为 hex 颜色
+ */
+export function colorToHex(color) {
+  if (!color || typeof color !== "string") return color;
+  if (!color.startsWith("rgb")) return color;
+  var match = color.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*([\d.]+))?\)$/);
+  if (!match) return color;
+  var r = parseInt(match[1]);
+  var g = parseInt(match[2]);
+  var b = parseInt(match[3]);
+  var toHex = function toHex(n) {
+    var hex = n.toString(16);
+    return hex.length === 1 ? "0" + hex : hex;
+  };
+  return "#".concat(toHex(r)).concat(toHex(g)).concat(toHex(b)).toLowerCase();
+}

package/dist/esm/utils/style/converter.d.ts

@@ -0,0 +1,7 @@
+import type { Style } from "./types";
+/** 转换根节点样式 */
+export declare const convertRootStyle: (style: Style) => Record<string, string | number>;
+/** 转换组件样式为 Taro/React 样式 */
+export declare const convertComponentStyle: (style: Style) => Record<string, Record<string, string | number>>;
+/** 转换 styleAry 为 CSS 字符串 */
+export declare const convertStyleAryToCss: (styleAry: any[], parentSelector?: string) => string;