@thednp/shorty 2.0.0-alpha5 → 2.0.0-alpha7

package/src/misc/data.ts

@@ -1,10 +1,6 @@
 import isHTMLElement from '../is/isHTMLElement';
 
-type MConstructor<T extends new (...args: any[]) => any> = new (
-  ...args: ConstructorParameters<T>
-) => InstanceType<T>;
-
-const componentData = new Map<MConstructor<any>, Map<HTMLElement, InstanceType<any>>>();
+const componentData = new Map<string, Map<HTMLElement, any>>();
 
 /**
  * An interface for web components background data.
@@ -19,19 +15,15 @@ const Data = {
    * @param component the component's name or a unique key
    * @param instance the component instance
    */
-  set: <T extends MConstructor<T>>(
-    element: HTMLElement,
-    component: T,
-    instance: InstanceType<T>,
-  ): void => {
+  set: <T>(element: HTMLElement, component: string, instance: T): void => {
     if (!isHTMLElement(element)) return;
 
     /* istanbul ignore else */
     if (!componentData.has(component)) {
-      componentData.set(component, new Map<HTMLElement, InstanceType<T>>());
+      componentData.set(component, new Map<HTMLElement, T>());
     }
 
-    const instanceMap = componentData.get(component) as Map<HTMLElement, InstanceType<T>>;
+    const instanceMap = componentData.get(component) as Map<HTMLElement, T>;
     // not undefined, but defined right above
     instanceMap.set(element, instance);
   },
@@ -42,10 +34,8 @@ const Data = {
    * @param component the component's name or a unique key
    * @returns all the component instances
    */
-  getAllFor: <T extends MConstructor<T>>(
-    component: T,
-  ): Map<HTMLElement, InstanceType<T>> | null => {
-    const instanceMap = componentData.get(component) as Map<HTMLElement, InstanceType<T>>;
+  getAllFor: <T>(component: string): Map<HTMLElement, T> | null => {
+    const instanceMap = componentData.get(component) as Map<HTMLElement, T>;
 
     return instanceMap || null;
   },
@@ -57,9 +47,11 @@ const Data = {
    * @param component the component's name or a unique key
    * @returns the instance
    */
-  get: <T extends MConstructor<T>>(element: HTMLElement, component: T): InstanceType<T> | null => {
+  get: <T>(element: HTMLElement, component: string): T | null => {
     if (!isHTMLElement(element) || !component) return null;
     const instanceMap = Data.getAllFor<T>(component);
+    // const instanceMap = componentData.get(component) as Map<HTMLElement, InstanceType<T>>;
+
     const instance = element && instanceMap && instanceMap.get(element);
 
     // return (instance as T) || null;
@@ -72,8 +64,10 @@ const Data = {
    * @param element target element
    * @param component the component's name or a unique key
    */
-  remove: <T extends MConstructor<T>>(element: HTMLElement, component: T): void => {
+  remove: <T>(element: HTMLElement, component: string): void => {
     const instanceMap = Data.getAllFor<T>(component);
+    // const instanceMap = componentData.get(component) as Map<HTMLElement, InstanceType<T>>;
+
     if (!instanceMap || !isHTMLElement(element)) return;
 
     instanceMap.delete(element);
@@ -85,12 +79,4 @@ const Data = {
   },
 };
 
-/**
- * An alias for `Data.get()`.
- */
-export const getInstance = <T extends MConstructor<T>>(
-  target: HTMLElement,
-  component: T,
-): InstanceType<T> | null => Data.get<T>(target, component);
-
 export default Data;

package/src/misc/getInstance.ts

@@ -0,0 +1,9 @@
+import Data from './data';
+
+/**
+ * An alias for `Data.get()`.
+ */
+const getInstance = <T>(target: HTMLElement, component: string): T | null =>
+  Data.get(target, component);
+
+export default getInstance;

package/src/misc/setElementStyle.ts

@@ -1,7 +1,7 @@
 import ObjectAssign from './ObjectAssign';
 import ObjectEntries from './ObjectEntries';
-import { CSS4Declaration } from '../interface/css4Declaration';
 import isString from '../is/isString';
+import type { CSS4Declaration } from '../interface/css4Declaration';
 
 /**
  * Shortcut for multiple uses of `HTMLElement.style.propertyName` method.

package/src/selectors/getCustomElements.ts

@@ -1,6 +1,6 @@
-import { CustomElement } from '../interface/customElement';
 import isCustomElement from '../is/isCustomElement';
 import getElementsByTagName from './getElementsByTagName';
+import type { CustomElement } from '../interface/customElement';
 
 /**
  * Returns an `Array` of `Node` elements that are registered as

package/src/selectors/querySelector.ts

@@ -1,5 +1,6 @@
 import getDocument from '../get/getDocument';
 import isNode from '../is/isNode';
+import isHTMLElement from '../is/isHTMLElement';
 
 /**
  * Utility to check if target is typeof `HTMLElement`, `Element`, `Node`
@@ -9,13 +10,13 @@ import isNode from '../is/isNode';
  * @param parent optional node to look into
  * @return the `HTMLElement` or `querySelector` result
  */
-const querySelector = (selector: Node | string, parent?: ParentNode): HTMLElement | null => {
-  if (isNode(selector as Node)) {
-    return selector as HTMLElement;
+const querySelector = (selector: HTMLElement | string, parent?: ParentNode): HTMLElement | null => {
+  if (isHTMLElement(selector)) {
+    return selector;
   }
-  const lookUp = parent && isNode(parent) ? parent : getDocument();
+  const lookUp = isNode(parent) ? parent : getDocument();
 
-  return lookUp.querySelector(selector as string);
+  return lookUp.querySelector(selector);
 };
 
 export default querySelector;

package/src/strings/userAgentData.ts

@@ -1,4 +1,4 @@
-import { NavigatorUA } from '../interface/navigatorUA';
+import type { NavigatorUA } from '../interface/navigatorUA';
 
 const uaDATA = (navigator as NavigatorUA).userAgentData;
 

package/src/interface/css4Declaration.ts

@@ -1,3 +0,0 @@
-export interface CSS4Declaration extends Exclude<() => string | symbol, CSSStyleDeclaration> {
-  [key: string]: string;
-}

package/src/interface/originalEvent.ts

@@ -1,4 +0,0 @@
-export interface OriginalEvent extends CustomEvent<any> {
-  readonly type: string;
-  relatedTarget?: EventTarget;
-}