@theia/filesystem 1.77.0-next.57 → 1.77.0-next.63

package/lib/node/parcel-watcher/parcel-watcher.js

@@ -0,0 +1,370 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017-2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecursiveWatcherProvider = exports.ParcelWatcher = exports.WatcherDisposal = exports.ParcelFileSystemWatcherServerOptions = void 0;
+const path = require("path");
+const fs_1 = require("fs");
+const minimatch_1 = require("minimatch");
+const file_uri_1 = require("@theia/core/lib/common/file-uri");
+const file_change_collection_1 = require("../file-change-collection");
+const promise_util_1 = require("@theia/core/lib/common/promise-util");
+const watcher_1 = require("@theia/core/shared/@parcel/watcher");
+const core_1 = require("@theia/core");
+const filesystem_watcher_1 = require("../filesystem-watcher");
+exports.ParcelFileSystemWatcherServerOptions = Symbol('ParcelFileSystemWatcherServerOptions');
+/**
+ * This is a flag value passed around upon disposal.
+ */
+exports.WatcherDisposal = Symbol('WatcherDisposal');
+/**
+ * Because URIs can be watched by different clients, we'll track
+ * how many are listening for a given URI.
+ *
+ * This component wraps the whole start/stop process given some
+ * reference count.
+ *
+ * Once there are no more references the handle
+ * will wait for some time before destroying its resources.
+ */
+class ParcelWatcher extends filesystem_watcher_1.AbstractFileSystemWatcher {
+    // copied from https://github.com/microsoft/vscode/blob/e3a5acfb517a443235981655413d566533107e92/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts#L158
+    static { this.PARCEL_WATCHER_BACKEND = core_1.isWindows ? 'windows' : core_1.isOSX ? 'fs-events' : 'inotify'; }
+    constructor(
+    /**
+     * Initial reference to this handle.
+     * @deprecated since 1.77.0 - pass `undefined` and use {@link addRequest}; references follow requests.
+     */
+    initialClientId, 
+    /** Filesystem path to be watched. */
+    fsPath, 
+    /** Watcher-specific options */
+    watcherOptions, 
+    /** Logging and parcel watcher options */
+    parcelFileSystemWatchServerOptions, 
+    /** The client to forward events to. */
+    fileSystemWatcherClient, 
+    /** Amount of time in ms to wait once this handle is not referenced anymore. */
+    deferredDisposalTimeout = 10_000) {
+        super(fsPath, parcelFileSystemWatchServerOptions);
+        this.fsPath = fsPath;
+        this.watcherOptions = watcherOptions;
+        this.parcelFileSystemWatchServerOptions = parcelFileSystemWatchServerOptions;
+        this.fileSystemWatcherClient = fileSystemWatcherClient;
+        this.deferredDisposalTimeout = deferredDisposalTimeout;
+        /**
+         * We count each reference made to this watcher, per client.
+         *
+         * We do this to know where to send events via the network.
+         *
+         * An entry should be removed when its value hits zero.
+         */
+        this.refsPerClient = new Map();
+        /** Requests served by this watcher, so that releasing one drops the reference of the right client. */
+        this.requests = new Map();
+        /**
+         * Ensures that events are processed in the order they are emitted,
+         * despite being processed async.
+         */
+        this.parcelEventProcessingQueue = Promise.resolve();
+        if (initialClientId !== undefined) {
+            this.refsPerClient.set(initialClientId, { value: 1 });
+        }
+        this.whenStarted = this.start().then(() => true, error => {
+            if (error === exports.WatcherDisposal) {
+                return false;
+            }
+            console.error(`Watcher failed to start at "${this.fsPath}":`, error);
+            this._dispose();
+            this.fireError();
+            throw error;
+        });
+        this.debug('NEW', `initialClientId=${initialClientId}`);
+    }
+    addRequest(watcherId, request) {
+        this.requests.set(watcherId, request);
+        this.addRef(request.clientId);
+    }
+    removeRequest(watcherId) {
+        const request = this.requests.get(watcherId);
+        if (request) {
+            this.requests.delete(watcherId);
+            this.removeRef(request.clientId);
+        }
+    }
+    addRef(clientId) {
+        let refs = this.refsPerClient.get(clientId);
+        if (typeof refs === 'undefined') {
+            this.refsPerClient.set(clientId, refs = { value: 1 });
+        }
+        else {
+            refs.value += 1;
+        }
+        const totalRefs = this.getTotalReferences();
+        // If it was zero before, 1 means we were revived:
+        const revived = totalRefs === 1;
+        if (revived) {
+            this.onRefsRevive();
+        }
+        this.debug('REF++', `clientId=${clientId}, clientRefs=${refs.value}, totalRefs=${totalRefs}. revived=${revived}`);
+    }
+    removeRef(clientId) {
+        const refs = this.refsPerClient.get(clientId);
+        if (typeof refs === 'undefined') {
+            this.info('WARN REF--', `removed one too many reference: clientId=${clientId}`);
+            return;
+        }
+        refs.value -= 1;
+        // We must remove the key from `this.clientReferences` because
+        // we list active clients by reading the keys of this map.
+        if (refs.value === 0) {
+            this.refsPerClient.delete(clientId);
+        }
+        const totalRefs = this.getTotalReferences();
+        const dead = totalRefs === 0;
+        if (dead) {
+            this.onRefsReachZero();
+        }
+        this.debug('REF--', `clientId=${clientId}, clientRefs=${refs.value}, totalRefs=${totalRefs}, dead=${dead}`);
+    }
+    /**
+     * All clients with at least one active reference.
+     */
+    getClientIds() {
+        return Array.from(this.refsPerClient.keys());
+    }
+    /**
+     * Add the references for each client together.
+     */
+    getTotalReferences() {
+        let total = 0;
+        for (const refs of this.refsPerClient.values()) {
+            total += refs.value;
+        }
+        return total;
+    }
+    /**
+     * Returns true if at least one client listens to this handle.
+     */
+    isInUse() {
+        return this.refsPerClient.size > 0;
+    }
+    /**
+     * @throws with {@link WatcherDisposal} if this instance is disposed.
+     */
+    assertNotDisposed() {
+        if (this.isDisposed) {
+            throw exports.WatcherDisposal;
+        }
+    }
+    /**
+     * When starting a watcher, we'll first check and wait for the path to exists
+     * before running a parcel watcher.
+     */
+    async start() {
+        while (await fs_1.promises.stat(this.fsPath).then(() => false, () => true)) {
+            await (0, promise_util_1.timeout)(500);
+            this.assertNotDisposed();
+        }
+        this.assertNotDisposed();
+        // This race is specific to Linux/inotify: parcel-watcher's inotify backend walks
+        // the tree and then calls inotify_add_watch on every subdirectory. If a subdirectory
+        // disappears between the walk and the add (common when watching dirs that contain
+        // auto-rotated log/temp folders), the syscall returns ENOENT and parcel-watcher fails
+        // the entire subscribe. Retry a few times: by the next walk the gone-but-not-forgotten
+        // dir is no longer present. Windows (ReadDirectoryChangesW) and macOS (FSEvents) watch
+        // the whole subtree from a single handle on the root and never register per-subdirectory
+        // watches, so they cannot hit this race; the retry is simply a no-op there.
+        let watcher;
+        let attempt = 0;
+        while (true) {
+            try {
+                watcher = await this.createWatcher();
+                break;
+            }
+            catch (error) {
+                const message = (error && error.message) || '';
+                const isTransientEnoent = message.includes('No such file or directory')
+                    && await fs_1.promises.stat(this.fsPath).then(() => true, () => false);
+                if (!isTransientEnoent || attempt >= 4) {
+                    throw error;
+                }
+                attempt++;
+                this.assertNotDisposed();
+                await (0, promise_util_1.timeout)(100 * attempt);
+                this.assertNotDisposed();
+            }
+        }
+        this.assertNotDisposed();
+        this.debug('STARTED', `disposed=${this.isDisposed}`);
+        // The watcher could be disposed while it was starting, make sure to check for this:
+        if (this.isDisposed) {
+            await this.stopWatcher(watcher);
+            throw exports.WatcherDisposal;
+        }
+        this.watcher = watcher;
+    }
+    /**
+     * Given a started parcel watcher instance, gracefully shut it down.
+     */
+    async stopWatcher(watcher) {
+        await watcher.unsubscribe()
+            .then(() => 'success=true', error => error)
+            .then(status => this.debug('STOPPED', status));
+    }
+    async createWatcher() {
+        let fsPath = await fs_1.promises.realpath(this.fsPath);
+        if ((await fs_1.promises.stat(fsPath)).isFile()) {
+            fsPath = path.dirname(fsPath);
+        }
+        return (0, watcher_1.subscribe)(fsPath, (err, events) => {
+            if (err) {
+                if (err.message && err.message.includes('File system must be re-scanned')) {
+                    console.log(`FS Events were dropped on watcher ${fsPath}`);
+                }
+                else {
+                    console.error(`Watcher service error on "${fsPath}":`, err);
+                    this._dispose();
+                    this.fireError();
+                    return;
+                }
+            }
+            if (events) {
+                this.handleWatcherEvents(events);
+            }
+        }, {
+            backend: ParcelWatcher.PARCEL_WATCHER_BACKEND,
+            ...this.parcelFileSystemWatchServerOptions.parcelOptions,
+            // Pass the excludes to parcel's native `ignore` so excluded directories are pruned
+            // from the watch tree (no OS watch is placed), not merely filtered out of the event
+            // stream. Mirrors VS Code's parcel watcher (`ignore: <request excludes>`).
+            ignore: [
+                ...(this.parcelFileSystemWatchServerOptions.parcelOptions.ignore ?? []),
+                ...this.watcherOptions.ignorePatterns
+            ]
+        });
+    }
+    handleWatcherEvents(events) {
+        // Only process events if someone is listening.
+        if (this.isInUse()) {
+            // This callback is async, but parcel won't wait for it to finish before firing the next one.
+            // We will use a lock/queue to make sure everything is processed in the order it arrives.
+            this.parcelEventProcessingQueue = this.parcelEventProcessingQueue.then(async () => {
+                const fileChangeCollection = new file_change_collection_1.FileChangeCollection();
+                for (const event of events) {
+                    const filePath = event.path;
+                    if (event.type === 'create') {
+                        this.pushFileChange(fileChangeCollection, 1 /* FileChangeType.ADDED */, filePath);
+                    }
+                    else if (event.type === 'delete') {
+                        this.pushFileChange(fileChangeCollection, 2 /* FileChangeType.DELETED */, filePath);
+                    }
+                    else if (event.type === 'update') {
+                        this.pushFileChange(fileChangeCollection, 0 /* FileChangeType.UPDATED */, filePath);
+                    }
+                }
+                const changes = fileChangeCollection.values();
+                // If all changes are part of the ignored files, the collection will be empty.
+                if (changes.length > 0) {
+                    this.fileSystemWatcherClient.onDidFilesChanged({
+                        clients: this.getClientIds(),
+                        changes,
+                    });
+                }
+            }, console.error);
+        }
+    }
+    async resolveEventPath(directory, file) {
+        // parcel already resolves symlinks, the paths should be clean already:
+        return path.resolve(directory, file);
+    }
+    pushFileChange(changes, type, filePath) {
+        if (!this.isIgnored(filePath)) {
+            const uri = file_uri_1.FileUri.create(filePath).toString();
+            changes.push({ type, uri });
+        }
+    }
+    fireError() {
+        this.fileSystemWatcherClient.onError({
+            clients: this.getClientIds(),
+            uri: this.fsPath,
+        });
+    }
+    /**
+     * When references hit zero, we'll schedule disposal for a bit later.
+     *
+     * This allows new references to reuse this watcher instead of creating a new one.
+     *
+     * e.g. A frontend disconnects for a few milliseconds before reconnecting again.
+     */
+    onRefsReachZero() {
+        this.deferredDisposalTimer = setTimeout(() => this._dispose(), this.deferredDisposalTimeout);
+    }
+    /**
+     * If we get new references after hitting zero, let's unschedule our disposal and keep watching.
+     */
+    onRefsRevive() {
+        if (this.deferredDisposalTimer) {
+            clearTimeout(this.deferredDisposalTimer);
+            this.deferredDisposalTimer = undefined;
+        }
+    }
+    isIgnored(filePath) {
+        return this.watcherOptions.ignored.length > 0
+            && this.watcherOptions.ignored.some(m => m.match(filePath));
+    }
+    /**
+     * Internal disposal mechanism.
+     */
+    async _dispose() {
+        if (this.markDisposed()) {
+            if (this.watcher) {
+                this.stopWatcher(this.watcher);
+                this.watcher = undefined;
+            }
+            this.debug('DISPOSED');
+        }
+    }
+}
+exports.ParcelWatcher = ParcelWatcher;
+/** Serves recursive requests with `@parcel/watcher`, one subscription per path and exclude set. */
+class RecursiveWatcherProvider extends filesystem_watcher_1.AbstractWatcherProvider {
+    constructor(options, client, deferredDisposalTimeout) {
+        super();
+        this.options = options;
+        this.client = client;
+        this.deferredDisposalTimeout = deferredDisposalTimeout;
+    }
+    canHandle(options) {
+        return options.recursive;
+    }
+    async watch(watcherId, request) {
+        this.serve(watcherId, this.getOrCreateWatcher(this.watcherKey(request), () => this.createWatcher(request)), request);
+    }
+    /** Excludes are part of the key: parcel prunes them from the crawl, so a different set is a different watch. */
+    watcherKey(request) {
+        return [request.path, [...request.ignored].sort().join()].join();
+    }
+    createWatcher(request) {
+        const watcherOptions = {
+            ignored: request.ignored.map(pattern => new minimatch_1.Minimatch(pattern, { dot: true })),
+            ignorePatterns: [...request.ignored]
+        };
+        return new ParcelWatcher(undefined, request.path, watcherOptions, this.options, this.client, this.deferredDisposalTimeout);
+    }
+}
+exports.RecursiveWatcherProvider = RecursiveWatcherProvider;
+//# sourceMappingURL=parcel-watcher.js.map

