refactor: remove unused resolver functions from agnostic, webpack-like, rspack, and esbuild modules

Author: radist2s

packages/tree-shaking-plugin/src/__tests__/core/resolution-and-module-access.test.ts

@@ -508,7 +508,7 @@ createAPIClient().pets.getPets.useQuery();
     }
   });
 
-  it('uses module access from options by default when creating a transform state', async () => {
+  it('uses explicit module access when creating a transform state', async () => {
     const fixture = await createFixture();
     const sourceFile = path.join(fixture, 'src/App.tsx');
     const fixtureModuleAccess = createFixtureModuleAccess(fixture);
@@ -538,10 +538,10 @@ export function App() {
             },
           },
         ],
-        moduleAccess: {
-          resolve: fixtureModuleAccess.resolve,
-          load,
-        },
+      },
+      {
+        resolve: fixtureModuleAccess.resolve,
+        load,
       }
     );
 
@@ -697,93 +697,6 @@ export function App() {
     }
   });
 
-  it('supports a legacy resolver 4th argument together with module access load options', async () => {
-    const fixture = await createFixture();
-    const sourceFile = path.join(fixture, 'src/App.tsx');
-    const fixtureModuleAccess = createFixtureModuleAccess(fixture);
-    const load = vi.fn(fixtureModuleAccess.load);
-
-    const result = await transformQraftTreeShakingImpl(
-      `
-import { createAPIClient } from './api';
-
-const api = createAPIClient();
-
-export function App() {
-  return api.pets.getPets.useQuery();
-}
-`,
-      sourceFile,
-      {
-        entrypoints: [
-          {
-            kind: 'clientFactory',
-            factory: {
-              exportName: 'createAPIClient',
-              moduleSpecifier: './api',
-            },
-            reactContext: {
-              exportName: 'APIClientContext',
-            },
-          },
-        ],
-        moduleAccess: {
-          load,
-        },
-      },
-      fixtureModuleAccess.resolve
-    );
-
-    expect(result?.code).toContain('api_pets_getPets.useQuery()');
-    expect(load).toHaveBeenCalledWith(path.join(fixture, 'src/api/index.ts'));
-  });
-
-  it('prefers module access resolve from options over a conflicting legacy resolver 4th argument', async () => {
-    const fixture = await createFixture();
-    const sourceFile = path.join(fixture, 'src/App.tsx');
-    const fixtureModuleAccess = createFixtureModuleAccess(fixture);
-    const load = vi.fn(fixtureModuleAccess.load);
-    const legacyResolver = vi.fn(async () => {
-      throw new Error('legacy resolver should not be called');
-    });
-
-    const result = await transformQraftTreeShakingImpl(
-      `
-import { createAPIClient } from './api';
-
-const api = createAPIClient();
-
-export function App() {
-  return api.pets.getPets.useQuery();
-}
-`,
-      sourceFile,
-      {
-        entrypoints: [
-          {
-            kind: 'clientFactory',
-            factory: {
-              exportName: 'createAPIClient',
-              moduleSpecifier: './api',
-            },
-            reactContext: {
-              exportName: 'APIClientContext',
-            },
-          },
-        ],
-        moduleAccess: {
-          resolve: fixtureModuleAccess.resolve,
-          load,
-        },
-      },
-      legacyResolver
-    );
-
-    expect(result?.code).toContain('api_pets_getPets.useQuery()');
-    expect(legacyResolver).not.toHaveBeenCalled();
-    expect(load).toHaveBeenCalledWith(path.join(fixture, 'src/api/index.ts'));
-  });
-
   it('does not match a same-named import that resolves to a different module', async () => {
     const fixture = await createFixture();
     const sourceFile = path.join(fixture, 'src/App.tsx');

packages/tree-shaking-plugin/src/core.ts

@@ -9,7 +9,6 @@ import type {
 import type { SourceFilterOptions } from './lib/transform/source-gate.js';
 import * as generateModule from '@babel/generator';
 import { resolveDefaultExport } from './lib/interop/resolve-default-export.js';
-import { createAgnosticModuleAccess } from './lib/resolvers/agnostic.js';
 import { normalizeEntrypoints } from './lib/transform/entrypoints.js';
 import { type GeneratedMetadataCache } from './lib/transform/generated-metadata.js';
 import { applyTransformMutations } from './lib/transform/mutate.js';
@@ -78,32 +77,18 @@ type GenerateFn = (typeof import('@babel/generator'))['default'];
 type GeneratorOptions = Omit<BabelGeneratorOptions, 'inputSourceMap'> & {
   inputSourceMap?: SourceMapInput;
 };
-type QraftModuleAccessInput = QraftModuleAccess | QraftResolver;
 
 const generate = resolveDefaultExport<GenerateFn>(generateModule);
 
 export async function transformQraftTreeShaking(
   code: string,
   id: string,
   options: QraftTreeShakeOptions,
-  moduleAccessOrResolver?: QraftModuleAccessInput,
+  moduleAccess: QraftModuleAccess,
   inputSourceMap?: SourceMapInput,
   generatedMetadataCache?: GeneratedMetadataCache,
   sourceFilters?: SourceFilterOptions
 ) {
-  const moduleAccess =
-    moduleAccessOrResolver === undefined
-      ? createAgnosticModuleAccess({
-          resolve: options.moduleAccess?.resolve ?? options.resolve,
-          load: options.moduleAccess?.load,
-        })
-      : typeof moduleAccessOrResolver === 'function'
-        ? createAgnosticModuleAccess({
-            resolve: options.moduleAccess?.resolve ?? moduleAccessOrResolver,
-            load: options.moduleAccess?.load,
-          })
-        : moduleAccessOrResolver;
-
   const entrypoints = normalizeEntrypoints(options);
   if (
     !shouldInspectSource({

packages/tree-shaking-plugin/src/lib/transform/state.ts

@@ -24,7 +24,6 @@ import { parse } from '@babel/parser';
 import * as traverseModule from '@babel/traverse';
 import * as t from '@babel/types';
 import { resolveDefaultExport } from '../interop/resolve-default-export.js';
-import { createAgnosticModuleAccess } from '../resolvers/agnostic.js';
 import { createTraceableQraftModuleAccess } from '../resolvers/common.js';
 import {
   getStaticMemberPath,
@@ -137,10 +136,7 @@ export async function createTransformState(
   code: string,
   id: string,
   options: QraftTreeShakeOptions,
-  moduleAccess: QraftModuleAccess = createAgnosticModuleAccess({
-    resolve: options.moduleAccess?.resolve ?? options.resolve,
-    load: options.moduleAccess?.load,
-  }),
+  moduleAccess: QraftModuleAccess,
   generatedMetadataCache?: GeneratedMetadataCache
 ): Promise<TransformState> {
   const traceableModuleAccess = createTraceableQraftModuleAccess(moduleAccess);