bc-deeplib 2.4.0 → 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

@@ -230,9 +230,9 @@ var BaseModule = class {
     if (!this.settingsStorage) return {};
     if (!modStorage.playerStorage) {
       Player[modName] = {};
-      this.registerDefaultSettings();
+      this.registerDefaultSettings(modStorage.playerStorage);
     } else if (!modStorage.playerStorage[this.settingsStorage]) {
-      this.registerDefaultSettings();
+      this.registerDefaultSettings(modStorage.playerStorage);
     }
     return modStorage.playerStorage[this.settingsStorage];
   }
@@ -246,9 +246,9 @@ var BaseModule = class {
     if (!this.settingsStorage) return;
     if (!storage.playerStorage) {
       Player[modName] = {};
-      this.registerDefaultSettings();
+      this.registerDefaultSettings(modStorage.playerStorage);
     } else if (!storage.playerStorage[this.settingsStorage]) {
-      this.registerDefaultSettings();
+      this.registerDefaultSettings(modStorage.playerStorage);
     }
     storage.playerStorage[this.settingsStorage] = value;
   }
@@ -266,12 +266,12 @@ var BaseModule = class {
    * If some settings already exist, they will be merged with defaults.
    * Existing values will NOT be overwritten.
    */
-  registerDefaultSettings() {
-    if (this.defaultSettings && hasGetter(this, "defaultSettings") && this.settings && hasSetter(this, "settings")) {
-      if (!this.defaultSettings || !this.settings) return;
-      if (Object.entries(this.defaultSettings).length === 0) return;
-      this.settings = deepMerge(this.defaultSettings, this.settings, { concatArrays: false });
-    }
+  registerDefaultSettings(target) {
+    const storage = this.settingsStorage;
+    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, matchingOnly: true });
   }
   /**
    * Provides default settings for this module.
@@ -1011,7 +1011,7 @@ function initModules(modulesToRegister) {
     module.run();
   }
   for (const module of modules()) {
-    module.registerDefaultSettings();
+    module.registerDefaultSettings(modStorage.playerStorage);
   }
   logger.debug("Modules Loaded.");
   return true;
@@ -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;