@repokit/core 3.0.1 → 3.0.3

package/internals/themes/theme_registry.rs

@@ -46,6 +46,9 @@ impl ThemeRegistry {
     }
 
     pub fn register_user_theme(&mut self, theme: &RepoKitTheme) {
+        if self.themes.contains_key(&theme.name) {
+            self.on_naming_conflict(&theme.name);
+        }
         self.themes
             .insert(theme.name.clone(), Theme::from_configuration(theme));
     }
@@ -99,4 +102,24 @@ impl ThemeRegistry {
             highlightColor: None,
         })
     }
+
+    fn on_naming_conflict(&self, name: &str) {
+        if ThemeRegistry::built_in_color_schemes()
+            .1
+            .map(|t| t.0)
+            .contains(&name)
+        {
+            println!(
+                "{}: I've discovered a theme that conflicts with one of my iternals. Please rename your {} theme",
+                self.current_theme().error_prefix("RepoKit"),
+                self.current_theme().highlight(name)
+            )
+        } else {
+            println!(
+                "{}: I've discovered two themes with the name {}. Please rename one of them",
+                self.current_theme().error_prefix("RepoKit"),
+                self.current_theme().highlight(name)
+            )
+        }
+    }
 }

package/internals/validations/command_validations.rs

@@ -6,15 +6,14 @@ use std::{
 use ignore::WalkBuilder;
 
 use crate::{
+    configuration::typescript_command::TypescriptCommand,
     executables::{
-        intenal_executable::InternalExecutable, internal_executable_definition::RepoKitScope,
+        internal_executable::InternalExecutable, internal_executable_definition::RepoKitScope,
     },
     file_walker::walker::TSFileVisitorBuilder,
-    internal_commands::{
-        internal_registry::InternalRegistry, typescript_command::TypescriptCommand,
-    },
+    internal_commands::internal_registry::InternalRegistry,
     logger::logger::Logger,
-    repokit::{interfaces::RepoKitCommand, repokit::RepoKit},
+    repokit::{repokit::RepoKit, repokit_command::RepoKitCommand},
 };
 
 pub struct CommandValidations {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repokit/core",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "A knowledgebase for your repository - wrapped in a CLI",
   "keywords": [
     "cli",

package/internals/executables/external_executable.rs

@@ -1,4 +0,0 @@
-trait ExternalExecutable {
-    fn run(command: String, args: Vec<String>);
-    fn help(&self);
-}

package/internals/repokit/interfaces.rs

@@ -1,48 +0,0 @@
-use std::collections::HashMap;
-
-use serde::Deserialize;
-
-use crate::themes::theme_inputs::RepoKitTheme;
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct CommandDefinition {
-    pub command: String,
-    pub description: String,
-    pub args: Option<HashMap<String, String>>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct RootCommand {
-    pub name: String,
-    pub command: String,
-    pub description: String,
-    pub args: Option<HashMap<String, String>>,
-}
-
-impl RootCommand {
-    pub fn from(name: &str, command: &CommandDefinition) -> RootCommand {
-        RootCommand {
-            name: name.to_string(),
-            args: command.args.clone(),
-            command: command.command.to_string(),
-            description: command.description.to_string(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct RepoKitConfig {
-    pub project: String,
-    pub thirdParty: Vec<RepoKitCommand>,
-    pub commands: HashMap<String, CommandDefinition>,
-    pub themes: Vec<RepoKitTheme>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct RepoKitCommand {
-    pub name: String,
-    pub owner: String,
-    pub location: String,
-    pub description: String,
-    pub commands: HashMap<String, CommandDefinition>,
-}