fix: issue with extra suffix parts in imported sources

ape_solidity/compiler.py

@@ -373,12 +373,15 @@ def _get_settings_from_imports(
         files_by_solc_version = self.get_version_map_from_imports(
             contract_filepaths, import_map, project=pm
         )
-        return self._get_settings_from_version_map(files_by_solc_version, remappings, project=pm)
+        return self._get_settings_from_version_map(
+            files_by_solc_version, remappings, import_map=import_map, project=pm
+        )
 
     def _get_settings_from_version_map(
         self,
         version_map: dict,
         import_remappings: dict[str, str],
+        import_map: Optional[dict[str, list[str]]] = None,
         project: Optional[ProjectManager] = None,
         **kwargs,
     ) -> dict[Version, dict]:
@@ -397,7 +400,9 @@ def _get_settings_from_version_map(
                 },
                 **kwargs,
             }
-            if remappings_used := self._get_used_remappings(sources, import_remappings, project=pm):
+            if remappings_used := self._get_used_remappings(
+                sources, import_remappings, import_map=import_map, project=pm
+            ):
                 remappings_str = [f"{k}={v}" for k, v in remappings_used.items()]
 
                 # Standard JSON input requires remappings to be sorted.
@@ -421,6 +426,7 @@ def _get_used_remappings(
         self,
         sources: Iterable[Path],
         remappings: dict[str, str],
+        import_map: Optional[dict[str, list[str]]] = None,
         project: Optional[ProjectManager] = None,
     ) -> dict[str, str]:
         pm = project or self.local_project
