Create tests cases to reproduce the module aliasing problem

cmcgee1024 · cmcgee1024 · commit d6db4df2be1e · 2025-07-17T11:34:12.000-04:00
diff --git a/Fixtures/ModuleAliasing/DirectDeps3/AppPkg/Package.swift b/Fixtures/ModuleAliasing/DirectDeps3/AppPkg/Package.swift
@@ -0,0 +1,29 @@
+// swift-tools-version:5.7
+import PackageDescription
+
+let package = Package(
+    name: "AppPkg",
+    dependencies: [
+        .package(path: "../UtilsPkg"),
+    ],
+    targets: [
+        .executableTarget(
+            name: "App",
+            dependencies: [
+                "Utils",
+                .product(name: "Lib",
+                         package: "UtilsPkg",
+                         moduleAliases: [
+                            "Utils": "GameUtils",
+                            "Lib": "GameLib",
+                        ]),
+            ],
+            path: "./Sources/App"),
+        .target(
+                name: "Utils",
+                dependencies: [],
+                path: "./Sources/Utils"
+            )
+        ]
+    )
+        
diff --git a/Fixtures/ModuleAliasing/DirectDeps3/AppPkg/Sources/App/main.swift b/Fixtures/ModuleAliasing/DirectDeps3/AppPkg/Sources/App/main.swift
@@ -0,0 +1,20 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+import Utils
+import GameUtils
+import GameLib
+
+Utils.echoModule()
+
+GameLib.userHelp()
+
+let level = LevelDetector.detect(for: "TestUser")
+print(level)
diff --git a/Fixtures/ModuleAliasing/DirectDeps3/AppPkg/Sources/Utils/FileUtils.swift b/Fixtures/ModuleAliasing/DirectDeps3/AppPkg/Sources/Utils/FileUtils.swift
@@ -0,0 +1,13 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+public func echoModule() {
+    print("Utils")
+}
diff --git a/Fixtures/ModuleAliasing/DirectDeps3/UtilsPkg/Package.swift b/Fixtures/ModuleAliasing/DirectDeps3/UtilsPkg/Package.swift
@@ -0,0 +1,14 @@
+// swift-tools-version:5.5
+import PackageDescription
+
+let package = Package(
+    name: "UtilsPkg",
+    products: [
+        .library(name: "Utils", targets: ["Utils"]),
+        .library(name: "Lib", targets: ["Lib", "Utils"])
+    ],
+    targets: [
+        .target(name: "Utils", dependencies: []),
+        .target(name: "Lib", dependencies: ["Utils"])
+    ]
+)
diff --git a/Fixtures/ModuleAliasing/DirectDeps3/UtilsPkg/Sources/Lib/Library.swift b/Fixtures/ModuleAliasing/DirectDeps3/UtilsPkg/Sources/Lib/Library.swift
@@ -0,0 +1,5 @@
+import Utils
+
+public func userHelp() {
+    _ = Utils.LevelDetector.detect(for: "someUser")
+}
diff --git a/Fixtures/ModuleAliasing/DirectDeps3/UtilsPkg/Sources/Utils/FileUtils.swift b/Fixtures/ModuleAliasing/DirectDeps3/UtilsPkg/Sources/Utils/FileUtils.swift
@@ -0,0 +1,15 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+public struct LevelDetector: Equatable {
+    public static func detect(for user: String) -> Int {
+        return user.count
+    }
+}
diff --git a/Fixtures/ModuleAliasing/NestedDeps3/AppPkg/Package.swift b/Fixtures/ModuleAliasing/NestedDeps3/AppPkg/Package.swift
@@ -0,0 +1,20 @@
+// swift-tools-version:5.7
+import PackageDescription
+
+let package = Package(
+    name: "AppPkg",
+    dependencies: [
+        .package(path: "../XPkg"),
+    ],
+    targets: [
+        .executableTarget(
+            name: "App",
+            dependencies: [
+                .product(name: "X",
+                         package: "XPkg",
+                         moduleAliases: ["Utils": "XUtils", "X": "XNew"]
+                        )
+            ]),
+    ]
+)
+
diff --git a/Fixtures/ModuleAliasing/NestedDeps3/AppPkg/Sources/App/main.swift b/Fixtures/ModuleAliasing/NestedDeps3/AppPkg/Sources/App/main.swift
@@ -0,0 +1,5 @@
+import XNew
+import XUtils
+
+utilsInX()
+XNew.funcInX()
diff --git a/Fixtures/ModuleAliasing/NestedDeps3/XPkg/Package.swift b/Fixtures/ModuleAliasing/NestedDeps3/XPkg/Package.swift
@@ -0,0 +1,18 @@
+// swift-tools-version:5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "XPkg",
+    products: [
+        .library(name: "X", targets: ["X"]),
+    ],
+    targets: [
+        .target(name: "X",
+                dependencies: [
+                    "Utils",
+                ]),
+        .target(name: "Utils", dependencies: [])
+    ]
+)
diff --git a/Fixtures/ModuleAliasing/NestedDeps3/XPkg/Sources/Utils/File.swift b/Fixtures/ModuleAliasing/NestedDeps3/XPkg/Sources/Utils/File.swift
@@ -0,0 +1,3 @@
+public func utilsInX() {
+    print("utils in X")
+}
diff --git a/Fixtures/ModuleAliasing/NestedDeps3/XPkg/Sources/X/File.swift b/Fixtures/ModuleAliasing/NestedDeps3/XPkg/Sources/X/File.swift
@@ -0,0 +1,6 @@
+import Utils
+
+public func funcInX() {
+    print("func in X")
+    utilsInX()
+}
diff --git a/Tests/FunctionalTests/ModuleAliasingFixtureTests.swift b/Tests/FunctionalTests/ModuleAliasingFixtureTests.swift
@@ -42,6 +42,19 @@ final class ModuleAliasingFixtureTests: XCTestCase {
         }
     }
 
