Acl check type fix

Author: monikaboz

package.json

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

src/generators/generate/generateAclCheck.ts

@@ -1,4 +1,4 @@
-import { ACL_APP_ABILITIES, ACL_CHECK_HOOK } from "../const/acl.const";
+import { ACL_APP_ABILITIES, ACL_CHECK_HOOK, CASL_ABILITY_BINDING, CASL_ABILITY_IMPORT } from "../const/acl.const";
 import { ABILITY_CONTEXT, ABILITY_CONTEXT_IMPORT, ERROR_HANDLERS, ERROR_HANDLING_IMPORT } from "../const/deps.const";
 import { SchemaResolver } from "../core/SchemaResolver.class";
 import { getAppAbilitiesImportPath } from "../utils/generate/generate.utils";
@@ -12,9 +12,13 @@ export function generateAclCheck(resolver: SchemaResolver) {
       ...ABILITY_CONTEXT_IMPORT,
       from: resolver.options.abilityContextImportPath,
     },
+    caslAbilityTupleImport: {
+      ...CASL_ABILITY_IMPORT,
+      bindings: [CASL_ABILITY_BINDING.abilityTuple],
+    },
     appAbilitiesImport: {
       bindings: [ACL_APP_ABILITIES],
-      from: getAppAbilitiesImportPath(),
+      from: getAppAbilitiesImportPath(resolver.options),
     },
     errorHandlingImport: {
       ...ERROR_HANDLING_IMPORT,

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]);

src/generators/utils/generate/generate.utils.ts

@@ -82,6 +82,6 @@ export function getZodExtendedImportPath(options: GenerateOptions) {
   return `${getImportPath(options)}${ZOD_EXTENDED_FILE.fileName}`;
 }
 
-export function getAppAbilitiesImportPath() {
-  return `./${ACL_APP_ABILITY_FILE.fileName}`;
+export function getAppAbilitiesImportPath(options: GenerateOptions) {
+  return `${getImportPath(options)}${ACL_APP_ABILITY_FILE.fileName}`;
 }