feat: copy files into crate_name directory (#31)

Author: wiseaidev

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Open SASS
+Copyright (c) 2025 Open SASS Core Maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -60,7 +60,7 @@ cargo build --release
 
 <video src="https://github.com/user-attachments/assets/add61376-cdf6-4a46-9d3b-067bc4d0c4bd"></video>
 
-### Add an OpenSASS component to your project
+### Yew Usage
 
 ```sh
 os add i18nrs yew
@@ -70,23 +70,36 @@ This will:
 
 - Download the `i18nrs` crate.
 - Extract files only related to the `yew` feature.
-- Copy `src/` files into your project.
-- Update your `Cargo.toml` dependencies and feature flags.
+- Copy `src/` files into your project under a new directory `crate_name`, in this case `i18nrs`.
+- Update your `Cargo.toml` dependencies and `lib.rs` file.
+
+### Dioxus Usage
+
+```sh
+os add i18nrs dio
+```
+
+### Leptos Usage
+
+```sh
+os add i18nrs lep
+```
 
 ## 🧃 Components
 
 Open SASS offers the following components:
 
 | 🧩 Component | 📦 GitHub Repository | 📝 Description |
 |------------------|--------------------------|---------------------|
-| `accordion` | [![GitHub](https://img.shields.io/github/stars/opensass/accordion-rs)](https://github.com/opensass/accordion-rs) | ↕️ A highly customizable accordion component for WASM frameworks. |
-| `alert`     | [![GitHub](https://img.shields.io/github/stars/opensass/alert-rs)](https://github.com/opensass/alert-rs)       | ⚠️ A highly customizable alert component for WASM frameworks. |
+| `accordion-rs` | [![GitHub](https://img.shields.io/github/stars/opensass/accordion-rs)](https://github.com/opensass/accordion-rs) | ↕️ A highly customizable accordion component for WASM frameworks. |
+| `alert-rs`     | [![GitHub](https://img.shields.io/github/stars/opensass/alert-rs)](https://github.com/opensass/alert-rs)       | ⚠️ A highly customizable alert component for WASM frameworks. |
 | `eld`       | [![GitHub](https://img.shields.io/github/stars/opensass/eld)](https://github.com/opensass/eld)                 | 🚛 ELD Toolkit for WASM frameworks. |
-| `i18n`      | [![GitHub](https://img.shields.io/github/stars/opensass/i18n-rs)](https://github.com/opensass/i18n-rs)         | 🌐 Internationalization (i18n) component for WASM frameworks. |
-| `input`     | [![GitHub](https://img.shields.io/github/stars/opensass/input-rs)](https://github.com/opensass/input-rs)       | 🔤 A highly customizable input component for WASM frameworks. |
-| `radio`     | [![GitHub](https://img.shields.io/github/stars/opensass/radio-rs)](https://github.com/opensass/radio-rs)       | 🎛️ A highly customizable radio buttons component for WASM frameworks. |
-| `scroll`    | [![GitHub](https://img.shields.io/github/stars/opensass/scroll-rs)](https://github.com/opensass/scroll-rs)     | 🖱️ A highly customizable scroll-to-anywhere component for WASM frameworks. |
-| `select`    | [![GitHub](https://img.shields.io/github/stars/opensass/select-rs)](https://github.com/opensass/select-rs)     | 🔽 A highly customizable select group component for WASM frameworks. |
+| `i18nrs`      | [![GitHub](https://img.shields.io/github/stars/opensass/i18n-rs)](https://github.com/opensass/i18n-rs)         | 🌐 Internationalization (i18n) component for WASM frameworks. |
+| `image-rs`    | [![GitHub](https://img.shields.io/github/stars/opensass/image-rs)](https://github.com/opensass/image-rs)        | 🖼️ Image Component for WASM frameworks. |
+| `input-rs`     | [![GitHub](https://img.shields.io/github/stars/opensass/input-rs)](https://github.com/opensass/input-rs)       | 🔤 A highly customizable input component for WASM frameworks. |
+| `radiors`     | [![GitHub](https://img.shields.io/github/stars/opensass/radio-rs)](https://github.com/opensass/radio-rs)       | 🎛️ A highly customizable radio buttons component for WASM frameworks. |
+| `scroll-rs`    | [![GitHub](https://img.shields.io/github/stars/opensass/scroll-rs)](https://github.com/opensass/scroll-rs)     | 🖱️ A highly customizable scroll-to-anywhere component for WASM frameworks. |
+| `select-rs`    | [![GitHub](https://img.shields.io/github/stars/opensass/select-rs)](https://github.com/opensass/select-rs)     | 🔽 A highly customizable select group component for WASM frameworks. |
 
 And much more coming over time...
 

src/cmds/add.rs

@@ -1,4 +1,4 @@
-use crate::utils::fs::{copy_relevant_files, update_cargo_toml, update_lib_rs};
+use crate::utils::fs::{copy_relevant_files, update_cargo_toml, update_pub_file};
 use crates_io_api::SyncClient;
 use flate2::read::GzDecoder;
 use indicatif::{ProgressBar, ProgressStyle};
@@ -52,10 +52,13 @@ pub fn run_add(crate_name: &str, feature: &str) -> anyhow::Result<()> {
     let current_project_src = Path::new("src");
 
     spinner.set_message("📁 Copying relevant source files...");
-    let copied_files = copy_relevant_files(&source_path, current_project_src, feature)?;
+    let _ = copy_relevant_files(&source_path, current_project_src, crate_name, feature)?;
 
     spinner.set_message("🧩 Updating lib.rs...");
-    update_lib_rs(current_project_src.join("lib.rs"), &copied_files)?;
+    update_pub_file(
+        current_project_src.join("lib.rs"),
+        &[crate_name.to_string()],
+    )?;
 
     spinner.set_message("🛠️ Updating Cargo.toml...");
     update_cargo_toml(

src/utils/fs.rs

@@ -1,3 +1,4 @@
+use anyhow::{Context, Result};
 use std::{
     fs,
     path::{Path, PathBuf},
@@ -8,42 +9,59 @@ use walkdir::WalkDir;
 pub fn copy_relevant_files(
     src_dir: &Path,
     dest_dir: &Path,
+    crate_name: &str,
     feature: &str,
-) -> anyhow::Result<Vec<String>> {
+) -> Result<Vec<String>> {
     let mut copied = Vec::new();
+
     let feature_file = match feature {
         "dio" => "dioxus",
         "lep" => "leptos",
         _ => feature,
     };
 
+    let crate_dir = dest_dir.join(crate_name);
+    fs::create_dir_all(&crate_dir)
+        .with_context(|| format!("Failed to create crate directory at {:?}", crate_dir))?;
+
     for entry in WalkDir::new(src_dir).into_iter().flatten() {
         let path = entry.path();
         if path.is_file() {
             let file_name = path.file_name().unwrap().to_string_lossy();
-            if [
+
+            let should_copy = [
                 "common.rs",
                 "config.rs",
-                &format!("{feature_file}.rs"),
                 "countries.rs",
                 "chart.rs",
+                &format!("{feature_file}.rs"),
             ]
-            .contains(&file_name.as_ref())
-            {
-                let dest_path = dest_dir.join(file_name.to_string());
-                fs::copy(path, &dest_path)?;
-                copied.push(file_name.to_string());
+            .contains(&file_name.as_ref());
+
+            if should_copy {
+                let dest_file_name = if file_name == format!("{feature_file}.rs") {
+                    format!("{crate_name}.rs")
+                } else {
+                    file_name.to_string()
+                };
+
+                let dest_path = crate_dir.join(&dest_file_name);
+
+                fs::copy(path, &dest_path)
+                    .with_context(|| format!("Failed to copy {:?} to {:?}", path, dest_path))?;
+
+                copied.push(dest_file_name.trim_end_matches(".rs").to_string());
             }
         }
     }
 
-    Ok(copied
-        .into_iter()
-        .map(|f| f.trim_end_matches(".rs").to_string())
-        .collect())
+    let crate_file = dest_dir.join(format!("{crate_name}.rs"));
+    update_pub_file(crate_file, &copied)?;
+
+    Ok(copied)
 }
 
-pub fn update_lib_rs(lib_path: PathBuf, modules: &[String]) -> anyhow::Result<()> {
+pub fn update_pub_file(lib_path: PathBuf, modules: &[String]) -> Result<()> {
     let mut content = if lib_path.exists() {
         fs::read_to_string(&lib_path)?
     } else {
@@ -61,7 +79,7 @@ pub fn update_lib_rs(lib_path: PathBuf, modules: &[String]) -> anyhow::Result<()
     Ok(())
 }
 
-pub fn update_cargo_toml(from: PathBuf, to: &Path, _feature: &str) -> anyhow::Result<()> {
+pub fn update_cargo_toml(from: PathBuf, to: &Path, _feature: &str) -> Result<()> {
     let source_content = fs::read_to_string(&from)?;
     let from_doc: DocumentMut = source_content.parse()?;