@@ -435,7 +441,8 @@ def _get_used_remappings(
         # Filter out unused import remapping.
         result = {}
         sources = list(sources)
-        imports = self.get_imports(sources, project=pm).values()
+        import_map = import_map or self.get_imports(sources, project=pm)
+        imports = import_map.values()
 
         for source_list in imports:
             for src in source_list:
@@ -461,7 +468,7 @@ def get_standard_input_json(
         import_map = self.get_imports_from_remapping(paths, remapping, project=pm)
         version_map = self.get_version_map_from_imports(paths, import_map, project=pm)
         return self.get_standard_input_json_from_version_map(
-            version_map, remapping, project=pm, **overrides
+            version_map, remapping, project=pm, import_map=import_map, **overrides
         )
 
     def get_standard_input_json_from(
@@ -481,12 +488,13 @@ def get_standard_input_json_from_version_map(
         self,
         version_map: dict[Version, set[Path]],
         import_remapping: dict[str, str],
+        import_map: Optional[dict[str, list[str]]] = None,
         project: Optional[ProjectManager] = None,
         **overrides,
     ):
         pm = project or self.local_project
         settings = self._get_settings_from_version_map(
-            version_map, import_remapping, project=pm, **overrides
+            version_map, import_remapping, import_map=import_map, project=pm, **overrides
         )
         return self.get_standard_input_json_from_settings(settings, version_map, project=pm)
 
@@ -571,8 +579,16 @@ def _compile(
         settings: Optional[dict] = None,
     ):
         pm = project or self.local_project
-        input_jsons = self.get_standard_input_json(
-            contract_filepaths, project=pm, **(settings or {})
+        remapping = self.get_import_remapping(project=pm)
+        paths = list(contract_filepaths)  # Handle if given generator=
+        import_map = self.get_imports_from_remapping(paths, remapping, project=pm)
+        version_map = self.get_version_map_from_imports(paths, import_map, project=pm)
+        input_jsons = self.get_standard_input_json_from_version_map(
+            version_map,
+            remapping,
+            project=pm,
+            import_map=import_map,
+            **(settings or {}),
         )
         contract_versions: dict[str, Version] = {}
         contract_types: list[ContractType] = []
@@ -608,7 +624,7 @@ def _compile(
                 for name, _ in contracts_out.items():
                     # Filter source files that the user did not ask for, such as
                     # imported relative files that are not part of the input.
-                    for input_file_path in contract_filepaths:
+                    for input_file_path in paths:
                         if source_id in str(input_file_path):
                             input_contract_names.append(name)
 

setup.py

@@ -69,7 +69,7 @@
     include_package_data=True,
     install_requires=[
         "py-solc-x>=2.0.2,<3",
-        "eth-ape>=0.8.1,<0.9",
+        "eth-ape>=0.8.4,<0.9",
         "ethpm-types",  # Use the version ape requires
         "eth-pydantic-types",  # Use the version ape requires
         "packaging",  # Use the version ape requires

tests/contracts/Imports.sol

@@ -26,6 +26,10 @@ import "@safe/contracts/common/Enum.sol";
 // Purposely exclude the contracts folder to test older Ape-style project imports.
 import "@noncompilingdependency/subdir/SubCompilingContract.sol";
 
+// Showing sources with extra extensions are by default excluded,
+// unless used as an import somewhere in a non-excluded source.
+import "./Source.extra.ext.sol";
+
 contract Imports {
     function foo() pure public returns(bool) {
         return true;

tests/contracts/Source.extra.ext.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+// Showing sources with extra extensions are by default excluded,
+// unless used as an import somewhere in a non-excluded source.
+contract SourceExtraExt {
+    function foo() pure public returns(bool) {
+        return true;
+    }
+}

tests/test_compiler.py

@@ -5,9 +5,11 @@
 from ape import Project, reverts
 from ape.exceptions import CompilerError
 from ape.logging import LogLevel
+from ape.utils import get_full_extension
 from ethpm_types import ContractType
 from packaging.version import Version
 
+from ape_solidity.compiler import logger
 from ape_solidity.exceptions import IndexOutOfBoundsError
 
 EXPECTED_NON_SOLIDITY_ERR_MSG = "Unable to compile 'RandomVyperFile.vy' using Solidity compiler."
@@ -126,6 +128,7 @@ def test_get_imports_complex(project, compiler):
             "contracts/CompilesOnce.sol",
             "contracts/MissingPragma.sol",
             "contracts/NumerousDefinitions.sol",
+            "contracts/Source.extra.ext.sol",
             "contracts/subfolder/Relativecontract.sol",
         ],
         "contracts/MissingPragma.sol": [],
@@ -403,6 +406,7 @@ def test_get_compiler_settings(project, compiler):
         "contracts/Imports.sol",
         "contracts/MissingPragma.sol",
         "contracts/NumerousDefinitions.sol",
+        "contracts/Source.extra.ext.sol",
         "contracts/subfolder/Relativecontract.sol",
     ]
     assert actual_files == expected_files
@@ -623,7 +627,7 @@ def test_compile_project(project, compiler):
     """
     Simple test showing the full project indeed compiles.
     """
-    paths = [x for x in project.sources.paths if x.suffix == ".sol"]
+    paths = [x for x in project.sources.paths if get_full_extension(x) == ".sol"]
     actual = [c for c in compiler.compile(paths, project=project)]
     assert len(actual) > 0
 
@@ -687,8 +691,17 @@ def test_enrich_error_when_builtin(project, owner, connection):
 def test_flatten(project, compiler, caplog):
     path = project.sources.lookup("contracts/Imports.sol")
     with caplog.at_level(LogLevel.WARNING):
-        compiler.flatten_contract(path, project=project)
-        actual = caplog.messages[-1]
+        res = compiler.flatten_contract(path, project=project)
+
+        # Ensure logger was flushed.
+        for handler in logger._logger.handlers:
+            handler.flush()
+
+        messages = caplog.messages
+        if len(messages) == 0:
+            pytest.fail(f"Missing captured logs for conflicting license. Result: {res}")
+
+        actual = messages[-1]
         expected = (
             "Conflicting licenses found: 'LGPL-3.0-only, MIT'. "
             "Using the root file's license 'MIT'."