openapi-ts-request 0.7.0 → 0.8.0

package/dist/generator/serviceGenarator.js

@@ -87,10 +87,11 @@ class ServiceGenerator {
                 interfaceFileName: config_1.interfaceFileName,
             });
         }
+        const displayTypeLabels = (0, lodash_1.filter)(interfaceTPConfigs, (item) => !item.isEnum);
         // 生成 type 翻译
-        if (this.config.isDisplayTypeLabel) {
+        if (this.config.isDisplayTypeLabel && !(0, lodash_1.isEmpty)(displayTypeLabels)) {
             this.genFileFromTemplate(`${config_1.displayTypeLabelFileName}.ts`, config_1.TypescriptFileType.displayTypeLabel, {
-                list: (0, lodash_1.filter)(interfaceTPConfigs, (item) => !item.isEnum),
+                list: displayTypeLabels,
                 namespace: this.config.namespace,
                 interfaceFileName: config_1.interfaceFileName,
             });
@@ -104,15 +105,7 @@ class ServiceGenerator {
         if (prettierError.includes(true)) {
             (0, log_1.default)('🚥 格式化失败，请检查 service controller 文件内可能存在的语法错误');
         }
-        // 生成 service index 文件
-        this.genFileFromTemplate(`${config_1.serviceEntryFileName}.ts`, config_1.TypescriptFileType.serviceIndex, {
-            list: this.classNameList,
-            namespace: this.config.namespace,
-            interfaceFileName: config_1.interfaceFileName,
-            schemaFileName: config_1.schemaFileName,
-            isGenJsonSchemas: this.config.isGenJsonSchemas,
-        });
-        if (this.config.isGenJsonSchemas) {
+        if (this.config.isGenJsonSchemas && !(0, lodash_1.isEmpty)(this.schemaList)) {
             // 处理重复的 schemaName
             (0, util_1.handleDuplicateTypeNames)(this.schemaList);
             // 生成 schema 文件
@@ -120,6 +113,18 @@ class ServiceGenerator {
                 list: this.schemaList,
             });
         }
+        // 生成 service index 文件
+        this.genFileFromTemplate(`${config_1.serviceEntryFileName}.ts`, config_1.TypescriptFileType.serviceIndex, {
+            list: this.classNameList,
+            namespace: this.config.namespace,
+            interfaceFileName: config_1.interfaceFileName,
+            isGenJsonSchemas: this.config.isGenJsonSchemas && !(0, lodash_1.isEmpty)(this.schemaList),
+            schemaFileName: config_1.schemaFileName,
+            isDisplayEnumLabel: !(0, lodash_1.isEmpty)(enums),
+            displayEnumLabelFileName: config_1.displayEnumLabelFileName,
+            isDisplayTypeLabel: this.config.isDisplayTypeLabel && !(0, lodash_1.isEmpty)(displayTypeLabels),
+            displayTypeLabelFileName: config_1.displayTypeLabelFileName,
+        });
         // 打印日志
         (0, log_1.default)('✅ 成功生成 api 文件');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Swagger2/OpenAPI3 to TypeScript, request client, request mock service, enum, type field label, JSON Schemas",
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
     "husky": "^9.0.11",
     "lint-staged": "^15.2.5",
     "openapi-types": "^12.1.3",
-    "typescript": "5.6.2"
+    "typescript": "5.6.3"
   },
   "keywords": [
     "openapi",

package/templates/interface.njk

@@ -52,5 +52,5 @@
     {%- endif %}
   {% endfor %}
 {%- else %}
-  export default {}
+  export {}
 {%- endif %}

package/templates/schema.njk

@@ -3,6 +3,4 @@
   export const {{ type.typeName }} = {{ type.type }}
 
   {% endfor -%}
-{%- else %}
-  export default {}
 {%- endif %}

package/templates/serviceIndex.njk

@@ -1,6 +1,12 @@
 /* eslint-disable */
 // @ts-ignore
 import * as {{ namespace }} from './{{ interfaceFileName }}';
+{%- if isDisplayEnumLabel %}
+import * as displayEnumLabels from './{{ displayEnumLabelFileName }}';
+{%- endif %}
+{%- if isDisplayTypeLabel %}
+import * as displayTypeLabels from './{{ displayTypeLabelFileName }}';
+{%- endif %}
 {%- if isGenJsonSchemas %}
 import * as schemas from './{{ schemaFileName }}';
 {%- endif %}
@@ -8,11 +14,17 @@ import * as schemas from './{{ schemaFileName }}';
 import * as {{ api.controllerName }} from './{{ api.fileName }}';
 {% endfor -%}
 
-export default {
+export {
+  {{ namespace }},
+  {%- if isDisplayEnumLabel %}
+  displayEnumLabels,
+  {%- endif %}
+  {%- if isDisplayTypeLabel %}
+  displayTypeLabels,
+  {%- endif %}
   {%- if isGenJsonSchemas %}
   schemas,
   {%- endif %}
-  {{ namespace }},
   {% for api in list -%}
   {{ api.controllerName }},
   {% endfor -%}