@acrool/rtk-query-codegen-openapi 0.0.2-test.0 → 0.0.2-test.2

package/lib/bin/cli.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import{fileURLToPath as l}from"node:url";var p=()=>l(import.meta.url);var c=p();import{generateEndpoints as m,parseConfig as f}from"@acrool/rtk-query-codegen-openapi";import r from"commander";import{createRequire as u}from"node:module";import{dirname as g,resolve as d}from"node:path";var e=u(c),o=!1;try{e.resolve("esbuild")&&e.resolve("esbuild-runner")&&e("esbuild-runner/register"),o=!0}catch{}try{o||(e.resolve("typescript")&&e.resolve("ts-node")&&e("ts-node").register({transpileOnly:!0,compilerOptions:{target:"es6",module:"commonjs"}}),o=!0)}catch{}var h=e("../../package.json");r.version(h.version).usage("</path/to/config.js>").parse(process.argv);var t=r.args[0];r.args.length===0||!/\.([mc]?(jsx?|tsx?)|jsonc?)?$/.test(t)?r.help():(/\.[mc]?tsx?$/.test(t)&&!o&&(console.error("Encountered a TypeScript configfile, but neither esbuild-runner nor ts-node are installed."),process.exit(1)),v(d(process.cwd(),t)));async function v(s){process.chdir(g(s));let n=e(s);for(let i of f(n.default??n))try{console.log(`Generating ${i.outputFile}`),await m(i),console.log("Done")}catch(a){console.error(a),process.exit(1)}}
+import{fileURLToPath as l}from"node:url";var p=()=>l(import.meta.url);var c=p();import{generateEndpoints as m,parseConfig as f}from"@rtk-query/codegen-openapi";import r from"commander";import{createRequire as u}from"node:module";import{dirname as g,resolve as d}from"node:path";var e=u(c),o=!1;try{e.resolve("esbuild")&&e.resolve("esbuild-runner")&&e("esbuild-runner/register"),o=!0}catch{}try{o||(e.resolve("typescript")&&e.resolve("ts-node")&&e("ts-node").register({transpileOnly:!0,compilerOptions:{target:"es6",module:"commonjs"}}),o=!0)}catch{}var h=e("../../package.json");r.version(h.version).usage("</path/to/config.js>").parse(process.argv);var t=r.args[0];r.args.length===0||!/\.([mc]?(jsx?|tsx?)|jsonc?)?$/.test(t)?r.help():(/\.[mc]?tsx?$/.test(t)&&!o&&(console.error("Encountered a TypeScript configfile, but neither esbuild-runner nor ts-node are installed."),process.exit(1)),v(d(process.cwd(),t)));async function v(s){process.chdir(g(s));let n=e(s);for(let i of f(n.default??n))try{console.log(`Generating ${i.outputFile}`),await m(i),console.log("Done")}catch(a){console.error(a),process.exit(1)}}
 //# sourceMappingURL=cli.mjs.map

