@mybricks/to-code-taro 1.2.6 → 1.2.8

package/dist/esm/processors/processScene.js

@@ -1,234 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-/**
- * 处理场景（Scene）
- * 参考鸿蒙实现，将场景处理逻辑独立出来
- */
-
-import handleSlot from "../handleSlot";
-import { RenderManager } from "../utils/templates/renderManager";
-import { createProvider, createProviderMap } from "../utils/context/createProvider";
-import { createEventQueries } from "../utils/context/createEventQueries";
-import { collectJSModulesFromScene, extractJSModuleFromCom } from "../utils/context/collectJSModules";
-/**
- * 获取需要调用的路由方法名
- */
-var getCallMethodName = function getCallMethodName(com, pinId, isTargetPopup) {
-  var _com$model;
-  // 不是 open 方法，或者是弹窗，直接返回 pinId
-  if (pinId !== 'open' || isTargetPopup) return pinId;
-
-  // 页面跳转类型映射
-  var OPEN_TYPE_MAP = {
-    'blank': 'open',
-    'redirect': 'replace'
-  };
-  var openType = com === null || com === void 0 || (_com$model = com.model) === null || _com$model === void 0 || (_com$model = _com$model.data) === null || _com$model === void 0 ? void 0 : _com$model.openType;
-  return OPEN_TYPE_MAP[openType] || openType || pinId;
-};
-
-/**
- * 处理单个场景
- */
-export var processScene = function processScene(params) {
-  var _config$getFileName, _originalScene$deps, _originalScene$slot;
-  var _params$scene = params.scene,
-    scene = _params$scene.scene,
-    ui = _params$scene.ui,
-    event = _params$scene.event,
-    config = params.config,
-    globalVarTypeDef = params.globalVarTypeDef,
-    defaultFxsMap = params.defaultFxsMap,
-    abstractEventTypeDefMap = params.abstractEventTypeDefMap,
-    jsModulesMap = params.jsModulesMap,
-    getExtensionEventById = params.getExtensionEventById,
-    getSceneById = params.getSceneById,
-    getFrameById = params.getFrameById,
-    pageConfigHandler = params.pageConfigHandler;
-
-  // 收集 JS 计算组件（全局）
-  collectJSModulesFromScene(scene, jsModulesMap);
-
-  // 收集当前页面/弹窗内的 JS 计算组件（用于生成 index.jsModules.ts）
-  var localJsModules = Object.entries(scene.coms || {}).map(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      comId = _ref2[0],
-      comInfo = _ref2[1];
-    return extractJSModuleFromCom(comId, comInfo);
-  }).filter(Boolean);
-
-  // 创建 Provider
-  var fileName = (_config$getFileName = config.getFileName) === null || _config$getFileName === void 0 ? void 0 : _config$getFileName.call(config, ui.meta.slotId);
-  var currentProvider = createProvider(fileName, true);
-  var providerMap = createProviderMap(currentProvider);
-
-  // 创建类型定义
-  var typeDef = {
-    vars: Object.assign({}, globalVarTypeDef),
-    inputs: {},
-    outputs: {}
-  };
-
-  // 创建 FX Map
-  var fxsMap = Object.assign({}, defaultFxsMap);
-
-  // 参考鸿蒙逻辑：如果场景中包含 popup 组件，则标记场景类型为 popup
-  var originalScene = getSceneById(scene.id);
-  var isPopup = (originalScene === null || originalScene === void 0 ? void 0 : originalScene.type) === 'popup' || (originalScene === null || originalScene === void 0 || (_originalScene$deps = originalScene.deps) === null || _originalScene$deps === void 0 ? void 0 : _originalScene$deps.some(function (dep) {
-    return dep.namespace === 'mybricks.taro.popup';
-  }));
-
-  // 处理页面配置
-  var pageConfigContent = pageConfigHandler.handle(scene, isPopup);
-
-  // 创建事件查询函数
-  var eventQueries = createEventQueries(event);
-
-  // 创建 RenderManager
-  var renderManager = new RenderManager();
-
-  // 鸿蒙规范：建立全局组件 ID -> DSL 名称映射表，确保在任何层级都能获取到稳定的名称
-  var dslComIdToNameMap = {};
-  if (originalScene !== null && originalScene !== void 0 && (_originalScene$slot = originalScene.slot) !== null && _originalScene$slot !== void 0 && _originalScene$slot.comAry) {
-    var scanComs = function scanComs(coms) {
-      if (!Array.isArray(coms)) return;
-      coms.forEach(function (com) {
-        var _com$def, _com$model2;
-        if (com.name) dslComIdToNameMap[com.id] = com.name;
-        if (com.slots) {
-          var slotList = Array.isArray(com.slots) ? com.slots : Object.values(com.slots);
-          slotList.forEach(function (slot) {
-            if (slot.comAry) scanComs(slot.comAry);
-            if (slot.children) scanComs(slot.children);
-          });
-        }
-        // 特殊处理表单容器
-        if (((_com$def = com.def) === null || _com$def === void 0 ? void 0 : _com$def.namespace) === 'mybricks.taro.formContainer' && (_com$model2 = com.model) !== null && _com$model2 !== void 0 && (_com$model2 = _com$model2.data) !== null && _com$model2 !== void 0 && _com$model2.items) {
-          com.model.data.items.forEach(function (item) {
-            if (item.comName) dslComIdToNameMap[item.id] = item.comName;
-          });
-        }
-      });
-    };
-    scanComs(originalScene.slot.comAry);
-  }
-
-  // 处理 Slot
-  handleSlot(ui, _objectSpread(_objectSpread({}, config), {}, {
-    renderManager: renderManager,
-    // 显式传入 renderManager
-    isPopup: isPopup,
-    // 标记当前场景是否为弹窗
-    getCallTemplate: function getCallTemplate(params) {
-      var com = params.com,
-        pinId = params.pinId,
-        args = params.args;
-      // 优先通过 sceneId 查找，如果找不到再通过 id 查找
-      var targetScene = getSceneById(com.sceneId || com.id);
-      if (targetScene || com.isScene) {
-        var _targetScene$deps, _targetScene$inputs, _targetScene$outputs;
-        var sceneId = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.id) || com.sceneId || com.id;
-        var isTargetPopup = (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 routerName = isTargetPopup ? "popupRouter" : "pageRouter";
-
-        // 动态判断 pinId 是否属于该场景的输入或输出
-        var isInput = targetScene === null || targetScene === void 0 || (_targetScene$inputs = targetScene.inputs) === null || _targetScene$inputs === void 0 ? void 0 : _targetScene$inputs.some(function (pin) {
-          return pin.id === pinId;
-        });
-        var isOutput = targetScene === null || targetScene === void 0 || (_targetScene$outputs = targetScene.outputs) === null || _targetScene$outputs === void 0 ? void 0 : _targetScene$outputs.some(function (pin) {
-          return pin.id === pinId;
-        });
-
-        // 调用的方法名
-        var callMethodName = getCallMethodName(com, pinId, isTargetPopup);
-        if (isInput || isOutput) {
-          var _config$getPageId;
-          return {
-            code: "".concat(routerName, ".").concat(callMethodName, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, sceneId)) || sceneId, "\"").concat(args ? ", ".concat(args) : "", ")"),
-            import: {
-              packageName: config.getComponentPackageName(),
-              dependencyNames: [routerName],
-              importType: "named"
-            }
-          };
-        }
-      }
-      return undefined;
-    },
-    getDslComNameById: function getDslComNameById(id) {
-      return dslComIdToNameMap[id];
-    },
-    getCurrentScene: function getCurrentScene() {
-      var originalScene = getSceneById(scene.id);
-      return _objectSpread(_objectSpread(_objectSpread({}, scene), originalScene), {}, {
-        event: event
-      });
-    },
-    add: function add(value) {
-      params.addResult(_objectSpread(_objectSpread({}, value), {}, {
-        type: isPopup ? "popup" : originalScene !== null && originalScene !== void 0 && originalScene.type ? originalScene.type : "normal",
-        meta: scene,
-        pageConfigContent: pageConfigContent,
-        jsModules: localJsModules
-      }));
-    },
-    addJSModule: function addJSModule(module) {
-      if (!jsModulesMap.has(module.id)) {
-        jsModulesMap.set(module.id, module);
-      }
-    },
-    getEventByDiagramId: eventQueries.getEventByDiagramId,
-    getFrameInputEvent: eventQueries.getFrameInputEvent,
-    getVarEvents: eventQueries.getVarEvents,
-    getFxEvents: eventQueries.getFxEvents,
-    checkIsRoot: function checkIsRoot() {
-      return true;
-    },
-    getEffectEvent: eventQueries.getEffectEvent,
-    getCurrentProvider: function getCurrentProvider() {
-      return currentProvider;
-    },
-    getRootProvider: function getRootProvider() {
-      return currentProvider;
-    },
-    getProviderMap: function getProviderMap() {
-      return providerMap;
-    },
-    getExtensionEventById: getExtensionEventById,
-    getSceneById: getSceneById,
-    getFrameById: getFrameById,
-    depth: 0,
-    getTypeDef: function getTypeDef() {
-      return typeDef;
-    },
-    getFxsMap: function getFxsMap() {
-      return fxsMap;
-    },
-    setAbstractEventTypeDefMap: function setAbstractEventTypeDefMap(params) {
-      var comId = params.comId,
-        eventId = params.eventId,
-        typeDef = params.typeDef,
-        schema = params.schema;
-      if (!abstractEventTypeDefMap[comId]) {
-        abstractEventTypeDefMap[comId] = {
-          typeDef: typeDef,
-          eventIdMap: {}
-        };
-      }
-      abstractEventTypeDefMap[comId].eventIdMap[eventId] = schema;
-    }
-  }));
-};
-
-/**
- * 处理所有场景
- */
-export var processScenes = function processScenes(scenes, params) {
-  scenes.forEach(function (scene) {
-    processScene(_objectSpread(_objectSpread({}, params), {}, {
-      scene: scene
-    }));
-  });
-};

