@accelbyte/codegen 1.0.0-beta.11 → 1.0.0-beta.16

package/dist/accelbyte-codegen.js

@@ -88,9 +88,9 @@ const makeNewImportVarMap$1 = () => ({
   axios: ["AxiosInstance"],
   "@accelbyte/sdk": ["SDKRequestConfig"]
 });
-const generateImports$1 = (body, importStatements) => {
-  const usedImportVarMap = makeNewImportVarMap$1();
-  const importableVarMap = getImportableVarMap$1();
+const generateImports = (body, importStatements, makeNewImportVarMap2, getImportableVarMap2) => {
+  const usedImportVarMap = makeNewImportVarMap2;
+  const importableVarMap = getImportableVarMap2;
   for (const [moduleSource, importableVars] of Object.entries(importableVarMap)) {
     for (const importableVar of importableVars) {
       const importVarRegex = new RegExp(`(?<![\\d\\w_])${importableVar}(?![\\d\\w_])`);
@@ -107,7 +107,7 @@ const templateClass = (className, body, importStatements) => {
   return `/**
  * AUTO GENERATED
  */
-${generateImports$1(body, importStatements)}
+${generateImports(body, importStatements, makeNewImportVarMap$1(), getImportableVarMap$1())}
 
 export class ${className} {
   // @ts-ignore
@@ -123,27 +123,12 @@ const getImportableVarMap = () => ({
 const makeNewImportVarMap = () => ({
   "@accelbyte/sdk": ["AccelbyteSDK", "ApiArgs", "ApiUtils"]
 });
-const generateImports = (body, importStatements) => {
-  const usedImportVarMap = makeNewImportVarMap();
-  const importableVarMap = getImportableVarMap();
-  for (const [moduleSource, importableVars] of Object.entries(importableVarMap)) {
-    for (const importableVar of importableVars) {
-      const importVarRegex = new RegExp(`(?<![\\d\\w_])${importableVar}(?![\\d\\w_])`);
-      if (body.match(importVarRegex)) {
-        usedImportVarMap[moduleSource] = [...usedImportVarMap[moduleSource] || [], importableVar];
-      }
-    }
-  }
-  const generatedImports = Object.keys(usedImportVarMap).sort().map((moduleSource) => `import { ${usedImportVarMap[moduleSource].sort().join(", ")} } from '${moduleSource}'`).join("\n");
-  return `${generatedImports}
-${importStatements.sort().join("\n")}`;
-};
 const templateApiClass = (className, body, importStatements, returnMethods) => {
   return `/**
  * AUTO GENERATED
  */
 /* eslint-disable camelcase */
-${generateImports(body, importStatements)}
+${generateImports(body, importStatements, makeNewImportVarMap(), getImportableVarMap())}
 
 export function ${className}(sdk: AccelbyteSDK, args?: ApiArgs) {
   const sdkAssembly = sdk.assembly()
@@ -193,12 +178,18 @@ class ParserUtils {
     return `${attrName}: ${defaultValue}`;
   };
   static parseType = (pathParam) => {
-    if (pathParam.type === "int" || pathParam.type === "integer" || pathParam?.schema?.type === "integer")
+    if (isSwaggerIntegerType(pathParam.type || pathParam?.schema?.type))
       return "number";
-    if (pathParam.type === "array")
+    if (pathParam.type === "array") {
+      if (isSwaggerIntegerType(pathParam.items.type))
+        return "number[]";
       return `${pathParam.items.type ?? "any"}[]`;
-    if (pathParam?.schema?.type === "array")
+    }
+    if (pathParam?.schema?.type === "array") {
+      if (isSwaggerIntegerType(pathParam.schema.items.type))
+        return "number[]";
       return `${pathParam.schema.items.type ?? "any"}[]`;
+    }
     if (pathParam?.schema?.type)
       return pathParam.schema.type;
     return pathParam.type;
@@ -289,6 +280,8 @@ class ParserUtils {
       return retBodyParams;
     }
     if (bodyParam?.schema?.type === "array" && !bodyParam?.schema?.items?.$ref) {
+      if (isSwaggerIntegerType(bodyParam.schema.items.type))
+        return "number[]";
       return `${bodyParam.schema.items.type ?? "any"}[]`;
     }
     if (bodyParam?.schema?.type === "array" && bodyParam?.schema?.items?.$ref) {
@@ -600,6 +593,9 @@ const testConflict = (path2, generatedMethod, existingMethods) => {
  existingMethods: ${JSON.stringify(existingMethods, null, 2)}`);
   }
 };
+const isSwaggerIntegerType = (type) => {
+  return type === "integer" || type === "int";
+};
 
 const Schema = zod.z.object({
   $ref: zod.z.string().nullish(),
@@ -706,8 +702,6 @@ const templateMethod = ({
   let methodParamsNoTypes = "";
   let newPath = `'${path}'`;
   let importStatements = [];
-  let snippetString = "";
-  let snippetMethodSignature = "";
   for (const pathParam of pathParams) {
     const type = ParserUtils.parseType(pathParam);
     if (pathParam.name !== "namespace") {
@@ -729,13 +723,6 @@ const templateMethod = ({
     importStatements = ParserUtils.parseBodyParamsImports(bodyParams);
     methodParams += dataType ? `data: ${dataType},` : "";
     methodParamsNoTypes += dataType ? `data,` : "";
-    const snippetParams = bodyParams?.map((ob) => {
-      return ` <span class='sn-purple'>${ob.name}</span>`;
-    });
-    snippetMethodSignature += snippetParams ? `data: { ${snippetParams} }` : "";
-    bodyParams?.map((ob) => {
-      return ` <span class='sn-purple'>"${ob.name}": ""</span>`;
-    });
   }
   const isAnyRequired = ParserUtils.isAnyQueryParamRequired(queryParams);
   const queryParamsType = queryParams.length ? `queryParams${isAnyRequired ? "" : "?"}: {${ParserUtils.parseQueryParamsType(queryParams)}}` : "";
@@ -772,8 +759,6 @@ const templateMethod = ({
   const methodName = httpMethod === "get" ? cachedFetchMethod : ["post", "put", "patch", "delete"].includes(httpMethod) ? classMethod : "";
   const responseType = resolvedResponseClass !== "unknown" ? `${resolvedResponseClass}` : "unknown";
   const generateMethodName = () => `${methodName}(${methodParams}): Promise<${responseSyncType}<${responseType}>>`;
-  const generateSnippetMethodName = () => `${methodName}(${snippetMethodSignature})`;
-  snippetString += `${generateSnippetMethodName()}`;
   const responseSyncType = httpMethod === "get" ? "IResponseWithSync" : ["post", "put", "patch", "delete"].includes(httpMethod) ? "IResponse" : "";
   methodImpl = `${descriptionText}
   ${generateMethodName()} {
@@ -781,13 +766,13 @@ const templateMethod = ({
     const url = ${newPath}    ${formPayloadString} ${isFileUpload ? "\n// TODO file upload not implemented" : ""}
     const resultPromise = this.axiosInstance.${httpMethod}(url, ${dataPayload})
 
-${httpMethod === "get" ? `    const res = () => Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated})
+${httpMethod === "get" ? `    const res = () => Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated}, '${resolvedResponseClassValidated}')
 
     if (!this.cache) {
       return SdkCache.withoutCache(res)
     }
     const cacheKey = url + CodeGenUtil.hashCode(JSON.stringify({ params }))
-    return SdkCache.withCache(cacheKey, res)` : ""}${["post", "put", "patch", "delete"].includes(httpMethod) ? `    return Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated})` : ""}
+    return SdkCache.withCache(cacheKey, res)` : ""}${["post", "put", "patch", "delete"].includes(httpMethod) ? `    return Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated}, '${resolvedResponseClassValidated}')` : ""}
   }
   `;
   if (!isGuardInvoked) {
@@ -804,8 +789,7 @@ ${httpMethod === "get" ? `    const res = () => Validate.responseType(() => resu
     methodImpl,
     methodParams,
     methodParamsNoTypes,
-    importStatements,
-    snippetString
+    importStatements
   };
   return res;
 };
@@ -1069,7 +1053,6 @@ const templateApiMethod = ({
   path,
   pathParams,
   bodyParams,
-  queryParams,
   responseClass,
   classGenName,
   methodParams,
@@ -1077,7 +1060,6 @@ const templateApiMethod = ({
 }) => {
   let methodSignature = "";
   let newPath = `'${path}'`;
-  let dependencies = [];
   let snippetSdk = "";
   let snippetShell = "";
   for (const pathParam of pathParams) {
@@ -1094,30 +1076,24 @@ const templateApiMethod = ({
       }
     }
   }
-  snippetShell = `<span class='sn-blue'>curl</span> --location --request <span class='sn-blue'>${httpMethod}</span> '<span class='sn-green'>__DOMAIN__${path}</span>' --header 'accept: application/json'`;
-  let dataType = null;
+  snippetShell = `curl --location --request  \\
+    ${httpMethod} '__DOMAIN__${path}'  \\
+    --header 'accept: application/json'`;
   if (httpMethod !== "get") {
-    dataType = ParserUtils.parseBodyParamsType(bodyParams);
-    dependencies = ParserUtils.parseBodyParamsImports(bodyParams);
-    methodSignature += dataType ? `data: ${dataType},` : "";
-    bodyParams?.map((ob) => {
-      return ` <span class='sn-purple'>${ob.name}</span>`;
-    });
     const curlParams = bodyParams?.map((ob) => {
-      return ` <span class='sn-purple'>"${ob.name}": ""</span>`;
+      return ` "${ob.name}": ""`;
     });
-    snippetShell += ` --data-raw { ${curlParams}}`;
+    snippetShell += `  \\
+    --data-raw '{ ${curlParams}}'`;
   }
-  const isAnyRequired = ParserUtils.isAnyQueryParamRequired(queryParams);
-  queryParams.length ? `queryParams${isAnyRequired ? "" : "?"}: {${ParserUtils.parseQueryParamsType(queryParams)}}` : "";
-  queryParams.length ? `const params = {${ParserUtils.parseQueryParamsDefault(queryParams)} ...queryParams} as SDKRequestConfig` : "const params = {} as SDKRequestConfig";
-  description ? `
+  const descriptionText = description ? `
   /**
    * ${description.replace(/\n/g, "\n   * ")} 
    */` : "";
   const resolvedResponseClass = responseClass || "unknown";
   const responseType = resolvedResponseClass !== "unknown" ? `${resolvedResponseClass}` : "unknown";
   const methodImpl = `
+  ${descriptionText}
   async function ${classMethod}(${methodParams}): Promise<${responseType}> {
     const $ = new ${classGenName}(Network.create(requestConfig), namespace, cache)
     const resp = await $.${classMethod}(${methodParamsNoTypes})
@@ -1125,8 +1101,10 @@ const templateApiMethod = ({
     return resp.response.data
   }
   `;
-  snippetSdk += `${classMethod}(${methodParams}) // return Promise<${responseType}>`;
-  return [methodImpl, dependencies, snippetSdk, snippetShell];
+  const snippetPromiseString = responseType !== "unknown" ? `Promise<${responseType}>` : "Promise";
+  snippetSdk += `${classMethod}(${methodParams}) 
+   // return ${snippetPromiseString}`;
+  return [methodImpl, snippetSdk, snippetShell];
 };
 
 const templateApiIndex = (serviceName, serviceNameTitle, apiList) => {
@@ -1152,26 +1130,44 @@ export const ${ParserUtils.convertDashesToTitleCase(serviceNameTitle)} = apis
 };
 
 const templateSdkSnippet = (serviceNameTitle, apiName, methodSnippet) => {
-  const sdkSnippet = `
-import { Accelbyte } from '@accelbyte/sdk'
+  const methodArr = methodSnippet.split("//");
+  let normMethod = normalizeMethodSnippet(methodArr[0].trim(), "data:");
+  normMethod = normalizeMethodSnippet(normMethod, "queryParams:");
+  normMethod = normalizeMethodSnippet(normMethod, "queryParams?:");
+  normMethod += "\n\n//" + methodArr[1];
+  const sdkSnippet = `import { Accelbyte } from '@accelbyte/sdk'
 import { ${serviceNameTitle} } from '@accelbyte/sdk-${serviceNameTitle.toLowerCase()}'
 
-const SDK_CONFIG = {
+const sdk = Accelbyte.SDK({
     baseURL: 'https://demo.accelbyte.io',
     clientId: '77f88506b6174c3ea4d925f5b4096ce8',
     namespace: 'accelbyte',
     redirectURI: 'http://localhost:3030'
-}
-
-const sdk = Accelbyte.SDK({
-    options: SDK_CONFIG
 })
 
-${serviceNameTitle}.${apiName}(sdk).${methodSnippet}
-`;
+${serviceNameTitle}.${apiName}(sdk)
+     .${normMethod}`;
   return sdkSnippet;
 };
+const normalizeMethodSnippet = (methodInput, splitWord) => {
+  const split1 = methodInput.split(splitWord);
+  if (!split1[1]) {
+    return methodInput;
+  }
+  let split2 = split1[1].trim();
+  split2 = ParserUtils.replaceAll(split2, "{", "");
+  split2 = ParserUtils.replaceAll(split2, "})", "");
+  split2 = split2.split(",");
+  let params = "";
+  split2.forEach((p) => {
+    params += "\n             " + ParserUtils.replaceAll(p.trim(), ")", "") + ",";
+  });
+  params = params.slice(0, -1);
+  const result = split1[0] + splitWord + " {" + params + "\n    })";
+  return result;
+};
 
+const GIT_URL = "https://github.com/AccelByte/accelbyte-web-sdk/blob/main/packages";
 class CodeGenerator {
   static getPatchedDir = () => path.join(CliParser.getSwaggersOutputPath(), "patched");
   static getGeneratedPublicFolder = () => `${CliParser.getOutputPath()}/generated-public`;
@@ -1254,7 +1250,7 @@ class CodeGenerator {
             }
           ];
         }
-        const { methodImpl, methodParams, methodParamsNoTypes, importStatements, snippetString } = templateMethod({
+        const { methodImpl, methodParams, methodParamsNoTypes, importStatements } = templateMethod({
           classMethod,
           description,
           httpMethod,
@@ -1266,14 +1262,13 @@ class CodeGenerator {
           responseClass
         });
         classBufferByTag[tag] = (classBufferByTag[tag] || "") + methodImpl;
-        const [generatedMethodString1, importStatements1, snippetMethod, snippetShell] = templateApiMethod({
+        const [generatedMethodString1, snippetMethod, snippetShell] = templateApiMethod({
           classMethod,
           description,
           httpMethod,
           path: pathWithBase,
           pathParams,
           bodyParams,
-          queryParams,
           responseClass,
           classGenName,
           methodParams,
@@ -1284,12 +1279,10 @@ class CodeGenerator {
         dependenciesByTag[tag] = dependenciesByTag[tag] ? [.../* @__PURE__ */ new Set([...importStatements, ...dependenciesByTag[tag]])] : [...new Set(importStatements)];
         const serviceNameTitle = ParserUtils.convertDashesToTitleCase(serviceName);
         const { apiGenName } = ParserUtils.generateApiName(tag);
-        let resultSnippet = templateSdkSnippet(serviceNameTitle, apiGenName, snippetMethod);
-        resultSnippet = ParserUtils.replaceAll(resultSnippet, "<", "&lt;");
-        resultSnippet = ParserUtils.replaceAll(resultSnippet, ">", "&gt;");
-        resultSnippet = ParserUtils.replaceAll(resultSnippet, "\n", "<br/>");
+        const resultSnippet = templateSdkSnippet(serviceNameTitle, apiGenName, snippetMethod);
         snippetMap[path2][httpMethod] = {
           web: resultSnippet,
+          webGit: GIT_URL + `/sdk-${serviceName}/src/generated-public/${serviceName}/${apiGenName}.ts`,
           shell: snippetShell
         };
       }
@@ -1392,6 +1385,22 @@ class SwaggerDownloader {
     fs__namespace.writeFileSync(destFile, "");
     return destFile;
   };
+  static postSanitizeDownloadedFile = (filePath) => {
+    const searchStr = ["%5B", "%5D", "%20", "%7B", "%7D"];
+    fs__namespace.readFile(filePath, "utf8", (err, data) => {
+      if (err)
+        throw err;
+      let result = data;
+      searchStr.forEach((s) => {
+        result = result.replace(new RegExp(s, "g"), " ");
+      });
+      fs__namespace.writeFile(filePath, result, "utf8", (err2) => {
+        if (err2)
+          throw err2;
+        console.log("File updated successfully.");
+      });
+    });
+  };
   static downloadFile = (targetFileName, url) => {
     const destFile = SwaggerDownloader.getDestFile(targetFileName);
     const file = fs__namespace.createWriteStream(destFile);
@@ -1399,6 +1408,7 @@ class SwaggerDownloader {
       response.pipe(file);
       file.on("finish", () => {
         file.close();
+        SwaggerDownloader.postSanitizeDownloadedFile(destFile);
         console.log(`SwaggerDownload ${url} completed`);
       });
     });