@atlaspack/fs 2.12.1-dev.3478 → 2.12.1-dev.3502

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/fs",
-  "version": "2.12.1-dev.3478+5fd2da535",
+  "version": "2.12.1-dev.3502+c2daeab5a",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -20,7 +20,7 @@
     "types": false,
     "main": {
       "includeNodeModules": {
-        "@atlaspack/core": false,
+        "@atlaspack/build-cache": false,
         "@atlaspack/feature-flags": false,
         "@atlaspack/rust": false,
         "@atlaspack/types-internal": false,
@@ -32,7 +32,7 @@
     },
     "browser": {
       "includeNodeModules": {
-        "@atlaspack/core": false,
+        "@atlaspack/build-cache": false,
         "@atlaspack/feature-flags": false,
         "@atlaspack/rust": false,
         "@atlaspack/types-internal": false,
@@ -48,26 +48,24 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/rust": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/types-internal": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/utils": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/workers": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/build-cache": "2.12.1-dev.3502+c2daeab5a",
+    "@atlaspack/feature-flags": "2.12.1-dev.3502+c2daeab5a",
+    "@atlaspack/rust": "2.12.1-dev.3502+c2daeab5a",
+    "@atlaspack/types-internal": "2.12.1-dev.3502+c2daeab5a",
+    "@atlaspack/utils": "2.12.1-dev.3502+c2daeab5a",
+    "@atlaspack/workers": "2.12.1-dev.3502+c2daeab5a",
     "@parcel/watcher": "^2.0.7"
   },
   "devDependencies": {
-    "@atlaspack/watcher-watchman-js": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/watcher-watchman-js": "2.12.1-dev.3502+c2daeab5a",
     "graceful-fs": "^4.2.4",
     "ncp": "^2.0.0",
     "nullthrows": "^1.1.1",
     "utility-types": "^3.10.0"
   },
-  "peerDependencies": {
-    "@atlaspack/core": "^2.12.1-dev.3478+5fd2da535"
-  },
   "browser": {
     "@atlaspack/fs": "./lib/browser.js",
     "./src/NodeFS.js": "./src/NodeFS.browser.js"
   },
-  "gitHead": "5fd2da535ecbe096d57e03aec15e80bb1d7601f7"
+  "gitHead": "c2daeab5a12461903159dec34df5671eaaa9b749"
 }

package/src/MemoryFS.js

@@ -15,7 +15,7 @@ import type {
 
 import path from 'path';
 import {Readable, Writable} from 'stream';
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import {SharedBuffer} from '@atlaspack/utils';
 import packageJSON from '../package.json';
 import WorkerFarm, {Handle} from '@atlaspack/workers';
@@ -628,6 +628,7 @@ export class MemoryFS implements FileSystem {
   }
 
   async writeSnapshot(dir: FilePath, snapshot: FilePath): Promise<void> {
+    await this.mkdirp(path.dirname(snapshot));
     await this.writeFile(snapshot, '' + this.events.length);
   }
 
@@ -854,11 +855,15 @@ class Stat {
   }
 }
 
+interface DirEntry {
+  mode: number;
+}
+
 class Dirent {
   name: string;
   #mode: number;
 
-  constructor(name: string, entry: interface {mode: number}) {
+  constructor(name: string, entry: DirEntry) {
     this.name = name;
     this.#mode = entry.mode;
   }

package/src/NodeFS.js

@@ -19,7 +19,7 @@ import ncp from 'ncp';
 import path from 'path';
 import {tmpdir} from 'os';
 import {promisify} from 'util';
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import {hashFile} from '@atlaspack/utils';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import watcher from '@parcel/watcher';

package/src/NodeVCSAwareFS.js

@@ -0,0 +1,79 @@
+// @flow strict-local
+
+import path from 'path';
+import {NodeFS} from './NodeFS';
+import {getVcsStateSnapshot, getEventsSince} from '@atlaspack/rust';
+import type {FilePath} from '@atlaspack/types-internal';
+import type {Event, Options as WatcherOptions} from '@parcel/watcher';
+import {registerSerializableClass} from '@atlaspack/build-cache';
+
+// $FlowFixMe
+import packageJSON from '../package.json';
+
+export interface NodeVCSAwareFSOptions {
+  gitRepoPath: FilePath;
+  excludePatterns: Array<string>;
+  logEventDiff: (watcherEvents: Event[], vcsEvents: string[]) => void;
+}
+
+export class NodeVCSAwareFS extends NodeFS {
+  #options: NodeVCSAwareFSOptions;
+
+  constructor(options: NodeVCSAwareFSOptions) {
+    super();
+    this.#options = options;
+  }
+
+  async getEventsSince(
+    dir: FilePath,
+    snapshot: FilePath,
+    opts: WatcherOptions,
+  ): Promise<Array<Event>> {
+    const snapshotFile = await this.readFile(snapshot).toString();
+    const {nativeSnapshotPath, vcsState} = JSON.parse(snapshotFile);
+
+    const watcherEventsSince = await this.watcher().getEventsSince(
+      dir,
+      nativeSnapshotPath,
+      opts,
+    );
+    const vcsEventsSince = getEventsSince(
+      this.#options.gitRepoPath,
+      vcsState.gitHash,
+    );
+    this.#options.logEventDiff(watcherEventsSince, vcsEventsSince);
+
+    return watcherEventsSince;
+  }
+
+  async writeSnapshot(
+    dir: FilePath,
+    snapshot: FilePath,
+    opts: WatcherOptions,
+  ): Promise<void> {
+    const snapshotDirectory = path.dirname(snapshot);
+    const filename = path.basename(snapshot, '.txt');
+    const nativeSnapshotPath = path.join(
+      snapshotDirectory,
+      `${filename}.native-snapshot.txt`,
+    );
+    await this.watcher().writeSnapshot(dir, nativeSnapshotPath, opts);
+
+    // TODO: we need the git repo path, pass the exclude patterns
+    const vcsState = await getVcsStateSnapshot(
+      this.#options.gitRepoPath,
+      this.#options.excludePatterns,
+    );
+
+    const snapshotContents = {
+      vcsState,
+      nativeSnapshotPath,
+    };
+    await this.writeFile(snapshot, JSON.stringify(snapshotContents));
+  }
+}
+
+registerSerializableClass(
+  `${packageJSON.version}:NodeVCSAwareFS`,
+  NodeVCSAwareFS,
+);

package/src/OverlayFS.js

@@ -15,7 +15,7 @@ import type {
   AsyncSubscription,
 } from '@parcel/watcher';
 
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import WorkerFarm from '@atlaspack/workers';
 import packageJSON from '../package.json';
 import {findAncestorFile, findNodeModule, findFirstFile} from './find';

package/test/OverlayFS.test.js

@@ -15,7 +15,7 @@ describe('OverlayFS', () => {
 
   beforeEach(() => {
     workerFarm = new WorkerFarm({
-      workerPath: require.resolve('@atlaspack/core/src/worker.js'),
+      workerPath: require.resolve('@atlaspack/core/worker'),
     });
     underlayFS = new MemoryFS(workerFarm);
     fs = new OverlayFS(workerFarm, underlayFS);