@accelbyte/codegen 1.0.0-alpha.6 → 1.0.0-alpha.8

package/dist/accelbyte-codegen.js

@@ -76,86 +76,6 @@ class CliParser {
   };
 }
 
-const Schema = zod.z.object({
-  $ref: zod.z.string().nullish(),
-  type: zod.z.union([
-    zod.z.literal("array"),
-    zod.z.literal("object"),
-    zod.z.literal("file"),
-    zod.z.literal("string"),
-    zod.z.literal("boolean")
-  ]).nullish(),
-  items: zod.z.object({
-    $ref: zod.z.string().nullish(),
-    type: zod.z.string().nullish()
-  }).nullish(),
-  properties: zod.z.array(zod.z.string()).nullish(),
-  description: zod.z.string().nullish(),
-  additionalProperties: zod.z.object({
-    type: zod.z.string().nullish()
-  }).nullish()
-});
-const Definition = zod.z.object({
-  required: zod.z.array(zod.z.string()).nullish(),
-  properties: zod.z.record(zod.z.object({
-    type: zod.z.string()
-  })).nullish()
-});
-const Definitions = zod.z.record(Definition);
-const EndpointParametersType = zod.z.enum(["apiKey", "boolean", "int", "integer", "number", "string", "array", "file"]);
-const EndpointParametersIn = zod.z.enum(["body", "formData", "header", "path", "query"]);
-const EndpointParameters = zod.z.object({
-  type: EndpointParametersType.nullish(),
-  description: zod.z.string().nullish(),
-  name: zod.z.string(),
-  in: EndpointParametersIn,
-  required: zod.z.boolean().nullish(),
-  schema: Schema.nullish(),
-  default: zod.z.union([zod.z.boolean(), zod.z.string(), zod.z.number()]).nullish(),
-  enum: zod.z.array(zod.z.union([zod.z.boolean(), zod.z.string(), zod.z.number()])).nullish(),
-  items: zod.z.object({
-    type: zod.z.string()
-  }).nullish()
-});
-const Endpoint = zod.z.object({
-  description: zod.z.string().nullish(),
-  consumes: zod.z.array(zod.z.string()).nullish(),
-  produces: zod.z.array(zod.z.string()).nullish(),
-  tags: zod.z.array(zod.z.string()).nullish(),
-  summary: zod.z.string().nullish(),
-  operationId: zod.z.string(),
-  deprecated: zod.z.boolean().nullish(),
-  responses: zod.z.record(zod.z.object({
-    description: zod.z.string().nullish(),
-    schema: Schema.nullish()
-  })),
-  parameters: zod.z.array(EndpointParameters).nullish()
-});
-const Operation = zod.z.object({
-  get: Endpoint.nullish(),
-  post: Endpoint.nullish(),
-  patch: Endpoint.nullish(),
-  delete: Endpoint.nullish(),
-  put: Endpoint.nullish()
-});
-const Paths = zod.z.record(Operation);
-zod.z.object({
-  paths: Paths,
-  definitions: Definitions,
-  basePath: zod.z.string(),
-  info: zod.z.object({
-    description: zod.z.string(),
-    title: zod.z.string(),
-    contact: zod.z.object({
-      name: zod.z.string(),
-      url: zod.z.string(),
-      email: zod.z.string()
-    }),
-    version: zod.z.string()
-  }),
-  schemes: zod.z.array(zod.z.string()).nullish()
-});
-
 const getImportableVarMap = () => ({
   "@accelbyte/sdk": ["CodeGenUtil", "SdkCache", "IResponse", "IResponseWithSync", "Validate"],
   axios: ["AxiosRequestConfig", "AxiosResponse"],
@@ -207,10 +127,14 @@ class ParserUtils {
     return `${attrName}: ${defaultValue}`;
   };
   static parseType = (pathParam) => {
-    if (pathParam.type === "int" || pathParam.type === "integer")
+    if (pathParam.type === "int" || pathParam.type === "integer" || pathParam?.schema?.type === "integer")
       return "number";
     if (pathParam.type === "array")
       return `${pathParam.items.type ?? "any"}[]`;
+    if (pathParam?.schema?.type === "array")
+      return `${pathParam.schema.items.type ?? "any"}[]`;
+    if (pathParam?.schema?.type)
+      return pathParam.schema.type;
     return pathParam.type;
   };
   static parseQueryParamsType = (queryParams) => {
@@ -263,12 +187,21 @@ class ParserUtils {
     if (definition.type && ParserUtils.parseType(definition) === "number") {
       return `${attrName}${required}: number`;
     }
+    if (definition?.schema?.type && ParserUtils.parseType(definition) === "number") {
+      return `${attrName}${required}: number`;
+    }
     if (definition.type && definition.type === "array") {
       return `${attrName}${required}: ${definition.items.type ?? "any"}[]`;
     }
+    if (definition?.schema?.type && definition.schema.type === "array") {
+      return `${attrName}${required}: ${definition.schema.items.type ?? "any"}[]`;
+    }
     if (definition.type && definition.type) {
       return `${attrName}${required}: ${definition.type} | null`;
     }
+    if (definition?.schema?.type && definition.schema.type) {
+      return `${attrName}${required}: ${definition.schema.type} | null`;
+    }
     return `${attrName}${required}: any`;
   };
   static parseBodyParamsType = (bodyParams) => {
@@ -300,11 +233,14 @@ class ParserUtils {
     keys.forEach((key) => {
       if (String(key).startsWith("2")) {
         const sch = methodEntity[key].schema;
+        const schV3 = methodEntity[key].content && methodEntity[key].content["application/json"].schema;
         if (sch?.$ref) {
           responseClass = ParserUtils.parseRefType(sch.$ref);
         } else if (sch?.type === "array" && sch.items?.$ref) {
           responseClass = ParserUtils.parseRefType(sch.items.$ref);
           responseClass = `${responseClass}Array`;
+        } else if (schV3?.$ref) {
+          responseClass = ParserUtils.parseRefType(schV3.$ref);
         } else ;
       }
     });
@@ -437,7 +373,104 @@ ${content}`;
   };
 }
 
-const templateJsdocMethod = ({ classMethod, httpMethod, path, pathParams, bodyParams, queryParams }) => {
+const Schema = zod.z.object({
+  $ref: zod.z.string().nullish(),
+  type: zod.z.union([zod.z.literal("array"), zod.z.literal("object"), zod.z.literal("file"), zod.z.literal("string"), zod.z.literal("boolean"), zod.z.literal("integer")]).nullish(),
+  items: zod.z.object({
+    $ref: zod.z.string().nullish(),
+    type: zod.z.string().nullish()
+  }).nullish(),
+  properties: zod.z.union([zod.z.array(zod.z.string()).nullish(), zod.z.record(zod.z.object({ type: zod.z.string() })).nullish()]),
+  description: zod.z.string().nullish(),
+  additionalProperties: zod.z.object({
+    type: zod.z.string().nullish()
+  }).nullish()
+});
+const Definition = zod.z.object({
+  required: zod.z.array(zod.z.string()).nullish(),
+  properties: zod.z.record(zod.z.object({
+    type: zod.z.string()
+  })).nullish()
+});
+const Definitions = zod.z.record(Definition);
+const EndpointParametersType = zod.z.enum(["apiKey", "boolean", "int", "integer", "number", "string", "array", "file"]);
+const EndpointParametersIn = zod.z.enum(["body", "formData", "header", "path", "query"]);
+const EndpointParameters = zod.z.object({
+  type: EndpointParametersType.nullish(),
+  description: zod.z.string().nullish(),
+  name: zod.z.string(),
+  in: EndpointParametersIn,
+  required: zod.z.boolean().nullish(),
+  schema: Schema.nullish(),
+  default: zod.z.union([zod.z.boolean(), zod.z.string(), zod.z.number()]).nullish(),
+  enum: zod.z.array(zod.z.union([zod.z.boolean(), zod.z.string(), zod.z.number()])).nullish(),
+  items: zod.z.object({
+    type: zod.z.string()
+  }).nullish()
+});
+const Endpoint = zod.z.object({
+  description: zod.z.string().nullish(),
+  consumes: zod.z.array(zod.z.string()).nullish(),
+  produces: zod.z.array(zod.z.string()).nullish(),
+  tags: zod.z.array(zod.z.string()).nullish(),
+  summary: zod.z.string().nullish(),
+  operationId: zod.z.string(),
+  deprecated: zod.z.boolean().nullish(),
+  responses: zod.z.record(zod.z.object({
+    description: zod.z.string().nullish(),
+    schema: Schema.nullish(),
+    content: zod.z.object({
+      "application/json": zod.z.object({
+        schema: Schema.nullish()
+      })
+    }).nullish()
+  })),
+  parameters: zod.z.array(EndpointParameters).nullish(),
+  requestBody: zod.z.object({
+    required: zod.z.boolean(),
+    content: zod.z.object({
+      "application/json": zod.z.object({
+        schema: Schema.nullish()
+      })
+    }).nullish()
+  }).nullish()
+});
+const Operation = zod.z.object({
+  get: Endpoint.nullish(),
+  post: Endpoint.nullish(),
+  patch: Endpoint.nullish(),
+  delete: Endpoint.nullish(),
+  put: Endpoint.nullish()
+});
+const Paths = zod.z.record(Operation);
+zod.z.object({
+  paths: Paths,
+  definitions: Definitions,
+  basePath: zod.z.string(),
+  info: zod.z.object({
+    description: zod.z.string(),
+    title: zod.z.string(),
+    contact: zod.z.object({
+      name: zod.z.string(),
+      url: zod.z.string(),
+      email: zod.z.string()
+    }),
+    version: zod.z.string()
+  }),
+  schemes: zod.z.array(zod.z.string()).nullish(),
+  components: zod.z.object({
+    schemas: Definitions
+  }).nullish()
+});
+
+const templateJsdocMethod = ({
+  classMethod,
+  httpMethod,
+  path,
+  pathParams,
+  bodyParams,
+  queryParams
+}) => {
   let jsdoc = "";
   let methodSignature = "";
   let newPath = path;
@@ -617,13 +650,17 @@ class TemplateZod {
     if (definition.additionalProperties) {
       return this.parseToZodAttribute("", definition, []);
     }
-    if (!definition.properties) {
+    let properties;
+    if (definition.properties) {
+      properties = Object.entries(definition.properties);
+    } else if (definition.items?.properties) {
+      properties = Object.entries(definition.items.properties);
+    } else {
       return {
         schemaString: "z.any()",
         typeString: "any"
       };
     }
-    const properties = Object.entries(definition.properties);
     const schemaFields = [];
     const typeFields = [];
     for (const property of properties) {
@@ -632,6 +669,12 @@ class TemplateZod {
       schemaFields.push(result.schemaString);
       typeFields.push(result.typeString);
     }
+    if (definition?.type === "array") {
+      return {
+        schemaString: `z.array(z.object({${schemaFields.join(",")}}))`,
+        typeString: typeFields.join(";")
+      };
+    }
     return {
       schemaString: `z.object({${schemaFields.join(",")}})`,
       typeString: typeFields.join(";")
@@ -673,7 +716,8 @@ class TemplateZod {
         };
       }
       if (type === "array") {
-        const ref2 = definition.items?.$ref;
+        const items = definition.items;
+        const ref2 = items?.$ref;
         let model2;
         if (ref2) {
           const refType = ParserUtils.parseRefType(ref2);
@@ -682,9 +726,13 @@ class TemplateZod {
             schemaString: refType,
             typeString: refType
           };
-        } else {
-          const items = definition.items;
+        } else if (items) {
           model2 = this.parseEnumItems(items);
+        } else {
+          return {
+            schemaString: `${schemaAttribute} z.array(z.any())${schemaRequired}`,
+            typeString: `${typeAttribute} any[]${typeNullishability}`
+          };
         }
         return {
           schemaString: `${schemaAttribute} z.array(${model2.schemaString})${schemaRequired}`,
@@ -834,13 +882,22 @@ class CodeGenerator {
           const isFormUrlEncoded = ParserUtils.isFormUrlEncoded(httpMethod, endpoint.consumes);
           const queryParams = ParserUtils.filterQueryParameters(endpoint.parameters);
           const pathParams = ParserUtils.filterPathParams(endpoint.parameters);
-          const bodyParams = ParserUtils.filterBodyParams(endpoint.parameters);
+          let bodyParams = ParserUtils.filterBodyParams(endpoint.parameters);
           const classMethod = ParserUtils.generateClassMethod({
             path: path2,
             endpoint,
             httpMethod,
             className
           });
+          if (endpoint.requestBody) {
+            bodyParams = [
+              {
+                name: "body",
+                in: "body",
+                schema: endpoint.requestBody.content["application/json"].schema
+              }
+            ];
+          }
           const pathWithBase = `${api.basePath ?? ""}${path2}`;
           const [generatedMethodString, importStatements] = templateMethod({
             classMethod,
@@ -891,8 +948,9 @@ class CodeGenerator {
       indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path.join(DIST_DIR, `${classGenName}`), targetSrcFolder));
     }
     const duplicates = /* @__PURE__ */ new Map();
-    for (const ref in api.definitions) {
-      const definition = api.definitions[ref];
+    const definitions = api?.components?.schemas || api.definitions;
+    for (const ref in definitions) {
+      const definition = definitions[ref];
       let fileName = ParserUtils.parseRefType(ref);
       const fileExist = fs.existsSync(path.join(DIST_DEFINITION_DIR, `${fileName}.ts`));
       if (fileExist) {
@@ -903,8 +961,8 @@ class CodeGenerator {
       ParserUtils.writeDefinitionFile(DIST_DEFINITION_DIR, fileName, buffer);
       indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path.join(DIST_DEFINITION_DIR, fileName), targetSrcFolder));
     }
-    for (const ref in api.definitions) {
-      const definition = api.definitions[ref];
+    for (const ref in definitions) {
+      const definition = definitions[ref];
       const fileName = ParserUtils.parseRefType(ref);
       const { buffer, duplicateFound } = new TemplateZod().render(fileName, definition, duplicates);
       if (duplicateFound) {