Merge pull request #5 from mrkpatchaa/patch-1

harshkhandeparkar · web-flow · commit 481b5a7ab85a · 2023-02-28T19:23:06.000+05:30
Merge current settings with default
diff --git a/src/settings-manager/settings-manager.ts b/src/settings-manager/settings-manager.ts
@@ -39,7 +39,7 @@ export class SettingsManager<SettingsSchema extends {} = any> {
       await this.saveSettings();
     }
     else if (currentSettings.status === STATUS.FILE_EXISTS) {
-      this.settings = { ...currentSettings.settings };
+      this.settings = { ...this.default, ...currentSettings.settings };
     }
 
     return this.settings;
@@ -121,4 +121,4 @@ export class SettingsManager<SettingsSchema extends {} = any> {
 
     return this.settings;
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class SettingsManager<SettingsSchema extends {} = any> {`
`39`	`39`	`await this.saveSettings();`
`40`	`40`	`}`
`41`	`41`	`else if (currentSettings.status === STATUS.FILE_EXISTS) {`
`42`		`- this.settings = { ...currentSettings.settings };`
	`42`	`+ this.settings = { ...this.default, ...currentSettings.settings };`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return this.settings;`
`@@ -121,4 +121,4 @@ export class SettingsManager<SettingsSchema extends {} = any> {`
`121`	`121`
`122`	`122`	`return this.settings;`
`123`	`123`	`}`
`124`		`-}`
	`124`	`+}`