@acodeninja/persist 2.0.0 → 2.1.1

package/README.md

@@ -17,6 +17,7 @@ export class SimpleModel extends Persist.Type.Model {
     static boolean = Persist.Type.Boolean;
     static string = Persist.Type.String;
     static number = Persist.Type.Number;
+    static date = Persist.Type.Date;
 }
 ```
 
@@ -29,6 +30,7 @@ export class SimpleModel extends Persist.Type.Model {
     static requiredBoolean = Persist.Type.Boolean.required;
     static requiredString = Persist.Type.String.required;
     static requiredNumber = Persist.Type.Number.required;
+    static requiredDate = Persist.Type.Date.required;
 }
 ```
 
@@ -41,6 +43,11 @@ export class SimpleModel extends Persist.Type.Model {
     static arrayOfBooleans = Persist.Type.Array.of(Type.Boolean);
     static arrayOfStrings = Persist.Type.Array.of(Type.String);
     static arrayOfNumbers = Persist.Type.Array.of(Type.Number);
+    static arrayOfDates = Persist.Type.Array.of(Type.Date);
+    static requiredArrayOfBooleans = Persist.Type.Array.of(Type.Boolean).required;
+    static requiredArrayOfStrings = Persist.Type.Array.of(Type.String).required;
+    static requiredArrayOfNumbers = Persist.Type.Array.of(Type.Number).required;
+    static requiredArrayOfDates = Persist.Type.Array.of(Type.Date).required;
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acodeninja/persist",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "A JSON based data modelling and persistence module with alternate storage mechanisms.",
   "type": "module",
   "scripts": {
@@ -25,6 +25,7 @@
   "dependencies": {
     "ajv": "^8.16.0",
     "ajv-errors": "^3.0.0",
+    "ajv-formats": "^3.0.1",
     "lunr": "^2.3.9",
     "slugify": "^1.6.6",
     "ulid": "^2.3.0"

package/src/SchemaCompiler.js

@@ -1,6 +1,7 @@
 import Type from './type/index.js';
 import ajv from 'ajv';
 import ajvErrors from 'ajv-errors';
+import ajvFormats from 'ajv-formats';
 
 /**
  * @class SchemaCompiler
@@ -15,6 +16,7 @@ export default class SchemaCompiler {
         const validation = new ajv({allErrors: true});
 
         ajvErrors(validation);
+        ajvFormats(validation);
 
         const schema = {
             type: 'object',
@@ -58,9 +60,17 @@ export default class SchemaCompiler {
 
             schema.properties[name] = {type: property?._type};
 
+            if (property?._format) {
+                schema.properties[name].format = property._format;
+            }
+
             if (property?._type === 'array') {
                 schema.properties[name].items = {type: property?._items._type};
 
+                if (property?._items?._format) {
+                    schema.properties[name].items.format = property?._items._format;
+                }
+
                 if (Type.Model.isModel(property?._items)) {
                     schema.properties[name].items = {
                         type: 'object',
@@ -102,11 +112,14 @@ export class CompiledSchema {
      * @throws {ValidationError}
      */
     static validate(data) {
-        let inputData = data;
+        let inputData = Object.assign({}, data);
+
         if (Type.Model.isModel(data)) {
             inputData = data.toData();
         }
+
         const valid = this._validator?.(inputData);
+
         if (valid) return valid;
 
         throw new ValidationError(inputData, this._validator.errors);

package/src/type/Model.js

@@ -93,6 +93,17 @@ export default class Model {
 
         for (const [name, value] of Object.entries(data)) {
             if (this[name]?._resolved) continue;
+
+            if (this[name].name.endsWith('DateType')) {
+                model[name] = new Date(value);
+                continue;
+            }
+
+            if (this[name].name.endsWith('ArrayOf(Date)Type')) {
+                model[name] = data[name].map(d => new Date(d));
+                continue;
+            }
+
             model[name] = value;
         }
 
@@ -107,9 +118,13 @@ export default class Model {
     }
 
     static isDryModel(possibleDryModel) {
-        return (
-            Object.keys(possibleDryModel).includes('id') &&
-            !!possibleDryModel.id.match(/[A-Za-z]+\/[A-Z0-9]+/)
-        );
+        try {
+            return (
+                Object.keys(possibleDryModel).includes('id') &&
+                !!possibleDryModel.id.match(/[A-Za-z]+\/[A-Z0-9]+/)
+            );
+        } catch (_) {
+            return false;
+        }
     }
 }

package/src/type/complex/ArrayType.js

@@ -7,7 +7,7 @@ export default class ArrayType {
             static _items = type;
 
             static toString() {
-                return `ArrayOf(${type})`;
+                return `ArrayOf(${type.toString()})`;
             }
 
             static get required() {
@@ -25,6 +25,8 @@ export default class ArrayType {
             }
         }
 
+        Object.defineProperty(ArrayOf, 'name', {value: `${ArrayOf.toString()}Type`});
+
         return ArrayOf;
     }
 }

package/src/type/index.js

@@ -1,18 +1,36 @@
 import ArrayType from './complex/ArrayType.js';
 import BooleanType from './simple/BooleanType.js';
 import CustomType from './complex/CustomType.js';
+import DateType from './simple/DateType.js';
 import Model from './Model.js';
 import NumberType from './simple/NumberType.js';
 import SlugType from './resolved/SlugType.js';
 import StringType from './simple/StringType.js';
 
+/**
+ * @class Type
+ * @property {StringType} String
+ * @property {NumberType} Number
+ * @property {BooleanType} Boolean
+ * @property {DateType} Date
+ * @property {ArrayType} Array
+ * @property {CustomType} Custom
+ * @property {ResolvedType} Resolved
+ * @property {Model} Model
+ */
 const Type = {};
 
 Type.String = StringType;
 Type.Number = NumberType;
 Type.Boolean = BooleanType;
+Type.Date = DateType;
 Type.Array = ArrayType;
 Type.Custom = CustomType;
+
+/**
+ * @class ResolvedType
+ * @property {SlugType} Slug
+ */
 Type.Resolved = {Slug: SlugType};
 Type.Model = Model;
 

package/src/type/simple/DateType.js

@@ -0,0 +1,10 @@
+import SimpleType from './SimpleType.js';
+
+export default class DateType extends SimpleType {
+    static _type = 'string';
+    static _format = 'iso-date-time';
+
+    static isDate(possibleDate) {
+        return possibleDate instanceof Date || !isNaN(new Date(possibleDate));
+    }
+}