@theia/filesystem 1.77.0-next.95 → 1.77.0

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

@@ -17,22 +17,23 @@
 import * as path from 'path';
 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 { 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';
+import { FileSystemWatcherServer, FileSystemWatcherService } from '../common/filesystem-watcher-protocol.js';
+import { FileSystemWatcherServerClient } from './filesystem-watcher-client.js';
+import { FileSystemWatcherServiceImpl } from './filesystem-watcher-service-impl.js';
+import { ParcelFileSystemWatcherServerOptions } from './parcel-watcher/parcel-watcher.js';
+import { NodeFileUploadService } from './upload/node-file-upload-service.js';
+import { ParcelWatcherOptions } from './parcel-watcher/parcel-options.js';
+import { DiskFileSystemProvider } from './disk-file-system-provider.js';
 import {
     remoteFileSystemPath, RemoteFileSystemServer, RemoteFileSystemClient, FileSystemProviderServer, RemoteFileSystemProxyFactory
-} from '../common/remote-file-system-provider';
-import { FileSystemProvider } from '../common/files';
+} from '../common/remote-file-system-provider.js';
+import { FileSystemProvider } from '../common/files.js';
 import { EncodingService } from '@theia/core/lib/common/encoding-service';
 import { BackendApplicationContribution, IPCConnectionProvider } from '@theia/core/lib/node';
 import { RpcProxyFactory, ConnectionErrorHandler } from '@theia/core';
-import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher';
-import { bindFileSystemPreferences } from '../common';
+import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher.js';
+import { bindFileSystemPreferences } from '../common/index.js';
+import { ArchiveExtractor, ArchiveExtractorImpl } from './archive/archive-extractor.js';
 
 export const WATCHER_SINGLE_THREADED = process.argv.includes('--no-cluster');
 export const WATCHER_VERBOSE = process.argv.includes('--watcher-verbose');
