Move query key definition out of parsers

TRUEPIC · Jul 23, 2019 · bf66b69 · bf66b69
1 parent 1f19103
commit bf66b69
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 21 deletions.
diff --git a/src/filterer.js b/src/filterer.js
@@ -8,7 +8,7 @@ class Filterer {
   }
 
   get queryKey() {
-    return FilterParser.QUERY_KEY
+    return 'filter'
   }
 
   get query() {
@@ -42,6 +42,7 @@ class Filterer {
   parse() {
     if (!this._filters) {
       const parser = new FilterParser(
+        this.queryKey,
         this.query || this.querier.defaultFilter,
         this.querier.schema,
         {

diff --git a/src/pager.js b/src/pager.js
@@ -8,7 +8,7 @@ class Pager {
   }
 
   get queryKey() {
-    return PageParser.QUERY_KEY
+    return 'page'
   }
 
   get query() {
@@ -50,6 +50,7 @@ class Pager {
       this._page = false
     } else if (this._page === null) {
       const parser = new PageParser(
+        this.queryKey,
         this.query || this.querier.defaultPage,
         this.querier.schema,
         this.querier.pageDefaults

diff --git a/src/parsers/base.js b/src/parsers/base.js
@@ -4,16 +4,13 @@ const NotImplementedError = require('../errors/not_implemented')
 const ValidationError = require('../errors/validation')
 
 class BaseParser {
-  constructor(query, schema, defaults = {}) {
+  constructor(queryKey, query, schema, defaults = {}) {
+    this.queryKey = queryKey
     this.query = query
     this.schema = schema
     this.defaults = defaults
   }
 
-  static get QUERY_KEY() {
-    throw new NotImplementedError()
-  }
-
   buildValidationSchema(schema) {
     throw new NotImplementedError()
   }
@@ -49,7 +46,7 @@ class BaseParser {
     const path = detail.path.reduce(
       (accumulator, value, index) =>
         index === 0 ? `${accumulator}:${value}` : `${accumulator}[${value}]`,
-      this.constructor.QUERY_KEY
+      this.queryKey
     )
 
     const message = detail.message.replace(/^".*?" /, '')

diff --git a/src/parsers/filter.js b/src/parsers/filter.js
@@ -3,10 +3,6 @@ const is = require('is')
 const BaseParser = require('./base')
 
 class FilterParser extends BaseParser {
-  static get QUERY_KEY() {
-    return 'filter'
-  }
-
   static get DEFAULTS() {
     return {
       field: null,

diff --git a/src/parsers/page.js b/src/parsers/page.js
@@ -3,10 +3,6 @@ const is = require('is')
 const BaseParser = require('./base')
 
 class PageParser extends BaseParser {
-  static get QUERY_KEY() {
-    return 'page'
-  }
-
   static get DEFAULTS() {
     return {
       size: 20,

diff --git a/src/parsers/sort.js b/src/parsers/sort.js
@@ -3,10 +3,6 @@ const is = require('is')
 const BaseParser = require('./base')
 
 class SortParser extends BaseParser {
-  static get QUERY_KEY() {
-    return 'sort'
-  }
-
   static get DEFAULTS() {
     return {
       field: null,

diff --git a/src/sorter.js b/src/sorter.js
@@ -8,7 +8,7 @@ class Sorter {
   }
 
   get queryKey() {
-    return SortParser.QUERY_KEY
+    return 'sort'
   }
 
   get query() {
@@ -42,6 +42,7 @@ class Sorter {
   parse() {
     if (!this._sorts) {
       const parser = new SortParser(
+        this.queryKey,
         this.query || this.querier.defaultSort,
         this.querier.schema,
         this.querier.sortDefaults