chore: merge main to release

.changeset/red-cups-sniff.md

@@ -0,0 +1,5 @@
+---
+'openapi-ts-request': patch
+---
+
+perf: typeName upperFist

src/generator/serviceGenarator.ts

@@ -12,6 +12,7 @@ import {
   isFunction,
   isObject,
   keys,
+  lowerFirst,
   map,
   upperFirst,
 } from 'lodash';
@@ -238,9 +239,10 @@ export default class ServiceGenerator {
             }
           }
 
+          const tagTypeName = resolveTypeName(tag);
           const tagKey = this.config.isCamelCase
-            ? camelCase(resolveTypeName(tag))
-            : resolveTypeName(tag);
+            ? camelCase(tagTypeName)
+            : lowerFirst(tagTypeName);
 
           if (!this.apiData[tagKey]) {
             this.apiData[tagKey] = [];
@@ -610,7 +612,7 @@ export default class ServiceGenerator {
 
       if (this.config.isGenJsonSchemas) {
         this.schemaList.push({
-          typeName: `$${resolveTypeName(schemaKey)}`,
+          typeName: `$${lowerFirst(resolveTypeName(schemaKey))}`,
           type: JSON.stringify(
             patchSchema<SchemaObject>(
               schema,
@@ -933,7 +935,9 @@ export default class ServiceGenerator {
     const typeName =
       this.config?.hook?.customTypeName?.(data) || this.getFunctionName(data);
 
-    return resolveTypeName(`${namespace}${typeName ?? data.operationId}Params`);
+    return upperFirst(
+      resolveTypeName(`${namespace}${typeName ?? data.operationId}Params`)
+    );
   }
 
   private getBodyTP(requestBody: RequestBodyObject, namespace?: string) {

src/generator/util.ts

@@ -14,6 +14,7 @@ import {
   isUndefined,
   keys,
   map,
+  upperFirst,
 } from 'lodash';
 import ReservedDict from 'reserved-words';
 import pinyin from 'tiny-pinyin';
@@ -97,12 +98,12 @@ export function resolveTypeName(typeName: string) {
   }
 
   if (!/[\u3220-\uFA29]/.test(name) && !/^\d$/.test(name)) {
-    return name;
+    return upperFirst(name);
   }
 
   const noBlankName = name.replace(/ +/g, '');
 
-  return pinyin.convertToPinyin(noBlankName, '', true);
+  return upperFirst(pinyin.convertToPinyin(noBlankName, '', true));
 }
 
 export function getRefName(refObject: ReferenceObject | string) {

test/__snapshots__/common/小驼峰命名文件和请求函数.snap

@@ -67,7 +67,7 @@ export async function petPetIdUsingGet({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.petPetIdUsingGetParams;
+  params: API.PetPetIdUsingGetParams;
   options?: { [key: string]: unknown };
 }) {
   const { petId: param0, ...queryParams } = params;
@@ -85,7 +85,7 @@ export async function petPetIdUsingPost({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.petPetIdUsingPostParams;
+  params: API.PetPetIdUsingPostParams;
   options?: { [key: string]: unknown };
 }) {
   const { petId: param0, ...queryParams } = params;
@@ -105,7 +105,7 @@ export async function petPetIdUsingDelete({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.petPetIdUsingDeleteParams;
+  params: API.PetPetIdUsingDeleteParams;
   options?: { [key: string]: unknown };
 }) {
   const { petId: param0, ...queryParams } = params;
@@ -124,7 +124,7 @@ export async function petPetIdUploadImageUsingPost({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.petPetIdUploadImageUsingPostParams;
+  params: API.PetPetIdUploadImageUsingPostParams;
   body: API.PetPetIdUploadImageUsingPostBody;
   options?: { [key: string]: unknown };
 }) {
@@ -149,7 +149,7 @@ export async function petFindByStatusUsingGet({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.petFindByStatusUsingGetParams;
+  params: API.PetFindByStatusUsingGetParams;
   options?: { [key: string]: unknown };
 }) {
   return request<API.Pet[]>('/pet/findByStatus', {
@@ -169,7 +169,7 @@ export async function petFindByTagsUsingGet({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.petFindByTagsUsingGetParams;
+  params: API.PetFindByTagsUsingGetParams;
   options?: { [key: string]: unknown };
 }) {
   return request<API.Pet[]>('/pet/findByTags', {
@@ -222,7 +222,7 @@ export async function storeOrderOrderIdUsingGet({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.storeOrderOrderIdUsingGetParams;
+  params: API.StoreOrderOrderIdUsingGetParams;
   options?: { [key: string]: unknown };
 }) {
   const { orderId: param0, ...queryParams } = params;
@@ -240,7 +240,7 @@ export async function storeOrderOrderIdUsingDelete({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.storeOrderOrderIdUsingDeleteParams;
+  params: API.StoreOrderOrderIdUsingDeleteParams;
   options?: { [key: string]: unknown };
 }) {
   const { orderId: param0, ...queryParams } = params;
@@ -285,36 +285,36 @@ export type Pet = {
   status?: 'available' | 'pending' | 'sold';
 };
 
-export type petFindByStatusUsingGetParams = {
+export type PetFindByStatusUsingGetParams = {
   /** Status values that need to be considered for filter */
   status?: 'available' | 'pending' | 'sold';
 };
 
-export type petFindByTagsUsingGetParams = {
+export type PetFindByTagsUsingGetParams = {
   /** Tags to filter by */
   tags?: string[];
 };
 
 export type PetPetIdUploadImageUsingPostBody = string;
 
-export type petPetIdUploadImageUsingPostParams = {
+export type PetPetIdUploadImageUsingPostParams = {
   /** ID of pet to update */
   petId: number;
   /** Additional Metadata */
   additionalMetadata?: string;
 };
 
-export type petPetIdUsingDeleteParams = {
+export type PetPetIdUsingDeleteParams = {
   /** Pet id to delete */
   petId: number;
 };
 
-export type petPetIdUsingGetParams = {
+export type PetPetIdUsingGetParams = {
   /** ID of pet to return */
   petId: number;
 };
 
-export type petPetIdUsingPostParams = {
+export type PetPetIdUsingPostParams = {
   /** ID of pet that needs to be updated */
   petId: number;
   /** Name of pet that needs to be updated */
@@ -339,12 +339,12 @@ export enum StatusEnum2 {
 
 export type IStatusEnum2 = keyof typeof StatusEnum2;
 
-export type storeOrderOrderIdUsingDeleteParams = {
+export type StoreOrderOrderIdUsingDeleteParams = {
   /** ID of the order that needs to be deleted */
   orderId: number;
 };
 
-export type storeOrderOrderIdUsingGetParams = {
+export type StoreOrderOrderIdUsingGetParams = {
   /** ID of order that needs to be fetched */
   orderId: number;
 };
@@ -368,24 +368,24 @@ export type User = {
 
 export type UserCreateWithListUsingPostBody = User[];
 
-export type userLoginUsingGetParams = {
+export type UserLoginUsingGetParams = {
   /** The user name for login */
   username?: string;
   /** The password for login in clear text */
   password?: string;
 };
 
-export type userUsernameUsingDeleteParams = {
+export type UserUsernameUsingDeleteParams = {
   /** The name that needs to be deleted */
   username: string;
 };
 
-export type userUsernameUsingGetParams = {
+export type UserUsernameUsingGetParams = {
   /** The name that needs to be fetched. Use user1 for testing.  */
   username: string;
 };
 
-export type userUsernameUsingPutParams = {
+export type UserUsernameUsingPutParams = {
   /** name that needs to be updated */
   username: string;
 };
@@ -419,7 +419,7 @@ export async function userUsernameUsingGet({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.userUsernameUsingGetParams;
+  params: API.UserUsernameUsingGetParams;
   options?: { [key: string]: unknown };
 }) {
   const { username: param0, ...queryParams } = params;
@@ -438,7 +438,7 @@ export async function userUsernameUsingPut({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.userUsernameUsingPutParams;
+  params: API.UserUsernameUsingPutParams;
   body: API.User;
   options?: { [key: string]: unknown };
 }) {
@@ -461,7 +461,7 @@ export async function userUsernameUsingDelete({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.userUsernameUsingDeleteParams;
+  params: API.UserUsernameUsingDeleteParams;
   options?: { [key: string]: unknown };
 }) {
   const { username: param0, ...queryParams } = params;
@@ -497,7 +497,7 @@ export async function userLoginUsingGet({
   options,
 }: {
   // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.userLoginUsingGetParams;
+  params: API.UserLoginUsingGetParams;
   options?: { [key: string]: unknown };
 }) {
   return request<string>('/user/login', {