@cocreate/utils 1.25.4 → 1.26.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.26.1](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.26.0...v1.26.1) (2023-10-24)
+
+
+### Bug Fixes
+
+* initialize counter with a random number from 1000 - 5000 ([0d82bf2](https://github.com/CoCreate-app/CoCreate-utils/commit/0d82bf289743a5db7ab431261b3ff343f9cc6c19))
+
+# [1.26.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.25.4...v1.26.0) (2023-10-22)
+
+
+### Features
+
+* ObjectId() returns an object containg the parts iof the _id along with a toString() function ([9cd7b81](https://github.com/CoCreate-app/CoCreate-utils/commit/9cd7b817282af1e0b3adaab7df5d059df2f1c0bc))
+
 ## [1.25.4](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.25.3...v1.25.4) (2023-10-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/utils",
-  "version": "1.25.4",
+  "version": "1.26.1",
   "description": "A simple utils component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "utils",

package/src/index.js

@@ -42,22 +42,43 @@
     /**
      * 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
+    let counter = 0;
+    function ObjectId(inputId) {
+        if (inputId && /^[0-9a-fA-F]{24}$/.test(inputId)) {
+            // If a valid ObjectId is provided, return it as a custom ObjectId object
+            return {
+                timestamp: inputId.substring(0, 8),
+                processId: inputId.substring(8, 20),
+                counter: inputId.substring(20),
+                toString: function () {
+                    return this.timestamp + this.processId + this.counter;
+                }
+            };
+        } else if (inputId) {
+            throw new Error('Invalid ObjectId provided.');
+        }
+
+        // Generate a new custom ObjectId
+        const timestampHex = Math.floor(Date.now() / 1000).toString(16).padStart(8, '0');
+        const processIdHex = Math.floor(Math.random() * 0x100000000000).toString(16).padStart(12, '0');
+
+        counter = (counter + 1) % 10000;
+        if (counter < 2) {
+            counter = Math.floor(Math.random() * (5000 - 100 + 1)) + 100;
         }
-    };
+
+        const counterHex = counter.toString(16).padStart(4, '0');
+
+        // Return the custom ObjectId object with a toString() method
+        return {
+            timestamp: timestampHex,
+            processId: processIdHex,
+            counter: counterHex,
+            toString: function () {
+                return this.timestamp + this.processId + this.counter;
+            }
+        };
+    }
 
     function checkValue(value) {
         if (/{{\s*([\w\W]+)\s*}}/g.test(value))