fix: use a better exp to replace modules

homer0 · May 17, 2022 · 5902cee · 5902cee
1 parent 0069848
commit 5902cee
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/src/transformer.js b/src/transformer.js
@@ -117,8 +117,15 @@ const transform = (file, api, options) => {
       .replaceWith((item) => {
         const importPath = item.value.source.value;
         const info = cjs2esm.modules.find((mod) => importPath.startsWith(mod.name));
-        const find = info.find ? new RegExp(info.find) : new RegExp(`^${info.name}`);
-        const replacement = importPath.replace(find, info.path);
+        let replacement;
+        if (info.find) {
+          replacement = importPath.replace(new RegExp(info.find), info.path);
+        } else {
+          replacement = importPath.replace(
+            new RegExp(`^${info.name}($|\\/)`),
+            (match, endChar) => (endChar.endsWith('/') ? `${info.path}/` : info.path),
+          );
+        }
 
         return j.importDeclaration(item.value.specifiers, j.literal(replacement));
       });

diff --git a/tests/transformer.test.js b/tests/transformer.test.js
@@ -413,6 +413,22 @@ describe('transformer', () => {
           },
         },
       },
+      {
+        value: {
+          specifiers: 'specifier',
+          source: {
+            value: 'lodash',
+          },
+        },
+      },
+      {
+        value: {
+          specifiers: 'specifier',
+          source: {
+            value: 'lodash-es',
+          },
+        },
+      },
     ];
     let currentNodes = nodes.slice();
     const message = 'done';
@@ -430,10 +446,6 @@ describe('transformer', () => {
       currentNodes = currentNodes.filter(fn);
       return ast;
     });
-    ast.filter.mockImplementationOnce((fn) => {
-      currentNodes = currentNodes.filter(fn);
-      return ast;
-    });
     ast.replaceWith.mockImplementationOnce((fn) => {
       currentNodes = currentNodes.map((item) => ({
         value: {
@@ -469,6 +481,7 @@ describe('transformer', () => {
           find: 'par\\w+or',
           path: 'parserror/esm',
         },
+        { name: 'lodash', path: 'lodash-es' },
       ],
     };
     const options = { cjs2esm };
@@ -479,11 +492,18 @@ describe('transformer', () => {
       path: deepAssignPath,
     }));
     utils.getAbsPathInfoSync.mockImplementationOnce(() => null);
+    utils.getAbsPathInfoSync.mockImplementationOnce(() => null);
+    utils.getAbsPathInfoSync.mockImplementationOnce(() => null);
     let result = null;
     // When
     result = transformer(file, api, options);
     // Then
     expect(result).toBe(message);
-    expect(currentNodes).toEqual(['wootils/esm/shared/deepAssign.js', 'parserror/esm']);
+    expect(currentNodes).toEqual([
+      'wootils/esm/shared/deepAssign.js',
+      'parserror/esm',
+      'lodash-es',
+      'lodash-es',
+    ]);
   });
 });