@cocreate/element-prototype 1.25.0 → 1.26.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.26.0](https://github.com/CoCreate-app/CoCreate-element-prototype/compare/v1.25.0...v1.26.0) (2024-09-21)
+
+
+### Bug Fixes
+
+* removed commented code ([67b9cb4](https://github.com/CoCreate-app/CoCreate-element-prototype/commit/67b9cb43a399b0c856ac8c285b4aa13d3ea93859))
+* valueType default empty string to support startsWith ([4515bc2](https://github.com/CoCreate-app/CoCreate-element-prototype/commit/4515bc2b6a1466eca1d210692002977fa6113540))
+
+
+### Features
+
+* if value-type object and parse fails snitizze to remove any string outside of object and attempt parse again ([9344106](https://github.com/CoCreate-app/CoCreate-element-prototype/commit/93441066dc255bb5becc85594bc5c3d11c1766d5))
+* value-type array.$keys array.$value and array.$entries will return an array from object ([25df40d](https://github.com/CoCreate-app/CoCreate-element-prototype/commit/25df40d1adbbff43f06029b9a22e29f9ec4371c4))
+
 # [1.25.0](https://github.com/CoCreate-app/CoCreate-element-prototype/compare/v1.24.1...v1.25.0) (2024-08-24)
 
 

package/package.json

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

package/src/getValue.js

@@ -26,7 +26,7 @@ const getValue = (element) => {
 
     let prefix = element.getAttribute('value-prefix') || "";
     let suffix = element.getAttribute('value-suffix') || "";
-    let valueType = element.getAttribute('value-type');
+    let valueType = element.getAttribute('value-type') || "";
 
     if (element.type === "checkbox") {
         let inputs = [element]
@@ -178,33 +178,6 @@ const getValue = (element) => {
         }
     }
 
-    // try {
-    //     let replace = element.getAttribute('value-replace');
-    //     let replaceAll = element.getAttribute('value-replaceall');
-
-    //     if (replace || replaceAll) {
-    //         let { regex, replacement } = regexParser(replace || replaceAll)
-    //         if (regex) {
-    //             if (replace)
-    //                 replace = regex
-    //             else if (replaceAll)
-    //                 replaceAll = regex
-    //         }
-
-
-    //         replacement = replacement || element.getAttribute('value-replacement') || "";
-
-    //         if (replacement !== undefined) {
-    //             if (replace)
-    //                 value = value.replace(replace, replacement);
-    //             else
-    //                 value = value.replaceAll(replaceAll, replacement);
-    //         }
-    //     }
-    // } catch (error) {
-    //     console.error('getValue() replace error:', error, element);
-    // }
-
     try {
         let replace = element.getAttribute('value-replace');
         let replaceAll = element.getAttribute('value-replaceall');
@@ -301,19 +274,52 @@ const getValue = (element) => {
     if (uppercase || uppercase === '')
         value = value.toUpperCase()
 
-    if (!Array.isArray(value)) {
-        if (prefix || suffix)
+    // Apply prefix and suffix first, before JSON parsing
+    if (typeof value === 'string' || typeof value === 'number') {
+        if (prefix || suffix) {
             value = prefix + value + suffix;
-
-        if (valueType == 'array')
-            value = [value];
+        }
     }
 
-    if (value && (valueType == 'object' || valueType == 'json')) {
+    // Handle JSON parsing for objects, arrays, or when valueType starts with 'array'
+    if (value && (valueType === 'object' || valueType === 'json' || valueType.startsWith('array'))) {
         try {
-            value = JSON.parse(value)
+            value = JSON.parse(value);
         } catch (error) {
-            value = value
+            const jsonRegex = /(\{[\s\S]*\}|\[[\s\S]*\])/;
+            const match = value.match(jsonRegex);
+
+            if (match) {
+                try {
+                    value = JSON.parse(match[0]);
+                } catch (e) {
+                    console.error('Failed to parse JSON after regex extraction:', e);
+                }
+            } else {
+                console.error('No valid JSON structure found in the string.');
+            }
+        }
+    }
+
+    // Now handle array-specific logic if valueType starts with 'array'
+    if (valueType.startsWith('array')) {
+        if (!Array.isArray(value)) {
+            // If the parsed value is an object, apply array conversion based on operators
+            if (typeof value === 'object') {
+                if (valueType === 'array.$keys') {
+                    value = Object.keys(value);
+                } else if (valueType === 'array.$values') {
+                    value = Object.values(value);
+                } else if (valueType === 'array.$entries') {
+                    value = Object.entries(value);
+                } else {
+                    // Default behavior: wrap the object in an array
+                    value = [value];
+                }
+            } else {
+                // If it's not an object (i.e., a primitive), wrap the value in an array
+                value = [value];
+            }
         }
     }