@lvce-editor/static-server 0.50.0 → 0.50.2

package/static/{80a664c → 61bc957}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -985,8 +985,12 @@ const getMissingIconRequests = (dirents, fileIconCache) => {
   return missingRequests;
 };
 
-const getPath = dirent => {
-  return dirent.path;
+const getPath = item => {
+  return item.path;
+};
+
+const getPaths = items => {
+  return items.map(getPath);
 };
 
 const DELTA_EDITING = 100;
@@ -1058,7 +1062,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   const missingRequests = getMissingIconRequests(dirents, fileIconCache);
   const newIcons = await requestFileIcons(missingRequests);
   const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const paths = dirents.map(getPath);
+  const paths = getPaths(dirents);
   const icons = getIconsCached(paths, newFileIconCache);
   return {
     icons,
@@ -1653,7 +1657,11 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
       end: 0
     },
     focusWord: '',
-    focusWordTimeout: 800
+    focusWordTimeout: 800,
+    finalDeltaY: 0,
+    handleOffset: 0,
+    scrollBarActive: false,
+    scrollBarHeight: 0
   };
   set(uid, state, state);
 };
@@ -1696,7 +1704,11 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
       end: 0
     },
     focusWord: '',
-    focusWordTimeout: 800
+    focusWordTimeout: 800,
+    finalDeltaY: 0,
+    handleOffset: 0,
+    scrollBarActive: false,
+    scrollBarHeight: 0
   };
   set(state.uid, state, state);
   return state;
