@lamentis/naome 1.3.11 → 1.3.13

package/crates/naome-core/tests/architecture.rs

@@ -1,15 +1,12 @@
-use std::fs;
-use std::path::{Path, PathBuf};
-use std::process::Command;
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::time::{SystemTime, UNIX_EPOCH};
-
 use naome_core::{
     default_architecture_config_text, scan_architecture, validate_architecture, ArchitectureConfig,
     ArchitectureEdgeKind, ArchitectureScanOptions,
 };
 
-static FIXTURE_COUNTER: AtomicU64 = AtomicU64::new(0);
+mod architecture_support;
+
+use architecture_support::{has_import_edge, FixtureRepo};
+
 const FORBIDDEN_DOMAIN_TO_INFRASTRUCTURE_CONFIG: &str = "layers:\n  domain:\n    paths:\n      - \"src/domain/**\"\n  infrastructure:\n    paths:\n      - \"src/infrastructure/**\"\nallowed_dependencies:\n  domain:\n  infrastructure:\n    - domain\nrules:\n  no_forbidden_layer_dependencies:\n    enabled: true\n    severity: error\n";
 
 #[test]
@@ -180,7 +177,7 @@ fn import_resolution_covers_common_language_forms_without_dropping_layer_edges()
 #[test]
 fn relative_import_resolution_prefers_source_language_extensions() {
     let repo = FixtureRepo::new();
-    repo.write("src/domain/mod.rs", "mod db;\n");
+    repo.write("src/domain/mod.rs", "use self::db::right;\n");
     repo.write("src/domain/db.ts", "export const wrong = true;\n");
     repo.write("src/domain/db.rs", "pub fn right() {}\n");
 
@@ -235,12 +232,24 @@ fn import_resolver_handles_language_specific_module_roots() {
         "file:packages/app/src/domain/event.rs",
         "file:packages/app/src/infrastructure/db.rs"
     ));
-    assert!(has("file:src/domain/service.rs", "file:src/domain/service/helper.rs"));
-    assert!(!has("file:src/domain/service.rs", "file:src/domain/helper.rs"));
-    assert!(has("file:src/domain/service.rs", "file:src/domain/infra.rs"));
+    assert!(has(
+        "file:src/domain/service.rs",
+        "file:src/domain/service/helper.rs"
+    ));
+    assert!(!has(
+        "file:src/domain/service.rs",
+        "file:src/domain/helper.rs"
+    ));
+    assert!(has(
+        "file:src/domain/service.rs",
+        "file:src/domain/infra.rs"
+    ));
     assert!(!has("file:src/domain/service.rs", "file:src/infra.rs"));
     assert!(has("file:domain/event.go", "file:infrastructure/db/db.go"));
-    assert!(!has("file:domain/external.go", "file:infrastructure/db/db.go"));
+    assert!(!has(
+        "file:domain/external.go",
+        "file:infrastructure/db/db.go"
+    ));
 }
 
 #[test]
