@hestia-earth/schema-validation 32.1.1 → 32.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-validation",
-  "version": "32.1.1",
+  "version": "32.2.0",
   "description": "HESTIA Schema Validation",
   "main": "index.js",
   "typings": "index.d.ts",

package/validators/datePattern.d.ts

@@ -1,4 +1,5 @@
 import { Ajv, SchemaValidateFunction } from 'ajv';
+export declare const isFutureDate: (date: string) => boolean;
 export declare const isValidDate: (date: string, withTime?: boolean) => boolean;
 export declare const keyword = "datePattern";
 export declare const validate: SchemaValidateFunction;

package/validators/datePattern.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.validate = exports.keyword = exports.isValidDate = void 0;
+exports.init = exports.validate = exports.keyword = exports.isValidDate = exports.isFutureDate = void 0;
 var formatDate = function (date) { return new Date("".concat(new Date(date).toJSON().substring(0, 10), "T12:00:00.000Z")); };
 /**
  * JavaScript does a lenient parsing of dates, so even `2000-30-30` will return a date.
@@ -15,11 +15,14 @@ var isValidDateRange = function (value) {
     var month = values[1] || 1;
     var day = values[2] || 1;
     var date = new Date(year, month - 1, day, 12); // Months are 0-indexed
-    return (formatDate(date) <= formatDate(new Date()) && // date cannot be in the future
-        date.getFullYear() === year &&
-        date.getMonth() === month - 1 && // Months are 0-indexed
-        date.getDate() === day);
+    return [
+        date.getFullYear() === year,
+        date.getMonth() === month - 1,
+        date.getDate() === day
+    ].every(Boolean);
 };
+var isFutureDate = function (date) { return formatDate(date) > formatDate(new Date()); };
+exports.isFutureDate = isFutureDate;
 var isValidDate = function (date, withTime) {
     if (withTime === void 0) { withTime = true; }
     return (date.length <= 10 || withTime) && isFinite(new Date(date).getTime()) && isValidDateRange(date);
@@ -31,7 +34,15 @@ var validate = function (_schema, value, _parentSchema, dataPath) {
     var errors = values
         .map(function (v, index) {
         return (0, exports.isValidDate)(v, false)
-            ? null
+            ? (0, exports.isFutureDate)(v)
+                ? {
+                    dataPath: "".concat(dataPath).concat(Array.isArray(value) ? "[".concat(index, "]") : ''),
+                    keyword: exports.keyword,
+                    schemaPath: '#/invalid',
+                    message: 'date cannot be in the future',
+                    params: {}
+                }
+                : null
             : {
                 dataPath: "".concat(dataPath).concat(Array.isArray(value) ? "[".concat(index, "]") : ''),
                 keyword: exports.keyword,

package/validators/dateTimePattern.js

@@ -8,7 +8,15 @@ var validate = function (_schema, value, _parentSchema, dataPath) {
     var errors = values
         .map(function (v, index) {
         return (0, datePattern_1.isValidDate)(v)
-            ? null
+            ? (0, datePattern_1.isFutureDate)(v)
+                ? {
+                    dataPath: "".concat(dataPath).concat(Array.isArray(value) ? "[".concat(index, "]") : ''),
+                    keyword: exports.keyword,
+                    schemaPath: '#/invalid',
+                    message: 'date cannot be in the future',
+                    params: {}
+                }
+                : null
             : {
                 dataPath: "".concat(dataPath).concat(Array.isArray(value) ? "[".concat(index, "]") : ''),
                 keyword: exports.keyword,