refactor(core): consolidate complete_package_names, seal Ecosystem, remove once_cell (#71)

* refactor(core): consolidate complete_package_names, seal Ecosystem, remove once_cell

Consolidate complete_package_names across Cargo, npm, PyPI, Bundler,
Dart ecosystems to use complete_package_names_generic from deps-core.

Rename ranges_overlap to position_in_range for semantic clarity.

Replace once_cell::sync::Lazy with std::sync::LazyLock, remove once_cell
dependency.

Seal Ecosystem trait with private::Sealed supertrait to prevent external
implementations.

Rename format_version_for_code_action to format_version_for_text_edit
to better reflect its TextEdit context.

Closes #68

* refactor(core): unify DependencySource enum across all ecosystems

Consolidate 4 duplicate DependencySource enums (Cargo, PyPI, Dart,
Bundler) into a single 7-variant enum in deps-core:
Registry, Git, Path, Url, Sdk, Workspace, CustomRegistry.

Eliminates lossy conversions at trait boundaries: PyPI Url and Dart Sdk
variants are now preserved through the Dependency trait. Cargo
workspace_inherited bool replaced by DependencySource::Workspace.

Add #[non_exhaustive] for forward compatibility. Add is_registry() and
is_version_resolvable() convenience methods. Simplify
UnifiedDependency::is_registry() to delegate to core enum.

Ref #68

Author: bug-ops

Cargo.lock

@@ -29,7 +29,6 @@ futures = "0.3"
 insta = "1"
 mockito = "1"
 node-semver = "2.2"
-once_cell = "1.21"
 pep440_rs = "0.7"
 pep508_rs = "0.9"
 bytes = "1"

Cargo.toml

@@ -27,7 +27,6 @@ urlencoding = { workspace = true }
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
 insta = { workspace = true, features = ["json"] }
-once_cell = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tokio-test = { workspace = true }

crates/deps-bundler/Cargo.toml

@@ -34,32 +34,9 @@ impl BundlerEcosystem {
         }
     }
 
-    /// Completes gem names by searching rubygems.org.
     async fn complete_package_names(&self, prefix: &str) -> Vec<CompletionItem> {
-        use deps_core::completion::build_package_completion;
-
-        // Require at least 2 characters, max 100 for security
-        if prefix.len() < 2 || prefix.len() > 100 {
-            return vec![];
-        }
-
-        let results = match self.registry.search(prefix, 20).await {
-            Ok(r) => r,
-            Err(e) => {
-                tracing::warn!("Gem search failed for '{}': {}", prefix, e);
-                return vec![];
-            }
-        };
-
-        let insert_range = tower_lsp_server::ls_types::Range::default();
-
-        results
-            .into_iter()
-            .map(|metadata| {
-                let boxed: Box<dyn deps_core::Metadata> = Box::new(metadata);
-                build_package_completion(boxed.as_ref(), insert_range)
-            })
-            .collect()
+        deps_core::completion::complete_package_names_generic(self.registry.as_ref(), prefix, 20)
+            .await
     }
 
     async fn complete_versions(&self, package_name: &str, prefix: &str) -> Vec<CompletionItem> {
@@ -73,6 +50,8 @@ impl BundlerEcosystem {
     }
 }
 
