ddm-plugin-dubbo-support 0.1.3 → 0.1.4

package/dist/index.js

@@ -661,7 +661,7 @@ class AppProxy {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"ddm-plugin-dubbo-support","version":"0.1.1","description":"Dubbo-Desktop-Manager插件-支持Dubbo框架","main":"dist/index.js","rendererMain":"dist/renderer.js","i18nMain":"dist/i18n.js","files":["README.md","logo.png","public/**","dist/**","docs/**","java-invoke/**"],"scripts":{"dev":"webpack","gen:keywords":"node ./scripts/gen-keywords.js","prepublishOnly":"npm run gen:keywords","publish":"webpack && npm publish"},"keywords":["Dubbo-Desktop-Manager","ddm-plugin","ddm","dubbo","dubbo service invoke","dubbo manager","dubbo console","dubbo admin","-","-s","-su","-sup","-supp","-suppo","-suppor","-support","b","bb","bbo","bbo-","bbo-s","bbo-su","bbo-sup","bbo-supp","bbo-suppo","bbo-suppor","bbo-support","bo","bo-","bo-s","bo-su","bo-sup","bo-supp","bo-suppo","bo-suppor","bo-support","d","du","dub","dubb","dubbo-","dubbo-s","dubbo-su","dubbo-sup","dubbo-supp","dubbo-suppo","dubbo-suppor","dubbo-support","o","o-","o-s","o-su","o-sup","o-supp","o-suppo","o-suppor","o-support","or","ort","p","po","por","port","pp","ppo","ppor","pport","r","rt","s","su","sup","supp","suppo","suppor","support","t","u","ub","ubb","ubbo","ubbo-","ubbo-s","ubbo-su","ubbo-sup","ubbo-supp","ubbo-suppo","ubbo-suppor","ubbo-support","up","upp","uppo","uppor","upport"],"homepage":"https://github.com/ddm-plugin/ddm-plugin-dubbo-support","author":"qiaolin","license":"Apache 2.0","devDependencies":{"@babel/core":"^7.24.7","babel-cli":"^6.26.0","babel-loader":"^8.2.5","css-loader":"^6.11.0","js-yaml":"^4.1.0","json-bigint":"^1.0.0","moment":"^2.29.1","node-zookeeper-client":"^1.1.1","qs":"^6.11.0","style-loader":"^3.3.4","telnet-stream":"^1.0.5","urijs":"^1.19.11","vue":"^2.6.11","vue-loader":"15.11.1","vue-style-loader":"^4.1.3","vue-template-compiler":"^2.6.11","webpack":"^5.92.1","webpack-cli":"^5.1.4"},"engines":{"ddm":">=1.1.0 <3.0.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"ddm-plugin-dubbo-support","version":"0.1.4","description":"Dubbo-Desktop-Manager插件-支持Dubbo框架","main":"dist/index.js","rendererMain":"dist/renderer.js","i18nMain":"dist/i18n.js","files":["README.md","logo.png","public/**","dist/**","docs/**","java-invoke/**"],"scripts":{"dev":"webpack","gen:keywords":"node ./scripts/gen-keywords.js","prepublishOnly":"npm run gen:keywords","publish":"webpack && npm publish"},"keywords":["Dubbo-Desktop-Manager","ddm-plugin","ddm","dubbo","dubbo service invoke","dubbo manager","dubbo console","dubbo admin","-","-s","-su","-sup","-supp","-suppo","-suppor","-support","b","bb","bbo","bbo-","bbo-s","bbo-su","bbo-sup","bbo-supp","bbo-suppo","bbo-suppor","bbo-support","bo","bo-","bo-s","bo-su","bo-sup","bo-supp","bo-suppo","bo-suppor","bo-support","d","du","dub","dubb","dubbo-","dubbo-s","dubbo-su","dubbo-sup","dubbo-supp","dubbo-suppo","dubbo-suppor","dubbo-support","o","o-","o-s","o-su","o-sup","o-supp","o-suppo","o-suppor","o-support","or","ort","p","po","por","port","pp","ppo","ppor","pport","r","rt","s","su","sup","supp","suppo","suppor","support","t","u","ub","ubb","ubbo","ubbo-","ubbo-s","ubbo-su","ubbo-sup","ubbo-supp","ubbo-suppo","ubbo-suppor","ubbo-support","up","upp","uppo","uppor","upport"],"homepage":"https://github.com/ddm-plugin/ddm-plugin-dubbo-support","author":"qiaolin","license":"Apache 2.0","devDependencies":{"@babel/core":"^7.24.7","babel-cli":"^6.26.0","babel-loader":"^8.2.5","css-loader":"^6.11.0","js-yaml":"^4.1.0","json-bigint":"^1.0.0","moment":"^2.29.1","node-zookeeper-client":"^1.1.1","qs":"^6.11.0","style-loader":"^3.3.4","telnet-stream":"^1.0.5","urijs":"^1.19.11","vue":"^2.6.11","vue-loader":"15.11.1","vue-style-loader":"^4.1.3","vue-template-compiler":"^2.6.11","webpack":"^5.92.1","webpack-cli":"^5.1.4"},"engines":{"ddm":">=1.1.0 <3.0.0"}}');
 
 /***/ }),
 /* 16 */
