0.24.0 toml or sdlang for configuration

1 files changed, 29 insertions, 10 deletions

diff --git a/src/sdp/meta/metadoc.d b/src/sdp/meta/metadoc.d
index cbc5d51..8223029 100644
--- a/src/sdp/meta/metadoc.d
+++ b/src/sdp/meta/metadoc.d
@@ -9,10 +9,10 @@ template SiSUabstraction() {
     sdp.meta,
     sdp.meta.metadoc_summary,
     sdp.meta.metadoc_from_src,
-    sdp.meta.conf_make_meta,
-    // sdp.meta.conf_make_meta_native,
+    sdp.meta.conf_make_meta_structs,
     sdp.meta.conf_make_meta_sdlang,
-    sdp.meta.conf_make_meta_composite,
+    sdp.meta.conf_make_meta_toml,
+    sdp.meta.conf_make_meta_json,
     sdp.meta.defaults,
     sdp.meta.doc_debugs,
     sdp.meta.read_config_files,
@@ -21,8 +21,9 @@ template SiSUabstraction() {
     sdp.output.hub,
     sdp.output.paths_source;
   mixin SiSUrgxInit;
-  mixin SiSUregisters;
+  mixin SiSUmakeMetaStructsSDLang;
   mixin SiSUextractSDLang;
+  mixin contentJSONtoSiSUstruct;
   mixin SiSUnode;
   mixin SiSUbiblio;
   mixin SiSUrgxInitFlags;
@@ -36,9 +37,22 @@ template SiSUabstraction() {
     O _opt_action,
     M _manifest,
   ){
-    auto sdl_root_config_document = configReadDoc!()(_manifest, _env); // document config file
-    auto sdl_root_config_local_site = configReadSite!()(_manifest, _env); // local site config
-    auto conf_files_composite_make = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site);
+    auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file
+    auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config
+    ConfCompositePlus _make_and_meta_struct;
+    switch (_config_local_site_struct.filetype) {
+    case "toml" :
+      _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
+      _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
+      break;
+    case "sdl" :
+      auto sdl_root_config_document = parseSDLangConfig!()(_config_document_struct.content, _config_document_struct.filename);
+      auto sdl_root_config_local_site = parseSDLangConfig!()(_config_local_site_struct.content, _config_local_site_struct.filename);
+      _make_and_meta_struct = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site);
+      break;
+    default :
+      break;
+    }
     /+ ↓ read file (filename with path) +/
     /+ ↓ file tuple of header and content +/
     debug(steps) {
@@ -61,9 +75,14 @@ template SiSUabstraction() {
     debug(steps) {
       writeln("step2 commence → (read document header - toml or sdlang, return struct)");
     }
-    auto _make_and_meta_struct
-      = docHeaderMakeAndMetaTupExtractAndConvertToStruct!()(
-        conf_files_composite_make,
+    _make_and_meta_struct =
+    ((_header_body_insertfilelist_imagelist[headBody.header]).match(rgx.toml_header_meta_title))
+    ? docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
+        _make_and_meta_struct,
+        _header_body_insertfilelist_imagelist[headBody.header]
+      )
+    : docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct!()(
+        _make_and_meta_struct,
         _header_body_insertfilelist_imagelist[headBody.header]
       );
     debug(steps) {