Allow passing params to file decode (#132)

* Allow passing params to file decode

* wip

* wip

Author: nitely

confutils.nim

@@ -979,29 +979,67 @@ macro configurationRtti(RecordType: type): untyped =
   result = newTree(nnkPar, newLitFixed cmdInfo, fieldSetters)
 
 when hasSerialization:
-  proc addConfigFile*(secondarySources: auto,
-                      Format: type,
-                      path: InputFile) {.raises: [ConfigurationError].} =
+  template addConfigFileImpl(
+      secondarySources: auto,
+      Format: type SerializationFormat,
+      path: InputFile,
+      params: varargs[untyped]
+  ): untyped =
     try:
-      secondarySources.data.add loadFile(Format, string path,
-                                         type(secondarySources.data[0]))
+      secondarySources.data.add loadFile(
+        Format, string path, typeof(secondarySources.data[0]), params
+      )
     except SerializationError as err:
       raise newException(ConfigurationError, err.formatMsg(string path), err)
     except IOError as err:
       raise newException(ConfigurationError,
         "Failed to read config file at '" & string(path) & "': " & err.msg)
 
-  proc addConfigFileContent*(secondarySources: auto,
-                             Format: type,
-                             content: string) {.raises: [ConfigurationError].} =
+  template addConfigFileWithParams*(
+      secondarySources: auto,
+      Format: type SerializationFormat,
+      path: InputFile,
+      params: varargs[untyped]
+  ): untyped =
+    addConfigFileImpl(secondarySources, Format, path, params)
+
+  proc addConfigFile*(
+      secondarySources: auto,
+      Format: type SerializationFormat,
+      path: InputFile
+  ) {.raises: [ConfigurationError].} =
+    addConfigFileImpl(secondarySources, Format, path)
+
+  template addConfigFileContentImpl(
+      secondarySources: auto,
+      Format: type SerializationFormat,
+      content: string,
+      params: varargs[untyped]
+  ): untyped =
     try:
-      secondarySources.data.add decode(Format, content,
-                                       type(secondarySources.data[0]))
+      secondarySources.data.add decode(
+        Format, content, type(secondarySources.data[0], params)
+      )
     except SerializationError as err:
       raise newException(ConfigurationError, err.formatMsg("<content>"), err)
     except IOError:
       raiseAssert "This should not be possible"
 
+  template addConfigFileContentWithParams*(
+      secondarySources: auto,
+      Format: type SerializationFormat,
+      content: string,
+      params: varargs[untyped]
+  ): untyped =
+    addConfigFileContentImpl(secondarySources, Format, content, params)
+
+  proc addConfigFileContent*(
+      secondarySources: auto,
+      Format: type SerializationFormat,
+      content: string
+  ) {.raises: [ConfigurationError].} =
+    addConfigFileContentImpl(secondarySources, Format, content)
+
 func constructEnvKey*(prefix: string, key: string): string {.raises: [].} =
   ## Generates env. variable names from keys and prefix following the
   ## IEEE Open Group env. variable spec: https://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap08.html

tests/config_files/nested_cmd.toml

@@ -1,2 +1,10 @@
 outer-arg = "toml outer-arg"
-outerCmd1 = { outer-arg1 = "toml outer-arg1", innerCmd1 = { inner-arg1 = "toml inner-arg1" }, innerCmd2 = { inner-arg2 = "toml inner-arg2" } }
+outerCmd1 = {
+  outer-arg1 = "toml outer-arg1",
+  innerCmd1 = {
+    inner-arg1 = "toml inner-arg1"
+  },
+  innerCmd2 = {
+    inner-arg2 = "toml inner-arg2"
+  }
+}

tests/test_nested_cmd.nim

@@ -15,7 +15,9 @@ template loadFile(T, file): untyped =
   proc (
     config: T, sources: ref SecondarySources
   ) {.raises: [ConfigurationError].} =
-    sources.addConfigFile(Toml, InputFile(configFilePath / file))
+    sources.addConfigFileWithParams(
+      Toml, InputFile(configFilePath / file), flags = {TomlInlineTableNewline}
+    )
 
 type
   OuterCmd = enum