add-to-calendar-button 2.2.1 → 2.2.2

package/dist/commonjs/index.js

@@ -7,15 +7,15 @@ const tzlibActions = require('timezones-ical-library');
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.2.1
+ *  Version: 2.2.2
  *  Creator: Jens Kuerschner (https://jenskuerschner.de)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.2.1';
-const atcbCssTemplate = {
+const atcbVersion = '2.2.2';
+const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
   } else {
@@ -173,7 +173,8 @@ const atcbWcBooleanParams = [
   'disabled',
   'hidden',
 ];
-const atcbWcObjectParams = ['dates', 'customLabels', 'ty', 'rsvp'];
+const atcbWcObjectParams = ['customLabels', 'ty', 'rsvp'];
+const atcbWcObjectArrayParams = ['dates'];
 const atcbWcArrayParams = ['images', 'options'];
 const atcbIcon = {
   trigger:
@@ -590,17 +591,16 @@ function atcb_decorate_data_button_status_handling(data) {
 }
 
 
-function atcb_check_required(data, throwError = true) {
+function atcb_check_required(data) {
+  if (data.validationError) {
+    data.validationError = null;
+  }
   if (data.options == null || data.options.length < 1) {
-    if (throwError) {
-      throw new Error('Add to Calendar Button generation failed: no valid options set');
-    }
+    data.validationError = 'Add to Calendar Button generation failed: no valid options set';
     return false;
   }
   if (data.name == null || data.name == '') {
-    if (throwError) {
-      throw new Error('Add to Calendar Button generation failed: required name information missing');
-    }
+    data.validationError = 'Add to Calendar Button generation failed: required name information missing';
     return false;
   }
   if (data.dates != null && data.dates.length > 0) {
@@ -612,9 +612,7 @@ function atcb_check_required(data, throwError = true) {
           (!requiredMultiFieldFlex.includes(`${field}`) && (data.dates[`${i}`][`${field}`] == null || data.dates[`${i}`][`${field}`] == '')) ||
           (requiredMultiFieldFlex.includes(`${field}`) && (data.dates[`${i}`][`${field}`] == null || data.dates[`${i}`][`${field}`] == '') && (data[`${field}`] == null || data[`${field}`] == ''))
         ) {
-          if (throwError) {
-            throw new Error('Add to Calendar Button generation failed: required setting missing [dates array object #' + (i + 1) + '/' + data.dates.length + '] => [' + field + ']');
-          }
+          data.validationError = 'Add to Calendar Button generation failed: required setting missing [dates array object #' + (i + 1) + '/' + data.dates.length + '] => [' + field + ']';
           return false;
         }
       }
@@ -624,9 +622,7 @@ function atcb_check_required(data, throwError = true) {
     const requiredSingleField = ['startDate'];
     return requiredSingleField.every(function (field) {
       if (data[`${field}`] == null || data[`${field}`] == '') {
-        if (throwError) {
-          throw new Error('Add to Calendar Button generation failed: required setting missing [' + field + ']');
-        }
+        data.validationError = 'Add to Calendar Button generation failed: required setting missing [' + field + ']';
         return false;
       }
       return true;
@@ -2468,8 +2464,12 @@ function atcb_rewrite_html_elements(content, clear = false) {
   } else {
     content = content.replace(/\[(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]/gi, '<$1$2>');
     content = content.replace(/\{(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}/gi, '<$1$2>');
-    content = content.replace(/\[url\]([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\[\/url\]/gi, function (match, p1) { return atcb_parse_url_code(p1); });
-    content = content.replace(/\{url\}([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\{\/url\}/gi, function (match, p1) { return atcb_parse_url_code(p1); });
+    content = content.replace(/\[url\]([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\[\/url\]/gi, function (match, p1) {
+      return atcb_parse_url_code(p1);
+    });
+    content = content.replace(/\{url\}([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\{\/url\}/gi, function (match, p1) {
+      return atcb_parse_url_code(p1);
+    });
   }
   return content;
 }
@@ -3102,9 +3102,8 @@ const i18nStrings = {
 };
 const availableLanguages = Object.keys(i18nStrings);
 function atcb_translate_hook(identifier, data) {
-  const searchKey = identifier.replace(/\s+/g, '').toLowerCase();
-  if (data.customLabels != null && data.customLabels[`${searchKey}`] != null && data.customLabels[`${searchKey}`] != '') {
-    return atcb_rewrite_html_elements(data.customLabels[`${searchKey}`]);
+  if (data.customLabels != null && data.customLabels[`${identifier}`] != null && data.customLabels[`${identifier}`] != '') {
+    return atcb_rewrite_html_elements(data.customLabels[`${identifier}`]);
   } else {
     return atcb_translate(identifier, data.language);
   }
@@ -3147,9 +3146,8 @@ if (isBrowser()) {
         } catch (e) {
           if (this.debug) {
             atcb_render_debug_msg(this.shadowRoot, e);
-            console.error(e);
-            return;
           }
+          return;
         }
         this.data.proKey = '';
       }
@@ -3179,9 +3177,8 @@ if (isBrowser()) {
       } catch (e) {
         if (this.debug) {
           atcb_render_debug_msg(this.shadowRoot, e);
-          console.error(e);
-          return;
         }
+        return;
       }
     }
     disconnectedCallback() {
@@ -3222,9 +3219,8 @@ if (isBrowser()) {
       } catch (e) {
         if (this.debug) {
           atcb_render_debug_msg(this.shadowRoot, e);
-          console.error(e);
-          return;
         }
+        return;
       }
       this.data.identifier = this.identifier;
       try {
@@ -3232,9 +3228,8 @@ if (isBrowser()) {
       } catch (e) {
         if (this.debug) {
           atcb_render_debug_msg(this.shadowRoot, e);
-          console.error(e);
-          return;
         }
+        return;
       }
     }
   }
@@ -3258,6 +3253,14 @@ function atcb_read_attributes(el) {
         }
       } else if (atcbWcObjectParams.includes(attr)) {
         val = JSON.parse(inputVal);
+      } else if (atcbWcObjectArrayParams.includes(attr)) {
+        const cleanedInput = (function () {
+          if (inputVal.substring(0, 1) != '[') {
+            return '[' + inputVal + ']';
+          }
+          return inputVal;
+        })();
+        val = JSON.parse(cleanedInput);
       } else if (atcbWcArrayParams.includes(attr)) {
         const cleanedInput = (function () {
           let newVal = inputVal;
@@ -3288,7 +3291,7 @@ function atcb_read_attributes(el) {
       data['identifier'] = atcb_secure_content(identifierAttr.replace(/(\r\n|\n|\r)/g, ''), false);
     }
   }
-  if (!atcb_check_required(data, false)) {
+  if (!atcb_check_required(data)) {
     const slotInput = el.innerHTML;
     const atcbJsonInput = (function () {
       if (slotInput != '') {
@@ -3301,6 +3304,7 @@ function atcb_read_attributes(el) {
       return '';
     })();
     if (atcbJsonInput.length == 0) {
+      console.error(data.validationError);
       throw new Error('Add to Calendar Button generation failed: no data provided or missing required fields - see console logs for details');
     }
     data = atcbJsonInput;
@@ -3308,26 +3312,24 @@ function atcb_read_attributes(el) {
   return data;
 }
 function atcb_build_button(host, data, debug = false) {
-  if (atcb_check_required(data)) {
-    data = atcb_decorate_data(data);
-    if (atcb_validate(data)) {
-      const rootObj = host.querySelector('.atcb-initialized');
-      atcb_set_light_mode(host, data);
-      rootObj.setAttribute('lang', data.language);
-      atcb_load_css(host, rootObj, data.buttonStyle, data.inline, data.buttonsList, data.customCss);
-      atcb_setup_state_management(data);
-      atcb_set_global_event_listener(host, data);
-      atcb_init_log(data.proKey, debug);
-      atcb_generate_button(host, rootObj, data, debug);
-      if (!data.hideRichData && data.name && data.dates[0].location && data.dates[0].startDate) {
-        atcb_generate_rich_data(data, host.host);
-        data.schemaEl = host.host.previousSibling;
-      }
-      atcb_log_event('initialization', data.identifier, data.identifier);
-    } else if (debug) {
-      console.error(data.validationError);
-      atcb_render_debug_msg(host, data.validationError);
-    }
+  data = atcb_decorate_data(data);
+  if (atcb_validate(data)) {
+    const rootObj = host.querySelector('.atcb-initialized');
+    atcb_set_light_mode(host, data);
+    rootObj.setAttribute('lang', data.language);
+    atcb_load_css(host, rootObj, data.buttonStyle, data.inline, data.buttonsList, data.customCss);
+    atcb_setup_state_management(data);
+    atcb_set_global_event_listener(host, data);
+    atcb_init_log(data.proKey, debug);
+    atcb_generate_button(host, rootObj, data, debug);
+    if (!data.hideRichData && data.name && data.dates[0].location && data.dates[0].startDate) {
+      atcb_generate_rich_data(data, host.host);
+      data.schemaEl = host.host.previousSibling;
+    }
+    atcb_log_event('initialization', data.identifier, data.identifier);
+  } else if (debug) {
+    console.error(data.validationError);
+    throw new Error(data.validationError);
   }
 }
 function atcb_cleanup(host, data) {
@@ -3453,7 +3455,8 @@ function atcb_action(data, triggerElement, keyboardTrigger = false) {
   }
   data.debug = data.debug === 'true';
   if (!atcb_check_required(data)) {
-    throw new Error('Add to Calendar Button generation failed: required data missing; see console logs');
+    console.error(data.validationError);
+    return;
   }
   data = atcb_decorate_data(data);
   let root = document.body;
@@ -3478,7 +3481,8 @@ function atcb_action(data, triggerElement, keyboardTrigger = false) {
     data.listStyle = 'modal';
   }
   if (!atcb_validate(data)) {
-    throw new Error('Add to Calendar Button generation (' + data.identifier + ') failed: invalid data; see console logs');
+    console.error(data.validationError);
+    return;
   }
   const oneOption = (function () {
     if (data.options.length === 1) {

package/dist/module/index.js

@@ -6,15 +6,15 @@ import { tzlib_get_ical_block, tzlib_get_offset, tzlib_get_timezones } from 'tim
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.2.1
+ *  Version: 2.2.2
  *  Creator: Jens Kuerschner (https://jenskuerschner.de)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.2.1';
-const atcbCssTemplate = {
+const atcbVersion = '2.2.2';
+const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
   } else {
@@ -172,7 +172,8 @@ const atcbWcBooleanParams = [
   'disabled',
   'hidden',
 ];
-const atcbWcObjectParams = ['dates', 'customLabels', 'ty', 'rsvp'];
+const atcbWcObjectParams = ['customLabels', 'ty', 'rsvp'];
+const atcbWcObjectArrayParams = ['dates'];
 const atcbWcArrayParams = ['images', 'options'];
 const atcbIcon = {
   trigger:
@@ -589,17 +590,16 @@ function atcb_decorate_data_button_status_handling(data) {
 }
 
 
-function atcb_check_required(data, throwError = true) {
+function atcb_check_required(data) {
+  if (data.validationError) {
+    data.validationError = null;
+  }
   if (data.options == null || data.options.length < 1) {
-    if (throwError) {
-      throw new Error('Add to Calendar Button generation failed: no valid options set');
-    }
+    data.validationError = 'Add to Calendar Button generation failed: no valid options set';
     return false;
   }
   if (data.name == null || data.name == '') {
-    if (throwError) {
-      throw new Error('Add to Calendar Button generation failed: required name information missing');
-    }
+    data.validationError = 'Add to Calendar Button generation failed: required name information missing';
     return false;
   }
   if (data.dates != null && data.dates.length > 0) {
@@ -611,9 +611,7 @@ function atcb_check_required(data, throwError = true) {
           (!requiredMultiFieldFlex.includes(`${field}`) && (data.dates[`${i}`][`${field}`] == null || data.dates[`${i}`][`${field}`] == '')) ||
           (requiredMultiFieldFlex.includes(`${field}`) && (data.dates[`${i}`][`${field}`] == null || data.dates[`${i}`][`${field}`] == '') && (data[`${field}`] == null || data[`${field}`] == ''))
         ) {
-          if (throwError) {
-            throw new Error('Add to Calendar Button generation failed: required setting missing [dates array object #' + (i + 1) + '/' + data.dates.length + '] => [' + field + ']');
-          }
+          data.validationError = 'Add to Calendar Button generation failed: required setting missing [dates array object #' + (i + 1) + '/' + data.dates.length + '] => [' + field + ']';
           return false;
         }
       }
@@ -623,9 +621,7 @@ function atcb_check_required(data, throwError = true) {
     const requiredSingleField = ['startDate'];
     return requiredSingleField.every(function (field) {
       if (data[`${field}`] == null || data[`${field}`] == '') {
-        if (throwError) {
-          throw new Error('Add to Calendar Button generation failed: required setting missing [' + field + ']');
-        }
+        data.validationError = 'Add to Calendar Button generation failed: required setting missing [' + field + ']';
         return false;
       }
       return true;
@@ -2467,8 +2463,12 @@ function atcb_rewrite_html_elements(content, clear = false) {
   } else {
     content = content.replace(/\[(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\]/gi, '<$1$2>');
     content = content.replace(/\{(\/|)(br|hr|p|b|strong|u|i|em|li|ul|ol|h\d)\}/gi, '<$1$2>');
-    content = content.replace(/\[url\]([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\[\/url\]/gi, function (match, p1) { return atcb_parse_url_code(p1); });
-    content = content.replace(/\{url\}([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\{\/url\}/gi, function (match, p1) { return atcb_parse_url_code(p1); });
+    content = content.replace(/\[url\]([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\[\/url\]/gi, function (match, p1) {
+      return atcb_parse_url_code(p1);
+    });
+    content = content.replace(/\{url\}([\w&$+.,:;=~!*'?@^%#|\s\-()/]*)\{\/url\}/gi, function (match, p1) {
+      return atcb_parse_url_code(p1);
+    });
   }
   return content;
 }
@@ -3101,9 +3101,8 @@ const i18nStrings = {
 };
 const availableLanguages = Object.keys(i18nStrings);
 function atcb_translate_hook(identifier, data) {
-  const searchKey = identifier.replace(/\s+/g, '').toLowerCase();
-  if (data.customLabels != null && data.customLabels[`${searchKey}`] != null && data.customLabels[`${searchKey}`] != '') {
-    return atcb_rewrite_html_elements(data.customLabels[`${searchKey}`]);
+  if (data.customLabels != null && data.customLabels[`${identifier}`] != null && data.customLabels[`${identifier}`] != '') {
+    return atcb_rewrite_html_elements(data.customLabels[`${identifier}`]);
   } else {
     return atcb_translate(identifier, data.language);
   }
@@ -3146,9 +3145,8 @@ if (isBrowser()) {
         } catch (e) {
           if (this.debug) {
             atcb_render_debug_msg(this.shadowRoot, e);
-            console.error(e);
-            return;
           }
+          return;
         }
         this.data.proKey = '';
       }
@@ -3178,9 +3176,8 @@ if (isBrowser()) {
       } catch (e) {
         if (this.debug) {
           atcb_render_debug_msg(this.shadowRoot, e);
-          console.error(e);
-          return;
         }
+        return;
       }
     }
     disconnectedCallback() {
@@ -3221,9 +3218,8 @@ if (isBrowser()) {
       } catch (e) {
         if (this.debug) {
           atcb_render_debug_msg(this.shadowRoot, e);
-          console.error(e);
-          return;
         }
+        return;
       }
       this.data.identifier = this.identifier;
       try {
@@ -3231,9 +3227,8 @@ if (isBrowser()) {
       } catch (e) {
         if (this.debug) {
           atcb_render_debug_msg(this.shadowRoot, e);
-          console.error(e);
-          return;
         }
+        return;
       }
     }
   }
@@ -3257,6 +3252,14 @@ function atcb_read_attributes(el) {
         }
       } else if (atcbWcObjectParams.includes(attr)) {
         val = JSON.parse(inputVal);
+      } else if (atcbWcObjectArrayParams.includes(attr)) {
+        const cleanedInput = (function () {
+          if (inputVal.substring(0, 1) != '[') {
+            return '[' + inputVal + ']';
+          }
+          return inputVal;
+        })();
+        val = JSON.parse(cleanedInput);
       } else if (atcbWcArrayParams.includes(attr)) {
         const cleanedInput = (function () {
           let newVal = inputVal;
@@ -3287,7 +3290,7 @@ function atcb_read_attributes(el) {
       data['identifier'] = atcb_secure_content(identifierAttr.replace(/(\r\n|\n|\r)/g, ''), false);
     }
   }
-  if (!atcb_check_required(data, false)) {
+  if (!atcb_check_required(data)) {
     const slotInput = el.innerHTML;
     const atcbJsonInput = (function () {
       if (slotInput != '') {
@@ -3300,6 +3303,7 @@ function atcb_read_attributes(el) {
       return '';
     })();
     if (atcbJsonInput.length == 0) {
+      console.error(data.validationError);
       throw new Error('Add to Calendar Button generation failed: no data provided or missing required fields - see console logs for details');
     }
     data = atcbJsonInput;
@@ -3307,26 +3311,24 @@ function atcb_read_attributes(el) {
   return data;
 }
 function atcb_build_button(host, data, debug = false) {
-  if (atcb_check_required(data)) {
-    data = atcb_decorate_data(data);
-    if (atcb_validate(data)) {
-      const rootObj = host.querySelector('.atcb-initialized');
-      atcb_set_light_mode(host, data);
-      rootObj.setAttribute('lang', data.language);
-      atcb_load_css(host, rootObj, data.buttonStyle, data.inline, data.buttonsList, data.customCss);
-      atcb_setup_state_management(data);
-      atcb_set_global_event_listener(host, data);
-      atcb_init_log(data.proKey, debug);
-      atcb_generate_button(host, rootObj, data, debug);
-      if (!data.hideRichData && data.name && data.dates[0].location && data.dates[0].startDate) {
-        atcb_generate_rich_data(data, host.host);
-        data.schemaEl = host.host.previousSibling;
-      }
-      atcb_log_event('initialization', data.identifier, data.identifier);
-    } else if (debug) {
-      console.error(data.validationError);
-      atcb_render_debug_msg(host, data.validationError);
-    }
+  data = atcb_decorate_data(data);
+  if (atcb_validate(data)) {
+    const rootObj = host.querySelector('.atcb-initialized');
+    atcb_set_light_mode(host, data);
+    rootObj.setAttribute('lang', data.language);
+    atcb_load_css(host, rootObj, data.buttonStyle, data.inline, data.buttonsList, data.customCss);
+    atcb_setup_state_management(data);
+    atcb_set_global_event_listener(host, data);
+    atcb_init_log(data.proKey, debug);
+    atcb_generate_button(host, rootObj, data, debug);
+    if (!data.hideRichData && data.name && data.dates[0].location && data.dates[0].startDate) {
+      atcb_generate_rich_data(data, host.host);
+      data.schemaEl = host.host.previousSibling;
+    }
+    atcb_log_event('initialization', data.identifier, data.identifier);
+  } else if (debug) {
+    console.error(data.validationError);
+    throw new Error(data.validationError);
   }
 }
 function atcb_cleanup(host, data) {
@@ -3452,7 +3454,8 @@ function atcb_action(data, triggerElement, keyboardTrigger = false) {
   }
   data.debug = data.debug === 'true';
   if (!atcb_check_required(data)) {
-    throw new Error('Add to Calendar Button generation failed: required data missing; see console logs');
+    console.error(data.validationError);
+    return;
   }
   data = atcb_decorate_data(data);
   let root = document.body;
@@ -3477,7 +3480,8 @@ function atcb_action(data, triggerElement, keyboardTrigger = false) {
     data.listStyle = 'modal';
   }
   if (!atcb_validate(data)) {
-    throw new Error('Add to Calendar Button generation (' + data.identifier + ') failed: invalid data; see console logs');
+    console.error(data.validationError);
+    return;
   }
   const oneOption = (function () {
     if (data.options.length === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-to-calendar-button",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "engines": {
     "node": ">=16.18.1",
     "npm": ">=8.19.2"