Skip to content

Commit bef4879

Browse files
skonvesskonves
committed
Add validators only option
1 parent 525f51d commit bef4879

File tree

3 files changed

+111
-103
lines changed

3 files changed

+111
-103
lines changed

‎src/sanitizer-factory.ts

+10-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@ export class SanitizerFactory {
3434
) {}
3535

3636
build(): File[] {
37-
return [
38-
{
39-
path: buildFilePath(['sanitizers.ts'], this.service, this.options),
40-
contents: format(from(this.buildFile()), this.options),
41-
},
42-
];
37+
if (!this.options?.typescriptValidators?.validatorsOnly) {
38+
return [
39+
{
40+
path: buildFilePath(['sanitizers.ts'], this.service, this.options),
41+
contents: format(from(this.buildFile()), this.options),
42+
},
43+
];
44+
}
45+
46+
return [];
4347
}
4448

4549
private buildMethodName(member: Type | Union): string {

‎src/types.ts

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { NamespacedTypescriptOptions } from '@basketry/typescript/lib/types';
22

33
export declare type TypescriptValidatorsOptions = {
44
typesImportPath?: string;
5+
validatorsOnly?: boolean;
56
};
67

78
export declare type NamespacedTypescriptValidatorsOptions =

‎src/validator-factory.ts

+100-97
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ export class ValidatorFactory {
128128
this.options?.typescriptValidators?.typesImportPath ?? './types'
129129
}"`;
130130

131-
yield `import ${
132-
this.options?.typescript?.typeImports ? ' type ' : ' '
133-
} * as sanitizers from "./sanitizers"`;
131+
if (!this.options?.typescriptValidators?.validatorsOnly) {
132+
yield `import ${
133+
this.options?.typescript?.typeImports ? ' type ' : ' '
134+
} * as sanitizers from "./sanitizers"`;
135+
}
134136
}
135137

136138
private readonly codes = new Set<string>();
@@ -428,118 +430,119 @@ export class ValidatorFactory {
428430
}
429431