package/lib/bin/cli.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../node_modules/tsup/assets/esm_shims.js","../../src/bin/cli.ts"],"sourcesContent":["// Shim globals in esm bundle\nimport path from 'node:path'\nimport { fileURLToPath } from 'node:url'\n\nconst getFilename = () => fileURLToPath(import.meta.url)\nconst getDirname = () => path.dirname(getFilename())\n\nexport const __dirname = /* @__PURE__ */ getDirname()\nexport const __filename = /* @__PURE__ */ getFilename()\n","#!/usr/bin/env node\n\nimport { generateEndpoints, parseConfig } from '@acrool/rtk-query-codegen-openapi';\nimport program from 'commander';\nimport { createRequire } from 'node:module';\nimport { dirname, resolve } from 'node:path';\n\nconst require = createRequire(__filename);\n\nlet ts = false;\ntry {\n  if (require.resolve('esbuild') && require.resolve('esbuild-runner')) {\n    require('esbuild-runner/register');\n  }\n  ts = true;\n} catch {}\n\ntry {\n  if (!ts) {\n    if (require.resolve('typescript') && require.resolve('ts-node')) {\n      (require('ts-node') as typeof import('ts-node')).register({\n        transpileOnly: true,\n        compilerOptions: {\n          target: 'es6',\n          module: 'commonjs',\n        },\n      });\n    }\n\n    ts = true;\n  }\n} catch {}\n\n// tslint:disable-next-line\nconst meta = require('../../package.json');\n\nprogram.version(meta.version).usage('</path/to/config.js>').parse(process.argv);\n\nconst configFile = program.args[0];\n\nif (program.args.length === 0 || !/\\.([mc]?(jsx?|tsx?)|jsonc?)?$/.test(configFile)) {\n  program.help();\n} else {\n  if (/\\.[mc]?tsx?$/.test(configFile) && !ts) {\n    console.error('Encountered a TypeScript configfile, but neither esbuild-runner nor ts-node are installed.');\n    process.exit(1);\n  }\n  run(resolve(process.cwd(), configFile));\n}\n\nasync function run(configFile: string) {\n  process.chdir(dirname(configFile));\n\n  const unparsedConfig = require(configFile);\n\n  for (const config of parseConfig(unparsedConfig.default ?? unparsedConfig)) {\n    try {\n      console.log(`Generating ${config.outputFile}`);\n      await generateEndpoints(config);\n      console.log(`Done`);\n    } catch (err) {\n      console.error(err);\n      process.exit(1);\n    }\n  }\n}\n"],"mappings":";AAEA,OAAS,iBAAAA,MAAqB,WAE9B,IAAMC,EAAc,IAAMD,EAAc,YAAY,GAAG,EAIhD,IAAME,EAA6BC,EAAY,ECNtD,OAAS,qBAAAC,EAAmB,eAAAC,MAAmB,oCAC/C,OAAOC,MAAa,YACpB,OAAS,iBAAAC,MAAqB,cAC9B,OAAS,WAAAC,EAAS,WAAAC,MAAe,YAEjC,IAAMC,EAAUH,EAAcI,CAAU,EAEpCC,EAAK,GACT,GAAI,CACEF,EAAQ,QAAQ,SAAS,GAAKA,EAAQ,QAAQ,gBAAgB,GAChEA,EAAQ,yBAAyB,EAEnCE,EAAK,EACP,MAAQ,CAAC,CAET,GAAI,CACGA,IACCF,EAAQ,QAAQ,YAAY,GAAKA,EAAQ,QAAQ,SAAS,GAC3DA,EAAQ,SAAS,EAA+B,SAAS,CACxD,cAAe,GACf,gBAAiB,CACf,OAAQ,MACR,OAAQ,UACV,CACF,CAAC,EAGHE,EAAK,GAET,MAAQ,CAAC,CAGT,IAAMC,EAAOH,EAAQ,oBAAoB,EAEzCJ,EAAQ,QAAQO,EAAK,OAAO,EAAE,MAAM,sBAAsB,EAAE,MAAM,QAAQ,IAAI,EAE9E,IAAMC,EAAaR,EAAQ,KAAK,CAAC,EAE7BA,EAAQ,KAAK,SAAW,GAAK,CAAC,gCAAgC,KAAKQ,CAAU,EAC/ER,EAAQ,KAAK,GAET,eAAe,KAAKQ,CAAU,GAAK,CAACF,IACtC,QAAQ,MAAM,4FAA4F,EAC1G,QAAQ,KAAK,CAAC,GAEhBG,EAAIN,EAAQ,QAAQ,IAAI,EAAGK,CAAU,CAAC,GAGxC,eAAeC,EAAID,EAAoB,CACrC,QAAQ,MAAMN,EAAQM,CAAU,CAAC,EAEjC,IAAME,EAAiBN,EAAQI,CAAU,EAEzC,QAAWG,KAAUZ,EAAYW,EAAe,SAAWA,CAAc,EACvE,GAAI,CACF,QAAQ,IAAI,cAAcC,EAAO,UAAU,EAAE,EAC7C,MAAMb,EAAkBa,CAAM,EAC9B,QAAQ,IAAI,MAAM,CACpB,OAASC,EAAK,CACZ,QAAQ,MAAMA,CAAG,EACjB,QAAQ,KAAK,CAAC,CAChB,CAEJ","names":["fileURLToPath","getFilename","__filename","getFilename","generateEndpoints","parseConfig","program","createRequire","dirname","resolve","require","__filename","ts","meta","configFile","run","unparsedConfig","config","err"]}
+{"version":3,"sources":["../../node_modules/tsup/assets/esm_shims.js","../../src/bin/cli.ts"],"sourcesContent":["// Shim globals in esm bundle\nimport path from 'node:path'\nimport { fileURLToPath } from 'node:url'\n\nconst getFilename = () => fileURLToPath(import.meta.url)\nconst getDirname = () => path.dirname(getFilename())\n\nexport const __dirname = /* @__PURE__ */ getDirname()\nexport const __filename = /* @__PURE__ */ getFilename()\n","#!/usr/bin/env node\n\nimport { generateEndpoints, parseConfig } from '@rtk-query/codegen-openapi';\nimport program from 'commander';\nimport { createRequire } from 'node:module';\nimport { dirname, resolve } from 'node:path';\n\nconst require = createRequire(__filename);\n\nlet ts = false;\ntry {\n  if (require.resolve('esbuild') && require.resolve('esbuild-runner')) {\n    require('esbuild-runner/register');\n  }\n  ts = true;\n} catch {}\n\ntry {\n  if (!ts) {\n    if (require.resolve('typescript') && require.resolve('ts-node')) {\n      (require('ts-node') as typeof import('ts-node')).register({\n        transpileOnly: true,\n        compilerOptions: {\n          target: 'es6',\n          module: 'commonjs',\n        },\n      });\n    }\n\n    ts = true;\n  }\n} catch {}\n\n// tslint:disable-next-line\nconst meta = require('../../package.json');\n\nprogram.version(meta.version).usage('</path/to/config.js>').parse(process.argv);\n\nconst configFile = program.args[0];\n\nif (program.args.length === 0 || !/\\.([mc]?(jsx?|tsx?)|jsonc?)?$/.test(configFile)) {\n  program.help();\n} else {\n  if (/\\.[mc]?tsx?$/.test(configFile) && !ts) {\n    console.error('Encountered a TypeScript configfile, but neither esbuild-runner nor ts-node are installed.');\n    process.exit(1);\n  }\n  run(resolve(process.cwd(), configFile));\n}\n\nasync function run(configFile: string) {\n  process.chdir(dirname(configFile));\n\n  const unparsedConfig = require(configFile);\n\n  for (const config of parseConfig(unparsedConfig.default ?? unparsedConfig)) {\n    try {\n      console.log(`Generating ${config.outputFile}`);\n      await generateEndpoints(config);\n      console.log(`Done`);\n    } catch (err) {\n      console.error(err);\n      process.exit(1);\n    }\n  }\n}\n"],"mappings":";AAEA,OAAS,iBAAAA,MAAqB,WAE9B,IAAMC,EAAc,IAAMD,EAAc,YAAY,GAAG,EAIhD,IAAME,EAA6BC,EAAY,ECNtD,OAAS,qBAAAC,EAAmB,eAAAC,MAAmB,6BAC/C,OAAOC,MAAa,YACpB,OAAS,iBAAAC,MAAqB,cAC9B,OAAS,WAAAC,EAAS,WAAAC,MAAe,YAEjC,IAAMC,EAAUH,EAAcI,CAAU,EAEpCC,EAAK,GACT,GAAI,CACEF,EAAQ,QAAQ,SAAS,GAAKA,EAAQ,QAAQ,gBAAgB,GAChEA,EAAQ,yBAAyB,EAEnCE,EAAK,EACP,MAAQ,CAAC,CAET,GAAI,CACGA,IACCF,EAAQ,QAAQ,YAAY,GAAKA,EAAQ,QAAQ,SAAS,GAC3DA,EAAQ,SAAS,EAA+B,SAAS,CACxD,cAAe,GACf,gBAAiB,CACf,OAAQ,MACR,OAAQ,UACV,CACF,CAAC,EAGHE,EAAK,GAET,MAAQ,CAAC,CAGT,IAAMC,EAAOH,EAAQ,oBAAoB,EAEzCJ,EAAQ,QAAQO,EAAK,OAAO,EAAE,MAAM,sBAAsB,EAAE,MAAM,QAAQ,IAAI,EAE9E,IAAMC,EAAaR,EAAQ,KAAK,CAAC,EAE7BA,EAAQ,KAAK,SAAW,GAAK,CAAC,gCAAgC,KAAKQ,CAAU,EAC/ER,EAAQ,KAAK,GAET,eAAe,KAAKQ,CAAU,GAAK,CAACF,IACtC,QAAQ,MAAM,4FAA4F,EAC1G,QAAQ,KAAK,CAAC,GAEhBG,EAAIN,EAAQ,QAAQ,IAAI,EAAGK,CAAU,CAAC,GAGxC,eAAeC,EAAID,EAAoB,CACrC,QAAQ,MAAMN,EAAQM,CAAU,CAAC,EAEjC,IAAME,EAAiBN,EAAQI,CAAU,EAEzC,QAAWG,KAAUZ,EAAYW,EAAe,SAAWA,CAAc,EACvE,GAAI,CACF,QAAQ,IAAI,cAAcC,EAAO,UAAU,EAAE,EAC7C,MAAMb,EAAkBa,CAAM,EAC9B,QAAQ,IAAI,MAAM,CACpB,OAASC,EAAK,CACZ,QAAQ,MAAMA,CAAG,EACjB,QAAQ,KAAK,CAAC,CAChB,CAEJ","names":["fileURLToPath","getFilename","__filename","getFilename","generateEndpoints","parseConfig","program","createRequire","dirname","resolve","require","__filename","ts","meta","configFile","run","unparsedConfig","config","err"]}

