- Made changes after testing

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/templates/javascript/partials/validationArray.hbs

@@ -1,7 +1,5 @@
-{{~#>validationBasics~}}
 {{~#if link~}}
-yup.array().of({{>validation link}})
+yup.array().of({{>validation link}}){{>validationBasics}}
 {{~else~}}
-yup.array().of({{{base}}}.schema)
+yup.array().of({{{base}}}.schema){{>validationBasics}}
 {{~/if~}}
-{{~/validationBasics~}}

src/templates/javascript/partials/validationBasics.hbs

@@ -1 +1 @@
-{{>@partial-block}}{{#if isNullable}}.nullable(){{/if}}{{#if isRequired}}.required(){{/if}}
+{{#if isNullable}}.nullable(){{/if}}{{#if isRequired}}.required(){{/if}}

src/templates/javascript/partials/validationEnum.hbs

@@ -1,15 +1,13 @@
-{{~#>validationBasics~}}
 {{~#equals parent name~}}
 yup.mixed().oneOf([
     {{#each enum}}
     {{{../parent}}}.{{{name}}}{{>comma}}
     {{/each}}
-])
+]){{>validationBasics}}
 {{~else~}}
 yup.mixed().oneOf([
     {{#each enum}}
     {{{value}}}{{>comma}}
     {{/each}}
-])
+]){{>validationBasics}}
 {{~/equals~}}
-{{~/validationBasics~}}

src/templates/javascript/partials/validationGeneric.hbs

@@ -1,11 +1,9 @@
-{{~#>validationBasics~}}
 {{~#equals type 'boolean'~}}
-yup.boolean()
+yup.boolean(){{>validationBasics}}
 {{~else equals type 'number'~}}
-yup.number()
+yup.number(){{>validationBasics}}
 {{~else equals type 'string'~}}
-yup.string()
+yup.string(){{>validationBasics}}
 {{~else~}}
-yup.mixed()
+yup.mixed(){{>validationBasics}}
 {{~/equals~}}
-{{~/validationBasics~}}

src/templates/javascript/partials/validationInterface.hbs

@@ -1,10 +1,10 @@
-{{~#>validationBasics~}}
+(
 {{#if extends}}
 {{#each extends}}
 {{{this}}}.schema.concat(
 {{/each}}
 {{/if}}
-{{~#if properties~}}
+{{#if properties}}
 yup.object().shape({
     {{#each properties}}
     {{#equals ../parent name}}
@@ -14,12 +14,12 @@ yup.object().shape({
     {{/equals}}
     {{/each}}
 }).noUnknown()
-{{~else~}}
+{{else}}
 yup.object()
-{{~/if~}}
+{{/if}}
 {{#if extends}}
 {{#each extends}}
 )
 {{/each}}
 {{/if}}
-{{~/validationBasics~}}
+){{>validationBasics}}

src/templates/javascript/partials/validationReference.hbs

@@ -1,3 +1 @@
-{{~#>validationBasics~}}
-{{{base}}}.schema
-{{~/validationBasics~}}
+{{{base}}}.schema{{>validationBasics}}

src/templates/typescript/partials/exportGeneric.hbs

@@ -9,11 +9,11 @@ export namespace {{{name}}} {
 
     export const schema = {{>validation}};
 
-    export async function validate(value: any): Promise<{{#>isNullable}}{{{name}}}{{/isNullable}}> {
+    export async function validate(value: any): Promise<{{{name}}}{{>isNullable}}> {
         return schema.validate(value, { strict: true });
     }
 
-    export function validateSync(value: any): {{#>isNullable}}{{{name}}}{{/isNullable}} {
+    export function validateSync(value: any): {{{name}}}{{>isNullable}} {
         return schema.validateSync(value, { strict: true });
     }
 }

src/templates/typescript/partials/isNullable.hbs

@@ -1 +1 @@
-{{>@partial-block}}{{#if isNullable}} | null{{/if}}
+{{#if isNullable}} | null{{/if}}

src/templates/typescript/partials/typeArray.hbs

@@ -1,7 +1,5 @@
-{{~#>isNullable~}}
 {{~#if link~}}
-Array<{{>type link}}>
+Array<{{>type link}}>{{>isNullable}}
 {{~else~}}
-Array<{{{type}}}>
+Array<{{{type}}}>{{>isNullable}}
 {{~/if~}}
-{{~/isNullable~}}

src/templates/typescript/partials/typeDictionary.hbs

@@ -1,7 +1,5 @@
-{{~#>isNullable~}}
 {{~#if link~}}
-Dictionary<{{>type link}}>
+Dictionary<{{>type link}}>{{>isNullable}}
 {{~else~}}
-Dictionary<{{{type}}}>
+Dictionary<{{{type}}}>{{>isNullable}}
 {{~/if~}}
-{{~/isNullable~}}

src/templates/typescript/partials/typeEnum.hbs

@@ -1,11 +1,9 @@
-{{~#>isNullable~}}
 {{~#if parent~}}
-{{{parent}}}.{{{name}}}
+{{{parent}}}.{{{name}}}{{>isNullable}}
 {{~else~}}
 (
 {{~#each enum~}}
 {{{value}}}{{#unless @last}} | {{/unless}}
 {{~/each~}}
-)
+){{>isNullable}}
 {{~/if~}}
-{{~/isNullable~}}

src/templates/typescript/partials/typeGeneric.hbs

@@ -1,3 +1 @@
-{{~#>isNullable~}}
-{{{base}}}
-{{~/isNullable~}}
+{{{base}}}{{>isNullable}}

src/templates/typescript/partials/typeInterface.hbs

@@ -1,4 +1,3 @@
-{{~#>isNullable~}}
 {{~#if properties~}}
 {
 {{#each properties}}
@@ -9,8 +8,7 @@
 {{/if}}
 {{>isReadOnly}}{{{name}}}{{>isRequired}}: {{>type}}{{>comma}}
 {{/each}}
-}
+}{{>isNullable}}
 {{~else~}}
 any
 {{~/if~}}
-{{~/isNullable~}}

src/templates/typescript/partials/typeReference.hbs

@@ -1,3 +1 @@
-{{~#>isNullable~}}
-{{{base}}}
-{{~/isNullable~}}
+{{{base}}}{{>isNullable}}

src/templates/typescript/partials/validationArray.hbs

@@ -1,7 +1,6 @@
-{{~#>validationBasics~}}
 {{~#if link~}}
 yup.array<{{>type link}}>().of({{>validation link}})
 {{~else~}}
-yup.array<{{#>isNullable}}{{{type}}}{{/isNullable}}>().of({{{base}}}.schema)
+yup.array<{{{type}}}{{>isNullable}}>().of({{{base}}}.schema)
 {{~/if~}}
-{{~/validationBasics~}}
+{{>validationBasics}}

src/templates/typescript/partials/validationBasics.hbs

@@ -1 +1 @@
-{{>@partial-block}}{{#if isNullable}}.nullable(){{/if}}{{#if isRequired}}.required(){{/if}}
+{{#if isNullable}}.nullable(){{/if}}{{#if isRequired}}.required(){{/if}}

src/templates/typescript/partials/validationDictionary.hbs

@@ -8,8 +8,8 @@ yup.lazy<Dictionary<{{>type link}}>>(value => {
     ).noUnknown();
 })
 {{~else~}}
-yup.lazy<Dictionary<{{#>isNullable}}{{{type}}}{{/isNullable}}>>(value => {
-    return yup.object<Dictionary<{{#>isNullable}}{{{type}}}{{/isNullable}}>>().shape(
+yup.lazy<Dictionary<{{{type}}}{{>isNullable}}>>(value => {
+    return yup.object<Dictionary<{{{type}}}{{>isNullable}}>>().shape(
         Object.keys(value).reduce((object, key) => ({
             ...object,
             [key]: {{{base}}}.schema

src/templates/typescript/partials/validationEnum.hbs

@@ -1,15 +1,14 @@
-{{~#>validationBasics~}}
 {{~#equals parent name~}}
 yup.mixed<{{{name}}}>().oneOf([
     {{#each enum}}
     {{{../parent}}}.{{{name}}}{{>comma}}
     {{/each}}
-])
+]){{>validationBasics}}
 {{~else~}}
-yup.mixed<{{#>isNullable}}{{{type}}}{{/isNullable}}>().oneOf([
+yup.mixed<{{{type}}}{{>isNullable}}>().oneOf([
     {{#each enum}}
     {{{value}}}{{>comma}}
     {{/each}}
-])
+]){{>validationBasics}}
 {{~/equals~}}
-{{~/validationBasics~}}
+

src/templates/typescript/partials/validationGeneric.hbs

@@ -1,11 +1,9 @@
-{{~#>validationBasics~}}
 {{~#equals type 'boolean'~}}
-yup.boolean()
+yup.boolean(){{>validationBasics}}
 {{~else equals type 'number'~}}
-yup.number()
+yup.number(){{>validationBasics}}
 {{~else equals type 'string'~}}
-yup.string()
+yup.string(){{>validationBasics}}
 {{~else~}}
-yup.mixed<{{#>isNullable}}{{{type}}}{{/isNullable}}>()
+yup.mixed<{{{type}}}{{>isNullable}}>(){{>validationBasics}}
 {{~/equals~}}
-{{~/validationBasics~}}

src/templates/typescript/partials/validationInterface.hbs

@@ -1,11 +1,11 @@
-{{~#>validationBasics~}}
+(
 {{#if extends}}
 {{#each extends}}
 {{{this}}}.schema.concat(
 {{/each}}
 {{/if}}
-{{~#if properties~}}
-yup.object{{#unless isProperty}}{{#if name}}<{{{name}}}>{{/if}}{{/unless}}().shape({
+{{#if properties}}
+yup.object().shape({
     {{#each properties}}
     {{#equals ../parent name}}
     {{{name}}}: {{>validation parent=name}}{{>comma}}
@@ -14,12 +14,12 @@ yup.object{{#unless isProperty}}{{#if name}}<{{{name}}}>{{/if}}{{/unless}}().sha
     {{/equals}}
     {{/each}}
 }).noUnknown()
-{{~else~}}
+{{else}}
 yup.object<any>()
-{{~/if~}}
+{{/if}}
 {{#if extends}}
 {{#each extends}}
 )
 {{/each}}
 {{/if}}
-{{~/validationBasics~}}
+){{>validationBasics}}

src/templates/typescript/partials/validationReference.hbs

@@ -1,3 +1 @@
-{{~#>validationBasics~}}
-{{{base}}}.schema
-{{~/validationBasics~}}
+{{{base}}}.schema{{>validationBasics}}