@@ -291,20 +300,44 @@ fn overlapping_target_layers_do_not_create_false_forbidden_dependency() {
 fn late_review_import_forms_keep_forbidden_layer_edges_visible() {
     let repo = FixtureRepo::new();
     repo.write("naome.arch.yaml", FORBIDDEN_DOMAIN_TO_INFRASTRUCTURE_CONFIG);
-    repo.write("src/domain/grouped.rs", "use crate::{domain::types, infrastructure::db};\n");
+    repo.write(
+        "src/domain/grouped.rs",
+        "use crate::{domain::types, infrastructure::db};\n",
+    );
     repo.write("src/domain/types.rs", "pub struct Event;\n");
     repo.write("src/infrastructure/db.rs", "pub fn connect() {}\n");
-    repo.write("src/domain/visible.rs", "pub(crate) use crate::infrastructure::db as database;\n");
-    repo.write("src/domain/nested.rs", "use crate::{domain::types, infrastructure::{db, cache}};\n");
+    repo.write(
+        "src/domain/visible.rs",
+        "pub(crate) use crate::infrastructure::db as database;\n",
+    );
+    repo.write(
+        "src/domain/nested.rs",
+        "use crate::{domain::types, infrastructure::{db, cache}};\n",
+    );
     repo.write("src/infrastructure/cache.rs", "pub fn cache() {}\n");
-    repo.write("src/domain/parenthesized.py", "from src.infrastructure import (\n    client,\n)\n");
+    repo.write(
+        "src/domain/parenthesized.py",
+        "from src.infrastructure import (\n    client,\n)\n",
+    );
     repo.write("src/infrastructure/client.py", "db = object()\n");
-    repo.write("src/domain/dynamic.ts", "const db = await import(\n  '../infrastructure/db_client'\n);\n");
+    repo.write(
+        "src/domain/dynamic.ts",
+        "const db = await import(\n  '../infrastructure/db_client'\n);\n",
+    );
     repo.write("src/infrastructure/db_client.ts", "export const db = 1;\n");
-    repo.write("src/domain/export_literal.ts", "export const fixture = '../infrastructure/db_client';\n");
-    repo.write("src/domain/commented.ts", "// await import('../infrastructure/db_client')\n");
+    repo.write(
+        "src/domain/export_literal.ts",
+        "export const fixture = '../infrastructure/db_client';\n",
+    );
+    repo.write(
+        "src/domain/commented.ts",
+        "// await import('../infrastructure/db_client')\n",
+    );
     repo.write("go.mod", "module github.com/acme/app\n");
-    repo.write("src/domain/commented.go", "package domain\nimport (\n  // \"github.com/acme/app/src/infrastructure/dbgo\"\n)\n");
+    repo.write(
+        "src/domain/commented.go",
+        "package domain\nimport (\n  // \"github.com/acme/app/src/infrastructure/dbgo\"\n)\n",
+    );
     repo.write("src/infrastructure/dbgo/dbgo.go", "package dbgo\n");
 
     let report = validate_architecture(repo.path(), ArchitectureScanOptions::default()).unwrap();
@@ -481,68 +514,3 @@ ignore:
         Some("generated/client.ts")
     );
 }
-
-struct FixtureRepo {
-    root: PathBuf,
-}
-
-impl FixtureRepo {
-    fn new() -> Self {
-        let nonce = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_nanos();
-        let counter = FIXTURE_COUNTER.fetch_add(1, Ordering::Relaxed);
-        let root = std::env::temp_dir().join(format!(
-            "naome-arch-fixture-{}-{nonce}-{counter}",
-            std::process::id()
-        ));
-        fs::create_dir_all(&root).unwrap();
-        fs::write(
-            root.join(".naomeignore"),
-            ".naome/archive/\n.naome/tasks/\n",
-        )
-        .unwrap();
-        Self { root }
-    }
-
-    fn path(&self) -> &Path {
-        &self.root
-    }
-
-    fn write(&self, relative_path: &str, content: &str) {
-        let path = self.root.join(relative_path);
-        fs::create_dir_all(path.parent().unwrap()).unwrap();
-        fs::write(path, content).unwrap();
-    }
-
-    fn init_git(&self) {
-        run_git(&self.root, &["init"]);
-        run_git(&self.root, &["config", "user.email", "naome@example.com"]);
-        run_git(&self.root, &["config", "user.name", "NAOME Test"]);
-        self.write("README.md", "# Fixture\n");
-        run_git(&self.root, &["add", "."]);
-        run_git(&self.root, &["commit", "-m", "baseline"]);
-    }
-}
-
-fn run_git(root: &Path, args: &[&str]) {
-    let result = Command::new("git")
-        .args(args)
-        .current_dir(root)
-        .output()
-        .unwrap();
-    assert!(
-        result.status.success(),
-        "git {:?} failed: {}{}",
-        args,
-        String::from_utf8_lossy(&result.stdout),
-        String::from_utf8_lossy(&result.stderr)
-    );
-}
-
-fn has_import_edge(scan: &naome_core::ArchitectureScanReport, from: &str, to: &str) -> bool {
-    scan.graph.edges.iter().any(|edge| {
-        edge.kind == ArchitectureEdgeKind::Imports && edge.from == from && edge.to == to
-    })
-}

package/crates/naome-core/tests/architecture_manifests.rs

