@accelbyte/codegen 2.2.1 → 3.0.3

package/.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "plugins": ["unused-imports"],
+  "rules": {
+    "unused-imports/no-unused-imports": "error"
+  }
+}

package/dist/accelbyte-codegen.js

@@ -81,7 +81,7 @@ class CliParser {
 }
 
 const getImportableVarMap$1 = () => ({
-  "@accelbyte/sdk": ["CodeGenUtil", "SdkCache", "IResponse", "IResponseWithSync", "Validate"],
+  "@accelbyte/sdk": ["CodeGenUtil", "IResponse", "Validate"],
   axios: ["AxiosRequestConfig", "AxiosResponse"],
   zod: ["z"]
 });
@@ -114,14 +114,14 @@ ${generateImports(body, importStatements, makeNewImportVarMap$1(), getImportable
 
 export class ${className} {
   // @ts-ignore
-  constructor(private axiosInstance: AxiosInstance, private namespace: string, private cache = false, private isValidationEnabled = true) {}
+  constructor(private axiosInstance: AxiosInstance, private namespace: string, private isValidationEnabled = true) {}
   ${body}
 }
   `;
 };
 
 const getImportableVarMap = () => ({
-  "@accelbyte/sdk": ["CodeGenUtil", "SdkCache", "IResponse", "IResponseWithSync", "Validate", "ApiArgs", "Network", "AccelbyteSDK"]
+  "@accelbyte/sdk": ["CodeGenUtil", "IResponse", "Validate", "ApiArgs", "Network", "AccelbyteSDK"]
 });
 const makeNewImportVarMap = () => ({
   "@accelbyte/sdk": ["AccelbyteSDK", "ApiArgs", "ApiUtils"]
@@ -137,7 +137,6 @@ export function ${className}(sdk: AccelbyteSDK, args?: ApiArgs) {
   const sdkAssembly = sdk.assembly()
   
   const namespace = args?.namespace ? args?.namespace : sdkAssembly.namespace
-  const cache = args?.cache ? args?.cache : sdkAssembly.cache
   const requestConfig = ApiUtils.mergedConfigs(sdkAssembly.config, args)
   const isValidationEnabled = args?.isValidationEnabled !== false
   ${body}
@@ -941,7 +940,7 @@ const templateApiIndex = (serviceName, serviceNameTitle, apiList) => {
   let imports = "";
   let returnStatement = "";
   for (const cl of apiList) {
-    const dir = cl.toLowerCase().includes("admin") ? "generated-admin" : "generated-public";
+    const dir = cl.toLowerCase().includes("admin") && cl !== "AdminApi" ? "generated-admin" : "generated-public";
     imports += `
 import { ${cl} } from './${dir}/${cl}.js'`;
     returnStatement += `
@@ -1021,7 +1020,8 @@ const Endpoint = zod.z.object({
         schema: Schema.nullish()
       })
     }).nullish()