package/lib/node/parcel-watcher/parcel-watcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parcel-watcher.js","sourceRoot":"","sources":["../../../src/node/parcel-watcher/parcel-watcher.ts"],"names":[],"mappings":"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"}

package/lib/node/test/watcher-test-helper.d.ts

@@ -0,0 +1,21 @@
+import { NodeDirectoryWatcherTimings } from '../nodejs-watcher/node-directory-watcher';
+/** Scaled down so the suite stays quick; only the order of the delays matters. */
+export declare const WATCHER_TIMINGS: NodeDirectoryWatcherTimings;
+export declare const NO_LOGGING: {
+    verbose: boolean;
+    info: () => void;
+    error: () => void;
+};
+/**
+ * A directory to act on, one per test, so that no test depends on what another one left behind. The root is
+ * passed in because `temp` is a root-level dev dependency, and this file is published.
+ */
+export declare class TempDir {
+    readonly root: string;
+    constructor(root: string);
+    path(...segments: string[]): string;
+    write(...segments: string[]): string;
+    mkdir(...segments: string[]): string;
+    remove(...segments: string[]): void;
+}
+//# sourceMappingURL=watcher-test-helper.d.ts.map

package/lib/node/test/watcher-test-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"watcher-test-helper.d.ts","sourceRoot":"","sources":["../../../src/node/test/watcher-test-helper.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAEvF,kFAAkF;AAClF,eAAO,MAAM,eAAe,EAAE,2BAK7B,CAAC;AAEF,eAAO,MAAM,UAAU;;;;CAAwD,CAAC;AAEhF;;;GAGG;AACH,qBAAa,OAAO;IAEJ,QAAQ,CAAC,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM;IAEjC,IAAI,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAInC,KAAK,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAMpC,KAAK,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAMpC,MAAM,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;CAGtC"}

