@cocreate/utils 1.24.2 → 1.25.0

package/.github/workflows/automated.yml

@@ -41,30 +41,4 @@ jobs:
     outputs:
       new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
       new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
-  upload:
-    runs-on: ubuntu-latest
-    needs: release
-    if: needs.release.outputs.new_release_published == 'true'
-    env:
-      VERSION: "${{ needs.release.outputs.new_release_version }}"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: Set npm registry auth
-        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-      - name: Install dependencies
-        run: yarn install
-      - name: Build
-        run: yarn build
-      - name: Set Environment Variables
-        run: |
-          echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
-          echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
-          echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
-      - name: CoCreate Upload
-        run: coc upload
 

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.25.0](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.24.2...v1.25.0) (2023-10-09)
+
+
+### Bug Fixes
+
+* improved validating dates from strings ([a0d6fa1](https://github.com/CoCreate-app/CoCreate-utils/commit/a0d6fa198ee0d5642bc1a51d356216f840aa7aae))
+* ObjectId() retuns an _id string, ObjectId(some_id)  will validate and thorw an error if not valid ([cb50091](https://github.com/CoCreate-app/CoCreate-utils/commit/cb500913969cfcfd2b71c7d730b8358601ebcc2b))
+
+
+### Features
+
+* isValidDate() - validates the string and returns a date object or the original value ([780574b](https://github.com/CoCreate-app/CoCreate-utils/commit/780574be515926896d3c621a0745a1f750cd7487))
+
 ## [1.24.2](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.24.1...v1.24.2) (2023-09-18)
 
 

package/CoCreate.config.js

@@ -1,24 +1,24 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "6143fc94829b690010a5f339",
-                "name": "index.html",
-                "path": "/docs/utils",
-                "pathname": "/docs/utils/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "*",
-                    "general.cocreate.app"
-                ],
-                "directory": "utils",
-                "content-type": "{{content-type}}",
-                "public": "true"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "array": "files",
+            "object": {
+                "_id": "6143fc94829b690010a5f339",
+                "name": "index.html",
+                "path": "/docs/utils",
+                "pathname": "/docs/utils/index.html",
+                "src": "{{./docs/index.html}}",
+                "host": [
+                    "*",
+                    "general.cocreate.app"
+                ],
+                "directory": "utils",
+                "content-type": "{{content-type}}",
+                "public": "true"
+            }
+        }
+    ]
+};

package/docs/index.html

@@ -355,7 +355,6 @@
                     src="/assets/svg/pencil-alt.svg"></i>
             </button>
         </main>
-        <script src="./apikey.js"></script>
         <script src="https://CoCreate.app/dist/CoCreate.js"></script>
     </body>
 </html>

package/package.json

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

package/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,