@@ -48692,11 +48692,11 @@ class ParamGeneratorDubbo3 {
 
     // 未找到方法
     if (!method) {
-      return null;
+      return [];
     }
     const typeMap = this.typeListToTypeMap(mateData.types);
     return method.parameterTypes.map(parameterType => {
-      return this.generateObject(typeMap, typeMap[parameterType]);
+      return this.generateObject(typeMap, [], typeMap[parameterType]);
     });
   }
   typeListToTypeMap(types) {
@@ -48709,57 +48709,53 @@ class ParamGeneratorDubbo3 {
     });
     return typeMap;
   }
-  generateObject(typeMap, typeInfo) {
+  generateObject(typeMap, parentTypes, typeInfo) {
     // Map 类型
     if (this.isMap(typeMap, typeInfo)) {
-      return this.generateMapType(typeMap, typeInfo);
+      return this.generateMapType(typeMap, parentTypes, typeInfo);
     }
 
     // 数组
     if (this.isArray(typeMap, typeInfo)) {
-      return this.generateArrayType(typeMap, typeInfo);
+      return this.generateArrayType(typeMap, parentTypes, typeInfo);
     }
 
     // 集合
     if (this.isCollection(typeMap, typeInfo)) {
-      return this.generateCollectionType(typeMap, typeInfo);
+      return this.generateCollectionType(typeMap, parentTypes, typeInfo);
     }
 
     // 对象类型
     if (this.isComplexType(typeMap, typeInfo)) {
-      return this.generateComplexType(typeMap, typeInfo);
+      return this.generateComplexType(typeMap, parentTypes, typeInfo);
     }
 
     // 基本类型
     return _ValueGenerator_js__WEBPACK_IMPORTED_MODULE_0__["default"].generate("", typeInfo.type);
   }
-  generateMapType(typeMap, typeInfo) {
+  generateMapType(typeMap, parentTypes, typeInfo) {
     const {
       type
     } = typeInfo;
     let keyStartOffset = type.indexOf("<");
-    let keyEndOffset = type.indexOf(",");
+    let commaOffset = type.indexOf(",");
+    let valueEndOffset = type.lastIndexOf(">");
 
     // 没有泛型
-    if (keyStartOffset < 0 || keyEndOffset < 0) {
-      return {};
-    }
-    let valueStartOffset = type.indexOf(",");
-    let valueEndOffset = type.indexOf(">");
-    if (valueStartOffset < 0 || valueEndOffset < 0) {
+    if (keyStartOffset < 0 || commaOffset < 0 || valueEndOffset < 0) {
       return {};
     }
 
     // 解析key与value
-    let keyType = type.substring(keyStartOffset + 1, keyEndOffset);
-    let valueType = type.substring(valueStartOffset + 1, valueEndOffset);
+    let keyType = type.substring(keyStartOffset + 1, commaOffset);
+    let valueType = type.substring(commaOffset + 1, valueEndOffset);
 
     // 可能会有Map的key里面放对象，但这也没有办法了...
     let data = {};
-    data[keyType] = this.generateObject(typeMap, typeMap[valueType]);
+    data[keyType] = this.generateObject(typeMap, parentTypes, typeMap[valueType]);
     return data;
   }
-  generateCollectionType(typeMap, typeInfo) {
+  generateCollectionType(typeMap, parentTypes, typeInfo) {
     const {
       type
     } = typeInfo;
@@ -48771,30 +48767,34 @@ class ParamGeneratorDubbo3 {
     }
 
     // 子类型
-    const subTypeInfo = typeMap[type.substring(startOffset + 1, type.indexOf(">"))];
+    const subTypeInfo = typeMap[type.substring(startOffset + 1, type.lastIndexOf(">"))];
 
     // 子类型有可能不存在
     if (!subTypeInfo) {
       return [];
     }
-    return [this.generateObject(typeMap, subTypeInfo)];
+    return [this.generateObject(typeMap, parentTypes, subTypeInfo)];
   }
-  generateArrayType(typeMap, typeInfo) {
+  generateArrayType(typeMap, parentTypes, typeInfo) {
     const {
       type
     } = typeInfo;
     let offset = type.indexOf("[]");
     let realType = type.substring(0, offset);
-    return [this.generateObject(typeMap, typeMap[realType])];
+    return [this.generateObject(typeMap, parentTypes, typeMap[realType])];
   }
-  generateComplexType(typeMap, typeInfo) {
-    if (typeInfo.properties == null || typeInfo.properties.length == 0) {
+  generateComplexType(typeMap, parentTypes, typeInfo) {
+    // 以下情况直接返回空对象
+    // 1. 没有属性了
+    // 2. 出现循环引用了
+    if (typeInfo.properties == null || typeInfo.properties.length == 0 || parentTypes.includes(typeInfo.type)) {
       return {};
     }
+    parentTypes = [...parentTypes, typeInfo.type];
     let data = {};
     for (let property in typeInfo.properties) {
       const type = typeInfo.properties[property];
-      data[property] = this.generateObject(typeMap, typeMap[type]);
+      data[property] = this.generateObject(typeMap, parentTypes, typeMap[type]);
     }
     return data;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddm-plugin-dubbo-support",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Dubbo-Desktop-Manager插件-支持Dubbo框架",
   "main": "dist/index.js",
   "rendererMain": "dist/renderer.js",