Skip to content

Commit dcb20df

Browse files
committed
Fixed issues with code gen
1 parent 3f8c147 commit dcb20df

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/Exceptionless.Web/ClientApp/api-templates/class-data-contract.ejs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
const { contract, utils } = it;
33
const { formatDescription, require, _ } = utils;
44
%>
5-
export class <%~ contract.name %> {
5+
class <%~ contract.name %> {
66
<% for (const field of contract.$content) { %>
77
<%~ includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
88
<%~ includeFile('./object-field-class-validator.ejs', { ...it, field }) %>
9-
<%~ field.name %><%~ field.isRequired || !field.nullable ? '!' : '' %><%~ field.nullable ? '?' : '' %>: <%~ field.value.replaceAll('any', 'unknown') %>;
9+
<%~ field.name %><%~ (field.isRequired && !field.nullable) || !field.nullable || !field.nullable ? '!' : '' %><%~ field.nullable ? '?' : '' %>: <%~ field.value.replaceAll('any', 'unknown') %>;
1010
<% } %>
1111
}
12-

src/Exceptionless.Web/ClientApp/api-templates/data-contracts.ejs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const dataContractTemplates = {
2828
},
2929
type: (contract) => {
3030
return `type ${contract.name}${buildGenerics(contract)} = ${contract.content}`;
31-
},
31+
}
3232
}
3333
%>
3434

@@ -47,6 +47,7 @@ import {
4747
IsNumber,
4848
IsMongoId,
4949
IsUrl,
50+
Matches,
5051
Min,
5152
MinDate,
5253
MinLength,

src/Exceptionless.Web/ClientApp/api-templates/object-field-class-validator.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const validationDecorators = _.compact([
2828
!_.isUndefined(field.format) && getFormatValidation(field),
2929
!_.isUndefined(field.minLength) && `@MinLength(${field.minLength}, { message: '${field.name} must be at least ${field.minLength} characters long.' })`,
3030
!_.isUndefined(field.maxLength) && `@MaxLength(${field.maxLength}, { message: '${field.name} must be at most ${field.maxLength} characters long.' })`,
31-
!_.isUndefined(field.pattern) && `@Matches(${field.pattern}, { message: '${field.name} must match the pattern ${field.pattern}.' })`,
31+
!_.isUndefined(field.pattern) && `@Matches(/${field.pattern}/, { message: '${field.name} must match the pattern ${field.pattern}.' })`,
3232
!_.isUndefined(field.type) && (field.type === "object" || (field.type === "array" && field.items.$ref)) && `@ValidateNested({ message: '${field.name} must be a valid nested object.' })`,
3333
]);
3434

src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,3 +506,7 @@ export class WebHook {
506506
/** @format date-time */
507507
@IsDate({ message: 'created_utc must be a valid date and time.' }) created_utc!: string;
508508
}
509+
510+
export class WorkInProgressResult {
511+
@IsDefined({ message: 'workers is required.' }) workers!: string[];
512+
}

0 commit comments

Comments
 (0)