@@ -2968,23 +2980,37 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
-const getTopLevelDirents = (root, pathSeparator, excluded) => {
-  if (!root) {
-    return [];
-  }
-  return getChildDirents(pathSeparator, {
-    depth: 0,
-    path: root,
-    type: Directory
-  }, excluded);
+const isExpanded = item => {
+  return item.type === DirectoryExpanded || item.type === DirectoryExpanding;
 };
 
-const mergeDirents$2 = (oldDirents, newDirents) => {
-  const merged = [];
-  for (const newDirent of newDirents) {
-    merged.push(newDirent);
+const getExpandedDirents = items => {
+  return items.filter(isExpanded);
+};
+
+const refreshChildDirent = async (folder, dirent, pathSeparator, expandedFolders) => {
+  const path = folder.path.endsWith(pathSeparator) ? `${folder.path}${dirent.name}` : `${folder.path}${pathSeparator}${dirent.name}`;
+  const isExpandedFolder = expandedFolders.includes(path);
+  const type = dirent.type === 'directory' ? isExpandedFolder ? DirectoryExpanded : Directory : File;
+  const item = {
+    name: dirent.name,
+    type,
+    path,
+    depth: folder.depth + 1,
+    selected: false
+  };
+  if (isExpandedFolder) {
+    const nestedItems = await refreshChildDirents(item, pathSeparator, expandedFolders);
+    return [item, ...nestedItems];
   }
-  return merged;
+  return [item];
+};
+const refreshChildDirents = async (folder, pathSeparator, expandedFolders) => {
+  const childDirents = await readDirWithFileTypes(folder.path);
+  const childItems = await Promise.all(childDirents.map(async dirent => {
+    return refreshChildDirent(folder, dirent, pathSeparator, expandedFolders);
+  }));
+  return childItems.flat();
 };
 
 // TODO add lots of tests for this
@@ -2995,24 +3021,73 @@ const refresh = async state => {
     minLineY,
     height,
     itemHeight,
-    fileIconCache
+    fileIconCache,
+    items,
+    focusedIndex
   } = state;
-  const topLevelDirents = await getTopLevelDirents(root, pathSeparator, []);
-  const newDirents = mergeDirents$2(state.items, topLevelDirents);
+
+  // Get all expanded folders
+  const expandedDirents = getExpandedDirents(items);
+  const expandedFolders = getPaths(expandedDirents);
+
+  // Get top level dirents
+  const topLevelDirents = await readDirWithFileTypes(root);
+  const newDirents = topLevelDirents.map(dirent => ({
+    name: dirent.name,
+    type: dirent.type === 'directory' ? Directory : File,
+    path: root.endsWith(pathSeparator) ? `${root}${dirent.name}` : `${root}${pathSeparator}${dirent.name}`,
+    depth: 0,
+    selected: false
+  }));
+
+  // Process expanded folders in parallel
+  const expandedFolderResults = await Promise.all(expandedFolders.map(async folderPath => {
+    const folderIndex = newDirents.findIndex(item => item.path === folderPath);
+    if (folderIndex !== -1) {
+      const folder = newDirents[folderIndex];
+      if (folder.type === Directory) {
+        const childItems = await refreshChildDirents(folder, pathSeparator, expandedFolders);
+        // @ts-ignore
+        folder.type = DirectoryExpanded;
+        return {
+          folderIndex,
+          childItems
+        };
+      }
+    }
+    return null;
+  }));
+
+  // Insert child items in the correct order
+  let offset = 0;
+  for (const result of expandedFolderResults) {
+    if (result) {
+      const {
+        folderIndex,
+        childItems
+      } = result;
+      newDirents.splice(folderIndex + 1 + offset, 0, ...childItems);
+      offset += childItems.length;
+    }
+  }
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
   const visible = newDirents.slice(minLineY, maxLineY);
   const {
     icons,
     newFileIconCache
   } = await getFileIcons(visible, fileIconCache);
-  const state3 = {
+  let newFocusedIndex = focusedIndex;
+  if (focusedIndex >= newDirents.length) {
+    newFocusedIndex = newDirents.length - 1;
+  }
+  return {
     ...state,
     items: newDirents,
     fileIconCache: newFileIconCache,
     icons,
-    maxLineY
+    maxLineY,
+    focusedIndex: newFocusedIndex
   };
-  return state3;
 };
 
 const applyOperation = operation => {
@@ -3109,7 +3184,7 @@ const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) =
   return true;
 };
 
-const mergeDirents$1 = (oldDirents, newDirents) => {
+const mergeDirents$2 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
@@ -3117,7 +3192,7 @@ const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
     path: root,
     depth: 0
   });
-  const mergedDirents = mergeDirents$1(dirents, childDirents);
+  const mergedDirents = mergeDirents$2(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$2 = async (state, fileHandles, files) => {
@@ -3166,7 +3241,7 @@ const copyFilesElectron = async (root, pathSeparator, fileHandles, files, paths)
   await applyFileOperations(operations);
 };
 
-const mergeDirents = (oldDirents, newDirents) => {
+const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
@@ -3174,7 +3249,7 @@ const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
     path: root,
     depth: 0
   });
-  const mergedDirents = mergeDirents(dirents, childDirents);
+  const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$1 = async (state, fileHandles, files, paths) => {
@@ -3427,6 +3502,25 @@ const handleKeyDown = (state, key) => {
   };
 };
 
+const getTopLevelDirents = (root, pathSeparator, excluded) => {
+  if (!root) {
+    return [];
+  }
+  return getChildDirents(pathSeparator, {
+    depth: 0,
+    path: root,
+    type: Directory
+  }, excluded);
+};
+
+const mergeDirents = (oldDirents, newDirents) => {
+  const merged = [];
+  for (const newDirent of newDirents) {
+    merged.push(newDirent);
+  }
+  return merged;
+};
+
 // TODO add lots of tests for this
 const updateRoot = async state1 => {
   // @ts-ignore
@@ -3441,7 +3535,7 @@ const updateRoot = async state1 => {
   // if (state2.disposed || state2.root !== state1.root) {
   //   return state2
   // }
-  const newDirents = mergeDirents$2(state1.items, topLevelDirents);
+  const newDirents = mergeDirents(state1.items, topLevelDirents);
   const state3 = {
     ...state1,
     items: newDirents
@@ -3749,10 +3843,11 @@ const loadContent = async (state, savedState) => {
     deltaY = savedState.deltaY;
   }
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, restoredDirents.length);
+  const visible = restoredDirents.slice(minLineY, maxLineY);
   const {
     icons,
     newFileIconCache
-  } = await getFileIcons(restoredDirents, fileIconCache);
+  } = await getFileIcons(visible, fileIconCache);
   return {
     ...state,
     root,
@@ -3929,70 +4024,35 @@ const openContainingFolder = async state => {
   return state;
 };
 
-// TODO support multiselection and removing multiple dirents
-const removeDirent = async state => {
-  if (state.focusedIndex < 0) {
-    return state;
-  }
-  const dirent = getFocusedDirent$1(state);
-  if (!dirent) {
-    return state;
-  }
-  const absolutePath = dirent.path;
-  try {
-    // TODO handle error
-    await remove(absolutePath);
-  } catch {
-    // TODO vscode shows error as alert (no stacktrace) and retry button
-    // maybe should show alert as well, but where to put stacktrace?
-    // on web should probably show notification (dialog)
-    // ErrorHandling.handleError(error)
-    // await ErrorHandling.showErrorDialog(error)
-    return state;
-  }
-  // TODO avoid state mutation
-  // @ts-ignore
-  const newVersion = ++state.version;
-  // TODO race condition
-  // const newState = await loadContent(state:any)
-  // @ts-ignore
-  if (state.version !== newVersion || state.disposed) {
-    return state;
-  }
-  // TODO is it possible to make this more functional instead of mutating state?
-  // maybe every function returns a new state?
-  const index = state.items.indexOf(dirent);
-  let deleteEnd = index + 1;
-  for (; deleteEnd < state.items.length; deleteEnd++) {
-    if (state.items[deleteEnd].depth <= dirent.depth) {
-      break;
+const getSelectedItems = (items, focusedIndex) => {
+  const dirent = items[focusedIndex];
+  const selectedItems = items.filter(item => item.selected || item === dirent);
+  return selectedItems;
+};
+
+const removePaths = async paths => {
+  for (const item of paths) {
+    try {
+      await remove(item);
+    } catch {
+      // ignore
     }
   }
-  const deleteCount = deleteEnd - index;
-  const newDirents = [...state.items];
-  newDirents.splice(index, deleteCount);
-  let indexToFocus = -1;
-  if (newDirents.length === 0) {
-    indexToFocus = -1;
-  } else if (index < state.focusedIndex) {
-    indexToFocus = state.focusedIndex - 1;
-  } else if (index === state.focusedIndex) {
-    indexToFocus = Math.max(state.focusedIndex - 1, 0);
-  } else {
-    indexToFocus = Math.max(state.focusedIndex - 1, 0);
-  }
-  const visible = newDirents.slice(state.minLineY, state.maxLineY);
+};
+
+const removeDirent = async state => {
   const {
-    icons,
-    newFileIconCache
-  } = await getFileIcons(visible, state.fileIconCache);
-  return {
-    ...state,
-    items: newDirents,
-    icons,
-    fileIconCache: newFileIconCache,
-    focusedIndex: indexToFocus
-  };
+    items,
+    focusedIndex
+  } = state;
+  const selectedItems = getSelectedItems(items, focusedIndex);
+  if (selectedItems.length === 0) {
+    return state;
+  }
+  const toRemove = getPaths(selectedItems);
+  await removePaths(toRemove);
+  const newState = await refresh(state);
+  return newState;
 };
 
 const getNewDirentsForRename = (items, focusedIndex) => {
@@ -4083,14 +4143,14 @@ const Chevron = 'Chevron';
 const Empty = '';
 const Explorer = 'Explorer';
 const ExplorerDropTarget = 'DropTarget';
+const ExplorerInputBox = 'ExplorerInputBox';
 const FileIcon = 'FileIcon';
 const FocusOutline = 'FocusOutline';
-const ListItems = 'ListItems';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
-const ExplorerInputBox = 'ExplorerInputBox';
 const InputValidationError = 'InputValidationError';
 const Label = 'Label';
+const ListItems = 'ListItems';
 const MaskIconChevronDown = 'MaskIconChevronDown';
 const MaskIconChevronRight = 'MaskIconChevronRight';
 const TreeItem = 'TreeItem';

package/static/{80a664c → 61bc957}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2393,7 +2393,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/80a664c/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/61bc957/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3689,9 +3689,9 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/80a664c' !== 'undefined') {
+  if (typeof '/61bc957' !== 'undefined') {
     // @ts-ignore
-    return '/80a664c';
+    return '/61bc957';
   }
   if (platform === Electron) {
     return '../../../../..';

package/static/{80a664c → 61bc957}/packages/extension-search-view-worker/dist/extensionSearchViewWorkerMain.js

@@ -1349,6 +1349,9 @@ const last = items => {
 const next = (items, index) => {
   return (index + 1) % items.length;
 };
+const previous = (items, index) => {
+  return index === 0 ? items.length - 1 : index - 1;
+};
 const focusFirst = state => {
   const firstIndex = first();
   return focusIndex(state, firstIndex);
@@ -1390,6 +1393,17 @@ const focusNextPage = state => {
   const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
   return focusIndex(state, indexNextPage);
 };
+const focusPrevious = state => {
+  const {
+    focusedIndex,
+    items
+  } = state;
+  if (focusedIndex === 0 || focusedIndex === -1) {
+    return state;
+  }
+  const previousIndex = previous(items, focusedIndex);
+  return focusIndex(state, previousIndex);
+};
 const focusPreviousPage = state => {
   const {
     focusedIndex,
@@ -2416,6 +2430,7 @@ const commandMap = {
   'SearchExtensions.focusNext': wrapCommand(focusNext),
   'SearchExtensions.focusNextPage': wrapCommand(focusNextPage),
   'SearchExtensions.focusPreviousPage': wrapCommand(focusPreviousPage),
+  'SearchExtensions.focusPrevious': wrapCommand(focusPrevious),
   'SearchExtensions.getActions': getActions,
   'SearchExtensions.getCommandIds': getCommandIds,
   'SearchExtensions.getKeyBindings': getKeyBindings,

package/static/{80a664c → 61bc957}/packages/renderer-process/dist/rendererProcessMain.js

@@ -404,7 +404,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/80a664c';
+const assetDir = '/61bc957';
 
 const getConfiguredWorkerUrl = key => {
   if (typeof location === 'undefined' || typeof document === 'undefined') {
@@ -1897,7 +1897,7 @@ const rememberFocus$1 = ($Viewlet, dom, eventMap, uid = 0) => {
         $Previous.className = $NewFocused.className;
         $Previous.placeholder = $NewFocused.placeholder;
         if ($NewFocused.childNodes) {
-          $Previous.append(...$NewFocused.childNodes);
+          $Previous.replaceChildren(...$NewFocused.childNodes);
         }
         $NewFocused.replaceWith($Previous);
       }

package/static/{80a664c → 61bc957}/packages/renderer-process/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "12.8.0",
+  "version": "12.9.0",
   "description": "",
   "keywords": [
     "lvce-editor",

package/static/{80a664c → 61bc957}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -110,7 +110,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/80a664c';
+    return '/61bc957';
   }
 };
 const assetDir = getAssetDir();
@@ -2611,6 +2611,20 @@ const isOpen = () => {
   return false;
 };
 
+const updateDynamicFocusContext = commands => {
+  const setFocusContextIndex = commands.findIndex(command => command[0] === 'Viewlet.setFocusContext');
+  let focusContext = 0;
+  if (setFocusContextIndex !== -1) {
+    const command = commands[setFocusContextIndex];
+    focusContext = command[2];
+    commands.splice(setFocusContextIndex, 1);
+  }
+  // TODO send focus changes to renderer process together with other message
+  if (focusContext) {
+    setFocus(focusContext);
+  }
+};
+
 class CancelationError extends Error {
   constructor() {
     super('canceled');
@@ -2628,6 +2642,23 @@ const get$a = id => {
   return state$w.idMap[id];
 };
 
+const registry = Object.create(null);
+const add$2 = (uid, mouseActions) => {
+  registry[uid] = mouseActions;
+};
+const matchesMouseAction = (item, button, modifiers) => {
+  return item.button === button && Boolean(item.modifiers.ctrl) === modifiers.ctrl && Boolean(item.modifiers.shift) === modifiers.shift;
+};
+const get$9 = (uid, button, modifiers) => {
+  const items = registry[uid];
+  for (const item of items) {
+    if (matchesMouseAction(item, button, modifiers)) {
+      return item.command;
+    }
+  }
+  return '';
+};
+
 const nameAnonymousFunction = (fn, name) => {
   Object.defineProperty(fn, 'name', {
     value: name
@@ -2699,13 +2730,13 @@ const setJsonObjects$1 = objects => {
   return setJsonObjects$2(LocalStorage, objects);
 };
 
-const getJson$4 = viewletId => {
+const getJson$4 = async viewletId => {
   return getJson$5(viewletId);
 };
-const setJson$3 = (viewletId, value) => {
+const setJson$3 = async (viewletId, value) => {
   return setJson$4(viewletId, value);
 };
-const setJsonObjects = value => {
+const setJsonObjects = async value => {
   return setJsonObjects$1(value);
 };
 
@@ -2910,23 +2941,6 @@ const getSavedViewletState = viewletId => {
   return getJson$4(viewletId);
 };
 
-const registry = Object.create(null);
-const add$2 = (uid, mouseActions) => {
-  registry[uid] = mouseActions;
-};
-const matchesMouseAction = (item, button, modifiers) => {
-  return item.button === button && Boolean(item.modifiers.ctrl) === modifiers.ctrl && Boolean(item.modifiers.shift) === modifiers.shift;
-};
-const get$9 = (uid, button, modifiers) => {
-  const items = registry[uid];
-  for (const item of items) {
-    if (matchesMouseAction(item, button, modifiers)) {
-      return item.command;
-    }
-  }
-  return '';
-};
-
 const loadModule$3 = async (id, module) => {
   if (module.Css) {
     // this is a memory leak but it is not too important
@@ -3169,17 +3183,7 @@ const runFn = async (instance, id, key, fn, args) => {
       return;
     }
     const commands = render$I(instance.factory, oldState, newState, newState.uid || id);
-    const setFocusContextIndex = commands.findIndex(command => command[0] === 'Viewlet.setFocusContext');
-    let focusContext = 0;
-    if (setFocusContextIndex !== -1) {
-      const command = commands[setFocusContextIndex];
-      focusContext = command[2];
-      commands.splice(setFocusContextIndex, 1);
-    }
-    // TODO send focus changes to renderer process together with other message
-    if (focusContext) {
-      setFocus(focusContext);
-    }
+    updateDynamicFocusContext(commands);
     setRenderedState(id, newState);
     await invoke$i(/* Viewlet.sendMultiple */kSendMultiple, /* commands */commands);
   } else {
@@ -4075,19 +4079,11 @@ const openWidget = async (moduleId, ...args) => {
   } else {
     commands.push(['Viewlet.append', layout.uid, childUid]);
   }
-  const setFocusContextIndex = commands.findIndex(command => command[0] === 'Viewlet.setFocusContext');
-  let focusContext = 0;
-  if (setFocusContextIndex !== -1) {
-    const command = commands[setFocusContextIndex];
-    focusContext = command[1];
-    commands.splice(setFocusContextIndex, 1);
-  }
+
+  // TODO send focus changes to renderer process together with other message
+  updateDynamicFocusContext(commands);
   commands.push(['Viewlet.focus', childUid]);
   await invoke$i('Viewlet.executeCommands', commands);
-  // TODO send focus changes to renderer process together with other message
-  if (focusContext) {
-    setFocus(focusContext);
-  }
 };
 const closeWidget = async id => {
   try {
@@ -4152,17 +4148,7 @@ const executeViewletCommand = async (uid, fnName, ...args) => {
   if ('newState' in newState) {
     commands.push(...newState.commands);
   }
-  const setFocusContextIndex = commands.findIndex(command => command[0] === 'Viewlet.setFocusContext');
-  let focusContext = 0;
-  if (setFocusContextIndex !== -1) {
-    const command = commands[setFocusContextIndex];
-    focusContext = command[1];
-    commands.splice(setFocusContextIndex, 1);
-  }
-  // TODO send focus changes to renderer process together with other message
-  if (focusContext) {
-    setFocus(focusContext);
-  }
+  updateDynamicFocusContext(commands);
   setRenderedState(uid, actualNewState);
   if (commands.length === 0) {
     return;
@@ -4813,9 +4799,13 @@ const getIcons = iconRequests => {
   const Folder = 2;
   return iconRequests.map(request => {
     if (request.type === Folder) {
-      return getFolderIcon(request.uri);
+      return getFolderIcon({
+        name: request.name
+      });
     }
-    return getFileIcon$1(request.uri);
+    return getFileIcon$1({
+      name: request.name
+    });
   });
 };
 
@@ -12970,13 +12960,17 @@ const showOverlay = (...args) => {
 const performAction = (...args) => {
   return invoke$i('TestFrameWork.performAction', ...args);
 };
+const checkConditionError = (...args) => {
+  return invoke$i('TestFrameWork.checkConditionError', ...args);
+};
 
 const name$1m = 'TestFrameWork';
 const Commands$1e = {
   checkMultiElementCondition: checkMultiElementCondition,
   checkSingleElementCondition: checkSingleElementCondition,
   showOverlay: showOverlay,
-  performAction: performAction
+  performAction: performAction,
+  checkConditionError: checkConditionError
 };
 
 const TestFrameWork_ipc = {