+    func testModuleDirectDeps3() async throws {
+        try await fixture(name: "ModuleAliasing/DirectDeps3") { fixturePath in
+            let pkgPath = fixturePath.appending(components: "AppPkg")
+            let buildPath = pkgPath.appending(components: ".build", try UserToolchain.default.targetTriple.platformBuildPathComponent, "debug")
+            await XCTAssertBuilds(pkgPath, extraArgs: ["--vv"])
+            XCTAssertFileExists(buildPath.appending(components: executableName("App")))
+            XCTAssertFileExists(buildPath.appending(components: "Modules", "GameUtils.swiftmodule"))
+            XCTAssertFileExists(buildPath.appending(components: "Modules", "GameLib.swiftmodule"))
+            XCTAssertFileExists(buildPath.appending(components: "Modules", "Utils.swiftmodule"))
+            _ = try await SwiftPM.Build.execute(packagePath: pkgPath)
+        }
+    }
+
     func testModuleNestedDeps1() async throws {
         try await fixture(name: "ModuleAliasing/NestedDeps1") { fixturePath in
             let pkgPath = fixturePath.appending(components: "AppPkg")
@@ -71,4 +84,14 @@ final class ModuleAliasingFixtureTests: XCTestCase {
             _ = try await SwiftPM.Build.execute(packagePath: pkgPath)
         }
     }
+
+    func testModuleNestedDeps3() async throws {
+        try await fixture(name: "ModuleAliasing/NestedDeps3") { fixturePath in
+            let pkgPath = fixturePath.appending(components: "AppPkg")
+            let buildPath = pkgPath.appending(components: ".build", try UserToolchain.default.targetTriple.platformBuildPathComponent, "debug")
+            await XCTAssertBuilds(pkgPath, extraArgs: ["--vv"])
+            XCTAssertFileExists(buildPath.appending(components: executableName("App")))
+            _ = try await SwiftPM.Build.execute(packagePath: pkgPath)
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+public func utilsInX() {`
	`2`	`+ print("utils in X")`
	`3`	`+}`