openapi-ts-request 1.12.2 → 1.12.3

package/dist/generator/serviceGeneratorHelper.js

@@ -56,7 +56,16 @@ function resolveEnumObject(params) {
     const enumArray = schemaObject.enum;
     let enumStr = '';
     let enumLabelTypeStr = '';
-    if (config_2.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumber)(enumArray)) {
+    // 获取实际的类型（处理 OpenAPI 3.1 的 type 数组情况）
+    const getActualType = (type) => {
+        if (Array.isArray(type)) {
+            // 如果是数组，返回第一个非 null 类型
+            return type.find((t) => t !== 'null') || 'string';
+        }
+        return type;
+    };
+    const actualType = getActualType(schemaObject.type);
+    if (config_2.numberEnum.includes(actualType) || (0, util_1.isAllNumber)(enumArray)) {
         if (config.isSupportParseEnumDesc && schemaObject.description) {
             const enumMap = (0, util_1.parseDescriptionEnum)(schemaObject.description);
             enumStr = `{${(0, lodash_1.map)(enumArray, (value) => {
@@ -95,7 +104,7 @@ function resolveEnumObject(params) {
         }).join(',')}}`;
     }
     else {
-        if (config_2.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumber)(enumArray)) {
+        if (config_2.numberEnum.includes(actualType) || (0, util_1.isAllNumber)(enumArray)) {
             if ((config.isSupportParseEnumDesc || config.supportParseEnumDescByReg) &&
                 schemaObject.description) {
                 const enumMap = config.isSupportParseEnumDesc
@@ -225,7 +234,14 @@ function resolveRefObject(params) {
         }
         else {
             const schemaObj = schema;
-            resolvedType = schemaObj.type;
+            // 处理 OpenAPI 3.1 的 type 数组情况
+            if (Array.isArray(schemaObj.type)) {
+                // 如果是数组，使用第一个非 null 类型
+                resolvedType = schemaObj.type.find((t) => t !== 'null') || 'string';
+            }
+            else {
+                resolvedType = schemaObj.type;
+            }
         }
         const finalSchema = schema;
         return Object.assign(Object.assign({}, (resolvedSchema || {})), { type: resolvedType || finalSchema.type });

package/dist/generator/util.js

@@ -104,6 +104,16 @@ function getDefaultType(schemaObject, namespace = '', schemas) {
     let type = schemaObject === null || schemaObject === void 0 ? void 0 : schemaObject.type;
     const dateEnum = ['Date', 'date', 'dateTime', 'date-time', 'datetime'];
     const stringEnum = ['string', 'email', 'password', 'url', 'byte', 'binary'];
+    // OpenAPI 3.1 支持 type 为数组，例如 ["string", "null"]
+    if (Array.isArray(type)) {
+        return type
+            .map((t) => {
+            // 为数组中的每个类型创建一个临时的 schemaObject
+            const tempSchema = Object.assign(Object.assign({}, schemaObject), { type: t });
+            return getDefaultType(tempSchema, namespace, schemas);
+        })
+            .join(' | ');
+    }
     if (type === 'null') {
         return 'null';
     }

package/dist/parser-mock/index.js

@@ -86,10 +86,14 @@ function getDateByName(name, parentsKey) {
 function primitive(schemaParams, propsName) {
     const schema = (0, util_2.objectify)(schemaParams);
     const { type, format } = schema;
-    const value = primitives_1.primitives[`${type}_${format || getDateByName(propsName)}`] ||
-        primitives_1.primitives[type];
+    // 处理 OpenAPI 3.1 的 type 数组情况
+    const actualType = Array.isArray(type)
+        ? type.find((t) => t !== 'null') || 'string'
+        : type;
+    const value = primitives_1.primitives[`${actualType}_${format || getDateByName(propsName)}`] ||
+        primitives_1.primitives[actualType];
     if ((0, lodash_1.isUndefined)(schema.example)) {
-        return value || `Unknown Type: ${schema.type}`;
+        return value || `Unknown Type: ${actualType}`;
     }
     return schema.example;
 }

package/dist/parser-mock/util.d.ts

@@ -3,7 +3,7 @@ import type { OpenAPIObject, ParameterObject, ReferenceObject, SchemaObject } fr
 export declare function objectify<T>(thing: T): T;
 export declare function get(openAPI: OpenAPIObject, path: string): OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
 export declare function normalizeArray(arr: string[] | string): string[];
-export declare function inferSchema(thing: ParameterObject | SchemaObject | ReferenceObject | OpenAPIV3.MediaTypeObject): OpenAPIV3.ReferenceObject | OpenAPIV3.MediaTypeObject | {
+export declare function inferSchema(thing: ParameterObject | SchemaObject | ReferenceObject | OpenAPIV3.MediaTypeObject): import("../type").NonArraySchemaObject | OpenAPIV3.ReferenceObject | OpenAPIV3.MediaTypeObject | {
     type: string;
     enum?: any[];
     title?: string;

package/dist/type.d.ts

@@ -16,7 +16,7 @@ export type MutuallyExclusiveWithFallback<T, N> = {
 }[keyof T];
 type Modify<T, R> = Omit<T, keyof R> & R;
 type ICustomBaseSchemaObject = {
-    type: ISchemaObjectType;
+    type: ISchemaObjectType | ISchemaObjectType[];
     format?: ISchemaObjectFormat;
     additionalProperties?: boolean | ISchemaObject;
     properties?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "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",