@atlaspack/fs 2.15.16-typescript-5b4d3ad41.0 → 2.15.16

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

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

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

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import path from 'path';
 import {NodeFS} from './NodeFS';
 import {getVcsStateSnapshot, getEventsSince} from '@atlaspack/rust';
@@ -7,6 +9,7 @@ import {registerSerializableClass} from '@atlaspack/build-cache';
 import logger, {instrumentAsync} from '@atlaspack/logger';
 import {getFeatureFlagValue} from '@atlaspack/feature-flags';
 
+// $FlowFixMe
 import packageJSON from '../package.json';
 
 export interface NodeVCSAwareFSOptions {
@@ -40,6 +43,7 @@ export class NodeVCSAwareFS extends NodeFS {
     this.#gitRepoPath = options.gitRepoPath;
   }
 
+  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
   static deserialize(data: SerializedNodeVCSAwareFS): NodeVCSAwareFS {
     const fs = new NodeVCSAwareFS({
       excludePatterns: data.excludePatterns,
@@ -49,7 +53,7 @@ export class NodeVCSAwareFS extends NodeFS {
     return fs;
   }
 
-  // @ts-expect-error TS2416
+  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
   serialize(): SerializedNodeVCSAwareFS {
     return {
       excludePatterns: this.#excludePatterns,
@@ -81,22 +85,18 @@ export class NodeVCSAwareFS extends NodeFS {
         return JSON.parse(snapshotFileContent);
       },
     );
-    let watcherEventsSince: Array<Event> = [];
+    let watcherEventsSince = [];
 
     const vcsEventsSince =
       vcsState != null
-        ? // @ts-expect-error TS2571
-          (
+        ? (
             await instrumentAsync('NodeVCSAwareFS::rust.getEventsSince', () =>
-              // @ts-expect-error TS2739
               getEventsSince(gitRepoPath, vcsState, null),
             )
-          )
-            // @ts-expect-error TS7006
-            .map((e) => ({
-              path: e.path,
-              type: e.changeType,
-            }))
+          ).map((e) => ({
+            path: e.path,
+            type: e.changeType,
+          }))
         : null;
 
     if (getFeatureFlagValue('vcsMode') !== 'NEW' && vcsEventsSince != null) {
@@ -107,7 +107,6 @@ export class NodeVCSAwareFS extends NodeFS {
       this.#logEventDiff?.(watcherEventsSince, vcsEventsSince);
     }
 
-    // @ts-expect-error TS2345
     if (['NEW_AND_CHECK', 'NEW'].includes(getFeatureFlagValue('vcsMode'))) {
       if (vcsEventsSince == null) {
         logger.error({
@@ -160,7 +159,6 @@ export class NodeVCSAwareFS extends NodeFS {
     try {
       vcsState = await instrumentAsync(
         'NodeVCSAwareFS::getVcsStateSnapshot',
-        // @ts-expect-error TS2322
         () => getVcsStateSnapshot(gitRepoPath, this.#excludePatterns),
       );
 
@@ -169,13 +167,11 @@ export class NodeVCSAwareFS extends NodeFS {
         message: 'Expose VCS timing metrics',
         meta: {
           trackableEvent: 'vcs_timing_metrics',
-          // @ts-expect-error TS2339
           dirtyFilesExecutionTime: vcsState?.dirtyFilesExecutionTime,
-          // @ts-expect-error TS2339
           yarnStatesExecutionTime: vcsState?.yarnStatesExecutionTime,
         },
       });
-    } catch (err: any) {
+    } catch (err) {
       logger.error({
         origin: '@atlaspack/fs',
         message: `Failed to get VCS state snapshot: ${err.message}`,
@@ -189,7 +185,7 @@ export class NodeVCSAwareFS extends NodeFS {
     const snapshotContents = {
       vcsState,
       nativeSnapshotPath,
-    } as const;
+    };
     await this.writeFile(snapshot, JSON.stringify(snapshotContents));
   }
 }

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

@@ -1,3 +1,5 @@
+// @flow
+
 import type {Readable, Writable} from 'stream';
 import type {
   FilePath,
@@ -44,12 +46,12 @@ export class OverlayFS implements FileSystem {
     return fs;
   }
 
-  serialize(): {
-    $$raw: boolean;
-    readable: FileSystem;
-    writable: FileSystem;
-    deleted: Set<FilePath>;
-  } {
+  serialize(): {|
+    $$raw: boolean,
+    readable: FileSystem,
+    writable: FileSystem,
+    deleted: Set<FilePath>,
+  |} {
     return {
       $$raw: false,
       writable: this.writable,
@@ -106,7 +108,7 @@ export class OverlayFS implements FileSystem {
               }
             }
           }
-        } catch (e: any) {
+        } catch (e) {
           if (e.code === 'ENOENT') {
             return false;
           }
@@ -139,7 +141,7 @@ export class OverlayFS implements FileSystem {
   async writeFile(
     filePath: FilePath,
     contents: string | Buffer,
-    options?: FileOptions | null,
+    options: ?FileOptions,
   ): Promise<void> {
     filePath = await this._copyPathForWrite(filePath);
     await this.writable.writeFile(filePath, contents, options);
@@ -210,7 +212,7 @@ export class OverlayFS implements FileSystem {
 
     try {
       await this.writable.unlink(filePath);
-    } catch (e: any) {
+    } catch (e) {
       if (e.code === 'ENOENT' && !this.readable.existsSync(filePath)) {
         throw e;
       }
@@ -237,7 +239,7 @@ export class OverlayFS implements FileSystem {
   async rimraf(filePath: FilePath): Promise<void> {
     try {
       await this.unlink(filePath);
-    } catch (e: any) {
+    } catch (e) {
       // noop
     }
   }
@@ -248,7 +250,7 @@ export class OverlayFS implements FileSystem {
     return this.writable.ncp(source, destination);
   }
 
-  createReadStream(filePath: FilePath, opts?: FileOptions | null): Readable {
+  createReadStream(filePath: FilePath, opts?: ?FileOptions): Readable {
     filePath = this._deletedThrows(filePath);
     if (this.writable.existsSync(filePath)) {
       return this.writable.createReadStream(filePath, opts);
@@ -257,7 +259,7 @@ export class OverlayFS implements FileSystem {
     return this.readable.createReadStream(filePath, opts);
   }
 
-  createWriteStream(path: FilePath, opts?: FileOptions | null): Writable {
+  createWriteStream(path: FilePath, opts?: ?FileOptions): Writable {
     path = this._normalizePath(path);
     this.deleted.delete(path);
     return this.writable.createWriteStream(path, opts);
@@ -279,10 +281,10 @@ export class OverlayFS implements FileSystem {
   readFileSync(filePath: FilePath, encoding?: Encoding): any {
     filePath = this.realpathSync(filePath);
     try {
-      // @ts-expect-error TS2345
+      // $FlowFixMe[incompatible-call]
       return this.writable.readFileSync(filePath, encoding);
-    } catch (err: any) {
-      // @ts-expect-error TS2345
+    } catch (err) {
+      // $FlowFixMe[incompatible-call]
       return this.readable.readFileSync(filePath, encoding);
     }
   }
@@ -291,7 +293,7 @@ export class OverlayFS implements FileSystem {
     filePath = this._normalizePath(filePath);
     try {
       return this.writable.statSync(filePath);
-    } catch (e: any) {
+    } catch (e) {
       if (e.code === 'ENOENT' && this.existsSync(filePath)) {
         return this.readable.statSync(filePath);
       }
@@ -319,7 +321,7 @@ export class OverlayFS implements FileSystem {
 
     try {
       filePath = this.realpathSync(filePath);
-    } catch (err: any) {
+    } catch (err) {
       if (err.code !== 'ENOENT') throw err;
     }
 
@@ -341,8 +343,7 @@ export class OverlayFS implements FileSystem {
     let entries = new Map();
 
     try {
-      // @ts-expect-error TS2769
-      for (let entry of this.writable.readdirSync(dir, opts)) {
+      for (let entry: any of this.writable.readdirSync(dir, opts)) {
         let filePath = path.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;
         entries.set(filePath, entry);
@@ -352,8 +353,7 @@ export class OverlayFS implements FileSystem {
     }
 
     try {
-      // @ts-expect-error TS2769
-      for (let entry of this.readable.readdirSync(dir, opts)) {
+      for (let entry: any of this.readable.readdirSync(dir, opts)) {
         let filePath = path.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;
         if (entries.has(filePath)) continue;
@@ -368,7 +368,7 @@ export class OverlayFS implements FileSystem {
 
   async watch(
     dir: FilePath,
-    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
+    fn: (err: ?Error, events: Array<Event>) => mixed,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     let writableSubscription = await this.writable.watch(dir, fn, opts);
@@ -411,18 +411,15 @@ export class OverlayFS implements FileSystem {
     fileNames: Array<string>,
     fromDir: FilePath,
     root: FilePath,
-  ): FilePath | null | undefined {
+  ): ?FilePath {
     return findAncestorFile(this, fileNames, fromDir, root);
   }
 
-  findNodeModule(
-    moduleName: string,
-    fromDir: FilePath,
-  ): FilePath | null | undefined {
+  findNodeModule(moduleName: string, fromDir: FilePath): ?FilePath {
     return findNodeModule(this, moduleName, fromDir);
   }
 
-  findFirstFile(filePaths: Array<FilePath>): FilePath | null | undefined {
+  findFirstFile(filePaths: Array<FilePath>): ?FilePath {
     return findFirstFile(this, filePaths);
   }
 }

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

@@ -1,3 +1,4 @@
+// @flow
 import type {FilePath, FileSystem} from '@atlaspack/types-internal';
 import path from 'path';
 
@@ -5,7 +6,7 @@ export function findNodeModule(
   fs: FileSystem,
   moduleName: string,
   dir: FilePath,
-): FilePath | null | undefined {
+): ?FilePath {
   let {root} = path.parse(dir);
   while (dir !== root) {
     // Skip node_modules directories
@@ -19,7 +20,7 @@ export function findNodeModule(
       if (stats.isDirectory()) {
         return moduleDir;
       }
-    } catch (err: any) {
+    } catch (err) {
       // ignore
     }
 
@@ -35,7 +36,7 @@ export function findAncestorFile(
   fileNames: Array<string>,
   dir: FilePath,
   root: FilePath,
-): FilePath | null | undefined {
+): ?FilePath {
   let {root: pathRoot} = path.parse(dir);
   // eslint-disable-next-line no-constant-condition
   while (true) {
@@ -49,7 +50,7 @@ export function findAncestorFile(
         if (fs.statSync(filePath).isFile()) {
           return filePath;
         }
-      } catch (err: any) {
+      } catch (err) {
         // ignore
       }
     }
@@ -67,13 +68,13 @@ export function findAncestorFile(
 export function findFirstFile(
   fs: FileSystem,
   filePaths: Array<FilePath>,
-): FilePath | null | undefined {
+): ?FilePath {
   for (let filePath of filePaths) {
     try {
       if (fs.statSync(filePath).isFile()) {
         return filePath;
       }
-    } catch (err: any) {
+    } catch (err) {
       // ignore
     }
   }

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

@@ -1,3 +1,4 @@
+// @flow strict-local
 import type {
   FilePath,
   FileSystem,
@@ -16,7 +17,7 @@ export * from './NodeVCSAwareFS';
 
 export type {FileSystem, FileOptions};
 
-const pipeline: (arg1: Readable, arg2: Writable) => Promise<void> = promisify(
+const pipeline: (Readable, Writable) => Promise<void> = promisify(
   stream.pipeline,
 );
 

package/test/{OverlayFS.test.ts → OverlayFS.test.js}

@@ -1,5 +1,7 @@
+// @flow
+
 import {OverlayFS} from '../src/OverlayFS';
-import {fsFixture} from '@atlaspack/test-utils';
+import {fsFixture} from '@atlaspack/test-utils/src/fsFixture';
 import {MemoryFS} from '../src/MemoryFS';
 import WorkerFarm from '@atlaspack/workers';
 import {WORKER_PATH} from '@atlaspack/core';
@@ -8,9 +10,9 @@ import assert from 'assert';
 import path from 'path';
 
 describe('OverlayFS', () => {
-  let underlayFS: any;
-  let fs: any;
-  let workerFarm: any;
+  let underlayFS;
+  let fs;
+  let workerFarm;
 
   beforeEach(() => {
     workerFarm = new WorkerFarm({