Skip to content

Commit 69e67ba

Browse files
committed
Resolver: Collect file system observations per resolution under unstable_incrementalResolution
Stacked on #1948. The first consumer of the `Observations` API from #1944. When `resolver.unstable_incrementalResolution` is enabled, `ModuleResolver.resolveDependency` creates an observations record at the start of each resolution, and everything that resolution looks up in the file map is recorded into it. The record is returned on the `BundlerResolution` as `unstable_observations`. Nothing reads it yet - invalidating from it is the next step - so there's no behaviour change, and with the flag off nothing is allocated. The resolution context given to `metro-resolver` doesn't change. `ModuleResolver` already builds a context per resolution, so when the flag is on it binds the file system capabilities to that resolution's record (`fileSystemLookup: p => fileSystemLookup(p, observations)`), and when it's off it passes the same functions as before. That means a custom `resolveRequest` records whatever it looks up through the context, without knowing about any of this. The observations parameter only appears on Metro's internal option types. What's recorded: - `fileSystemLookup`, and `resolveAsset` through it. - `getPackageForModule`, down to `hierarchicalLookup`. There's no memo in the way since #1948. - `doesFileExist`. `FileSystem.exists` can't record, so when recording this is answered by `lookup`, which agrees with it - true for exactly the paths found to be a file. Putting the record on the `BundlerResolution` means `DependencyGraph`'s whole-resolution cache replays it for free - every origin given a cached resolution gets its observations too. The one other memo is the empty module, which is resolved once and cached, so a resolution that lands on it returns a copy with the union of what led there and what resolving the empty module observed. Not included, to follow: - The contents of `package.json`. `getPackage` reads with `fs` outside the file map, and Metro has no way to turn an absolute path into a canonical one. The file is recorded in `existence` by `hierarchicalLookup`, so adding or removing one is covered, but editing one isn't. - Haste lookups, which have no bucket yet. - Failed resolutions. They throw, so there's nowhere to put what they observed. Resolution time in isolation, replaying every `DependencyGraph.resolveDependency` call made by one iOS dev build of the benchmark app (described in the test plan), through the whole-resolution cache. Nothing is transformed or serialised, so these are percentages of resolution, not of a build. 7 interleaved rounds. Resolutions are identical with the flag on and off. | scenario | #1948 | this diff, flag off | this diff, flag on | |---|---|---|---| | first build (ms) | 95.9 | 95.8 (−0.1%) | 111.6 (+16.5%) | | rebuild, nothing changed (ms) | 7.61 | 7.64 (+0.4%) | 7.80 (+2.1%) | | after a source edit, re-resolving the edited module's dependencies (µs) | 153 | 159 (+4.1%) | 180 (+13.2%) | | after a `package.json` change, re-resolving everything (ms) | 79.8 | 80.1 (+0.4%) | 93.1 (+16.2%) | | heap retained after resolving (MB) | | 5.3 | 18.8 (3.5x) | Flag off is within noise of #1948. (The source edit row is 8 resolutions, so that's under a microsecond each, and the runs overlap.) Flag on costs about 16% of resolution time wherever everything is resolved, which is ~2µs per resolution, and 3.5x the retained heap. On the benchmark app that's 100k entries across 6.9k distinct resolutions - a median of 14 each, 90th percentile 27 - naming 28k distinct paths. Nearly all of it is `existence`, and most of that is extension and platform candidates that missed (`a.ios.js`, `a.native.js`, ...), which can't collapse because the directory they're in exists. That's the memory to go after before this is worth turning on, e.g. by recording the directory once instead. ``` yarn jest packages/metro-file-map packages/metro-resolver packages/metro/src/node-haste packages/metro/src/DeltaBundler packages/metro/src/integration_tests yarn flow check yarn typecheck-ts yarn verify-api-snapshots ``` New tests in `resolver-test.js` assert the exact sets recorded for a relative import's candidates, each level probed for a package, a symlink (recorded as `content`, with lookups recorded by real path), asset variants, and a resolution that lands on the empty module. They also check that there's no `unstable_observations` by default, and that origins sharing a cached resolution share its observations. **Benchmark app** - a synthetic mid-size RN 0.87 app: 23 common dependencies (Reanimated, React Navigation, TanStack Query, lodash, etc.) and ~1,000 generated first-party modules, 60% of them in a workspace package outside `projectRoot` with its own `node_modules`. The iOS dev bundle is 2.8k modules, from a file map of 34k files. Timings replay the `resolveDependency` calls a real build of it makes against a fresh `DependencyGraph` per process, in interleaved rounds, with source and `package.json` edits made on disk and picked up by the watcher. A real build of this app takes around 4s even with a warm transform cache, so resolution is about 2% of it. Changelog: Internal
1 parent 9cce06b commit 69e67ba

6 files changed

Lines changed: 326 additions & 26 deletions

