From b5d4698e5a8cb061a03c06b4c1a4a3c30c73704b Mon Sep 17 00:00:00 2001 From: ssube Date: Sat, 2 Nov 2019 10:26:22 -0500 Subject: [PATCH] fix(rules): remove redundant rule field from result the value of the rule field is always this and it is unused by the visitor. --- src/rule/SchemaRule.ts | 11 +++-------- src/visitor/index.ts | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/rule/SchemaRule.ts b/src/rule/SchemaRule.ts index c54caf8..1fb8244 100644 --- a/src/rule/SchemaRule.ts +++ b/src/rule/SchemaRule.ts @@ -10,11 +10,7 @@ import { VisitorContext } from '../visitor/VisitorContext'; import { VisitorError } from '../visitor/VisitorError'; import { VisitorResult } from '../visitor/VisitorResult'; -export interface RuleResult extends VisitorResult { - rule: SchemaRule; -} - -export class SchemaRule implements RuleData, Visitor { +export class SchemaRule implements RuleData, Visitor { public readonly check: ValidateFunction; public readonly desc: string; public readonly filter?: ValidateFunction; @@ -47,16 +43,15 @@ export class SchemaRule implements RuleData, Visitor { return items; } - public async visit(ctx: VisitorContext, node: any): Promise { + public async visit(ctx: VisitorContext, node: any): Promise { ctx.logger.debug({ item: node, rule: this }, 'visiting node'); const check = ctx.compile(this.check); const filter = this.compileFilter(ctx); const errors: Array = []; - const result: RuleResult = { + const result: VisitorResult = { changes: [], errors, - rule: this, }; if (filter(node)) { diff --git a/src/visitor/index.ts b/src/visitor/index.ts index 2aa55c7..34ffd30 100644 --- a/src/visitor/index.ts +++ b/src/visitor/index.ts @@ -1,7 +1,7 @@ import { VisitorContext } from './VisitorContext'; import { VisitorResult } from './VisitorResult'; -export interface Visitor { +export interface Visitor { /** * Select nodes eligible to be visited. **/