Replace import addresses

src/imports.js

@@ -19,7 +19,7 @@
 import {getContractAddress} from "./contract"
 import {defaultsByName} from "./file"
 
-const REGEXP_IMPORT = /(\s*import\s*)([\w\d]+)(\s+from\s*)([\w\d".\\/]+)/g
+const REGEXP_IMPORT = /(\s*import\s*)([\w\d\s,]+)(\s+from\s*)([\w\d".\\/]+)/g
 
 const getPairs = line => {
   return line
@@ -70,10 +70,12 @@ export const replaceImports = (code, addressMap) => {
  */
 export const replaceImportAddresses = (code, addressMap, byName = true) => {
   return code.replace(REGEXP_IMPORT, (match, imp, contract, _, address) => {
-    const key = byName ? contract : address
+    const noSpaces = contract.replace(/\s/g, "").split(",")
+    const contractName = noSpaces[0]
+    const key = byName ? contractName : address
     const newAddress =
       addressMap instanceof Function ? addressMap(key) : addressMap[key]
-    return `${imp}${contract} from ${newAddress}`
+    return `${imp}${noSpaces.join(", ")} from ${newAddress}`
   })
 }
 

test/imports.test.js

@@ -65,3 +65,37 @@ describe("replace", () => {
     expect(result).toEqual(reference)
   })
 })
+
+describe("multiple imports from the same address", () => {
+  test("basic case", async () => {
+    const Basic = "0x01"
+    const Advanced = "0x02"
+
+    const code = `
+      import Basic, Advanced from 0xSAME_ADDRESS
+    `
+    const result = replaceImportAddresses(code, {Basic, Advanced})
+
+    const reference = `
+      import Basic, Advanced from 0x01
+    `
+
+    expect(result).toEqual(reference)
+  })
+
+  test("extra spaces", async () => {
+    const Basic = "0x01"
+    const Advanced = "0x02"
+
+    const code = `
+      import Basic    ,       Advanced       from       0xSAME_ADDRESS
+    `
+    const result = replaceImportAddresses(code, {Basic, Advanced})
+
+    const reference = `
+      import Basic, Advanced from 0x01
+    `
+
+    expect(result).toEqual(reference)
+  })
+})