File tree

‎packages/metro/src/DeltaBundler/__tests__/resolver-test.js‎

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2995,6 +2995,185 @@ function dep(name: string): TransformResultDependency {
29952995
});
29962996
});
29972997

2998+
describe('unstable_incrementalResolution', () => {
2999+
const incremental: InputConfigT = {
3000+
resolver: {unstable_incrementalResolution: true},
3001+
};
3002+
// Observed paths are canonical: relative to the root, with system
3003+
// separators.
3004+
const canonical = (...posixPaths: Array<string>) =>
3005+
new Set(posixPaths.map(posixPath => joinPath(...posixPath.split('/'))));
3006+
3007+
test('resolutions carry no observations by default', async () => {
3008+
setMockFileSystem({'index.js': '', 'a.js': ''});
3009+
resolver = await createResolver();
3010+
expect(
3011+
resolver.resolve(p('/root/index.js'), dep('./a')),
3012+
).not.toHaveProperty('unstable_observations');
3013+
});
3014+
3015+
test('records every candidate probed for a relative import', async () => {
3016+
setMockFileSystem({'index.js': '', 'a.js': ''});
3017+
resolver = await createResolver(incremental, 'ios');
3018+
expect(resolver.resolve(p('/root/index.js'), dep('./a'))).toEqual({
3019+
type: 'sourceFile',
3020+
filePath: p('/root/a.js'),
3021+
unstable_observations: {
3022+
// A more specific candidate appearing changes the result
3023+
existence: canonical(
3024+
'a',
3025+
'a.ios.js',
3026+
'a.native.js',
3027+
'a.js',
3028+
'package.json',
3029+
),
3030+
content: new Set(),
3031+
},
3032+
});
3033+
});
3034+
3035+
test('records each level probed for a package', async () => {
3036+
setMockFileSystem({
3037+
deep: {dir: {'index.js': ''}},
3038+
node_modules: {
3039+
pkg: {
3040+
'package.json': JSON.stringify({name: 'pkg', main: 'main.js'}),
3041+
'main.js': '',
3042+
},
3043+
},
3044+
});
3045+
resolver = await createResolver(incremental, 'ios');
3046+
expect(
3047+
resolver.resolve(p('/root/deep/dir/index.js'), dep('pkg')),
3048+
).toEqual({
3049+
type: 'sourceFile',
3050+
filePath: p('/root/node_modules/pkg/main.js'),
3051+
unstable_observations: {
3052+
existence: canonical(
3053+
// The closest package to the origin
3054+
'deep/dir/index.js',
3055+
'deep/dir/package.json',
3056+
'deep/package.json',
3057+
'package.json',
3058+
// Each node_modules on the way up. A missing one is one entry,
3059+
// however many packages are looked up beneath it.
3060+
'deep/dir/node_modules',
3061+
'deep/node_modules',
3062+
'node_modules',
3063+
// The package scope of the files directly in node_modules
3064+
'node_modules/package.json',
3065+
// A file is preferred to a package of the same name
3066+
'node_modules/pkg.ios.js',
3067+
'node_modules/pkg.native.js',
3068+
'node_modules/pkg.js',
3069+
'node_modules/pkg.ios.json',
3070+
'node_modules/pkg.native.json',
3071+
'node_modules/pkg.json',
3072+
'node_modules/pkg',
3073+
'node_modules/pkg/package.json',
3074+
'node_modules/pkg/main.js',
3075+
),
3076+
content: new Set(),
3077+
},
3078+
});
3079+
});
3080+
3081+
test('records a traversed symlink as content, and lookups by real path', async () => {
3082+
setMockFileSystem({'index.js': '', real: {'x.js': ''}});
3083+
fs.symlinkSync(p('/root/real'), p('/root/link'));
3084+
resolver = await createResolver(incremental, 'ios');
3085+
expect(resolver.resolve(p('/root/index.js'), dep('./link/x'))).toEqual({
3086+
type: 'sourceFile',
3087+
filePath: p('/root/real/x.js'),
3088+
unstable_observations: {
3089+
existence: canonical(
3090+
'real/x',
3091+
'real/x.ios.js',
3092+
'real/x.native.js',
3093+
'real/x.js',
3094+
'real/package.json',
3095+
'package.json',
3096+
),
3097+
// Retargeting the link changes what every path through it means
3098+
content: canonical('link'),
3099+
},
3100+
});
3101+
});
3102+
3103+
test('records every asset variant probed', async () => {
3104+
setMockFileSystem({
3105+
'index.js': '',
3106+
'asset.png': '',
3107+
'asset@2x.png': '',
3108+
});
3109+
resolver = await createResolver(incremental, 'ios');
3110+
expect(
3111+
resolver.resolve(p('/root/index.js'), dep('./asset.png'))
3112+
.unstable_observations,
3113+
).toEqual({
3114+
existence: canonical(
3115+
'asset.png',
3116+
'asset@1x.png',
3117+
'asset@1.5x.png',
3118+
'asset@2x.png',
3119+
'asset@3x.png',
3120+
'asset@4x.png',
3121+
'package.json',
3122+
),
3123+
content: new Set(),
3124+
});
3125+
});
3126+
3127+
test('a resolution landing on the empty module includes what resolving the empty module observed', async () => {
3128+
setMockFileSystem({
3129+
'empty.js': '',
3130+
withBrowser: {
3131+
'package.json': JSON.stringify({
3132+
name: 'with-browser',
3133+
browser: {'./gone.js': false},
3134+
}),
3135+
'index.js': '',
3136+
'gone.js': '',
3137+
},
3138+
});
3139+
resolver = await createResolver(
3140+
{
3141+
resolver: {
3142+
emptyModulePath: p('/root/empty.js'),
3143+
unstable_incrementalResolution: true,
3144+
},
3145+
},
3146+
'ios',
3147+
);
3148+
expect(
3149+
resolver.resolve(p('/root/withBrowser/index.js'), dep('./gone')),
3150+
).toEqual({
3151+
type: 'sourceFile',
3152+
filePath: p('/root/empty.js'),
3153+
unstable_observations: {
3154+
existence: canonical(
3155+
// What led to the empty module
3156+
'withBrowser/gone',
3157+
'withBrowser/package.json',
3158+
// What resolving the empty module observed
3159+
'empty.js',
3160+
'package.json',
3161+
),
3162+
content: new Set(),
3163+
},
3164+
});
3165+
});
3166+
3167+
test('origins sharing a cached resolution share its observations', async () => {
3168+
setMockFileSystem({'index.js': '', 'other.js': '', 'a.js': ''});
3169+
resolver = await createResolver(incremental, 'ios');
3170+
const first = resolver.resolve(p('/root/index.js'), dep('./a'));
3171+
const second = resolver.resolve(p('/root/other.js'), dep('./a'));
3172+
expect(second).toBe(first);
3173+
expect(second.unstable_observations?.existence.size).toBeGreaterThan(0);
3174+
});
3175+
});
3176+
29983177
describe('schemeResolvers', () => {
29993178
test('config schemeResolvers are applied to scheme-prefixed specifiers', async () => {
30003179
setMockFileSystem({'index.js': '', 'a.js': ''});

‎packages/metro/src/DeltaBundler/types.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,21 @@ export type AllowOptionalDependenciesWithOptions = {
151151
export type AllowOptionalDependencies =
152152
boolean | AllowOptionalDependenciesWithOptions;
153153

154+
// What a resolution observed of the file system: canonical paths whose
155+
// addition or removal can change its result, and those whose modification
156+
// can too. Satisfies `metro-file-map`'s `Observations`, which populates it.
157+
export type ResolutionObservations = Readonly<{
158+
existence: Set<string>,
159+
content: Set<string>,
160+
}>;
161+
154162
export type BundlerResolution = Readonly<{
155163
type: 'sourceFile',
156164
filePath: string,
165+
// What this resolution observed of the file system, if
166+
// `resolver.unstable_incrementalResolution` is enabled. It is shared by
167+
// every caller given this resolution, so must not be mutated.
168+
unstable_observations?: ResolutionObservations,
157169
}>;
158170

159171
export type Options<T = MixedOutput> = Readonly<{

‎packages/metro/src/node-haste/DependencyGraph.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import type {
1313
BundlerResolution,
14+
ResolutionObservations,
1415
TransformResultDependency,
1516
} from '../DeltaBundler/types';
1617
import type {DynamicRoot} from '../lib/dynamicRoots';
@@ -135,8 +136,8 @@ export default class DependencyGraph extends EventEmitter {
135136
);
136137
this._resolutionCache = new Map();
137138
this.#packageCache = new PackageCache({
138-
getClosestPackage: absoluteModulePath =>
139-
this._getClosestPackage(absoluteModulePath),
139+
getClosestPackage: (absoluteModulePath, observations) =>
140+
this._getClosestPackage(absoluteModulePath, observations),
140141
});
141142
this._createModuleResolver();
142143
});
@@ -193,6 +194,7 @@ export default class DependencyGraph extends EventEmitter {
193194

194195
_getClosestPackage(
195196
absoluteModulePath: string,
197+
observations?: ?ResolutionObservations,
196198
): ?{packageJsonPath: string, packageRelativePath: string} {
197199
const result = this._fileSystem.hierarchicalLookup(
198200
absoluteModulePath,
@@ -201,6 +203,7 @@ export default class DependencyGraph extends EventEmitter {
201203
breakOnSegment: 'node_modules',
202204
subpathType: 'f',
203205
},
206+
observations,
204207
);
205208
return result
206209
? {

0 commit comments

Comments
 (0)