Merge branch 'dev'

Author: frankpagan

src/index.js

@@ -39,8 +39,25 @@
 
     }
 
-    const ObjectId = (rnd = r16 => Math.floor(r16).toString(16)) =>
-        rnd(Date.now() / 1000) + ' '.repeat(16).replace(/./g, () => rnd(Math.random() * 16));
+    /**
+     * Generates an ObjectId
+     */
+    const ObjectId = (id) => {
+        // Define the rnd function
+        const rnd = (r16) => Math.floor(r16).toString(16);
+
+        if (id === undefined) {
+            // If id is undefined, generate a new ObjectId
+            return rnd(Date.now() / 1000) + '0'.repeat(16).replace(/./g, () => rnd(Math.random() * 16));
+        } else {
+            // Check if the provided id is a valid ObjectId
+            const validIdRegex = /^[0-9a-fA-F]{24}$/;
+            if (!validIdRegex.test(id)) {
+                throw new Error('Invalid ObjectId');
+            }
+            return id; // Return the valid ObjectId as a string
+        }
+    };
 
     function checkValue(value) {
         if (/{{\s*([\w\W]+)\s*}}/g.test(value))
@@ -49,10 +66,28 @@
             return true
     }
 
+    function isValidDate(value) {
+        // Check if the value is a string and can be converted to a Date object
+        if (typeof value === 'string'
+            && !isNaN(value)
+            && !(/^[0-9a-fA-F]{24}$/.test(value))
+            && !(/^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?Z|Mon|Tue|Wed|Thu|Fri|Sat|Sun [A-Za-z]{3} \d{2} \d{4} \d{2}:\d{2}:\d{2} [A-Za-z]{3} \+\d{4}|\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}(\.\d{1,3})?|\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(\.\d{1,3})?|\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}(\.\d{1,3})?|Sun|Mon|Tue|Wed|Thu|Fri|Sat),? .+$/.test(value))
+        ) {
+            const dateObject = new Date(value);
+
+            // Check if the result of the Date constructor is a valid Date object
+            if (!isNaN(dateObject) && dateObject.toString() !== 'Invalid Date') {
+                return dateObject; // It's a valid Date object
+            }
+        }
+
+        return value; // It's not a valid Date object
+    }
+
     function dotNotationToObject(data, obj = {}) {
         try {
             for (const key of Object.keys(data)) {
-                let value = data[key]
+                let value = isValidDate(data[key])
                 let newObject = obj
                 let oldObject = new Object(obj)
                 let keys = key.split('.');
@@ -602,6 +637,7 @@
     return {
         ObjectId,
         checkValue,
+        isValidDate,
         dotNotationToObject,
         getValueFromObject,
         isObjectEmpty,