@accelbyte/codegen 0.0.0-dev-20240906023252 → 0.0.0-dev-20240911051006

package/dist/accelbyte-codegen.mjs

@@ -124,6 +124,18 @@ var extractDescription = (description, options) => {
     indentation
   }) : "";
 };
+var getResponseType = ({
+  responseClasses,
+  defaultType = "unknown"
+}) => {
+  const responseClass = responseClasses.length === 1 ? responseClasses?.[0] : "unknown";
+  const responseType = responseClass !== "unknown" ? responseClasses?.[0] : defaultType;
+  return {
+    responseType,
+    responseTypeInAxiosResponse: `Promise<AxiosResponse<${responseType}>>`,
+    responseTypeInResponse: `Promise<Response<${responseType}>>`
+  };
+};
 
 // src/templates/template-class.ts
 var getImportableVarMap = () => ({
@@ -177,6 +189,12 @@ var makeNewImportVarMap2 = () => ({
   axios: ["AxiosRequestConfig", "AxiosResponse"]
 });
 var templateApiClass = (className, body, importStatements, returnMethods) => {
+  const returnsMethodsWithDescription = Object.keys(returnMethods).reduce((acc, key) => {
+    acc += `
+    ${returnMethods[key]}
+${key},`;
+    return acc;
+  }, "");
   const $className = className.replace(/Api$/, "$");
   return `/**
  * AUTO GENERATED
@@ -191,25 +209,35 @@ export function ${className}(sdk: AccelByteSDK, args?: SdkSetConfigParam) {
   const sdkAssembly = sdk.assembly()
   
   const namespace = args?.coreConfig?.namespace ?? sdkAssembly.coreConfig.namespace
-  const requestConfig = ApiUtils.mergeAxiosConfigs(sdkAssembly.axiosInstance.defaults as AxiosRequestConfig, {...(args?.coreConfig?.baseURL ? {baseURL: args?.coreConfig?.baseURL} : {}), ...args?.axiosConfig?.request})
-  const interceptors = args?.axiosConfig?.interceptors ?? sdkAssembly.axiosConfig.interceptors ?? []
   const useSchemaValidation = args?.coreConfig?.useSchemaValidation ?? sdkAssembly.coreConfig.useSchemaValidation
-  const axiosInstance = Network.create(requestConfig)
   
-  for (const interceptor of interceptors) {
-    if(interceptor.type === 'request') {
-      axiosInstance.interceptors.request.use(interceptor?.onRequest, interceptor.onError)
-    }
+  let axiosInstance = sdkAssembly.axiosInstance
+  const requestConfigOverrides = args?.axiosConfig?.request
+  const baseURLOverride = args?.coreConfig?.baseURL
+  const interceptorsOverride = args?.axiosConfig?.interceptors ?? []
 
-    if(interceptor.type === 'response') {
-      axiosInstance.interceptors.response.use(interceptor?.onSuccess, interceptor.onError)
+  if (requestConfigOverrides || baseURLOverride || interceptorsOverride.length > 0) {
+    const requestConfig = ApiUtils.mergeAxiosConfigs(sdkAssembly.axiosInstance.defaults as AxiosRequestConfig, {
+      ...(baseURLOverride ? { baseURL: baseURLOverride } : {}),
+      ...requestConfigOverrides
+    })
+    axiosInstance = Network.create(requestConfig)
+
+    for (const interceptor of interceptorsOverride) {
+      if (interceptor.type === 'request') {
+        axiosInstance.interceptors.request.use(interceptor.onRequest, interceptor.onError)
+      }
+
+      if (interceptor.type === 'response') {
+        axiosInstance.interceptors.response.use(interceptor.onSuccess, interceptor.onError)
+      }
     }
   }
 
   ${body}
   
   return {
-    ${returnMethods}
+    ${returnsMethodsWithDescription}
   }
 }
   `;
@@ -594,12 +622,12 @@ var ParserUtils = class _ParserUtils {
       fs3.writeFileSync(`${distDir}/version.json`, JSON.stringify(customVersion, null, 2));
     }
   }
-  static writeApiFile(distDir, apiName, apiBuffer, imports, returnMethods) {
+  static writeApiFile(distDir, apiName, apiBuffer, imports, returnMethodsDescription) {
     const newImports = [];
     imports.forEach((el) => {
       newImports.push(el.replace("../../generated-definitions", "../generated-definitions"));
     });
-    const fileContent = templateApiClass(apiName, apiBuffer, newImports, returnMethods);
+    const fileContent = templateApiClass(apiName, apiBuffer, newImports, returnMethodsDescription);
     fs3.writeFileSync(`${distDir}/${apiName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
   }
   static writeApiMainFile(distDir, serviceName, fileContent) {
@@ -862,7 +890,6 @@ var OpenApiSpec = z2.object({
 // src/templates/template-api-method.ts
 var templateApiMethod = ({
   classMethod,
-  description,
   httpMethod,
   path: path7,
   pathParams,
@@ -871,7 +898,6 @@ var templateApiMethod = ({
   classGenName,
   methodParams,
   methodParamsNoTypes,
-  deprecated,
   xSecurity
 }) => {
   let newPath = `'${path7}'`;
@@ -902,12 +928,9 @@ var templateApiMethod = ({
     }
   }
   const snippetShell = `curl ${snippetShellArgs.join(" \\\n    ")}`;
-  const descriptionText = extractDescription(description, { isDeprecated: deprecated, responseClasses });
-  const resolvedResponseClass = responseClasses.length === 1 ? responseClasses?.[0] : "unknown";
-  const responseType = resolvedResponseClass !== "unknown" ? `${resolvedResponseClass}` : "unknown";
+  const { responseType, responseTypeInAxiosResponse } = getResponseType({ responseClasses });
   const methodImpl = `
-  ${descriptionText}
-  async function ${classMethod}(${methodParams}): Promise<AxiosResponse<${responseType}>> {
+  async function ${classMethod}(${methodParams}): ${responseTypeInAxiosResponse} {
     const $ = new ${classGenName}(axiosInstance, namespace, useSchemaValidation)
     const resp = await $.${classMethod}(${methodParamsNoTypes})
     if (resp.error) throw resp.error
@@ -983,14 +1006,12 @@ var templateMethod = ({
     dataPayload = dataType ? `{data, params}` : "{params}";
   }
   const isFileUpload = methodParams.indexOf("data: {file") > -1;
-  const resolvedResponseClass = responseClasses.length === 1 ? responseClasses?.[0] : "unknown";
-  const resolvedResponseClassValidated = responseClasses.length === 1 ? responseClasses?.[0] : "z.unknown()";
+  const { responseType, responseTypeInResponse } = getResponseType({ responseClasses });
+  const resolvedResponseClassValidated = responseType !== "unknown" ? `${responseType}` : "z.unknown()";
   methodParams = (queryParamsType ? `${methodParams} ${queryParamsType}` : methodParams).replace(/,\s*$/, "");
   methodParamsNoTypes = queryParamsType ? `${methodParamsNoTypes} queryParams` : methodParamsNoTypes;
   const isGuardInvoked = ["get", "post", "put", "patch", "delete"].includes(httpMethod);
-  const responseType = resolvedResponseClass !== "unknown" ? `${resolvedResponseClass}` : "unknown";
-  const responseSyncType = "Response";
-  const generatedMethodName = `${classMethod}(${methodParams}): Promise<${responseSyncType}<${responseType}>>`;
+  const generatedMethodName = `${classMethod}(${methodParams}): ${responseTypeInResponse}`;
   let methodImpl = `${descriptionText}
   ${generatedMethodName} {
     ${queryParamsDefault}
@@ -1048,9 +1069,8 @@ var templateQueryMethod = ({
       }
     }
   }
-  const resolvedResponseClass = responseClasses.length === 1 ? responseClasses?.[0] : "unknown";
-  let _methodName = convertMethodNameToHook({ classMethod, apiGenName, isPostFetch, isFetch });
-  const _responseType = resolvedResponseClass !== "unknown" ? `${resolvedResponseClass}` : "unknown";
+  const { responseType } = getResponseType({ responseClasses });
+  let _methodName = convertMethodNameToHook({ classMethod, apiGenName, isGet });
   const _methodParams = methodParams && methodParams.length > 0 ? `& { ${methodParams} }` : "";
   const _methodParamsImpl = convertToMethodImplArgs(methodParams);
   const queryKey = createQueryKey(apiGenName, classMethod);
@@ -1065,9 +1085,9 @@ ${descriptionText}
 export const ${_methodName} = (
     sdk: AccelByteSDK,
     input: SdkSetConfigParam ${_methodParams},
-    options?: Omit<UseQueryOptions<${_responseType}, AxiosError<ApiError>>, 'queryKey'>,
-    callback?: (data: AxiosResponse<${_responseType}>) => void
-  ): UseQueryResult<${_responseType}, AxiosError<ApiError>> => { 
+    options?: Omit<UseQueryOptions<${responseType}, AxiosError<ApiError>>, 'queryKey'>,
+    callback?: (data: AxiosResponse<${responseType}>) => void
+  ): UseQueryResult<${responseType}, AxiosError<ApiError>> => { 
   
   const queryFn = (
   sdk: AccelByteSDK, 
@@ -1080,7 +1100,7 @@ export const ${_methodName} = (
       return response.data
   }
   
-  return ${queryMethod}<${_responseType}, AxiosError<ApiError>>({
+  return ${queryMethod}<${responseType}, AxiosError<ApiError>>({
     queryKey: [${queryKey}, input],
     queryFn: queryFn(sdk, input),
     ...options
@@ -1093,9 +1113,9 @@ export const ${_methodName} = (
   ${descriptionText}
 export const ${_methodName} = (
     sdk: AccelByteSDK,
-    options?: Omit<UseMutationOptions<${_responseType}, AxiosError<ApiError>, SdkSetConfigParam ${_methodParams}>, 'mutationKey'>,
-    callback?: (data: ${_responseType}) => void
-  ): UseMutationResult<${_responseType}, AxiosError<ApiError>, SdkSetConfigParam ${_methodParams}> => { 
+    options?: Omit<UseMutationOptions<${responseType}, AxiosError<ApiError>, SdkSetConfigParam ${_methodParams}>, 'mutationKey'>,
+    callback?: (data: ${responseType}) => void
+  ): UseMutationResult<${responseType}, AxiosError<ApiError>, SdkSetConfigParam ${_methodParams}> => { 
   
   const mutationFn = async (input: SdkSetConfigParam ${_methodParams}) => {
       const response = 
@@ -1115,6 +1135,13 @@ export const ${_methodName} = (
   `;
   return isGet ? queryMethodImpl : mutationMethodImpl;
 };
+function versionMutationSuffixMethodName(baseMethodName) {
+  const parts = baseMethodName.split(/(_v\d+)$/);
+  const name = parts[0];
+  const versionSuffix = parts[1] || "";
+  const res = `${name}Mutation${versionSuffix}`;
+  return res;
+}
 function createQueryKey(className, methodName) {
   const prefixRegex = /^(get|create|update|delete|patch|post|fetch)[_]?/i;
   const cleanedMethodName = methodName.replace(prefixRegex, "").trim();
@@ -1130,15 +1157,11 @@ var prefixMappings = {
   post: "usePost",
   fetch: "useFetch"
 };
-function convertMethodNameToHook({
-  classMethod,
-  apiGenName,
-  isPostFetch,
-  isFetch
-}) {
-  for (const [originalPrefix, newPrefix] of Object.entries(prefixMappings)) {
+function convertMethodNameToHook({ classMethod, apiGenName, isGet }) {
+  for (const [originalPrefix] of Object.entries(prefixMappings)) {
     if (classMethod.startsWith(originalPrefix)) {
-      return `use${apiGenName}_${capitalize(classMethod)}`;
+      const methodName = !isGet ? versionMutationSuffixMethodName(classMethod) : classMethod;
+      return `use${apiGenName}_${capitalize(methodName)}`;
     }
   }
   return classMethod;
@@ -1224,7 +1247,8 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
         tagToSdkClientRecord: {},
         tagToSdkFunctionNamesRecord: {},
         tagToSdkImportsRecord: {},
-        tagToEndpointQueryRecord: {}
+        tagToEndpointQueryRecord: {},
+        tagToSdkFunctionDescription: {}
       },
       public: {
         arrayDefinitions: [],
@@ -1234,7 +1258,8 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
         tagToSdkClientRecord: {},
         tagToSdkFunctionNamesRecord: {},
         tagToSdkImportsRecord: {},
-        tagToEndpointQueryRecord: {}
+        tagToEndpointQueryRecord: {},
+        tagToSdkFunctionDescription: {}
       }
     };
     const sortedPathsByLength = new Map(
@@ -1266,7 +1291,8 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
         tagToSdkClientRecord,
         tagToSdkFunctionNamesRecord,
         tagToSdkImportsRecord,
-        tagToEndpointQueryRecord
+        tagToEndpointQueryRecord,
+        tagToSdkFunctionDescription
       } = picked;
       const tagToClassMethodsMapByType = isAdminEndpoint ? tagToClassMethodsMap.admin : tagToClassMethodsMap.public;
       const generatedMethods = {};
@@ -1346,9 +1372,14 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
           description
         });
         tagToEndpointQueryRecord[tag] = (tagToEndpointQueryRecord[tag] || "") + queryMethodImpl;
+        const fnDescription = extractDescription(description, { isDeprecated: deprecated, responseClasses });
+        const tagFnDescriptions = tagToSdkFunctionDescription[tag];
+        tagToSdkFunctionDescription[tag] = {
+          ...tagFnDescriptions,
+          [classMethod]: fnDescription
+        };
         const { generatedMethodString, snippetApiArgs, snippetMethod, snippetShell } = templateApiMethod({
           classMethod,
-          description,
           httpMethod,
           path: pathWithBase,
           pathParams,
@@ -1357,7 +1388,6 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
           classGenName,
           methodParams,
           methodParamsNoTypes,
-          deprecated,
           xSecurity: endpoint["x-security"]
         });
         tagToSdkClientRecord[tag] = (tagToSdkClientRecord[tag] || "") + generatedMethodString;
@@ -1729,7 +1759,8 @@ var CodeGenerator = class _CodeGenerator {
         tagToSdkClientRecord,
         tagToSdkFunctionNamesRecord,
         tagToSdkImportsRecord,
-        tagToEndpointQueryRecord
+        tagToEndpointQueryRecord,
+        tagToSdkFunctionDescription
       } = parsedInformationByType;
       const writeApiEndpointFiles = (isAdminEndpoint) => {
         const apiList = [];
@@ -1753,7 +1784,7 @@ var CodeGenerator = class _CodeGenerator {
             sdkName
           );
           const apiBuffer = tagToSdkClientRecord[tag];
-          ParserUtils.writeApiFile(DIST_DIR(isAdminEndpoint), apiGenName, apiBuffer, imports, tagToSdkFunctionNamesRecord[tag]);
+          ParserUtils.writeApiFile(DIST_DIR(isAdminEndpoint), apiGenName, apiBuffer, imports, tagToSdkFunctionDescription[tag]);
           apiList.push(apiGenName);
           indexImportsSet.add(
             ParserUtils.getRelativePathToWebSdkSrcFolder(path4.join(DIST_DIR_ENDPOINTS(isAdminEndpoint), `${classGenName}`), targetSrcFolder)