Acl subject type fix

Author: monikaboz

package.json

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

src/generators/const/acl.const.ts

@@ -11,13 +11,15 @@ export const CASL_ABILITY_BINDING = {
   abilityTuple: "AbilityTuple",
   pureAbility: "PureAbility",
   forcedSubject: "ForcedSubject",
-  subject: "Subject",
+  subjectType: "Subject",
+  subject: "subject",
 };
 export const CASL_ABILITY_IMPORT: Import = {
   bindings: [
     CASL_ABILITY_BINDING.abilityTuple,
     CASL_ABILITY_BINDING.pureAbility,
     CASL_ABILITY_BINDING.forcedSubject,
+    CASL_ABILITY_BINDING.subjectType,
     CASL_ABILITY_BINDING.subject,
   ],
   from: "@casl/ability",

src/generators/generate/generateAcl.ts

@@ -53,7 +53,7 @@ export function generateAppAcl(resolver: SchemaResolver, tags: string[]) {
   const caslAbilityTupleImport: Import = {
     bindings: [
       CASL_ABILITY_BINDING.pureAbility,
-      ...(tags.length === 0 ? [CASL_ABILITY_BINDING.subject, CASL_ABILITY_BINDING.abilityTuple] : []),
+      ...(tags.length === 0 ? [CASL_ABILITY_BINDING.subjectType, CASL_ABILITY_BINDING.abilityTuple] : []),
     ],
     from: CASL_ABILITY_IMPORT.from,
   };
@@ -79,6 +79,6 @@ export function generateAppAcl(resolver: SchemaResolver, tags: string[]) {
     tags,
     namespaces,
     abilityTuple: CASL_ABILITY_BINDING.abilityTuple,
-    subject: CASL_ABILITY_BINDING.subject,
+    subjectType: CASL_ABILITY_BINDING.subjectType,
   });
 }

src/generators/templates/app-acl.hbs

@@ -11,7 +11,7 @@ export type {{appAbilities}} =
 {{#if includeNamespace}}{{#each namespaces as | namespace |}} | {{namespace}}.{{../allAbilities}}{{/each}}
 {{else}}{{#each tags as | tag |}} | {{tagAllAbilitiesName tag}}{{/each}}{{/if}}
 {{else}}
-{{abilityTuple}}<string, {{subject}}>;
+{{abilityTuple}}<string, {{subjectType}}>;
 {{/if}}
 
 export type AppAbility = PureAbility<{{appAbilities}}>;