@lvce-editor/static-server 0.40.8 → 0.41.0

package/static/{8b59747 → 7b4acfa}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -1,368 +1,161 @@
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
-const state$1 = {
-  callbacks: Object.create(null)
-};
-const set = (id, fn) => {
-  state$1.callbacks[id] = fn;
-};
-const get = id => {
-  return state$1.callbacks[id];
-};
-const remove$1 = id => {
-  delete state$1.callbacks[id];
-};
-let id = 0;
-const create$3 = () => {
-  return ++id;
-};
-const warn = (...args) => {
-  console.warn(...args);
-};
-const registerPromise = () => {
-  const id = create$3();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set(id, resolve);
-  return {
-    id,
-    promise
-  };
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
+  }
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
+  }
+  return line;
 };
-const resolve = (id, response) => {
-  const fn = get(id);
-  if (!fn) {
-    console.log(response);
-    warn(`callback ${id} may already be disposed`);
-    return;
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
   }
-  fn(response);
-  remove$1(id);
+  return stringifiedError;
 };
-const create$2 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
+const NewLine$2 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
 };
-class JsonRpcError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'JsonRpcError';
-  }
-}
-const NewLine$3 = '\n';
-const DomException = 'DOMException';
-const ReferenceError$1 = 'ReferenceError';
-const SyntaxError$1 = 'SyntaxError';
-const TypeError$1 = 'TypeError';
-const getErrorConstructor = (message, type) => {
-  if (type) {
-    switch (type) {
-      case DomException:
-        return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
-      case ReferenceError$1:
-        return ReferenceError;
-      default:
-        return Error;
-    }
-  }
-  if (message.startsWith('TypeError: ')) {
-    return TypeError;
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
   }
-  if (message.startsWith('SyntaxError: ')) {
-    return SyntaxError;
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
+  if (childNewLineIndex === -1) {
+    return parent;
   }
-  if (message.startsWith('ReferenceError: ')) {
-    return ReferenceError;
+  const parentFirstLine = parent.slice(0, parentNewLineIndex);
+  const childRest = child.slice(childNewLineIndex);
+  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest;
   }
-  return Error;
+  return child;
 };
-const constructError = (message, type, name) => {
-  const ErrorConstructor = getErrorConstructor(message, type);
-  if (ErrorConstructor === DOMException && name) {
-    return new ErrorConstructor(message, name);
-  }
-  if (ErrorConstructor === Error) {
-    const error = new Error(message);
-    if (name && name !== 'VError') {
-      error.name = name;
+class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message);
+    super(combinedMessage);
+    this.name = 'VError';
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack);
+    }
+    if (error.codeFrame) {
+      // @ts-ignore
+      this.codeFrame = error.codeFrame;
+    }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
     }
-    return error;
-  }
-  return new ErrorConstructor(message);
-};
-const getNewLineIndex$2 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$3, startIndex);
-};
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$3 + parentStack;
-  }
-  return parentStack;
-};
-const joinLines$1 = lines => {
-  return lines.join(NewLine$3);
-};
-const MethodNotFound = -32601;
-const Custom = -32001;
-const splitLines$1 = lines => {
-  return lines.split(NewLine$3);
-};
-const restoreJsonRpcError = error => {
-  if (error && error instanceof Error) {
-    return error;
   }
-  const currentStack = joinLines$1(splitLines$1(new Error().stack || '').slice(1));
-  if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine$3 + currentStack;
-    return restoredError;
+}
+
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
   }
-  if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$3 + error.data.stack + NewLine$3 + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex$2(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+}
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return 'number';
+    case 'function':
+      return 'function';
+    case 'string':
+      return 'string';
+    case 'object':
+      if (value === null) {
+        return 'null';
       }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
+      if (Array.isArray(value)) {
+        return 'array';
       }
-    }
-    return restoredError;
-  }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
+      return 'object';
+    case 'boolean':
+      return 'boolean';
+    default:
+      return 'unknown';
   }
-  return new Error(`JsonRpc Error: ${error}`);
 };
-const unwrapJsonRpcResult = responseMessage => {
-  if ('error' in responseMessage) {
-    const restoredError = restoreJsonRpcError(responseMessage.error);
-    throw restoredError;
-  }
-  if ('result' in responseMessage) {
-    return responseMessage.result;
+const object = value => {
+  const type = getType(value);
+  if (type !== 'object') {
+    throw new AssertionError('expected value to be of type object');
   }
-  throw new JsonRpcError('unexpected response message');
 };
-const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getErrorType = prettyError => {
-  if (prettyError && prettyError.type) {
-    return prettyError.type;
-  }
-  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
-    return prettyError.constructor.name;
+const number = value => {
+  const type = getType(value);
+  if (type !== 'number') {
+    throw new AssertionError('expected value to be of type number');
   }
-  return undefined;
 };
-const getErrorProperty = (error, prettyError) => {
-  if (error && error.code === E_COMMAND_NOT_FOUND) {
-    return {
-      code: MethodNotFound,
-      message: error.message,
-      data: error.stack
-    };
+const array = value => {
+  const type = getType(value);
+  if (type !== 'array') {
+    throw new AssertionError('expected value to be of type array');
   }
-  return {
-    code: Custom,
-    message: prettyError.message,
-    data: {
-      stack: prettyError.stack,
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
-      code: prettyError.code,
-      name: prettyError.name
-    }
-  };
-};
-const create$1 = (message, error) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    error
-  };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1(message, errorProperty);
-};
-const create$5 = (message, result) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    result: result ?? null
-  };
-};
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
-};
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
-  try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
-  } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+const string = value => {
+  const type = getType(value);
+  if (type !== 'string') {
+    throw new AssertionError('expected value to be of type string');
   }
 };
