@lvce-editor/static-server 0.49.23 → 0.49.24

package/static/{eacd2c0 → 8d1fee9}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -467,7 +467,7 @@ const registerPromise = () => {
     promise
   };
 };
-const create$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -759,7 +759,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -846,7 +846,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$1 = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -858,7 +858,7 @@ const create$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1
+  create: create$2
 };
 
 const None$5 = 0;
@@ -1004,6 +1004,7 @@ const SymLinkFolder = 11;
 const Unknown = 12;
 const EditingFile = File + DELTA_EDITING;
 const EditingFolder = Directory + DELTA_EDITING;
+const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
 
 const RendererWorker = 1;
 
@@ -1422,12 +1423,19 @@ const acceptEdit = async state => {
   }
 };
 
+const normalizeDirentType = direntType => {
+  if (direntType > DELTA_EDITING) {
+    return direntType - DELTA_EDITING;
+  }
+  return direntType;
+};
+
 const getNewDirentsForCancelRename = (items, editingIndex) => {
   const item = items[editingIndex];
   const newItems = [...items];
   newItems[editingIndex] = {
     ...item,
-    type: item.type - DELTA_EDITING
+    type: normalizeDirentType(item.type)
   };
   return newItems;
 };
@@ -1531,17 +1539,57 @@ const copyRelativePath = async state => {
   return state;
 };
 
-const states = Object.create(null);
-const get = uid => {
-  return states[uid];
-};
-const set = (uid, oldState, newState) => {
-  states[uid] = {
-    oldState,
-    newState
+const create$1 = () => {
+  const states = Object.create(null);
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    }
   };
 };
 
+const {
+  get,
+  set,
+  wrapCommand
+} = create$1();
+
 const ListItem = 22;
 
 const Slash = '/';
@@ -2064,7 +2112,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2615,6 +2663,18 @@ const getClickFn = direntType => {
   }
 };
 
+const resetEditing = {
+  editingIndex: -1,
+  editingValue: '',
+  editingType: None$5,
+  editingIcon: '',
+  editingErrorMessage: '',
+  editingSelection: {
+    start: 0,
+    end: 0
+  }
+};
+
 // 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
@@ -2644,8 +2704,16 @@ const handleClick = async (state, index, keepFocus = false) => {
     console.warn(`[explorer] dirent at index ${actualIndex} not found`, state);
     return state;
   }
-  const clickFn = getClickFn(dirent.type);
-  return clickFn(state, dirent, actualIndex, keepFocus);
+  const normalizedType = normalizeDirentType(dirent.type);
+  const clickFn = getClickFn(normalizedType);
+  const newState = await clickFn(state, dirent, actualIndex, keepFocus);
+  if (newState.editingIndex === -1) {
+    return newState;
+  }
+  return {
+    ...newState,
+    ...resetEditing
+  };
 };
 
 // export const handleBlur=()=>{}
@@ -2705,7 +2773,10 @@ const handleClickAtRangeSelection = async (state, index) => {
   return handleRangeSelection(state, min, max);
 };
 
