@accelbyte/codegen 1.0.1 → 1.0.4

package/dist/accelbyte-codegen.mjs

@@ -7,6 +7,7 @@ import path__default from 'path';
 import SwaggerParser from '@apidevtools/swagger-parser';
 import { applyPatch } from 'fast-json-patch';
 import _ from 'lodash';
+import semver from 'semver';
 import * as https from 'https';
 
 const SwaggersConfig = z.array(z.array(z.string()));
@@ -151,7 +152,14 @@ class ParserUtils {
   };
   static parseQueryParamAttributeDefault = (definition) => {
     const attrName = definition.name.slice(definition.name.lastIndexOf(".") + 1);
-    const defaultValue = definition.type === "string" ? `'${definition.default}'` : definition.default;
+    let defaultValue = definition.default;
+    if (definition.type === "array" && Array.isArray(definition.default)) {
+      const mappedDefaultValue = definition.default.map((defaultValue2) => typeof defaultValue2 === "string" ? `'${defaultValue2}'` : defaultValue2);
+      defaultValue = `[${mappedDefaultValue.join(", ")}]`;
+    }
+    if (definition.type === "string") {
+      defaultValue = `'${definition.default}'`;
+    }
     return `${attrName}: ${defaultValue}`;
   };
   static parseType = (pathParam) => {
@@ -380,6 +388,19 @@ class ParserUtils {
     const fileContent = templateClass(apiName, apiBuffer, imports);
     fs__default.writeFileSync(`${distDir}/${apiName}.ts`, ParserUtils.prependCopyrightHeader(fileContent));
   }
+  static writeXVersion(distDir, xversionJson, apiInfo) {
+    if (xversionJson) {
+      console.log("x-version:", xversionJson);
+      fs__default.writeFileSync(`${distDir}/version.json`, JSON.stringify(xversionJson, null, 2));
+    } else {
+      const customVersion = {
+        ...apiInfo,
+        gitHash: apiInfo.version
+      };
+      console.error("!!!! Missing x-version for ", distDir, customVersion);
+      fs__default.writeFileSync(`${distDir}/version.json`, JSON.stringify(customVersion, null, 2));
+    }
+  }
   static writeApiFile(distDir, apiName, apiBuffer, imports, returnMethods) {
     const newImports = [];
     imports.forEach((el, index) => {
@@ -417,7 +438,7 @@ class ParserUtils {
 ` + fileContent.trim();
     fs__default.writeFileSync(pathToChangelog, fileContent, "utf-8");
   }
-  static syncPackageVersion(apiInfo, isAdminWebSdk) {
+  static syncPackageVersion(apiInfo, isAdminWebSdk, prereleaseId) {
     if (isAdminWebSdk) {
       return;
     }
@@ -426,9 +447,18 @@ class ParserUtils {
     let swaggerVersion = apiInfo.version ? apiInfo.version : UNDEFINED_SWAGGER_SEMVER;
     swaggerVersion = Number(swaggerVersion.replace(".", "").replace(".", ""));
     swaggerVersion = isNaN(swaggerVersion) ? 0 : swaggerVersion;
-    const semver = packageJSON.version.split(".").map((numStr) => Number(numStr));
-    const newSemver = [semver[0], swaggerVersion, ++semver[2]];
-    packageJSON.version = newSemver[0] + "." + newSemver[1] + "." + newSemver[2];
+    const currentSemver = packageJSON.version;
+    let nextSemver = [semver.major(currentSemver), swaggerVersion, semver.patch(currentSemver)].join(".");
+    if (!prereleaseId) {
+      nextSemver = semver.inc(nextSemver, "patch");
+    } else {
+      const currentPrerelease = semver.prerelease(currentSemver);
+      if (currentPrerelease) {
+        nextSemver += `-${currentPrerelease.join(".")}`;
+      }
+      nextSemver = semver.inc(nextSemver, "prerelease", void 0, prereleaseId);
+    }
+    packageJSON.version = nextSemver;
     writeFileSync(pathToPackageJSON, JSON.stringify(packageJSON, null, 2));
     ParserUtils.syncChangelog(packageJSON.version);
   }
@@ -508,6 +538,9 @@ class ParserUtils {
  */
 ${content}`;
   };
+  static sortPathParamsByPath = (pathParams, path2) => {
+    return pathParams.sort((a, b) => path2.indexOf(a.name) - path2.indexOf(b.name));
+  };
 }
 const mappedMethod = (httpMethod, isForm) => {
   if (httpMethod === "get") {
@@ -603,10 +636,11 @@ const EndpointParameters = z.object({
   in: EndpointParametersIn,
   required: z.boolean().nullish(),
   schema: Schema.nullish(),
-  default: z.union([z.boolean(), z.string(), z.number()]).nullish(),
+  default: z.union([z.boolean(), z.string(), z.number(), z.array(z.any())]).nullish(),
   enum: z.array(z.union([z.boolean(), z.string(), z.number()])).nullish(),
   items: z.object({
-    type: z.string()
+    type: z.string(),
+    enum: z.array(z.any()).nullish()
   }).nullish()
 });
 const Endpoint = z.object({
@@ -679,7 +713,8 @@ const templateMethod = ({
   let methodParamsNoTypes = "";
   let newPath = `'${path}'`;
   let importStatements = [];
-  for (const pathParam of pathParams) {
+  const sortedPathParams = ParserUtils.sortPathParamsByPath(pathParams, path);
+  for (const pathParam of sortedPathParams) {
     const type = ParserUtils.parseType(pathParam);
     if (pathParam.name !== "namespace") {
       methodParams += pathParam.name + `:${type}, `;
@@ -1175,6 +1210,8 @@ class CodeGenerator {
         continue;
       } else if (!CliParser.isAdmin() && isAdminEndpoint) {
         continue;
+      } else if (path2.indexOf("/healthz") >= 0) {
+        continue;
       }
       const httpMethods = Object.keys(operation);
       for (const httpMethod of httpMethods) {
@@ -1284,19 +1321,20 @@ class CodeGenerator {
     const DIST_ENDPOINTS_DIR = path__default.join(DIST_DIR, "endpoints");
     const DIST_DEFINITION_DIR = path__default.join(DIST_DIR, "definitions");
     const swaggerFilePath = `${CliParser.getSwaggersOutputPath()}/${swaggerFile}`;
-    const swaggerPatchedFilePath = `${CodeGenerator.getPatchedDir()}/${swaggerFile}`;
-    const swaggerPatchFilePath = `${swaggerFilePath}patch`;
-    ParserUtils.applyPatchIfExists(swaggerFilePath, swaggerPatchFilePath, swaggerPatchedFilePath, CodeGenerator.getPatchedDir());
-    const api = await parser.parse(swaggerPatchedFilePath);
+    const api = await parser.parse(swaggerFilePath);
     const indexImportsSet = /* @__PURE__ */ new Set();
     console.log("----------\nGenerating API:", { title: api.info.title, version: api.info.version });
     ParserUtils.mkdirIfNotExist(DIST_DIR);
     ParserUtils.mkdirIfNotExist(DIST_DEFINITION_DIR);
     ParserUtils.mkdirIfNotExist(DIST_ENDPOINTS_DIR);
-    ParserUtils.syncPackageVersion(api.info, CliParser.isAdmin());
+    ParserUtils.syncPackageVersion(api.info, CliParser.isAdmin(), process.env.PRERELEASE_ID);
     const { apiArgumentsByTag, apiBufferByTag, classBufferByTag, dependenciesByTag, classImports, arrayDefinitions, snippetMap } = await CodeGenerator.iterateApi(api, serviceName);
     if (CliParser.getSnippetOutputPath()) {
-      ParserUtils.writeSnippetFile(CodeGenerator.getGeneratedSnippetsFolder(), api.info.title, JSON.stringify(snippetMap, null, 2));
+      try {
+        ParserUtils.writeSnippetFile(CodeGenerator.getGeneratedSnippetsFolder(), api.info.title, JSON.stringify(snippetMap, null, 2));
+      } catch (err) {
+        console.log("Generating snippets", err);
+      }
     }
     const targetSrcFolder = `${CliParser.getOutputPath()}/`;
     const apiList = [];
@@ -1346,6 +1384,7 @@ class CodeGenerator {
       ParserUtils.writeDefinitionFile(DIST_DEFINITION_DIR, arrayClass, buffer);
       indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path__default.join(DIST_DEFINITION_DIR, arrayClass), targetSrcFolder));
     }
+    ParserUtils.writeXVersion(DIST_DIR, api["x-version"], api.info);
     console.log("\nCOMPLETED\n----------\n\n");
     return indexImportsSet;
   };
@@ -1380,13 +1419,19 @@ class SwaggerDownloader {
   };
   static downloadFile = (targetFileName, url) => {
     const destFile = SwaggerDownloader.getDestFile(targetFileName);
-    const file = fs.createWriteStream(destFile);
+    let data = "";
     const request = https.get(url, function(response) {
-      response.pipe(file);
-      file.on("finish", () => {
-        file.close();
-        SwaggerDownloader.postSanitizeDownloadedFile(destFile);
-        console.log(`SwaggerDownload ${url} completed`);
+      response.on("data", (chunk) => {
+        data += chunk;
+      });
+      response.on("end", () => {
+        if (response.statusCode !== 200) {
+          console.log(`SwaggerDownload error with status code: ${response.statusCode}`);
+        } else {
+          fs.writeFileSync(destFile, JSON.stringify(JSON.parse(data), null, 2), "utf-8");
+          SwaggerDownloader.postSanitizeDownloadedFile(destFile);
+          console.log(`SwaggerDownload ${url} completed with status code: ${response.statusCode}`);
+        }
       });
     });
     request.on("error", (err) => {
@@ -1400,7 +1445,6 @@ class SwaggerDownloader {
       const url = swaggers[ref][3];
       SwaggerDownloader.downloadFile(targetFileName, url);
     }
-    console.log("\n----------\n SwaggerDownloader COMPLETED.\n----------\n\n");
   };
 }
 
@@ -1408,7 +1452,7 @@ yargs.command("download-swaggers", "Download swaggers JSON files", (yargs2) => {
   CliParser.createInstance(yargs2);
   SwaggerDownloader.main();
 }).command("generate-code", "Generate code based on downloaded swagger files", async (yargs2) => {
-  yargs2.check(({ output, swaggersOutput }) => {
+  yargs2.check(({ output }) => {
     if (!output?.trim()) {
       throw new Error("output is required for generate-code");
     }
@@ -1429,7 +1473,7 @@ yargs.command("download-swaggers", "Download swaggers JSON files", (yargs2) => {
   }
   const indexImportsArray = Array.from(indexImportsSet);
   const filesToImport = indexImportsArray.map((fileToImport) => {
-    return `export * from '${fileToImport.replace("\\", "/")}'`;
+    return `export * from '${fileToImport.replace("\\", "/")}.js'`;
   });
   ParserUtils.writeAllImportsFile(CliParser.getOutputPath(), filesToImport.join("\n"), CliParser.isAdmin());
 }).option("config", {