openapi-ts-request 0.3.0 → 0.3.2

package/dist/generator/serviceGenarator.js

@@ -107,6 +107,7 @@ class ServiceGenerator {
             namespace: this.config.namespace,
             interfaceFileName: config_1.interfaceFileName,
             schemaFileName: config_1.schemaFileName,
+            isGenJsonSchemas: this.config.isGenJsonSchemas,
         });
         if (this.config.isGenJsonSchemas) {
             // 处理重复的 schemaName

package/dist/generator/util.js

@@ -275,14 +275,14 @@ function resolveFunctionName(functionName, methodName) {
 exports.resolveFunctionName = resolveFunctionName;
 // 标记引用的 $ref 对应的schema
 function markAllowSchema(schemaStr, schemas) {
-    const refs = schemaStr.match(/#\/components\/schemas\/([A-Za-z0-9._-]+)/g);
+    const refs = schemaStr === null || schemaStr === void 0 ? void 0 : schemaStr.match(/#\/components\/schemas\/([A-Za-z0-9._-]+)/g);
     (0, lodash_1.forEach)(refs, (ref) => {
         const refPaths = ref.split('/');
         const schema = schemas === null || schemas === void 0 ? void 0 : schemas[refPaths[refPaths.length - 1]];
-        if (schema) {
+        if (!(schema === null || schema === void 0 ? void 0 : schema.isAllowed)) {
             schema.isAllowed = true;
+            markAllowSchema(JSON.stringify(schema), schemas);
         }
-        markAllowSchema(JSON.stringify(schema), schemas);
     });
 }
 exports.markAllowSchema = markAllowSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Swagger2/OpenAPI3 to TypeScript, request client, request mock service, enum, type field label, JSON Schemas",
   "repository": {
     "type": "git",

package/templates/serviceIndex.njk

@@ -1,13 +1,18 @@
 /* eslint-disable */
 // @ts-ignore
 import * as {{ namespace }} from './{{ interfaceFileName }}';
+{%- if isGenJsonSchemas %}
 import * as schemas from './{{ schemaFileName }}';
+{%- endif %}
+
 {% for api in list -%}
 import * as {{ api.controllerName }} from './{{ api.fileName }}';
 {% endfor -%}
 
 export default {
+  {%- if isGenJsonSchemas %}
   schemas,
+  {%- endif %}
   {{ namespace }},
   {% for api in list -%}
   {{ api.controllerName }},