package/lib/node/test/watcher-test-helper.js

@@ -0,0 +1,56 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 Ehab Younes and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TempDir = exports.NO_LOGGING = exports.WATCHER_TIMINGS = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs = tslib_1.__importStar(require("@theia/core/shared/fs-extra"));
+/** Scaled down so the suite stays quick; only the order of the delays matters. */
+exports.WATCHER_TIMINGS = {
+    changeDelay: 5,
+    deleteDelay: 20,
+    existencePollDelay: 20,
+    deferredDisposalTimeout: 30
+};
+exports.NO_LOGGING = { verbose: false, info: () => { }, error: () => { } };
+/**
+ * A directory to act on, one per test, so that no test depends on what another one left behind. The root is
+ * passed in because `temp` is a root-level dev dependency, and this file is published.
+ */
+class TempDir {
+    constructor(root) {
+        this.root = root;
+    }
+    path(...segments) {
+        return path.resolve(this.root, ...segments);
+    }
+    write(...segments) {
+        const target = this.path(...segments);
+        fs.writeFileSync(target, 'content');
+        return target;
+    }
+    mkdir(...segments) {
+        const target = this.path(...segments);
+        fs.mkdirSync(target, { recursive: true });
+        return target;
+    }
+    remove(...segments) {
+        fs.removeSync(this.path(...segments));
+    }
+}
+exports.TempDir = TempDir;
+//# sourceMappingURL=watcher-test-helper.js.map

