@lvce-editor/static-server 0.67.5 → 0.68.0

package/static/{fd11a0c → 52d769d}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -2340,6 +2340,25 @@ const None$4 = 0;
 const Right = 1;
 const Down = 2;
 
+const ensureUri = item => {
+  if (item.startsWith('/')) {
+    return `file://` + item;
+  }
+  return item;
+};
+const ensureUris = maybeUris => {
+  return maybeUris.map(ensureUri);
+};
+
+const createDecorationMap = decorations => {
+  const map = Object.create(null);
+  for (const decoration of decorations) {
+    const uri = ensureUri(decoration.uri);
+    map[uri] = decoration.decoration;
+  }
+  return map;
+};
+
 const getChevronType = (type, useChevrons) => {
   if (!useChevrons) {
     return None$4;
@@ -2430,7 +2449,7 @@ const text = data => {
   };
 };
 
-const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, indent) => {
+const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, indent, decoration) => {
   let className = TreeItem$1;
   className = mergeClassNames(className, `Indent-${indent}`);
   if (isSelected || isFocused) {
@@ -2439,6 +2458,9 @@ const getTreeItemClassName = (isSelected, isFocused, isDropping, useChevrons, in
   if (isDropping) {
     className = mergeClassNames(className, 'DropTarget');
   }
+  if (decoration) {
+    className = mergeClassNames(className, `decoration-${decoration}`);
+  }
   return className;
 };
 
@@ -2470,7 +2492,8 @@ const getEditingChevron = direntType => {
       return None$4;
   }
 };
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = []) => {
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = [], decorations) => {
+  const decorationMap = createDecorationMap(decorations);
   const visible = [];
   const indentFn = useChevrons ? getTreeItemIndentWithChevron : getTreeItemIndent;
   let iconIndex = 0;
@@ -2484,7 +2507,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const isDropping = dropTargets.includes(i);
     const isIgnored = sourceControlIgnoredUris.includes(item.path);
     const indent = indentFn(item.depth, chevron);
-    const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent);
+    const decoration = decorationMap[item.path] || '';
+    const className = getTreeItemClassName(isSelected, isFocused, isDropping, useChevrons, indent, decoration);
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
     const isEditing = i === editingIndex;
@@ -2507,7 +2531,9 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       className,
       isCut,
       isIgnored,
-      index: i
+      index: i,
+      // @ts-ignore
+      decoration
     });
   }
   return visible;
@@ -2539,12 +2565,13 @@ const wrapListItemCommand = fn => {
       sourceControlIgnoredUris,
       height,
       itemHeight,
-      fileIconCache
+      fileIconCache,
+      decorations
     } = updatedState;
     const intermediate = get(id);
     set(id, intermediate.oldState, updatedState);
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, items.length);
-    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache) {
+    if (items === intermediate.newState.items && minLineY === intermediate.newState.minLineY && editingIcon === intermediate.newState.editingIcon && cutItems === intermediate.newState.cutItems && editingErrorMessage === intermediate.newState.editingErrorMessage && dropTargets === intermediate.newState.dropTargets && fileIconCache === intermediate.newState.fileIconCache && decorations === intermediate.newState.decorations) {
       return;
     }
     const visible = items.slice(minLineY, maxLineY);
@@ -2552,7 +2579,7 @@ const wrapListItemCommand = fn => {
       icons,
       newFileIconCache
     } = await getFileIcons(visible, fileIconCache);
-    const visibleExplorerItems = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris);
+    const visibleExplorerItems = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris, decorations);
     const finalState = {
       ...updatedState,
       visibleExplorerItems,
@@ -2622,7 +2649,9 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     errorMessageLeft: 0,
     errorMessageTop: 0,
     visibleExplorerItems: [],
-    errorMessageWidth: 0
+    errorMessageWidth: 0,
+    decorations: [],
+    sourceControlDecorations: false
   };
   set(state.uid, state, state);
   return state;
