@wx-sab/renkei 1.0.2 → 1.1.0

package/lib/core/generate.js

@@ -143,13 +143,21 @@ const generateApis = (config, services // 指定服务
     // 进度条控制
     const progress = new cli_progress_1.default.SingleBar({});
     progress.start(_configs.length, 0);
+    let failedServices = []; // 统计失败服务
     try {
         for (var _d = true, _configs_1 = __asyncValues(_configs), _configs_1_1; _configs_1_1 = yield _configs_1.next(), _a = _configs_1_1.done, !_a; _d = true) {
             _c = _configs_1_1.value;
             _d = false;
             const conf = _c;
-            yield (0, exports.generate)(conf);
-            progress.increment(1);
+            try {
+                yield (0, exports.generate)(conf);
+            }
+            catch (e) {
+                failedServices.push(conf.serviceName);
+            }
+            finally {
+                progress.increment(1);
+            }
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -160,6 +168,8 @@ const generateApis = (config, services // 指定服务
         finally { if (e_1) throw e_1.error; }
     }
     progress.stop();
-    console.info("✅ 执行完毕");
+    console.info(`✅ 执行完毕${failedServices.length
+        ? `，以下服务生成失败: ${failedServices.join("、")}`
+        : ""}`);
 });
 exports.generateApis = generateApis;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wx-sab/renkei",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "解析swagger转为ts代码，日本动漫《游戏王》中的‘Renkei’，意为连携或协作。",
   "main": "./lib/index.js",
   "bin": {

package/templates/api.ejs

@@ -93,7 +93,7 @@ export class <%~ serviceName %> {
   <% routes.combined && routes.combined.forEach(({ routes = [], moduleName }) => { %>
     <% routes.forEach((route) => { %>
 
-        <%~ includeFile('./procedure-call.eta', { ...it, route }) %>
+        <%~ includeFile('./procedure-call.ejs', { ...it, route }) %>
 
     <% }) %>
   <% }) %>

package/templates/procedure-call.ejs

@@ -22,8 +22,19 @@ const requestConfigParam = {
 const getListItemType = (type) => type.replace(/\((\w+)\)\[\]/g, (match, key) => `${key}[]`)
 
 const getFullType = (type) => {
+    const originType = type;
+
+    // 处理列表list
+    const matchList = type.match(/\((\w+)\)\[\]/)
+    if (matchList) {
+        type = matchList[1]
+    }
+
     const matchType = modelTypes.find(t => (t.name || t.type) === type)
     if (!matchType) {
+        if (matchList) {
+            return originType
+        }
         return type
     }