package/lib/node/test/watcher-test-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watcher-test-helper.js","sourceRoot":"","sources":["../../../src/node/test/watcher-test-helper.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,mDAA6B;AAC7B,wEAAkD;AAGlD,kFAAkF;AACrE,QAAA,eAAe,GAAgC;IACxD,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,EAAE;IACf,kBAAkB,EAAE,EAAE;IACtB,uBAAuB,EAAE,EAAE;CAC9B,CAAC;AAEW,QAAA,UAAU,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;AAEhF;;;GAGG;AACH,MAAa,OAAO;IAEhB,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAAI,CAAC;IAEtC,IAAI,CAAC,GAAG,QAAkB;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,GAAG,QAAkB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACtC,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,GAAG,QAAkB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QACtC,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,GAAG,QAAkB;QACxB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAC1C,CAAC;CACJ;AAvBD,0BAuBC"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.77.0-next.57+81ea5f939",
+  "version": "1.77.0-next.63+046af0812",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.77.0-next.57+81ea5f939",
+    "@theia/core": "1.77.0-next.63+046af0812",
     "@types/body-parser": "^1.19.6",
     "@types/multer": "^1.4.13",
     "@types/tar-fs": "^1.16.3",
@@ -82,5 +82,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "81ea5f939c40c905de91083d07e284bfd7437fac"
+  "gitHead": "046af0812516f46f2bf7ce3357cca0b672159b20"
 }

