refactor validators

Author: lstreckeisen

src/language/ContextMapperDslValidator.ts

@@ -1,26 +1,28 @@
-import { AstNode, type ValidationChecks, ValidationRegistry } from 'langium'
+import { ValidationAcceptor, type ValidationChecks, ValidationRegistry } from 'langium'
 import { ContextMappingModelValidator } from './validation/ContextMappingModelValidator.js'
 import { ValueValidator } from './validation/ValueValidator.js'
-import { AbstractContextMapperValidator } from './validation/AbstractContextMapperValidator.js'
-import type { ContextMapperDslAstType } from './generated/ast.js'
-
-const validators: AbstractContextMapperValidator<AstNode>[] = [
-  new ContextMappingModelValidator(),
-  new ValueValidator()
-]
+import type { ContextMapperDslAstType, ContextMappingModel, Value } from './generated/ast.js'
 
 /**
  * Register custom validation checks.
  */
 export function registerValidationChecks (registry: ValidationRegistry, validator: ContextMapperDslValidator) {
-  const validatorChecks: ValidationChecks<ContextMapperDslAstType>[] = []
-  for (const validator of validators) {
-    validatorChecks.push(validator.getChecks())
+  const checks: ValidationChecks<ContextMapperDslAstType> = {
+    ContextMappingModel: validator.checkContextMappingModel,
+    Value: validator.checkValue
   }
-  const checks: ValidationChecks<ContextMapperDslAstType> = Object.assign({}, ...validatorChecks)
   registry.register(checks, validator)
 }
 
 export class ContextMapperDslValidator {
+  private contextMappingModelValidator = new ContextMappingModelValidator()
+  private valueValidator = new ValueValidator()
+
+  checkContextMappingModel (model: ContextMappingModel, acceptor: ValidationAcceptor) {
+    this.contextMappingModelValidator.validate(model, acceptor)
+  }
 
+  checkValue (value: Value, acceptor: ValidationAcceptor) {
+    this.valueValidator.validate(value, acceptor)
+  }
 }

src/language/validation/AbstractContextMapperValidator.ts

@@ -0,0 +1,5 @@
+import { AstNode, ValidationAcceptor } from 'langium'
+
+export interface ContextMapperValidator<T extends AstNode> {
+  validate (node: T, acceptor: ValidationAcceptor): void
+}

src/language/validation/ContextMapperValidator.ts

@@ -1,14 +1,8 @@
-import type { ValidationAcceptor, ValidationChecks } from 'langium'
-import type { ContextMapperDslAstType, ContextMappingModel } from '../generated/ast.js'
-import { AbstractContextMapperValidator } from './AbstractContextMapperValidator.js'
-
-export class ContextMappingModelValidator implements AbstractContextMapperValidator<ContextMappingModel> {
-  getChecks (): ValidationChecks<ContextMapperDslAstType> {
-    return {
-      ContextMappingModel: this.validate
-    }
-  }
+import type { ValidationAcceptor } from 'langium'
+import type { ContextMappingModel } from '../generated/ast.js'
+import { ContextMapperValidator } from './ContextMapperValidator.js'
 
+export class ContextMappingModelValidator implements ContextMapperValidator<ContextMappingModel> {
   validate (model: ContextMappingModel, acceptor: ValidationAcceptor): void {
     checkForZeroOrOneContextMap(model, acceptor)
   }

src/language/validation/ContextMappingModelValidator.ts

@@ -1,14 +1,8 @@
-import { AbstractContextMapperValidator } from './AbstractContextMapperValidator.js'
-import { ContextMapperDslAstType, Value } from '../generated/ast.js'
-import { ValidationAcceptor, ValidationChecks } from 'langium'
-
-export class ValueValidator implements AbstractContextMapperValidator<Value> {
-  getChecks (): ValidationChecks<ContextMapperDslAstType> {
-    return {
-      Value: this.validate
-    }
-  }
+import { ContextMapperValidator } from './ContextMapperValidator.js'
+import { Value } from '../generated/ast.js'
+import { ValidationAcceptor } from 'langium'
 
+export class ValueValidator implements ContextMapperValidator<Value> {
   validate (node: Value, acceptor: ValidationAcceptor): void {
     if (node.coreValue.length > 1) {
       acceptor('error', 'There must be zero or one isCore attribute', {