移除深度合并依赖

packages/artplayer/src/utils/dom.js

@@ -1,51 +0,0 @@
-export function append(parent, child) {
-    if (child instanceof Element) {
-        parent.appendChild(child);
-    } else {
-        parent.insertAdjacentHTML('beforeend', child);
-    }
-    return parent.lastElementChild;
-}
-
-export function insertByIndex(parent, child, index) {
-    const childs = Array.from(parent.children);
-    child.dataset.index = index;
-    const nextChild = childs.find(item => Number(item.dataset.index) >= Number(index));
-    if (nextChild) {
-        nextChild.insertAdjacentElement('beforebegin', child);
-    } else {
-        append(parent, child);
-    }
-    return child;
-}
-
-export function setStyle(element, key, value) {
-    element.style[key] = value;
-    return element;
-}
-
-export function setStyles(element, styles) {
-    Object.keys(styles).forEach(key => {
-        setStyle(element, key, styles[key]);
-    });
-    return element;
-}
-
-export function getStyle(element, key, numberType = true) {
-    const value = window.getComputedStyle(element, null).getPropertyValue(key);
-    return numberType ? parseFloat(value) : value;
-}
-
-export function sublings(target) {
-    return Array.from(target.parentElement.children).filter(item => item !== target);
-}
-
-export function inverseClass(target, className) {
-    sublings(target).forEach(item => item.classList.remove(className));
-    target.classList.add(className);
-}
-
-export function tooltip(target, msg, pos = 'up') {
-    target.setAttribute('data-balloon', msg);
-    target.setAttribute('data-balloon-pos', pos);
-}

packages/artplayer/src/utils/error.js

@@ -1,16 +0,0 @@
-export class ArtPlayerError extends Error {
-    constructor(message, context) {
-        super(message);
-        if (typeof Error.captureStackTrace === 'function') {
-            Error.captureStackTrace(this, context || this.constructor);
-        }
-        this.name = 'ArtPlayerError';
-    }
-}
-
-export function errorHandle(condition, msg) {
-    const isFun = typeof condition === 'function';
-    if (isFun ? !isFun() : !condition) {
-        throw new ArtPlayerError(msg);
-    }
-}

packages/artplayer/src/utils/index.js

@@ -1,6 +1,18 @@
-export * from './error';
-export * from './dom';
-export * from './subtitle';
+export class ArtPlayerError extends Error {
+    constructor(message, context) {
+        super(message);
+        if (typeof Error.captureStackTrace === 'function') {
+            Error.captureStackTrace(this, context || this.constructor);
+        }
+        this.name = 'ArtPlayerError';
+    }
+}
+
+export function errorHandle(condition, msg) {
+    if (!condition) {
+        throw new ArtPlayerError(msg);
+    }
+}
 
 export function clamp(num, a, b) {
     return Math.max(Math.min(num, Math.max(a, b)), Math.min(a, b));
@@ -48,6 +60,109 @@ export function debounce(func, wait, context) {
     fn.clearTimeout = function ct() {
         clearTimeout(timeout);
     };
-
+    
     return fn;
 }
+
+export function isObject(item) {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+export function isElement(item) {
+    return item instanceof Element;
+}
+
+export function mergeDeep(target, source) {
+    const output = Object.assign({}, target);
+    if (isObject(target) && isObject(source)) {
+        Object.keys(source).forEach(key => {
+            const value = source[key];
+            if (isObject(value) && !isElement(value)) {
+                if (!(key in target)) {
+                    Object.assign(output, {
+                        [key]: value,
+                    });
+                } else {
+                    output[key] = mergeDeep(target[key], value);
+                }
+            } else {
+                Object.assign(output, {
+                    [key]: value,
+                });
+            }
+        });
+    }
+    return output;
+}
+
+export function append(parent, child) {
+    if (child instanceof Element) {
+        parent.appendChild(child);
+    } else {
+        parent.insertAdjacentHTML('beforeend', child);
+    }
+    return parent.lastElementChild;
+}
+
+export function insertByIndex(parent, child, index) {
+    const childs = Array.from(parent.children);
+    child.dataset.index = index;
+    const nextChild = childs.find(item => Number(item.dataset.index) >= Number(index));
+    if (nextChild) {
+        nextChild.insertAdjacentElement('beforebegin', child);
+    } else {
+        append(parent, child);
+    }
+    return child;
+}
+
+export function setStyle(element, key, value) {
+    element.style[key] = value;
+    return element;
+}
+
+export function setStyles(element, styles) {
+    Object.keys(styles).forEach(key => {
+        setStyle(element, key, styles[key]);
+    });
+    return element;
+}
+
+export function getStyle(element, key, numberType = true) {
+    const value = window.getComputedStyle(element, null).getPropertyValue(key);
+    return numberType ? parseFloat(value) : value;
+}
+
+export function sublings(target) {
+    return Array.from(target.parentElement.children).filter(item => item !== target);
+}
+
+export function inverseClass(target, className) {
+    sublings(target).forEach(item => item.classList.remove(className));
+    target.classList.add(className);
+}
+
+export function tooltip(target, msg, pos = 'up') {
+    target.setAttribute('data-balloon', msg);
+    target.setAttribute('data-balloon-pos', pos);
+}
+
+export function srtToVtt(srtText) {
+    return 'WEBVTT \r\n\r\n'.concat(
+        srtText
+            .replace(/\{\\([ibu])\}/g, '</$1>')
+            .replace(/\{\\([ibu])1\}/g, '<$1>')
+            .replace(/\{([ibu])\}/g, '<$1>')
+            .replace(/\{\/([ibu])\}/g, '</$1>')
+            .replace(/(\d\d:\d\d:\d\d),(\d\d\d)/g, '$1.$2')
+            .concat('\r\n\r\n'),
+    );
+}
+
+export function vttToBlob(vttText) {
+    return URL.createObjectURL(
+        new Blob([vttText], {
+            type: 'text/vtt',
+        }),
+    );
+}

packages/artplayer/src/utils/subtitle.js

@@ -1,19 +0,0 @@
-export function srtToVtt(srtText) {
-    return 'WEBVTT \r\n\r\n'.concat(
-        srtText
-            .replace(/\{\\([ibu])\}/g, '</$1>')
-            .replace(/\{\\([ibu])1\}/g, '<$1>')
-            .replace(/\{([ibu])\}/g, '<$1>')
-            .replace(/\{\/([ibu])\}/g, '</$1>')
-            .replace(/(\d\d:\d\d:\d\d),(\d\d\d)/g, '$1.$2')
-            .concat('\r\n\r\n'),
-    );
-}
-
-export function vttToBlob(vttText) {
-    return URL.createObjectURL(
-        new Blob([vttText], {
-            type: 'text/vtt',
-        }),
-    );
-}