@@ -66,6 +67,8 @@ export default new ContainerModule(bind => {
     bind(NodeFileUploadService).toSelf().inSingletonScope();
     bind(BackendApplicationContribution).toService(NodeFileUploadService);
     bindFileSystemPreferences(bind);
+    bind(ArchiveExtractorImpl).toSelf().inSingletonScope();
+    bind(ArchiveExtractor).toService(ArchiveExtractorImpl);
 });
 
 export function bindFileSystemWatcherServer(bind: interfaces.Bind): void {
@@ -77,7 +80,7 @@ export function bindFileSystemWatcherServer(bind: interfaces.Bind): void {
     bind(FileSystemWatcherServer).toService(FileSystemWatcherServerClient);
 
     bind<FileSystemWatcherServiceProcessOptions>(FileSystemWatcherServiceProcessOptions).toDynamicValue(ctx => ({
-        entryPoint: path.join(__dirname, 'parcel-watcher'),
+        entryPoint: path.join(import.meta.dirname, 'parcel-watcher'),
     })).inSingletonScope();
     bind<ParcelFileSystemWatcherServerOptions>(ParcelFileSystemWatcherServerOptions).toDynamicValue(ctx => {
         const logger = ctx.container.get<ILogger>(ILogger);

package/src/node/filesystem-watcher-client.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { injectable, inject } from '@theia/core/shared/inversify';
-import { FileSystemWatcherServer, WatchOptions, FileSystemWatcherClient, FileSystemWatcherService } from '../common/filesystem-watcher-protocol';
-import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher';
+import { FileSystemWatcherServer, WatchOptions, FileSystemWatcherClient, FileSystemWatcherService } from '../common/filesystem-watcher-protocol.js';
+import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher.js';
 
 /**
  * Wraps the watcher singleton service for each frontend.

package/src/node/filesystem-watcher-dispatcher.ts

@@ -18,7 +18,7 @@ import { injectable, inject, named } from '@theia/core/shared/inversify';
 import {
     FileSystemWatcherClient, FileSystemWatcherServiceClient,
     DidFilesChangedParams, FileSystemWatcherErrorParams
-} from '../common/filesystem-watcher-protocol';
+} from '../common/filesystem-watcher-protocol.js';
 import { ILogger } from '@theia/core';
 /**
  * This component routes watch events to the right clients.

package/src/node/filesystem-watcher-service-impl.spec.ts

@@ -20,13 +20,13 @@ import * as temp from 'temp';
 import * as fs from '@theia/core/shared/fs-extra';
 import { isWindows } from '@theia/core';
 import { FileUri } from '@theia/core/lib/node';
-import { DirectoryWatcherProvider, NodeDirectoryWatcher } from './nodejs-watcher/node-directory-watcher';
-import { NO_LOGGING, TempDir, WATCHER_TIMINGS as TIMINGS } from './test/watcher-test-helper';
-import { FileSystemWatcher, WatcherProvider } from './filesystem-watcher';
+import { DirectoryWatcherProvider, NodeDirectoryWatcher } from './nodejs-watcher/node-directory-watcher.js';
+import { NO_LOGGING, TempDir, WATCHER_TIMINGS as TIMINGS } from './test/watcher-test-helper.js';
+import { FileSystemWatcher, WatcherProvider } from './filesystem-watcher.js';
 import {
     FileSystemWatcherServiceImpl, ParcelFileSystemWatcherServerOptions, ParcelFileSystemWatcherService, ParcelWatcher, RecursiveWatcherProvider
-} from './parcel-watcher/parcel-filesystem-service';
-import { WatchOptions } from '../common/filesystem-watcher-protocol';
+} from './parcel-watcher/parcel-filesystem-service.js';
+import { WatchOptions } from '../common/filesystem-watcher-protocol.js';
 
 const track = temp.track();
 

package/src/node/filesystem-watcher-service-impl.ts

@@ -15,10 +15,10 @@
 // *****************************************************************************
 
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { FileSystemWatcherService, FileSystemWatcherServiceClient, WatchOptions } from '../common/filesystem-watcher-protocol';
-import { ResolvedWatchOptions, WatcherLogger, WatcherProvider } from './filesystem-watcher';
-import { DirectoryWatcherProvider } from './nodejs-watcher/node-directory-watcher';
-import { ParcelFileSystemWatcherServerOptions, RecursiveWatcherProvider } from './parcel-watcher/parcel-watcher';
+import { FileSystemWatcherService, FileSystemWatcherServiceClient, WatchOptions } from '../common/filesystem-watcher-protocol.js';
+import { ResolvedWatchOptions, WatcherLogger, WatcherProvider } from './filesystem-watcher.js';
+import { DirectoryWatcherProvider } from './nodejs-watcher/node-directory-watcher.js';
+import { ParcelFileSystemWatcherServerOptions, RecursiveWatcherProvider } from './parcel-watcher/parcel-watcher.js';
 
 /** Routes each request to the first provider that can handle it. The provider picks the watcher that serves it. */
 export class FileSystemWatcherServiceImpl implements FileSystemWatcherService {

package/src/node/filesystem-watcher.ts

@@ -16,7 +16,7 @@
 
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
-import { WatchOptions } from '../common/filesystem-watcher-protocol';
+import { WatchOptions } from '../common/filesystem-watcher-protocol.js';
 
 /** How a watcher reports what it is doing. */
 export interface WatcherLogger {

package/src/node/nodejs-watcher/node-directory-watcher.spec.ts

@@ -23,11 +23,11 @@ import { FSWatcher } from 'fs';
 import { Deferred, wait } from '@theia/core/lib/common/promise-util';
 import { isWindows } from '@theia/core';
 import { FileUri } from '@theia/core/lib/node';
-import { DidFilesChangedParams, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol';
-import { NO_LOGGING, TempDir, WATCHER_TIMINGS as TIMINGS } from '../test/watcher-test-helper';
-import { DirectoryWatcherProvider, NodeDirectoryWatcher } from './node-directory-watcher';
-import { DirectoryWatchRequest } from './watch-request-router';
-import { DirectoryIdentity, WatcherHost, WatchEventListener } from './watcher-host';
+import { DidFilesChangedParams, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol.js';
+import { NO_LOGGING, TempDir, WATCHER_TIMINGS as TIMINGS } from '../test/watcher-test-helper.js';
+import { DirectoryWatcherProvider, NodeDirectoryWatcher } from './node-directory-watcher.js';
+import { DirectoryWatchRequest } from './watch-request-router.js';
+import { DirectoryIdentity, WatcherHost, WatchEventListener } from './watcher-host.js';
 
 const track = temp.track();
 

package/src/node/nodejs-watcher/node-directory-watcher.ts

@@ -18,11 +18,11 @@ import * as path from 'path';
 import { Emitter } from '@theia/core';
 import { timeout } from '@theia/core/lib/common/promise-util';
 import { CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
-import { DirectoryIdentity, WatcherHost } from './watcher-host';
-import { FileChangeType, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol';
-import { AbstractFileSystemWatcher, AbstractWatcherProvider, ResolvedWatchOptions, WatcherLogger, WatchRequest } from '../filesystem-watcher';
-import { DirectoryWatchRequest, ResolvedChange, WatchRequestRouter } from './watch-request-router';
-import throttle = require('@theia/core/shared/lodash.throttle');
+import { DirectoryIdentity, WatcherHost } from './watcher-host.js';
+import { FileChangeType, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol.js';
+import { AbstractFileSystemWatcher, AbstractWatcherProvider, ResolvedWatchOptions, WatcherLogger, WatchRequest } from '../filesystem-watcher.js';
+import { DirectoryWatchRequest, ResolvedChange, WatchRequestRouter } from './watch-request-router.js';
+import throttle from '@theia/core/shared/lodash.throttle';
 
 /** How far the poll interval stretches while a handle refuses to open. */
 const MAX_OPEN_BACKOFF = 10;

package/src/node/nodejs-watcher/watch-request-router.ts

@@ -17,10 +17,10 @@
 import * as path from 'path';
 import { Minimatch } from 'minimatch';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { FileChangeType, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol';
-import { FileChangeCollection } from '../file-change-collection';
-import { WatchRequest } from '../filesystem-watcher';
-import { WatcherHost } from './watcher-host';
+import { FileChangeType, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol.js';
+import { FileChangeCollection } from '../file-change-collection.js';
+import { WatchRequest } from '../filesystem-watcher.js';
+import { WatcherHost } from './watcher-host.js';
 
 /** A {@link WatchRequest} resolved against the file system. */
 export interface DirectoryWatchRequest extends WatchRequest {

package/src/node/nodejs-watcher/watcher-host.ts

@@ -17,7 +17,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
 import { isOSX, isWindows } from '@theia/core';
-import { WatcherLogger } from '../filesystem-watcher';
+import { WatcherLogger } from '../filesystem-watcher.js';
 
 export type WatchEventListener = (eventType: string, fileName: string | null) => void;
 

package/src/node/parcel-watcher/index.ts

@@ -16,8 +16,8 @@
 
 import * as yargs from '@theia/core/shared/yargs';
 import { RpcProxyFactory } from '@theia/core';
-import { FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol';
-import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl';
+import { FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol.js';
+import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl.js';
 import { IPCEntryPoint } from '@theia/core/lib/node/messaging/ipc-protocol';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */

package/src/node/parcel-watcher/parcel-filesystem-service.ts

@@ -21,11 +21,11 @@
  * per `doc/api-management.md` is a major release.
  */
 
-import { FileSystemWatcher } from '../filesystem-watcher';
-import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl';
+import { FileSystemWatcher } from '../filesystem-watcher.js';
+import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl.js';
 
-export * from './parcel-watcher';
-export * from '../filesystem-watcher-service-impl';
+export * from './parcel-watcher.js';
+export * from '../filesystem-watcher-service-impl.js';
 
 /** @deprecated since 1.77.0 - use `FileSystemWatcherServiceImpl`, which also serves non-recursive requests. */
 export const ParcelFileSystemWatcherService = FileSystemWatcherServiceImpl;

package/src/node/parcel-watcher/parcel-filesystem-watcher.spec.ts

@@ -21,8 +21,8 @@ import * as fs from '@theia/core/shared/fs-extra';
 import * as assert from 'assert';
 import URI from '@theia/core/lib/common/uri';
 import { FileUri } from '@theia/core/lib/node';
-import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl';
-import { DidFilesChangedParams, FileChange, FileChangeType } from '../../common/filesystem-watcher-protocol';
+import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl.js';
+import { DidFilesChangedParams, FileChange, FileChangeType } from '../../common/filesystem-watcher-protocol.js';
 
 const expect = chai.expect;
 const track = temp.track();

package/src/node/parcel-watcher/parcel-watcher-exclude.spec.ts

@@ -20,14 +20,10 @@ import * as temp from 'temp';
 import * as fs from '@theia/core/shared/fs-extra';
 import URI from '@theia/core/lib/common/uri';
 import { FileUri } from '@theia/core/lib/node';
-import { Options } from '@theia/core/shared/@parcel/watcher';
-import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl';
-
-// We require the *same* module object that the production code imports from, so that
-// stubbing its `subscribe` export is observed by `ParcelWatcher`. The `@theia/core/shared`
-// shim simply re-exports `require('@parcel/watcher')`, so this is the identical reference.
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const parcel = require('@theia/core/shared/@parcel/watcher');
+// The default export is the same module object that the production code calls `subscribe` on,
+// so that stubbing its `subscribe` export is observed by `ParcelWatcher`.
+import parcel, { Options } from '@theia/core/shared/@parcel/watcher';
+import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl.js';
 
 const expect = chai.expect;
 const track = temp.track();

package/src/node/parcel-watcher/parcel-watcher-retry.spec.ts

@@ -20,13 +20,11 @@ import * as temp from 'temp';
 import * as fs from '@theia/core/shared/fs-extra';
 import URI from '@theia/core/lib/common/uri';
 import { FileUri } from '@theia/core/lib/node';
-import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl';
+import { FileSystemWatcherServiceImpl } from '../filesystem-watcher-service-impl.js';
 
-// We require the *same* module object that the production code imports from, so that
-// stubbing its `subscribe` export is observed by `ParcelWatcher`. The `@theia/core/shared`
-// shim simply re-exports `require('@parcel/watcher')`, so this is the identical reference.
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const parcel = require('@theia/core/shared/@parcel/watcher');
+// The default export is the same module object that the production code calls `subscribe` on,
+// so that stubbing its `subscribe` export is observed by `ParcelWatcher`.
+import parcel from '@theia/core/shared/@parcel/watcher';
 
 const expect = chai.expect;
 const track = temp.track();

package/src/node/parcel-watcher/parcel-watcher.ts

@@ -14,16 +14,16 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import path = require('path');
+import * as path from 'path';
 import { promises as fsp } from 'fs';
 import { Minimatch } from 'minimatch';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { FileChangeType, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol';
-import { FileChangeCollection } from '../file-change-collection';
+import { FileChangeType, FileSystemWatcherServiceClient } from '../../common/filesystem-watcher-protocol.js';
+import { FileChangeCollection } from '../file-change-collection.js';
 import { timeout } from '@theia/core/lib/common/promise-util';
-import { subscribe, Options, AsyncSubscription, Event } from '@theia/core/shared/@parcel/watcher';
+import parcelWatcher, { Options, AsyncSubscription, Event } from '@theia/core/shared/@parcel/watcher';
 import { isOSX, isWindows } from '@theia/core';
-import { AbstractFileSystemWatcher, AbstractWatcherProvider, ResolvedWatchOptions, WatcherLogger, WatchRequest } from '../filesystem-watcher';
+import { AbstractFileSystemWatcher, AbstractWatcherProvider, ResolvedWatchOptions, WatcherLogger, WatchRequest } from '../filesystem-watcher.js';
 
 /**
  * The excludes of one parcel watch. Not the same as `ParcelWatcherOptions` in `parcel-options.ts`, which is
@@ -282,7 +282,8 @@ export class ParcelWatcher extends AbstractFileSystemWatcher {
         if ((await fsp.stat(fsPath)).isFile()) {
             fsPath = path.dirname(fsPath);
         }
-        return subscribe(fsPath, (err, events) => {
+        // Called through the module object, so that tests can stub `subscribe`.
+        return parcelWatcher.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}`);

package/src/node/test/watcher-test-helper.ts

@@ -16,7 +16,7 @@
 
 import * as path from 'path';
 import * as fs from '@theia/core/shared/fs-extra';
-import { NodeDirectoryWatcherTimings } from '../nodejs-watcher/node-directory-watcher';
+import { NodeDirectoryWatcherTimings } from '../nodejs-watcher/node-directory-watcher.js';
 
 /** Scaled down so the suite stays quick; only the order of the delays matters. */
 export const WATCHER_TIMINGS: NodeDirectoryWatcherTimings = {

package/src/node/upload/node-file-upload-service.spec.ts

@@ -19,7 +19,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as fs from '@theia/core/shared/fs-extra';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { NodeFileUploadService } from './node-file-upload-service';
+import { NodeFileUploadService } from './node-file-upload-service.js';
 
 /** Captures what the upload handler wrote to the Express response. */
 interface CapturedResponse {

package/src/node/upload/node-file-upload-service.ts

@@ -14,14 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import multer = require('multer');
-import path = require('path');
-import os = require('os');
-import express = require('@theia/core/shared/express');
-import fs = require('@theia/core/shared/fs-extra');
+import multer from 'multer';
+import * as path from 'path';
+import * as os from 'os';
+import * as express from '@theia/core/shared/express';
+import * as fs from '@theia/core/shared/fs-extra';
 import { BackendApplicationContribution, FileUri, HttpConnectionValidator } from '@theia/core/lib/node';
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { HTTP_FILE_UPLOAD_PATH } from '../../common/file-upload';
+import { HTTP_FILE_UPLOAD_PATH } from '../../common/file-upload.js';
 import { ILogger, URI } from '@theia/core';
 
 @injectable()