@lamentis/naome 1.3.0 → 1.3.1

package/crates/naome-core/src/quality/structure/adapter_ios.rs

@@ -0,0 +1,149 @@
+use crate::quality::adapter_support::{
+    detects_generated_ios_project, detects_ios_app_structure_project,
+    detects_ios_resources_project, detects_swift_package_project, detects_swift_project,
+    detects_swiftui_project, detects_xcode_project, detects_xctest_project,
+};
+
+use super::adapters::StructureAdapter;
+
+pub(super) fn adapters() -> Vec<StructureAdapter> {
+    let mut adapters = Vec::new();
+    adapters.extend_from_slice(IOS_CORE_STRUCTURE_ADAPTERS);
+    adapters.extend_from_slice(IOS_APP_STRUCTURE_ADAPTERS);
+    adapters
+}
+
+const IOS_CORE_STRUCTURE_ADAPTERS: &[StructureAdapter] = &[
+    StructureAdapter {
+        id: "swift",
+        detect: detects_swift_project,
+        source_roots: &[
+            "Sources/**",
+            "**/Sources/**",
+            "Source/**",
+            "App/**",
+            "Features/**",
+            "Modules/**",
+            "Shared/**",
+        ],
+        test_roots: &[],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &[
+            "Sources/*/**",
+            "**/Sources/*/**",
+            "App/**",
+            "Features/*/**",
+            "Modules/*/**",
+        ],
+        allowed_root_files: &[],
+    },
+    StructureAdapter {
+        id: "xcode",
+        detect: detects_xcode_project,
+        source_roots: &[],
+        test_roots: &[],
+        generated_roots: &[],
+        artifact_roots: &[
+            "DerivedData/**",
+            "**/DerivedData/**",
+            "Build/**",
+            "**/Build/**",
+            "**/*.xcarchive/**",
+        ],
+        module_roots: &[],
+        allowed_root_files: &["*.xcodeproj", "*.xcworkspace"],
+    },
+    StructureAdapter {
+        id: "xctest",
+        detect: detects_xctest_project,
+        source_roots: &[],
+        test_roots: &[
+            "Tests/**",
+            "**/Tests/**",
+            "*Tests/**",
+            "**/*Tests/**",
+            "*UITests/**",
+            "**/*UITests/**",
+        ],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &[],
+        allowed_root_files: &[],
+    },
+];
+
+const IOS_APP_STRUCTURE_ADAPTERS: &[StructureAdapter] = &[
+    StructureAdapter {
+        id: "swiftui",
+        detect: detects_swiftui_project,
+        source_roots: &[
+            "Views/**",
+            "**/Views/**",
+            "Preview Content/**",
+            "**/Preview Content/**",
+        ],
+        test_roots: &[],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &["Views/*/**", "**/Views/*/**"],
+        allowed_root_files: &[],
+    },
+    StructureAdapter {
+        id: "ios-app-structure",
+        detect: detects_ios_app_structure_project,
+        source_roots: &[
+            "App/**",
+            "Application/**",
+            "Features/**",
+            "Modules/**",
+            "Shared/**",
+        ],
+        test_roots: &[],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &["Features/*/**", "Modules/*/**", "App/**"],
+        allowed_root_files: &["Info.plist", "*.entitlements", "Podfile", "Cartfile"],
+    },
+    StructureAdapter {
+        id: "swift-package",
+        detect: detects_swift_package_project,
+        source_roots: &["Sources/**", "**/Sources/**"],
+        test_roots: &["Tests/**", "**/Tests/**"],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &["Sources/*/**", "**/Sources/*/**"],
+        allowed_root_files: &["Package.swift", "Package.resolved"],
+    },
+    StructureAdapter {
+        id: "ios-resources",
+        detect: detects_ios_resources_project,
+        source_roots: &["Resources/**", "**/Resources/**"],
+        test_roots: &[],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &["Resources/**", "**/Resources/**"],
+        allowed_root_files: &["Info.plist", "*.entitlements"],
+    },
+    StructureAdapter {
+        id: "generated-ios",
+        detect: detects_generated_ios_project,
+        source_roots: &[],
+        test_roots: &[],
+        generated_roots: &[
+            "Generated/**",
+            "**/Generated/**",
+            "SwiftGen/**",
+            "**/SwiftGen/**",
+            "Sourcery/**",
+            "**/Sourcery/**",
+            "**/*.generated.swift",
+            "**/*.pb.swift",
+            "**/*.grpc.swift",
+            "**/R.generated.swift",
+        ],
+        artifact_roots: &[],
+        module_roots: &[],
+        allowed_root_files: &[],
+    },
+];

package/crates/naome-core/src/quality/structure/adapters.rs