+impl deps_core::ecosystem::private::Sealed for BundlerEcosystem {}
+
 impl Ecosystem for BundlerEcosystem {
     fn id(&self) -> &'static str {
         "bundler"
@@ -201,8 +180,8 @@ mod tests {
         let cache = Arc::new(deps_core::HttpCache::new());
         let ecosystem = BundlerEcosystem::new(cache);
 
-        // Prefix longer than 100 chars should return empty
-        let long_prefix = "a".repeat(101);
+        // Prefix longer than 200 chars should return empty
+        let long_prefix = "a".repeat(201);
         let results = ecosystem.complete_package_names(&long_prefix).await;
         assert!(results.is_empty());
     }

crates/deps-bundler/src/ecosystem.rs

@@ -7,7 +7,7 @@ use deps_core::lsp_helpers::EcosystemFormatter;
 pub struct BundlerFormatter;
 
 impl EcosystemFormatter for BundlerFormatter {
-    fn format_version_for_code_action(&self, version: &str) -> String {
+    fn format_version_for_text_edit(&self, version: &str) -> String {
         format!("'{version}'")
     }
 
@@ -27,8 +27,8 @@ mod tests {
     #[test]
     fn test_format_version() {
         let formatter = BundlerFormatter;
-        assert_eq!(formatter.format_version_for_code_action("7.0.8"), "'7.0.8'");
-        assert_eq!(formatter.format_version_for_code_action("1.0.0"), "'1.0.0'");
+        assert_eq!(formatter.format_version_for_text_edit("7.0.8"), "'7.0.8'");
+        assert_eq!(formatter.format_version_for_text_edit("1.0.0"), "'1.0.0'");
     }
 
     #[test]

crates/deps-bundler/src/formatter.rs

@@ -231,16 +231,14 @@ fn extract_source(line: &str) -> DependencySource {
     if let Some(caps) = GIT_OPTION.captures(line) {
         return DependencySource::Git {
             url: caps[1].to_string(),
-            branch: None,
-            tag: None,
-            ref_: None,
+            rev: None,
         };
     }
 
     if let Some(caps) = GITHUB_OPTION.captures(line) {
-        return DependencySource::Github {
-            repo: caps[1].to_string(),
-            branch: None,
+        return DependencySource::Git {
+            url: format!("https://github.com/{}", &caps[1]),
+            rev: None,
         };
     }
 
@@ -421,10 +419,12 @@ gem 'rails', git: 'https://github.com/rails/rails.git'";
         let gemfile = r"source 'https://rubygems.org'
 gem 'rails', github: 'rails/rails'";
         let result = parse_gemfile(gemfile, &test_uri()).unwrap();
-        assert!(matches!(
-            result.dependencies[0].source,
-            DependencySource::Github { .. }
-        ));
+        match &result.dependencies[0].source {
+            DependencySource::Git { url, .. } => {
+                assert!(url.contains("github.com/rails/rails"));
+            }
+            _ => panic!("Expected Git source"),
+        }
     }
 
     #[test]

crates/deps-bundler/src/parser.rs

@@ -16,28 +16,7 @@ pub struct BundlerDependency {
     pub require: Option<String>,
 }
 
-/// Source location of a dependency.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum DependencySource {
-    /// Default rubygems.org registry
-    Registry,
-    /// Git repository
-    Git {
-        url: String,
-        branch: Option<String>,
-        tag: Option<String>,
-        ref_: Option<String>,
-    },
-    /// Local filesystem path
-    Path { path: String },
-    /// GitHub shorthand (e.g., "rails/rails")
-    Github {
-        repo: String,
-        branch: Option<String>,
-    },
-    /// Custom gem source
-    Source { name: String, url: String },
-}
+pub use deps_core::parser::DependencySource;
 
 /// Gem group classification.
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
@@ -106,21 +85,7 @@ impl deps_core::DependencyInfo for BundlerDependency {
     }
 
     fn source(&self) -> deps_core::parser::DependencySource {
-        match &self.source {
-            DependencySource::Registry => deps_core::parser::DependencySource::Registry,
-            DependencySource::Git { url, ref_, .. } => deps_core::parser::DependencySource::Git {
-                url: url.clone(),
-                rev: ref_.clone(),
-            },
-            DependencySource::Path { path } => {
-                deps_core::parser::DependencySource::Path { path: path.clone() }
-            }
-            DependencySource::Github { repo, .. } => deps_core::parser::DependencySource::Git {
-                url: format!("https://github.com/{repo}"),
-                rev: None,
-            },
-            DependencySource::Source { .. } => deps_core::parser::DependencySource::Registry,
-        }
+        self.source.clone()
     }
 
     fn features(&self) -> &[String] {
@@ -146,21 +111,7 @@ impl deps_core::Dependency for BundlerDependency {
     }
 
     fn source(&self) -> deps_core::parser::DependencySource {
-        match &self.source {
-            DependencySource::Registry => deps_core::parser::DependencySource::Registry,
-            DependencySource::Git { url, ref_, .. } => deps_core::parser::DependencySource::Git {
-                url: url.clone(),
-                rev: ref_.clone(),
-            },
-            DependencySource::Path { path } => {
-                deps_core::parser::DependencySource::Path { path: path.clone() }
-            }
-            DependencySource::Github { repo, .. } => deps_core::parser::DependencySource::Git {
-                url: format!("https://github.com/{repo}"),
-                rev: None,
-            },
-            DependencySource::Source { .. } => deps_core::parser::DependencySource::Registry,
-        }
+        self.source.clone()
     }
 
     fn features(&self) -> &[String] {
@@ -195,27 +146,19 @@ mod tests {
         let registry = DependencySource::Registry;
         let git = DependencySource::Git {
             url: "https://github.com/rails/rails".into(),
-            branch: Some("main".into()),
-            tag: None,
-            ref_: None,
+            rev: Some("main".into()),
         };
         let path = DependencySource::Path {
             path: "../local".into(),
         };
-        let github = DependencySource::Github {
-            repo: "rails/rails".into(),
-            branch: None,
-        };
-        let source = DependencySource::Source {
-            name: "custom".into(),
+        let custom = DependencySource::CustomRegistry {
             url: "https://custom.gem.source".into(),
         };
 
-        assert!(matches!(registry, DependencySource::Registry));
-        assert!(matches!(git, DependencySource::Git { .. }));
-        assert!(matches!(path, DependencySource::Path { .. }));
-        assert!(matches!(github, DependencySource::Github { .. }));
-        assert!(matches!(source, DependencySource::Source { .. }));
+        assert!(registry.is_registry());
+        assert!(!git.is_registry());
+        assert!(!path.is_registry());
+        assert!(custom.is_registry());
     }
 
     #[test]
@@ -311,10 +254,7 @@ mod tests {
         assert_eq!(dep.version_requirement(), Some("~> 1.0"));
         assert!(dep.version_range().is_some());
         assert!(dep.features().is_empty());
-        assert!(matches!(
-            dep.source(),
-            deps_core::parser::DependencySource::Registry
-        ));
+        assert!(dep.source().is_registry());
     }
 
     #[test]
@@ -323,9 +263,7 @@ mod tests {
 
         let dep = create_test_dependency(DependencySource::Git {
             url: "https://github.com/rails/rails".into(),
-            branch: Some("main".into()),
-            tag: None,
-            ref_: Some("abc123".into()),
+            rev: Some("abc123".into()),
         });
 
         match dep.source() {
@@ -353,37 +291,15 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_dependency_info_trait_github() {
-        use deps_core::DependencyInfo;
-
-        let dep = create_test_dependency(DependencySource::Github {
-            repo: "rails/rails".into(),
-            branch: Some("main".into()),
-        });
-
-        match dep.source() {
-            deps_core::parser::DependencySource::Git { url, rev } => {
-                assert_eq!(url, "https://github.com/rails/rails");
-                assert_eq!(rev, None);
-            }
-            _ => panic!("Expected Git source"),
-        }
-    }
-
     #[test]
     fn test_dependency_info_trait_custom_source() {
         use deps_core::DependencyInfo;
 
-        let dep = create_test_dependency(DependencySource::Source {
-            name: "private".into(),
+        let dep = create_test_dependency(DependencySource::CustomRegistry {
             url: "https://gems.example.com".into(),
         });
 
-        assert!(matches!(
-            dep.source(),
-            deps_core::parser::DependencySource::Registry
-        ));
+        assert!(dep.source().is_registry());
     }
 
     #[test]
@@ -404,19 +320,12 @@ mod tests {
             DependencySource::Registry,
             DependencySource::Git {
                 url: "https://github.com/test/repo".into(),
-                branch: None,
-                tag: Some("v1.0".into()),
-                ref_: None,
+                rev: Some("v1.0".into()),
             },
             DependencySource::Path {
                 path: "./local".into(),
             },
-            DependencySource::Github {
-                repo: "test/repo".into(),
-                branch: None,
-            },
-            DependencySource::Source {
-                name: "custom".into(),
+            DependencySource::CustomRegistry {
                 url: "https://custom.example.com".into(),
             },
         ];

crates/deps-bundler/src/types.rs

@@ -28,7 +28,6 @@ urlencoding = { workspace = true }
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
 insta = { workspace = true, features = ["json"] }
-once_cell = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tokio-test = { workspace = true }