Skip to content

Commit ebe27a9

Browse files
committed
CCM-13675: Address review comments
1 parent cb83fa0 commit ebe27a9

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

src/digital-letters-events/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
"exports": {
1212
".": {
1313
"default": "./index.ts"
14-
},
15-
"./*.js": {
16-
"default": "./validators/*.js",
17-
"types": "./validators/index.d.ts"
1814
}
1915
},
2016
"name": "digital-letters-events",

src/typescript-schema-generator/src/generate-guard-functions.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,27 @@ export async function generateGuardFunctions() {
1818

1919
const validatorVariableName = `event${typeName}Validator`;
2020

21-
const guardFunction = `import ${validatorVariableName} from 'digital-letters-events/${typeName}.js';
22-
import { InvalidEvent, type ${typeName} } from 'digital-letters-events';
21+
const guardFunction = `import ${validatorVariableName} from '../validators/${typeName}.js';
22+
import { type ${typeName} } from '../types';
23+
import { InvalidEvent } from '../errors';
2324
import { Logger } from 'utils';
25+
import { ValidateFunction } from 'ajv';
26+
27+
const validator = ${validatorVariableName} as unknown as ValidateFunction;
2428
2529
export function validate${typeName}(
2630
event: unknown,
2731
logger: Logger,
2832
): asserts event is ${typeName} {
29-
if (!${validatorVariableName}(event)) {
33+
if (!validator(event)) {
3034
logger.error({
31-
err: ${validatorVariableName}.errors,
35+
err: validator.errors,
3236
description: 'Error parsing ${typeName} event',
3337
});
34-
throw new InvalidEvent(${validatorVariableName}.errors);
38+
throw new InvalidEvent(validator.errors);
3539
}
36-
}`;
40+
}
41+
`;
3742

3843
const typeDeclarationFilename = `${typeName}.ts`;
3944
writeFile(outputDir, typeDeclarationFilename, guardFunction);

0 commit comments

Comments
 (0)