fix: support all cases with one number in range (#64)

webpack · Oct 1, 2019 · 7fc8069 · 7fc8069
1 parent 9cf11ad
commit 7fc8069
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 52 deletions.
diff --git a/src/ValidationError.js b/src/ValidationError.js
@@ -247,6 +247,51 @@ function getSchemaNonTypes(schema) {
   return '';
 }
 
+function numberHints(schema) {
+  const hints = [];
+  const range = new Range();
+
+  if (typeof schema.minimum === 'number') {
+    range.left(schema.minimum);
+  }
+
+  if (typeof schema.exclusiveMinimum === 'number') {
+    range.left(schema.exclusiveMinimum, true);
+  }
+
+  if (typeof schema.maximum === 'number') {
+    range.right(schema.maximum);
+  }
+
+  if (typeof schema.exclusiveMaximum === 'number') {
+    range.right(schema.exclusiveMaximum, true);
+  }
+
+  const rangeFormat = range.format();
+
+  if (rangeFormat) {
+    hints.push(rangeFormat);
+  }
+
+  if (typeof schema.multipleOf === 'number') {
+    hints.push(`should be multiple of ${schema.multipleOf}`);
+  }
+
+  return hints;
+}
+
+function formatHints(hints) {
+  return hints.length > 0 ? `(${hints.join(', ')})` : '';
+}
+
+function getHints(schema) {
+  if (likeNumber(schema) || likeInteger(schema)) {
+    return formatHints(numberHints(schema));
+  }
+
+  return '';
+}
+
 class ValidationError extends Error {
   constructor(errors, schema, configuration = {}) {
     super();
@@ -349,38 +394,10 @@ class ValidationError extends Error {
     }
 
     if (likeNumber(schema) || likeInteger(schema)) {
-      const hints = [];
-      const range = new Range();
-
-      if (typeof schema.minimum === 'number') {
-        range.left(schema.minimum);
-      }
-
-      if (typeof schema.exclusiveMinimum === 'number') {
-        range.left(schema.exclusiveMinimum, true);
-      }
-
-      if (typeof schema.maximum === 'number') {
-        range.right(schema.maximum);
-      }
-
-      if (typeof schema.exclusiveMaximum === 'number') {
-        range.right(schema.exclusiveMaximum, true);
-      }
-
-      const rangeFormat = range.format();
-
-      if (rangeFormat) {
-        hints.push(rangeFormat);
-      }
-
-      if (typeof schema.multipleOf === 'number') {
-        hints.push(`should be multiple of ${schema.multipleOf}`);
-      }
-
       const type = schema.type === 'integer' ? 'integer' : 'number';
+      const hints = getHints(schema);
 
-      return `${type}${hints.length > 0 ? ` (${hints.join(', ')})` : ''}`;
+      return `${type}${hints.length > 0 ? ` ${hints}` : ''}`;
     }
 
     if (likeString(schema)) {
@@ -743,12 +760,19 @@ class ValidationError extends Error {
       case 'minimum':
       case 'maximum':
       case 'exclusiveMinimum':
-      case 'exclusiveMaximum':
-        return `${dataPath} should be ${error.params.comparison} ${
-          error.params.limit
-        }${getSchemaNonTypes(
+      case 'exclusiveMaximum': {
+        const hints = numberHints(error.parentSchema);
+
+        if (hints.length === 0) {
+          hints.push(
+            `should be ${error.params.comparison} ${error.params.limit}`
+          );
+        }
+
+        return `${dataPath} ${hints.join(' ')}${getSchemaNonTypes(
           error.parentSchema
         )}.${this.getSchemaPartDescription(error.parentSchema)}`;
+      }
       case 'multipleOf':
         return `${dataPath} should be multiple of ${
           error.params.multipleOf

diff --git a/src/util/Range.js b/src/util/Range.js
@@ -118,16 +118,12 @@ class Range {
       return '';
     }
 
-    if (leftExclusive === rightExclusive) {
-      // e.g. 5 <= x <= 5
-      if (leftExclusive === false && start === end) {
-        return `should be ${logic ? '' : '!'}= ${start}`;
-      }
+    const realStart = leftExclusive ? start + 1 : start;
+    const realEnd = rightExclusive ? end - 1 : end;
 
-      // e.g. 4 < x < 6
-      if (leftExclusive === true && start + 1 === end - 1) {
-        return `should be ${logic ? '' : '!'}= ${start + 1}`;
-      }
+    // e.g. 5 < x < 7, 5 < x <= 6, 6 <= x <= 6
+    if (realStart === realEnd) {
+      return `should be ${logic ? '' : '!'}= ${realStart}`;
     }
 
     // e.g. 4 < x < ∞

diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
diff --git a/test/fixtures/schema.json b/test/fixtures/schema.json
@@ -2925,6 +2925,11 @@
         "minLength": 2
       }
     },
+    "integerEqualsTo5": {
+      "type": "integer",
+      "minimum": 5,
+      "exclusiveMaximum": 6
+    },
     "integerWithMinimum": {
       "type": "integer",
       "minimum": 5,

diff --git a/test/index.test.js b/test/index.test.js
@@ -1639,6 +1639,14 @@ describe('Validation', () => {
     (msg) => expect(msg).toMatchSnapshot()
   );
 
+  createFailedTestCase(
+    'integer equals to 5',
+    {
+      integerEqualsTo5: 6,
+    },
+    (msg) => expect(msg).toMatchSnapshot()
+  );
+
   createFailedTestCase(
     'integer with minimum',
     {

diff --git a/test/range.test.js b/test/range.test.js
@@ -16,6 +16,14 @@ it('not 5 <= x <= 5', () => {
   expect(range.format(false)).toEqual('should be != 5');
 });
 
+it('5 < x <= 6', () => {
+  const range = new Range();
+  range.left(5, true);
+  range.right(6);
+
+  expect(range.format()).toEqual('should be = 6');
+});
+
 it('-1 < x < 1', () => {
   const range = new Range();
   range.left(-1, true);