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

package/dist/accelbyte-codegen.js

@@ -78,6 +78,9 @@ class CliParser {
   static getSnippetOutputPath = () => {
     return CliParser.instance().argv.snippetOutput;
   };
+  static skipVersionSync = () => {
+    return CliParser.instance().argv.skipVersionSync;
+  };
 }
 
 const getImportableVarMap$1 = () => ({
@@ -178,7 +181,8 @@ class VersionHelpers {
       throw new Error(`Invalid sdk version: ${sdkVersion}`);
     }
     const { major: currentMajor, minor: currentMinor, patch: currentPatch, prerelease: currentPrerelease } = sdkSemvers;
-    const nextMajor = codegenSemvers.minor + predefinedMajorVersion;
+    const nextMajor = codegenSemvers.major + predefinedMajorVersion;
+    const shouldResetVersion = nextMajor !== currentMajor;
     let nextMinor = currentMinor;
     let nextPatch = currentPatch;
     switch (versionBumpType) {
@@ -194,6 +198,10 @@ class VersionHelpers {
         break;
       }
     }
+    if (shouldResetVersion) {
+      nextMinor = 0;
+      nextPatch = 0;
+    }
     let nextVersion = [
       codegenSemvers.major + predefinedMajorVersion,
       nextMinor,
@@ -203,7 +211,7 @@ class VersionHelpers {
       if (nextMinor !== currentMinor || nextMajor !== currentMajor) {
         nextVersion += `-${nextPrereleaseId}.0`;
       } else {
-        nextVersion += `-${sdkSemvers.prerelease.join(".")}`;
+        nextVersion += `-${currentPrerelease.join(".")}`;
         nextVersion = semver.inc(nextVersion, "prerelease", void 0, nextPrereleaseId);
       }
     }
@@ -516,16 +524,15 @@ class ParserUtils {
     ParserUtils.mkdirIfNotExist(distDir);
     fs.writeFileSync(path.join(distDir, `all-${isAdminWebSdk ? "admin" : "public"}-imports.ts`), ParserUtils.prependCopyrightHeader(buffer));
   }
-  static syncPackageVersion(apiInfo, isAdminWebSdk, prereleaseId) {
-    if (isAdminWebSdk) {
+  static syncPackageVersion(apiInfo, skipVersionSync, prereleaseId) {
+    if (skipVersionSync)
       return;
-    }
     const currDir = process.cwd();
     const { packageJSON, pathToPackageJSON } = ParserUtils.getPackageJSONInfo(currDir);
     const nextSemver = VersionHelpers.getNextVersion({
       codegenVersion: codegenPackageJSON.version,
       serviceVersion: apiInfo["x-version"] || apiInfo.version || UNDEFINED_SWAGGER_SEMVER,
-      predefinedMajorVersion: packageJSON.predefinedMajorVersion,
+      predefinedMajorVersion: packageJSON.predefinedMajorVersion || 0,
       versionBumpType: process.env.VERSION_BUMP_TYPE,
       sdkVersion: packageJSON.version,
       nextPrereleaseId: prereleaseId
@@ -610,7 +617,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) => {
@@ -1297,6 +1306,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({
@@ -1307,7 +1317,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, " ");
@@ -1322,7 +1332,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);
@@ -1365,7 +1374,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
@@ -1399,7 +1408,7 @@ class CodeGenerator {
     ParserUtils.mkdirIfNotExist(DIST_DIR);
     ParserUtils.mkdirIfNotExist(DIST_DEFINITION_DIR);
     ParserUtils.mkdirIfNotExist(DIST_ENDPOINTS_DIR);
-    ParserUtils.syncPackageVersion(apiInfo, CliParser.isAdmin(), process.env.PRERELEASE_ID);
+    ParserUtils.syncPackageVersion(apiInfo, CliParser.skipVersionSync(), process.env.PRERELEASE_ID);
     const { apiArgumentsByTag, apiBufferByTag, classBufferByTag, dependenciesByTag, classImports, arrayDefinitions, snippetMap } = await CodeGenerator.iterateApi(api, serviceName);
     if (CliParser.getSnippetOutputPath()) {
       try {