Simplify readConfig by removing baseConfig parameter and updating merge logic

Author: andrey-helldar

src/utils/filesystem.ts

@@ -31,18 +31,16 @@ export const writeFile = (config: Config, filename: string, content: string): vo
     fs.writeFileSync(filePath(config, filename), content)
 }
 
-export const readConfig = (override: Config, userConfigPath: string, baseConfig: Config | undefined = undefined): Config => {
-    const dataConfig: Config = baseConfig ?? defaultConfig
-
-    const content: string = readFile(override, userConfigPath)
+export const readConfig = (config: Config, userConfigPath: string): Config => {
+    const content: string = readFile(config, userConfigPath)
 
     if (content === '') {
-        return <Config>deepmerge(dataConfig, override)
+        return <Config>deepmerge(defaultConfig, config)
     }
 
     const userConfig = <Config>yaml.load(content)
 
-    return <Config>deepmerge(dataConfig, userConfig, override)
+    return <Config>deepmerge(defaultConfig, userConfig, config)
 }
 
 export const exec = async (command: string): Promise<string> => {

tests/unit/filesystem.test.ts

@@ -4,12 +4,13 @@ import { readConfig } from '../../src/utils/filesystem'
 import { CONFIG_PATH } from '../../src/utils/inputs'
 
 test('read config', () => {
-    const data: Config = readConfig(testConfig, CONFIG_PATH.defaultValue, testConfig)
+    const data: Config = readConfig(testConfig, CONFIG_PATH.defaultValue)
 
-    expect(data.directory).toBe(testConfig.directory)
-    expect(data.image.parameters.packageName).toBe(testConfig.image.parameters.packageName)
-    expect(data.image.parameters.title).toBe(testConfig.image.parameters.title)
-    expect(data.image.parameters.description).toBe(testConfig.image.parameters.description)
+    expect(data.directory).toBe(process.cwd())
+
+    expect(data.image.parameters.packageName).toBe('TheDragonCode/preview-updater')
+    expect(data.image.parameters.title).toBe('Preview Updater')
+    expect(data.image.parameters.description).toBe('Lightweight preview update in your repository')
 
     expect(data.path.readme).toBe(defaultConfig.path.readme)
     expect(data.image.url).toBe(defaultConfig.image.url)