@@ -5,17 +5,21 @@ use crate::quality::adapter_support::{
     find_adapter_by_id, validate_ids, AdapterDescriptor, RepoSignals,
 };
 
+use super::adapter_ios;
 use super::model::RepositoryStructureConfig;
 
 const CONFIG_PATH: &str = ".naome/repository-structure.json";
 
-struct StructureAdapter {
-    id: &'static str,
-    detect: fn(&RepoSignals<'_>) -> bool,
-    source_roots: &'static [&'static str],
-    test_roots: &'static [&'static str],
-    module_roots: &'static [&'static str],
-    allowed_root_files: &'static [&'static str],
+#[derive(Clone, Copy)]
+pub(super) struct StructureAdapter {
+    pub(super) id: &'static str,
+    pub(super) detect: fn(&RepoSignals<'_>) -> bool,
+    pub(super) source_roots: &'static [&'static str],
+    pub(super) test_roots: &'static [&'static str],
+    pub(super) generated_roots: &'static [&'static str],
+    pub(super) artifact_roots: &'static [&'static str],
+    pub(super) module_roots: &'static [&'static str],
+    pub(super) allowed_root_files: &'static [&'static str],
 }
 
 impl AdapterDescriptor for StructureAdapter {
@@ -29,17 +33,21 @@ impl AdapterDescriptor for StructureAdapter {
 }
 
 pub fn detected_structure_adapter_ids(paths: &[String]) -> Vec<String> {
-    detected_ids(paths, registry())
+    let registry = registry();
+    detected_ids(paths, &registry)
 }
 
 pub fn apply_structure_adapters(
     mut config: RepositoryStructureConfig,
 ) -> Result<RepositoryStructureConfig, NaomeError> {
-    validate_structure_adapter_ids(&config.enabled_adapters)?;
+    let registry = registry();
+    validate_ids(&config.enabled_adapters, &registry, CONFIG_PATH)?;
     for adapter_id in config.enabled_adapters.clone() {
-        let adapter = find_adapter_by_id(registry(), &adapter_id, CONFIG_PATH)?;
+        let adapter = find_adapter_by_id(&registry, &adapter_id, CONFIG_PATH)?;
         extend_unique(&mut config.source_roots, adapter.source_roots);
         extend_unique(&mut config.test_roots, adapter.test_roots);
+        extend_unique(&mut config.generated_roots, adapter.generated_roots);
+        extend_unique(&mut config.artifact_roots, adapter.artifact_roots);
         extend_unique(&mut config.module_roots, adapter.module_roots);
         extend_unique(&mut config.allowed_root_files, adapter.allowed_root_files);
     }
@@ -47,38 +55,48 @@ pub fn apply_structure_adapters(
 }
 
 pub fn validate_structure_adapter_ids(ids: &[String]) -> Result<(), NaomeError> {
-    validate_ids(ids, registry(), CONFIG_PATH)
+    let registry = registry();
+    validate_ids(ids, &registry, CONFIG_PATH)
 }
 
-fn registry() -> &'static [StructureAdapter] {
-    &[
-        StructureAdapter {
-            id: "rust",
-            detect: detects_rust_project,
-            source_roots: &["src/**", "crates/*/src/**", "**/crates/*/src/**"],
-            test_roots: &["tests/**", "crates/*/tests/**", "**/crates/*/tests/**"],
-            module_roots: &["src/**", "crates/*/src/**", "**/crates/*/src/**"],
-            allowed_root_files: &["Cargo.toml", "Cargo.lock"],
-        },
-        StructureAdapter {
-            id: "javascript-typescript",
-            detect: detects_javascript_typescript_project,
-            source_roots: &[
-                "src/**",
-                "app/**",
-                "pages/**",
-                "components/**",
-                "packages/*/src/**",
-                "**/packages/*/src/**",
-            ],
-            test_roots: &["test/**", "tests/**", "__tests__/**", "packages/*/tests/**"],
-            module_roots: &["src/**", "app/**", "packages/*/src/**"],
-            allowed_root_files: &[
-                "package.json",
-                "tsconfig.json",
-                "vite.config.ts",
-                "next.config.js",
-            ],
-        },
-    ]
+const BASE_STRUCTURE_ADAPTERS: &[StructureAdapter] = &[
+    StructureAdapter {
+        id: "rust",
+        detect: detects_rust_project,
+        source_roots: &["src/**", "crates/*/src/**", "**/crates/*/src/**"],
+        test_roots: &["tests/**", "crates/*/tests/**", "**/crates/*/tests/**"],
+        generated_roots: &[],
+        artifact_roots: &[],
+        module_roots: &["src/**", "crates/*/src/**", "**/crates/*/src/**"],
+        allowed_root_files: &["Cargo.toml", "Cargo.lock"],
+    },
+    StructureAdapter {
+        id: "javascript-typescript",
+        detect: detects_javascript_typescript_project,
+        source_roots: &[
+            "src/**",
+            "app/**",
+            "pages/**",
+            "components/**",
+            "packages/*/src/**",
+            "**/packages/*/src/**",
+        ],
+        test_roots: &["test/**", "tests/**", "__tests__/**", "packages/*/tests/**"],
+        generated_roots: &[],
+        artifact_roots: &["coverage/**", "**/coverage/**", ".next/**", "**/.next/**"],
+        module_roots: &["src/**", "app/**", "packages/*/src/**"],
+        allowed_root_files: &[
+            "package.json",
+            "tsconfig.json",
+            "vite.config.ts",
+            "next.config.js",
+        ],
+    },
+];
+
+fn registry() -> Vec<StructureAdapter> {
+    let mut adapters = Vec::new();
+    adapters.extend_from_slice(BASE_STRUCTURE_ADAPTERS);
+    adapters.extend(adapter_ios::adapters());
+    adapters
 }

package/crates/naome-core/src/quality/structure/checks/directory.rs

@@ -83,10 +83,12 @@ pub(super) fn case_collisions(
     mode: QualityMode,
     violations: &mut Vec<QualityViolation>,
 ) {
-    for group in model.lowercase_paths.values().filter(|group| group.len() > 1) {
-        let changed_group = group.iter().any(|path| {
-            model.changed_paths.contains(path)
-        });
+    for group in model
+        .lowercase_paths
+        .values()
+        .filter(|group| group.len() > 1)
+    {
+        let changed_group = group.iter().any(|path| model.changed_paths.contains(path));
         if mode.is_changed() && !changed_group {
             continue;
         }

package/crates/naome-core/src/quality/structure/classify/roles.rs

@@ -2,13 +2,37 @@ use crate::paths;
 
 use crate::quality::structure::model::RepositoryStructureConfig;
 
+const ROLE_SEGMENTS: &[&str] = &[
+    "src",
+    "source",
+    "sources",
+    "test",
+    "tests",
+    "docs",
+    "doc",
+    "scripts",
+    "generated",
+    "resources",
+    "views",
+];
+
 pub fn role_for(path: &str, segments: &[String], config: &RepositoryStructureConfig) -> String {
     let lower = path.to_ascii_lowercase();
     if has_segment(segments, &["node_modules", "vendor", "third_party"]) {
         return "dependency/vendor".to_string();
     }
     if paths::matches_any(path, &config.generated_roots)
-        || has_segment(segments, &["generated", "__generated__", "codegen"])
+        || has_segment(
+            segments,
+            &[
+                "generated",
+                "__generated__",
+                "codegen",
+                "swiftgen",
+                "sourcery",
+            ],
+        )
+        || is_generated_ios_path(&lower)
     {
         return "generated".to_string();
     }
@@ -131,7 +155,13 @@ fn is_test_path(lower: &str, segments: &[String]) -> bool {
     lower.contains(".test.")
         || lower.contains(".spec.")
         || lower.ends_with("_test.rs")
+        || lower.ends_with("tests.swift")
+        || lower.ends_with("uitests.swift")
         || has_segment(segments, &["test", "tests", "__tests__"])
+        || segments.iter().any(|segment| {
+            let lower = segment.to_ascii_lowercase();
+            lower.ends_with("tests") || lower.ends_with("uitests")
+        })
 }
 
 fn is_docs_path(lower: &str, segments: &[String]) -> bool {
@@ -150,8 +180,16 @@ fn is_config_path(
     paths::matches_any(path, &config.allowed_root_files)
         || segments.len() == 1 && (lower.starts_with('.') || lower.ends_with(".toml"))
         || lower.ends_with(".json")
+        || lower.ends_with(".plist")
+        || lower.ends_with(".entitlements")
+        || lower.ends_with(".xcconfig")
+        || lower.ends_with(".strings")
+        || lower.ends_with(".stringsdict")
         || lower.ends_with(".yaml")
         || lower.ends_with(".yml")
+        || lower.ends_with("package.swift")
+        || lower.ends_with("podfile")
+        || lower.ends_with("cartfile")
 }
 
 fn is_script_path(lower: &str, segments: &[String]) -> bool {
@@ -163,6 +201,16 @@ fn is_artifact_path(lower: &str) -> bool {
         || lower.ends_with(".log")
         || lower.ends_with(".map")
         || lower.ends_with(".min.js")
+        || lower.contains("/deriveddata/")
+        || lower.ends_with(".xcarchive")
+        || lower.ends_with(".dsym")
+}
+
+fn is_generated_ios_path(lower: &str) -> bool {
+    lower.ends_with(".generated.swift")
+        || lower.ends_with(".pb.swift")
+        || lower.ends_with(".grpc.swift")
+        || lower.ends_with("/r.generated.swift")
 }
 
 fn has_segment(segments: &[String], expected: &[&str]) -> bool {
@@ -173,10 +221,8 @@ fn has_segment(segments: &[String], expected: &[&str]) -> bool {
 }
 
 fn is_role_segment(segment: &str) -> bool {
-    matches!(
-        segment,
-        "src" | "test" | "tests" | "docs" | "doc" | "scripts" | "generated"
-    )
+    let lower = segment.to_ascii_lowercase();
+    ROLE_SEGMENTS.contains(&lower.as_str())
 }
 
 fn stem(file_name: &str) -> Option<String> {

package/crates/naome-core/src/quality/structure/config.rs

@@ -19,6 +19,15 @@ pub fn structure_config_relative_path() -> &'static str {
 pub fn read_structure_config(
     root: &Path,
     paths: &[String],
+) -> Result<RepositoryStructureConfig, NaomeError> {
+    let config = read_policy_structure_config(root, paths)?;
+    validate_structure_config(&config)?;
+    apply_structure_adapters(config)
+}
+
+pub(crate) fn read_policy_structure_config(
+    root: &Path,
+    paths: &[String],
 ) -> Result<RepositoryStructureConfig, NaomeError> {
     let path = root.join(CONFIG_RELATIVE_PATH);
     let config = if path.is_file() {
@@ -27,7 +36,20 @@ pub fn read_structure_config(
         generated_structure_config(paths)
     };
     validate_structure_config(&config)?;
-    apply_structure_adapters(config)
+    Ok(config)
+}
+
+pub(crate) fn write_policy_structure_config(
+    root: &Path,
+    config: &RepositoryStructureConfig,
+) -> Result<(), NaomeError> {
+    let path = root.join(CONFIG_RELATIVE_PATH);
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent)?;
+    }
+    let content = serde_json::to_string_pretty(config)?;
+    fs::write(path, format!("{content}\n"))?;
+    Ok(())
 }
 
 pub fn write_default_structure_config_if_missing(
@@ -41,8 +63,7 @@ pub fn write_default_structure_config_if_missing(
     if let Some(parent) = path.parent() {
         fs::create_dir_all(parent)?;
     }
-    let content = serde_json::to_string_pretty(&generated_structure_config(paths))?;
-    fs::write(path, format!("{content}\n"))?;
+    write_policy_structure_config(root, &generated_structure_config(paths))?;
     Ok(true)
 }
 

package/crates/naome-core/src/quality/structure/mod.rs

@@ -1,3 +1,4 @@
+mod adapter_ios;
 mod adapters;
 mod checks;
 mod classify;
@@ -12,9 +13,11 @@ use crate::models::NaomeError;
 
 use super::scanner::QualityContext;
 use super::types::QualityViolation;
+pub(crate) use adapters::detected_structure_adapter_ids;
 use checks::run_structure_checks;
 use classify::build_structure_model;
 use config::read_structure_config;
+pub(crate) use config::{read_policy_structure_config, write_policy_structure_config};
 pub use config::{structure_config_relative_path, write_default_structure_config_if_missing};
 pub use model::{RepositoryStructureConfig, StructurePathExplanation};
 

package/crates/naome-core/src/quality/types.rs

@@ -5,6 +5,7 @@ use crate::paths;
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum QualityMode {
     ChangedFast,
+    PathScoped,
     Report,
     DeepReport,
 }
@@ -16,13 +17,14 @@ impl QualityMode {
     pub fn as_str(self) -> &'static str {
         match self {
             Self::ChangedFast => "changed",
+            Self::PathScoped => "path",
             Self::Report => "report",
             Self::DeepReport => "deep-report",
         }
     }
 
     pub fn is_changed(self) -> bool {
-        self == Self::ChangedFast
+        matches!(self, Self::ChangedFast | Self::PathScoped)
     }
 
     pub fn is_deep(self) -> bool {
@@ -257,6 +259,23 @@ pub struct QualityInitResult {
     pub baseline_path: String,
 }
 
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct QualityReconcileReport {
+    pub schema: String,
+    pub ok: bool,
+    pub stale: bool,
+    pub write: bool,
+    pub detected_quality_adapters: Vec<String>,
+    pub enabled_quality_adapters: Vec<String>,
+    pub missing_quality_adapters: Vec<String>,
+    pub detected_structure_adapters: Vec<String>,
+    pub enabled_structure_adapters: Vec<String>,
+    pub missing_structure_adapters: Vec<String>,
+    pub updated_paths: Vec<String>,
+    pub reason_codes: Vec<String>,
+}
+
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct QualityCleanupPlan {