package/lib/index.js

@@ -39,6 +39,7 @@ var import_node_module = require("node:module");
 var import_node_path3 = __toESM(require("node:path"));
 
 // src/generate.ts
+var import_lodash = __toESM(require("lodash.camelcase"));
 var import_node_path2 = __toESM(require("node:path"));
 var import_generate3 = __toESM(require("oazapfts/generate"));
 var import_typescript4 = __toESM(require("typescript"));
@@ -177,10 +178,7 @@ function generateEndpointDefinition({
     objectProperties.push(
       factory.createPropertyAssignment(
         factory.createIdentifier(type === "query" ? "providesTags" : "invalidatesTags"),
-        factory.createArrayLiteralExpression(
-          tags.map((tag) => factory.createStringLiteral(tag)),
-          false
-        )
+        factory.createArrayLiteralExpression(tags.map((tag) => factory.createStringLiteral(tag), false))
       )
     );
   }
@@ -382,10 +380,7 @@ var generateReactHooks = ({
 // src/generate.ts
 var generatedApiName = "injectedRtkApi";
 var v3DocCache = {};
-var useFetcherImport = generateImportNode("@acrool/react-fetcher", {
-  IUseFetcherArgs: "IUseFetcherArgs"
-});
-function defaultIsDataResponse(code, includeDefault, response, allResponses) {
+function defaultIsDataResponse(code, includeDefault) {
   if (includeDefault && code === "default") {
     return true;
   }
@@ -396,8 +391,7 @@ function getOperationName2({ verb, path: path4, operation }) {
   return (0, import_generate3.getOperationName)(verb, path4, operation.operationId);
 }
 function getTags({ verb, pathItem }) {
-  const tags = verb && pathItem[verb]?.tags ? pathItem[verb].tags : [];
-  return tags.map((tag) => tag.toString());
+  return verb ? pathItem[verb]?.tags || [] : [];
 }
 function patternMatches(pattern) {
   const filters = Array.isArray(pattern) ? pattern : [pattern];
@@ -416,6 +410,26 @@ function operationMatches(pattern) {
     return checkMatch(operationName, operationDefinition);
   };
 }
+function argumentMatches(pattern) {
+  const checkMatch = typeof pattern === "function" ? pattern : patternMatches(pattern);
+  return function matcher(argumentDefinition) {
+    if (!pattern || argumentDefinition.in === "path") return true;
+    const argumentName = argumentDefinition.name;
+    return checkMatch(argumentName, argumentDefinition);
+  };
+}
+function withQueryComment(node, def, hasTrailingNewLine) {
+  const comment = def.origin === "param" ? def.param.description : def.body.description;
+  if (comment) {
+    return import_typescript4.default.addSyntheticLeadingComment(
+      node,
+      import_typescript4.default.SyntaxKind.MultiLineCommentTrivia,
+      `* ${comment} `,
+      hasTrailingNewLine
+    );
+  }
+  return node;
+}
 function getOverrides(operation, endpointOverrides) {
   return endpointOverrides?.find((override) => operationMatches(override.pattern)(operation));
 }
@@ -534,109 +548,6 @@ async function generateApi(spec, {
     }
     return [...allTagTypes];
   }
-  function generateQueryArgType(operationDefinition) {
-    const {
-      operation: { parameters = [], requestBody }
-    } = operationDefinition;
-    const properties = [];
-    if (requestBody && !(0, import_generate3.isReference)(requestBody)) {
-      const bodySchema = requestBody.content?.["application/json"]?.schema;
-      if (bodySchema) {
-        properties.push(
-          factory.createPropertySignature(
-            void 0,
-            factory.createIdentifier("body"),
-            void 0,
-            factory.createTypeReferenceNode(factory.createIdentifier("any"), void 0)
-          )
-        );
-      }
-    }
-    const queryParams = parameters.filter((p) => !(0, import_generate3.isReference)(p) && p.in === "query");
-    if (queryParams.length > 0) {
-      properties.push(
-        factory.createPropertySignature(
-          void 0,
-          factory.createIdentifier("params"),
-          void 0,
-          factory.createTypeLiteralNode(
-            queryParams.map(
-              (param) => factory.createPropertySignature(
-                void 0,
-                factory.createIdentifier(param.name),
-                factory.createToken(import_typescript4.default.SyntaxKind.QuestionToken),
-                factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.StringKeyword)
-              )
-            )
-          )
-        )
-      );
-    }
-    const headerParams = parameters.filter((p) => !(0, import_generate3.isReference)(p) && p.in === "header");
-    if (headerParams.length > 0) {
-      properties.push(
-        factory.createPropertySignature(
-          void 0,
-          factory.createIdentifier("headers"),
-          void 0,
-          factory.createTypeLiteralNode(
-            headerParams.map(
-              (param) => factory.createPropertySignature(
-                void 0,
-                factory.createIdentifier(param.name),
-                factory.createToken(import_typescript4.default.SyntaxKind.QuestionToken),
-                factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.StringKeyword)
-              )
-            )
-          )
-        )
-      );
-    }
-    return factory.createTypeLiteralNode([
-      factory.createPropertySignature(
-        void 0,
-        factory.createIdentifier("variables"),
-        void 0,
-        factory.createTypeLiteralNode(properties)
-      ),
-      factory.createPropertySignature(
-        void 0,
-        factory.createIdentifier("fetchOptions"),
-        factory.createToken(import_typescript4.default.SyntaxKind.QuestionToken),
-        factory.createTypeReferenceNode(factory.createIdentifier("any"), void 0)
-      )
-    ]);
-  }
-  function generateQueryArgDefinitions(operationDefinition) {
-    const {
-      operation: { parameters = [], requestBody }
-    } = operationDefinition;
-    const queryArg = {};
-    if (requestBody && !(0, import_generate3.isReference)(requestBody)) {
-      const bodySchema = requestBody.content?.["application/json"]?.schema;
-      if (bodySchema) {
-        queryArg["body"] = {
-          name: "body",
-          originalName: "body",
-          type: factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.AnyKeyword),
-          required: true,
-          origin: "body",
-          body: requestBody
-        };
-      }
-    }
-    parameters.filter((p) => !(0, import_generate3.isReference)(p)).forEach((param) => {
-      queryArg[param.name] = {
-        name: param.name,
-        originalName: param.name,
-        type: factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.StringKeyword),
-        required: param.required || false,
-        origin: "param",
-        param
-      };
-    });
-    return queryArg;
-  }
   function generateEndpoint({
     operationDefinition,
     overrides
@@ -655,39 +566,138 @@ async function generateApi(spec, {
     let ResponseType = factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.UnknownKeyword);
     if (returnsJson) {
       const returnTypes = Object.entries(responses || {}).map(
-        ([code, response]) => isDataResponse(code, includeDefault, response, responses) && response ? apiGen.getTypeFromResponse(response) : void 0
-      ).filter(removeUndefined);
-      if (returnTypes.length === 1) {
-        ResponseType = returnTypes[0];
-      } else if (returnTypes.length > 1) {
+        ([code, response]) => [
+          code,
+          apiGen.resolve(response),
+          apiGen.getTypeFromResponse(response, "readOnly") || factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.UndefinedKeyword)
+        ]
+      ).filter(
+        ([status, response]) => isDataResponse(status, includeDefault, apiGen.resolve(response), responses || {})
+      ).filter(([_1, _2, type]) => type !== import_generate3.keywordType.void).map(
+        ([code, response, type]) => import_typescript4.default.addSyntheticLeadingComment(
+          { ...type },
+          import_typescript4.default.SyntaxKind.MultiLineCommentTrivia,
+          `* status ${code} ${response.description} `,
+          false
+        )
+      );
+      if (returnTypes.length > 0) {
         ResponseType = factory.createUnionTypeNode(returnTypes);
       }
     }
-    const QueryArg = generateQueryArgType(operationDefinition);
-    const wrappedQueryArg = factory.createTypeReferenceNode(factory.createIdentifier("IUseFetcherArgs"), [QueryArg]);
-    const endpointBuilder = factory.createIdentifier("build");
-    const Response = factory.createTypeReferenceNode(
-      factory.createIdentifier(`${capitalize(operationName)}${responseSuffix}`),
-      void 0
+    const ResponseTypeName = factory.createTypeReferenceNode(
+      registerInterface(
+        factory.createTypeAliasDeclaration(
+          [factory.createModifier(import_typescript4.default.SyntaxKind.ExportKeyword)],
+          capitalize(operationName + operationNameSuffix + responseSuffix),
+          void 0,
+          ResponseType
+        )
+      ).name
+    );
+    const operationParameters = apiGen.resolveArray(operation.parameters);
+    const pathItemParameters = apiGen.resolveArray(pathItem.parameters).filter((pp) => !operationParameters.some((op) => op.name === pp.name && op.in === pp.in));
+    const parameters = (0, import_generate3.supportDeepObjects)([...pathItemParameters, ...operationParameters]).filter(
+      argumentMatches(overrides?.parameterFilter)
+    );
+    const allNames = parameters.map((p) => p.name);
+    const queryArg = {};
+    function generateName(name, potentialPrefix) {
+      const isPureSnakeCase = /^[a-zA-Z][a-zA-Z0-9_]*$/.test(name);
+      const hasNamingConflict = allNames.filter((n) => n === name).length > 1;
+      if (hasNamingConflict) {
+        name = `${potentialPrefix}_${name}`;
+      }
+      const camelCaseName = (0, import_lodash.default)(name);
+      if (isPureSnakeCase && !allNames.includes(camelCaseName)) {
+        name = camelCaseName;
+      }
+      while (name in queryArg) {
+        name = `_${name}`;
+      }
+      return name;
+    }
+    for (const param of parameters) {
+      const name = generateName(param.name, param.in);
+      queryArg[name] = {
+        origin: "param",
+        name,
+        originalName: param.name,
+        type: apiGen.getTypeFromSchema((0, import_generate3.isReference)(param) ? param : param.schema, void 0, "writeOnly"),
+        required: param.required,
+        param
+      };
+    }
+    if (requestBody) {
+      const body = apiGen.resolve(requestBody);
+      const schema = apiGen.getSchemaFromContent(body.content);
+      const type = apiGen.getTypeFromSchema(schema);
+      const schemaName = (0, import_lodash.default)(
+        type.name || (0, import_generate3.getReferenceName)(schema) || typeof schema === "object" && "title" in schema && schema.title || "body"
+      );
+      const name = generateName(schemaName in queryArg ? "body" : schemaName, "body");
+      queryArg[name] = {
+        origin: "body",
+        name,
+        originalName: schemaName,
+        type: apiGen.getTypeFromSchema(schema, void 0, "writeOnly"),
+        required: true,
+        body
+      };
+    }
+    const propertyName = (name) => {
+      if (typeof name === "string") {
+        return (0, import_generate3.isValidIdentifier)(name) ? factory.createIdentifier(name) : factory.createStringLiteral(name);
+      }
+      return name;
+    };
+    const queryArgValues = Object.values(queryArg);
+    const isFlatArg = flattenArg && queryArgValues.length === 1;
+    const QueryArg = factory.createTypeReferenceNode(
+      registerInterface(
+        factory.createTypeAliasDeclaration(
+          [factory.createModifier(import_typescript4.default.SyntaxKind.ExportKeyword)],
+          capitalize(operationName + operationNameSuffix + argSuffix),
+          void 0,
+          queryArgValues.length > 0 ? isFlatArg ? withQueryComment(
+            factory.createUnionTypeNode([
+              queryArgValues[0].type,
+              ...!queryArgValues[0].required ? [factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.UndefinedKeyword)] : []
+            ]),
+            queryArgValues[0],
+            false
+          ) : factory.createTypeLiteralNode(
+            queryArgValues.map(
+              (def) => withQueryComment(
+                factory.createPropertySignature(
+                  void 0,
+                  propertyName(def.name),
+                  (0, import_generate3.createQuestionToken)(!def.required),
+                  def.type
+                ),
+                def,
+                true
+              )
+            )
+          ) : factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.VoidKeyword)
+        )
+      ).name
     );
-    const queryArgDefinitions = generateQueryArgDefinitions(operationDefinition);
-    const extraEndpointsProps = isQuery2 ? generateQueryEndpointProps({ operationDefinition }) : generateMutationEndpointProps({ operationDefinition });
     return generateEndpointDefinition({
-      operationName,
+      operationName: operationNameSuffix ? capitalize(operationName + operationNameSuffix) : operationName,
       type: isQuery2 ? "query" : "mutation",
-      Response,
-      QueryArg: wrappedQueryArg,
+      Response: ResponseTypeName,
+      QueryArg,
       queryFn: generateQueryFn({
         operationDefinition,
-        queryArg: queryArgDefinitions,
-        isFlatArg: flattenArg,
+        queryArg,
         isQuery: isQuery2,
+        isFlatArg,
         encodePathParams,
         encodeQueryParams
       }),
-      extraEndpointsProps,
-      tags,
-      endpointBuilder
+      extraEndpointsProps: isQuery2 ? generateQueryEndpointProps({ operationDefinition }) : generateMutationEndpointProps({ operationDefinition }),
+      tags
     });
   }
   function generateQueryFn({
@@ -698,91 +708,60 @@ async function generateApi(spec, {
     encodePathParams: encodePathParams2,
     encodeQueryParams: encodeQueryParams2
   }) {
-    const {
-      operation: { parameters = [], requestBody },
-      path: path4,
-      verb
-    } = operationDefinition;
-    const bodyParameter = requestBody && !(0, import_generate3.isReference)(requestBody) ? requestBody.content?.["application/json"]?.schema : void 0;
-    const bodyArg = bodyParameter ? queryArg["body"] : void 0;
-    const pathParameters = parameters.filter((p) => !(0, import_generate3.isReference)(p) && p.in === "path").map((param) => ({
-      name: param.name,
-      originalName: param.name,
-      type: factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.StringKeyword),
-      required: param.required,
-      param,
-      origin: "param"
-    }));
-    const queryParameters = parameters.filter((p) => !(0, import_generate3.isReference)(p) && p.in === "query").map((param) => ({
-      name: param.name,
-      originalName: param.name,
-      type: factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.StringKeyword),
-      required: param.required,
-      param,
-      origin: "param"
-    }));
-    const headerParameters = parameters.filter((p) => !(0, import_generate3.isReference)(p) && p.in === "header").map((param) => ({
-      name: param.name.includes("-") ? `'${param.name}'` : param.name,
-      originalName: param.name,
-      type: factory.createKeywordTypeNode(import_typescript4.default.SyntaxKind.StringKeyword),
-      required: param.required,
-      param,
-      origin: "param"
-    }));
+    const { path: path4, verb } = operationDefinition;
+    const bodyParameter = Object.values(queryArg).find((def) => def.origin === "body");
     const rootObject = factory.createIdentifier("queryArg");
-    const objectProperties = [
-      factory.createPropertyAssignment(
-        "url",
-        generatePathExpression(path4, pathParameters, rootObject, isFlatArg, encodePathParams2)
-      ),
-      factory.createPropertyAssignment("method", factory.createStringLiteral(verb.toUpperCase()))
-    ];
-    if (bodyArg) {
-      objectProperties.push(
-        factory.createPropertyAssignment(
-          "body",
-          factory.createPropertyAccessExpression(
-            factory.createPropertyAccessExpression(rootObject, factory.createIdentifier("variables")),
-            factory.createIdentifier("body")
-          )
-        )
-      );
+    function pickParams(paramIn) {
+      return Object.values(queryArg).filter((def) => def.origin === "param" && def.param.in === paramIn);
     }
-    if (queryParameters.length) {
-      objectProperties.push(
-        factory.createPropertyAssignment(
-          "params",
-          factory.createPropertyAccessExpression(
-            factory.createPropertyAccessExpression(rootObject, factory.createIdentifier("variables")),
-            factory.createIdentifier("params")
-          )
-        )
-      );
-    }
-    if (headerParameters.length) {
-      objectProperties.push(
-        factory.createPropertyAssignment(
-          "headers",
-          factory.createPropertyAccessExpression(
-            factory.createPropertyAccessExpression(rootObject, factory.createIdentifier("variables")),
-            factory.createIdentifier("headers")
-          )
-        )
+    function createObjectLiteralProperty(parameters, propertyName) {
+      if (parameters.length === 0) return void 0;
+      const properties = parameters.map((param) => {
+        const value = isFlatArg ? rootObject : accessProperty(rootObject, param.name);
+        const encodedValue = encodeQueryParams2 && param.param?.in === "query" ? factory.createConditionalExpression(
+          value,
+          void 0,
+          factory.createCallExpression(factory.createIdentifier("encodeURIComponent"), void 0, [
+            factory.createCallExpression(factory.createIdentifier("String"), void 0, [value])
+          ]),
+          void 0,
+          factory.createIdentifier("undefined")
+        ) : value;
+        return (0, import_generate3.createPropertyAssignment)(param.originalName, encodedValue);
+      });
+      return factory.createPropertyAssignment(
+        factory.createIdentifier(propertyName),
+        factory.createObjectLiteralExpression(properties, true)
       );
     }
-    objectProperties.push(
-      factory.createPropertyAssignment(
-        "fetchOptions",
-        factory.createPropertyAccessExpression(rootObject, factory.createIdentifier("fetchOptions"))
-      )
-    );
     return factory.createArrowFunction(
       void 0,
       void 0,
-      [factory.createParameterDeclaration(void 0, void 0, rootObject)],
+      Object.keys(queryArg).length ? [factory.createParameterDeclaration(void 0, void 0, rootObject, void 0, void 0, void 0)] : [],
       void 0,
       factory.createToken(import_typescript4.default.SyntaxKind.EqualsGreaterThanToken),
-      factory.createParenthesizedExpression(factory.createObjectLiteralExpression(objectProperties, true))
+      factory.createParenthesizedExpression(
+        factory.createObjectLiteralExpression(
+          [
+            factory.createPropertyAssignment(
+              factory.createIdentifier("url"),
+              generatePathExpression(path4, pickParams("path"), rootObject, isFlatArg, encodePathParams2)
+            ),
+            isQuery2 && verb.toUpperCase() === "GET" ? void 0 : factory.createPropertyAssignment(
+              factory.createIdentifier("method"),
+              factory.createStringLiteral(verb.toUpperCase())
+            ),
+            bodyParameter === void 0 ? void 0 : factory.createPropertyAssignment(
+              factory.createIdentifier("body"),
+              isFlatArg ? rootObject : factory.createPropertyAccessExpression(rootObject, factory.createIdentifier(bodyParameter.name))
+            ),
+            createObjectLiteralProperty(pickParams("cookie"), "cookies"),
+            createObjectLiteralProperty(pickParams("header"), "headers"),
+            createObjectLiteralProperty(pickParams("query"), "params")
+          ].filter(removeUndefined),
+          false
+        )
+      )
     );
   }
   function generateQueryEndpointProps({}) {
@@ -792,6 +771,9 @@ async function generateApi(spec, {
     return {};
   }
 }
+function accessProperty(rootObject, propertyName) {
+  return (0, import_generate3.isValidIdentifier)(propertyName) ? factory.createPropertyAccessExpression(rootObject, factory.createIdentifier(propertyName)) : factory.createElementAccessExpression(rootObject, factory.createStringLiteral(propertyName));
+}
 function generatePathExpression(path4, pathParameters, rootObject, isFlatArg, encodePathParams) {
   const expressions = [];
   const head = path4.replace(/\{(.*?)}(.*?)(?=\{|$)/g, (_, expression, literal) => {
@@ -803,21 +785,18 @@ function generatePathExpression(path4, pathParameters, rootObject, isFlatArg, en
     return "";
   });
   return expressions.length ? factory.createTemplateExpression(
-    factory.createTemplateHead(head, head),
+    factory.createTemplateHead(head),
     expressions.map(([prop, literal], index) => {
-      const value = factory.createPropertyAccessExpression(
-        factory.createPropertyAccessExpression(rootObject, factory.createIdentifier("variables")),
-        factory.createIdentifier(prop)
-      );
+      const value = isFlatArg ? rootObject : accessProperty(rootObject, prop);
       const encodedValue = encodePathParams ? factory.createCallExpression(factory.createIdentifier("encodeURIComponent"), void 0, [
         factory.createCallExpression(factory.createIdentifier("String"), void 0, [value])
       ]) : value;
       return factory.createTemplateSpan(
         encodedValue,
-        index === expressions.length - 1 ? factory.createTemplateTail(literal, literal) : factory.createTemplateMiddle(literal, literal)
+        index === expressions.length - 1 ? factory.createTemplateTail(literal) : factory.createTemplateMiddle(literal)
       );
     })
-  ) : factory.createStringLiteral(head);
+  ) : factory.createNoSubstitutionTemplateLiteral(head);
 }
 
 // src/index.ts