@hestia-earth/schema-validation 30.6.2 → 30.7.1

package/package.json

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

package/validators/datePattern.d.ts

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

package/validators/datePattern.js

@@ -1,20 +1,4 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = exports.validate = exports.keyword = exports.isValidDate = void 0;
 /**
@@ -25,12 +9,19 @@ exports.init = exports.validate = exports.keyword = exports.isValidDate = void 0
  * @returns
  */
 var isValidDateRange = function (value) {
-    var _a = __read(value.substring(0, 10).split('-').map(Number), 3), year = _a[0], month = _a[1], day = _a[2];
+    var values = value.substring(0, 10).split('-').map(Number);
+    var year = values[0] || 1970;
+    var month = values[1] || 1;
+    var day = values[2] || 1;
     var date = new Date(year, month - 1, day, 12); // Months are 0-indexed
-    return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
+    return (date <= new Date() && // date cannot be in the future
+        date.getFullYear() === year &&
+        date.getMonth() === month - 1 && // Months are 0-indexed
+        date.getDate() === day);
 };
-var isValidDate = function (date) {
-    return isFinite(new Date(date).getTime()) && (date.length < 10 || isValidDateRange(date));
+var isValidDate = function (date, withTime) {
+    if (withTime === void 0) { withTime = true; }
+    return (date.length <= 10 || withTime) && isFinite(new Date(date).getTime()) && isValidDateRange(date);
 };
 exports.isValidDate = isValidDate;
 exports.keyword = 'datePattern';
@@ -38,7 +29,7 @@ var validate = function (_schema, value, _parentSchema, dataPath) {
     var values = Array.isArray(value) ? value : [value];
     var errors = values
         .map(function (v, index) {
-        return (0, exports.isValidDate)(v)
+        return (0, exports.isValidDate)(v, false)
             ? null
             : {
                 dataPath: "".concat(dataPath).concat(Array.isArray(value) ? "[".concat(index, "]") : ''),

package/validators/dateTimePattern.d.ts

@@ -0,0 +1,4 @@
+import { Ajv, SchemaValidateFunction } from 'ajv';
+export declare const keyword = "dateTimePattern";
+export declare const validate: SchemaValidateFunction;
+export declare const init: (ajv: Ajv) => Ajv;

package/validators/dateTimePattern.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = exports.validate = exports.keyword = void 0;
+var datePattern_1 = require("./datePattern");
+exports.keyword = 'dateTimePattern';
+var validate = function (_schema, value, _parentSchema, dataPath) {
+    var values = Array.isArray(value) ? value : [value];
+    var errors = values
+        .map(function (v, index) {
+        return (0, datePattern_1.isValidDate)(v)
+            ? null
+            : {
+                dataPath: "".concat(dataPath).concat(Array.isArray(value) ? "[".concat(index, "]") : ''),
+                keyword: exports.keyword,
+                schemaPath: '#/invalid',
+                message: 'not a valid date',
+                params: {}
+            };
+    })
+        .filter(Boolean);
+    exports.validate.errors = errors;
+    return errors.length === 0;
+};
+exports.validate = validate;
+var init = function (ajv) {
+    return ajv.addKeyword(exports.keyword, {
+        type: ['string', 'array'],
+        errors: 'full',
+        validate: exports.validate
+    });
+};
+exports.init = init;

package/validators/index.d.ts

@@ -1,7 +1,8 @@
 import { Ajv } from 'ajv';
 import { keyword as arraySameSize } from './arraySameSize';
 import { keyword as datePattern } from './datePattern';
+import { keyword as dateTimePattern } from './dateTimePattern';
 import { keyword as geojson } from './geojson';
 import { keyword as uniqueArrayItem } from './uniqueArrayItem';
-export { arraySameSize, datePattern, geojson, uniqueArrayItem };
+export { arraySameSize, datePattern, dateTimePattern, geojson, uniqueArrayItem };
 export declare const init: (ajv: Ajv) => void;

package/validators/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.uniqueArrayItem = exports.geojson = exports.datePattern = exports.arraySameSize = void 0;
+exports.init = exports.uniqueArrayItem = exports.geojson = exports.dateTimePattern = exports.datePattern = exports.arraySameSize = void 0;
 var arraySameSize_1 = require("./arraySameSize");
 Object.defineProperty(exports, "arraySameSize", { enumerable: true, get: function () { return arraySameSize_1.keyword; } });
 var datePattern_1 = require("./datePattern");
 Object.defineProperty(exports, "datePattern", { enumerable: true, get: function () { return datePattern_1.keyword; } });
+var dateTimePattern_1 = require("./dateTimePattern");
+Object.defineProperty(exports, "dateTimePattern", { enumerable: true, get: function () { return dateTimePattern_1.keyword; } });
 var geojson_1 = require("./geojson");
 Object.defineProperty(exports, "geojson", { enumerable: true, get: function () { return geojson_1.keyword; } });
 var uniqueArrayItem_1 = require("./uniqueArrayItem");
@@ -12,6 +14,7 @@ Object.defineProperty(exports, "uniqueArrayItem", { enumerable: true, get: funct
 var init = function (ajv) {
     (0, arraySameSize_1.init)(ajv);
     (0, datePattern_1.init)(ajv);
+    (0, dateTimePattern_1.init)(ajv);
     (0, geojson_1.init)(ajv);
     (0, uniqueArrayItem_1.init)(ajv);
 };