@@ -0,0 +1,289 @@
+use naome_core::{scan_architecture, ArchitectureEdgeKind, ArchitectureScanOptions};
+
+mod architecture_support;
+
+use architecture_support::FixtureRepo;
+
+#[test]
+fn manifest_extractors_add_package_dependency_graph_nodes() {
+    let repo = FixtureRepo::new();
+    repo.write(
+        "package.json",
+        r#"{
+  "name": "@acme/web",
+  "dependencies": { "react": "^18.0.0" },
+  "devDependencies": { "vite": "^5.0.0" }
+}
+"#,
+    );
+    repo.write(
+        "crates/app/Cargo.toml",
+        "[package]\nname = \"app\"\nversion = \"0.1.0\"\n[dependencies]\nserde = \"1\"\n",
+    );
+    repo.write(
+        "pyproject.toml",
+        "[project]\nname = \"acme-python\"\ndependencies = [\"requests>=2\", \"fastapi\"]\n",
+    );
+    repo.write(
+        "go.mod",
+        "module github.com/acme/app\nrequire github.com/gin-gonic/gin v1.9.0\n",
+    );
+    repo.write(
+        "pom.xml",
+        "<project><groupId>com.acme</groupId><artifactId>service</artifactId><dependencies><dependency><groupId>org.slf4j</groupId><artifactId>slf4j-api</artifactId></dependency></dependencies></project>",
+    );
+    repo.write(
+        "build.gradle",
+        "plugins { id 'java' }\ndependencies { implementation 'com.google.guava:guava:33.0.0-jre' }\n",
+    );
+
+    let scan = scan_architecture(repo.path(), ArchitectureScanOptions::default()).unwrap();
+
+    for node_id in [
+        "package:npm:package.json",
+        "package:cargo:crates/app/Cargo.toml",
+        "package:python:pyproject.toml",
+        "package:go:go.mod",
+        "package:maven:pom.xml",
+        "package:gradle:build.gradle",
+        "external:react",
+        "external:vite",
+        "external:serde",
+        "external:requests",
+        "external:fastapi",
+        "external:github.com/gin-gonic/gin",
+        "external:org.slf4j:slf4j-api",
+        "external:com.google.guava:guava",
+    ] {
+        assert!(
+            scan.graph.nodes.iter().any(|node| node.id == node_id),
+            "missing {node_id}"
+        );
+    }
+    assert!(scan.graph.edges.iter().any(|edge| {
+        edge.kind == ArchitectureEdgeKind::DependsOn
+            && edge.from == "package:npm:package.json"
+            && edge.to == "external:react"
+            && edge.metadata.extractor == "manifest:package.json"
+    }));
+    assert!(scan.graph.edges.iter().any(|edge| {
+        edge.kind == ArchitectureEdgeKind::DependsOn
+            && edge.from == "package:go:go.mod"
+            && edge.to == "external:github.com/gin-gonic/gin"
+    }));
+    assert!(scan
+        .graph
+        .nodes
+        .iter()
+        .any(|node| { node.id == "package:npm:package.json" && node.label == "@acme/web" }));
+}
+
+#[test]
+fn manifest_package_ids_are_namespaced_and_parse_common_multiline_forms() {
+    let repo = FixtureRepo::new();
+    repo.write(
+        "package.json",
+        r#"{
+  "name": "core",
+  "dependencies": { "react": "^18.0.0" }
+}
+"#,
+    );
+    repo.write(
+        "crates/core/Cargo.toml",
+        "[package]\nname = \"core\"\nversion = \"0.1.0\"\n[dependencies.serde]\nversion = \"1\"\n",
+    );
+    repo.write(
+        "pyproject.toml",
+        "[project]\nname = \"core\"\ndependencies = [\n  \"requests>=2\",\n  \"fastapi\",\n]\n",
+    );
+    repo.write(
+        "build.gradle.kts",
+        "dependencies {\n  // implementation(\"com.acme:old-lib:1.0\")\n  implementation(\"com.google.guava:guava:33.0.0-jre\")\n  implementation group: 'com.squareup.okio', name: 'okio', version: '3.9.0'\n}\n",
+    );
+    repo.write(
+        "child/pom.xml",
+        r#"<project>
+  <parent>
+    <groupId>com.acme.parent</groupId>
+    <artifactId>parent</artifactId>
+  </parent>
+  <groupId>com.acme.child</groupId>
+  <artifactId>service</artifactId>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.acme</groupId>
+        <artifactId>managed-only</artifactId>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <dependencies>
+          <dependency>
+            <groupId>com.acme</groupId>
+            <artifactId>plugin-only</artifactId>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>"#,
+    );
+    let scan = scan_architecture(repo.path(), ArchitectureScanOptions::default()).unwrap();
+
+    for (node_id, label) in [
+        ("package:npm:package.json", "core"),
+        ("package:cargo:crates/core/Cargo.toml", "core"),
+        ("package:python:pyproject.toml", "core"),
+        ("package:gradle:build.gradle.kts", "gradle:build.gradle.kts"),
+        ("package:maven:child/pom.xml", "com.acme.child:service"),
+    ] {
+        assert!(
+            scan.graph
+                .nodes
+                .iter()
+                .any(|node| node.id == node_id && node.label == label),
+            "missing {node_id} with label {label}"
+        );
+    }
+    for (package_id, dependency_id) in [
+        ("package:npm:package.json", "external:react"),
+        ("package:cargo:crates/core/Cargo.toml", "external:serde"),
+        ("package:python:pyproject.toml", "external:requests"),
+        ("package:python:pyproject.toml", "external:fastapi"),
+        (
+            "package:gradle:build.gradle.kts",
+            "external:com.google.guava:guava",
+        ),
+        (
+            "package:gradle:build.gradle.kts",
+            "external:com.squareup.okio:okio",
+        ),
+        (
+            "package:maven:child/pom.xml",
+            "external:org.slf4j:slf4j-api",
+        ),
+    ] {
+        assert!(
+            scan.graph.edges.iter().any(|edge| {
+                edge.kind == ArchitectureEdgeKind::DependsOn
+                    && edge.from == package_id
+                    && edge.to == dependency_id
+            }),
+            "missing edge {package_id} -> {dependency_id}"
+        );
+    }
+    assert!(!scan
+        .graph
+        .nodes
+        .iter()
+        .any(|node| node.id == "external:com.acme:old-lib"));
+    assert!(!scan
+        .graph
+        .nodes
+        .iter()
+        .any(|node| node.id == "external:com.acme:managed-only"));
+    assert!(!scan
+        .graph
+        .nodes
+        .iter()
+        .any(|node| node.id == "external:com.acme:plugin-only"));
+}
+
+#[test]
+fn swift_manifests_emit_package_and_dependency_nodes() {
+    let repo = FixtureRepo::new();
+    repo.write(
+        "Package.swift",
+        r#"// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+  name: "Tickets",
+  dependencies: [
+    .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.9.0"),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.8.0")
+  ]
+)
+"#,
+    );
+    repo.write(
+        "Tickets.xcodeproj/project.pbxproj",
+        r#"
+/* Begin XCRemoteSwiftPackageReference section */
+  repositoryURL = "https://github.com/onevcat/Kingfisher.git";
+/* End XCRemoteSwiftPackageReference section */
+"#,
+    );
+
+    let scan = scan_architecture(repo.path(), ArchitectureScanOptions::default()).unwrap();
+
+    for node_id in [
+        "package:swift:Package.swift",
+        "package:xcode:Tickets.xcodeproj/project.pbxproj",
+        "external:Alamofire",
+        "external:swift-composable-architecture",
+        "external:Kingfisher",
+    ] {
+        assert!(
+            scan.graph.nodes.iter().any(|node| node.id == node_id),
+            "missing {node_id}"
+        );
+    }
+    assert!(scan.graph.edges.iter().any(|edge| {
+        edge.kind == ArchitectureEdgeKind::DependsOn
+            && edge.from == "package:swift:Package.swift"
+            && edge.to == "external:Alamofire"
+    }));
+    assert!(scan.graph.edges.iter().any(|edge| {
+        edge.kind == ArchitectureEdgeKind::DependsOn
+            && edge.from == "package:xcode:Tickets.xcodeproj/project.pbxproj"
+            && edge.to == "external:Kingfisher"
+    }));
+}
+
+#[test]
+fn swift_manifests_ignore_commented_package_declarations() {
+    let repo = FixtureRepo::new();
+    repo.write(
+        "Package.swift",
+        r#"// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+  name: "CoreSwift",
+  dependencies: [
+    // .package(url: "https://github.com/Old/Old.git", from: "1.0.0"),
+    .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.9.0")
+  ]
+)
+"#,
+    );
+
+    let scan = scan_architecture(repo.path(), ArchitectureScanOptions::default()).unwrap();
+
+    assert!(scan
+        .graph
+        .nodes
+        .iter()
+        .any(|node| node.id == "package:swift:Package.swift" && node.label == "CoreSwift"));
+    assert!(scan.graph.edges.iter().any(|edge| {
+        edge.kind == ArchitectureEdgeKind::DependsOn
+            && edge.from == "package:swift:Package.swift"
+            && edge.to == "external:Alamofire"
+    }));
+    assert!(!scan
+        .graph
+        .nodes
+        .iter()
+        .any(|node| node.id == "external:Old"));
+}