Fix unused or empty destructured variables

Author: monikaboz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "main": "./dist/index.js",
   "bin": {
     "openapi-codegen": "./dist/sh.js"

src/generators/templates/partials/query-use-mutation.hbs

@@ -29,7 +29,7 @@ export const {{queryName endpoint mutation=true}} = (options?: AppMutationOption
     onSuccess: async (resData, variables, context) => {
       {{! Mutation effects }}
       {{#if updateQueryEndpoints}}
-      const { {{endpointArgs endpoint includeOnlyRequiredParams=true excludeBodyParam=true}} } = variables;
+      {{#if destructuredVariables}}const { {{commaSeparated destructuredVariables }} } = variables;{{/if}}
       const updateKeys = [{{#each updateQueryEndpoints as | endpoint |}}keys.{{endpointName endpoint}}({{{endpointArgs endpoint includeOnlyRequiredParams=true}}}), {{/each}}];
       {{/if}}
       await runMutationEffects(resData, options{{#if updateQueryEndpoints}}, updateKeys{{/if}});

src/generators/utils/hbs/hbs.partials.utils.ts

@@ -14,7 +14,7 @@ import {
   mapEndpointParamsToFunctionParams,
 } from "../generate/generate.endpoints.utils";
 import { getHbsPartialTemplateDelegate } from "../hbs/hbs-template.utils";
-import { isInfiniteQuery, isMutation, isQuery } from "../query.utils";
+import { getDestructuredVariables, isInfiniteQuery, isMutation, isQuery } from "../query.utils";
 import { isNamedZodSchema } from "../zod-schema.utils";
 
 enum PartialsHelpers {
@@ -153,6 +153,7 @@ function registerGenerateMutationHelper(resolver: SchemaResolver) {
     }
 
     const updateQueryEndpoints = getUpdateQueryEndpoints(endpoint, queryEndpoints);
+    const destructuredVariables = getDestructuredVariables(resolver, endpoint, updateQueryEndpoints);
     const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
 
     return getHbsPartialTemplateDelegate("query-use-mutation")({
@@ -166,6 +167,7 @@ function registerGenerateMutationHelper(resolver: SchemaResolver) {
       hasMutationEffects: resolver.options.mutationEffects,
       mutationEffectsType: MUTATION_EFFECTS.optionsType,
       updateQueryEndpoints,
+      destructuredVariables,
       hasAclCheck,
       aclCheckHook: ACL_CHECK_HOOK,
     });

src/generators/utils/query.utils.ts

@@ -1,5 +1,7 @@
 import { INFINITE_QUERY_PARAMS } from "../const/queries.const";
+import { SchemaResolver } from "../core/SchemaResolver.class";
 import { Endpoint } from "../types/endpoint";
+import { mapEndpointParamsToFunctionParams } from "./generate/generate.endpoints.utils";
 
 export const isQuery = (endpoint: Endpoint) => endpoint.method === "get";
 
@@ -10,3 +12,26 @@ export const isInfiniteQuery = (endpoint: Endpoint, infiniteQueryParams?: string
   (infiniteQueryParams ?? Object.values(INFINITE_QUERY_PARAMS)).every((infiniteQueryParam) =>
     endpoint.parameters.some((param) => param.name === infiniteQueryParam && param.type === "Query"),
   );
+
+export const getDestructuredVariables = (
+  resolver: SchemaResolver,
+  endpoint: Endpoint,
+  updateQueryEndpoints: Endpoint[],
+) => {
+  const requiredUpdateQueryParams = updateQueryEndpoints.reduce(
+    (acc, updateEndpoint) => [
+      ...acc,
+      ...mapEndpointParamsToFunctionParams(resolver, updateEndpoint, { includeOnlyRequiredParams: true }).map(
+        (param) => param.name,
+      ),
+    ],
+    [] as string[],
+  );
+
+  return mapEndpointParamsToFunctionParams(resolver, endpoint, {
+    includeOnlyRequiredParams: true,
+    excludeBodyParam: true,
+  })
+    .filter((param) => requiredUpdateQueryParams.includes(param.name))
+    .map((param) => param.name);
+};