Merge pull request #1128 from ssi02014/imp/types

refac: improve types

Author: cure53

dist/purify.cjs.js

@@ -27,12 +27,18 @@ if (!seal) {
   };
 }
 if (!apply) {
-  apply = function apply(fun, thisValue, args) {
-    return fun.apply(thisValue, args);
+  apply = function apply(func, thisArg) {
+    for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+      args[_key - 2] = arguments[_key];
+    }
+    return func.apply(thisArg, args);
   };
 }
 if (!construct) {
-  construct = function construct(Func, args) {
+  construct = function construct(Func) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
+    }
     return new Func(...args);
   };
 }
@@ -61,8 +67,8 @@ function unapply(func) {
     if (thisArg instanceof RegExp) {
       thisArg.lastIndex = 0;
     }
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
+    for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+      args[_key3 - 1] = arguments[_key3];
     }
     return apply(func, thisArg, args);
   };
@@ -73,12 +79,12 @@ function unapply(func) {
  * @param func - The constructor function to be wrapped and called.
  * @returns A new function that constructs an instance of the given constructor function with the provided arguments.
  */
-function unconstruct(func) {
+function unconstruct(Func) {
   return function () {
-    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      args[_key2] = arguments[_key2];
+    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      args[_key4] = arguments[_key4];
     }
-    return construct(func, args);
+    return construct(Func, args);
   };
 }
 /**

dist/purify.cjs.js.map

@@ -1000,15 +1000,12 @@ function createDOMPurify(window: WindowLike = getGlobal()): DOMPurify {
     return typeof Node === 'function' && value instanceof Node;
   };
 
-  function _executeHooks<
-    T extends
-      | NodeHook
-      | ElementHook
-      | DocumentFragmentHook
-      | UponSanitizeElementHook
-      | UponSanitizeAttributeHook
-  >(hooks: T[], currentNode: Parameters<T>[0], data: Parameters<T>[1]): void {
-    arrayForEach(hooks, (hook) => {
+  function _executeHooks<T extends HookFunction>(
+    hooks: HookFunction[],
+    currentNode: Parameters<T>[0],
+    data: Parameters<T>[1]
+  ): void {
+    arrayForEach(hooks, (hook: T) => {
       hook.call(DOMPurify, currentNode, data, CONFIG);
     });
   }
@@ -1132,7 +1129,7 @@ function createDOMPurify(window: WindowLike = getGlobal()): DOMPurify {
       /* Get the element's text content */
       content = currentNode.textContent;
 
-      arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], (expr) => {
+      arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], (expr: RegExp) => {
         content = stringReplace(content, expr, ' ');
       });
 
@@ -1353,7 +1350,7 @@ function createDOMPurify(window: WindowLike = getGlobal()): DOMPurify {
 
       /* Sanitize attribute content to be template-safe */
       if (SAFE_FOR_TEMPLATES) {
-        arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], (expr) => {
+        arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], (expr: RegExp) => {
           value = stringReplace(value, expr, ' ');
         });
       }
@@ -1614,7 +1611,7 @@ function createDOMPurify(window: WindowLike = getGlobal()): DOMPurify {
 
     /* Sanitize final string template-safe */
     if (SAFE_FOR_TEMPLATES) {
-      arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], (expr) => {
+      arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], (expr: RegExp) => {
         serializedHTML = stringReplace(serializedHTML, expr, ' ');
       });
     }
@@ -1645,15 +1642,21 @@ function createDOMPurify(window: WindowLike = getGlobal()): DOMPurify {
     return _isValidAttribute(lcTag, lcName, value);
   };
 
-  DOMPurify.addHook = function (entryPoint, hookFunction) {
+  DOMPurify.addHook = function (
+    entryPoint: keyof HooksMap,
+    hookFunction: HookFunction
+  ) {
     if (typeof hookFunction !== 'function') {
       return;
     }
 
     arrayPush(hooks[entryPoint], hookFunction);
   };
 
-  DOMPurify.removeHook = function (entryPoint, hookFunction) {
+  DOMPurify.removeHook = function (
+    entryPoint: keyof HooksMap,
+    hookFunction: HookFunction
+  ) {
     if (hookFunction !== undefined) {
       const index = arrayLastIndexOf(hooks[entryPoint], hookFunction);
 
@@ -1665,7 +1668,7 @@ function createDOMPurify(window: WindowLike = getGlobal()): DOMPurify {
     return arrayPop(hooks[entryPoint]);
   };
 
-  DOMPurify.removeHooks = function (entryPoint) {
+  DOMPurify.removeHooks = function (entryPoint: keyof HooksMap) {
     hooks[entryPoint] = [];
   };
 
@@ -1950,6 +1953,10 @@ interface HooksMap {
   uponSanitizeAttribute: UponSanitizeAttributeHook[];
 }
 
+type ArrayElement<T> = T extends Array<infer U> ? U : never;
+
+type HookFunction = ArrayElement<HooksMap[keyof HooksMap]>;
+
 export type HookName =
   | BasicHookName
   | ElementHookName

dist/purify.es.mjs

@@ -10,25 +10,29 @@ let { freeze, seal, create } = Object; // eslint-disable-line import/no-mutable-
 let { apply, construct } = typeof Reflect !== 'undefined' && Reflect;
 
 if (!freeze) {
-  freeze = function (x) {
+  freeze = function <T>(x: T): T {
     return x;
   };
 }
 
 if (!seal) {
-  seal = function (x) {
+  seal = function <T>(x: T): T {
     return x;
   };
 }
 
 if (!apply) {
-  apply = function (fun, thisValue, args) {
-    return fun.apply(thisValue, args);
+  apply = function <T>(
+    func: (thisArg: any, ...args: any[]) => T,
+    thisArg: any,
+    ...args: any[]
+  ): T {
+    return func.apply(thisArg, args);
   };
 }
 
 if (!construct) {
-  construct = function (Func, args) {
+  construct = function <T>(Func: new (...args: any[]) => T, ...args: any[]): T {
     return new Func(...args);
   };
 }
@@ -78,8 +82,10 @@ function unapply<T>(
  * @param func - The constructor function to be wrapped and called.
  * @returns A new function that constructs an instance of the given constructor function with the provided arguments.
  */
-function unconstruct<T>(func: (...args: any[]) => T): (...args: any[]) => T {
-  return (...args: any[]): T => construct(func, args);
+function unconstruct<T>(
+  Func: new (...args: any[]) => T
+): (...args: any[]) => T {
+  return (...args: any[]): T => construct(Func, args);
 }
 
 /**