makinzm
diff --git a/‎Cargo.lock‎
Lines changed: 1 addition & 1 deletion b/‎Cargo.lock‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 40 additions & 0 deletions b/‎README.md‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎docs/TODO.md‎
Lines changed: 1 addition & 0 deletions b/‎docs/TODO.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎mille.toml‎
Lines changed: 4 additions & 0 deletions b/‎mille.toml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/domain/entity/config.rs‎
Lines changed: 147 additions & 77 deletions b/‎src/domain/entity/config.rs‎
Lines changed: 147 additions & 77 deletions
@@ -23,6 +23,7 @@ One TOML config. Rust-powered. CI-ready. Supports multiple languages from a sing
 | Layer dependency rules (`dependency_mode`) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | External library rules (`external_mode`) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | DI method call rules (`allow_call_patterns`) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
+| Naming convention rules (`name_deny`) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 
 ## Install
 
@@ -432,6 +433,43 @@ Exit codes:
 | `external_mode` | `"opt-in"` or `"opt-out"` for external library usage |
 | `external_allow` | Allowed external packages (when `external_mode = "opt-in"`) |
 | `external_deny` | Forbidden external packages (when `external_mode = "opt-out"`) |
+| `name_deny` | Forbidden keywords for naming convention check (case-insensitive partial match) |
+| `name_allow` | Substrings to strip before `name_deny` check (e.g. `"category"` prevents `"go"` match inside it) |
+| `name_targets` | Targets to check: `"file"`, `"symbol"`, `"variable"`, `"comment"` (default: all) |
+| `name_deny_ignore` | Glob patterns for files to exclude from naming checks (e.g. `"**/test_*.rs"`) |
+
+#### Naming Convention Check (`name_deny`)
+
+Forbid infrastructure-specific keywords from appearing in a layer's names.
+
+```toml
+[[layers]]
+name = "usecase"
+paths = ["src/usecase/**"]
+dependency_mode = "opt-out"
+deny = []
+external_mode = "opt-out"
+external_deny = []
+
+# Usecase layer must not reference specific infrastructure technologies
+name_deny    = ["gcp", "aws", "azure", "mysql", "postgres"]
+name_allow   = ["category"]   # "category" contains "go" but should not be flagged
+name_targets = ["file", "symbol", "variable", "comment"]  # default: all targets
+name_deny_ignore = ["**/test_*.rs", "tests/**"]  # exclude test files from naming checks
+```
+
+**Rules:**
+- Case-insensitive (`GCP` = `gcp` = `Gcp`)
+- Partial match (`ManageGcp` also matches `gcp`)
+- `name_allow` strips listed substrings before matching (e.g. `"category"` prevents false positive on `"go"`)
+- `name_deny_ignore` excludes files matching glob patterns from naming checks entirely
+- `name_targets` restricts which entity types are checked:
+  - `"file"`: file basename (e.g. `aws_client.rs`)
+  - `"symbol"`: function, class, struct, enum, trait, interface, type alias names
+  - `"variable"`: variable, const, let, static declaration names
+  - `"comment"`: inline comment content
+- Supported languages: Rust, TypeScript, JavaScript, Python, Go, Java, Kotlin
+- Severity is controlled by `severity.naming_violation` (default: `"error"`)
 
 ### `[[layers.allow_call_patterns]]`
 
@@ -472,13 +510,15 @@ Control the severity level of each violation type. Violations can be `"error"`,
 | `external_violation` | `"error"` | External library rule violated |
 | `call_pattern_violation` | `"error"` | DI entrypoint method call rule violated |
 | `unknown_import` | `"warning"` | Import that could not be classified |
+| `naming_violation` | `"error"` | Naming convention rule violated (`name_deny`) |
 
 ```toml
 [severity]
 dependency_violation   = "warning"   # treat as warning for gradual adoption
 external_violation     = "error"
 call_pattern_violation = "error"
 unknown_import         = "warning"
+naming_violation       = "warning"   # treat as warning while rolling out naming rules
 ```
 
 Use `--fail-on warning` to exit 1 even for warnings when integrating into CI gradually.
 