package/src/common/filesystem-watcher-protocol.ts

@@ -89,6 +89,10 @@ export interface FileSystemWatcherClient {
 
 export interface WatchOptions {
     ignored: string[];
+    /**
+     * Watch the whole subtree under the given path. Defaults to `true`.
+     */
+    recursive?: boolean;
 }
 export interface FileChange {
     uri: string;

package/src/node/disk-file-system-provider.ts

@@ -835,7 +835,8 @@ export class DiskFileSystemProvider implements Disposable,
         };
         watcherService.watchFileChanges(resource.toString(), {
             // Convert from `files.WatchOptions` to internal `watcher-protocol.WatchOptions`:
-            ignored: opts.excludes
+            ignored: opts.excludes,
+            recursive: opts.recursive
         }).then(watcherId => {
             if (handle.disposed) {
                 watcherService.unwatchFileChanges(watcherId);

package/src/node/filesystem-backend-module.ts

@@ -19,7 +19,8 @@ import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
 import { ConnectionHandler, RpcConnectionHandler, ILogger } from '@theia/core/lib/common';
 import { FileSystemWatcherServer, FileSystemWatcherService } from '../common/filesystem-watcher-protocol';
 import { FileSystemWatcherServerClient } from './filesystem-watcher-client';
-import { ParcelFileSystemWatcherService, ParcelFileSystemWatcherServerOptions } from './parcel-watcher/parcel-filesystem-service';
+import { FileSystemWatcherServiceImpl } from './filesystem-watcher-service-impl';
+import { ParcelFileSystemWatcherServerOptions } from './parcel-watcher/parcel-watcher';
 import { NodeFileUploadService } from './upload/node-file-upload-service';
 import { ParcelWatcherOptions } from './parcel-watcher/parcel-options';
 import { DiskFileSystemProvider } from './disk-file-system-provider';
@@ -38,11 +39,11 @@ export const WATCHER_VERBOSE = process.argv.includes('--watcher-verbose');
 
 export const FileSystemWatcherServiceProcessOptions = Symbol('FileSystemWatcherServiceProcessOptions');
 /**
- * Options to control the way the `ParcelFileSystemWatcherService` process is spawned.
+ * Options to control the way the `FileSystemWatcherServiceImpl` process is spawned.
  */
 export interface FileSystemWatcherServiceProcessOptions {
     /**
-     * Path to the script that will run the `ParcelFileSystemWatcherService` in a new process.
+     * Path to the script that will run the `FileSystemWatcherServiceImpl` in a new process.
      */
     entryPoint: string;
 }
@@ -102,7 +103,7 @@ export function bindFileSystemWatcherServer(bind: interfaces.Bind): void {
 export function createParcelFileSystemWatcherService(ctx: interfaces.Context): FileSystemWatcherService {
     const options = ctx.container.get<ParcelFileSystemWatcherServerOptions>(ParcelFileSystemWatcherServerOptions);
     const dispatcher = ctx.container.get<FileSystemWatcherServiceDispatcher>(FileSystemWatcherServiceDispatcher);
-    const server = new ParcelFileSystemWatcherService(options);
+    const server = new FileSystemWatcherServiceImpl(options);
     server.setClient(dispatcher);
     return server;
 }