@accelbyte/codegen 2.0.0-beta.4 → 2.0.0-beta.5

package/dist/accelbyte-codegen.mjs

@@ -594,7 +594,9 @@ class ParserUtils {
 ${content}`;
   };
   static sortPathParamsByPath = (pathParams, path2) => {
-    return pathParams.sort((a, b) => path2.indexOf(a.name) - path2.indexOf(b.name));
+    const params = path2.match(/{\w*}/g) || [];
+    const cleanParams = params.map((param) => param.replace("{", "").replace("}", ""));
+    return pathParams.sort((a, b) => cleanParams.indexOf(a.name) - cleanParams.indexOf(b.name));
   };
 }
 const mappedMethod = (httpMethod, isForm) => {
@@ -1281,6 +1283,7 @@ class CodeGenerator {
           continue;
         }
         const [tag] = endpoint.tags;
+        const pathWithBase = `${api.basePath ?? ""}${path2}`;
         mapClassMethods[tag] = mapClassMethods[tag] ? mapClassMethods[tag] : {};
         const isForm = endpoint.consumes && endpoint.consumes[0] === "application/x-www-form-urlencoded";
         const classMethod = ParserUtils.generateNaturalLangMethod({
@@ -1291,7 +1294,7 @@ class CodeGenerator {
           existingMethods: mapClassMethods[tag]
         });
         mapClassMethods[tag][classMethod] = `${path2} ${httpMethod}`;
-        snippetMap[path2] = snippetMap[path2] ? snippetMap[path2] : {};
+        snippetMap[pathWithBase] = snippetMap[pathWithBase] ? snippetMap[pathWithBase] : {};
         let description = endpoint.description;
         description = description || "";
         description = description.replace(/\s+/g, " ");
@@ -1306,7 +1309,6 @@ class CodeGenerator {
           arrayDefinitions.push(responseClass);
         }
         const queryParams = ParserUtils.filterQueryParameters(endpoint.parameters);
-        const pathWithBase = `${api.basePath ?? ""}${path2}`;
         const isFormUrlEncoded = ParserUtils.isFormUrlEncoded(httpMethod, endpoint.consumes);
         const pathParams = ParserUtils.filterPathParams(endpoint.parameters);
         let bodyParams = ParserUtils.filterBodyParams(endpoint.parameters);
@@ -1349,7 +1351,7 @@ class CodeGenerator {
         const serviceNameTitle = ParserUtils.convertDashesToTitleCase(serviceName);
         const { apiGenName } = ParserUtils.generateApiName(tag);
         const resultSnippet = templateSdkSnippet(serviceNameTitle, apiGenName, snippetMethod);
-        snippetMap[path2][httpMethod] = {
+        snippetMap[pathWithBase][httpMethod] = {
           web: resultSnippet,
           webGit: GIT_URL + `/sdk-${serviceName}/src/generated-public/${serviceName}/${apiGenName}.ts`,
           shell: snippetShell