@povio/openapi-codegen-cli 1.0.2 → 1.1.0

package/package.json

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

package/src/generators/templates/acl.hbs

@@ -8,14 +8,6 @@
 {{#if includeNamespace}}
 export namespace {{namespace}} {
 {{/if}}
-{{! Ability types }}
-{{#each endpoints as | endpoint |}}
-{{{genCaslAbilityType endpoint}}}
-
-{{/each}}
-{{! All abilities type }}
-export type AllAbilities =
-{{#each endpoints as | endpoint |}} | {{abilityTypeName endpoint}} {{/each}};
 
 {{! Ability functions }}
 {{#each endpoints as | endpoint |}}
@@ -24,4 +16,4 @@ export type AllAbilities =
 {{/each}}
 {{#if includeNamespace}}
 }
-{{/if}}
+{{/if}}

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

@@ -1,17 +1,17 @@
 {{! Casl AbilityTuple import}}
 {{{genImport caslAbilityTupleImport}}}
-{{! Acl imports }}
-{{#each imports as | import |}}
-{{{genImport import}}}
+{{! Models import }}
+{{#each modelsImports as | modelsImport |}}
+{{{genImport modelsImport}}}
 {{/each}}
 
 {{! AppAbilities union type }}
-export type {{appAbilities}} = 
-{{#if tags}}
-{{#if includeNamespace}}{{#each namespaces as | namespace |}} | {{namespace}}.{{../allAbilities}}{{/each}}
-{{else}}{{#each tags as | tag |}} | {{tagAllAbilitiesName tag}}{{/each}}{{/if}}
+export type {{appAbilities}} = {{#if appAbilitiesType}} 
+{{#each appAbilitiesType as | appAbilityType |}}
+| {{../abilityTuple}}<"{{@key}}", {{{union appAbilityType}}}>
+{{/each}}
 {{else}}
 {{abilityTuple}}<string, {{subjectType}}>;
 {{/if}}
 
-export type AppAbility = PureAbility<{{appAbilities}}>;
+export type AppAbility = PureAbility<{{appAbilities}}>;

package/src/generators/templates/models.hbs

@@ -12,8 +12,7 @@ export namespace {{namespace}} {
 {{! Js docs }}
 {{{genModelJsDocs @key zodSchema ../tag}}}
 {{! Zod schema export }}
-export const {{@key}}{{#if zodSchema.isCircular}}: z.ZodType<unknown> // TODO: Fix type inference {{/if}}
-    = {{{zodSchema.code}}};
+export const {{@key}} = {{{zodSchema.code}}};
 {{! Zod schema infered type export }}
 export type {{zodInferedType @key}} = z.infer<typeof {{@key}}>;
 {{#if zodSchema.isEnum}}export const {{zodInferedType @key}} = {{@key}}.enum;{{/if}}

package/src/generators/templates/partials/casl-ability-function.hbs

@@ -2,11 +2,11 @@
  * Use for {{{genCaslAbilityQuery endpoint}}} ability. {{#if (hasAbilityConditions endpoint)}}For global ability, omit the object parameter.{{/if}}{{#if (abilityDescription endpoint)}}
  * @description {{abilityDescription endpoint}}{{/if}} 
 {{#if (hasAbilityConditions endpoint)}}{{#each (abilityConditionsTypes endpoint) as | propertyType |}} * @param { {{propertyType.type}}{{propertyType.zodSchemaName}} } object.{{propertyType.name}} {{propertyType.name}} from {{propertyType.info}}
-{{/each}}{{/if}} * @returns { {{abilityTypeName endpoint}} } An ability tuple indicating the user's ability to use {{{genCaslAbilityQuery endpoint}}}
+{{/each}}{{/if}} * @returns { AbilityTuple } An ability tuple indicating the user's ability to use {{{genCaslAbilityQuery endpoint}}}
  */
 export const {{abilityFunctionName endpoint}} = (
   {{#if (hasAbilityConditions endpoint)}}object?: { {{#each (abilityConditionsTypes endpoint) as | propertyType |}}{{propertyType.name}}{{#unless propertyType.required}}?{{/unless}}: {{propertyType.type}}{{propertyType.zodSchemaName}}, {{/each}} } {{/if}}
 ) => [
   "{{ablityAction endpoint}}", 
   {{#if (hasAbilityConditions endpoint)}}object ? subject("{{ablitySubject endpoint}}", object) : "{{ablitySubject endpoint}}"{{else}}"{{ablitySubject endpoint}}"{{/if}}
-] as {{abilityTypeName endpoint}};
+] as {{{genCaslAbilityType endpoint}}};

package/src/generators/templates/partials/casl-ability-type.hbs

@@ -1,5 +1 @@
-type {{abilityTypeName endpoint}} = {{abilityTupleType}}<
-  "{{ablityAction endpoint}}", 
-  "{{ablitySubject endpoint}}" 
-  {{#if (hasAbilityConditions endpoint)}}| (ForcedSubject<"{{ablitySubject endpoint}}"> & { {{#each (abilityConditionsTypes endpoint) as | propertyType |}}{{propertyType.name}}{{#unless propertyType.required}}?{{/unless}}: {{propertyType.type}}{{propertyType.zodSchemaName}}, {{/each}} }){{/if}}
->;
+{{abilityTuple}}<"{{ablityAction endpoint}}", {{{union (abilitySubjectTypes endpoint)}}}>

package/dist/generators/core/zod/wrapCircularZodSchemas.d.ts

@@ -1,2 +0,0 @@
-import { SchemaResolver } from "src/generators/core/SchemaResolver.class";
-export declare function wrapCircularZodSchemas(resolver: SchemaResolver, zodSchemas: Record<string, string>): Record<string, string>;