@lvce-editor/explorer-view 5.18.0 → 5.20.0

package/dist/explorerViewWorkerMain.js

@@ -1,3 +1,88 @@
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$6 = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          oldState,
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (oldState === newerState || newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    }
+  };
+};
+const terminate = () => {
+  globalThis.close();
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -54,6 +139,64 @@ class VError extends Error {
   }
 }
 
+const CreateFolder$1 = 1;
+const CreateFile$1 = 2;
+const Copy$1 = 3;
+const Rename$2 = 4;
+const Remove = 5;
+
+const Text = 12;
+
+const Button$3 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const CtrlKey = 'event.ctrlKey';
+const DataTransferFiles = 'event.dataTransfer.files';
+const DataTransferFiles2 = 'event.dataTransfer.files2';
+const DefaultPrevented = 'event.defaultPrevented';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
+const EventTargetClassName = 'event.target.className';
+const IsTrusted = 'event.isTrusted';
+const ShiftKey = 'event.shiftKey';
+const TargetName = 'event.target.name';
+const TargetValue = 'event.target.value';
+
+const Enter = 3;
+const Escape = 8;
+const Space = 9;
+const End = 255;
+const Home = 12;
+const LeftArrow = 13;
+const UpArrow = 14;
+const RightArrow = 15;
+const DownArrow = 16;
+const Delete$1 = 18;
+const KeyA = 29;
+const KeyC = 31;
+const KeyV = 50;
+const KeyX = 52;
+const F2 = 58;
+const Star = 131;
+
+const CtrlCmd = 1 << 11 >>> 0;
+const Shift = 1 << 10 >>> 0;
+const Alt = 1 << 9 >>> 0;
+
+const FileSystemWorker$1 = 209;
+const IconThemeWorker = 7009;
+const RendererWorker = 1;
+const SourceControlWorker = 66;
+
+const FocusElementByName = 'Viewlet.focusElementByName';
+const FocusSelector = 'Viewlet.focusSelector';
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+
+const FocusExplorer = 13;
+const FocusExplorerEditBox = 14;
+
 class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -529,7 +672,7 @@ const callbacks = Object.create(null);
 const get$2 = id => {
   return callbacks[id];
 };
