openapi-ts-request 1.3.3 → 1.4.0

package/dist/generator/util.js

@@ -171,13 +171,18 @@ function getDefaultType(schemaObject, namespace = '', schemas) {
         return `(${allofList.join(' & ')})`;
     }
     if (schemaObject.type === 'object' || schemaObject.properties) {
+        if ((0, lodash_1.isObject)(schemaObject.additionalProperties)) {
+            const type = getDefaultType(schemaObject.additionalProperties, namespace, schemas);
+            return `Record<string, ${type}>`;
+        }
         if (!(0, lodash_1.keys)(schemaObject.properties).length) {
             return 'Record<string, unknown>';
         }
         return `{ ${(0, lodash_1.keys)(schemaObject.properties)
             .map((key) => {
-            var _a, _b;
+            var _a;
             let required = false;
+            const property = (((_a = schemaObject.properties) === null || _a === void 0 ? void 0 : _a[key]) || {});
             if ((0, lodash_1.isBoolean)(schemaObject.required) && schemaObject.required) {
                 required = true;
             }
@@ -185,8 +190,7 @@ function getDefaultType(schemaObject, namespace = '', schemas) {
                 schemaObject.required.includes(key)) {
                 required = true;
             }
-            if ('required' in (schemaObject.properties[key] || {}) &&
-                ((_a = schemaObject.properties[key]) === null || _a === void 0 ? void 0 : _a.required)) {
+            if (property.required) {
                 required = true;
             }
             /**
@@ -195,18 +199,29 @@ function getDefaultType(schemaObject, namespace = '', schemas) {
              * 在后面进行格式化的时候会将正确的字符串转换为正常形式，
              * 错误的继续保留字符串。
              * */
-            return `'${key}'${required ? '' : '?'}: ${getDefaultType((_b = schemaObject.properties) === null || _b === void 0 ? void 0 : _b[key], namespace)}; `;
+            return `
+        ${property.description ? `/** ${property.description} */` : ''}
+        '${key}'${required ? '' : '?'}: ${getDefaultType(property, namespace)}; `;
         })
             .join('')}}`;
     }
     return 'unknown';
 }
 function getDefaultFileTag(operationObject, apiPath) {
-    return operationObject['x-swagger-router-controller']
-        ? [operationObject['x-swagger-router-controller']]
-        : operationObject.tags || [operationObject.operationId] || [
-            apiPath.replace('/', '').split('/')[1],
-        ];
+    let lastTags = [];
+    if (operationObject['x-swagger-router-controller']) {
+        lastTags = [operationObject['x-swagger-router-controller']];
+    }
+    else if (!(0, lodash_1.isEmpty)(operationObject.tags)) {
+        lastTags = operationObject.tags;
+    }
+    else if (operationObject.operationId) {
+        lastTags = [operationObject.operationId];
+    }
+    else {
+        lastTags = [apiPath.replace('/', '').split('/')[1]];
+    }
+    return lastTags;
 }
 function findDuplicateTypeNames(arr) {
     const counts = (0, lodash_1.countBy)(arr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "Swagger2/OpenAPI3/Apifox to TypeScript/JavaScript, request client(support any client), request mock service, enum and enum translation, react-query/vue-query, type field label, JSON Schemas",
   "engines": {
     "node": ">=18.0.0",