style: 更改 fs-extra export name

winjo · winjo · commit 2333a43a8987 · 2021-02-10T10:33:06.000+08:00
diff --git a/packages/alex/src/api/require.ts b/packages/alex/src/api/require.ts
@@ -100,7 +100,7 @@ export function requireModule(module: '@ali/common-di'): typeof CommonDI;
 export function requireModule(module: '@alipay/alex-core'): typeof AlexCore;
 
 export function requireModule(module: 'fs'): typeof AlexCore.fs;
-export function requireModule(module: 'fs-extra'): typeof AlexCore.fse;
+export function requireModule(module: 'fs-extra'): typeof AlexCore.fsExtra;
 export function requireModule(module: 'os'): typeof os;
 export function requireModule(module: 'crypto'): typeof crypto;
 export function requireModule(module: 'buffer'): typeof buffer;
@@ -199,7 +199,7 @@ export function requireModule(module: string): any {
     case 'fs':
       return AlexCore.fs;
     case 'fs-extra':
-      return AlexCore.fse;
+      return AlexCore.fsExtra;
     case 'os':
       return os;
     case 'crypto':
diff --git a/packages/core/src/server/core/app.ts b/packages/core/src/server/core/app.ts
@@ -19,7 +19,7 @@ import { INodeLogger, NodeLogger } from './node-logger';
 import { FCServiceCenter, initFCService, ServerPort } from '../../connection';
 import { IServerApp } from '../../common';
 import { initializeRootFileSystem, filesystemDeferred } from './filesystem';
-import { fse } from '../node';
+import { fsExtra as fse } from '../node';
 import { WORKSPACE_ROOT, STORAGE_DIR } from '../../common/constant';
 import { RootFS, RuntimeConfig } from '../../common/types';
 import { isBackServicesInServer } from '../../common/util';
diff --git a/packages/core/src/server/file-scheme/file-scheme-doc.service.ts b/packages/core/src/server/file-scheme/file-scheme-doc.service.ts
@@ -10,7 +10,7 @@ import { IFileService } from '../file-service/base';
 import md5 from 'md5';
 import { ISavingContent, IContentChange } from '@ali/ide-file-scheme/lib/common';
 import { IFileSchemeDocNodeService } from './base';
-import { fse } from '../node';
+import { fsExtra as fse } from '../node';
 import { encode, decode } from '../file-service/encoding';
 
 @Injectable()
diff --git a/packages/core/src/server/file-service/disk-file-system.provider.ts b/packages/core/src/server/file-service/disk-file-system.provider.ts
@@ -27,7 +27,7 @@ import * as os from 'os';
 import { IDiskFileProvider } from './base';
 import { FCService } from '../../connection';
 import { FWFileSystemWatcherServer } from './file-service-watcher';
-import { fse, writeFileAtomic } from '../node';
+import { fsExtra as fse, writeFileAtomic } from '../node';
 import { decode, encode } from './encoding';
 
 const debugLog = new DebugLog();
diff --git a/packages/core/src/server/file-service/encoding.ts b/packages/core/src/server/file-service/encoding.ts
@@ -1,5 +1,5 @@
 // TODO: iconv-lite-umd 和 jschardet 使用异步加载，加快主应用启动速度
-import { fse as fs } from '../node';
+// import { fs } from '../node';
 // import * as jschardet from 'jschardet';
 import * as iconv from 'iconv-lite-umd';
 import { URI } from '@ali/ide-core-common';
@@ -161,18 +161,18 @@ export function detectEncodingByBuffer(buffer: Buffer): string | null {
   return mapped || normalizedEncodingName;
 }
 
-export function detectEncodingByURI(uri: URI): string | null {
-  const filePath = FileUri.fsPath(uri);
-  const fd = fs.openSync(filePath, 'r');
-  const maxLength = 100;
-  let buffer = Buffer.allocUnsafe(maxLength);
-  const readLength = fs.readSync(fd, buffer, 0, maxLength, null);
-
-  // Reset real length
-  buffer = buffer.slice(0, readLength);
-  fs.closeSync(fd);
-  return detectEncodingByBuffer(buffer);
-}
+// export function detectEncodingByURI(uri: URI): string | null {
+//   const filePath = FileUri.fsPath(uri);
+//   const fd = fs.openSync(filePath, 'r');
+//   const maxLength = 100;
+//   let buffer = Buffer.allocUnsafe(maxLength);
+//   const readLength = fs.readSync(fd, buffer, 0, maxLength, null);
+
+//   // Reset real length
+//   buffer = buffer.slice(0, readLength);
+//   fs.closeSync(fd);
+//   return detectEncodingByBuffer(buffer);
+// }
 
 export function getEncodingInfo(encoding: string | null): null | EncodingInfo {
   if (!encoding) {
diff --git a/packages/core/src/server/file-service/file-service-watcher.ts b/packages/core/src/server/file-service/file-service-watcher.ts
@@ -12,8 +12,8 @@ import {
 import debounce from 'lodash.debounce';
 import path from 'path';
 import { FileChangeCollection } from './file-change-collection';
-import { fse, watch } from '../node';
-import { ChangeEvent, FW } from '../node/extend/fs-watch';
+import { fsWatcher, fsExtra as fse } from '../node';
+// import { ChangeEvent, FW } from '../node/extend/fs-watch';
 
 export interface WatcherOptions {
   excludesPattern: ParsedPattern[];
@@ -126,18 +126,19 @@ export class FWFileSystemWatcherServer implements FileSystemWatcherServer {
       ...rawOptions,
     };
 
-    let watcher: FW | undefined = await watch(basePath, (events: ChangeEvent[]) => {
+    const { watch, actions } = fsWatcher;
+    let watcher = await watch(basePath, (events) => {
       for (const event of events) {
-        if (event.action === watch.actions.CREATED) {
+        if (event.action === actions.CREATED) {
           this.pushAdded(watcherId, this.resolvePath(event.directory, event.file!));
         }
-        if (event.action === watch.actions.DELETED) {
+        if (event.action === actions.DELETED) {
           this.pushDeleted(watcherId, this.resolvePath(event.directory, event.file!));
         }
-        if (event.action === watch.actions.MODIFIED) {
+        if (event.action === actions.MODIFIED) {
           this.pushUpdated(watcherId, this.resolvePath(event.directory, event.file!));
         }
-        if (event.action === watch.actions.RENAMED) {
+        if (event.action === actions.RENAMED) {
           if (event.newDirectory) {
             this.pushDeleted(watcherId, this.resolvePath(event.directory, event.oldFile!));
             this.pushAdded(watcherId, this.resolvePath(event.newDirectory, event.newFile!));
@@ -153,7 +154,6 @@ export class FWFileSystemWatcherServer implements FileSystemWatcherServer {
     if (toDisposeWatcher.disposed) {
       this.debug('Stopping watching:', basePath);
       watcher.stop();
-      watcher = undefined;
       this.options.info('Stopped watching:', basePath);
       return;
     }
@@ -163,7 +163,6 @@ export class FWFileSystemWatcherServer implements FileSystemWatcherServer {
         if (watcher) {
           this.debug('Stopping watching:', basePath);
           watcher.stop();
-          watcher = undefined;
           this.options.info('Stopped watching:', basePath);
         }
       })
diff --git a/packages/core/src/server/file-service/file-service.ts b/packages/core/src/server/file-service/file-service.ts
@@ -28,7 +28,7 @@ import * as path from 'path';
 import * as os from 'os';
 import { IDiskFileProvider, IFileService } from './base';
 import { FCService } from '../../connection';
-import { fse } from '../node';
+import { fsExtra as fse } from '../node';
 import { ServerConfig } from '../core/app';
 import { INodeLogger } from '../core/node-logger';
 
diff --git a/packages/core/src/server/node/extend/fs-extra.ts b/packages/core/src/server/node/extend/fs-extra.ts
@@ -5,12 +5,10 @@ import path from 'path';
 
 import { fs } from '../bfs';
 
-const fse = fsExtraFactory({
+export const fsExtra = fsExtraFactory({
   fs,
   path,
   process,
   assert,
   buffer,
 });
-
-export default fse;
diff --git a/packages/core/src/server/node/extend/fs-watcher.ts b/packages/core/src/server/node/extend/fs-watcher.ts
@@ -10,7 +10,7 @@ import debounce from 'lodash.debounce';
 import * as path from 'path';
 import { fs } from '../bfs';
 
-export const enum ActionType {
+const enum ActionType {
   CREATED = 0,
   DELETED = 1,
   MODIFIED = 2,
@@ -275,7 +275,7 @@ function call(cb: Function, args: any[]) {
   }
 }
 
-export interface FW {
+interface FW {
   start: () => void;
   stop: () => void;
 }
@@ -286,7 +286,6 @@ interface FWFunction {
     eventCallback: (events: Array<ChangeEvent>) => void,
     options?: Partial<Options>
   ): Promise<FW>;
-  actions: Record<keyof typeof ActionType, number>;
 }
 
 export const watch: FWFunction = (
@@ -381,7 +380,7 @@ export const watch: FWFunction = (
   });
 };
 
-watch.actions = {
+export const actions = {
   CREATED: ActionType.CREATED,
   DELETED: ActionType.DELETED,
   MODIFIED: ActionType.MODIFIED,
diff --git a/packages/core/src/server/node/extend/write-file-atomic.ts b/packages/core/src/server/node/extend/write-file-atomic.ts
@@ -3,7 +3,7 @@
  * 目前不考虑多线程的情况，因此只根据 filename 加锁即可
  */
 
-import fse from './fs-extra';
+import { fsExtra as fse } from './fs-extra';
 import * as path from 'path';
 
 const mutex = {
@@ -36,7 +36,11 @@ const mutex = {
   },
 };
 
-const writeFileAtomic = async (filename: string, data: any, options?: any) => {
+const writeFileAtomic = async (
+  filename: string,
+  data: any,
+  options?: Record<string, any> | string
+) => {
   const absoluteName = path.resolve(filename);
   await mutex.lock(absoluteName);
   try {
diff --git a/packages/core/src/server/node/index.ts b/packages/core/src/server/node/index.ts
@@ -1,8 +1,8 @@
 export * from './bfs';
 
 // should place before other fs api
-export * from './extend/fs-watch';
+export * as fsWatcher from './extend/fs-watcher';
 
-export { default as fse } from './extend/fs-extra';
+export * from './extend/fs-extra';
 
 export * from './extend/write-file-atomic';
