streamline

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

src/validation/index.node.ts

@@ -18,5 +18,5 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
 */
 
 export * from './errors'
-export * from './validator'
+export type { Validator } from './validator'
 export * as Validators from './validators'

src/validation/validator.ts

@@ -17,12 +17,28 @@ SPDX-License-Identifier: Apache-2.0
 Copyright (c) OWASP Foundation. All Rights Reserved.
 */
 
+import type { Version } from '../spec'
+
 export interface Validator {
   /**
    * Promise rejects with one of the following
    * - {@link Validation.NotImplementedError | NotImplementedError} when there is no validator available for `this.version`
    * - {@link Validation.MissingOptionalDependencyError | MissingOptionalDependencyError} when a required dependency was not installed
    * - {@link Validation.ValidationError | ValidationError} when `data` was invalid to the schema
    */
-  validate: (data: any) => Promise<void>
+  validate: (data: string) => Promise<void>
+}
+
+export abstract class BaseValidator implements Validator {
+  readonly #version: Version
+
+  constructor (version: Version) {
+    this.#version = version
+  }
+
+  get version (): Version {
+    return this.#version
+  }
+
+  abstract validate (data: string): Promise<void>
 }

src/validation/validators/_helpers.ts

@@ -23,7 +23,7 @@ import { readFile } from 'fs/promises'
 
 import { FILES } from '../../resources.node'
 import { MissingOptionalDependencyError, NotImplementedError, ValidationError } from '../errors'
-import { BaseValidator } from './_helpers'
+import { BaseValidator } from '../validator'
 
 let _ajv: Ajv | undefined
 

src/validation/validators/json.ts

@@ -23,7 +23,7 @@ import { pathToFileURL } from 'url'
 
 import { FILES } from '../../resources.node'
 import { MissingOptionalDependencyError, NotImplementedError, ValidationError } from '../errors'
-import { BaseValidator } from './_helpers'
+import { BaseValidator } from '../validator'
 
 let _parser: typeof parseXml | undefined