@lvce-editor/explorer-view 1.10.0 → 1.12.0

package/dist/explorerViewWorkerMain.js

@@ -107,27 +107,6 @@ const string = value => {
   }
 };
 
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
-  }
-};
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -152,6 +131,27 @@ const isTransferrable = value => {
   }
   return false;
 };
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
 const getTransferrables = value => {
   const transferrables = [];
   walkValue(value, transferrables, isTransferrable);
@@ -184,30 +184,35 @@ 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 RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines$1(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
+  }
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
+    }
+  }
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
   };
 };
-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 splitLines$1 = lines => {
+  return lines.split(NewLine$1);
+};
 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);
 };
@@ -222,51 +227,46 @@ const getMessageCodeBlock = stderr => {
   const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
   return relevantMessage;
 };
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
+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: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    message,
+    code: ERR_MODULE_NOT_FOUND
   };
 };
-const isModulesSyntaxError = stderr => {
+const isModuleNotFoundError = 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
-  };
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
 };
-const isModuleNotFoundError = stderr => {
+const isModulesSyntaxError = stderr => {
   if (!stderr) {
     return false;
   }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
 };
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+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 isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
 };
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines$1(lines),
-      rest: []
-    };
-  }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
-    }
-  }
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
   return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
+    message: `Incompatible native node module: ${message}`,
+    code: E_INCOMPATIBLE_NATIVE_MODULE
+  };
+};
+const getModuleSyntaxError = () => {
+  return {
+    message: `ES Modules are not supported in electron`,
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -285,7 +285,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: `${actualMessage}`,
+    message: actualMessage,
     code: '',
     stack: rest
   };
@@ -320,14 +320,14 @@ const readyMessage = 'ready';
 const getData$2 = event => {
   return event.data;
 };
-const listen$6 = () => {
+const listen$7 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$6 = global => {
+const signal$8 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -353,7 +353,7 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$d = global => {
+const wrap$f = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const withResolvers = () => {
@@ -362,6 +362,7 @@ const withResolvers = () => {
     _resolve = resolve;
   });
   return {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     resolve: _resolve,
     promise
   };
@@ -378,10 +379,10 @@ const waitForFirstMessage = async port => {
   // @ts-ignore
   return event.data;
 };
-const listen$5 = async () => {
-  const parentIpcRaw = listen$6();
-  signal$6(parentIpcRaw);
-  const parentIpc = wrap$d(parentIpcRaw);
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -400,9 +401,6 @@ const listen$5 = async () => {
   return globalThis;
 };
 class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData(event) {
     return getData$2(event);
   }
@@ -426,13 +424,13 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$c = port => {
+const wrap$e = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$5,
-  wrap: wrap$c
+  listen: listen$6,
+  wrap: wrap$e
 };
 
 const Two = '2.0';
@@ -457,9 +455,6 @@ let id = 0;
 const create$3 = () => {
   return ++id;
 };
-const warn = (...args) => {
-  console.warn(...args);
-};
 const registerPromise = () => {
   const id = create$3();
   const {
@@ -472,16 +467,6 @@ const registerPromise = () => {
     promise
   };
 };
-const resolve = (id, response) => {
-  const fn = get(id);
-  if (!fn) {
-    console.log(response);
-    warn(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(response);
-  remove$1(id);
-};
 const create$2 = (method, params) => {
   const {
     id,
@@ -629,6 +614,19 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
+const warn = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove$1(id);
+};
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
   if (prettyError && prettyError.type) {
@@ -798,6 +796,8 @@ const execute = (command, ...args) => {
 
 const createRpc = ipc => {
   const rpc = {
+    // @ts-ignore
+    ipc,
     /**
      * @deprecated
      */
@@ -824,7 +824,8 @@ const logError = () => {
 };
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
-  return handleJsonRpcMessage(event.target, event.data, execute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  const actualExecute = event?.target?.execute || execute;
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -2167,23 +2168,24 @@ const getMenuEntries = state => {
   }
 };
 
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue) => {
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, icons) => {
   const visible = [];
+  let iconIndex = 0;
   for (let i = minLineY; i < Math.min(maxLineY, items.length); i++) {
     const item = items[i];
+    const icon = icons[iconIndex++];
     if (i === editingIndex) {
       visible.push({
         ...item,
         isFocused: i === focusedIndex,
         isEditing: true,
-        icon: getFileIcon$1({
-          name: editingValue
-        })
+        icon
       });
     } else {
       visible.push({
         ...item,
-        isFocused: i === focusedIndex
+        isFocused: i === focusedIndex,
+        icon
       });
     }
   }
@@ -2677,6 +2679,65 @@ const handleCopy = async state => {
   return state;
 };
 
+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 getFilePathElectron = async file => {
   return invoke('GetFilePathElectron.getFilePathElectron', file);
 };
@@ -3293,65 +3354,6 @@ const removeDirent = async state => {
   };
 };
 
-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,
@@ -3367,6 +3369,57 @@ const renameDirent = state => {
   };
 };
 
+const renderItems = {
+  isEqual(oldState, newState) {
+    return JSON.stringify(oldState.items) === JSON.stringify(newState.items) && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.width === newState.width;
+  },
+  apply(oldState, newState) {
+    const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue, newState.icons);
+    const isWide = newState.width > 450;
+    const dom = getExplorerVirtualDom(visibleDirents, newState.focusedIndex, newState.root, isWide);
+    return ['Viewlet.setDom2', dom];
+  }
+};
+
+// const renderFocusedIndex = {
+//   isEqual(oldState:any, newState:any) {
+//     return oldState.focusedIndex === newState.focusedIndex && oldState.focused === newState.focused && oldState.minLineY === newState.minLineY
+//   },
+//   apply(oldState:any, newState:any) {
+//     const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY
+//     const newFocusedIndex = newState.focusedIndex - newState.minLineY
+//     return [/* method */ 'setFocusedIndex', /* oldindex */ oldFocusedIndex, /* newIndex */ newFocusedIndex, /* focused */ newState.focused]
+//   },
+// }
+
+// const renderDropTargets = {
+//   isEqual(oldState:any, newState:any) {
+//     return oldState.dropTargets === newState.dropTargets
+//   },
+//   apply(oldState:any, newState:any) {
+//     return [/* method */ 'setDropTargets', /* oldDropTargets */ oldState.dropTargets, /* newDropTargets */ newState.dropTargets]
+//   },
+// }
+
+const renderEditingIndex = {
+  isEqual(oldState, newState) {
+    return oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType;
+  },
+  apply(oldState, newState) {
+    return ['focusInput', 'ExplorerInput'];
+  }
+};
+const render = [renderItems, renderEditingIndex];
+const doRender = (oldState, newState) => {
+  const commands = [];
+  for (const fn of render) {
+    if (!fn.isEqual(oldState, newState)) {
+      commands.push(fn.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -3767,6 +3820,7 @@ const commandMap = {
   'Explorer.openContainingFolder': openContainingFolder,
   'Explorer.removeDirent': removeDirent,
   'Explorer.renameDirent': renameDirent,
+  'Explorer.render': doRender,
   'Explorer.renderActions': renderActions,
   'Explorer.restoreState': restoreState,
   'Explorer.revealItem': revealItem,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "description": "Explorer Worker",
   "main": "dist/explorerViewWorkerMain.js",
   "type": "module",