@@ -3,18 +3,12 @@ import fs from 'node:fs/promises';
33import os from 'node:os' ;
44import path from 'node:path' ;
55import { describe , expect , it , vi } from 'vitest' ;
6- import {
7- createAgnosticModuleAccess ,
8- createAgnosticResolver ,
9- } from './agnostic.js' ;
6+ import { createAgnosticModuleAccess } from './agnostic.js' ;
107import { getQraftModuleAccessStrategyMetadata } from './common.js' ;
118import { createEsbuildModuleAccess } from './esbuild.js' ;
129import { createRollupLikeModuleAccess } from './rollup-like.js' ;
13- import { createRspackModuleAccess , createRspackResolver } from './rspack.js' ;
14- import {
15- createWebpackLikeModuleAccess ,
16- createWebpackLikeResolver ,
17- } from './webpack-like.js' ;
10+ import { createRspackModuleAccess } from './rspack.js' ;
11+ import { createWebpackLikeModuleAccess } from './webpack-like.js' ;
1812
1913async function mktemp ( ) {
2014 return fs . mkdtemp ( path . join ( os . tmpdir ( ) , 'qraft-resolver-' ) ) ;
@@ -54,12 +48,12 @@ describe('resolver composition', () => {
5448 } ) ;
5549 } ) ;
5650
57- it ( 'uses only the custom resolver in the agnostic resolver chain ' , async ( ) => {
51+ it ( 'uses only the custom resolver in agnostic module access ' , async ( ) => {
5852 const importer = path . join ( await mktemp ( ) , 'src.ts' ) ;
5953 const customResolve = vi . fn ( async ( ) => null ) ;
60- const resolver = createAgnosticResolver ( customResolve ) ;
54+ const access = createAgnosticModuleAccess ( { resolve : customResolve } ) ;
6155
62- await expect ( resolver ( './fallback' , importer ) ) . resolves . toBeNull ( ) ;
56+ await expect ( access . resolve ( './fallback' , importer ) ) . resolves . toBeNull ( ) ;
6357 expect ( customResolve ) . toHaveBeenCalledWith ( './fallback' , importer ) ;
6458 } ) ;
6559
@@ -193,10 +187,10 @@ describe('resolver composition', () => {
193187 } ,
194188 } ;
195189
196- const resolver = createWebpackLikeResolver ( ctx ) ;
197- await expect ( resolver ( '@/generated-api' , '/tmp/src/app.ts' ) ) . resolves . toBe (
198- '/tmp/ generated-api/index .ts'
199- ) ;
190+ const access = createWebpackLikeModuleAccess ( ctx ) ;
191+ await expect (
192+ access . resolve ( '@/ generated-api' , '/tmp/src/app .ts')
193+ ) . resolves . toBe ( '/tmp/generated-api/index.ts' ) ;
200194 expect ( resolve ) . toHaveBeenCalledTimes ( 1 ) ;
201195 } ) ;
202196
@@ -222,7 +216,7 @@ describe('resolver composition', () => {
222216 ) ;
223217 await fs . writeFile ( path . join ( srcDir , 'index.ts' ) , '' ) ;
224218
225- const resolver = createRspackResolver ( {
219+ const access = createRspackModuleAccess ( {
226220 getNativeBuildContext ( ) {
227221 return {
228222 framework : 'rspack' ,
@@ -239,7 +233,7 @@ describe('resolver composition', () => {
239233
240234 const expected = await fs . realpath ( path . join ( srcDir , 'index.ts' ) ) ;
241235 await expect (
242- resolver ( '@/generated-api' , path . join ( dir , 'src' , 'app.ts' ) )
236+ access . resolve ( '@/generated-api' , path . join ( dir , 'src' , 'app.ts' ) )
243237 ) . resolves . toBe ( expected ) ;
244238 } ) ;
245239
0 commit comments