Version 1.7.5 with fixed extend() bug.

igoramadas · Nov 3, 2021 · 3506bb3 · 3506bb3
1 parent 6641c7d
commit 3506bb3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/History.md b/History.md
@@ -1,5 +1,9 @@
 # Changelog for SetMeUp
 
+1.7.5
+=====
+* Fixed regression bug with the utils.extend().
+
 1.7.4
 =====
 * Updated dependencies.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "setmeup",
-    "version": "1.7.4",
+    "version": "1.7.5",
     "description": "SetMeUp, your single and only settings manager.",
     "keywords": [
         "setmeup",

diff --git a/src/utils.ts b/src/utils.ts
@@ -194,10 +194,7 @@ export function loadJson(filename: string, cryptoOptions?: CryptoOptions | boole
  * @param overwrite If false it won't set properties that are already defined, default is true.
  * @protected
  */
-export function extend(source: any, target: any, overwrite: boolean): any[] {
-    const result = []
-
-    // Overwrite defaults to true.
+export function extend(source: any, target: any, overwrite: boolean): void {
     if (overwrite == null || typeof overwrite == "undefined") {
         overwrite = true
     }
@@ -209,15 +206,11 @@ export function extend(source: any, target: any, overwrite: boolean): any[] {
             if (target[prop] == null) {
                 target[prop] = {}
             }
-            result.push(this.extend(source[prop], target[prop], overwrite))
+            extend(source[prop], target[prop], overwrite)
         } else if (overwrite || target[prop] == null) {
-            result.push((target[prop] = source[prop]))
-        } else {
-            result.push(undefined)
+            target[prop] = source[prop]
         }
     }
-
-    return result
 }
 
 /**