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

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

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import path from 'path';
 import {NodeFS} from './NodeFS';
 import {getVcsStateSnapshot, getEventsSince} from '@atlaspack/rust';
@@ -9,7 +7,6 @@ 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 {
@@ -43,7 +40,6 @@ 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,
@@ -53,7 +49,7 @@ export class NodeVCSAwareFS extends NodeFS {
     return fs;
   }
 
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
+  // @ts-expect-error TS2416
   serialize(): SerializedNodeVCSAwareFS {
     return {
       excludePatterns: this.#excludePatterns,
@@ -85,18 +81,22 @@ export class NodeVCSAwareFS extends NodeFS {
         return JSON.parse(snapshotFileContent);
       },
     );
-    let watcherEventsSince = [];
+    let watcherEventsSince: Array<Event> = [];
 
     const vcsEventsSince =
       vcsState != null
-        ? (
+        ? // @ts-expect-error TS2571
+          (
             await instrumentAsync('NodeVCSAwareFS::rust.getEventsSince', () =>
+              // @ts-expect-error TS2739
               getEventsSince(gitRepoPath, vcsState, null),
             )
-          ).map((e) => ({
-            path: e.path,
-            type: e.changeType,
-          }))
+          )
+            // @ts-expect-error TS7006
+            .map((e) => ({
+              path: e.path,
+              type: e.changeType,
+            }))
         : null;
 
     if (getFeatureFlagValue('vcsMode') !== 'NEW' && vcsEventsSince != null) {
@@ -107,6 +107,7 @@ 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({
@@ -159,6 +160,7 @@ export class NodeVCSAwareFS extends NodeFS {
     try {
       vcsState = await instrumentAsync(
         'NodeVCSAwareFS::getVcsStateSnapshot',
+        // @ts-expect-error TS2322
         () => getVcsStateSnapshot(gitRepoPath, this.#excludePatterns),
       );
 
@@ -167,11 +169,13 @@ 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) {
+    } catch (err: any) {
       logger.error({
         origin: '@atlaspack/fs',
         message: `Failed to get VCS state snapshot: ${err.message}`,
@@ -185,7 +189,7 @@ export class NodeVCSAwareFS extends NodeFS {
     const snapshotContents = {
       vcsState,
       nativeSnapshotPath,
-    };
+    } as const;
     await this.writeFile(snapshot, JSON.stringify(snapshotContents));
   }
 }

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

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

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

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

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

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

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

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

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}

package/index.d.ts

@@ -1,34 +0,0 @@
-import type {FileSystem, FilePath} from '@atlaspack/types-internal';
-import type {Event} from '@parcel/watcher';
-import type WorkerFarm from '@atlaspack/workers';
-
-export type {
-  FileSystem,
-  FileOptions,
-  ReaddirOptions,
-  Stats,
-  Encoding,
-  Dirent,
-} from '@atlaspack/types-internal';
-
-export const NodeFS: {
-  new (): FileSystem;
-};
-
-export const MemoryFS: {
-  new (farm: WorkerFarm): FileSystem;
-};
-
-export const OverlayFS: {
-  new (writable: FileSystem, readable: FileSystem): FileSystem;
-};
-
-interface NodeVCSAwareFSOptions {
-  gitRepoPath: null | FilePath;
-  excludePatterns: Array<string>;
-  logEventDiff: null | ((watcherEvents: Event[], vcsEvents: Event[]) => void);
-}
-
-export const NodeVCSAwareFS: {
-  new (options: NodeVCSAwareFSOptions): FileSystem;
-};