bc-deeplib 2.4.1 → 2.4.2

package/dist/deeplib.d.ts

@@ -767,7 +767,10 @@ declare module 'bc-deeplib/screens/main_menu' {
 }
 declare module 'bc-deeplib/utilities/common' {
   export type DeepMergeOptions = {
+      /** Concatenate arrays instead of replacing them. */
       concatArrays?: boolean;
+      /** Only merge matching keys. */
+      matchingOnly?: boolean;
   };
   /**
    * Deeply merges two values into a new value.
@@ -852,7 +855,7 @@ declare module 'bc-deeplib/utilities/elements/elements' {
   function elementCreateCustom(options: Omit<Custom, 'type'>): HTMLElement;
   function elementCreateInput(options: Input): HTMLElement;
   function elementCreateLabel(options: Omit<Label, 'type'>): HTMLElement;
-  function elementCreateDropdown(options: Omit<Dropdown, 'type'>): HTMLDivElement | HTMLLabelElement;
+  function elementCreateDropdown(options: Omit<Dropdown, 'type'>): HTMLLabelElement | HTMLDivElement;
   function elementCreateTooltip(): HTMLDivElement;
   function elementGetTooltip(): HTMLElement | undefined;
   function elementSetTooltip(text: string): boolean;

package/dist/deeplib.js

@@ -271,7 +271,7 @@ var BaseModule = class {
     const defaults = this.defaultSettings;
     if (!storage || !defaults) return;
     if (Object.entries(this.defaultSettings).length === 0) return;
-    target[storage] = deepMerge(this.defaultSettings, target[storage], { concatArrays: false });
+    target[storage] = deepMerge(this.defaultSettings, target[storage], { concatArrays: false, matchingOnly: true });
   }
   /**
    * Provides default settings for this module.
@@ -1439,7 +1439,7 @@ function isPlainObject(value) {
   return value !== null && typeof value === "object" && Object.getPrototypeOf(value) === Object.prototype && !Array.isArray(value);
 }
 __name(isPlainObject, "isPlainObject");
-function deepMerge(target, source, options = { concatArrays: true }) {
+function deepMerge(target, source, options = { concatArrays: true, matchingOnly: false }) {
   if (target === void 0) return source;
   if (source === void 0) return target;
   if (Array.isArray(target) && Array.isArray(source) && options.concatArrays) {
@@ -1447,10 +1447,9 @@ function deepMerge(target, source, options = { concatArrays: true }) {
   }
   if (isPlainObject(target) && isPlainObject(source)) {
     const result = { ...target };
-    for (const key of Object.keys(source)) {
-      if (key === "__proto__" || key === "constructor" || key === "prototype") {
-        continue;
-      }
+    const keys = options.matchingOnly ? Object.keys(source).filter((k) => k in target) : Object.keys(source);
+    for (const key of keys) {
+      if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
       result[key] = key in target ? deepMerge(target[key], source[key], options) : source[key];
     }
     return result;
@@ -1481,7 +1480,7 @@ function exportToGlobal(name, value) {
   current[keys[keys.length - 1]] = value;
 }
 __name(exportToGlobal, "exportToGlobal");
-function hasGetter3(obj, prop) {
+function hasGetter(obj, prop) {
   while (obj && obj !== Object.prototype) {
     const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
     if (descriptor?.get) return true;
@@ -1489,8 +1488,8 @@ function hasGetter3(obj, prop) {
   }
   return false;
 }
-__name(hasGetter3, "hasGetter");
-function hasSetter3(obj, prop) {
+__name(hasGetter, "hasGetter");
+function hasSetter(obj, prop) {
   while (obj && obj !== Object.prototype) {
     const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
     if (descriptor?.set) return true;
@@ -1498,7 +1497,7 @@ function hasSetter3(obj, prop) {
   }
   return false;
 }
-__name(hasSetter3, "hasSetter");
+__name(hasSetter, "hasSetter");
 var byteToKB = /* @__PURE__ */ __name((nByte) => Math.round(nByte / 100) / 10, "byteToKB");
 
 // src/utilities/elements/elements.ts
@@ -3155,8 +3154,8 @@ export {
   exportToGlobal,
   getModule,
   getText,
-  hasGetter3 as hasGetter,
-  hasSetter3 as hasSetter,
+  hasGetter,
+  hasSetter,
   initMod,
   layout,
   logger,