@atlaspack/fs 2.15.16 → 2.15.17-typescript-5ad950d33.0

package/lib/NodeVCSAwareFS.js

@@ -44,7 +44,6 @@ var _package = _interopRequireDefault(require("../package.json"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// $FlowFixMe
 class NodeVCSAwareFS extends _NodeFS.NodeFS {
   /**
    * These files are excluded from 'dirty file' tracking even if they are
@@ -66,8 +65,6 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     this.#logEventDiff = options.logEventDiff;
     this.#gitRepoPath = options.gitRepoPath;
   }
-
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
   static deserialize(data) {
     const fs = new NodeVCSAwareFS({
       excludePatterns: data.excludePatterns,
@@ -77,7 +74,7 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     return fs;
   }
 
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
+  // @ts-expect-error TS2416
   serialize() {
     return {
       excludePatterns: this.#excludePatterns,
@@ -103,7 +100,14 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
       return JSON.parse(snapshotFileContent);
     });
     let watcherEventsSince = [];
-    const vcsEventsSince = vcsState != null ? (await (0, _logger().instrumentAsync)('NodeVCSAwareFS::rust.getEventsSince', () => (0, _rust().getEventsSince)(gitRepoPath, vcsState, null))).map(e => ({
+    const vcsEventsSince = vcsState != null ?
+    // @ts-expect-error TS2571
+    (await (0, _logger().instrumentAsync)('NodeVCSAwareFS::rust.getEventsSince', () =>
+    // @ts-expect-error TS2739
+    (0, _rust().getEventsSince)(gitRepoPath, vcsState, null))
+
+    // @ts-expect-error TS7006
+    ).map(e => ({
       path: e.path,
       type: e.changeType
     })) : null;
@@ -112,6 +116,8 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
       watcherEventsSince = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::watchman.getEventsSince', () => this.watcher().getEventsSince(dir, nativeSnapshotPath, opts));
       (_this$logEventDiff = this.#logEventDiff) === null || _this$logEventDiff === void 0 || _this$logEventDiff.call(this, watcherEventsSince, vcsEventsSince);
     }
+
+    // @ts-expect-error TS2345
     if (['NEW_AND_CHECK', 'NEW'].includes((0, _featureFlags().getFeatureFlagValue)('vcsMode'))) {
       if (vcsEventsSince == null) {
         _logger().default.error({
@@ -145,13 +151,17 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     let vcsState = null;
     try {
       var _vcsState, _vcsState2;
-      vcsState = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::getVcsStateSnapshot', () => (0, _rust().getVcsStateSnapshot)(gitRepoPath, this.#excludePatterns));
+      vcsState = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::getVcsStateSnapshot',
+      // @ts-expect-error TS2322
+      () => (0, _rust().getVcsStateSnapshot)(gitRepoPath, this.#excludePatterns));
       _logger().default.verbose({
         origin: '@atlaspack/fs',
         message: 'Expose VCS timing metrics',
         meta: {
           trackableEvent: 'vcs_timing_metrics',
+          // @ts-expect-error TS2339
           dirtyFilesExecutionTime: (_vcsState = vcsState) === null || _vcsState === void 0 ? void 0 : _vcsState.dirtyFilesExecutionTime,
+          // @ts-expect-error TS2339
           yarnStatesExecutionTime: (_vcsState2 = vcsState) === null || _vcsState2 === void 0 ? void 0 : _vcsState2.yarnStatesExecutionTime
         }
       });

package/lib/OverlayFS.d.ts

@@ -0,0 +1,50 @@
+import type { Readable, Writable } from 'stream';
+import type { FilePath, Encoding, FileOptions, FileSystem, ReaddirOptions, FileStats } from '@atlaspack/types-internal';
+import type { Event, Options as WatcherOptions, AsyncSubscription } from '@parcel/watcher';
+import WorkerFarm from '@atlaspack/workers';
+export declare class OverlayFS implements FileSystem {
+    deleted: Set<FilePath>;
+    writable: FileSystem;
+    readable: FileSystem;
+    _cwd: FilePath;
+    constructor(workerFarmOrFS: WorkerFarm | FileSystem, readable: FileSystem);
+    static deserialize(opts: any): OverlayFS;
+    serialize(): {
+        $$raw: boolean;
+        readable: FileSystem;
+        writable: FileSystem;
+        deleted: Set<FilePath>;
+    };
+    _deletedThrows(filePath: FilePath): FilePath;
+    _checkExists(filePath: FilePath): FilePath;
+    _isSymlink(filePath: FilePath): boolean;
+    _copyPathForWrite(filePath: FilePath): Promise<FilePath>;
+    _normalizePath(filePath: FilePath): FilePath;
+    readFile(filePath: FilePath, encoding?: Encoding): Promise<any>;
+    writeFile(filePath: FilePath, contents: string | Buffer, options?: FileOptions | null): Promise<void>;
+    copyFile(source: FilePath, destination: FilePath): Promise<void>;
+    stat(filePath: FilePath): Promise<FileStats>;
+    symlink(target: FilePath, filePath: FilePath): Promise<void>;
+    unlink(filePath: FilePath): Promise<void>;
+    mkdirp(dir: FilePath): Promise<void>;
+    rimraf(filePath: FilePath): Promise<void>;
+    ncp(source: FilePath, destination: FilePath): Promise<void>;
+    createReadStream(filePath: FilePath, opts?: FileOptions | null): Readable;
+    createWriteStream(path: FilePath, opts?: FileOptions | null): Writable;
+    cwd(): FilePath;
+    chdir(path: FilePath): void;
+    realpath(filePath: FilePath): Promise<FilePath>;
+    readFileSync(filePath: FilePath, encoding?: Encoding): any;
+    statSync(filePath: FilePath): FileStats;
+    realpathSync(filePath: FilePath): FilePath;
+    exists(filePath: FilePath): Promise<boolean>;
+    existsSync(filePath: FilePath): boolean;
+    readdir(path: FilePath, opts?: ReaddirOptions): Promise<any>;
+    readdirSync(dir: FilePath, opts?: ReaddirOptions): any;
+    watch(dir: FilePath, fn: (err: Error | null | undefined, events: Array<Event>) => unknown, opts: WatcherOptions): Promise<AsyncSubscription>;
+    getEventsSince(dir: FilePath, snapshot: FilePath, opts: WatcherOptions): Promise<Array<Event>>;
+    writeSnapshot(dir: FilePath, snapshot: FilePath, opts: WatcherOptions): Promise<void>;
+    findAncestorFile(fileNames: Array<string>, fromDir: FilePath, root: FilePath): FilePath | null | undefined;
+    findNodeModule(moduleName: string, fromDir: FilePath): FilePath | null | undefined;
+    findFirstFile(filePaths: Array<FilePath>): FilePath | null | undefined;
+}

package/lib/OverlayFS.js

@@ -252,10 +252,10 @@ class OverlayFS {
   readFileSync(filePath, encoding) {
     filePath = this.realpathSync(filePath);
     try {
-      // $FlowFixMe[incompatible-call]
+      // @ts-expect-error TS2345
       return this.writable.readFileSync(filePath, encoding);
     } catch (err) {
-      // $FlowFixMe[incompatible-call]
+      // @ts-expect-error TS2345
       return this.readable.readFileSync(filePath, encoding);
     }
   }
@@ -304,6 +304,7 @@ class OverlayFS {
     // Read from both filesystems and merge the results
     let entries = new Map();
     try {
+      // @ts-expect-error TS2769
       for (let entry of this.writable.readdirSync(dir, opts)) {
         let filePath = _path().default.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;
@@ -313,6 +314,7 @@ class OverlayFS {
       // noop
     }
     try {
+      // @ts-expect-error TS2769
       for (let entry of this.readable.readdirSync(dir, opts)) {
         let filePath = _path().default.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;

package/lib/find.d.ts

@@ -0,0 +1,4 @@
+import type { FilePath, FileSystem } from '@atlaspack/types-internal';
+export declare function findNodeModule(fs: FileSystem, moduleName: string, dir: FilePath): FilePath | null | undefined;
+export declare function findAncestorFile(fs: FileSystem, fileNames: Array<string>, dir: FilePath, root: FilePath): FilePath | null | undefined;
+export declare function findFirstFile(fs: FileSystem, filePaths: Array<FilePath>): FilePath | null | undefined;

package/lib/index.d.ts

@@ -0,0 +1,7 @@
+import type { FilePath, FileSystem, FileOptions } from '@atlaspack/types-internal';
+export * from './NodeFS';
+export * from './MemoryFS';
+export * from './OverlayFS';
+export * from './NodeVCSAwareFS';
+export type { FileSystem, FileOptions };
+export declare function ncp(sourceFS: FileSystem, source: FilePath, destinationFS: FileSystem, destination: FilePath, filter?: (filePath: FilePath) => boolean): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/fs",
-  "version": "2.15.16",
+  "version": "2.15.17-typescript-5ad950d33.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -10,9 +10,9 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/index.js",
-  "source": "src/index.js",
-  "types": "index.d.ts",
+  "main": "./lib/index.js",
+  "source": "./src/index.ts",
+  "types": "./lib/index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
@@ -48,19 +48,18 @@
     }
   },
   "scripts": {
-    "build-ts": "mkdir -p lib && flow-to-ts src/types.js > lib/types.d.ts",
-    "check-ts": "tsc --noEmit index.d.ts"
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3",
-    "@atlaspack/feature-flags": "2.20.0",
-    "@atlaspack/logger": "2.14.13",
-    "@atlaspack/rust": "3.4.1",
-    "@atlaspack/types-internal": "2.16.0",
-    "@atlaspack/utils": "2.17.3",
+    "@atlaspack/build-cache": "2.13.4-typescript-5ad950d33.0",
+    "@atlaspack/feature-flags": "2.20.1-typescript-5ad950d33.0",
+    "@atlaspack/logger": "2.14.14-typescript-5ad950d33.0",
+    "@atlaspack/rust": "3.4.2-typescript-5ad950d33.0",
+    "@atlaspack/types-internal": "2.16.1-typescript-5ad950d33.0",
+    "@atlaspack/utils": "2.17.4-typescript-5ad950d33.0",
+    "@atlaspack/watcher-watchman-js": "2.14.22-typescript-5ad950d33.0",
+    "@atlaspack/workers": "2.14.22-typescript-5ad950d33.0",
     "@parcel/watcher": "^2.0.7",
-    "@atlaspack/workers": "2.14.21",
-    "@atlaspack/watcher-watchman-js": "2.14.21",
     "graceful-fs": "^4.2.4",
     "ncp": "^2.0.0",
     "nullthrows": "^1.1.1",
@@ -70,5 +69,6 @@
     "@atlaspack/fs": "./lib/browser.js",
     "./src/NodeFS.js": "./src/NodeFS.browser.js"
   },
-  "type": "commonjs"
-}
+  "type": "commonjs",
+  "gitHead": "5ad950d33a5f2255ebeb10c04a2e84c346e2de85"
+}

package/src/{MemoryFS.js → MemoryFS.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   FilePath,
   FileSystem,
@@ -28,22 +26,21 @@ let id = 0;
 
 type HandleFunction = (...args: Array<any>) => any;
 type SerializedMemoryFS = {
-  id: number,
-  handle: any,
-  dirs: Map<FilePath, Directory>,
-  files: Map<FilePath, File>,
-  symlinks: Map<FilePath, FilePath>,
-  ...
+  id: number;
+  handle: any;
+  dirs: Map<FilePath, Directory>;
+  files: Map<FilePath, File>;
+  symlinks: Map<FilePath, FilePath>;
 };
 
-type WorkerEvent = {|
-  type: 'writeFile' | 'unlink' | 'mkdir' | 'symlink',
-  path: FilePath,
-  entry?: Entry,
-  target?: FilePath,
-|};
+type WorkerEvent = {
+  type: 'writeFile' | 'unlink' | 'mkdir' | 'symlink';
+  path: FilePath;
+  entry?: Entry;
+  target?: FilePath;
+};
 
-type ResolveFunction = () => mixed;
+type ResolveFunction = () => unknown;
 
 export class MemoryFS implements FileSystem {
   dirs: Map<FilePath, Directory>;
@@ -52,11 +49,13 @@ export class MemoryFS implements FileSystem {
   watchers: Map<FilePath, Set<Watcher>>;
   events: Array<Event>;
   id: number;
+  // @ts-expect-error TS2564
   handle: Handle;
   farm: WorkerFarm;
   _cwd: FilePath;
   _eventQueue: Array<Event>;
-  _watcherTimer: TimeoutID;
+  // @ts-expect-error TS2564
+  _watcherTimer: number;
   _numWorkerInstances: number = 0;
   _workerHandles: Array<Handle>;
   _workerRegisterResolves: Array<ResolveFunction> = [];
@@ -103,8 +102,8 @@ export class MemoryFS implements FileSystem {
   serialize(): SerializedMemoryFS {
     if (!this.handle) {
       this.handle = this.farm.createReverseHandle(
-        (fn: string, args: Array<mixed>) => {
-          // $FlowFixMe
+        (fn: string, args: Array<unknown>) => {
+          // @ts-expect-error TS7053
           return this[fn](...args);
         },
       );
@@ -114,6 +113,7 @@ export class MemoryFS implements FileSystem {
     this._numWorkerInstances++;
 
     return {
+      // @ts-expect-error TS2353
       $$raw: false,
       id: this.id,
       handle: this.handle,
@@ -166,7 +166,7 @@ export class MemoryFS implements FileSystem {
   async writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options?: ?FileOptions,
+    options?: FileOptions | null,
   ) {
     filePath = this._normalizePath(filePath);
     if (this.dirs.has(filePath)) {
@@ -256,7 +256,7 @@ export class MemoryFS implements FileSystem {
       dir += path.sep;
     }
 
-    let res = [];
+    let res: Array<Dirent | any | string> = [];
     for (let [filePath, entry] of this.dirs) {
       if (filePath === dir) {
         continue;
@@ -496,7 +496,10 @@ export class MemoryFS implements FileSystem {
     return new ReadStream(this, filePath);
   }
 
-  createWriteStream(filePath: FilePath, options: ?FileOptions): WriteStream {
+  createWriteStream(
+    filePath: FilePath,
+    options?: FileOptions | null,
+  ): WriteStream {
     this.mkdirp(path.dirname(filePath));
     return new WriteStream(this, filePath, options);
   }
@@ -541,6 +544,7 @@ export class MemoryFS implements FileSystem {
     this._eventQueue.push(event);
     clearTimeout(this._watcherTimer);
 
+    // @ts-expect-error TS2322
     this._watcherTimer = setTimeout(() => {
       let events = this._eventQueue;
       this._eventQueue = [];
@@ -572,8 +576,10 @@ export class MemoryFS implements FileSystem {
   async _sendWorkerEvent(event: WorkerEvent) {
     // Wait for worker instances to register their handles
     while (this._workerHandles.length < this._numWorkerInstances) {
-      await new Promise((resolve) =>
-        this._workerRegisterResolves.push(resolve),
+      await new Promise(
+        (resolve: (result: Promise<undefined> | undefined) => void) =>
+          // @ts-expect-error TS2345
+          this._workerRegisterResolves.push(resolve),
       );
     }
 
@@ -586,7 +592,7 @@ export class MemoryFS implements FileSystem {
 
   watch(
     dir: FilePath,
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     dir = this._normalizePath(dir);
@@ -640,25 +646,28 @@ export class MemoryFS implements FileSystem {
     fileNames: Array<string>,
     fromDir: FilePath,
     root: FilePath,
-  ): ?FilePath {
+  ): FilePath | null | undefined {
     return findAncestorFile(this, fileNames, fromDir, root);
   }
 
-  findNodeModule(moduleName: string, fromDir: FilePath): ?FilePath {
+  findNodeModule(
+    moduleName: string,
+    fromDir: FilePath,
+  ): FilePath | null | undefined {
     return findNodeModule(this, moduleName, fromDir);
   }
 
-  findFirstFile(filePaths: Array<FilePath>): ?FilePath {
+  findFirstFile(filePaths: Array<FilePath>): FilePath | null | undefined {
     return findFirstFile(this, filePaths);
   }
 }
 
 class Watcher {
-  fn: (err: ?Error, events: Array<Event>) => mixed;
+  fn: (err: Error | null | undefined, events: Array<Event>) => unknown;
   options: WatcherOptions;
 
   constructor(
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     options: WatcherOptions,
   ) {
     this.fn = fn;
@@ -726,10 +735,14 @@ class ReadStream extends Readable {
 class WriteStream extends Writable {
   fs: FileSystem;
   filePath: FilePath;
-  options: ?FileOptions;
+  options: FileOptions | null | undefined;
   buffer: Buffer;
 
-  constructor(fs: FileSystem, filePath: FilePath, options: ?FileOptions) {
+  constructor(
+    fs: FileSystem,
+    filePath: FilePath,
+    options?: FileOptions | null,
+  ) {
     super({emitClose: true, autoDestroy: true});
     this.fs = fs;
     this.filePath = filePath;
@@ -750,6 +763,7 @@ class WriteStream extends Writable {
   _final(callback: (error?: Error) => void) {
     this.fs
       .writeFile(this.filePath, this.buffer, this.options)
+      // @ts-expect-error TS2345
       .then(callback)
       .catch(callback);
   }
@@ -935,7 +949,7 @@ export function makeShared(contents: Buffer | string): Buffer {
   }
 
   let contentsBuffer: Buffer | string = contents;
-  // $FlowFixMe
+  // @ts-expect-error TS2339
   if (process.browser) {
     // For the polyfilled buffer module, it's faster to always convert once so that the subsequent
     // operations are fast (.byteLength and using .set instead of .write)
@@ -965,10 +979,10 @@ class WorkerFS extends MemoryFS {
 
   constructor(id: number, handle: Handle) {
     // TODO Make this not a subclass
-    // $FlowFixMe
+    // @ts-expect-error TS2554
     super();
     this.id = id;
-    this.handleFn = (methodName, args) =>
+    this.handleFn = (methodName: any, args: any) =>
       WorkerFarm.getWorkerApi().runHandle(handle, [methodName, args]);
 
     this.handleFn('_registerWorker', [
@@ -998,7 +1012,7 @@ class WorkerFS extends MemoryFS {
   }
 
   serialize(): SerializedMemoryFS {
-    // $FlowFixMe
+    // @ts-expect-error TS2739
     return {
       id: this.id,
     };
@@ -1007,7 +1021,7 @@ class WorkerFS extends MemoryFS {
   writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options: ?FileOptions,
+    options?: FileOptions | null,
   ): Promise<void> {
     super.writeFile(filePath, contents, options);
     let buffer = makeShared(contents);

package/src/{NodeFS.browser.js → NodeFS.browser.ts}

@@ -1,7 +1,6 @@
-// @flow
 import type {FileSystem} from '@atlaspack/types-internal';
 
-// $FlowFixMe[prop-missing] handled by the throwing constructor
+// @ts-expect-error TS2420
 export class NodeFS implements FileSystem {
   constructor() {
     throw new Error("NodeFS isn't available in the browser");

package/src/{NodeFS.js → NodeFS.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {ReadStream, Stats} from 'fs';
 import type {Writable} from 'stream';
 import type {
@@ -13,8 +12,10 @@ import type {
   AsyncSubscription,
 } from '@parcel/watcher';
 
+// @ts-expect-error TS7016
 import fs from 'graceful-fs';
 import nativeFS from 'fs';
+// @ts-expect-error TS7016
 import ncp from 'ncp';
 import path from 'path';
 import {tmpdir} from 'os';
@@ -40,7 +41,6 @@ function getWatchmanWatcher(): typeof watcher {
   // This is here to trick atlaspack into ignoring this require...
   const packageName = ['@atlaspack', 'watcher-watchman-js'].join('/');
 
-  // $FlowFixMe
   return require(packageName);
 }
 
@@ -62,15 +62,18 @@ export class NodeFS implements FileSystem {
   realpathSync: (path: string, cache?: any) => string =
     process.platform === 'win32' ? fs.realpathSync : fs.realpathSync.native;
   existsSync: (path: string) => boolean = fs.existsSync;
-  readdirSync: any = (fs.readdirSync: any);
+  readdirSync: any = fs.readdirSync as any;
   findAncestorFile: any = isPnP
-    ? (...args) => searchJS.findAncestorFile(this, ...args)
+    ? // @ts-expect-error TS7019
+      (...args) => searchJS.findAncestorFile(this, ...args)
     : searchNative.findAncestorFile;
   findNodeModule: any = isPnP
-    ? (...args) => searchJS.findNodeModule(this, ...args)
+    ? // @ts-expect-error TS7019
+      (...args) => searchJS.findNodeModule(this, ...args)
     : searchNative.findNodeModule;
   findFirstFile: any = isPnP
-    ? (...args) => searchJS.findFirstFile(this, ...args)
+    ? // @ts-expect-error TS7019
+      (...args) => searchJS.findFirstFile(this, ...args)
     : searchNative.findFirstFile;
 
   watcher(): typeof watcher {
@@ -79,7 +82,7 @@ export class NodeFS implements FileSystem {
       : watcher;
   }
 
-  createWriteStream(filePath: string, options: any): Writable {
+  createWriteStream(filePath: string, options?: any): Writable {
     // Make createWriteStream atomic
     let tmpFilePath = getTempFilePath(filePath);
     let failed = false;
@@ -88,7 +91,7 @@ export class NodeFS implements FileSystem {
       if (!failed) {
         try {
           await fs.promises.rename(tmpFilePath, filePath);
-        } catch (e) {
+        } catch (e: any) {
           // This is adapted from fs-write-stream-atomic. Apparently
           // Windows doesn't like renaming when the target already exists.
           if (
@@ -117,7 +120,9 @@ export class NodeFS implements FileSystem {
       ...options,
       fs: {
         ...fs,
+        // @ts-expect-error TS7006
         close: (fd, cb) => {
+          // @ts-expect-error TS7006
           fs.close(fd, (err) => {
             if (err) {
               cb(err);
@@ -136,7 +141,7 @@ export class NodeFS implements FileSystem {
       failed = true;
       try {
         fs.unlinkSync(tmpFilePath);
-      } catch (_err) {
+      } catch (_err: any) {
         // ignore
       }
     });
@@ -147,7 +152,7 @@ export class NodeFS implements FileSystem {
   async writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options: ?FileOptions,
+    options?: FileOptions | null,
   ): Promise<void> {
     let tmpFilePath = getTempFilePath(filePath);
     await fs.promises.writeFile(tmpFilePath, contents, options);
@@ -164,7 +169,7 @@ export class NodeFS implements FileSystem {
   async realpath(originalPath: string): Promise<string> {
     try {
       return await realpath(originalPath, 'utf8');
-    } catch (e) {
+    } catch (e: any) {
       // do nothing
     }
 
@@ -172,14 +177,14 @@ export class NodeFS implements FileSystem {
   }
 
   exists(filePath: FilePath): Promise<boolean> {
-    return new Promise((resolve) => {
+    return new Promise((resolve: (result: Promise<never>) => void) => {
       fs.exists(filePath, resolve);
     });
   }
 
   watch(
     dir: FilePath,
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     return this.watcher().subscribe(dir, fn, opts);
@@ -224,12 +229,11 @@ export class NodeFS implements FileSystem {
     let stat;
     try {
       stat = await this.stat(filePath);
-    } catch (err) {
+    } catch (err: any) {
       return;
     }
 
     if (stat.isDirectory()) {
-      // $FlowFixMe
       await nativeFS.promises.rmdir(filePath, {recursive: true});
     } else {
       await nativeFS.promises.unlink(filePath);
@@ -241,6 +245,7 @@ registerSerializableClass(`${packageJSON.version}:NodeFS`, NodeFS);
 
 let writeStreamCalls = 0;
 
+// @ts-expect-error TS7034
 let threadId;
 try {
   ({threadId} = require('worker_threads'));
@@ -248,10 +253,13 @@ try {
   //
 }
 
+// @ts-expect-error TS7034
 let useOsTmpDir;
 
-function shouldUseOsTmpDir(filePath) {
+function shouldUseOsTmpDir(filePath: FilePath) {
+  // @ts-expect-error TS7005
   if (useOsTmpDir != null) {
+    // @ts-expect-error TS7005
     return useOsTmpDir;
   }
   try {
@@ -265,7 +273,7 @@ function shouldUseOsTmpDir(filePath) {
     // Check the tmpdir is on the same partition as the target directory.
     // This is required to ensure renaming is an atomic operation.
     useOsTmpDir = tmpDirStats.dev === filePathStats.dev;
-  } catch (e) {
+  } catch (e: any) {
     // We don't have read/write access to the OS tmp directory
     useOsTmpDir = false;
   }
@@ -288,6 +296,7 @@ function getTempFilePath(filePath: FilePath) {
     tmpFilePath +
     '.' +
     process.pid +
+    // @ts-expect-error TS7005
     (threadId != null ? '.' + threadId : '') +
     '.' +
     (writeStreamCalls++).toString(36)