Skip to content

Commit aee6bd6

Browse files
update types
1 parent d058f13 commit aee6bd6

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

src/registry/domain/validators/component-parameters.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface ValidationResult {
3030
export default function componentParameters(
3131
requestParameters: Dictionary<string | number | boolean>,
3232
expectedParameters: Dictionary<OcParameter> = {}
33-
) {
33+
): ValidationResult {
3434
const result: ValidationResult = { isValid: true, errors: {} };
3535
const mandatoryParameters: string[] = [];
3636

@@ -45,6 +45,7 @@ export default function componentParameters(
4545
for (const mandatoryParameterName of mandatoryParameters) {
4646
if (
4747
typeof requestParameters === 'object' &&
48+
// eslint-disable-next-line no-prototype-builtins
4849
!requestParameters.hasOwnProperty(mandatoryParameterName)
4950
) {
5051
if (!result.errors.mandatory) {
@@ -62,6 +63,7 @@ export default function componentParameters(
6263
)) {
6364
if (
6465
typeof expectedParameters === 'object' &&
66+
// eslint-disable-next-line no-prototype-builtins
6567
expectedParameters.hasOwnProperty(requestParameterName)
6668
) {
6769
const expectedType = expectedParameters[requestParameterName].type;

src/registry/domain/validators/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ import registryConfigurationValidator from './registry-configuration';
99
import uploadedPackageValidator from './uploaded-package';
1010
import nodeVersionValidator from './node-version';
1111

12-
export function validateComponentName(componentName: string) {
13-
return (
14-
!/[^a-zA-Z0-9\-\_]/.test(componentName) && componentName !== '_package'
15-
);
12+
export function validateComponentName(componentName: string): boolean {
13+
return !/[^a-zA-Z0-9\-_]/.test(componentName) && componentName !== '_package';
1614
}
1715
export const validateComponentParameters = componentParametersValidator;
1816
export const validateNodeVersion = nodeVersionValidator;
@@ -21,6 +19,6 @@ export const validatePackage = uploadedPackageValidator;
2119
export const validatePackageJson = packageJsonValidator;
2220
export const validatePluginsRequirements = pluginsRequirementsValidator;
2321
export const validateRegistryConfiguration = registryConfigurationValidator;
24-
export function validateVersion(version: string) {
22+
export function validateVersion(version: string): boolean {
2523
return !!semver.valid(version);
2624
}

src/registry/domain/validators/plugins-requirements.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ type ValidationResult =
77
| { isValid: false; missing: string[] };
88

99
export default function pluginsRequirements(
10-
componentRequirements: string[],
10+
componentRequirements:
11+
| Record<string, (...args: unknown[]) => unknown>
12+
| string[]
13+
| null
14+
| undefined,
1115
registryPlugins: Config['plugins']
1216
): ValidationResult {
13-
const result = { isValid: true };
1417
const missing: string[] = [];
18+
const requiredPlugins = Array.isArray(componentRequirements)
19+
? componentRequirements
20+
: Object.keys(componentRequirements || {});
1521

16-
for (const requiredPlugin of componentRequirements || []) {
22+
for (const requiredPlugin of requiredPlugins) {
1723
if (
1824
!registryPlugins ||
1925
!Object.keys(registryPlugins).includes(requiredPlugin)

src/registry/domain/validators/registry-configuration.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import { Config } from '../../../types';
44

55
type ValidationResult = { isValid: true } | { isValid: false; message: string };
66

7-
export default function registryConfiguration(conf: Config): ValidationResult {
7+
export default function registryConfiguration(
8+
conf: Partial<Config>
9+
): ValidationResult {
810
const returnError = (message: string): ValidationResult => {
911
return {
1012
isValid: false,
@@ -69,10 +71,10 @@ export default function registryConfiguration(conf: Config): ValidationResult {
6971
);
7072
}
7173

72-
if (route.route.indexOf(prefix) === 0) {
74+
if (route.route.indexOf(prefix || '') === 0) {
7375
return returnError(
7476
strings.errors.registry.CONFIGURATION_ROUTES_ROUTE_CONTAINS_PREFIX(
75-
prefix
77+
prefix || ''
7678
)
7779
);
7880
}

src/registry/domain/validators/uploaded-package.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import _ from 'lodash';
2-
31
type ValidationResponse =
42
| {
53
isValid: true;
@@ -16,7 +14,7 @@ export default function uploadedPackage(
1614
[fieldname: string]: Express.Multer.File[];
1715
}
1816
): ValidationResponse {
19-
const returnError = function(message): ValidationResponse {
17+
const returnError = function(message?: string): ValidationResponse {
2018
return {
2119
isValid: false,
2220
message: message || 'uploaded package is not valid'
@@ -31,7 +29,7 @@ export default function uploadedPackage(
3129
return returnError('not_valid');
3230
}
3331

34-
const file = input[0];
32+
const file: Express.Multer.File = (input as any)[0];
3533
const validTypes = ['application/gzip', 'application/octet-stream'];
3634

3735
if (

0 commit comments

Comments
 (0)