-const handleClickAt = async (state, button, ctrlKey, shiftKey, x, y) => {
+const handleClickAt = async (state, defaultPrevented, button, ctrlKey, shiftKey, x, y) => {
+  if (defaultPrevented) {
+    return state;
+  }
   if (button !== LeftClick) {
     return state;
   }
@@ -3260,6 +3331,10 @@ const handleInputBlur = state => {
   return cancelEdit(state);
 };
 
+const handleInputClick = state => {
+  return state;
+};
+
 // TODO add lots of tests for this
 const updateRoot = async state1 => {
   // @ts-ignore
@@ -3921,6 +3996,7 @@ const FocusOutline = 'FocusOutline';
 const ListItems = 'ListItems';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
+const ExplorerInputBox = 'ExplorerInputBox';
 const InputValidationError = 'InputValidationError';
 const Label = 'Label';
 const MaskIconChevronDown = 'MaskIconChevronDown';
@@ -3951,6 +4027,7 @@ const HandleDragOver = 'handleDragOver';
 const HandleDrop = 'handleDrop';
 const HandleEditingInput = 'handleEditingInput';
 const HandleInputBlur = 'handleInputBlur';
+const HandleInputClick = 'handleInputClick';
 const HandleListBlur = 'handleListBlur';
 const HandleListFocus = 'handleListFocus';
 const HandlePointerDown = 'handlePointerDown';
@@ -4001,26 +4078,28 @@ const getFileIconVirtualDom = icon => {
   };
 };
 
-const getClassName$2 = hasEditingError => {
+const getInputClassName = hasEditingError => {
   if (hasEditingError) {
-    return mergeClassNames(InputBox, InputValidationError);
+    return mergeClassNames(InputBox, ExplorerInputBox, InputValidationError);
   }
-  return InputBox;
+  return mergeClassNames(InputBox, ExplorerInputBox);
 };
+
 const getInputDom = hasEditingError => {
   const ariaLabel = typeAFileName();
   return [{
     type: Input,
-    className: getClassName$2(hasEditingError),
-    id: 'ExplorerInput',
-    onInput: HandleEditingInput,
-    onBlur: HandleInputBlur,
+    ariaLabel: ariaLabel,
+    autocapitalize: 'off',
+    autocorrect: 'off',
     childCount: 0,
+    className: getInputClassName(hasEditingError),
+    id: 'ExplorerInput',
     name: ExplorerInput,
-    autocorrect: 'off',
-    autocapitalize: 'off',
-    spellcheck: 'false',
-    ariaLabel: ariaLabel
+    onBlur: HandleInputBlur,
+    onClick: HandleInputClick,
+    onInput: HandleEditingInput,
+    spellcheck: 'false'
   }];
 };
 
@@ -4029,31 +4108,35 @@ const label = {
   className: Label,
   childCount: 1
 };
+const getLabelDom = name => {
+  return [label, text(name)];
+};
+
 const getInputOrLabelDom = (isEditing, hasEditingError, name) => {
   if (isEditing) {
     return getInputDom(hasEditingError);
   }
-  return [label, text(name)];
+  return getLabelDom(name);
 };
 
 const getExplorerItemVirtualDom = item => {
   const {
-    posInSet,
-    setSize,
-    icon,
-    name,
-    path,
-    depth,
-    indent,
+    ariaExpanded,
     chevron,
-    id,
     className,
+    depth,
+    hasEditingError,
+    icon,
+    id,
+    indent,
     isEditing,
-    ariaExpanded,
-    hasEditingError
+    name,
+    path,
+    setSize,
+    posInSet
   } = item;
   const chevronDom = getChevronVirtualDom(chevron);
-  const dom = [{
+  return [{
     type: Div,
     role: TreeItem$1,
     className,
@@ -4069,7 +4152,6 @@ const getExplorerItemVirtualDom = item => {
     ariaDescription: '',
     id
   }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, hasEditingError, name)];
-  return dom;
 };
 
 const getExplorerWelcomeVirtualDom = isWide => {
@@ -4100,7 +4182,7 @@ const getActiveDescendant = focusedIndex => {
   }
   return undefined;
 };
-const getClassName$1 = (focused, focusedIndex, dropTarget) => {
+const getClassName = (focused, focusedIndex, dropTarget) => {
   const extraClass1 = focused && focusedIndex === -1 ? FocusOutline : Empty;
   const extraClass2 = dropTarget === dropTargetFull ? ExplorerDropTarget : Empty;
   const className = mergeClassNames(ListItems, extraClass1, extraClass2);
@@ -4118,7 +4200,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
   }
   const dom = [parentNode, {
     type: Div,
-    className: getClassName$1(focused, focusedIndex, dropTargets),
+    className: getClassName(focused, focusedIndex, dropTargets),
     tabIndex: 0,
     role: Tree,
     ariaLabel: filesExplorer(),
@@ -4172,6 +4254,18 @@ const getExpandedType = type => {
   }
 };
 
+const focused = mergeClassNames(TreeItem, TreeItemActive);
+const selected = mergeClassNames(TreeItem, TreeItemActive);
+const getTreeItemClassName = (isSelected, isFocused) => {
+  if (isFocused) {
+    return focused;
+  }
+  if (isSelected) {
+    return selected;
+  }
+  return TreeItem;
+};
+
 const defaultIndent$1 = 1;
 const getTreeItemIndent = depth => {
   return `${depth * defaultIndent$1}rem`;
@@ -4190,14 +4284,15 @@ const getTreeItemIndentWithChevron = (depth, chevron) => {
 };
 
 const ariaExpandedValues = [undefined, 'true', 'false'];
-const getClassName = (isSelected, isFocused) => {
-  if (isFocused) {
-    return mergeClassNames(TreeItem, TreeItemActive);
-  }
-  if (isSelected) {
-    return mergeClassNames(TreeItem, TreeItemActive);
+const getEditingChevron = direntType => {
+  switch (direntType) {
+    case EditingDirectoryExpanded:
+      return Down;
+    case EditingFolder:
+      return Right;
+    default:
+      return None$1;
   }
-  return TreeItem;
 };
 const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon) => {
   const visible = [];
@@ -4205,19 +4300,20 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
   let iconIndex = 0;
   for (let i = minLineY; i < Math.min(maxLineY, items.length); i++) {
     const item = items[i];
-    const chevron = getChevronType(item.type, useChevrons);
-    const indent = indentFn(item.depth, chevron);
+    let chevron = getChevronType(item.type, useChevrons);
     const isFocused = i === focusedIndex;
     const id = isFocused ? 'TreeItemActive' : undefined;
     const isSelected = item.selected;
-    const className = getClassName(isSelected, isFocused);
+    const className = getTreeItemClassName(isSelected, isFocused);
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
     const isEditing = i === editingIndex;
     let icon = icons[iconIndex++];
     if (isEditing) {
       icon = editingIcon;
+      chevron = getEditingChevron(item.type);
     }
+    const indent = indentFn(item.depth, chevron);
     visible.push({
       ...item,
       posInSet: item.posInSet ?? i + 1,
@@ -4392,7 +4488,11 @@ const renderEventListeners = () => {
     params: ['handleBlur']
   }, {
     name: HandleClick,
-    params: ['handleClickAt', 'event.button', 'event.ctrlKey', 'event.shiftKey', 'event.clientX', 'event.clientY'],
+    params: ['handleClickAt', 'event.defaultPrevented', 'event.button', 'event.ctrlKey', 'event.shiftKey', 'event.clientX', 'event.clientY'],
+    preventDefault: true
+  }, {
+    name: HandleInputClick,
+    params: ['handleInputClick'],
     preventDefault: true
   }, {
     name: HandleClickOpenFolder,
@@ -4778,26 +4878,10 @@ const updateEditingValue = async (state, value, inputSource = User) => {
   };
 };
 
-const wrapCommand = fn => {
-  const wrapped = async (uid, ...args) => {
-    const {
-      newState
-    } = get(uid);
-    const newerState = await fn(newState, ...args);
-    if (newState === newerState) {
-      return;
-    }
-    const latest = get(uid);
-    set(uid, latest.oldState, newerState);
-  };
-  return wrapped;
-};
-
 const commandMap = {
   'Explorer.acceptEdit': wrapCommand(acceptEdit),
   'Explorer.cancelEdit': wrapCommand(cancelEdit),
   'Explorer.collapseAll': wrapCommand(collapseAll),
-  'Explorer.handleInputBlur': wrapCommand(handleInputBlur),
   'Explorer.copyPath': wrapCommand(copyPath),
   'Explorer.copyRelativePath': wrapCommand(copyRelativePath),
   'Explorer.expandAll': wrapCommand(expandAll),
@@ -4827,6 +4911,8 @@ const commandMap = {
   'Explorer.handleDrop': wrapCommand(handleDrop),
   'Explorer.handleFocus': wrapCommand(handleFocus),
   'Explorer.handleIconThemeChange': wrapCommand(handleIconThemeChange),
+  'Explorer.handleInputBlur': wrapCommand(handleInputBlur),
+  'Explorer.handleInputClick': wrapCommand(handleInputClick),
   'Explorer.handlePaste': wrapCommand(handlePaste),
   'Explorer.handlePointerDown': wrapCommand(handlePointerDown),
   'Explorer.handleUpload': wrapCommand(handleUpload),

package/static/{eacd2c0 → 8d1fee9}/packages/extension-detail-view-worker/dist/extensionDetailViewWorkerMain.js

@@ -430,7 +430,7 @@ const set$2 = (id, fn) => {
 const get$2 = id => {
   return callbacks[id];
 };
-const remove$1 = id => {
+const remove = id => {
   delete callbacks[id];
 };
 let id$1 = 0;
@@ -607,7 +607,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$1(id);
+  remove(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -857,8 +857,35 @@ const create$1 = () => {
         newState
       };
     },
-    remove(uid) {
+    dispose(uid) {
       delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -866,7 +893,8 @@ const create$1 = () => {
 const {
   get: get$1,
   set: set$1,
-  remove
+  dispose: dispose$1,
+  wrapCommand
 } = create$1();
 
 const create = (uid, uri, width, height, platform, assetDir$1) => {
@@ -927,7 +955,7 @@ const diff2 = uid => {
 };
 
 const dispose = uid => {
-  remove(uid);
+  dispose$1(uid);
 };
 
 const commandIds = ['getMenuEntries', 'handleClickDisable', 'handleClickSize', 'handleClickUninstall', 'handleFeaturesClick', 'handleIconError', 'handleTabsClick', 'renderEventListeners', 'resize', 'saveState', 'selectTab', 'terminate'];
@@ -1215,7 +1243,7 @@ const getCategoriesDom = categories => {
   }, ...categories.flatMap(getCategoryVirtualDom)];
 };
 
-const parentNode = {
+const parentNode$1 = {
   type: Div,
   className: MoreInfoEntryKey,
   childCount: 1
@@ -1224,7 +1252,7 @@ const getMoreInfoEntryKeyVirtualDom = item => {
   const {
     key
   } = item;
-  return [parentNode, text(key)];
+  return [parentNode$1, text(key)];
 };
 
 const getTag = (onClick, code) => {
@@ -1444,8 +1472,10 @@ const getCommandTableEntry = command => {
 const getCommandTableEntries = extension => {
   const commands = extension.commands || [];
   const rows = commands.map(getCommandTableEntry);
+  const id$1 = id();
+  const label$1 = label();
   return {
-    headings: ['ID', 'Label'],
+    headings: [id$1, label$1],
     rows
   };
 };
@@ -1567,14 +1597,15 @@ const getJsonValidationTableEntries = extension => {
   };
 };
 
+const parentNode = {
+  type: Div,
+  className: FeatureContent,
+  childCount: 2
+};
 const getFeatureJsonValidationVirtualDom = extension => {
   const heading = jsonValidation();
   const tableInfo = getJsonValidationTableEntries(extension);
-  return [{
-    type: Div,
-    className: FeatureContent,
-    childCount: 2
-  }, ...getFeatureContentHeadingVirtualDom(heading), ...getTableVirtualDom(tableInfo)];
+  return [parentNode, ...getFeatureContentHeadingVirtualDom(heading), ...getTableVirtualDom(tableInfo)];
 };
 
 const getFeatureNotImplementedVirtualDom = () => {
@@ -1820,7 +1851,7 @@ const getExtensionDetailContentVirtualDom = async (sanitizedReadmeHtml, themesHt
 const getButtonVirtualDom = (message, onClick) => {
   return [{
     type: Button,
-    className: Button$1 + ' ' + ButtonPrimary,
+    className: mergeClassNames(Button$1, ButtonPrimary),
     onClick,
     childCount: 1
   }, text(message)];
@@ -2557,21 +2588,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const wrapCommand = fn => {
-  const wrapped = async (uid, ...args) => {
-    const {
-      newState
-    } = get$1(uid);
-    const newerState = await fn(newState, ...args);
-    if (newState === newerState) {
-      return;
-    }
-    const latest = get$1(uid);
-    set$1(uid, latest.oldState, newerState);
-  };
-  return wrapped;
-};
-
 const commandMap = {
   'ExtensionDetail.create': create,
   'ExtensionDetail.diff2': diff2,

package/static/{eacd2c0 → 8d1fee9}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2393,7 +2393,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/eacd2c0/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/8d1fee9/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3118,7 +3118,8 @@ const getWebExtensionManifest = async (path, manifestPath) => {
     const manifest = await getJson(manifestPath);
     return {
       ...manifest,
-      path
+      path,
+      uri: path
     };
   } catch (error) {
     const id = interExtensionId(path);
@@ -3688,9 +3689,9 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/eacd2c0' !== 'undefined') {
+  if (typeof '/8d1fee9' !== 'undefined') {
     // @ts-ignore
-    return '/eacd2c0';
+    return '/8d1fee9';
   }
   if (platform === Electron) {
     return '../../../../..';