Support contracts with the same name #1203

Author: melnikaite

package-lock.json

@@ -70,6 +70,7 @@
     "ethereumjs-util": "^6.1.0",
     "find-up": "^3.0.0",
     "fs-extra": "^7.0.1",
+    "fs-readdir-recursive": "^1.1.0",
     "inquirer": "^6.4.1",
     "is-url": "^1.2.4",
     "lockfile": "^1.0.4",

packages/cli/package.json

@@ -5,7 +5,8 @@ import pick from 'lodash.pick';
 import omitBy from 'lodash.omitby';
 import isUndefined from 'lodash.isundefined';
 import { readJsonSync, ensureDirSync, readJSON, writeJson, unlink } from 'fs-extra';
-import { statSync, existsSync, readdirSync, lstatSync } from 'fs';
+import { statSync, existsSync, lstatSync } from 'fs';
+import readdirSync from 'fs-readdir-recursive';
 import { Loggy, Contracts } from '@openzeppelin/upgrades';
 import {
   RawContract,
@@ -188,7 +189,9 @@ class SolidityProjectCompiler {
     await Promise.all(
       this.compilerOutput.map(async data => {
         const name = data.contractName;
-        const buildFileName = `${this.outputDir}/${name}.json`;
+        const buildDirName = `${this.outputDir}/${data.sourcePath.replace(/^contracts\/(.*)$/, `$1`)}`;
+        ensureDirSync(buildDirName);
+        const buildFileName = `${buildDirName}/${name}.json`;
         if (networksInfo[name]) Object.assign(data, { networks: networksInfo[name] });
         await writeJson(buildFileName, data, { spaces: 2 });
       }),

packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts

@@ -3,6 +3,7 @@ import Dependency from '../dependency/Dependency';
 import ProjectFile from '../files/ProjectFile';
 import ConfigManager from '../config/ConfigManager';
 import path from 'path';
+import readdirSync from 'fs-readdir-recursive';
 
 export default class ContractManager {
   public projectFile: ProjectFile;
@@ -35,7 +36,7 @@ export default class ContractManager {
     const buildDir = ConfigManager.getBuildDir();
     const contractsDir = Contracts.getLocalContractsDir();
     if (FileSystem.exists(buildDir)) {
-      return FileSystem.readDir(buildDir)
+      return readdirSync(buildDir)
         .filter(name => name.match(/\.json$/))
         .map(name => FileSystem.parseJsonIfExists(`${buildDir}/${name}`))
         .filter(contract => {
@@ -45,7 +46,7 @@ export default class ContractManager {
             !this.isAbstractContract(contract)
           );
         })
-        .map(({ contractName }) => contractName);
+        .map(({ sourcePath, contractName }) => `${sourcePath.replace(/contracts\/(.*)/, `$1`)}/${contractName}`);
     } else return [];
   }