@povio/openapi-codegen-cli 0.13.5 → 0.13.7

package/package.json

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

package/src/generators/templates/acl-check.hbs

@@ -5,6 +5,8 @@ import { useCallback } from "react";
 {{{genImport errorHandlingImport}}}
 {{! App abilities import }}
 {{{genImport appAbilitiesImport}}}
+{{! Casl ability tuple import }}
+{{{genImport caslAbilityTupleImport}}}
 
 interface UseAclCheckProps {
   errorHandler?: {{errorHandler}}<never>;
@@ -14,7 +16,7 @@ export function {{aclCheckHook}}({ errorHandler }: UseAclCheckProps = {}) {
   const ability = {{abilityContext}}.useAbility();
 
   const checkAcl = useCallback((appAbility: {{appAbilities}}) => {
-    if (!ability.can(...appAbility)) {
+    if (!ability.can(...(appAbility as AbilityTuple))) {
       (errorHandler ?? {{sharedErrorHandler}}).rethrowError(new Error("ACL check failed"));
     }
   }, [ability, errorHandler]);

package/src/generators/templates/partials/acl-check-call.hbs

@@ -0,0 +1 @@
+checkAcl({{importedAbilityFunctionName endpoint}}({{#if generateAclCheckParams}}{ {{#each (abilityConditionsTypes endpoint) as | propertyType |}}{{propertyType.name}}, {{/each}} } {{/if}}));

package/src/generators/templates/partials/query-use-infinite-query.hbs

@@ -8,7 +8,7 @@ export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endp
   return {{infiniteQueryHook}}({
     queryKey: keys.{{endpointName endpoint}}Infinite({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint excludePageParam=true}}}{{/if}}),
     queryFn: ({ pageParam }) => {{#if hasQueryFnBody}}{ {{/if}} 
-    {{#if hasAclCheck}}checkAcl({{genAclCheckParams endpoint}});{{/if}}
+    {{#if hasAclCheck}}{{{genAclCheckCall endpoint}}}{{/if}}
     {{#if hasQueryFnBody}}return {{/if}}{{importedEndpointName endpoint}}({{{endpointArgs endpoint replacePageParam=true}}}{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}{{/if}})
     {{#if hasQueryFnBody}} }{{/if}},
     initialPageParam: 1,

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

@@ -9,7 +9,7 @@ export const {{queryName endpoint mutation=true}} = (options?: AppMutationOption
 
   return {{queryHook}}({
     mutationFn: {{#if endpoint.mediaUpload}}async {{/if}}({{#if (endpointParams endpoint includeFileParam=true)}} { {{{endpointArgs endpoint includeFileParam=true}}} } {{/if}}) => {{#if hasMutationFnBody}} { {{/if}}
-      {{#if hasAclCheck}}checkAcl({{genAclCheckParams endpoint}});{{/if}}
+      {{#if hasAclCheck}}{{{genAclCheckCall endpoint}}}{{/if}}
       {{#if endpoint.mediaUpload}}const uploadInstructions = await {{importedEndpointName endpoint}}({{{endpointArgs endpoint}}}{{#if hasAxiosRequestConfig}}{{#if (endpointArgs endpoint)}}, {{/if}}{{axiosRequestConfigName}}{{/if}}); 
       
       if (file && uploadInstructions.url) {

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

@@ -8,7 +8,7 @@ export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{
   return {{queryHook}}({
     queryKey: keys.{{endpointName endpoint}}({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint}}}{{/if}}),
     queryFn: {{#if hasQueryFn}}() => {{#if hasQueryFnBody}}{ {{/if}} 
-    {{#if hasAclCheck}}checkAcl({{genAclCheckParams endpoint}});{{/if}}
+    {{#if hasAclCheck}}{{{genAclCheckCall endpoint}}}{{/if}}
     {{#if hasQueryFnBody}}return {{/if}}{{importedEndpointName endpoint}}({{{endpointArgs endpoint}}}{{#if hasAxiosRequestConfig}}{{#if (endpointArgs endpoint)}}, {{/if}}{{axiosRequestConfigName}}{{/if}}){{else}}{{importedEndpointName endpoint}}{{/if}}
     {{#if hasQueryFnBody}} }{{/if}},
     ...options,

package/src/generators/templates/queries.hbs

@@ -26,6 +26,10 @@
 {{#each endpointsImports as | endpointsImport |}}
 {{{genImport endpointsImport}}}
 {{/each}}
+{{! Acl import }}
+{{#each aclImports as | aclImport |}}
+{{{genImport aclImport}}}
+{{/each}}
 
 {{#if includeNamespace}}
 export namespace {{namespace}} {

package/src/generators/templates/partials/acl-check-params.hbs

@@ -1 +0,0 @@
-{{#if generateAclCheckParams}}{ {{#each (abilityConditionsTypes endpoint) as | propertyType |}}{{propertyType.name}}, {{/each}} } {{/if}}