-const remove$2 = id => {
+const remove$3 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -682,7 +825,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$2(id);
+  remove$3(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -975,6 +1118,53 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+const create$i = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$2({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+const LazyTransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$i
+};
 const create$4 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -992,7 +1182,7 @@ const create$4 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2$1 = async ({
+const create$2 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1008,10 +1198,6 @@ const create$2$1 = async ({
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$2$1
-};
 const create$1$1 = async ({
   commandMap
 }) => {
@@ -1046,35 +1232,6 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Button$3 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const CtrlKey = 'event.ctrlKey';
-const DataTransferFiles = 'event.dataTransfer.files';
-const DataTransferFiles2 = 'event.dataTransfer.files2';
-const DefaultPrevented = 'event.defaultPrevented';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
-const EventTargetClassName = 'event.target.className';
-const IsTrusted = 'event.isTrusted';
-const ShiftKey = 'event.shiftKey';
-const TargetName = 'event.target.name';
-const TargetValue = 'event.target.value';
-
-const FileSystemWorker$1 = 209;
-const IconThemeWorker = 7009;
-const RendererWorker = 1;
-const SourceControlWorker = 66;
-
-const FocusElementByName = 'Viewlet.focusElementByName';
-const FocusSelector = 'Viewlet.focusSelector';
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetFocusContext = 'Viewlet.setFocusContext';
-
-const FocusExplorer = 13;
-const FocusExplorerEditBox = 14;
-
 const rpcs = Object.create(null);
 const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1082,8 +1239,12 @@ const set$6 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove$2 = id => {
+  delete rpcs[id];
+};
 
-const create$2 = rpcId => {
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+const create$1 = rpcId => {
   return {
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1101,6 +1262,18 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$6(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove$2(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$6(rpcId, rpc);
     }
@@ -1111,8 +1284,9 @@ const {
   dispose,
   invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$1,
+  registerMockRpc,
   set: set$5
-} = create$2(FileSystemWorker$1);
+} = create$1(FileSystemWorker$1);
 const remove$1 = async dirent => {
   return invoke$4('FileSystem.remove', dirent);
 };
@@ -1164,13 +1338,6 @@ const watchFile = async (watchId, uri, rpcId) => {
 const unwatchFile = async watchId => {
   await invoke$4('FileSystem.unwatchFile', watchId);
 };
-const registerMockRpc = commandMap => {
-  const mockRpc = createMockRpc({
-    commandMap
-  });
-  set$5(mockRpc);
-  return mockRpc;
-};
 
 const FileSystemWorker = {
   __proto__: null,
@@ -1201,7 +1368,7 @@ const FileSystemWorker = {
 const {
   invoke: invoke$3,
   set: set$4
-} = create$2(IconThemeWorker);
+} = create$1(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
   return invoke$3('IconTheme.getIcons', iconRequests);
@@ -1211,7 +1378,7 @@ const {
   invoke: invoke$2,
   invokeAndTransfer,
   set: set$3
-} = create$2(RendererWorker);
+} = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1251,98 +1418,7 @@ const sendMessagePortToSourceControlWorker = async port => {
 const {
   invoke: invoke$1,
   set: set$2
-} = create$2(SourceControlWorker);
-
-const toCommandId = key => {
-  const dotIndex = key.indexOf('.');
-  return key.slice(dotIndex + 1);
-};
-const create$1 = () => {
-  const states = Object.create(null);
-  const commandMapRef = {};
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    },
-    dispose(uid) {
-      delete states[uid];
-    },
-    getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseInt(key);
-      });
-    },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          oldState,
-          newState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (oldState === newerState || newState === newerState) {
-          return;
-        }
-        const latest = states[uid];
-        states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
-        };
-      };
-      return wrapped;
-    },
-    wrapGetter(fn) {
-      const wrapped = (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        return fn(newState, ...args);
-      };
-      return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
-    }
-  };
-};
-const terminate = () => {
-  globalThis.close();
-};
-
-const CreateFolder$1 = 1;
-const CreateFile$1 = 2;
-const Copy$1 = 3;
-const Rename$2 = 4;
-const Remove = 5;
+} = create$1(SourceControlWorker);
 
 // TODO use direct connection
 const invoke = async (method, ...params) => {
@@ -1822,7 +1898,7 @@ const Copy = 'Copy';
 const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
 const Cut = 'Cut';
-const Delete$1 = 'Delete';
+const Delete = 'Delete';
 const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 const FileOrFolderAlreadyExists = 'A file or folder **{PH1}** already exists at this location. Please choose a different name.';
 const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
@@ -1871,7 +1947,7 @@ const rename = () => {
   return i18nString(Rename);
 };
 const deleteItem = () => {
-  return i18nString(Delete$1);
+  return i18nString(Delete);
 };
 const refresh$1 = () => {
   return i18nString(RefreshExplorer);
@@ -2194,14 +2270,12 @@ const toCollapsedDirent = dirent => {
 
 const collapseAll = async state => {
   const {
-    focusedIndex,
     items
   } = state;
   const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
-  const newFocusedIndex = getFocusedIndexCancel(newDirents, focusedIndex);
   return {
     ...state,
-    focusedIndex: newFocusedIndex,
+    focusedIndex: 0,
     items: newDirents
   };
 };
@@ -2445,29 +2519,6 @@ const Viewlet = 'Viewlet';
 const Welcome = 'Welcome';
 const WelcomeMessage = 'WelcomeMessage';
 
-const Text = 12;
-
-const Enter = 3;
-const Escape = 8;
-const Space = 9;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-const Delete = 18;
-const KeyA = 29;
-const KeyC = 31;
-const KeyV = 50;
-const KeyX = 52;
-const F2 = 58;
-const Star = 131;
-
-const CtrlCmd = 1 << 11 >>> 0;
-const Shift = 1 << 10 >>> 0;
-const Alt = 1 << 9 >>> 0;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -2481,9 +2532,9 @@ const position = (x, y) => {
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
@@ -2583,7 +2634,7 @@ const {
   registerCommands,
   set,
   wrapGetter
-} = create$1();
+} = create$6();
 const wrapListItemCommand = fn => {
   const wrappedCommand = async (id, ...args) => {
     const {
@@ -3083,7 +3134,7 @@ const getKeyBindings = () => {
     when: FocusExplorerEditBox
   }, {
     command: 'Explorer.removeDirent',
-    key: Delete,
+    key: Delete$1,
     when: FocusExplorer
   }, {
     command: 'Explorer.focusNone',
@@ -4189,6 +4240,9 @@ const getFileOperations = (root, uploadTree) => {
 };
 
 const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
+  if (fileSystemHandles.length === 0) {
+    return true;
+  }
   const uploadTree = await createUploadTree(root, fileSystemHandles);
   const fileOperations = getFileOperations(root, uploadTree);
   await applyFileOperations(fileOperations);
@@ -4369,6 +4423,9 @@ const getFileArray = fileList => {
 };
 
 const getFileHandles = async fileIds => {
+  if (fileIds.length === 0) {
+    return [];
+  }
   const files = await getFileHandles$1(fileIds);
   return files;
 };
@@ -5058,75 +5115,8 @@ const handleWorkspaceRefresh = async state => {
   return refresh(state);
 };
 
-const sendMessagePortToFileSystemWorker = async port => {
-  await sendMessagePortToFileSystemWorker$1(port, 0);
-};
-
-const createFileSystemWorkerRpc = async () => {
-  try {
-    const rpc = await TransferMessagePortRpcParent.create({
-      commandMap: {},
-      send: sendMessagePortToFileSystemWorker
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create file system worker rpc`);
-  }
-};
-
-const initializeFileSystemWorker = async () => {
-  const rpc = await createFileSystemWorkerRpc();
-  set$1(rpc);
-};
-
-const send$1 = port => {
-  return sendMessagePortToIconThemeWorker(port, 0);
-};
-const createIconThemeWorkerRpc = async () => {
-  try {
-    const rpc = await TransferMessagePortRpcParent.create({
-      commandMap: {},
-      send: send$1
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create icon theme worker rpc`);
-  }
-};
-
-const initializeIconThemeWorker = async () => {
-  const rpc = await createIconThemeWorkerRpc();
-  set$4(rpc);
-};
-
-const send = port => {
-  // @ts-ignore
-  return sendMessagePortToSourceControlWorker(port);
-};
-const createSourceControlWorkerRpc = async () => {
-  try {
-    const rpc = await TransferMessagePortRpcParent.create({
-      commandMap: {},
-      send
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create source control worker rpc`);
-  }
-};
-
-const initializeSourceControlWorker = async () => {
-  try {
-    const rpc = await createSourceControlWorkerRpc();
-    // TODO
-    set$2(rpc);
-  } catch {
-    // ignore
-  }
-};
-
 const initialize = async () => {
-  await Promise.all([initializeFileSystemWorker(), initializeIconThemeWorker(), initializeSourceControlWorker()]);
+  // this function is not needed anymore
 };
 
 const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
@@ -6280,14 +6270,85 @@ const commandMap = {
   'Explorer.updateIcons': wrapListItemCommand(updateIcons)
 };
 
-const listen = async () => {
-  registerCommands(commandMap);
+const sendMessagePortToFileSystemWorker = async port => {
+  await sendMessagePortToFileSystemWorker$1(port, 0);
+};
+
+const createFileSystemWorkerRpc = async () => {
+  try {
+    const rpc = await LazyTransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: sendMessagePortToFileSystemWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create file system worker rpc`);
+  }
+};
+
+const initializeFileSystemWorker = async () => {
+  const rpc = await createFileSystemWorkerRpc();
+  set$1(rpc);
+};
+
+const send$1 = port => {
+  return sendMessagePortToIconThemeWorker(port, 0);
+};
+const createIconThemeWorkerRpc = async () => {
+  try {
+    const rpc = await LazyTransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: send$1
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create icon theme worker rpc`);
+  }
+};
+
+const initializeIconThemeWorker = async () => {
+  const rpc = await createIconThemeWorkerRpc();
+  set$4(rpc);
+};
+
+const initializeRendererWorker = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
   set$3(rpc);
 };
 
+const send = port => {
+  // @ts-ignore
+  return sendMessagePortToSourceControlWorker(port);
+};
+const createSourceControlWorkerRpc = async () => {
+  try {
+    const rpc = await LazyTransferMessagePortRpcParent.create({
+      commandMap: {},
+      send
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create source control worker rpc`);
+  }
+};
+
+const initializeSourceControlWorker = async () => {
+  try {
+    const rpc = await createSourceControlWorkerRpc();
+    // TODO
+    set$2(rpc);
+  } catch {
+    // ignore
+  }
+};
+
+const listen = async () => {
+  registerCommands(commandMap);
+  await Promise.all([initializeRendererWorker(), initializeFileSystemWorker(), initializeIconThemeWorker(), initializeSourceControlWorker()]);
+};
+
 const main = async () => {
   await listen();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "5.18.0",
+  "version": "5.20.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",