@accelbyte/codegen 4.1.6 → 4.2.1

package/dist/accelbyte-codegen.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import path7 from "path";
+import path8 from "path";
 import yargs from "yargs";
 
 // src/CliParser.ts
@@ -65,18 +65,55 @@ var CliParser = class _CliParser {
 
 // src/CodeGenerator.ts
 import SwaggerParser from "@apidevtools/swagger-parser";
-import fs4 from "fs";
-import path4 from "path";
+import fs5 from "fs";
+import path5 from "path";
+
+// src/CodegenConfig.ts
+import fs2 from "fs";
+import path2 from "path";
+import { pathToFileURL } from "url";
+var CodegenConfig = class _CodegenConfig {
+  static config = {};
+  static async loadConfig(configDir) {
+    const configPath = path2.join(configDir, "abcodegen.config.ts");
+    if (!fs2.existsSync(configPath)) {
+      _CodegenConfig.config = {};
+      return;
+    }
+    const loaded = await import(pathToFileURL(configPath).href);
+    _CodegenConfig.config = loaded.default ?? loaded ?? {};
+  }
+  static shouldProduceIndexFiles() {
+    return _CodegenConfig.config.shouldProduceIndexFiles ?? true;
+  }
+  static getBasePath() {
+    return _CodegenConfig.config.basePath;
+  }
+  static getOverrideAsAny() {
+    return _CodegenConfig.config.overrideAsAny;
+  }
+  static splitOutputByServiceName() {
+    return _CodegenConfig.config.splitOutputByServiceName ?? false;
+  }
+  /** Reset to defaults — used for testing */
+  static reset() {
+    _CodegenConfig.config = {};
+  }
+  /** Set config directly — used for testing */
+  static setConfig(config) {
+    _CodegenConfig.config = config;
+  }
+};
 
 // src/ParserUtils.ts
 import { applyPatch } from "fast-json-patch";
-import fs3 from "fs";
+import fs4 from "fs";
 import _ from "lodash";
-import path3 from "path";
+import path4 from "path";
 
 // src/helpers/utils.ts
-import fs2 from "fs";
-import path2 from "path";
+import fs3 from "fs";
+import path3 from "path";
 var capitalize = (string) => {
   return string.charAt(0).toUpperCase() + string.slice(1);
 };
@@ -138,7 +175,8 @@ var getResponseType = ({
   defaultType = "unknown"
 }) => {
   const responseClass = responseClasses.length === 1 ? responseClasses?.[0] : "unknown";
-  const responseType = responseClass !== "unknown" ? responseClasses?.[0] : defaultType;
+  const rawResponseType = responseClass !== "unknown" ? responseClasses?.[0] : defaultType;
+  const responseType = rawResponseType === "__dictionary__" ? "Record<string, any>" : rawResponseType;
   return {
     responseType,
     responseTypeInAxiosResponse: `Promise<AxiosResponse<${responseType}>>`,
@@ -153,10 +191,10 @@ var getImportableVarMap = () => ({
   zod: ["z"]
 });
 var makeNewImportVarMap = () => ({
-  axios: ["AxiosInstance", "AxiosRequestConfig"],
-  "@accelbyte/sdk": ["SDKRequestConfig"]
+  axios: ["AxiosInstance", "AxiosRequestConfig"]
 });
-var generateImports = (body, importStatements, makeNewImportVarMap3, getImportableVarMap3) => {
+var CLASS_TYPE_ONLY_VARS = /* @__PURE__ */ new Set(["AxiosInstance", "AxiosRequestConfig", "AxiosResponse", "SdkSetConfigParam", "Response"]);
+var generateImports = (body, importStatements, makeNewImportVarMap3, getImportableVarMap3, typeOnlyVars = /* @__PURE__ */ new Set()) => {
   const usedImportVarMap = makeNewImportVarMap3;
   const importableVarMap = getImportableVarMap3;
   for (const [moduleSource, importableVars] of Object.entries(importableVarMap)) {
@@ -167,22 +205,45 @@ var generateImports = (body, importStatements, makeNewImportVarMap3, getImportab
       }
     }
   }
-  const generatedImports = Object.keys(usedImportVarMap).sort().map((moduleSource) => {
-    return `import { ${usedImportVarMap[moduleSource].sort().join(", ")} } from '${moduleSource}'`;
-  }).join("\n");
+  const importLines = [];
+  for (const moduleSource of Object.keys(usedImportVarMap).sort()) {
+    const allVars = usedImportVarMap[moduleSource];
+    const valueVars = allVars.filter((v) => !typeOnlyVars.has(v)).sort();
+    const typeVars = allVars.filter((v) => typeOnlyVars.has(v)).sort();
+    if (valueVars.length > 0) {
+      importLines.push(`import { ${valueVars.join(", ")} } from '${moduleSource}'`);
+    }
+    if (typeVars.length > 0) {
+      importLines.push(`import type { ${typeVars.join(", ")} } from '${moduleSource}'`);
+    }
+  }
+  const generatedImports = importLines.join("\n");
   return `${generatedImports}
 ${importStatements.sort().join("\n")}`;
 };
 var templateClass = (className, body, importStatements) => {
+  const attributes = {
+    definitions: ["private axiosInstance: AxiosInstance", "private namespace: string", "private useSchemaValidation: boolean"],
+    assignments: ["this.axiosInstance = axiosInstance", "this.namespace = namespace", "this.useSchemaValidation = useSchemaValidation"]
+  };
+  let namespaceConstructor = "namespace";
+  if (!body.includes(".replace('{namespace}', this.namespace)")) {
+    namespaceConstructor = "_namespace";
+    attributes.definitions.splice(1, 1);
+    attributes.assignments.splice(1, 1);
+  }
   return `/**
  * AUTO GENERATED
  */
-${generateImports(body, importStatements, makeNewImportVarMap(), getImportableVarMap())}
+${generateImports(body, importStatements, makeNewImportVarMap(), getImportableVarMap(), CLASS_TYPE_ONLY_VARS)}
 
 export class ${className} {
-  // @ts-ignore
-  // prettier-ignore
-  constructor(private axiosInstance: AxiosInstance, private namespace: string, private useSchemaValidation = true) {}
+  ${attributes.definitions.join("\n")}
+
+  constructor(axiosInstance: AxiosInstance, ${namespaceConstructor}: string, useSchemaValidation = true) {
+    ${attributes.assignments.join("\n")}
+  }
+
   ${body}
 }
   `;
@@ -197,6 +258,15 @@ var makeNewImportVarMap2 = () => ({
   "@accelbyte/sdk": ["AccelByteSDK", "SdkSetConfigParam", "ApiUtils", "Network"],
   axios: ["AxiosRequestConfig", "AxiosResponse"]
 });
+var API_TYPE_ONLY_VARS = /* @__PURE__ */ new Set([
+  "AxiosRequestConfig",
+  "AxiosResponse",
+  "AxiosDefaults",
+  "HeadersDefaults",
+  "AccelByteSDK",
+  "SdkSetConfigParam",
+  "Response"
+]);
 var templateApiClass = (className, body, importStatements, returnMethods) => {
   const returnsMethodsWithDescription = Object.keys(returnMethods).reduce((acc, key) => {
     acc += `
@@ -208,18 +278,16 @@ ${key},`;
   return `/**
  * AUTO GENERATED
  */
-/* eslint-disable camelcase */
-// @ts-ignore -> ts-expect-error TS6133
-${generateImports(body, importStatements, makeNewImportVarMap2(), getImportableVarMap2())}
+${generateImports(body, importStatements, makeNewImportVarMap2(), getImportableVarMap2(), API_TYPE_ONLY_VARS)}
 ${`import { ${$className} } from './endpoints/${$className}.js'
 `}
 
 export function ${className}(sdk: AccelByteSDK, args?: SdkSetConfigParam) {
   const sdkAssembly = sdk.assembly()
-  
+
   const namespace = args?.coreConfig?.namespace ?? sdkAssembly.coreConfig.namespace
   const useSchemaValidation = args?.coreConfig?.useSchemaValidation ?? sdkAssembly.coreConfig.useSchemaValidation
-  
+
   let axiosInstance = sdkAssembly.axiosInstance
   const requestConfigOverrides = args?.axiosConfig?.request
   const baseURLOverride = args?.coreConfig?.baseURL
@@ -237,7 +305,7 @@ export function ${className}(sdk: AccelByteSDK, args?: SdkSetConfigParam) {
         if (interceptor.type === 'request') {
           axiosInstance.interceptors.request.use(interceptor.onRequest, interceptor.onError)
         }
-  
+
         if (interceptor.type === 'response') {
           axiosInstance.interceptors.response.use(interceptor.onSuccess, interceptor.onError)
         }
@@ -248,7 +316,7 @@ export function ${className}(sdk: AccelByteSDK, args?: SdkSetConfigParam) {
   }
 
   ${body}
-  
+
   return {
     ${returnsMethodsWithDescription}
   }
@@ -259,7 +327,7 @@ export function ${className}(sdk: AccelByteSDK, args?: SdkSetConfigParam) {
 // src/ParserQueryUtils.ts
 var ParserQueryUtils = class {
   /**
-   * convert csv 'aa,bb' into "aa='aa', bb='bb'"
+   * convert csv 'aa,bb' into "aa = 'Sdk.Class.aa', bb = 'Sdk.Class.bb'"
    */
   static createQueryKeys(classNameWithoutApi, csvMethodNames, sdkName) {
     const keys = csvMethodNames.split(",");
@@ -270,7 +338,7 @@ var ParserQueryUtils = class {
         const cleanedKey = trimmedKey.replace(/^(get|update|create|patch|delete|post|fetch)[_]?/, "");
         if (!processedKeys.has(cleanedKey)) {
           processedKeys.add(cleanedKey);
-          acc += `${cleanedKey} = '${capitalize(sdkName)}.${classNameWithoutApi}.${cleanedKey}'`;
+          acc += `${cleanedKey}: '${capitalize(sdkName)}.${classNameWithoutApi}.${cleanedKey}'`;
           if (index < keys.length - 1) {
             acc += ",\n";
           }
@@ -284,42 +352,51 @@ var ParserQueryUtils = class {
 
 // src/templates/template-query.ts
 var generateImports2 = (body, className) => {
-  const generatedImports = `import { AccelByteSDK, SdkSetConfigParam, ApiError } from '@accelbyte/sdk'
-import { AxiosError, AxiosResponse } from 'axios'
-// @ts-ignore
-import { useQuery, UseQueryOptions, UseQueryResult, useMutation, UseMutationOptions, UseMutationResult } from '@tanstack/react-query'
-import { ${className} } from "../${className}.js"
-`;
-  return generatedImports;
+  const lines = [];
+  lines.push("import type { AccelByteSDK, ApiError, SdkSetConfigParam } from '@accelbyte/sdk'");
+  const axiosTypes = ["AxiosError", "AxiosResponse"].filter((t) => body.includes(t));
+  if (axiosTypes.length) {
+    lines.push(`import type { ${axiosTypes.join(", ")} } from 'axios'`);
+  }
+  const rqValues = ["useMutation", "useQuery"].filter((t) => body.includes(t));
+  if (rqValues.length) {
+    lines.push(`import { ${rqValues.join(", ")} } from '@tanstack/react-query'`);
+  }
+  const rqTypes = ["UseMutationOptions", "UseMutationResult", "UseQueryOptions", "UseQueryResult"].filter((t) => body.includes(t));
+  if (rqTypes.length) {
+    lines.push(`import type { ${rqTypes.join(", ")} } from '@tanstack/react-query'`);
+  }
+  lines.push(`import { ${className} } from "../${className}.js"`);
+  return lines.join("\n") + "\n";
 };
 var templateQuery = (className, body, importStatements, serviceNameTitle, returnMethods, paramImports, sdkName) => {
   const classNameWithoutApi = className.replace("Api", "");
   const queryKeys = ParserQueryUtils.createQueryKeys(classNameWithoutApi, returnMethods, sdkName);
   const generatedImports = generateImports2(body, className);
+  const queryKeyBlock = `export const Key_${classNameWithoutApi} = {
+  ${queryKeys}
+} as const`;
   return `/**
  * AUTO GENERATED
  */
-/* eslint-disable camelcase */
 ${generatedImports}
 ${filterUsedImports(paramImports, body)}
 
-export enum Key_${classNameWithoutApi} {
-  ${queryKeys}
-}
+${queryKeyBlock}
 
   ${body}
   `;
 };
 function filterUsedImports(importArr, body) {
-  return importArr.filter((path8) => {
-    const start = path8.indexOf("{") + 1;
-    const end = path8.indexOf("}");
+  return importArr.filter((path9) => {
+    const start = path9.indexOf("{") + 1;
+    const end = path9.indexOf("}");
     if (start > 0 && end > start) {
-      const importName = path8.slice(start, end).trim();
+      const importName = path9.slice(start, end).trim();
       return body.includes(importName);
     }
     return false;
-  }).map((path8) => path8).join("\n") + "\n";
+  }).map((path9) => path9).join("\n") + "\n";
 }
 
 // src/ParserUtils.ts
@@ -336,8 +413,8 @@ var REMOVED_KEYWORDS = [
   "/{namespace}/"
 ];
 var ParserUtils = class _ParserUtils {
-  static getVersionSuffixFromPath(path8) {
-    const version2_3_4_etc = path8.match(/\/v([2-9]|[1-9]\d+)\/+/);
+  static getVersionSuffixFromPath(path9) {
+    const version2_3_4_etc = path9.match(/\/v([2-9]|[1-9]\d+)\/+/);
     const methodSuffix = version2_3_4_etc ? `_v${version2_3_4_etc[1]}` : "";
     return methodSuffix;
   }
@@ -419,13 +496,14 @@ var ParserUtils = class _ParserUtils {
   };
   static parseRefImport = (bodyParam) => {
     const $ref = bodyParam?.schema?.$ref || bodyParam?.schema?.items?.$ref;
-    if (!$ref) {
+    if (!$ref || $ref.endsWith("__dictionary__")) {
       return null;
     }
     const type = _ParserUtils.parseRefType($ref);
     return `import { ${type} } from '../../generated-definitions/${type}.js'`;
   };
   static parseRefType = ($ref) => {
+    if ($ref.endsWith("__dictionary__")) return "__dictionary__";
     let ref = $ref.replace(".", "/");
     if (ref[ref.length - 1] === "." || ref[ref.length - 1] === "/") {
       ref = ref.slice(0, -1);
@@ -532,14 +610,14 @@ var ParserUtils = class _ParserUtils {
    * to this
    * `createGenerateByRequestIdByUserId`
    */
-  static generateNaturalLangMethod = ({ servicePrefix, path: path8, httpMethod, isForm, existingMethods, permissionType }) => {
-    let path_ = path8;
+  static generateNaturalLangMethod = ({ servicePrefix, path: path9, httpMethod, isForm, existingMethods, permissionType }) => {
+    let path_ = path9;
     path_ = path_.replace(`/${servicePrefix}/`, "/");
     REMOVED_KEYWORDS.forEach((prefix) => {
       path_ = path_.replace(prefix, "/");
     });
     path_ = path_.substring(1);
-    const isPlural = httpMethod === "get" && !(path8.slice(-1) === "}");
+    const isPlural = httpMethod === "get" && !(path9.slice(-1) === "}");
     if (!isPlural) {
       path_ = _ParserUtils.replaceAll(path_, "ies/", "y/");
       path_ = _ParserUtils.replaceAll(path_, "s/", "/");
@@ -582,9 +660,9 @@ var ParserUtils = class _ParserUtils {
     const genPath = _.upperFirst(lastWords) + "/" + listBeforeLastWords.join("/") + listByParams.reverse().join("/");
     let generatedMethod = _.camelCase(mappedMethod(httpMethod, isForm, permissionType) + genPath);
     generatedMethod = _ParserUtils.replaceAll(generatedMethod, "Byword", "_By");
-    const testedGeneratedMethod = generatedMethod + _ParserUtils.getVersionSuffixFromPath(path8);
-    generatedMethod = resolveConflicts({ path: path8, generatedMethod, testedGeneratedMethod, existingMethods });
-    generatedMethod = generatedMethod + _ParserUtils.getVersionSuffixFromPath(path8);
+    const testedGeneratedMethod = generatedMethod + _ParserUtils.getVersionSuffixFromPath(path9);
+    generatedMethod = resolveConflicts({ path: path9, generatedMethod, testedGeneratedMethod, existingMethods });
+    generatedMethod = generatedMethod + _ParserUtils.getVersionSuffixFromPath(path9);
     return generatedMethod;
   };
   static filterBodyParams(parameters) {
@@ -600,17 +678,17 @@ var ParserUtils = class _ParserUtils {
     return parameters.filter((parameter) => parameter.in === "query");
   }
   static mkdirIfNotExist(dirToCreate) {
-    if (!fs3.existsSync(dirToCreate)) {
-      fs3.mkdirSync(dirToCreate, { recursive: true });
+    if (!fs4.existsSync(dirToCreate)) {
+      fs4.mkdirSync(dirToCreate, { recursive: true });
     }
   }
   static writeClassFile(distDir, apiName, apiBuffer, imports) {
     const fileContent = templateClass(apiName, apiBuffer, imports);
-    fs3.writeFileSync(`${distDir}/${apiName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
+    fs4.writeFileSync(`${distDir}/${apiName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
   }
   static writeAtomFile(distDir, apiName, fileContent) {
     _ParserUtils.mkdirIfNotExist(distDir);
-    fs3.writeFileSync(`${distDir}/${apiName}.atom.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
+    fs4.writeFileSync(`${distDir}/${apiName}.atom.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
   }
   static writeQueryFile(distDir, apiName, apiBuffer, imports, serviceNameTitle, returnMethods, paramImports, sdkName) {
     if (apiBuffer.length < 1) {
@@ -619,20 +697,21 @@ var ParserUtils = class _ParserUtils {
     const queryFileName = `${apiName.replace("Api", "")}.query`;
     _ParserUtils.mkdirIfNotExist(distDir);
     const fileContent = templateQuery(apiName, apiBuffer, imports, serviceNameTitle, returnMethods, paramImports, sdkName);
-    fs3.writeFileSync(`${distDir}/${queryFileName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
+    fs4.writeFileSync(`${distDir}/${queryFileName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
     return queryFileName;
   }
   static writeXVersion(distDir, xversionJson, apiInfo) {
+    fs4.mkdirSync(distDir, { recursive: true });
     if (xversionJson) {
       console.log("x-version:", xversionJson);
-      fs3.writeFileSync(`${distDir}/version.json`, JSON.stringify(xversionJson, null, 2));
+      fs4.writeFileSync(`${distDir}/version.json`, JSON.stringify(xversionJson, null, 2));
     } else {
       const customVersion = {
         ...apiInfo,
         gitHash: apiInfo.version
       };
       console.error(`!!!! Missing x-version for ${distDir} ${customVersion}`);
-      fs3.writeFileSync(`${distDir}/version.json`, JSON.stringify(customVersion, null, 2));
+      fs4.writeFileSync(`${distDir}/version.json`, JSON.stringify(customVersion, null, 2));
     }
   }
   static writeApiFile(distDir, apiName, apiBuffer, imports, returnMethodsDescription) {
@@ -641,28 +720,28 @@ var ParserUtils = class _ParserUtils {
       newImports.push(el.replace("../../generated-definitions", "../generated-definitions"));
     });
     const fileContent = templateApiClass(apiName, apiBuffer, newImports, returnMethodsDescription);
-    fs3.writeFileSync(`${distDir}/${apiName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
+    fs4.writeFileSync(`${distDir}/${apiName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
   }
   static writeApiMainFile(distDir, serviceName, fileContent) {
-    fs3.writeFileSync(`${distDir}/${serviceName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
+    fs4.writeFileSync(`${distDir}/${serviceName}.ts`, _ParserUtils.prependCopyrightHeader(fileContent));
   }
   static writeSnippetFile(distDir, name, docBuffer) {
     let snippetFileName = _ParserUtils.replaceAll(name, " ", "-").toLowerCase();
     snippetFileName = snippetFileName.replace("justice-", "");
     snippetFileName = "snippet-" + snippetFileName + ".json";
-    fs3.writeFileSync(`${distDir}/${snippetFileName}`, docBuffer);
+    fs4.writeFileSync(`${distDir}/${snippetFileName}`, docBuffer);
   }
   static writeDefinitionFile(distDir, name, buffer) {
     _ParserUtils.mkdirIfNotExist(distDir);
-    fs3.writeFileSync(path3.join(distDir, `${name}.ts`), _ParserUtils.prependCopyrightHeader(buffer));
+    fs4.writeFileSync(path4.join(distDir, `${name}.ts`), _ParserUtils.prependCopyrightHeader(buffer));
   }
   static writeAllImportsFile(distDir, buffer) {
     _ParserUtils.mkdirIfNotExist(distDir);
-    fs3.writeFileSync(path3.join(distDir, "all-imports.ts"), _ParserUtils.prependCopyrightHeader(buffer));
+    fs4.writeFileSync(path4.join(distDir, "all-imports.ts"), _ParserUtils.prependCopyrightHeader(buffer));
   }
   static writeAllQueryImportsFile(distDir, buffer) {
     _ParserUtils.mkdirIfNotExist(distDir);
-    fs3.writeFileSync(path3.join(distDir, "all-query-imports.ts"), _ParserUtils.prependCopyrightHeader(buffer));
+    fs4.writeFileSync(path4.join(distDir, "all-query-imports.ts"), _ParserUtils.prependCopyrightHeader(buffer));
   }
   static toCamelCase(str) {
     return str.split("/").map(function(word, index) {
@@ -688,15 +767,15 @@ var ParserUtils = class _ParserUtils {
     });
   }
   static applyPatchIfExists(swaggerFilePath, possibleSwaggerPatchFilePath, swaggerPatchedFilePath, swaggerPatchedDir) {
-    if (!fs3.existsSync(swaggerPatchedDir)) {
-      fs3.mkdirSync(swaggerPatchedDir, { recursive: true });
+    if (!fs4.existsSync(swaggerPatchedDir)) {
+      fs4.mkdirSync(swaggerPatchedDir, { recursive: true });
     }
-    if (!fs3.existsSync(possibleSwaggerPatchFilePath)) {
-      fs3.copyFileSync(swaggerFilePath, swaggerPatchedFilePath);
+    if (!fs4.existsSync(possibleSwaggerPatchFilePath)) {
+      fs4.copyFileSync(swaggerFilePath, swaggerPatchedFilePath);
       return;
     }
-    const swaggerContent = JSON.parse(fs3.readFileSync(swaggerFilePath, "utf8"));
-    const swaggerPatchFileContent = JSON.parse(fs3.readFileSync(possibleSwaggerPatchFilePath, "utf8"));
+    const swaggerContent = JSON.parse(fs4.readFileSync(swaggerFilePath, "utf8"));
+    const swaggerPatchFileContent = JSON.parse(fs4.readFileSync(possibleSwaggerPatchFilePath, "utf8"));
     for (const patchEntry of swaggerPatchFileContent) {
       const segments = patchEntry.path.split("/").filter(Boolean);
       let currentNode = swaggerContent;
@@ -724,7 +803,7 @@ var ParserUtils = class _ParserUtils {
       }
     }
     const { newDocument } = applyPatch(swaggerContent, swaggerPatchFileContent);
-    fs3.writeFileSync(swaggerPatchedFilePath, JSON.stringify(newDocument, null, 2));
+    fs4.writeFileSync(swaggerPatchedFilePath, JSON.stringify(newDocument, null, 2));
   }
   static getRelativePathToWebSdkSrcFolder(srcFolder, targetSrcFolder) {
     const replaced = srcFolder.replace(/\\/g, "/");
@@ -739,8 +818,8 @@ var ParserUtils = class _ParserUtils {
  */
 ${content}`;
   };
-  static sortPathParamsByPath = (pathParams, path8) => {
-    const params = path8.match(/{\w*}/g) || [];
+  static sortPathParamsByPath = (pathParams, path9) => {
+    const params = path9.match(/{\w*}/g) || [];
     const cleanParams = params.map((param) => param.replace("{", "").replace("}", ""));
     return pathParams.sort((a, b) => cleanParams.indexOf(a.name) - cleanParams.indexOf(b.name));
   };
@@ -764,30 +843,40 @@ var mappedMethod = (httpMethod, isForm, permissionType) => {
     return "delete";
   }
 };
-var resolveConflicts = ({ path: path8, generatedMethod, testedGeneratedMethod, existingMethods }) => {
+var resolveConflicts = ({ path: path9, generatedMethod, testedGeneratedMethod, existingMethods }) => {
   let _testedGenMethod = testedGeneratedMethod;
   try {
-    testConflict(path8, _testedGenMethod, existingMethods);
+    testConflict(path9, _testedGenMethod, existingMethods);
   } catch (e) {
-    if (path8.indexOf("/namespaces/") >= 0) {
+    if (path9.indexOf("/namespaces/") >= 0) {
       generatedMethod += "_ByNS";
       _testedGenMethod += "_ByNS";
     }
   }
   try {
-    testConflict(path8, _testedGenMethod, existingMethods);
+    testConflict(path9, _testedGenMethod, existingMethods);
   } catch (e) {
-    if (path8.indexOf("/admin/") >= 0) {
+    if (path9.indexOf("/admin/") >= 0) {
       generatedMethod += "_admin";
       _testedGenMethod += "_admin";
     }
   }
-  testConflict(path8, _testedGenMethod, existingMethods);
+  try {
+    testConflict(path9, _testedGenMethod, existingMethods);
+  } catch (e) {
+    const parentSegmentMatch = path9.match(/\/([^/{}]+)\/{[^}]+}\/[^/]*$/);
+    if (parentSegmentMatch) {
+      const suffix = "_By" + _.upperFirst(_.camelCase(parentSegmentMatch[1]));
+      generatedMethod += suffix;
+      _testedGenMethod += suffix;
+    }
+  }
+  testConflict(path9, _testedGenMethod, existingMethods);
   return generatedMethod;
 };
-var testConflict = (path8, generatedMethod, existingMethods) => {
+var testConflict = (path9, generatedMethod, existingMethods) => {
   if (existingMethods[generatedMethod]) {
-    const conflictingMethod = { path: path8, generatedMethod };
+    const conflictingMethod = { path: path9, generatedMethod };
     throw Error(
       `Duplicate method conflict in ${JSON.stringify(conflictingMethod)},
  existingMethods: ${JSON.stringify(existingMethods, null, 2)}`
@@ -904,7 +993,7 @@ var OpenApiSpec = z2.object({
 var templateApiMethod = ({
   classMethod,
   httpMethod,
-  path: path8,
+  path: path9,
   pathParams,
   bodyParams,
   responseClasses,
@@ -913,12 +1002,12 @@ var templateApiMethod = ({
   methodParamsNoTypes,
   xSecurity
 }) => {
-  let newPath = `'${path8}'`;
+  let newPath = `'${path9}'`;
   let snippetMethod = "";
   for (const pathParam of pathParams) {
     const type = ParserUtils.parseType(pathParam);
     const pName = pathParam.name === "namespace" ? "this.namespace" : pathParam.name;
-    if (path8.match(`{${pathParam.name}}`)) {
+    if (path9.match(`{${pathParam.name}}`)) {
       if (type === "string") {
         newPath = `${newPath}.replace('{${pathParam.name}}', ${pName})`;
       } else {
@@ -926,9 +1015,9 @@ var templateApiMethod = ({
       }
     }
   }
-  const snippetShellArgs = ["--location --request", `${httpMethod} '__DOMAIN__${path8}'`, "--header 'accept: application/json'"];
+  const snippetShellArgs = ["--location --request", `${httpMethod} '__DOMAIN__${path9}'`, "--header 'accept: application/json'"];
   const snippetApiArgs = [];
-  if (xSecurity !== void 0 || path8.includes("/admin")) {
+  if (xSecurity !== void 0 || path9.includes("/admin")) {
     snippetShellArgs.push("--header 'Authorization: Bearer {access_token}'");
     snippetApiArgs.push("{ axiosConfig: { request: { headers: { Authorization: 'Bearer {access_token}' } } } }".trim());
   }
@@ -966,7 +1055,7 @@ var templateMethod = ({
   classMethod,
   description,
   httpMethod,
-  path: path8,
+  path: path9,
   pathParams,
   bodyParams,
   queryParams,
@@ -976,9 +1065,9 @@ var templateMethod = ({
 }) => {
   let methodParams = "";
   let methodParamsNoTypes = "";
-  let newPath = `'${path8}'`;
+  let newPath = `'${path9}'`;
   let importStatements = [];
-  const sortedPathParams = ParserUtils.sortPathParamsByPath(pathParams, path8);
+  const sortedPathParams = ParserUtils.sortPathParamsByPath(pathParams, path9);
   for (const pathParam of sortedPathParams) {
     const type = ParserUtils.parseType(pathParam);
     if (pathParam.name !== "namespace") {
@@ -986,7 +1075,7 @@ var templateMethod = ({
       methodParamsNoTypes += pathParam.name + ", ";
     }
     const pName = pathParam.name === "namespace" ? "this.namespace" : pathParam.name;
-    if (path8.match(`{${pathParam.name}}`)) {
+    if (path9.match(`{${pathParam.name}}`)) {
       if (type === "string") {
         newPath = `${newPath}.replace('{${pathParam.name}}', ${pName})`;
       } else {
@@ -997,6 +1086,7 @@ var templateMethod = ({
   let dataType = null;
   if (httpMethod !== "get") {
     dataType = ParserUtils.parseBodyParamsType(bodyParams);
+    if (dataType === "__dictionary__") dataType = "Record<string, any>";
     importStatements = ParserUtils.parseBodyParamsImports(bodyParams);
     methodParams += dataType ? `data: ${dataType},` : "";
     methodParamsNoTypes += dataType ? `data,` : "";
@@ -1020,7 +1110,7 @@ var templateMethod = ({
   }
   const isFileUpload = methodParams.indexOf("data: {file") > -1;
   const { responseType, responseTypeInResponse } = getResponseType({ responseClasses });
-  const resolvedResponseClassValidated = responseType !== "unknown" ? `${responseType}` : "z.unknown()";
+  const resolvedResponseClassValidated = responseClasses.length === 1 && responseClasses[0] === "__dictionary__" ? "z.record(z.string(), z.any())" : responseType !== "unknown" ? `${responseType}` : "z.unknown()";
   methodParams = (queryParamsType ? `${methodParams} ${queryParamsType}` : methodParams).replace(/,\s*$/, "");
   methodParamsNoTypes = queryParamsType ? `${methodParamsNoTypes} queryParams` : methodParamsNoTypes;
   const isGuardInvoked = ["get", "post", "put", "patch", "delete"].includes(httpMethod);
@@ -1051,7 +1141,7 @@ var POST_FETCH_INCLUDES_PATH = ["/table-query/"];
 var templateQueryMethod = ({
   classMethod,
   httpMethod,
-  path: path8,
+  path: path9,
   pathParams,
   responseClasses,
   methodParams,
@@ -1059,14 +1149,14 @@ var templateQueryMethod = ({
   description,
   deprecated
 }) => {
-  const isPostFetch = httpMethod === "post" && (POST_FETCH_INCLUDES_PATH.some((p) => path8.includes(p)) || path8.endsWith("/list"));
+  const isPostFetch = httpMethod === "post" && (POST_FETCH_INCLUDES_PATH.some((p) => path9.includes(p)) || path9.endsWith("/list"));
   const isFetch = classMethod.startsWith("fetch");
   const isGet = httpMethod === "get" || isPostFetch || isFetch;
   const queryMethod = isGet ? "useQuery" : "useMutation";
   let mParams = "";
   let mParamsNoTypes = "";
-  let newPath = `'${path8}'`;
-  const sortedPathParams = ParserUtils.sortPathParamsByPath(pathParams, path8);
+  let newPath = `'${path9}'`;
+  const sortedPathParams = ParserUtils.sortPathParamsByPath(pathParams, path9);
   for (const pathParam of sortedPathParams) {
     const type = ParserUtils.parseType(pathParam);
     if (pathParam.name !== "namespace") {
@@ -1074,7 +1164,7 @@ var templateQueryMethod = ({
       mParamsNoTypes += pathParam.name + ", ";
     }
     const pName = pathParam.name === "namespace" ? "this.namespace" : pathParam.name;
-    if (path8.match(`{${pathParam.name}}`)) {
+    if (path9.match(`{${pathParam.name}}`)) {
       if (type === "string") {
         newPath = `${newPath}.replace('{${pathParam.name}}', ${pName})`;
       } else {
@@ -1109,7 +1199,7 @@ export const ${_methodName} = (
       const response = 
             (await ${apiGenName}(sdk, { coreConfig: input.coreConfig, axiosConfig: input.axiosConfig }).
                 ${classMethod}(${_methodParamsImpl}))
-      callback && callback(response)
+      callback?.(response)
       return response.data
   }
   
@@ -1134,7 +1224,7 @@ export const ${_methodName} = (
       const response = 
             (await ${apiGenName}(sdk, { coreConfig: input.coreConfig, axiosConfig: input.axiosConfig }).
                 ${classMethod}(${_methodParamsImpl}))
-      callback && callback(response.data)
+      callback?.(response.data)
       return response.data
   }
   
@@ -1313,11 +1403,11 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
       admin: {},
       public: {}
     };
-    for (const [path8, operation] of sortedPathsByLength) {
-      if (path8.indexOf("/healthz") >= 0) {
+    for (const [path9, operation] of sortedPathsByLength) {
+      if (path9.indexOf("/healthz") >= 0) {
         continue;
       }
-      const isAdminEndpoint = path8.indexOf("/admin/") > -1;
+      const isAdminEndpoint = path9.indexOf("/admin/") > -1;
       const picked = isAdminEndpoint ? result.admin : result.public;
       const {
         arrayDefinitions,
@@ -1335,25 +1425,27 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
       const httpMethods = Object.keys(operation);
       for (const httpMethod of httpMethods) {
         const endpoint = await Endpoint.parseAsync(operation[httpMethod]).catch((error) => {
-          console.error(JSON.stringify({ path: path8, httpMethod }, null, 2));
+          console.error(JSON.stringify({ path: path9, httpMethod }, null, 2));
           throw error;
         });
         if (!endpoint.tags) continue;
         const [tag] = endpoint.tags;
-        const pathWithBase = `${api.basePath ?? ""}${path8}`;
+        const configBasePath = CodegenConfig.getBasePath();
+        const effectiveBasePath = configBasePath !== void 0 ? configBasePath : api.basePath ?? "";
+        const pathWithBase = `${effectiveBasePath}${path9}`;
         const permissionType = getPermissionType(getPermission(endpoint));
         tagToClassMethodsMapByType[tag] = tagToClassMethodsMapByType[tag] ? tagToClassMethodsMapByType[tag] : {};
         const isForm = endpoint.consumes && endpoint.consumes[0] === "application/x-www-form-urlencoded";
         const classMethod = ParserUtils.generateNaturalLangMethod({
           servicePrefix,
-          path: path8,
+          path: path9,
           httpMethod,
           isForm,
           existingMethods: tagToClassMethodsMapByType[tag],
           permissionType
         });
-        tagToClassMethodsMapByType[tag][classMethod] = `${path8} ${httpMethod}`;
-        generatedMethods[`${path8} ${httpMethod}`] = `${classMethod}`;
+        tagToClassMethodsMapByType[tag][classMethod] = `${path9} ${httpMethod}`;
+        generatedMethods[`${path9} ${httpMethod}`] = `${classMethod}`;
         if (!snippetMap[pathWithBase]) {
           snippetMap[pathWithBase] = {};
         }
@@ -1362,7 +1454,7 @@ var SwaggerReaderHelpers = class _SwaggerReaderHelpers {
         const responseClass = responseClasses.length > 1 ? null : responseClasses?.[0];
         const { className, classGenName } = ParserUtils.generateClassName(tag, isAdminEndpoint);
         tagToClassImportsRecord[className] = tagToClassImportsRecord[className] ? tagToClassImportsRecord[className] : {};
-        if (responseClass) {
+        if (responseClass && responseClass !== "__dictionary__") {
           tagToClassImportsRecord[className][responseClass] = `import { ${responseClass} } from '../../generated-definitions/${responseClass}.js'`;
         }
         if (responseClass && responseClass.endsWith("Array")) {
@@ -1508,6 +1600,20 @@ var TemplateZod = class {
   // --
   render = (fileName, definition, duplicates) => {
     this.duplicates = duplicates;
+    const overrideAsAny = CodegenConfig.getOverrideAsAny();
+    const override = overrideAsAny?.[fileName];
+    if (override !== void 0) {
+      const shouldOverride = typeof override === "function" ? override(definition) : override;
+      if (shouldOverride) {
+        const template2 = `import { z } from 'zod'
+
+export const ${fileName} = z.any()
+
+export interface ${fileName} extends z.TypeOf<typeof ${fileName}> {}
+  `;
+        return { buffer: template2, duplicateFound: false };
+      }
+    }
     const content = this.parseToZodSchema(definition, definition.required || []);
     const containsRecursiveType = this.importClasses.has(fileName);
     if (containsRecursiveType) {
@@ -1596,7 +1702,14 @@ ${exportedTypeString}
       };
     } else if (type) {
       if (type === "object" && definition.additionalProperties) {
-        const zodAttribute = this.parseToZodAttribute("", definition.additionalProperties, [""]);
+        const additionalProps = definition.additionalProperties;
+        if (Object.keys(additionalProps).length === 0) {
+          return {
+            schemaString: `${schemaAttribute} z.record(z.any())${schemaRequired}`,
+            typeString: `${typeAttribute} Record<string, any>${typeNullishability}`
+          };
+        }
+        const zodAttribute = this.parseToZodAttribute("", additionalProps, [""]);
         return {
           schemaString: `${schemaAttribute} z.record(${zodAttribute.schemaString})${schemaRequired}`,
           typeString: `${typeAttribute} Record<string, ${zodAttribute.typeString}>${typeNullishability}`
@@ -1782,8 +1895,11 @@ var CodeGenerator = class _CodeGenerator {
     const queryImportsSet = /* @__PURE__ */ new Set();
     const apiInfo = { ...api.info, "x-version": api["x-version"]?.version };
     console.log("----------\nGenerating API:", { title: apiInfo.title, version: apiInfo.version });
+    const isSplitByService = CodegenConfig.splitOutputByServiceName();
+    const srcFolder = isSplitByService ? path5.join(CliParser.getOutputPath(), serviceName) : CliParser.getOutputPath();
+    const targetSrcFolder = `${CliParser.getOutputPath()}/`;
     if (!CliParser.isGenerateSnippetOnly()) {
-      ParserUtils.writeXVersion(_CodeGenerator.srcFolder(), api["x-version"], api.info);
+      ParserUtils.writeXVersion(srcFolder, api["x-version"], api.info);
     }
     const parsedInformation = await SwaggerReaderHelpers.parseAllEndpoints({ api, sdkName, serviceName });
     if (CliParser.getSnippetOutputPath()) {
@@ -1809,11 +1925,10 @@ var CodeGenerator = class _CodeGenerator {
       console.log("\nSuccessfully generate SDK snippets only\n----------\n\n");
       return;
     }
-    const DIST_DIR = (isAdmin) => `${_CodeGenerator.getGeneratedFolder(isAdmin)}`;
-    const DIST_DIR_ENDPOINTS = (isAdmin) => path4.join(DIST_DIR(isAdmin), "endpoints");
-    const DIST_DIR_QUERIES = (isAdmin) => path4.join(DIST_DIR(isAdmin), "queries");
-    const DIST_DEFINITION_DIR = path4.join(_CodeGenerator.srcFolder(), "generated-definitions");
-    const targetSrcFolder = `${_CodeGenerator.srcFolder()}/`;
+    const DIST_DIR = (isAdmin) => path5.join(srcFolder, isAdmin ? "generated-admin" : "generated-public");
+    const DIST_DIR_ENDPOINTS = (isAdmin) => path5.join(DIST_DIR(isAdmin), "endpoints");
+    const DIST_DIR_QUERIES = (isAdmin) => path5.join(DIST_DIR(isAdmin), "queries");
+    const DIST_DEFINITION_DIR = path5.join(srcFolder, "generated-definitions");
     _CodeGenerator.prepareDirs(DIST_DEFINITION_DIR, DIST_DIR, DIST_DIR_ENDPOINTS, DIST_DIR_QUERIES);
     const mainApiList = [];
     const generatedDefinitions = [];
@@ -1854,30 +1969,31 @@ var CodeGenerator = class _CodeGenerator {
           ParserUtils.writeApiFile(DIST_DIR(isAdminEndpoint), apiGenName, apiBuffer, imports, tagToSdkFunctionDescription[tag]);
           apiList.push(apiGenName);
           indexImportsSet.add(
-            ParserUtils.getRelativePathToWebSdkSrcFolder(path4.join(DIST_DIR_ENDPOINTS(isAdminEndpoint), `${classGenName}`), targetSrcFolder)
+            ParserUtils.getRelativePathToWebSdkSrcFolder(path5.join(DIST_DIR_ENDPOINTS(isAdminEndpoint), `${classGenName}`), targetSrcFolder)
           );
           indexImportsSet.add(
-            ParserUtils.getRelativePathToWebSdkSrcFolder(path4.join(DIST_DIR(isAdminEndpoint), `${apiGenName}`), targetSrcFolder)
+            ParserUtils.getRelativePathToWebSdkSrcFolder(path5.join(DIST_DIR(isAdminEndpoint), `${apiGenName}`), targetSrcFolder)
           );
           queryFileName && queryImportsSet.add(
             ParserUtils.getRelativePathToWebSdkSrcFolder(
-              path4.join(DIST_DIR(isAdminEndpoint), "queries", `${queryFileName}`),
+              path5.join(DIST_DIR(isAdminEndpoint), "queries", `${queryFileName}`),
               targetSrcFolder
             )
           );
         }
         mainApiList.push(...apiList);
-        indexImportsSet.add(
-          ParserUtils.getRelativePathToWebSdkSrcFolder(path4.join(_CodeGenerator.srcFolder(), serviceNameTitle), targetSrcFolder)
-        );
+        if (CodegenConfig.shouldProduceIndexFiles()) {
+          indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path5.join(srcFolder, serviceNameTitle), targetSrcFolder));
+        }
       };
       const writeDefinitions = (api2) => {
         const duplicates = /* @__PURE__ */ new Map();
         const definitions = api2?.components?.schemas || api2.definitions;
         for (const ref in definitions) {
+          if (ref === "__dictionary__") continue;
           const definition = definitions[ref];
           const fileName = ParserUtils.parseRefType(ref);
-          const fileExist = fs4.existsSync(path4.join(DIST_DEFINITION_DIR, `${fileName}.ts`));
+          const fileExist = fs5.existsSync(path5.join(DIST_DEFINITION_DIR, `${fileName}.ts`));
           if (fileExist) {
             const duplicateName = ParserUtils.toCamelCaseWord(ref).replace(".", "").replace(".", "");
             duplicates.set(ref, duplicateName);
@@ -1885,13 +2001,13 @@ var CodeGenerator = class _CodeGenerator {
           const { buffer } = new TemplateZod().render(fileName, definition, /* @__PURE__ */ new Map());
           generatedDefinitions.push(fileName);
           ParserUtils.writeDefinitionFile(DIST_DEFINITION_DIR, fileName, buffer);
-          indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path4.join(DIST_DEFINITION_DIR, fileName), targetSrcFolder));
+          indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path5.join(DIST_DEFINITION_DIR, fileName), targetSrcFolder));
         }
         for (const arrayClass of arrayDefinitions) {
           const buffer = new TemplateZodArray().render(arrayClass);
           generatedDefinitions.push(arrayClass);
           ParserUtils.writeDefinitionFile(DIST_DEFINITION_DIR, arrayClass, buffer);
-          indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path4.join(DIST_DEFINITION_DIR, arrayClass), targetSrcFolder));
+          indexImportsSet.add(ParserUtils.getRelativePathToWebSdkSrcFolder(path5.join(DIST_DEFINITION_DIR, arrayClass), targetSrcFolder));
         }
       };
       writeApiEndpointFiles(isAdmin);
@@ -1899,9 +2015,11 @@ var CodeGenerator = class _CodeGenerator {
     };
     generatePublicOrAdmin(true);
     generatePublicOrAdmin(false);
-    const isGenerateWebSocket = CliParser.isGenerateWebSocket();
-    const apiIndexBuff = templateApiIndex(serviceNameTitle, mainApiList, isGenerateWebSocket);
-    ParserUtils.writeApiMainFile(_CodeGenerator.srcFolder(), serviceNameTitle, apiIndexBuff);
+    if (CodegenConfig.shouldProduceIndexFiles()) {
+      const isGenerateWebSocket = CliParser.isGenerateWebSocket();
+      const apiIndexBuff = templateApiIndex(serviceNameTitle, mainApiList, isGenerateWebSocket);
+      ParserUtils.writeApiMainFile(srcFolder, serviceNameTitle, apiIndexBuff);
+    }
     console.log("\nCOMPLETED\n----------\n\n");
     return { indexImports: indexImportsSet, queryImports: queryImportsSet };
   };
@@ -1909,29 +2027,30 @@ var CodeGenerator = class _CodeGenerator {
 };
 
 // src/SwaggerDownloader.ts
+import * as fs6 from "fs";
 import * as https from "https";
-import * as fs5 from "fs";
-import * as path5 from "path";
+import * as path6 from "path";
 var SwaggerDownloader = class _SwaggerDownloader {
   static getDestFile = (targetFileName) => {
     const destPath = CliParser.getResolvedSwaggersOutputPath();
-    const destFile = path5.join(destPath, targetFileName);
-    if (fs5.existsSync(destFile)) return destFile;
-    if (!fs5.existsSync(destPath)) fs5.mkdirSync(destPath);
-    fs5.writeFileSync(destFile, "");
+    const destFile = path6.join(destPath, targetFileName);
+    if (fs6.existsSync(destFile)) return destFile;
+    if (!fs6.existsSync(destPath)) fs6.mkdirSync(destPath);
+    fs6.writeFileSync(destFile, "");
     return destFile;
   };
   // session-api.json contains illegal URL encoded character that breaks the codegen
   // e.g. "$ref": "#/definitions/map%5Bstring%5Dinterface%20%7B%7D"
   static postSanitizeDownloadedFile = (filePath) => {
     const searchStr = ["%5B", "%5D", "%20", "%7B", "%7D"];
-    fs5.readFile(filePath, "utf8", (err, data) => {
+    fs6.readFile(filePath, "utf8", (err, data) => {
       if (err) throw err;
       let result = data;
+      result = result.replace(new RegExp("map%5Bstring%5Dinterface%20%7B%7D", "g"), "__dictionary__").replace(new RegExp("map\\[string\\]interface \\{\\}", "g"), "__dictionary__").replace(new RegExp("map\\[string\\]any", "g"), "__dictionary__");
       searchStr.forEach((s) => {
         result = result.replace(new RegExp(s, "g"), " ");
       });
-      fs5.writeFile(filePath, result, "utf8", (err2) => {
+      fs6.writeFile(filePath, result, "utf8", (err2) => {
         if (err2) throw err2;
         console.log("File updated successfully.");
       });
@@ -1949,7 +2068,7 @@ var SwaggerDownloader = class _SwaggerDownloader {
           if (response.statusCode !== 200) {
             console.log(`SwaggerDownload error with status code: ${response.statusCode}`);
           } else {
-            fs5.writeFileSync(destFile, JSON.stringify(JSON.parse(data), null, 2), "utf-8");
+            fs6.writeFileSync(destFile, JSON.stringify(JSON.parse(data), null, 2), "utf-8");
             _SwaggerDownloader.postSanitizeDownloadedFile(destFile);
             console.log(`SwaggerDownload ${url} completed with status code: ${response.statusCode}`);
           }
@@ -1972,8 +2091,8 @@ var SwaggerDownloader = class _SwaggerDownloader {
 };
 
 // src/WebsocketGenerator.ts
-import fs6 from "fs";
-import path6 from "path";
+import fs7 from "fs";
+import path7 from "path";
 
 // src/templates/template-ws-class.ts
 var definitionToFunctionName = (type) => {
@@ -1988,7 +2107,7 @@ var renderSendFunction = (name, definition) => {
     send({ type: '${name}', ...data })
   }`;
 };
-var templateWebsocketClass = (name, path8, definitions) => {
+var templateWebsocketClass = (name, path9, definitions) => {
   const requestDefinitions = Object.keys(definitions).filter((key) => {
     const val = definitions[key];
     return val["x-type"] == "request";
@@ -2047,7 +2166,7 @@ const messageSerializer = (data: Record<string, any>) => {
 export function WebSocketClass(sdk: AccelByteSDK, args?: SdkSetConfigParam) {
   const sdkAssembly = sdk.assembly()
   const baseURL = (args?.coreConfig?.baseURL ?? sdkAssembly.coreConfig.baseURL).replace('http', 'ws')
-  const path = '${path8}'
+  const path = '${path9}'
   const url = baseURL + path
   let ws: WebSocket | null = null
   let isDisconnectManually = false
@@ -2296,9 +2415,9 @@ ${renderUnion(["response", "notification"], definitions)}
 // src/WebsocketGenerator.ts
 var WebsocketGenerator = class {
   static srcFolder = () => CliParser.getOutputPath();
-  static outputFolder = () => path6.join(this.srcFolder(), "generated-websocket");
+  static outputFolder = () => path7.join(this.srcFolder(), "generated-websocket");
   static schemaContent = () => {
-    const fileContent = JSON.parse(fs6.readFileSync(CliParser.getWebSocketSchemaPath(), "utf8"));
+    const fileContent = JSON.parse(fs7.readFileSync(CliParser.getWebSocketSchemaPath(), "utf8"));
     return fileContent;
   };
   static prepareDirs = () => {
@@ -2308,11 +2427,11 @@ var WebsocketGenerator = class {
     const { name, path: wsPath, definitions } = this.schemaContent();
     const templateDefinitions = templateWebsocketDefinitions(definitions);
     this.prepareDirs();
-    const filePath = path6.join(this.outputFolder(), "WebSocketDefinitions.ts");
-    fs6.writeFileSync(filePath, templateDefinitions, "utf8");
+    const filePath = path7.join(this.outputFolder(), "WebSocketDefinitions.ts");
+    fs7.writeFileSync(filePath, templateDefinitions, "utf8");
     const templateClass2 = templateWebsocketClass(name, wsPath, definitions);
-    const filePathClass = path6.join(this.outputFolder(), "WebSocketClass.ts");
-    fs6.writeFileSync(filePathClass, templateClass2, "utf8");
+    const filePathClass = path7.join(this.outputFolder(), "WebSocketClass.ts");
+    fs7.writeFileSync(filePathClass, templateClass2, "utf8");
   };
 };
 
@@ -2325,24 +2444,28 @@ var generateSdk = async () => {
   if (CliParser.isGenerateWebSocket()) {
     WebsocketGenerator.main();
   }
+  if (!CodegenConfig.shouldProduceIndexFiles()) {
+    return;
+  }
   const indexImportsSet = /* @__PURE__ */ new Set();
   const queryImportsSet = /* @__PURE__ */ new Set();
   const filenamesSet = /* @__PURE__ */ new Set();
   for (const set of arrayOfSets) {
     set.indexImports.forEach((value) => {
-      const fileName = path7.basename(value);
+      const fileName = path8.basename(value);
       if (!filenamesSet.has(fileName)) {
         indexImportsSet.add(value);
         filenamesSet.add(fileName);
       }
     });
     set.queryImports.forEach((value) => {
-      const fileName = path7.basename(value);
+      const fileName = path8.basename(value);
       if (!filenamesSet.has(fileName)) {
         queryImportsSet.add(value);
       }
     });
   }
+  const outputPath = CliParser.getOutputPath();
   const indexImportsArray = Array.from(indexImportsSet).sort();
   const queryImportsArray = Array.from(queryImportsSet).sort();
   const filesToImport = indexImportsArray.map((fileToImport) => {
@@ -2351,8 +2474,8 @@ var generateSdk = async () => {
   const queryFilesToImport = queryImportsArray.map((fileToImport) => {
     return `export * from '${fileToImport.replace("\\", "/")}.js'`;
   });
-  ParserUtils.writeAllImportsFile(CliParser.getOutputPath(), filesToImport.join("\n"));
-  ParserUtils.writeAllQueryImportsFile(CliParser.getOutputPath(), queryFilesToImport.join("\n"));
+  ParserUtils.writeAllImportsFile(outputPath, filesToImport.join("\n"));
+  ParserUtils.writeAllQueryImportsFile(outputPath, queryFilesToImport.join("\n"));
 };
 yargs.command("download-swaggers", "Download swaggers JSON files", (yargs2) => {
   CliParser.createInstance(yargs2);
@@ -2368,6 +2491,7 @@ yargs.command("download-swaggers", "Download swaggers JSON files", (yargs2) => {
     return true;
   });
   CliParser.createInstance(yargs2);
+  await CodegenConfig.loadConfig(path8.dirname(path8.resolve(CliParser.getConfigPath())));
   await generateSdk();
 }).option("config", {
   description: "Path to the config file with backend service URLs.",