Skip to content

Commit ec8172e

Browse files
committed
refactor: make sourceFilters and generatedMetadataCache mandatory in transformQraftTreeShaking
1 parent 26052ee commit ec8172e

3 files changed

Lines changed: 27 additions & 10 deletions

File tree

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import fs from 'node:fs/promises';
44
import os from 'node:os';
55
import path from 'node:path';
66
import { transformQraftTreeShaking as transformQraftTreeShakingImpl } from '../../core.js';
7+
import { createGeneratedMetadataCache } from '../../lib/transform/generated-metadata.js';
78
import { createTransformState } from '../../lib/transform/state.js';
89
import {
910
createFixtureModuleAccess,
@@ -32,6 +33,8 @@ export async function transformQraftTreeShaking(
3233
const moduleAccess = createFixtureModuleAccess(fixtureRoot, {
3334
resolve: options.moduleAccess?.resolve ?? options.resolve,
3435
});
36+
const generatedMetadataCache = createGeneratedMetadataCache();
37+
const sourceFilters = {};
3538

3639
if (options.moduleAccess?.load) {
3740
return transformQraftTreeShakingImpl(
@@ -42,7 +45,9 @@ export async function transformQraftTreeShaking(
4245
...moduleAccess,
4346
load: options.moduleAccess.load,
4447
},
45-
inputSourceMap
48+
inputSourceMap,
49+
generatedMetadataCache,
50+
sourceFilters
4651
);
4752
}
4853

@@ -51,7 +56,9 @@ export async function transformQraftTreeShaking(
5156
id,
5257
options,
5358
moduleAccess,
54-
inputSourceMap
59+
inputSourceMap,
60+
generatedMetadataCache,
61+
sourceFilters
5562
);
5663
}
5764

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
createUserResolverStrategy,
99
createUserSourceLoaderStrategy,
1010
} from '../../lib/resolvers/common.js';
11+
import { createGeneratedMetadataCache } from '../../lib/transform/generated-metadata.js';
1112
import {
1213
createFixtureModuleAccess,
1314
PRECREATED_API_INDEX_TS,
@@ -179,7 +180,10 @@ createAPIClient().pets.getPets.useQuery();
179180
},
180181
],
181182
},
182-
moduleAccess
183+
moduleAccess,
184+
undefined,
185+
createGeneratedMetadataCache(),
186+
{}
183187
)
184188
).rejects.toMatchObject({
185189
name: 'QraftTreeShakeError',
@@ -248,7 +252,10 @@ createAPIClient().pets.getPets.useQuery();
248252
},
249253
],
250254
},
251-
moduleAccess
255+
moduleAccess,
256+
undefined,
257+
createGeneratedMetadataCache(),
258+
{}
252259
)
253260
).rejects.toMatchObject({
254261
name: 'QraftTreeShakeError',
@@ -686,7 +693,10 @@ export function App() {
686693
{
687694
resolve: fixtureResolver,
688695
load,
689-
}
696+
},
697+
undefined,
698+
createGeneratedMetadataCache(),
699+
{}
690700
);
691701

692702
expect(result).toBeNull();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@ export async function transformQraftTreeShaking(
8585
id: string,
8686
options: QraftTreeShakeOptions,
8787
moduleAccess: QraftModuleAccess,
88-
inputSourceMap?: SourceMapInput,
89-
generatedMetadataCache?: GeneratedMetadataCache,
90-
sourceFilters?: SourceFilterOptions
88+
inputSourceMap: SourceMapInput | undefined,
89+
generatedMetadataCache: GeneratedMetadataCache,
90+
sourceFilters: SourceFilterOptions
9191
) {
9292
const entrypoints = normalizeEntrypoints(options);
9393
if (
9494
!shouldInspectSource({
9595
code,
9696
id,
9797
entrypoints,
98-
include: sourceFilters?.include,
99-
exclude: sourceFilters?.exclude,
98+
include: sourceFilters.include,
99+
exclude: sourceFilters.exclude,
100100
})
101101
) {
102102
return null;

0 commit comments

Comments
 (0)