feat(visitor): move jsonpath pick to context for modules to use

ssube · Nov 3, 2019 · b99431b · b99431b
1 parent 29e9462
commit b99431b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/src/rule/SchemaRule.ts b/src/rule/SchemaRule.ts
@@ -1,5 +1,4 @@
 import { ValidateFunction } from 'ajv';
-import { JSONPath } from 'jsonpath-plus';
 import { cloneDeep, defaultTo, isNil } from 'lodash';
 import { LogLevel } from 'noicejs';
 
@@ -39,17 +38,13 @@ export class SchemaRule implements RuleData, Visitor<RuleResult> {
   }
 
   public async pick(ctx: VisitorContext, root: any): Promise<Array<any>> {
-    const scopes = JSONPath({
-      json: root,
-      path: this.select,
-    });
+    const items = ctx.pick(this.select, root);
 
-    if (hasItems(scopes)) {
-      return scopes;
+    if (items.length === 0) {
+      ctx.logger.debug('no data selected');
     }
 
-    ctx.logger.debug('no data selected');
-    return [];
+    return items;
   }
 
   public async visit(ctx: VisitorContext, node: any): Promise<RuleResult> {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,5 +1,9 @@
 import { isNil } from 'lodash';
 
+export function doesExist<T>(val: T | null | undefined): val is T {
+  return !isNil(val);
+}
+
 export function hasItems<T>(val: Array<T> | null | undefined): val is Array<T> {
   return (Array.isArray(val) && val.length > 0);
 }

diff --git a/src/visitor/VisitorContext.ts b/src/visitor/VisitorContext.ts
@@ -1,6 +1,8 @@
 import Ajv from 'ajv';
+import { JSONPath } from 'jsonpath-plus';
 import { Logger, logWithLevel } from 'noicejs';
 
+import { doesExist, hasItems } from '../utils';
 import { VisitorError } from './VisitorError';
 import { VisitorResult } from './VisitorResult';
 
@@ -45,6 +47,22 @@ export class VisitorContext implements VisitorContextOptions, VisitorResult {
     this.innerOptions = options.innerOptions;
   }
 
+  public addSchema(name: string, schema: any): void {
+    this.logger.debug({
+      name,
+      schema,
+    }, 'adding ajv schema');
+
+    this.ajv.addSchema({
+      $id: name,
+      definitions: schema,
+    });
+  }
+
+  public compile(schema: any): Ajv.ValidateFunction {
+    return this.ajv.compile(schema);
+  }
+
   public error(...errors: Array<VisitorError>) {
     for (const err of errors) {
       logWithLevel(this.logger, err.level, err.data, err.msg);
@@ -59,19 +77,21 @@ export class VisitorContext implements VisitorContextOptions, VisitorResult {
     return this;
   }
 
-  public compile(schema: any): Ajv.ValidateFunction {
-    return this.ajv.compile(schema);
-  }
+  public pick(path: string, root: any): Array<any> {
+    const items = JSONPath({
+      json: root,
+      path,
+    });
 
-  public addSchema(name: string, schema: any): void {
     this.logger.debug({
-      name,
-      schema,
-    }, 'adding ajv schema');
-
-    this.ajv.addSchema({
-      $id: name,
-      definitions: schema,
-    });
+      items,
+      path,
+    }, 'path query picked items');
+
+    if (hasItems(items)) {
+      return items.filter(doesExist);
+    } else {
+      return [];
+    }
   }
 }