@@ -4607,30 +4636,17 @@ const getWorkspacePath = () => {
   return invoke$2('Workspace.getPath');
 };
 
-const DecorationsEnabled = false;
-
-const ensureUris = maybeUris => {
-  const uris = [];
-  for (const item of maybeUris) {
-    if (item.startsWith('/')) {
-      uris.push(`file://` + item);
-    } else {
-      uris.push(item);
-    }
-  }
-  return uris;
-};
-const getFileDecorations = async (scheme, root, maybeUris) => {
+const getFileDecorations = async (scheme, root, maybeUris, decorationsEnabled) => {
   try {
-    if (!DecorationsEnabled) {
+    if (!decorationsEnabled) {
       return [];
     }
     const providerIds = await invoke$1('SourceControl.getEnabledProviderIds', scheme, root);
     if (providerIds.length === 0) {
       return [];
     }
-    const providerId = providerIds[0];
-    // @ts-ignore
+    // TODO how to handle multiple providers?
+    const providerId = providerIds.at(-1);
     const uris = ensureUris(maybeUris);
     const decorations = await invoke$1('SourceControl.getFileDecorations', providerId, uris);
     return decorations;
@@ -4640,7 +4656,17 @@ const getFileDecorations = async (scheme, root, maybeUris) => {
   }
 };
 
+const RE_PROTOCOL = /^[a-z+]:\/\//;
+const getScheme = uri => {
+  const match = uri.match(RE_PROTOCOL);
+  if (!match) {
+    return '';
+  }
+  return match[0];
+};
+
 const getSettings = async () => {
+  // TODO don't return false always
   // TODO get all settings at once
   const useChevronsRaw = await invoke$2('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
@@ -4648,10 +4674,13 @@ const getSettings = async () => {
   const confirmDelete = confirmDeleteRaw === false ? false : false;
   const confirmPasteRaw = await invoke$2('Preferences.get', 'explorer.confirmpaste');
   const confirmPaste = confirmPasteRaw === false ? false : false;
+  const sourceControlDecorationsRaw = await invoke$2('Preferences.get', 'explorer.sourceControlDecorations');
+  const sourceControlDecorations = sourceControlDecorationsRaw === false ? false : true;
   return {
     useChevrons,
     confirmDelete,
-    confirmPaste
+    confirmPaste,
+    sourceControlDecorations
   };
 };
 
@@ -4764,18 +4793,11 @@ const getExcluded = () => {
 const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
-const RE_PROTOCOL = /^[a-z+]:\/\//;
-const getScheme = uri => {
-  const match = uri.match(RE_PROTOCOL);
-  if (!match) {
-    return '';
-  }
-  return match[0];
-};
 const loadContent = async (state, savedState) => {
   const {
     useChevrons,
-    confirmDelete
+    confirmDelete,
+    sourceControlDecorations
   } = await getSettings();
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot(savedState, workspacePath);
@@ -4792,10 +4814,11 @@ const loadContent = async (state, savedState) => {
     deltaY = savedState.deltaY;
   }
   const scheme = getScheme(root);
-  const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path));
+  const decorations = await getFileDecorations(scheme, root, restoredDirents.filter(item => item.depth === 1).map(item => item.path), sourceControlDecorations);
   return {
     ...state,
     confirmDelete,
+    decorations,
     deltaY,
     excluded,
     items: restoredDirents,
@@ -4803,8 +4826,7 @@ const loadContent = async (state, savedState) => {
     minLineY,
     pathSeparator,
     root,
-    useChevrons,
-    decorations
+    useChevrons
   };
 };
 
@@ -4877,9 +4899,6 @@ const createSourceControlWorkerRpc = async () => {
 
 const initializeSourceControlWorker = async () => {
   try {
-    if (!DecorationsEnabled) {
-      return;
-    }
     const rpc = await createSourceControlWorkerRpc();
     // TODO
     set$2(rpc);

package/static/{fd11a0c → 52d769d}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2188,6 +2188,14 @@ const readFile$2 = async (protocol, path) => {
     throw new VError(error, 'Failed to execute file system provider');
   }
 };
+const mkdir$2 = async (protocol, path) => {
+  try {
+    const provider = get$9(protocol);
+    return await provider.mkdir(path);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
+};
 const readFileExternal = async path => {
   // TODO when file is local,
   // don't ask renderer worker
@@ -2198,6 +2206,10 @@ const readFileExternal = async path => {
   const content = await invoke$1('FileSystem.readFile', path);
   return content;
 };
+const removeExternal = async path => {
+  const content = await invoke$1('FileSystem.remove', path);
+  return content;
+};
 const existsExternal = async uri => {
   return await invoke$1('FileSystem.exists', uri);
 };
@@ -2740,7 +2752,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/fd11a0c/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/52d769d/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3018,9 +3030,9 @@ const getJson = async url => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/fd11a0c' !== 'undefined') {
+  if (typeof '/52d769d' !== 'undefined') {
     // @ts-ignore
-    return '/fd11a0c';
+    return '/52d769d';
   }
   if (platform === Electron) {
     return '../../../../..';
@@ -3408,6 +3420,7 @@ const api = {
   readDirWithFileTypes: readDirWithFileTypesExternal,
   exists: existsExternal,
   mkdir: mkdirExternal,
+  remove: removeExternal,
   writeFile: writeFileExternal,
   stat: statExternal,
   // Formatting
@@ -4938,6 +4951,7 @@ const FileSystemReadFile = 'ExtensionHostFileSystem.readFile';
 const FileSystemRename = 'ExtensionHostFileSystem.rename';
 const FileSystemWriteFile = 'ExtensionHostFileSystem.writeFile';
 const FileSystemRemove = 'ExtensionHostFileSystem.remove';
+const FileSystemMkdir = 'ExtensionHostFileSystem.mkdir';
 const FormattingExecuteFormmattingProvider = 'ExtensionHostFormatting.executeFormattingProvider';
 const HoverExecute = 'ExtensionHostHover.execute';
 const ImplementationExecuteImplementationProvider = 'ExtensionHostImplementation.executeImplementationProvider';
@@ -6266,6 +6280,7 @@ const commandMap = {
   [FileSystemRename]: rename$1,
   [FileSystemWriteFile]: writeFile$3,
   [FileSystemRemove]: remove$3,
+  [FileSystemMkdir]: mkdir$2,
   [FormattingExecuteFormmattingProvider]: executeFormattingProvider,
   [HoverExecute]: executeHoverProvider,
   [ImplementationExecuteImplementationProvider]: executeImplementationProvider,

package/static/{fd11a0c → 52d769d}/packages/extension-search-view-worker/dist/extensionSearchViewWorkerMain.js

@@ -1138,7 +1138,7 @@ const LeftClick = 0;
 
 const DebugWorker = 55;
 const ExtensionHostWorker = 44;
-const RendererWorker$1 = 1;
+const RendererWorker$2 = 1;
 
 const None$2 = 0;
 const Input = 1;
@@ -1306,9 +1306,6 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
 };
 
-const User = 1;
-const Script = 2;
-
 const getScrollBarY$1 = (delta, finalDelta, size, scrollBarSize) => {
   if (finalDelta === 0) {
     return 0;
@@ -1459,8 +1456,16 @@ const searchExtensions = async (extensions, value, platform, assetDir) => {
 };
 
 // TODO debounce
-const handleInput = async (state, value, inputSource = User) => {
+const handleChange = async (state, update) => {
+  const fullNewState = {
+    ...state,
+    ...update
+  };
   try {
+    const value = fullNewState.searchValue;
+    const {
+      inputSource
+    } = fullNewState;
     const hasValue = value.length > 0;
     const inputActions = getInputActions(hasValue);
     const {
@@ -1524,18 +1529,19 @@ const handleInput = async (state, value, inputSource = User) => {
     // TODO send error to error worker
     await handleError(error);
     return {
-      ...state,
-      searchValue: value,
+      ...fullNewState,
       message: `${error}`
     };
   }
 };
 
 const clearSearchResults = state => {
-  return handleInput({
+  return handleChange(state, {
     ...state,
-    focus: Input
-  }, '', Script$1);
+    focus: Input,
+    searchValue: '',
+    inputSource: Script$1
+  });
 };
 
 const closeSuggest = state => {
@@ -1617,7 +1623,7 @@ const {
   invokeAndTransfer,
   set: set$3,
   dispose: dispose$2
-} = create$1(RendererWorker$1);
+} = create$1(RendererWorker$2);
 const searchFileHtml = async uri => {
   return invoke$2('ExtensionHost.searchFileWithHtml', uri);
 };
@@ -1627,6 +1633,10 @@ const getFilePathElectron = async file => {
 const showContextMenu$1 = async (x, y, id, ...args) => {
   return invoke$2('ContextMenu.show', x, y, id, ...args);
 };
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  // @ts-ignore
+  await RendererWorker.invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const getElectronVersion = async () => {
   return invoke$2('Process.getElectronVersion');
 };
@@ -1856,7 +1866,7 @@ const openExtensionSearch = async () => {
 };
 const setExtensionsSearchValue = async searchValue => {
   // @ts-ignore
-  return invoke$2('Extensions.handleInput', searchValue);
+  return invoke$2('Extensions.handleInput', searchValue, Script$1);
 };
 const openExternal = async uri => {
   // @ts-ignore
@@ -1886,7 +1896,7 @@ const registerMockRpc = commandMap => {
   return mockRpc;
 };
 
-const RendererWorker = {
+const RendererWorker$1 = {
   __proto__: null,
   activateByEvent,
   applyBulkReplacement,
@@ -1958,6 +1968,7 @@ const RendererWorker = {
   setWebViewPort,
   setWorkspacePath,
   showContextMenu: showContextMenu$1,
+  showContextMenu2,
   showErrorDialog,
   showMessageBox,
   showSaveFilePicker,
@@ -2092,13 +2103,16 @@ const isEqual$2 = (oldState, newState) => {
   if (!newState.focus) {
     return true;
   }
-  return oldState.focus === newState.focus;
+  return oldState.focus === newState.focus && oldState.inputSource === newState.inputSource;
 };
 
 const isEqual$1 = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.deltaY === newState.deltaY && oldState.focusedIndex === newState.focusedIndex && oldState.message === newState.message && oldState.inputActions === newState.inputActions && oldState.placeholder === newState.placeholder && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
+const User = 1;
+const Script = 2;
+
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.searchValue === newState.searchValue;
 };
@@ -2148,6 +2162,7 @@ const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength)
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     minLineY: newMinLineY,
     maxLineY: newMaxLineY,
     focused: true,
@@ -2170,6 +2185,7 @@ const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) =
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     minLineY: newMinLineY,
     maxLineY: newMaxLineY,
     focused: true,
@@ -2195,6 +2211,7 @@ const focusIndex = (state, index) => {
     return {
       ...state,
       focusedIndex: -1,
+      listFocusedIndex: -1,
       focused: true
     };
   }
@@ -2208,6 +2225,7 @@ const focusIndex = (state, index) => {
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     focused: true
   };
 };
@@ -2408,7 +2426,7 @@ const {
   showContextMenu,
   openUri: openUri$1,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1
-} = RendererWorker;
+} = RendererWorker$1;
 
 const openUri = async uri => {
   return openUri$1(uri);
@@ -2514,6 +2532,13 @@ const handleHeaderContextMenu = async state => {
   return state;
 };
 
+const handleInput = async (state, value, inputSource = User) => {
+  return handleChange(state, {
+    searchValue: value,
+    inputSource
+  });
+};
+
 // TODO show error / warning  when installment fails / times out
 const handleInstall = async (state, id) => {
   return state;