@y14e/disclosure 2.0.11 → 2.0.12

package/README.md

@@ -13,11 +13,11 @@ npm i @y14e/disclosure
 import { Disclosure } from "@y14e/disclosure";
 
 // CDNs
-import { Disclosure } from "https://esm.sh/@y14e/disclosure@2.0.11";
+import { Disclosure } from "https://esm.sh/@y14e/disclosure@2.0.12";
 // or
-import { Disclosure } from "https://cdn.jsdelivr.net/npm/@y14e/disclosure@2.0.11/+esm";
+import { Disclosure } from "https://cdn.jsdelivr.net/npm/@y14e/disclosure@2.0.12/+esm";
 // or
-import { Disclosure } from "https://esm.unpkg.com/@y14e/disclosure@2.0.11";
+import { Disclosure } from "https://esm.unpkg.com/@y14e/disclosure@2.0.12";
 ```
 
 ## Usage

package/dist/index.bundle.cjs

@@ -4,12 +4,11 @@
 var DEFAULT_PARSER = (value) => value.split(/\s+/);
 var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
 function addAttributeToken(element, name, token, options = {}) {
+  if (!isValid(element, name, token)) {
+    return;
+  }
   const value = element.getAttribute(name)?.trim();
-  const {
-    caseInsensitive = false,
-    parse = DEFAULT_PARSER,
-    serialize = DEFAULT_SERIALIZER
-  } = options;
+  const { caseInsensitive, parse, serialize } = resolveOptions(options);
   const tokens = value ? parse(value).filter(Boolean) : [];
   if (caseInsensitive) {
     const lower = token.toLowerCase();
@@ -49,6 +48,45 @@ function saveAttributes(element_or_elements, name_or_names) {
     });
   });
 }
+function isValid(element, name, token) {
+  if (!(element instanceof Element)) {
+    console.warn("Invalid element");
+    return false;
+  }
+  if (!element.hasAttribute(name)) {
+    console.warn("Invalid attribute name");
+    return false;
+  }
+  if (typeof token !== "string" || !token.trim()) {
+    console.warn("Invalid token");
+    return false;
+  }
+  return true;
+}
+function resolveOptions(options) {
+  let {
+    caseInsensitive = false,
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
+  } = options;
+  if (typeof caseInsensitive !== "boolean") {
+    console.warn("Invalid caseInsensitive option. Fallback: false.");
+    caseInsensitive = false;
+  }
+  if (typeof parse !== "function") {
+    console.warn(
+      "Invalid parser. Fallback: default parser (splits by whitespace)."
+    );
+    parse = DEFAULT_PARSER;
+  }
+  if (typeof serialize !== "function") {
+    console.warn(
+      "Invalid serializer. Fallback: default serializer (joins by whitespace)."
+    );
+    serialize = DEFAULT_SERIALIZER;
+  }
+  return { caseInsensitive, parse, serialize };
+}
 
 // node_modules/power-focusable/dist/index.js
 var FOCUSABLE_SELECTOR = `:is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])`;
@@ -609,8 +647,8 @@ var Disclosure = class _Disclosure {
       return;
     }
     this.#rootElement = root;
-    this.#defaults = this.#mergeOptions(this.#defaults, _Disclosure.defaults);
-    this.#settings = this.#mergeOptions(this.#defaults, options);
+    this.#defaults = this.#resolveOptions(this.#defaults, _Disclosure.defaults);
+    this.#settings = this.#resolveOptions(this.#defaults, options);
     matchMedia("(prefers-reduced-motion: reduce)").matches && Object.assign(this.#settings.animation, { duration: 0 });
     const NOT_NESTED = ":not(:scope summary + * *)";
     this.#detailsElements = [
@@ -833,7 +871,7 @@ var Disclosure = class _Disclosure {
   #isFocusable(element) {
     return element.tabIndex >= 0;
   }
-  #mergeOptions(target, source) {
+  #resolveOptions(target, source) {
     const merged = {
       ...target,
       ...source,
@@ -882,7 +920,7 @@ function waitAnimationFinish(animation) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.0.11
+ * @version 2.0.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -894,7 +932,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attribute Utils
    *
-   * @version 2.0.5
+   * @version 2.0.6
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.bundle.js

@@ -2,12 +2,11 @@
 var DEFAULT_PARSER = (value) => value.split(/\s+/);
 var DEFAULT_SERIALIZER = (tokens) => tokens.join(" ");
 function addAttributeToken(element, name, token, options = {}) {
+  if (!isValid(element, name, token)) {
+    return;
+  }
   const value = element.getAttribute(name)?.trim();
-  const {
-    caseInsensitive = false,
-    parse = DEFAULT_PARSER,
-    serialize = DEFAULT_SERIALIZER
-  } = options;
+  const { caseInsensitive, parse, serialize } = resolveOptions(options);
   const tokens = value ? parse(value).filter(Boolean) : [];
   if (caseInsensitive) {
     const lower = token.toLowerCase();
@@ -47,6 +46,45 @@ function saveAttributes(element_or_elements, name_or_names) {
     });
   });
 }
+function isValid(element, name, token) {
+  if (!(element instanceof Element)) {
+    console.warn("Invalid element");
+    return false;
+  }
+  if (!element.hasAttribute(name)) {
+    console.warn("Invalid attribute name");
+    return false;
+  }
+  if (typeof token !== "string" || !token.trim()) {
+    console.warn("Invalid token");
+    return false;
+  }
+  return true;
+}
+function resolveOptions(options) {
+  let {
+    caseInsensitive = false,
+    parse = DEFAULT_PARSER,
+    serialize = DEFAULT_SERIALIZER
+  } = options;
+  if (typeof caseInsensitive !== "boolean") {
+    console.warn("Invalid caseInsensitive option. Fallback: false.");
+    caseInsensitive = false;
+  }
+  if (typeof parse !== "function") {
+    console.warn(
+      "Invalid parser. Fallback: default parser (splits by whitespace)."
+    );
+    parse = DEFAULT_PARSER;
+  }
+  if (typeof serialize !== "function") {
+    console.warn(
+      "Invalid serializer. Fallback: default serializer (joins by whitespace)."
+    );
+    serialize = DEFAULT_SERIALIZER;
+  }
+  return { caseInsensitive, parse, serialize };
+}
 
 // node_modules/power-focusable/dist/index.js
 var FOCUSABLE_SELECTOR = `:is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])`;
@@ -607,8 +645,8 @@ var Disclosure = class _Disclosure {
       return;
     }
     this.#rootElement = root;
-    this.#defaults = this.#mergeOptions(this.#defaults, _Disclosure.defaults);
-    this.#settings = this.#mergeOptions(this.#defaults, options);
+    this.#defaults = this.#resolveOptions(this.#defaults, _Disclosure.defaults);
+    this.#settings = this.#resolveOptions(this.#defaults, options);
     matchMedia("(prefers-reduced-motion: reduce)").matches && Object.assign(this.#settings.animation, { duration: 0 });
     const NOT_NESTED = ":not(:scope summary + * *)";
     this.#detailsElements = [
@@ -831,7 +869,7 @@ var Disclosure = class _Disclosure {
   #isFocusable(element) {
     return element.tabIndex >= 0;
   }
-  #mergeOptions(target, source) {
+  #resolveOptions(target, source) {
     const merged = {
       ...target,
       ...source,
@@ -880,7 +918,7 @@ function waitAnimationFinish(animation) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.0.11
+ * @version 2.0.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -892,7 +930,7 @@ function waitAnimationFinish(animation) {
   (**
    * Attribute Utils
    *
-   * @version 2.0.5
+   * @version 2.0.6
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.cjs

@@ -53,8 +53,8 @@ var Disclosure = class _Disclosure {
       return;
     }
     this.#rootElement = root;
-    this.#defaults = this.#mergeOptions(this.#defaults, _Disclosure.defaults);
-    this.#settings = this.#mergeOptions(this.#defaults, options);
+    this.#defaults = this.#resolveOptions(this.#defaults, _Disclosure.defaults);
+    this.#settings = this.#resolveOptions(this.#defaults, options);
     matchMedia("(prefers-reduced-motion: reduce)").matches && Object.assign(this.#settings.animation, { duration: 0 });
     const NOT_NESTED = ":not(:scope summary + * *)";
     this.#detailsElements = [
@@ -277,7 +277,7 @@ var Disclosure = class _Disclosure {
   #isFocusable(element) {
     return element.tabIndex >= 0;
   }
-  #mergeOptions(target, source) {
+  #resolveOptions(target, source) {
     const merged = {
       ...target,
       ...source,
@@ -326,7 +326,7 @@ function waitAnimationFinish(animation) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.0.11
+ * @version 2.0.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts

@@ -3,7 +3,7 @@
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.0.11
+ * @version 2.0.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.0.11
+ * @version 2.0.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -31,8 +31,8 @@ var Disclosure = class _Disclosure {
       return;
     }
     this.#rootElement = root;
-    this.#defaults = this.#mergeOptions(this.#defaults, _Disclosure.defaults);
-    this.#settings = this.#mergeOptions(this.#defaults, options);
+    this.#defaults = this.#resolveOptions(this.#defaults, _Disclosure.defaults);
+    this.#settings = this.#resolveOptions(this.#defaults, options);
     matchMedia("(prefers-reduced-motion: reduce)").matches && Object.assign(this.#settings.animation, { duration: 0 });
     const NOT_NESTED = ":not(:scope summary + * *)";
     this.#detailsElements = [
@@ -255,7 +255,7 @@ var Disclosure = class _Disclosure {
   #isFocusable(element) {
     return element.tabIndex >= 0;
   }
-  #mergeOptions(target, source) {
+  #resolveOptions(target, source) {
     const merged = {
       ...target,
       ...source,
@@ -304,7 +304,7 @@ function waitAnimationFinish(animation) {
  * WAI-ARIA compliant disclosure pattern implementation in TypeScript.
  * Using the <details> and <summary> element.
  *
- * @version 2.0.11
+ * @version 2.0.12
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/disclosure",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "WAI-ARIA compliant disclosure pattern implementation in TypeScript",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -54,7 +54,7 @@
     "esbuild": true
   },
   "dependencies": {
-    "@y14e/attribute-utils": "^2.0.5",
+    "@y14e/attribute-utils": "^2.0.6",
     "@y14e/roving-tabindex": "^3.1.25"
   }
 }