fix: 修正 nullable 的升级兼容

FrontEndDev-org · Aug 5, 2024 · c565fdc · c565fdc
1 parent 68557d5
commit c565fdc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/src/migrations/openapi-3_0.ts b/src/migrations/openapi-3_0.ts
@@ -7,17 +7,34 @@ import { isArray, isBoolean, isUndefined } from '../utils/type-is';
 
 function migSchema(schema: OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject): OpenAPIV3_1.SchemaObject | OpenAPIV3_1.ReferenceObject {
     if (isUndefined(schema)) return schema;
-    if ('$ref' in schema) return schema;
+
+    if ('$ref' in schema) {
+        if (schema.nullable) {
+            return {
+                oneOf: [{ $ref: schema.$ref }, { type: 'null' }],
+            };
+        }
+
+        return schema;
+    }
 
     const { type, nullable, properties, additionalProperties, allOf, oneOf, anyOf, ...rest } = schema;
 
     if (allOf || oneOf || anyOf) {
-        return {
+        const schemaOf = {
             ...rest,
             allOf: allOf && allOf.map(migSchema),
             oneOf: oneOf && oneOf.map(migSchema),
             anyOf: anyOf && anyOf.map(migSchema),
         };
+
+        if (nullable) {
+            return {
+                oneOf: [schemaOf, { type: 'null' }],
+            };
+        }
+
+        return schemaOf;
     }
 
     if (type === 'array') {

diff --git a/src/printer/Schemata.ts b/src/printer/Schemata.ts
@@ -30,7 +30,7 @@ export class Schemata {
         const { type, allOf, oneOf, anyOf } = schema;
         const comments = JsDoc.fromSchema(schema);
 
-        if (allOf) {
+        if (allOf && allOf.length > 0) {
             return {
                 comments,
                 type: withGroup(
@@ -41,7 +41,7 @@ export class Schemata {
             };
         }
 
-        if (oneOf) {
+        if (oneOf && oneOf.length > 0) {
             return {
                 comments,
                 type: withGroup(
@@ -52,14 +52,14 @@ export class Schemata {
             };
         }
 
-        if (anyOf) {
+        if (anyOf && anyOf.length > 0) {
             return {
                 comments,
                 type: withGroup(
                     anyOf.map((s) => this.toString(s)),
                     ',',
-                    'AnyOf<',
-                    '>',
+                    'AnyOf<[',
+                    ']>',
                 ),
                 required: false,
             };
@@ -196,7 +196,7 @@ export class Schemata {
                 maxItems,
             },
             // type: withNullable(explicit ? `[${subTypes.join(',')}]` : `((${subTypes.join('|')})[])`, schema.nullable),
-            type: this.toString(schema.items),
+            type: this.toString(schema.items) + '[]',
             required: false,
         };
     }

diff --git a/src/types/openapi-3_0.ts b/src/types/openapi-3_0.ts
@@ -174,6 +174,7 @@ export interface XMLObject {
 }
 export interface ReferenceObject {
     $ref: string;
+    nullable?: boolean;
 }
 export interface ExampleObject {
     summary?: string;