From 4e68f4710eecb2dc6d44c19fa851eacc39eefc7c Mon Sep 17 00:00:00 2001 From: Sam Zhou Date: Sun, 22 Nov 2026 10:20:24 -0800 Subject: [PATCH] Fix Flow types that use `void` for a missing value (#2263) Summary: Under Flow's `experimental.ts_void`, `void` is TypeScript's `void`, which flows only into `void`, `any` and `unknown`, so a value typed `void` can't be passed where an optional value is expected. This updates Metro's Flow types for projects that check Metro's sources with that option: RAM bundle `encoding` parameters become optional parameters, the bundle output's `save()` returns `Promise`, two test helpers admit `void`, and the two errors whose only fix needs the `undefined` type, which this repository's Flow config doesn't enable, are suppressed. Without that option, `void` and `undefined` are the same type, so nothing changes. Changelog: [Internal] Differential Revision: D133660832 --- packages/metro-file-map/src/watchers/__tests__/helpers.js | 4 ++-- packages/metro/src/DeltaBundler/Transformer.js | 1 + packages/metro/src/DeltaBundler/__tests__/resolver-test.js | 2 +- packages/metro/src/index.flow.js | 1 + packages/metro/src/shared/output/RamBundle/as-assets.js | 4 ++-- .../metro/src/shared/output/RamBundle/as-indexed-file.js | 6 +++--- packages/metro/src/shared/output/bundle.flow.js | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/metro-file-map/src/watchers/__tests__/helpers.js b/packages/metro-file-map/src/watchers/__tests__/helpers.js index 53ed712ba1..58abc3daa0 100644 --- a/packages/metro-file-map/src/watchers/__tests__/helpers.js +++ b/packages/metro-file-map/src/watchers/__tests__/helpers.js @@ -59,7 +59,7 @@ export type EventHelpers = { nextEvent: (afterFn: () => Promise) => Promise<{ eventType: string, path: string, - metadata?: ChangeEventMetadata, + metadata?: ChangeEventMetadata | void, }>, untilEvent: ( afterFn: () => Promise, @@ -150,7 +150,7 @@ export const startWatching = async ( Promise.all([ new Promise<{ eventType: string, - metadata?: ChangeEventMetadata, + metadata?: ChangeEventMetadata | void, path: string, }>((resolve, reject) => { const unsubscribe: () => void = watcherInstance.onFileEvent( diff --git a/packages/metro/src/DeltaBundler/Transformer.js b/packages/metro/src/DeltaBundler/Transformer.js index ae10b23d2e..8578774174 100644 --- a/packages/metro/src/DeltaBundler/Transformer.js +++ b/packages/metro/src/DeltaBundler/Transformer.js @@ -274,6 +274,7 @@ export default class Transformer { this._workerFarm.transform( projectRelativePath, transformerOptions, + // $FlowFixMe[incompatible-type] `void` is not `undefined` under experimental.ts_void content, assetUrlPath ?? undefined, ); diff --git a/packages/metro/src/DeltaBundler/__tests__/resolver-test.js b/packages/metro/src/DeltaBundler/__tests__/resolver-test.js index 72778a92ac..17bea6da77 100644 --- a/packages/metro/src/DeltaBundler/__tests__/resolver-test.js +++ b/packages/metro/src/DeltaBundler/__tests__/resolver-test.js @@ -125,7 +125,7 @@ function dep(name: string): TransformResultDependency { from: string, dependency: TransformResultDependency, resolverOptions?: ResolverInputOptions = {dev: true}, - options: void | {assumeFlatNodeModules: boolean}, + options?: {assumeFlatNodeModules: boolean}, ) => dependencyGraph.resolveDependency( from, diff --git a/packages/metro/src/index.flow.js b/packages/metro/src/index.flow.js index 07018b9188..14ec0c913a 100644 --- a/packages/metro/src/index.flow.js +++ b/packages/metro/src/index.flow.js @@ -593,6 +593,7 @@ async function earlyPortCheck(host: void | string, port: number) { server.on('error', err => { reject(err); }); + // $FlowFixMe[incompatible-type] `void` is not `undefined` under experimental.ts_void server.listen(port, host, undefined, () => resolve()); }); } finally { diff --git a/packages/metro/src/shared/output/RamBundle/as-assets.js b/packages/metro/src/shared/output/RamBundle/as-assets.js index a38f528f19..a13416d838 100644 --- a/packages/metro/src/shared/output/RamBundle/as-assets.js +++ b/packages/metro/src/shared/output/RamBundle/as-assets.js @@ -93,7 +93,7 @@ function createDir(dirName: string): Promise { function writeModuleFile( module: ModuleTransportLike, modulesDir: string, - encoding: void | 'ascii' | 'utf16le' | 'utf8', + encoding?: 'ascii' | 'utf16le' | 'utf8', ): Promise { const {code, id} = module; return writeFile(path.join(modulesDir, id + '.js'), code, encoding); @@ -102,7 +102,7 @@ function writeModuleFile( function writeModules( modules: ReadonlyArray, modulesDir: string, - encoding: void | 'ascii' | 'utf16le' | 'utf8', + encoding?: 'ascii' | 'utf16le' | 'utf8', ): Promise> { const writeFiles = modules.map( (module: ModuleTransportLike): Promise => diff --git a/packages/metro/src/shared/output/RamBundle/as-indexed-file.js b/packages/metro/src/shared/output/RamBundle/as-indexed-file.js index 06492a43c0..3e438b0b64 100644 --- a/packages/metro/src/shared/output/RamBundle/as-indexed-file.js +++ b/packages/metro/src/shared/output/RamBundle/as-indexed-file.js @@ -101,7 +101,7 @@ function writeBuffers( function nullTerminatedBuffer( contents: string, - encoding: void | 'ascii' | 'utf16le' | 'utf8', + encoding?: 'ascii' | 'utf16le' | 'utf8', ): Buffer { return Buffer.concat([Buffer.from(contents, encoding), nullByteBuffer]); } @@ -109,7 +109,7 @@ function nullTerminatedBuffer( function moduleToBuffer( id: number, code: string, - encoding: void | 'ascii' | 'utf16le' | 'utf8', + encoding?: 'ascii' | 'utf16le' | 'utf8', ): {buffer: Buffer, id: number} { return { id, @@ -194,7 +194,7 @@ function groupCode( function buildModuleBuffers( modules: ReadonlyArray, moduleGroups: ModuleGroups, - encoding: void | 'ascii' | 'utf16le' | 'utf8', + encoding?: 'ascii' | 'utf16le' | 'utf8', ): Array<{ buffer: Buffer, id: number, diff --git a/packages/metro/src/shared/output/bundle.flow.js b/packages/metro/src/shared/output/bundle.flow.js index b96cc6ff07..c192a6c6e1 100644 --- a/packages/metro/src/shared/output/bundle.flow.js +++ b/packages/metro/src/shared/output/bundle.flow.js @@ -69,7 +69,7 @@ export async function save( }, options: OutputOptions, log: (message: string) => void, -): Promise { +): Promise { const { bundleOutput, bundleEncoding: encoding,