-const defaultPreparePrettyError = error => {
-  return error;
-};
-const defaultLogError = () => {
-  // ignore
-};
-const defaultRequiresSocket = () => {
-  return false;
-};
-const defaultResolve = resolve;
 
-// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
-const normalizeParams = args => {
-  if (args.length === 1) {
-    const options = args[0];
-    return {
-      ipc: options.ipc,
-      message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
-      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
-    };
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
   }
-  return {
-    ipc: args[0],
-    message: args[1],
-    execute: args[2],
-    resolve: args[3],
-    preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
-  };
-};
-const handleJsonRpcMessage = async (...args) => {
-  const options = normalizeParams(args);
-  const {
-    message,
-    ipc,
-    execute,
-    resolve,
-    preparePrettyError,
-    logError,
-    requiresSocket
-  } = options;
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
-    }
-    resolve(message.id, message);
+  if (isTransferrable(value)) {
+    transferrables.push(value);
     return;
   }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
     return;
   }
-  throw new JsonRpcError('unexpected message');
-};
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
   }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
 };
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
 };
-const invokeAndTransfer = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
 };
-
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
 };
-const getCommand = key => {
-  return commands[key];
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
 };
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new Error(`command not found ${command}`);
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
+    }
   }
-  return fn(...args);
+  return false;
 };
-
-const getData$1 = event => {
-  return event.data;
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
 };
 const attachEvents = that => {
   const handleMessage = (...args) => {
@@ -375,79 +168,171 @@ const attachEvents = that => {
   const handleClose = event => {
     that.dispatchEvent(new Event('close'));
   };
-  that.onClose(handleClose);
+  that.onClose(handleClose);
+};
+class Ipc extends EventTarget {
+  constructor(rawIpc) {
+    super();
+    this._rawIpc = rawIpc;
+    attachEvents(this);
+  }
+}
+const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
+const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
+const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
+const NewLine$1 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
+};
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
+};
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
+};
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines$1(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
+  return {
+    message,
+    code: ERR_MODULE_NOT_FOUND
+  };
+};
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
+const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
+};
+const isMessageCodeBlockStartIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_START.test(line);
+};
+const isMessageCodeBlockEndIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_END.test(line);
+};
+const getMessageCodeBlock = stderr => {
+  const lines = splitLines$1(stderr);
+  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
+  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
+  const relevantLines = lines.slice(startIndex, endIndex);
+  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
+  return relevantMessage;
+};
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
+  return {
+    message: `Incompatible native node module: ${message}`,
+    code: E_INCOMPATIBLE_NATIVE_MODULE
+  };
+};
+const isModulesSyntaxError = stderr => {
+  if (!stderr) {
+    return false;
+  }
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
+};
+const getModuleSyntaxError = () => {
+  return {
+    message: `ES Modules are not supported in electron`,
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+  };
 };
-class Ipc extends EventTarget {
-  constructor(rawIpc) {
-    super();
-    this._rawIpc = rawIpc;
-    attachEvents(this);
-  }
-}
-const readyMessage = 'ready';
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
+const isModuleNotFoundError = stderr => {
+  if (!stderr) {
+    return false;
   }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
+};
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+};
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
   }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
     }
-    return;
   }
+  return {
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
+  };
 };
-const isMessagePort = value => {
-  return value && value instanceof MessagePort;
-};
-const isMessagePortMain = value => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain';
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
+const getHelpfulChildProcessError = (stdout, stderr) => {
+  if (isUnhelpfulNativeModuleError(stderr)) {
+    return getNativeModuleErrorMessage(stderr);
+  }
+  if (isModulesSyntaxError(stderr)) {
+    return getModuleSyntaxError();
+  }
+  if (isModuleNotFoundError(stderr)) {
+    return getModuleNotFoundError(stderr);
+  }
+  const lines = splitLines$1(stderr);
+  const {
+    actualMessage,
+    rest
+  } = getDetails(lines);
+  return {
+    message: `${actualMessage}`,
+    code: '',
+    stack: rest
+  };
 };
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
+class IpcError extends VError {
+  // @ts-ignore
+  constructor(betterMessage, stdout = '', stderr = '') {
+    if (stdout || stderr) {
+      // @ts-ignore
+      const {
+        message,
+        code,
+        stack
+      } = getHelpfulChildProcessError(stdout, stderr);
+      const cause = new Error(message);
+      // @ts-ignore
+      cause.code = code;
+      cause.stack = stack;
+      super(cause, betterMessage);
+    } else {
+      super(betterMessage);
     }
+    // @ts-ignore
+    this.name = 'IpcError';
+    // @ts-ignore
+    this.stdout = stdout;
+    // @ts-ignore
+    this.stderr = stderr;
   }
-  return false;
-};
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue(value, transferrables, isTransferrable);
-  return transferrables;
+}
+const readyMessage = 'ready';
+const getData$2 = event => {
+  return event.data;
 };
