refactor: remove usage of import.meta.resolve API

Author: thetutlage

factories/router.ts

@@ -31,9 +31,7 @@ export class RouterFactory {
    * Returns an instance of the application class
    */
   #getApp() {
-    return (
-      this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => {})
-    )
+    return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url))
   }
 
   /**

factories/server_factory.ts

@@ -58,9 +58,7 @@ export class ServerFactory {
    * Returns an instance of the application class
    */
   #getApp() {
-    return (
-      this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => {})
-    )
+    return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url))
   }
 
   /**

src/router/route.ts

@@ -12,7 +12,7 @@ import Macroable from '@poppinss/macroable'
 import Middleware from '@poppinss/middleware'
 import { RuntimeException } from '@poppinss/utils'
 import type { Application } from '@adonisjs/application'
-import { moduleCaller, moduleExpression, moduleImporter } from '@adonisjs/fold'
+import { moduleCaller, moduleImporter } from '@adonisjs/fold'
 
 import { execute } from './executor.js'
 import { dropSlash } from '../helpers.js'
@@ -139,10 +139,18 @@ export class Route<Controller extends Constructor<any> = any> extends Macroable
       | string
       | [LazyImport<Controller> | Controller, GetControllerHandlers<Controller>?]
   ) {
+    /**
+     * Convert magic string to handle method call
+     */
     if (typeof handler === 'string') {
+      const parts = handler.split('.')
+      const method = parts.length === 1 ? 'handle' : parts.pop()!
+      const moduleRefId = parts.join('.')
+
       return {
         reference: handler,
-        ...moduleExpression(handler, this.#app.appRoot).toHandleMethod(),
+        ...moduleImporter(() => this.#app.import(moduleRefId), method).toHandleMethod(),
+        name: handler,
       }
     }
 

tests/define_config.spec.ts

@@ -19,8 +19,8 @@ test.group('Define config', () => {
         httpOnly: true,
         path: '/',
         maxAge: 7200,
-        sameSite: false,
-        secure: false,
+        sameSite: 'lax',
+        secure: true,
       },
       generateRequestId: false,
       jsonpCallbackName: 'callback',
@@ -37,8 +37,8 @@ test.group('Define config', () => {
         httpOnly: true,
         path: '/',
         maxAge: 7200,
-        sameSite: false,
-        secure: false,
+        sameSite: 'lax',
+        secure: true,
       },
       generateRequestId: false,
       jsonpCallbackName: 'callback',

tests/router/execute.spec.ts

@@ -24,7 +24,7 @@ test.group('Route | execute', () => {
     assert.plan(2)
 
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     const context = new HttpContextFactory().create()
@@ -47,41 +47,40 @@ test.group('Route | execute', () => {
   })
 
   test('execute route controller specified as a string', async ({ assert }) => {
-    assert.plan(3)
-
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+
+    class HomeControllerClass {
+      async handle() {
+        stack.push('invoked handle')
+      }
+    }
+    const app = new AppFactory().create(BASE_URL, (filePath: string) => {
+      if (filePath === '#controllers/home') {
+        return {
+          default: HomeControllerClass,
+        }
+      }
+    })
     await app.init()
 
     const resolver = app.container.createResolver()
-
     const context = new HttpContextFactory().create()
 
     const route = new Route(app, [], {
       pattern: '/',
       methods: ['GET'],
-      handler: () => {},
+      handler: '#controllers/home',
       globalMatchers: {},
     })
 
     const routeJSON = route.toJSON()
-
-    routeJSON.handler = {
-      reference: '#controllers/home',
-      async handle(container, ctx) {
-        assert.strictEqual(container, resolver)
-        assert.strictEqual(ctx, context)
-        stack.push('controller')
-      },
-    }
-
     await routeJSON.execute(routeJSON, resolver, context, () => {})
-    assert.deepEqual(stack, ['controller'])
+    assert.deepEqual(stack, ['invoked handle'])
   })
 
   test('execute route controller specified as lazy import', async ({ assert }) => {
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     const resolver = app.container.createResolver()
@@ -128,7 +127,7 @@ test.group('Route | execute', () => {
 
   test('execute route controller specified as a class constructor', async ({ assert }) => {
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     const resolver = app.container.createResolver()
@@ -171,7 +170,7 @@ test.group('Route | execute', () => {
     assert.plan(4)
 
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     const context = new HttpContextFactory().create()
@@ -210,7 +209,7 @@ test.group('Route | execute', () => {
     assert.plan(3)
 
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     const context = new HttpContextFactory().create()
@@ -246,7 +245,7 @@ test.group('Route | execute', () => {
     assert.plan(6)
 
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     class BodyParserMiddleware {
@@ -313,7 +312,7 @@ test.group('Route | execute', () => {
     assert.plan(3)
 
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     class BodyParserMiddleware {
@@ -375,7 +374,7 @@ test.group('Route | execute', () => {
 
   test('catch global middleware exceptions', async ({ assert }) => {
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     class BodyParserMiddleware {
@@ -439,7 +438,7 @@ test.group('Route | execute', () => {
 
   test('catch route handler exceptions', async ({ assert }) => {
     const stack: string[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     class BodyParserMiddleware {
@@ -502,7 +501,7 @@ test.group('Route | execute', () => {
 
   test('pass arguments to the named middleware', async ({ assert }) => {
     const stack: any[] = []
-    const app = new AppFactory().create(BASE_URL, () => {})
+    const app = new AppFactory().create(BASE_URL)
     await app.init()
 
     class AclMiddleware {