430432
private *buildValidatedServiceWrappers(): Iterable<string> {
431-
yield `export type ResponseBuilder<T> = (validationErrors: ValidationError[], err: any) => T`;
432-
for (const int of sort(this.service.interfaces)) {
433-
const returnTypes = sort(
434-
Array.from(
435-
new Set(
436-
int.methods
437-
.map((m) =>
438-
getTypeByName(this.service, m.returnType?.typeName.value),
439-
)
440-
.filter((t): t is Type => !!t),
433+
if (!this.options?.typescriptValidators?.validatorsOnly) {
434+
yield `export type ResponseBuilder<T> = (validationErrors: ValidationError[], err: any) => T`;
435+
for (const int of sort(this.service.interfaces)) {
436+
const returnTypes = sort(
437+
Array.from(
438+
new Set(
439+
int.methods
440+
.map((m) =>
441+
getTypeByName(this.service, m.returnType?.typeName.value),
442+
)
443+
.filter((t): t is Type => !!t),
444+
),
441445
),
442-
),
443-
);
444-
445-
const hasVoid = int.methods.some((m) => !m.returnType);
446-
447-
const handlers = returnTypes.map(
448-
(type) =>
449-
`${camel(
450-
`build_${type.name.value}`,
451-
)}: ResponseBuilder<${buildTypeName(type, 'types')}>`,
452-
);
453-
if (hasVoid) {
454-
handlers.push('buildVoid: ResponseBuilder<void>');
455-
}
456-
457-
const handlersType = `{${handlers.join(',')}}`;
458-
459-
const intName = buildInterfaceName(int, 'types');
460-
yield `export class ${pascal(
461-
`validated_${int.name.value}_service`,
462-
)} implements ${buildInterfaceName(int, 'types')} {`;
463-
yield `constructor(private readonly service: ${intName}, private readonly handlers: ${handlersType}){}`;
464-
yield '';
465-
for (const method of sort(int.methods)) {
466-
const methodName = buildMethodName(method);
467-
const returnType = getTypeByName(
468-
this.service,
469-
method.returnType?.typeName.value,
470446
);
471447

472-
const sanitize = (call: string, isAsync: boolean): string => {
473-
if (returnType) {
474-
return `sanitizers.${camel(`sanitize_${returnType.name.value}`)}(${
475-
isAsync ? 'await' : ''
476-
} ${call})`;
477-
} else {
478-
return call;
479-
}
480-
};
448+
const hasVoid = int.methods.some((m) => !m.returnType);
481449

482-
const sanitizeAsync = (call: string): string => {
483-
return sanitize(call, true);
484-
};
450+
const handlers = returnTypes.map(
451+
(type) =>
452+
`${camel(
453+
`build_${type.name.value}`,
454+
)}: ResponseBuilder<${buildTypeName(type, 'types')}>`,
455+
);
456+
if (hasVoid) {
457+
handlers.push('buildVoid: ResponseBuilder<void>');
458+
}
485459

486-
const sanitizeSync = (call: string): string => {
487-
return sanitize(call, false);
488-
};
460+
const handlersType = `{${handlers.join(',')}}`;
489461

490-
const handlerName = returnType
491-
? `this.handlers.${camel(`build_${returnType.name.value}`)}`
492-
: 'this.handlers.buildVoid';
462+
const intName = buildInterfaceName(int, 'types');
463+
yield `export class ${pascal(
464+
`validated_${int.name.value}_service`,
465+
)} implements ${buildInterfaceName(int, 'types')} {`;
466+
yield `constructor(private readonly service: ${intName}, private readonly handlers: ${handlersType}){}`;
467+
yield '';
468+
for (const method of sort(int.methods)) {
469+
const methodName = buildMethodName(method);
470+
const returnType = getTypeByName(
471+
this.service,
472+
method.returnType?.typeName.value,
473+
);
493474

494-
const hasParams = !!method.parameters.length;
495-
const hasRequiredParams = method.parameters.some(isRequired);
496-
const paramDef = method.parameters.length
497-
? `params${hasRequiredParams ? '' : '?'}: ${buildMethodParamsTypeName(
475+
const sanitize = (call: string, isAsync: boolean): string => {
476+
if (returnType) {
477+
return `sanitizers.${camel(
478+
`sanitize_${returnType.name.value}`,
479+
)}(${isAsync ? 'await' : ''} ${call})`;
480+
} else {
481+
return call;
482+
}
483+
};
484+
485+
const sanitizeAsync = (call: string): string => {
486+
return sanitize(call, true);
487+
};
488+
489+
const sanitizeSync = (call: string): string => {
490+
return sanitize(call, false);
491+
};
492+
493+
const handlerName = returnType
494+
? `this.handlers.${camel(`build_${returnType.name.value}`)}`
495+
: 'this.handlers.buildVoid';
496+
497+
const hasParams = !!method.parameters.length;
498+
const hasRequiredParams = method.parameters.some(isRequired);
499+
const paramDef = method.parameters.length
500+
? `params${
501+
hasRequiredParams ? '' : '?'
502+
}: ${buildMethodParamsTypeName(method, 'types')}`
503+
: '';
504+
yield `async ${methodName}(${paramDef}) {`;
505+
yield `${
506+
hasParams ? 'let' : 'const'
507+
} validationErrors: ValidationError[] = [];`;
508+
yield 'try {';
509+
if (hasParams) {
510+
yield `validationErrors = ${buildParamsValidatorName(
498511
method,
499-
'types',
500-
)}`
501-
: '';
502-
yield `async ${methodName}(${paramDef}) {`;
503-
yield `${
504-
hasParams ? 'let' : 'const'
505-
} validationErrors: ValidationError[] = [];`;
506-
yield 'try {';
507-
if (hasParams) {
508-
yield `validationErrors = ${buildParamsValidatorName(
509-
method,
510-
)}(params)`;
511-
yield `if(validationErrors.length) {`;
512+
)}(params)`;
513+
yield `if(validationErrors.length) {`;
514+
if (returnType) {
515+
yield `return ${sanitizeSync(
516+
`${handlerName}(validationErrors, undefined)`,
517+
)}`;
518+
} else {
519+
yield `return ${handlerName}(validationErrors, undefined)`;
520+
}
521+
yield '}';
522+
}
523+
if (hasParams) {
524+
yield `const sanitizedParams = sanitizers.${camel(
525+
`sanitize_${method.name.value}_params`,
526+
)}(params)`;
527+
}
528+
yield `return ${sanitizeAsync(
529+
`this.service.${methodName}(${hasParams ? 'sanitizedParams' : ''})`,
530+
)}`;
531+
yield '} catch (err) {';
512532
if (returnType) {
513533
yield `return ${sanitizeSync(
514-
`${handlerName}(validationErrors, undefined)`,
534+
`${handlerName}(validationErrors, err)`,
515535
)}`;
516536
} else {
517-
yield `return ${handlerName}(validationErrors, undefined)`;
537+
yield `return ${handlerName}(validationErrors, err)`;
518538
}
519539
yield '}';
520-
}
521-
if (hasParams) {
522-
yield `const sanitizedParams = sanitizers.${camel(
523-
`sanitize_${method.name.value}_params`,
524-
)}(params)`;
525-
}
526-
yield `return ${sanitizeAsync(
527-
`this.service.${methodName}(${hasParams ? 'sanitizedParams' : ''})`,
528-
)}`;
529-
yield '} catch (err) {';
530-
if (returnType) {
531-
yield `return ${sanitizeSync(
532-
`${handlerName}(validationErrors, err)`,
533-
)}`;
534-
} else {
535-
yield `return ${handlerName}(validationErrors, err)`;
540+
yield '}';
541+
yield '';
536542
}
537543
yield '}';
538-
yield '}';
539544
yield '';
540545
}
541-
yield '}';
542-
yield '';
543546
}
544547
}
545548
}

0 commit comments

Comments
 (0)