fix(type-safe-api): fix optional date/array/map types in model (#833)

aws · Oct 1, 2024 · f2ca308 · f2ca308
1 parent 5d97640
commit f2ca308
Show file tree

Hide file tree

Showing 3 changed files with 1,462 additions and 4 deletions.
diff --git a/...e-safe-api/scripts/type-safe-api/generators/typescript/templates/client/models/models.ejs b/...e-safe-api/scripts/type-safe-api/generators/typescript/templates/client/models/models.ejs
@@ -129,13 +129,13 @@ export function <%= model.name %>ToJSON(value?: <%= model.name %> | null): any {
 <%_ model.resolvedProperties.forEach((property) => { _%>
 <%_ if (!property.isReadOnly) { _%>
     <%_ if (property.isPrimitive && ["date", "date-time"].includes(property.format)) { _%>
-        '<%= property.name %>': <% if (!property.isRequired) { %>value.<%- property.typescriptName %> === undefined : undefined : <% } %>(<% if (property.isNullable) { %>value.<%- property.typescriptName %> === null ? null : <% } %>value.<%- property.typescriptName %>.toISOString()<% if (property.format === 'date') { %>.substr(0,10)<% } %>),
+        '<%= property.name %>': <% if (!property.isRequired) { %>value.<%- property.typescriptName %> === undefined ? undefined : <% } %>(<% if (property.isNullable) { %>value.<%- property.typescriptName %> === null ? null : <% } %>value.<%- property.typescriptName %>.toISOString()<% if (property.format === 'date') { %>.substr(0,10)<% } %>),
     <%_ } else if (property.isPrimitive) { _%>
         '<%= property.name %>': value.<%- property.typescriptName %>,
     <%_ } else if (property.export === 'array') { _%>
-        '<%= property.name %>': <% if (!property.isRequired) { %>value.<%- property.typescriptName %> === undefined : undefined : <% } %>(<% if (property.isNullable) { %>value.<%- property.typescriptName %> === null ? null : <% } %><% if (property.uniqueItems) { %>Array.from(value.<%- property.typescriptName %> as Set<any>)<% } else { %>(value.<%- property.typescriptName %> as Array<any>)<% } %>.map(<%- property.type %>ToJSON)),
+        '<%= property.name %>': <% if (!property.isRequired) { %>value.<%- property.typescriptName %> === undefined ? undefined : <% } %>(<% if (property.isNullable) { %>value.<%- property.typescriptName %> === null ? null : <% } %><% if (property.uniqueItems) { %>Array.from(value.<%- property.typescriptName %> as Set<any>)<% } else { %>(value.<%- property.typescriptName %> as Array<any>)<% } %>.map(<%- property.type %>ToJSON)),
     <%_ } else if (property.export === 'dictionary') { _%>
-        '<%= property.name %>': <% if (!property.isRequired) { %>value.<%- property.typescriptName %> === undefined : undefined : <% } %>(<% if (property.isNullable) { %>value.<%- property.typescriptName %> === null ? null : <% } %>mapValues(value.<%- property.typescriptName %>, <%- property.type %>ToJSON)),
+        '<%= property.name %>': <% if (!property.isRequired) { %>value.<%- property.typescriptName %> === undefined ? undefined : <% } %>(<% if (property.isNullable) { %>value.<%- property.typescriptName %> === null ? null : <% } %>mapValues(value.<%- property.typescriptName %>, <%- property.type %>ToJSON)),
     <%_ } else if (property.type !== 'any') { _%>
         '<%= property.name %>': <%- property.type %>ToJSON(value.<%- property.typescriptName %>),
     <%_ } else { _%>