@@ -28,6 +28,7 @@
 - ✅ Kotlin 言語サポート — `.kt` ファイルのパース（tree-sitter-kotlin）・`[resolve.java]` リゾルバー共用、flat/Gradle レイアウト対応、E2E テスト追加
 - ✅ `mille init` Python namespace パッケージ修正 — `src/` レイアウトで `from src.domain...` を使うプロジェクトで `src` が `package_names` に自動追加されるよう修正（PR #62）
 - ✅ `mille init` Python namespace インポートスキャン修正 — `from src.domain.entity import X` がレイヤー内部依存として正しく検出されるよう修正（`classify_py_import` フルパス返し + `resolve_to_known_dir` プレフィックス照合）、`src/main.py` 等の浅い階層ファイルがスキップされずレイヤーとして登録されるよう修正（PR #62）
+- ✅ ネーミング規則チェック (`name_deny` / `name_targets` / `name_allow` / `name_deny_ignore`) — レイヤーごとに禁止キーワードを設定し、ファイル名・シンボル名・変数名・コメントに禁止キーワードが含まれる場合に `NamingViolation` を報告（大文字小文字区別なし・部分一致）。`name_allow` で false positive を抑制、`name_deny_ignore` でグロブパターンにマッチするファイルを除外可能。対応言語: Rust/TypeScript/Python/Go/Java/Kotlin。`severity.naming_violation` で重大度設定可（PR #65）
 
 以下は **設定ファイルにフィールドが存在しても、まだ動作していない** 項目です（README に掲載しないよう修正済み）：
 （現在なし）
 
@@ -11,6 +11,8 @@ allow = []
 deny = ["infrastructure", "usecase", "presentation"]
 external_mode = "opt-in"
 external_allow = ["serde"]
+name_deny = ["python", "go", "java", "kotlin", "javascript", "typescript", "ruby", "php", "csharp", "cpp", "rust"]
+name_allow = ["category", "algorithm", "diagonal", "cargo", "ergonomic"]
 
 [[layers]]
 name = "infrastructure"
@@ -27,6 +29,8 @@ dependency_mode = "opt-in"
 allow = ["domain"]
 external_mode = "opt-in"
 external_allow = []
+name_deny = ["python", "go", "java", "kotlin", "javascript", "typescript", "ruby", "php", "csharp", "cpp", "rust"]
+name_allow = ["algorithm", "cargo", "ergonomic"]
 
 [[layers]]
 name = "presentation"
 
@@ -17,57 +17,6 @@ pub struct IgnoreConfig {
     pub test_patterns: Vec<String>,
 }
 