-  }).nullish()
+  }).nullish(),
+  "x-security": zod.z.any().nullish()
 });
 const Operation = zod.z.object({
   get: Endpoint.nullish(),
@@ -1117,28 +1117,20 @@ const templateMethod = ({
   methodParamsNoTypes = queryParamsType ? `${methodParamsNoTypes} queryParams` : methodParamsNoTypes;
   let methodImpl = "";
   const isCacheFetch = ["get"].includes(httpMethod) && resolvedResponseClass !== "unknown";
-  const cachedFetchMethod = classMethod;
   const deprecateTag = isCacheFetch ? `/**
  * @deprecated Use "${classMethod}()" instead.
  */` : "";
   const isGuardInvoked = ["get", "post", "put", "patch", "delete"].includes(httpMethod);
-  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 responseSyncType = httpMethod === "get" ? "IResponseWithSync" : ["post", "put", "patch", "delete"].includes(httpMethod) ? "IResponse" : "";
+  const generateMethodName = () => `${classMethod}(${methodParams}): Promise<${responseSyncType}<${responseType}>>`;
+  const responseSyncType = "IResponse";
   methodImpl = `${descriptionText}
   ${generateMethodName()} {
     ${queryParamsDefault}
     const url = ${newPath}    ${formPayloadString} ${isFileUpload ? "\n// TODO file upload not implemented" : ""}
     const resultPromise = this.axiosInstance.${httpMethod}(url, ${dataPayload})
 
-${httpMethod === "get" ? `    const res = () => this.isValidationEnabled ? Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated}, '${resolvedResponseClassValidated}') : Validate.unsafeResponse(() => resultPromise)
-
-    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 this.isValidationEnabled ? Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated}, '${resolvedResponseClassValidated}') : Validate.unsafeResponse(() => resultPromise)` : ""}
+${`    return this.isValidationEnabled ? Validate.responseType(() => resultPromise, ${resolvedResponseClassValidated}, '${resolvedResponseClassValidated}') : Validate.unsafeResponse(() => resultPromise)`}
   }
   `;
   if (!isGuardInvoked) {
@@ -1171,17 +1163,13 @@ const templateApiMethod = ({
   classGenName,
   methodParams,
   methodParamsNoTypes,
-  deprecated
+  deprecated,
+  xSecurity
 }) => {
-  let methodSignature = "";
   let newPath = `'${path}'`;
-  let snippetSdk = "";
-  let snippetShell = "";
+  let snippetMethod = "";
   for (const pathParam of pathParams) {
     const type = ParserUtils.parseType(pathParam);
-    if (pathParam.name !== "namespace") {
-      methodSignature += pathParam.name + `:${type}, `;
-    }
     const pName = pathParam.name === "namespace" ? "this.namespace" : pathParam.name;
     if (path.match(`{${pathParam.name}}`)) {
       if (type === "string") {
@@ -1191,16 +1179,21 @@ const templateApiMethod = ({
       }
     }
   }
-  snippetShell = `curl --location --request  \\
-    ${httpMethod} '__DOMAIN__${path}'  \\
-    --header 'accept: application/json'`;
+  const snippetShellArgs = ["--location --request", `${httpMethod} '__DOMAIN__${path}'`, "--header 'accept: application/json'"];
+  const snippetApiArgs = [];
+  if (xSecurity !== void 0 || path.includes("/admin")) {
+    snippetShellArgs.push("--header 'Authorization: Bearer {access_token}'");
+    snippetApiArgs.push("{ config: { headers: { Authorization: 'Bearer {access_token}' }  }}".trim());
+  }
   if (httpMethod !== "get") {
     const curlParams = bodyParams?.map((ob) => {
       return ` "${ob.name}": ""`;
     });
-    snippetShell += `  \\
-    --data-raw '{ ${curlParams}}'`;
+    if (curlParams.length > 0) {
+      snippetShellArgs.push(`--data-raw '{ ${curlParams}}'`);
+    }
   }
+  const snippetShell = `curl ${snippetShellArgs.join(" \\\n    ")}`;
   const descriptionText = description ? `
   /**${deprecated ? "\n   * @deprecated" : ""}
    * ${description.replace(/\n/g, "\n   * ")} 
@@ -1210,20 +1203,31 @@ const templateApiMethod = ({
   const methodImpl = `
   ${descriptionText}
   async function ${classMethod}(${methodParams}): Promise<${responseType}> {
-    const $ = new ${classGenName}(Network.create(requestConfig), namespace, cache, isValidationEnabled)
+    const $ = new ${classGenName}(Network.create(requestConfig), namespace, isValidationEnabled)
     const resp = await $.${classMethod}(${methodParamsNoTypes})
     if (resp.error) throw resp.error
     return resp.response.data
   }
   `;
   const snippetPromiseString = responseType !== "unknown" ? `Promise<${responseType}>` : "Promise";
-  snippetSdk += `${classMethod}(${methodParams}) 
+  snippetMethod += `${classMethod}(${methodParams}) 
    // return ${snippetPromiseString}`;
-  return [methodImpl, snippetSdk, snippetShell];
+  return {
+    generatedMethodString: methodImpl,
+    snippetApiArgs,
+    snippetMethod,
+    snippetShell
+  };
 };
 
-const templateSdkSnippet = (serviceNameTitle, apiName, methodSnippet) => {
-  const methodArr = methodSnippet.split("//");
+const templateSdkSnippet = ({
+  serviceNameTitle,
+  apiName,
+  snippetMethod,
+  snippetApiArgs: snippetApiArgsParam
+}) => {
+  const methodArr = snippetMethod.split("//");
+  const snippetApiArgs = ["sdk", ...snippetApiArgsParam];
   let normMethod = normalizeMethodSnippet(methodArr[0].trim(), "data:");
   normMethod = normalizeMethodSnippet(normMethod, "queryParams:");
   normMethod = normalizeMethodSnippet(normMethod, "queryParams?:");
@@ -1232,14 +1236,16 @@ const templateSdkSnippet = (serviceNameTitle, apiName, methodSnippet) => {
 import { ${serviceNameTitle} } from '@accelbyte/sdk-${serviceNameTitle.toLowerCase()}'
 
 const sdk = Accelbyte.SDK({
+  options: {
     baseURL: 'https://demo.accelbyte.io',
     clientId: '77f88506b6174c3ea4d925f5b4096ce8',
     namespace: 'accelbyte',
     redirectURI: 'http://localhost:3030'
+  }
 })
 
-${serviceNameTitle}.${apiName}(sdk)
-     .${normMethod}`;
+${serviceNameTitle}.${apiName}(${snippetApiArgs.join(", ")})
+  .${normMethod}`;
   return sdkSnippet;
 };
 const normalizeMethodSnippet = (methodInput, splitWord) => {
@@ -1378,7 +1384,7 @@ class SwaggerReaderHelpers {
           deprecated
         });
         tagToEndpointClassesRecord[tag] = (tagToEndpointClassesRecord[tag] || "") + methodImpl;
-        const [generatedMethodString, snippetMethod, snippetShell] = templateApiMethod({
+        const { generatedMethodString, snippetApiArgs, snippetMethod, snippetShell } = templateApiMethod({
           classMethod,
           description,
           httpMethod,
@@ -1389,14 +1395,15 @@ class SwaggerReaderHelpers {
           classGenName,
           methodParams,
           methodParamsNoTypes,
-          deprecated
+          deprecated,
+          xSecurity: endpoint["x-security"]
         });
         tagToSdkClientRecord[tag] = (tagToSdkClientRecord[tag] || "") + generatedMethodString;
         tagToSdkFunctionNamesRecord[tag] = (tagToSdkFunctionNamesRecord[tag] || "") + classMethod + ",";
         tagToSdkImportsRecord[tag] = tagToSdkImportsRecord[tag] ? [.../* @__PURE__ */ new Set([...importStatements, ...tagToSdkImportsRecord[tag]])] : [...new Set(importStatements)];
         const serviceNameTitle = ParserUtils.convertDashesToTitleCase(serviceName);
         const { apiGenName } = ParserUtils.generateApiName(tag, isAdminEndpoint);
-        const resultSnippet = templateSdkSnippet(serviceNameTitle, apiGenName, snippetMethod);
+        const resultSnippet = templateSdkSnippet({ serviceNameTitle, apiName: apiGenName, snippetMethod, snippetApiArgs });
         const currentSnippetMap = {};
         snippetMap[pathWithBase][httpMethod] = currentSnippetMap;
         currentSnippetMap.web = resultSnippet;