fix(typescript-fetch): generate validationAttributes when withoutRuntimeChecks=true (OpenAPITools#23107)

* fix(typescript-fetch): generate validationAttributes when withoutRuntimeChecks=true

Previously, setting `validationAttributes=true` had no effect when
`withoutRuntimeChecks=true` was set. This commit fixes that by adding
the validation attributes to the `modelGenericInterfaces.mustache`
template (that is used when withoutRuntimeChecks is enabled)

- Moves validationAttributes logic to a partial template and includes it
  in the modelGenericInterfaces.mustache template
- modelGeneric.mustache includes the modelGenericInterfaces.mustache
  partial and should work as before

* update samples

Author: gurkodil

modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache

@@ -194,68 +194,3 @@ export function {{classname}}ToJSONTyped(value?: {{#hasReadOnly}}Omit<{{classnam
     return value;
     {{/hasVars}}
 }
-{{#validationAttributes}}
-
-export const {{classname}}PropertyValidationAttributesMap: {
-    [property: string]: {
-        maxLength?: number,
-        minLength?: number,
-        pattern?: string,
-        maximum?: number,
-        exclusiveMaximum?: boolean,
-        minimum?: number,
-        exclusiveMinimum?: boolean,
-        multipleOf?: number,
-        maxItems?: number,
-        minItems?: number,
-        uniqueItems?: boolean
-    }
-} = {
-{{#vars}}
-{{#hasValidation}}
-    {{name}}: {
-        {{#maxLength}}
-        maxLength: {{maxLength}},
-        {{/maxLength}}
-        {{#minLength}}
-        minLength: {{minLength}},
-        {{/minLength}}
-        {{#pattern}}
-        pattern: '{{pattern}}',
-        {{/pattern}}
-        {{#maximum}}
-        maximum: {{maximum}},
-        exclusiveMaximum: {{exclusiveMaximum}},
-        {{/maximum}}
-        {{#minimum}}
-        minimum: {{minimum}},
-        exclusiveMinimum: {{exclusiveMinimum}},
-        {{/minimum}}
-        {{#multipleOf}}
-        multipleOf: {{multipleOf}},
-        {{/multipleOf}}
-        {{#maxItems}}
-        maxItems: {{maxItems}},
-        {{/maxItems}}
-        {{#minItems}}
-        minItems: {{minItems}},
-        {{/minItems}}
-        {{#isArray}}
-        uniqueItems: {{uniqueItems}},
-        {{/isArray}}
-    },
-{{/hasValidation}}
-{{/vars}}
-}
-{{#isAdditionalPropertiesTrue}}
-
-export const {{classname}}AdditionalPropertiesValidationAttributes: { maxProperties?: number, minProperties?: number } = {
-    {{#maxProperties}}
-    maxProperties: {{maxProperties}},
-    {{/maxProperties}}
-    {{#minProperties}}
-    minProperties: {{minProperties}},
-    {{/minProperties}}
-}
-{{/isAdditionalPropertiesTrue}}
-{{/validationAttributes}}

modules/openapi-generator/src/main/resources/typescript-fetch/modelGenericInterfaces.mustache

@@ -47,4 +47,4 @@ export const {{classname}}{{enumName}} = {
 } as const;
 export type {{classname}}{{enumName}} = typeof {{classname}}{{enumName}}[keyof typeof {{classname}}{{enumName}}];
 {{/stringEnums}}
-{{/isEnum}}{{/vars}}{{/hasEnums}}
+{{/isEnum}}{{/vars}}{{/hasEnums}}{{>validationAttributes}}

modules/openapi-generator/src/main/resources/typescript-fetch/validationAttributes.mustache

@@ -0,0 +1,65 @@
+{{#validationAttributes}}
+
+export const {{classname}}PropertyValidationAttributesMap: {
+    [property: string]: {
+        maxLength?: number,
+        minLength?: number,
+        pattern?: string,
+        maximum?: number,
+        exclusiveMaximum?: boolean,
+        minimum?: number,
+        exclusiveMinimum?: boolean,
+        multipleOf?: number,
+        maxItems?: number,
+        minItems?: number,
+        uniqueItems?: boolean
+    }
+} = {
+{{#vars}}
+{{#hasValidation}}
+    {{name}}: {
+        {{#maxLength}}
+        maxLength: {{maxLength}},
+        {{/maxLength}}
+        {{#minLength}}
+        minLength: {{minLength}},
+        {{/minLength}}
+        {{#pattern}}
+        pattern: '{{pattern}}',
+        {{/pattern}}
+        {{#maximum}}
+        maximum: {{maximum}},
+        exclusiveMaximum: {{exclusiveMaximum}},
+        {{/maximum}}
+        {{#minimum}}
+        minimum: {{minimum}},
+        exclusiveMinimum: {{exclusiveMinimum}},
+        {{/minimum}}
+        {{#multipleOf}}
+        multipleOf: {{multipleOf}},
+        {{/multipleOf}}
+        {{#maxItems}}
+        maxItems: {{maxItems}},
+        {{/maxItems}}
+        {{#minItems}}
+        minItems: {{minItems}},
+        {{/minItems}}
+        {{#isArray}}
+        uniqueItems: {{uniqueItems}},
+        {{/isArray}}
+    },
+{{/hasValidation}}
+{{/vars}}
+}
+{{#isAdditionalPropertiesTrue}}
+
+export const {{classname}}AdditionalPropertiesValidationAttributes: { maxProperties?: number, minProperties?: number } = {
+    {{#maxProperties}}
+    maxProperties: {{maxProperties}},
+    {{/maxProperties}}
+    {{#minProperties}}
+    minProperties: {{minProperties}},
+    {{/minProperties}}
+}
+{{/isAdditionalPropertiesTrue}}
+{{/validationAttributes}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java

@@ -444,6 +444,20 @@ public void testOneOfModelsImportNonPrimitiveTypes() throws IOException {
         TestUtils.assertFileContains(testResponse, "import type { OptionThree } from './OptionThree'");
     }
 
+    @Test(description = "Verify validationAttributes works with withoutRuntimeChecks=true")
+    public void testValidationAttributesWithWithoutRuntimeChecks() throws IOException {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(TypeScriptFetchClientCodegen.VALIDATION_ATTRIBUTES, true);
+        properties.put(TypeScriptFetchClientCodegen.WITHOUT_RUNTIME_CHECKS, true);
+
+        File output = generate(properties, "src/test/resources/3_0/typescript-fetch/validation-attributes.yaml");
+
+        Path modelsIndex = Paths.get(output + "/models/index.ts");
+        TestUtils.assertFileExists(modelsIndex);
+        TestUtils.assertFileContains(modelsIndex, "PetPropertyValidationAttributesMap");
+        TestUtils.assertFileContains(modelsIndex, "[property: string]:");
+    }
+
     private static File generate(
         Map<String, Object> properties
     ) throws IOException {

samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Category.ts

@@ -32,6 +32,26 @@ export interface Category {
      */
     name?: string;
 }
+export const CategoryPropertyValidationAttributesMap: {
+    [property: string]: {
+        maxLength?: number,
+        minLength?: number,
+        pattern?: string,
+        maximum?: number,
+        exclusiveMaximum?: boolean,
+        minimum?: number,
+        exclusiveMinimum?: boolean,
+        multipleOf?: number,
+        maxItems?: number,
+        minItems?: number,
+        uniqueItems?: boolean
+    }
+} = {
+    name: {
+        pattern: '/^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$/',
+    },
+}
+
 
 /**
  * Check if a given object implements the Category interface.
@@ -71,23 +91,3 @@ export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator
     };
 }
 
-export const CategoryPropertyValidationAttributesMap: {
-    [property: string]: {
-        maxLength?: number,
-        minLength?: number,
-        pattern?: string,
-        maximum?: number,
-        exclusiveMaximum?: boolean,
-        minimum?: number,
-        exclusiveMinimum?: boolean,
-        multipleOf?: number,
-        maxItems?: number,
-        minItems?: number,
-        uniqueItems?: boolean
-    }
-} = {
-    name: {
-        pattern: '/^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$/',
-    },
-}
-

samples/client/petstore/typescript-fetch/builds/validation-attributes/models/ModelApiResponse.ts

@@ -38,6 +38,23 @@ export interface ModelApiResponse {
      */
     message?: string;
 }
+export const ModelApiResponsePropertyValidationAttributesMap: {
+    [property: string]: {
+        maxLength?: number,
+        minLength?: number,
+        pattern?: string,
+        maximum?: number,
+        exclusiveMaximum?: boolean,
+        minimum?: number,
+        exclusiveMinimum?: boolean,
+        multipleOf?: number,
+        maxItems?: number,
+        minItems?: number,
+        uniqueItems?: boolean
+    }
+} = {
+}
+
 
 /**
  * Check if a given object implements the ModelApiResponse interface.
@@ -79,20 +96,3 @@ export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ign
     };
 }
 
-export const ModelApiResponsePropertyValidationAttributesMap: {
-    [property: string]: {
-        maxLength?: number,
-        minLength?: number,
-        pattern?: string,
-        maximum?: number,
-        exclusiveMaximum?: boolean,
-        minimum?: number,
-        exclusiveMinimum?: boolean,
-        multipleOf?: number,
-        maxItems?: number,
-        minItems?: number,
-        uniqueItems?: boolean
-    }
-} = {
-}
-

samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Order.ts

@@ -69,6 +69,28 @@ export const OrderStatusEnum = {
 } as const;
 export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum];
 
+export const OrderPropertyValidationAttributesMap: {
+    [property: string]: {
+        maxLength?: number,
+        minLength?: number,
+        pattern?: string,
+        maximum?: number,
+        exclusiveMaximum?: boolean,
+        minimum?: number,
+        exclusiveMinimum?: boolean,
+        multipleOf?: number,
+        maxItems?: number,
+        minItems?: number,
+        uniqueItems?: boolean
+    }
+} = {
+}
+
+export const OrderAdditionalPropertiesValidationAttributes: { maxProperties?: number, minProperties?: number } = {
+    maxProperties: 10,
+    minProperties: 2,
+}
+
 
 /**
  * Check if a given object implements the Order interface.
@@ -118,25 +140,3 @@ export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: bool
     };
 }
 
-export const OrderPropertyValidationAttributesMap: {
-    [property: string]: {
-        maxLength?: number,
-        minLength?: number,
-        pattern?: string,
-        maximum?: number,
-        exclusiveMaximum?: boolean,
-        minimum?: number,
-        exclusiveMinimum?: boolean,
-        multipleOf?: number,
-        maxItems?: number,
-        minItems?: number,
-        uniqueItems?: boolean
-    }
-} = {
-}
-
-export const OrderAdditionalPropertiesValidationAttributes: { maxProperties?: number, minProperties?: number } = {
-    maxProperties: 10,
-    minProperties: 2,
-}
-

samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts

@@ -84,6 +84,28 @@ export const PetStatusEnum = {
 } as const;
 export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum];
 
+export const PetPropertyValidationAttributesMap: {
+    [property: string]: {
+        maxLength?: number,
+        minLength?: number,
+        pattern?: string,
+        maximum?: number,
+        exclusiveMaximum?: boolean,
+        minimum?: number,
+        exclusiveMinimum?: boolean,
+        multipleOf?: number,
+        maxItems?: number,
+        minItems?: number,
+        uniqueItems?: boolean
+    }
+} = {
+    photoUrls: {
+        maxItems: 8,
+        minItems: 1,
+        uniqueItems: true,
+    },
+}
+
 
 /**
  * Check if a given object implements the Pet interface.
@@ -133,25 +155,3 @@ export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean
     };
 }
 
-export const PetPropertyValidationAttributesMap: {
-    [property: string]: {
-        maxLength?: number,
-        minLength?: number,
-        pattern?: string,
-        maximum?: number,
-        exclusiveMaximum?: boolean,
-        minimum?: number,
-        exclusiveMinimum?: boolean,
-        multipleOf?: number,
-        maxItems?: number,
-        minItems?: number,
-        uniqueItems?: boolean
-    }
-} = {
-    photoUrls: {
-        maxItems: 8,
-        minItems: 1,
-        uniqueItems: true,
-    },
-}
-