fix short-hand-import parser

onflow · Apr 10, 2024 · fe3d60f · fe3d60f
1 parent 3275c15
commit fe3d60f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/imports.js b/src/imports.js
@@ -29,7 +29,8 @@ const importRegex = new RegExp(
 export const fixShorthandImports = code => {
   return code.replaceAll(importRegex, found => {
     if (found.indexOf(" from") !== -1) return found
-    const whatMatch = found.matchAll(/"?([^"\s]+)"?,?\s*?/giu)
+    const cutAt = found.indexOf("import") + 6
+    const whatMatch = found.substring(cutAt).matchAll(/"?([^"\s]+)"?,?\s*?/giu)
     return [...whatMatch]
       .map(what => `import ${what[1]} from "./${what[1]}.cdc"`)
       .join("\n")

diff --git a/test/integration/imports.test.js b/test/integration/imports.test.js
@@ -8,6 +8,7 @@ import {
 } from "../../src"
 import {defaultsByName} from "../../src/file"
 import {DEFAULT_TEST_TIMEOUT} from "../util/timeout.const"
+import {fixShorthandImports} from "../../src/imports"
 
 jest.setTimeout(DEFAULT_TEST_TIMEOUT)
 
@@ -49,6 +50,9 @@ describe("import resolver", () => {
             access(all) fun main(){}
         `
 
+    const testFixed = fixShorthandImports(code)
+    expect(testFixed.includes("import.cdc")).toBe(false)
+
     const addressMap = await resolveImports(code)
     const Registry = await getServiceAddress()