-const listen$2 = () => {
+const listen$6 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$2 = global => {
+const signal$6 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
   getData(event) {
-    return getData$1(event);
+    return getData$2(event);
   }
   send(message) {
     // @ts-ignore
@@ -468,280 +353,447 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$5 = global => {
+const wrap$d = global => {
   return new IpcChildWithModuleWorker(global);
 };
-const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
-const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
-const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$1 = '\n';
-const joinLines = lines => {
-  return lines.join(NewLine$1);
+const withResolvers = () => {
+  let _resolve;
+  const promise = new Promise(resolve => {
+    _resolve = resolve;
+  });
+  return {
+    resolve: _resolve,
+    promise
+  };
 };
-const splitLines = lines => {
-  return lines.split(NewLine$1);
+const waitForFirstMessage = async port => {
+  const {
+    resolve,
+    promise
+  } = withResolvers();
+  port.addEventListener('message', resolve, {
+    once: true
+  });
+  const event = await promise;
+  // @ts-ignore
+  return event.data;
 };
-const isModuleNotFoundMessage = line => {
-  return line.includes('[ERR_MODULE_NOT_FOUND]');
+const listen$5 = async () => {
+  const parentIpcRaw = listen$6();
+  signal$6(parentIpcRaw);
+  const parentIpc = wrap$d(parentIpcRaw);
+  const firstMessage = await waitForFirstMessage(parentIpc);
+  if (firstMessage.method !== 'initialize') {
+    throw new IpcError('unexpected first message');
+  }
+  const type = firstMessage.params[0];
+  if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
+    parentIpc.dispose();
+    const port = firstMessage.params[1];
+    return port;
+  }
+  return globalThis;
 };
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
+class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
+  constructor(port) {
+    super(port);
+  }
+  getData(event) {
+    return getData$2(event);
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    if (this._rawIpc.close) {
+      this._rawIpc.close();
+    }
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
+  }
+}
+const wrap$c = port => {
+  return new IpcChildWithModuleWorkerAndMessagePort(port);
+};
+const IpcChildWithModuleWorkerAndMessagePort$1 = {
+  __proto__: null,
+  listen: listen$5,
+  wrap: wrap$c
+};
+
+const Two = '2.0';
+const create$4 = (method, params) => {
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    jsonrpc: Two,
+    method,
+    params
   };
 };
-const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
-const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
-const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
-const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isUnhelpfulNativeModuleError = stderr => {
-  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
+const callbacks = Object.create(null);
+const set = (id, fn) => {
+  callbacks[id] = fn;
 };
-const isMessageCodeBlockStartIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_START.test(line);
+const get = id => {
+  return callbacks[id];
 };
-const isMessageCodeBlockEndIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_END.test(line);
+const remove$1 = id => {
+  delete callbacks[id];
 };
-const getMessageCodeBlock = stderr => {
-  const lines = splitLines(stderr);
-  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
-  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
-  const relevantLines = lines.slice(startIndex, endIndex);
-  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
-  return relevantMessage;
+let id = 0;
+const create$3 = () => {
+  return ++id;
 };
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
+const warn = (...args) => {
+  console.warn(...args);
+};
+const registerPromise = () => {
+  const id = create$3();
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  set(id, resolve);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    id,
+    promise
   };
 };
-const isModulesSyntaxError = stderr => {
-  if (!stderr) {
-    return false;
+const resolve = (id, response) => {
+  const fn = get(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
   }
-  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
+  fn(response);
+  remove$1(id);
 };
-const getModuleSyntaxError = () => {
+const create$2 = (method, params) => {
+  const {
+    id,
+    promise
+  } = registerPromise();
+  const message = {
+    jsonrpc: Two,
+    method,
+    params,
+    id
+  };
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    message,
+    promise
   };
 };
-const isModuleNotFoundError = stderr => {
-  if (!stderr) {
-    return false;
-  }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
-};
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
-};
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines(lines),
-      rest: []
-    };
+class JsonRpcError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'JsonRpcError';
   }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
+}
+const NewLine = '\n';
+const DomException = 'DOMException';
+const ReferenceError$1 = 'ReferenceError';
+const SyntaxError$1 = 'SyntaxError';
+const TypeError$1 = 'TypeError';
+const getErrorConstructor = (message, type) => {
+  if (type) {
+    switch (type) {
+      case DomException:
+        return DOMException;
+      case TypeError$1:
+        return TypeError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case ReferenceError$1:
+        return ReferenceError;
+      default:
+        return Error;
     }
   }
-  return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
-  };
-};
-const getHelpfulChildProcessError = (stdout, stderr) => {
-  if (isUnhelpfulNativeModuleError(stderr)) {
-    return getNativeModuleErrorMessage(stderr);
+  if (message.startsWith('TypeError: ')) {
+    return TypeError;
   }
-  if (isModulesSyntaxError(stderr)) {
-    return getModuleSyntaxError();
+  if (message.startsWith('SyntaxError: ')) {
+    return SyntaxError;
   }
-  if (isModuleNotFoundError(stderr)) {
-    return getModuleNotFoundError(stderr);
+  if (message.startsWith('ReferenceError: ')) {
+    return ReferenceError;
   }
-  const lines = splitLines(stderr);
-  const {
-    actualMessage,
-    rest
-  } = getDetails(lines);
-  return {
-    message: `${actualMessage}`,
-    code: '',
-    stack: rest
-  };
+  return Error;
 };
-const normalizeLine$1 = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice('Error: '.length);
+const constructError = (message, type, name) => {
+  const ErrorConstructor = getErrorConstructor(message, type);
+  if (ErrorConstructor === DOMException && name) {
+    return new ErrorConstructor(message, name);
   }
-  if (line.startsWith('VError: ')) {
-    return line.slice('VError: '.length);
+  if (ErrorConstructor === Error) {
+    const error = new Error(message);
+    if (name && name !== 'VError') {
+      error.name = name;
+    }
+    return error;
   }
-  return line;
+  return new ErrorConstructor(message);
 };
-const getCombinedMessage$1 = (error, message) => {
-  const stringifiedError = normalizeLine$1(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
+const getNewLineIndex = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine, startIndex);
+};
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine + parentStack;
   }
-  return stringifiedError;
+  return parentStack;
 };
-const NewLine$2 = '\n';
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
+const joinLines = lines => {
+  return lines.join(NewLine);
 };
-const mergeStacks$1 = (parent, child) => {
-  if (!child) {
-    return parent;
+const MethodNotFound = -32601;
+const Custom = -32001;
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const restoreJsonRpcError = error => {
+  if (error && error instanceof Error) {
+    return error;
   }
-  const parentNewLineIndex = getNewLineIndex$1(parent);
-  const childNewLineIndex = getNewLineIndex$1(child);
-  if (childNewLineIndex === -1) {
-    return parent;
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
+  if (error && error.code && error.code === MethodNotFound) {
+    const restoredError = new JsonRpcError(error.message);
+    const parentStack = getParentStack(error);
+    restoredError.stack = parentStack + NewLine + currentStack;
+    return restoredError;
   }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine$1(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
+  if (error && error.message) {
+    const restoredError = constructError(error.message, error.type, error.name);
+    if (error.data) {
+      if (error.data.stack && error.data.type && error.message) {
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+      } else if (error.data.stack) {
+        restoredError.stack = error.data.stack;
+      }
+      if (error.data.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.data.codeFrame;
+      }
+      if (error.data.code) {
+        // @ts-ignore
+        restoredError.code = error.data.code;
+      }
+      if (error.data.type) {
+        // @ts-ignore
+        restoredError.name = error.data.type;
+      }
+    } else {
+      if (error.stack) {
+        const lowerStack = restoredError.stack || '';
+        // @ts-ignore
+        const indexNewLine = getNewLineIndex(lowerStack);
+        const parentStack = getParentStack(error);
+        // @ts-ignore
+        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+      }
+      if (error.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.codeFrame;
+      }
+    }
+    return restoredError;
   }
-  return child;
+  if (typeof error === 'string') {
+    return new Error(`JsonRpc Error: ${error}`);
+  }
+  return new Error(`JsonRpc Error: ${error}`);
 };
-let VError$1 = class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage$1(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks$1(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
+const unwrapJsonRpcResult = responseMessage => {
+  if ('error' in responseMessage) {
+    const restoredError = restoreJsonRpcError(responseMessage.error);
+    throw restoredError;
+  }
+  if ('result' in responseMessage) {
+    return responseMessage.result;
   }
+  throw new JsonRpcError('unexpected response message');
 };
-class IpcError extends VError$1 {
-  // @ts-ignore
-  constructor(betterMessage, stdout = '', stderr = '') {
-    if (stdout || stderr) {
-      // @ts-ignore
-      const {
-        message,
-        code,
-        stack
-      } = getHelpfulChildProcessError(stdout, stderr);
-      const cause = new Error(message);
-      // @ts-ignore
-      cause.code = code;
-      cause.stack = stack;
-      super(cause, betterMessage);
-    } else {
-      super(betterMessage);
-    }
-    // @ts-ignore
-    this.name = 'IpcError';
-    // @ts-ignore
-    this.stdout = stdout;
-    // @ts-ignore
-    this.stderr = stderr;
+const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const getErrorType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
   }
-}
-const withResolvers = () => {
-  let _resolve;
-  const promise = new Promise(resolve => {
-    _resolve = resolve;
-  });
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
+  }
+  return undefined;
+};
+const getErrorProperty = (error, prettyError) => {
+  if (error && error.code === E_COMMAND_NOT_FOUND) {
+    return {
+      code: MethodNotFound,
+      message: error.message,
+      data: error.stack
+    };
+  }
+  return {
+    code: Custom,
+    message: prettyError.message,
+    data: {
+      stack: prettyError.stack,
+      codeFrame: prettyError.codeFrame,
+      type: getErrorType(prettyError),
+      code: prettyError.code,
+      name: prettyError.name
+    }
+  };
+};
+const create$1 = (message, error) => {
   return {
-    resolve: _resolve,
-    promise
+    jsonrpc: Two,
+    id: message.id,
+    error
   };
 };
-const waitForFirstMessage = async port => {
-  const {
-    resolve,
-    promise
-  } = withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
+const getErrorResponse = (message, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1(message, errorProperty);
 };
-const listen$1$1 = async () => {
-  const parentIpcRaw = listen$2();
-  signal$2(parentIpcRaw);
-  const parentIpc = wrap$5(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError('unexpected first message');
-  }
-  const type = firstMessage.params[0];
-  if (type === 'message-port') {
-    parentIpc.send({
-      jsonrpc: '2.0',
-      id: firstMessage.id,
-      result: null
-    });
-    parentIpc.dispose();
-    const port = firstMessage.params[1];
-    return port;
-  }
-  return globalThis;
+const create$5 = (message, result) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    result: result ?? null
+  };
 };
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
-  getData(event) {
-    return getData$1(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$5(message, resultProperty);
+};
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    return getErrorResponse(message, error, preparePrettyError, logError);
   }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
+};
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
+  if (args.length === 1) {
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
+    };
   }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
+  return {
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
+  };
+};
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
+  const {
+    message,
+    ipc,
+    execute,
+    resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
     }
+    resolve(message.id, message);
+    return;
   }
-  onClose(callback) {
-    // ignore
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
   }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
+  throw new JsonRpcError('unexpected message');
+};
+const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+  const {
+    message,
+    promise
+  } = create$2(method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
   }
-}
-const wrap$4 = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
 };
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
-  __proto__: null,
-  listen: listen$1$1,
-  wrap: wrap$4
+const send = (transport, method, ...params) => {
+  const message = create$4(method, params);
+  transport.send(message);
+};
+const invoke$1 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, false);
+};
+const invokeAndTransfer = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, true);
+};
+
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new Error(`command not found ${command}`);
+  }
+  return fn(...args);
 };
 
 const createRpc = ipc => {
@@ -771,16 +823,22 @@ const logError = () => {
   // handled by renderer worker
 };
 const handleMessage = event => {
-  return handleJsonRpcMessage(event.target, event.data, execute, resolve, preparePrettyError, logError, requiresSocket);
+  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
+  return handleJsonRpcMessage(event.target, event.data, execute, resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
-  ipc.addEventListener('message', handleMessage);
+  if ('addEventListener' in ipc) {
+    ipc.addEventListener('message', handleMessage);
+  } else if ('on' in ipc) {
+    // deprecated
+    ipc.on('message', handleMessage);
+  }
 };
-
-// @ts-ignore
-const listen$1 = async () => {
-  const module = IpcChildWithModuleWorkerAndMessagePort$1;
-  const rawIpc = await module.listen();
+const listen$1 = async (module, options) => {
+  const rawIpc = await module.listen(options);
+  if (module.signal) {
+    module.signal(rawIpc);
+  }
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
@@ -789,7 +847,7 @@ const create = async ({
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
-  const ipc = await listen$1();
+  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
   handleIpc(ipc);
   const rpc = createRpc(ipc);
   return rpc;
@@ -839,7 +897,7 @@ const compareDirent = (direntA, direntB) => {
   return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
 };
 
-const getFileIcon = ({
+const getFileIcon$1 = ({
   name
 }) => {
   return '';
@@ -862,7 +920,7 @@ const computeExplorerRenamedDirent = (dirents, index, newName) => {
     ...oldDirent,
     name: newName,
     path: oldDirent.path.slice(0, -oldDirent.name.length) + newName,
-    icon: getFileIcon({
+    icon: getFileIcon$1({
       name: newName
     })
   };
@@ -1219,59 +1277,6 @@ const copyRelativePath$1 = async state => {
   return state;
 };
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return 'number';
-    case 'function':
-      return 'function';
-    case 'string':
-      return 'string';
-    case 'object':
-      if (value === null) {
-        return 'null';
-      }
-      if (Array.isArray(value)) {
-        return 'array';
-      }
-      return 'object';
-    case 'boolean':
-      return 'boolean';
-    default:
-      return 'unknown';
-  }
-};
-const object = value => {
-  const type = getType(value);
-  if (type !== 'object') {
-    throw new AssertionError('expected value to be of type object');
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== 'number') {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const array = value => {
-  const type = getType(value);
-  if (type !== 'array') {
-    throw new AssertionError('expected value to be of type array');
-  }
-};
-const string = value => {
-  const type = getType(value);
-  if (type !== 'string') {
-    throw new AssertionError('expected value to be of type string');
-  }
-};
-
 const isSymbolicLink = dirent => {
   return dirent.type === Symlink;
 };
@@ -2171,7 +2176,7 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
         ...item,
         isFocused: i === focusedIndex,
         isEditing: true,
-        icon: getFileIcon({
+        icon: getFileIcon$1({
           name: editingValue
         })
       });
@@ -2206,43 +2211,34 @@ const handleBlur = state => {
   } = state;
   if (editingType !== None$3) {
     return state;
-  }
-  return {
-    ...state,
-    focused: false
-  };
-};
-
-// TODO viewlet should only have create and refresh functions
-// every thing else can be in a separate module <viewlet>.lazy.js
-// and  <viewlet>.ipc.js
-
-// viewlet: creating | refreshing | done | disposed
-// TODO recycle viewlets (maybe)
-
-// TODO instead of root string, there should be a root dirent
-
-// TODO rename dirents to items, then can use virtual list component directly
-
-// TODO support multiselection and removing multiple dirents
-
-// TODO use posInSet and setSize properties to compute more effectively
-
-// TODO much shared logic with newFolder
-
-const handleClickFile$1 = async (state, dirent, index, keepFocus = false) => {
-  // await Command.execute(/* Main.openAbsolutePath */ 'Main.openUri', /* absolutePath */ dirent.path, /* focus */ !keepFocus)
+  }
   return {
     ...state,
-    focusedIndex: index,
-    focused: keepFocus
+    focused: false
   };
 };
-const handleClickDirectory$1 = async (state, dirent, index, keepFocus) => {
+
+const getFileIcon = dirent => {
+  if (dirent.type === File) {
+    return invoke('IconTheme.getFileIcon', {
+      name: dirent.name
+    });
+  }
+  return invoke('IconTheme.getFolderIcon', {
+    name: dirent.name
+  });
+};
+const getFileIcons = async dirents => {
+  const promises = dirents.map(getFileIcon);
+  const icons = await Promise.all(promises);
+  return icons;
+};
+
+const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   dirent.type = DirectoryExpanding;
   // TODO handle error
   const dirents = await getChildDirents(state.pathSeparator, dirent);
-  const state2 = {};
+  const state2 = state;
   if (!state2) {
     return state;
   }
@@ -2263,24 +2259,19 @@ const handleClickDirectory$1 = async (state, dirent, index, keepFocus) => {
   } = state2;
   // TODO when focused index has changed while expanding, don't update it
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
+  const parts = newDirents.slice(minLineY, maxLineY);
+  const icons = await getFileIcons(parts);
   return {
     ...state,
     items: newDirents,
+    icons,
     focusedIndex: newIndex,
     focused: keepFocus,
     maxLineY
   };
 };
-const handleClickDirectoryExpanding = (state, dirent, index, keepFocus) => {
-  dirent.type = Directory;
-  dirent.icon = getIcon();
-  return {
-    ...state,
-    focusedIndex: index,
-    focused: keepFocus
-  };
-};
-const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
+
+const handleClickDirectoryExpanded$1 = async (state, dirent, index, keepFocus) => {
   const {
     minLineY,
     maxLineY,
@@ -2299,9 +2290,12 @@ const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
     const newMaxLineY = Math.min(maxLineY, newTotal);
     const newMinLineY = newMaxLineY - visibleItems;
     const deltaY = newMinLineY * itemHeight;
+    const parts = newDirents.slice(minLineY, maxLineY);
+    const icons = await getFileIcons(parts);
     return {
       ...state,
       items: newDirents,
+      icons,
       focusedIndex: index,
       focused: keepFocus,
       minLineY: newMinLineY,
@@ -2309,13 +2303,36 @@ const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
       deltaY
     };
   }
+  const parts = newDirents.slice(state.minLineY, state.maxLineY);
+  const icons = await getFileIcons(parts);
   return {
     ...state,
     items: newDirents,
+    icons,
+    focusedIndex: index,
+    focused: keepFocus
+  };
+};
+
+const handleClickDirectoryExpanding = (state, dirent, index, keepFocus) => {
+  dirent.type = Directory;
+  dirent.icon = getIcon();
+  return {
+    ...state,
+    focusedIndex: index,
+    focused: keepFocus
+  };
+};
+
+const handleClickFile$1 = async (state, dirent, index, keepFocus = false) => {
+  await invoke(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */dirent.path, /* focus */!keepFocus);
+  return {
+    ...state,
     focusedIndex: index,
     focused: keepFocus
   };
 };
+
 const handleClickSymLink$1 = async (state, dirent, index) => {
   const realPath = await getRealPath(dirent.path);
   const type = await stat(realPath);
@@ -2326,6 +2343,24 @@ const handleClickSymLink$1 = async (state, dirent, index) => {
       throw new Error(`unsupported file type ${type}`);
   }
 };
+
+// TODO viewlet should only have create and refresh functions
+// every thing else can be in a separate module <viewlet>.lazy.js
+// and  <viewlet>.ipc.js
+
+// viewlet: creating | refreshing | done | disposed
+// TODO recycle viewlets (maybe)
+
+// TODO instead of root string, there should be a root dirent
+
+// TODO rename dirents to items, then can use virtual list component directly
+
+// TODO support multiselection and removing multiple dirents
+
+// TODO use posInSet and setSize properties to compute more effectively
+
+// TODO much shared logic with newFolder
+
 const getClickFn = direntType => {
   switch (direntType) {
     case File:
@@ -2333,7 +2368,7 @@ const getClickFn = direntType => {
       return handleClickFile$1;
     case Directory:
     case SymLinkFolder:
-      return handleClickDirectory$1;
+      return handleClickDirectory;
     case DirectoryExpanding:
       return handleClickDirectoryExpanding;
     case DirectoryExpanded:
@@ -2367,40 +2402,6 @@ const getIndexFromPosition = (state, eventX, eventY) => {
   return index;
 };
 
-const handleClickDirectory = async (state, dirent, index, keepFocus) => {
-  dirent.type = DirectoryExpanding;
-  // TODO handle error
-  const dirents = await getChildDirents(state.pathSeparator, dirent);
-  const state2 = state;
-  if (!state2) {
-    return state;
-  }
-  // TODO use Viewlet.getState here and check if it exists
-  const newIndex = state2.items.indexOf(dirent);
-  // TODO if viewlet is disposed or root has changed, return
-  if (newIndex === -1) {
-    return state;
-  }
-  const newDirents = [...state2.items];
-  newDirents.splice(newIndex + 1, 0, ...dirents);
-  dirent.type = DirectoryExpanded;
-  dirent.icon = getIcon();
-  const {
-    height,
-    itemHeight,
-    minLineY
-  } = state2;
-  // TODO when focused index has changed while expanding, don't update it
-  const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
-  return {
-    ...state,
-    items: newDirents,
-    focusedIndex: newIndex,
-    focused: keepFocus,
-    maxLineY
-  };
-};
-
 const getParentStartIndex = (dirents, index) => {
   const dirent = dirents[index];
   let startIndex = index - 1;
@@ -2422,23 +2423,6 @@ const LeftClick = 0;
 
 // TODO instead of root string, there should be a root dirent
 
-const updateIcon = dirent => {
-  return {
-    ...dirent,
-    icon: getIcon()
-  };
-};
-const updateIcons = state => {
-  const newDirents = state.items.map(updateIcon);
-  return {
-    ...state,
-    items: newDirents
-  };
-};
-const handleIconThemeChange = state => {
-  return updateIcons(state);
-};
-
 // TODO rename dirents to items, then can use virtual list component directly
 const setDeltaY$1 = (state, deltaY) => {
   const {
@@ -2844,62 +2828,6 @@ const handleDropIndex = (state, index, files) => {
   }
 };
 
-const normalizeLine = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice('Error: '.length);
-  }
-  if (line.startsWith('VError: ')) {
-    return line.slice('VError: '.length);
-  }
-  return line;
-};
-const getCombinedMessage = (error, message) => {
-  const stringifiedError = normalizeLine(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
-  }
-  return stringifiedError;
-};
-const NewLine = '\n';
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
-};
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
-  }
-  const parentNewLineIndex = getNewLineIndex(parent);
-  const childNewLineIndex = getNewLineIndex(child);
-  if (childNewLineIndex === -1) {
-    return parent;
-  }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
-  }
-  return child;
-};
-class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
-  }
-}
-
 const handleDrop = async (state, x, y, files) => {
   try {
     const index = getIndexFromPosition(state, x, y);
@@ -2914,6 +2842,25 @@ const handleDrop = async (state, x, y, files) => {
   }
 };
 
+const updateIcon = dirent => {
+  return {
+    ...dirent,
+    icon: getIcon()
+  };
+};
+
+const updateIcons = state => {
+  const newDirents = state.items.map(updateIcon);
+  return {
+    ...state,
+    items: newDirents
+  };
+};
+
+const handleIconThemeChange = state => {
+  return updateIcons(state);
+};
+
 const getTopLevelDirents = (root, pathSeparator, excluded) => {
   if (!root) {
     return [];
@@ -2985,8 +2932,7 @@ const None = 'none';
 const Copy = 'copy';
 const Cut = 'cut';
 
-const handlePaste = async state => {
-  const nativeFiles = await readNativeFiles();
+const getPasteHandler = type => {
   // TODO detect cut/paste event, not sure if that is possible
   // TODO check that pasted folder is not a parent folder of opened folder
   // TODO support pasting multiple paths
@@ -2999,18 +2945,36 @@ const handlePaste = async state => {
   // TODO but what if a file is currently selected? Then maybe the parent folder
   // TODO but will it work if the folder is a symlink?
   // TODO handle error gracefully when copy fails
-  switch (nativeFiles.type) {
+  switch (type) {
     case None:
-      return handlePasteNone(state);
+      return handlePasteNone;
     case Copy:
-      return handlePasteCopy(state, nativeFiles);
+      return handlePasteCopy;
     case Cut:
-      return handlePasteCut(state, nativeFiles);
+      return handlePasteCut;
     default:
-      throw new Error(`unexpected native paste type: ${nativeFiles.type}`);
+      throw new Error(`unexpected native paste type: ${type}`);
   }
 };
 
+const handlePaste = async state => {
+  const nativeFiles = await readNativeFiles();
+  // TODO detect cut/paste event, not sure if that is possible
+  // TODO check that pasted folder is not a parent folder of opened folder
+  // TODO support pasting multiple paths
+  // TODO what happens when pasting multiple paths, but some of them error?
+  // how many error messages should be shown? Should the operation be undone?
+  // TODO what if it is a large folder and takes a long time to copy? Should show progress
+  // TODO what if there is a permission error? Probably should show a modal to ask for permission
+  // TODO if error is EEXISTS, just rename the copy (e.g. file-copy-1.txt, file-copy-2.txt)
+  // TODO actual target should be selected folder
+  // TODO but what if a file is currently selected? Then maybe the parent folder
+  // TODO but will it work if the folder is a symlink?
+  // TODO handle error gracefully when copy fails
+  const fn = getPasteHandler(nativeFiles.type);
+  return fn(state, nativeFiles);
+};
+
 const handlePointerDown = (state, button, x, y) => {
   const index = getIndexFromPosition(state, x, y);
   if (button === LeftClick && index === -1) {
@@ -3042,15 +3006,15 @@ const handleUpload = async (state, dirents) => {
   }
 };
 
+const getWorkspacePath = () => {
+  return invoke('Workspace.getPath');
+};
+
 const EmptyString = '';
 
 const Fulfilled = 'fulfilled';
 const Rejected = 'rejected';
 
-const getWorkspacePath = () => {
-  return invoke('Workspace.getPath');
-};
-
 // TODO viewlet should only have create and refresh functions
 // every thing else can be in a separate module <viewlet>.lazy.js
 // and  <viewlet>.ipc.js
@@ -3184,10 +3148,12 @@ const loadContent = async (state, savedState) => {
     deltaY = savedState.deltaY;
   }
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, restoredDirents.length);
+  const icons = await getFileIcons(restoredDirents);
   return {
     ...state,
     root,
     items: restoredDirents,
+    icons,
     minLineY,
     deltaY,
     maxLineY,
@@ -3196,6 +3162,16 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const handleWorkspaceChange = async state => {
+  const newRoot = await getWorkspacePath();
+  const state1 = {
+    ...state,
+    root: newRoot
+  };
+  const newState = await loadContent(state1, undefined);
+  return newState;
+};
+
 const ExplorerEditBox = FocusExplorerEditBox;
 
 const setFocus = key => {
@@ -3215,7 +3191,7 @@ const newDirent = async (state, editingType) => {
     if (dirent.type === Directory) {
       // TODO handle error
       // @ts-ignore
-      await undefined(state, dirent, focusedIndex);
+      await handleClickDirectory(state, dirent);
     }
   }
   return {
@@ -3304,13 +3280,78 @@ const removeDirent = async state => {
   } else {
     indexToFocus = Math.max(state.focusedIndex - 1, 0);
   }
+  const visible = newDirents.slice(state.minLineY, state.maxLineY);
+  const icons = await getFileIcons(visible);
+  console.log({
+    icons
+  });
   return {
     ...state,
     items: newDirents,
+    icons,
     focusedIndex: indexToFocus
   };
 };
 
+const canBeDroppedInto = dirent => {
+  if (!dirent) {
+    return false;
+  }
+  switch (dirent.type) {
+    case Directory:
+    case DirectoryExpanded:
+    case DirectoryExpanding:
+      return true;
+    default:
+      return false;
+  }
+};
+
+const getNewDropTargets = (state, x, y) => {
+  const {
+    items
+  } = state;
+  const index = getIndexFromPosition(state, x, y);
+  if (index === -1) {
+    return [-1];
+  }
+  const item = items[index];
+  if (!canBeDroppedInto(item)) {
+    return [];
+  }
+  const newDropTargets = [index];
+  return newDropTargets;
+};
+
+const isEqual = (a, b) => {
+  if (a.length !== b.length) {
+    return false;
+  }
+  const length = a.length;
+  for (let i = 0; i < length; i++) {
+    if (a[i] !== b[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
+const handleDragOver = (state, x, y) => {
+  number(x);
+  number(y);
+  const {
+    dropTargets
+  } = state;
+  const newDropTargets = getNewDropTargets(state, x, y);
+  if (isEqual(dropTargets, newDropTargets)) {
+    return state;
+  }
+  return {
+    ...state,
+    dropTargets: newDropTargets
+  };
+};
+
 const renameDirent = state => {
   const {
     focusedIndex,
@@ -3377,6 +3418,7 @@ const renderActions = state => {
 const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
+
 const restoreState = savedState => {
   if (!savedState) {
     return {
@@ -3674,7 +3716,7 @@ const setDeltaY = (state, deltaY) => {
 };
 
 const updateEditingValue = (state, value) => {
-  const editingIcon = getFileIcon({
+  const editingIcon = getFileIcon$1({
     name: value
   });
   return {
@@ -3711,12 +3753,14 @@ const commandMap = {
   'Explorer.handleClickOpenFolder': handleClickOpenFolder,
   'Explorer.handleContextMenu': handleContextMenu,
   'Explorer.handleCopy': handleCopy,
+  'Explorer.handleDragOver': handleDragOver,
   'Explorer.handleDrop': handleDrop,
   'Explorer.handleIconThemeChange': handleIconThemeChange,
   'Explorer.handlePaste': handlePaste,
   'Explorer.handlePointerDown': handlePointerDown,
   'Explorer.handleUpload': handleUpload,
   'Explorer.handleWheel': handleWheel,
+  'Explorer.handleWorkspaceChange': handleWorkspaceChange,
   'Explorer.loadContent': loadContent,
   'Explorer.newFile': newFile,
   'Explorer.newFolder': newFolder,
@@ -3728,7 +3772,8 @@ const commandMap = {
   'Explorer.revealItem': revealItem,
   'Explorer.saveState': saveState,
   'Explorer.setDeltaY': setDeltaY,
-  'Explorer.updateEditingValue': updateEditingValue
+  'Explorer.updateEditingValue': updateEditingValue,
+  'Explorer.updateIcons': updateIcons
 };
 
 const listen = async () => {