fix: dynamic imports from arrow func expressions. (#31)

Author: knightedcodemonkey

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/specifier",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Node.js tool for updating your ES module and CommonJS specifiers.",
   "type": "module",
   "main": "dist",
@@ -54,9 +54,9 @@
     "url": "https://github.com/knightedcodemonkey/specifier/issues"
   },
   "dependencies": {
-    "@knighted/walk": "^1.0.0-rc.0",
+    "@knighted/walk": "^1.0.0-rc.1",
     "magic-string": "^0.30.17",
-    "oxc-parser": "^0.62.0"
+    "oxc-parser": "^0.63.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.3.0",

package.json

@@ -148,6 +148,22 @@ const format = async (src: string, ast: ParseResult, cb: Callback) => {
         }
       }
 
+      if (node.type === 'ArrowFunctionExpression') {
+        const { body } = node
+
+        if (body.type === 'ImportExpression') {
+          formatExpression(body)
+        }
+
+        if (
+          body.type === 'CallExpression' &&
+          body.callee.type === 'Identifier' &&
+          body.callee.name === 'require'
+        ) {
+          formatExpression(body)
+        }
+      }
+
       if (node.type === 'TSImportType') {
         const { argument } = node
 

src/format.ts

@@ -0,0 +1,24 @@
+type RouteMap = Record<string, object>
+
+export const routes: RouteMap = {
+  all: {
+    paths: ['*'],
+    components: {
+      interface: () =>
+        import(
+          /* webpackChunkName: "user" */
+          './user.js'
+        ),
+    },
+  },
+};
+
+function foo () {
+  import('./code.js')
+}
+
+const bar = () => {
+  import('./code.js')
+}
+
+(() => import('./code.js'))()

test/__fixtures__/complexImportExpression.ts

@@ -0,0 +1,21 @@
+export const routes = {
+  all: {
+    paths: ['*'],
+    components: {
+      interface: () =>
+        require(
+          './user.js'
+        ),
+    },
+  },
+};
+
+function foo () {
+  require('./code.js')
+}
+
+const bar = () => {
+  require('./code.js')
+}
+
+(() => require('./code.js'))()

test/__fixtures__/complexRequire.js

@@ -74,6 +74,24 @@ describe('update', () => {
     assert.ok(update.indexOf(tl) > -1)
   })
 
+  it('updates complex import expressions', async () => {
+    const update = await specifier.update(
+      join(fixtures, 'complexImportExpression.ts'),
+      spec => {
+        if (spec.value === './user.js') {
+          return './other-user.js'
+        }
+
+        if (spec.value === './code.js') {
+          return './other-code.js'
+        }
+      },
+    )
+
+    assert.ok(update.indexOf('./other-user.js') > -1)
+    assert.equal([...update.matchAll(/other-code\.js/g)].length, 3)
+  })
+
   it('works with typescript', async () => {
     let update = await specifier.update(join(fixtures, 'types.d.ts'), spec => {
       if (spec.value === './user.js') {
@@ -116,6 +134,21 @@ describe('update', () => {
     assert.ok(update.indexOf('require("./esm.mjs")') > -1)
   })
 
+  it('updates complex require expressions', async () => {
+    const update = await specifier.update(join(fixtures, 'complexRequire.js'), spec => {
+      if (spec.value === './user.js') {
+        return './other-user.js'
+      }
+
+      if (spec.value === './code.js') {
+        return './other-code.js'
+      }
+    })
+
+    assert.ok(update.indexOf('./other-user.js') > -1)
+    assert.equal([...update.matchAll(/other-code\.js/g)].length, 3)
+  })
+
   it('updates `resolve` from different module types', async () => {
     const update = await specifier.update(join(fixtures, 'modules.js'), ({ value }) => {
       if (value === './require/file.js') {