Fix addConfigFileContent regression (#137)

Author: nitely

confutils.nim

@@ -1026,7 +1026,7 @@ when hasSerialization:
   ): untyped =
     try:
       secondarySources.data.add decode(
-        Format, content, type(secondarySources.data[0], params)
+        Format, content, typeof(secondarySources.data[0]), params
       )
     except SerializationError as err:
       raise newException(ConfigurationError, err.formatMsg("<content>"), err)
@@ -1254,7 +1254,6 @@ proc loadImpl[C, SecondarySources](
 
   template processHelpAndVersionOptions(optKey, optVal: string) =
     let key = optKey
-    let val = optVal
     if cmpIgnoreStyle(key, "help") == 0:
       help.showHelp(lazyHelpAppInfo(optVal.toHelpFlags), activeCmds)
     elif version.len > 0 and cmpIgnoreStyle(key, "version") == 0:

tests/test_config_file.nim

@@ -185,15 +185,15 @@ proc testConfigFile() =
 
     test "basic config file":
       let conf = TestConf.load(
-          envVarsPrefix="prefix",
-          secondarySources = proc (
-            config: TestConf, sources: ref SecondarySources
-      ) {.raises: [ConfigurationError].} =
-        if config.configFile.isSome:
-          sources.addConfigFile(Toml, config.configFile.get)
-        else:
-          sources.addConfigFile(Toml, InputFile(confPathCurrUser / "testVendor" / "testApp.toml"))
-          sources.addConfigFile(Toml, InputFile(confPathSystemWide / "testVendor" / "testApp.toml"))
+        envVarsPrefix="prefix",
+        secondarySources = proc (
+          config: TestConf, sources: ref SecondarySources
+        ) {.raises: [ConfigurationError].} =
+          if config.configFile.isSome:
+            sources.addConfigFile(Toml, config.configFile.get)
+          else:
+            sources.addConfigFile(Toml, InputFile(confPathCurrUser / "testVendor" / "testApp.toml"))
+            sources.addConfigFile(Toml, InputFile(confPathSystemWide / "testVendor" / "testApp.toml"))
       )
 
       # dataDir is in env var
@@ -207,4 +207,21 @@ proc testConfigFile() =
       check conf.logLevel == "TOML SW DEBUG"
       check conf.rpcPort.int == 1235
 
+    test "basic config file content":
+      let currUserCont = readFile(confPathCurrUser / "testVendor" / "testApp.toml")
+      let sysWideCont = readFile(confPathSystemWide / "testVendor" / "testApp.toml")
+      let conf = TestConf.load(
+        envVarsPrefix="prefix",
+        secondarySources = proc (
+            config: TestConf, sources: ref SecondarySources
+        ) {.raises: [ConfigurationError].} =
+          sources.addConfigFileContent(Toml, currUserCont)
+          sources.addConfigFileContent(Toml, sysWideCont)
+      )
+      check conf.dataDir.string == "ENV VAR DATADIR"
+      check conf.logFile.isSome()
+      check conf.logFile.get().string == "TOML CU LOGFILE"
+      check conf.logLevel == "TOML SW DEBUG"
+      check conf.rpcPort.int == 1235
+
 testConfigFile()

tests/test_nested_cmd.nim

@@ -19,6 +19,14 @@ template loadFile(T, file): untyped =
       Toml, InputFile(configFilePath / file), flags = {TomlInlineTableNewline}
     )
 
+template loadContent(T, cont): untyped =
+  proc (
+    config: T, sources: ref SecondarySources
+  ) {.raises: [ConfigurationError].} =
+    sources.addConfigFileContentWithParams(
+      Toml, cont, flags = {TomlInlineTableNewline}
+    )
+
 type
   OuterCmd = enum
     noCommand
@@ -148,3 +156,18 @@ suite "test nested cmd toml":
       conf.innerCmd == InnerCmd.innerCmd2
       conf.outerArg1 == "toml outer-arg1"
       conf.innerArg2 == "toml inner-arg2"
+
+  test "subcommand outerCmd1 innerCmd2":
+    let tomlCont = readFile(configFilePath / "nested_cmd.toml")
+    let conf = TestConf.load(
+      secondarySources = loadContent(TestConf, tomlCont),
+      cmdLine = @[
+        "outerCmd1",
+        "innerCmd2"
+      ]
+    )
+    check:
+      conf.cmd == OuterCmd.outerCmd1
+      conf.innerCmd == InnerCmd.innerCmd2
+      conf.outerArg1 == "toml outer-arg1"
+      conf.innerArg2 == "toml inner-arg2"