diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2026-05-25 10:47:12 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2026-05-25 12:21:38 -0400 |
| commit | 0c5e723742fb923bfa85e3ee47434b463f390f20 (patch) | |
| tree | d2cab9dd062e67d7af9a8b67ed3c92cc46cc40d0 /org/spine.org | |
| parent | separate abstraction lib from output processing (diff) | |
ocda + outputs split: module/import + dub.json fixups
Modules and imports rewritten to sisudoc.ocda.* and
sisudoc.outputs.*; dub.json excludedSourceFiles and the
spine:abstraction sub-package sourcePaths collapsed to
./src/sisudoc/ocda.
Verified: nix build .#spine-overlay-ldc clean.
(assisted by Claude-Code)
Diffstat (limited to 'org/spine.org')
| -rw-r--r-- | org/spine.org | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/org/spine.org b/org/spine.org index 481f2c7..6d67e3b 100644 --- a/org/spine.org +++ b/org/spine.org @@ -105,7 +105,7 @@ string program_name = "spine"; spineMetaDocCuratesAuthors!()(hvst.curates, _make_and_meta_struct, _opt_action); } if (_opt_action.vox_gt_1) { - import sisudoc.io_out.paths_output; + import sisudoc.outputs.io_out.paths_output; auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); if (_opt_action.curate_authors) { writeln("- ", out_pth.curate("authors.html")); @@ -139,25 +139,25 @@ import std.getopt; import std.file; import std.path; import std.process; -import sisudoc.conf.compile_time_info; -import sisudoc.meta; -import sisudoc.meta.metadoc; -import sisudoc.io_out.curate.metadoc_curate; -import sisudoc.io_out.curate.metadoc_curate_authors; -import sisudoc.io_out.curate.metadoc_curate_topics; -import sisudoc.meta.metadoc_from_src; -import sisudoc.meta.conf_make_meta_structs; -import sisudoc.meta.conf_make_meta_json; -import sisudoc.meta.defaults; -import sisudoc.meta.doc_debugs; -import sisudoc.meta.rgx; -import sisudoc.meta.rgx_yaml; -import sisudoc.meta.rgx_files; -import sisudoc.io_in.paths_source; -import sisudoc.io_in.read_config_files; -import sisudoc.io_in.read_source_files; -import sisudoc.io_in.read_zip_pod; -import sisudoc.io_out.hub; +import sisudoc.outputs.conf.compile_time_info; +import sisudoc.ocda.meta; +import sisudoc.ocda.meta.metadoc; +import sisudoc.outputs.io_out.curate.metadoc_curate; +import sisudoc.outputs.io_out.curate.metadoc_curate_authors; +import sisudoc.outputs.io_out.curate.metadoc_curate_topics; +import sisudoc.ocda.meta.metadoc_from_src; +import sisudoc.ocda.meta.conf_make_meta_structs; +import sisudoc.ocda.meta.conf_make_meta_json; +import sisudoc.ocda.meta.defaults; +import sisudoc.ocda.meta.doc_debugs; +import sisudoc.ocda.meta.rgx; +import sisudoc.ocda.meta.rgx_yaml; +import sisudoc.ocda.meta.rgx_files; +import sisudoc.ocda.io_in.paths_source; +import sisudoc.ocda.io_in.read_config_files; +import sisudoc.ocda.io_in.read_source_files; +import sisudoc.ocda.io_in.read_zip_pod; +import sisudoc.outputs.io_out.hub; #+END_SRC ***** spine metadoc :spine: @@ -167,14 +167,14 @@ import sisudoc.io_out.hub; import std.datetime; import std.digest.crc; import std.digest.sha; -import sisudoc.meta; -import sisudoc.meta.metadoc_from_src; -import sisudoc.meta.conf_make_meta_structs; -import sisudoc.meta.conf_make_meta_json; -import sisudoc.meta.defaults; -import sisudoc.io_in.paths_source; -import sisudoc.io_in.read_config_files; -import sisudoc.io_in.read_source_files; +import sisudoc.ocda.meta; +import sisudoc.ocda.meta.metadoc_from_src; +import sisudoc.ocda.meta.conf_make_meta_structs; +import sisudoc.ocda.meta.conf_make_meta_json; +import sisudoc.ocda.meta.defaults; +import sisudoc.ocda.io_in.paths_source; +import sisudoc.ocda.io_in.read_config_files; +import sisudoc.ocda.io_in.read_source_files; #+END_SRC ****** notes @@ -1127,7 +1127,7 @@ if ( { /+ local site config +/ _conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set); auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg); - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action, _cfg); // - get local site config break; } @@ -1135,11 +1135,11 @@ if ( } } else { /+ local site config +/ auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg); - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action, _cfg); // - get local site config } if (_opt_action.show_config) { - import sisudoc.meta.metadoc_show_config; + import sisudoc.ocda.meta.metadoc_show_config; spineShowSiteConfig!()(_opt_action, _siteConfig); } #+END_SRC @@ -1492,7 +1492,7 @@ foreach(arg; _resolved_args) { #+BEGIN_SRC d { /+ document config/make file +/ auto _config_document_struct = readConfigDoc!()(_manifest, _env); - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _make_and_meta_struct = _config_document_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifest, _opt_action, _cfg); } #+END_SRC @@ -1566,7 +1566,7 @@ if ((doc.matters.opt.action.debug_do) #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_summary) { - import sisudoc.meta.metadoc_show_summary; + import sisudoc.ocda.meta.metadoc_show_summary; spineMetaDocSummary!()(doc); } #+END_SRC @@ -1578,7 +1578,7 @@ if (doc.matters.opt.action.show_summary) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_metadata) { - import sisudoc.meta.metadoc_show_metadata; + import sisudoc.ocda.meta.metadoc_show_metadata; spineShowMetaData!()(doc.matters); } #+END_SRC @@ -1590,7 +1590,7 @@ if (doc.matters.opt.action.show_metadata) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_make) { - import sisudoc.meta.metadoc_show_make; + import sisudoc.ocda.meta.metadoc_show_make; spineShowMake!()(doc.matters); } #+END_SRC @@ -1602,7 +1602,7 @@ if (doc.matters.opt.action.show_make) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_config) { - import sisudoc.meta.metadoc_show_config; + import sisudoc.ocda.meta.metadoc_show_config; spineShowConfig!()(doc.matters); } #+END_SRC @@ -1614,7 +1614,7 @@ if (doc.matters.opt.action.show_config) { #+BEGIN_SRC d /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.abstraction.ssp; + import sisudoc.ocda.abstraction.ssp; spineAbstractionTxt!()(doc); } #+END_SRC @@ -1626,7 +1626,7 @@ if (doc.matters.opt.action.show_abstraction) { #+BEGIN_SRC d /+ ↓ document abstraction sqlite database +/ if (doc.matters.opt.action.show_abstraction_db) { - import sisudoc.io_out.create_abstraction_db; + import sisudoc.outputs.io_out.create_abstraction_db; spineAbstractionDb!()(doc); } #+END_SRC @@ -1719,10 +1719,10 @@ break; // terminate, stop *** 0 module template - abstraction template -#+HEADER: :tangle "../src/sisudoc/meta/metadoc.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc.d" #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta.metadoc; +module sisudoc.ocda.meta.metadoc; @safe: template spineAbstraction() { <<imports_spine_metadoc>> @@ -1840,7 +1840,7 @@ if ((_opt_action.debug_do) ) { writeln("step2 commence → (read document header (yaml) return struct) [", _manifest.src.filename, "]"); } -import sisudoc.meta.conf_make_meta_yaml; +import sisudoc.ocda.meta.conf_make_meta_yaml; _make_and_meta_struct = docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct!()( _header_body_insertfilelist_imagelist.header_raw, |