-#[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
-pub struct ResolveConfig {
-    pub typescript: Option<TsResolveConfig>,
-    pub go: Option<GoResolveConfig>,
-    pub python: Option<PythonResolveConfig>,
-    pub java: Option<JavaResolveConfig>,
-    #[serde(default)]
-    pub aliases: std::collections::HashMap<String, String>,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
-pub struct TsResolveConfig {
-    pub tsconfig: String,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
-pub struct GoResolveConfig {
-    pub module_name: String,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
-pub struct JavaResolveConfig {
-    /// Base package name that identifies internal imports.
-    /// e.g. "com.example.myapp" — imports starting with this prefix are Internal.
-    /// If omitted, mille auto-detects from `pom_xml` or `build_gradle`.
-    #[serde(default)]
-    pub module_name: Option<String>,
-    /// Path to pom.xml (relative to mille.toml). If set, `groupId.artifactId`
-    /// is used as the module name when `module_name` is not explicitly specified.
-    #[serde(default)]
-    pub pom_xml: Option<String>,
-    /// Path to build.gradle (relative to mille.toml). If set, `group.rootProject.name`
-    /// is used as the module name when `module_name` is not explicitly specified.
-    #[serde(default)]
-    pub build_gradle: Option<String>,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
-pub struct PythonResolveConfig {
-    /// Source root relative to project root. Optional — if omitted, mille derives it
-    /// automatically from the importing file's path and `package_names`.
-    /// NOTE: this field is currently not consumed by the resolver; the resolver always
-    /// auto-derives the source root. The field is kept for forward compatibility.
-    #[serde(default)]
-    pub src_root: String,
-    /// Top-level package names that are part of this project.
-    /// Imports starting with any of these names are classified as Internal.
-    #[serde(default)]
-    pub package_names: Vec<String>,
-}
-
 #[derive(Debug, Deserialize, PartialEq, Eq, Clone)]
 pub struct SeverityConfig {
     #[serde(default = "default_error")]
@@ -78,6 +27,8 @@ pub struct SeverityConfig {
     pub call_pattern_violation: String,
     #[serde(default = "default_warning")]
     pub unknown_import: String,
+    #[serde(default = "default_error")]
+    pub naming_violation: String,
 }
 
 fn default_error() -> String {
@@ -94,7 +45,6 @@ pub struct MilleConfig {
     #[serde(rename = "layers", default)]
     pub layers: Vec<LayerConfig>,
     pub ignore: Option<IgnoreConfig>,
-    pub resolve: Option<ResolveConfig>,
     #[serde(default = "default_severity")]
     pub severity: SeverityConfig,
 }
@@ -105,6 +55,7 @@ fn default_severity() -> SeverityConfig {
         external_violation: default_error(),
         call_pattern_violation: default_error(),
         unknown_import: default_warning(),
+        naming_violation: default_error(),
     }
 }
 
@@ -119,66 +70,185 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_python_resolve_config_without_src_root_parses() {
-        // src_root なしの [resolve.python] は parse エラーにならないべき
+    fn test_config_with_resolve_section_still_parses() {
+        // [resolve] section is now handled by infrastructure's two-pass parsing,
+        // but MilleConfig should still parse when [resolve] is absent.
         let toml = r#"
 [project]
 name = "myproject"
 root = "."
-languages = ["python"]
-
-[resolve.python]
-package_names = ["domain", "usecase"]
+languages = ["rust"]
 
 [[layers]]
 name = "domain"
 paths = ["src/domain/**"]
 dependency_mode = "opt-in"
 external_mode = "opt-in"
+"#;
+        let result = toml::from_str::<MilleConfig>(toml);
+        assert!(result.is_ok(), "parse should succeed: {:?}", result.err());
+    }
+
+    #[test]
+    fn test_layer_config_with_name_deny_parses() {
+        // name_deny を含む [[layers]] が parse できる
+        let toml = r#"
+[project]
+name = "myproject"
+root = "."
+languages = ["rust"]
+
+[[layers]]
+name = "usecase"
+paths = ["src/usecase/**"]
+dependency_mode = "opt-out"
+external_mode = "opt-out"
+name_deny = ["aws", "gcp"]
+"#;
+        let result = toml::from_str::<MilleConfig>(toml);
+        assert!(
+            result.is_ok(),
+            "name_deny で parse できるべき: {:?}",
+            result.err()
+        );
+        let config = result.unwrap();
+        assert_eq!(config.layers[0].name_deny, vec!["aws", "gcp"]);
+    }
+
+    #[test]
+    fn test_layer_config_with_name_targets_parses() {
+        use crate::domain::entity::layer::NameTarget;
+        // name_targets を含む [[layers]] が parse できる
+        let toml = r#"
+[project]
+name = "myproject"
+root = "."
+languages = ["rust"]
+
+[[layers]]
+name = "usecase"
+paths = ["src/usecase/**"]
+dependency_mode = "opt-out"
+external_mode = "opt-out"
+name_deny = ["aws"]
+name_targets = ["file", "symbol"]
 "#;
         let result = toml::from_str::<MilleConfig>(toml);
         assert!(
             result.is_ok(),
-            "src_root なしで parse できるべき: {:?}",
+            "name_targets で parse できるべき: {:?}",
             result.err()
         );
         let config = result.unwrap();
-        let py = config
-            .resolve
-            .unwrap()
-            .python
-            .expect("python config should exist");
-        assert_eq!(py.src_root, "");
-        assert_eq!(py.package_names, vec!["domain", "usecase"]);
+        assert_eq!(
+            config.layers[0].name_targets,
+            vec![NameTarget::File, NameTarget::Symbol]
+        );
     }
 
     #[test]
-    fn test_python_resolve_config_with_src_root_still_parses() {
-        // 既存の src_root ありの設定は引き続き parse できる (regression)
+    fn test_layer_config_name_targets_default_is_all() {
+        use crate::domain::entity::layer::NameTarget;
+        // name_targets を省略したとき全ターゲットがデフォルトになる
         let toml = r#"
 [project]
 name = "myproject"
 root = "."
-languages = ["python"]
+languages = ["rust"]
 
-[resolve.python]
-src_root = "src"
-package_names = ["domain"]
+[[layers]]
+name = "usecase"
+paths = ["src/usecase/**"]
+dependency_mode = "opt-out"
+external_mode = "opt-out"
+name_deny = ["aws"]
+"#;
+        let result = toml::from_str::<MilleConfig>(toml);
+        assert!(
+            result.is_ok(),
+            "name_targets 省略で parse できるべき: {:?}",
+            result.err()
+        );
+        let config = result.unwrap();
+        assert_eq!(config.layers[0].name_targets, NameTarget::all());
+    }
+
+    #[test]
+    fn test_severity_config_with_naming_violation_parses() {
+        // naming_violation = "error" を含む [severity] が parse できる
+        let toml = r#"
+[project]
+name = "myproject"
+root = "."
+languages = ["rust"]
+
+[[layers]]
+name = "usecase"
+paths = ["src/usecase/**"]
+dependency_mode = "opt-out"
+external_mode = "opt-out"
+
+[severity]
+naming_violation = "error"
+"#;
+        let result = toml::from_str::<MilleConfig>(toml);
+        assert!(
+            result.is_ok(),
+            "naming_violation で parse できるべき: {:?}",
+            result.err()
+        );
+        let config = result.unwrap();
+        assert_eq!(config.severity.naming_violation, "error");
+    }
+
+    #[test]
+    fn test_severity_config_naming_violation_default_is_error() {
+        // naming_violation を省略したときデフォルトは "error"
+        let toml = r#"
+[project]
+name = "myproject"
+root = "."
+languages = ["rust"]
+
+[[layers]]
+name = "usecase"
+paths = ["src/usecase/**"]
+dependency_mode = "opt-out"
+external_mode = "opt-out"
+"#;
+        let result = toml::from_str::<MilleConfig>(toml);
+        assert!(result.is_ok());
+        let config = result.unwrap();
+        assert_eq!(config.severity.naming_violation, "error");
+    }
+
+    #[test]
+    fn test_layer_config_with_name_deny_ignore_parses() {
+        // name_deny_ignore を含む [[layers]] が parse できる
+        let toml = r#"
+[project]
+name = "myproject"
+root = "."
+languages = ["rust"]
 
 [[layers]]
 name = "domain"
 paths = ["src/domain/**"]
-dependency_mode = "opt-in"
-external_mode = "opt-in"
+dependency_mode = "opt-out"
+external_mode = "opt-out"
+name_deny = ["aws", "gcp"]
+name_deny_ignore = ["**/test_*.rs", "tests/**"]
 "#;
         let result = toml::from_str::<MilleConfig>(toml);
         assert!(
             result.is_ok(),
-            "src_root ありも parse できるべき: {:?}",
+            "name_deny_ignore で parse できるべき: {:?}",
             result.err()
         );
         let config = result.unwrap();
-        let py = config.resolve.unwrap().python.unwrap();
-        assert_eq!(py.src_root, "src");
+        assert_eq!(
+            config.layers[0].name_deny_ignore,
+            vec!["**/test_*.rs", "tests/**"]
+        );
     }
 }