package/dist/esm/processors/processSceneLogic.d.ts

@@ -1,7 +0,0 @@
-/**
- * 处理场景/插槽的逻辑（事件流、输入项等）
- */
-export declare const processSceneLogic: (ui: any, config: any, addDependencyImport: any) => {
-    initCode: string;
-    effectCode: string;
-};

package/dist/esm/processors/processSceneLogic.js

@@ -1,247 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { indentation, getSafeVarName, getInitValueBySchema } from "../utils";
-import { handleProcess } from "../utils/logic/handleProcess";
-function sanitizeBlockComment(text) {
-  var s = String(text !== null && text !== void 0 ? text : "").trim();
-  if (!s) return "";
-  // 避免 title 中出现 */ 破坏注释
-  return s.replace(/\*\//g, "* /");
-}
-
-/**
- * 处理场景/插槽的逻辑（事件流、输入项等）
- */
-export var processSceneLogic = function processSceneLogic(ui, config, addDependencyImport) {
-  var initCode = "";
-  var effectCode = "";
-  var indent2 = indentation(config.codeStyle.indent);
-  var currentScene = config.getCurrentScene();
-  var providerName = config.getCurrentProvider().name;
-
-  // 1. 初始化变量和 FX：放在 render 阶段（useEffect 之前），避免用户在首帧触发事件时 $vars/$fxs 仍未初始化
-  initCode += processLogicalInit(currentScene, config, addDependencyImport, indent2, providerName);
-
-  // 如果不是 root，目前只处理初始化逻辑
-  if (!config.checkIsRoot()) return {
-    initCode: initCode,
-    effectCode: effectCode
-  };
-
-  // 2. 处理场景级事件（如 Start 节点）
-  effectCode += processSceneEvents(ui, currentScene, config, addDependencyImport, indent2);
-
-  // 3. 处理场景级输入（如 open）
-  effectCode += processSceneInputs(currentScene, config, addDependencyImport, indent2);
-
-  // 4. 处理变量监听事件（starter.type === 'var'，例如 changed）
-  effectCode += processVarEvents(currentScene, config, addDependencyImport, indent2);
-  return {
-    initCode: initCode,
-    effectCode: effectCode
-  };
-};
-
-/**
- * 处理变量监听事件（例如变量 changed -> 驱动一条 diagram）
- * 关键点：更新 UI 不是靠 React state，而是靠 runtime inputs（例如 Text.value）
- */
-var processVarEvents = function processVarEvents(currentScene, config, addDependencyImport, indent) {
-  var _config$getVarEvents;
-  var code = "";
-  var varEvents = ((_config$getVarEvents = config.getVarEvents) === null || _config$getVarEvents === void 0 ? void 0 : _config$getVarEvents.call(config)) || [];
-  if (!Array.isArray(varEvents) || varEvents.length === 0) return code;
-
-  // 用于订阅 variable.changed() 结果
-  var importParams = {
-    isPopup: config.isPopup
-  };
-  addDependencyImport({
-    packageName: config.getUtilsPackageName(importParams),
-    dependencyNames: ["SUBJECT_SUBSCRIBE"],
-    importType: "named"
-  });
-  varEvents.forEach(function (varEvent) {
-    if ((varEvent === null || varEvent === void 0 ? void 0 : varEvent.type) !== "var") return;
-    // toCode-react 的 var event 自带 meta（变量组件）+ paramId（输出 pin，如 changed/return）
-    var com = varEvent === null || varEvent === void 0 ? void 0 : varEvent.meta;
-    if (!(com !== null && com !== void 0 && com.id)) return;
-    var pinId = (varEvent === null || varEvent === void 0 ? void 0 : varEvent.paramId) || "changed";
-    var varName = getSafeVarName(com);
-
-    // params 映射：toCode-react 会用 paramSource: [{type:'params', id:'changed'}]
-    // 这里用 Proxy 保证任何 params.xxx 都能落到 value 上（避免强依赖 paramPins）
-    var paramsProxy = new Proxy({}, {
-      get: function get() {
-        return "value";
-      }
-    });
-    var process = handleProcess(varEvent, _objectSpread(_objectSpread({}, config), {}, {
-      target: "comRefs.current",
-      depth: 3,
-      addParentDependencyImport: addDependencyImport,
-      getParams: function getParams() {
-        return paramsProxy;
-      }
-    })).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
-    if (!process.trim()) return;
-    code += "\n".concat(indent, "  /** \u53D8\u91CF ").concat(sanitizeBlockComment(com.title || varName), " \u7684 ").concat(pinId, " */");
-    // 使用 registerChange 订阅变量事件，确保有初始值时也能触发
-    code += "\n".concat(indent, "  const run_").concat(varName, "_").concat(pinId, " = (value: any) => {\n").concat(process, "\n").concat(indent, "  };");
-    code += "\n".concat(indent, "  $vars.current.").concat(varName, ".registerChange((changeValue: any) => {");
-    code += "\n".concat(indent, "    changeValue[SUBJECT_SUBSCRIBE](run_").concat(varName, "_").concat(pinId, ");");
-    code += "\n".concat(indent, "  });");
-  });
-  return code;
-};
-
-/**
- * 初始化变量和 FX
- */
-var processLogicalInit = function processLogicalInit(scene, config, addDependencyImport, indent, providerName) {
-  var code = "";
-
-  // 1. 初始化 Vars
-  var vars = Object.entries(scene.coms || {}).filter(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      com = _ref2[1];
-    return com.def.namespace === "mybricks.core-comlib.var";
-  });
-  if (vars.length > 0) {
-    var importParams = {
-      isPopup: config.isPopup
-    };
-    addDependencyImport({
-      packageName: config.getUtilsPackageName(importParams),
-      dependencyNames: ["createVariable"],
-      importType: "named"
-    });
-    // $vars 是页面级共享注册表（与 comRefs 同级）
-    code += "\n".concat(indent, "const vars = ($vars.current ||= {});");
-    vars.forEach(function (_ref3) {
-      var _com$model, _com$model2, _com$model3;
-      var _ref4 = _slicedToArray(_ref3, 2),
-        comId = _ref4[0],
-        com = _ref4[1];
-      var varName = getSafeVarName(com);
-      var varTitle = sanitizeBlockComment((com === null || com === void 0 ? void 0 : com.title) || (com === null || com === void 0 || (_com$model = com.model) === null || _com$model === void 0 ? void 0 : _com$model.title) || (com === null || com === void 0 || (_com$model2 = com.model) === null || _com$model2 === void 0 || (_com$model2 = _com$model2.data) === null || _com$model2 === void 0 ? void 0 : _com$model2.title) || varName);
-      var initValue = JSON.stringify(getInitValueBySchema(com.schema, (_com$model3 = com.model) === null || _com$model3 === void 0 || (_com$model3 = _com$model3.data) === null || _com$model3 === void 0 ? void 0 : _com$model3.initValue));
-      code += "\n".concat(indent, "/** \u521D\u59CB\u5316 \u53D8\u91CF ").concat(varTitle, " */");
-      code += "\n".concat(indent, "if (!vars.").concat(varName, ") vars.").concat(varName, " = createVariable(").concat(initValue, ");");
-    });
-  }
-
-  // 2. 初始化 Fxs (使用 getFxEvents 获取 FX 列表)
-  var fxEvents = config.getFxEvents();
-  if (fxEvents.length > 0) {
-    var _importParams = {
-      isPopup: config.isPopup
-    };
-    addDependencyImport({
-      packageName: config.getUtilsPackageName(_importParams),
-      dependencyNames: ["createFx"],
-      importType: "named"
-    });
-    // $fxs 是页面级共享注册表（与 comRefs 同级）
-    code += "\n".concat(indent, "const fxs = ($fxs.current ||= {});");
-    fxEvents.forEach(function (fxEvent) {
-      var res = handleProcess(fxEvent, _objectSpread(_objectSpread({}, config), {}, {
-        depth: 3,
-        getCurrentScene: function getCurrentScene() {
-          return _objectSpread({
-            id: fxEvent.frameId
-          }, fxEvent);
-        },
-        addParentDependencyImport: addDependencyImport,
-        getParams: function getParams() {
-          return (fxEvent.paramPins || []).reduce(function (pre, cur, index) {
-            pre[cur.id] = "value".concat(index);
-            return pre;
-          }, {});
-        }
-      })).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
-      var values = (fxEvent.paramPins || []).map(function (paramPin, index) {
-        if (paramPin.type === "config") {
-          var _fxEvent$initValues;
-          return "value".concat(index, ": any = ").concat(JSON.stringify(((_fxEvent$initValues = fxEvent.initValues) === null || _fxEvent$initValues === void 0 ? void 0 : _fxEvent$initValues[paramPin.id]) || {}));
-        }
-        return "value".concat(index, ": any");
-      }).join(", ");
-      code += "\n".concat(indent, "if (!fxs.").concat(fxEvent.frameId, ") fxs.").concat(fxEvent.frameId, " = createFx((").concat(values, ") => {\n").concat(res, "\n").concat(indent, "});");
-    });
-  }
-  return code;
-};
-
-/**
- * 处理场景级事件
- */
-var processSceneEvents = function processSceneEvents(ui, currentScene, config, addDependencyImport, indent) {
-  var code = "";
-  var sceneEvents = (currentScene === null || currentScene === void 0 ? void 0 : currentScene.events) || (ui === null || ui === void 0 ? void 0 : ui.events) || [];
-  if (!Array.isArray(sceneEvents)) return code;
-  sceneEvents.forEach(function (eventInfo) {
-    var type = eventInfo.type,
-      diagramId = eventInfo.diagramId,
-      active = eventInfo.active;
-    if (active !== false && type === "defined" && diagramId) {
-      var event = config.getEventByDiagramId(diagramId);
-      if (event) {
-        var process = handleProcess(event, _objectSpread(_objectSpread({}, config), {}, {
-          target: "comRefs.current",
-          depth: 2,
-          addParentDependencyImport: addDependencyImport,
-          getParams: function getParams() {
-            return {};
-          }
-        })).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
-        if (process.trim()) {
-          code += "\n".concat(indent, "  ").concat(process.trim());
-        }
-      }
-    }
-  });
-  return code;
-};
-
-/**
- * 处理场景级输入
- */
-var processSceneInputs = function processSceneInputs(currentScene, config, addDependencyImport, indent) {
-  var code = "";
-  var sceneInputs = (currentScene === null || currentScene === void 0 ? void 0 : currentScene.inputs) || [];
-  if (!Array.isArray(sceneInputs) || sceneInputs.length === 0) return code;
-
-  // 约定：场景级 inputs 挂载到 $inputs，避免与组件 runtime 的 inputs 冲突
-  code += "\n".concat(indent, "  const inputs = comRefs.current.$inputs;");
-  sceneInputs.forEach(function (input) {
-    var event = config.getFrameInputEvent(input.id, currentScene.id);
-    if (!event) return;
-    var process = handleProcess(event, _objectSpread(_objectSpread({}, config), {}, {
-      target: "comRefs.current",
-      depth: 3,
-      addParentDependencyImport: addDependencyImport,
-      getParams: function getParams() {
-        return _defineProperty({}, input.id, "data");
-      }
-    })).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
-    if (process.trim()) {
-      code += "\n".concat(indent, "  inputs.").concat(input.id, " = (data: any) => {\n").concat(process, "\n").concat(indent, "  };");
-      if (input.id === "open") {
-        var importParams = {
-          isPopup: config.isPopup
-        };
-        var controllerName = config.isPopup ? "popupRouter" : "pageRouter";
-        addDependencyImport({
-          packageName: config.getComponentPackageName(importParams),
-          dependencyNames: [controllerName, "SUBJECT_SUBSCRIBE"],
-          importType: "named"
-        });
-        // 使用 SUBJECT_SUBSCRIBE 订阅，不修改 Subject.js
-        code += "\n".concat(indent, "  ").concat(controllerName, ".getParams(\"").concat(currentScene.id, "\")[SUBJECT_SUBSCRIBE]((val: any) => {\n").concat(indent, "    inputs.open(val);\n").concat(indent, "  });");
-      }
-    }
-  });
-  return code;
-};

package/dist/esm/shims-taro.d.ts

@@ -1,20 +0,0 @@
-/**
- * 由于本仓库以生成代码为主，运行时依赖由宿主项目提供，
- * 这里补充最小化的模块声明以避免编辑器/类型检查报错。
- */
-
-declare module '@tarojs/taro' {
-  const Taro: any;
-  export default Taro;
-}
-
-declare module '@tarojs/components' {
-  export const View: any;
-  export const Text: any;
-  export const Image: any;
-  export const Button: any;
-  const components: any;
-  export default components;
-}
-
-