@lvce-editor/static-server 0.66.6 → 0.66.8

package/static/{26ac40c → 25fb5b2}/packages/text-search-worker/dist/textSearchWorkerMain.js

@@ -596,7 +596,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
+const set$5 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$3 = id => {
@@ -615,7 +615,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$4(id, resolve);
+  set$5(id, resolve);
   return {
     id,
     promise
@@ -956,11 +956,11 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
+const send$1 = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke$3 = (ipc, method, ...params) => {
+const invoke$4 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer$1 = (ipc, method, ...params) => {
@@ -996,10 +996,10 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
+      send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$3(ipc, method, ...params);
+      return invoke$4(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer$1(ipc, method, ...params);
@@ -1340,6 +1340,7 @@ const Remote = 3;
 const DebugWorker = 55;
 const RendererWorker$1 = 1;
 const SearchProcess = 77;
+const IconThemeWorker = 7009;
 
 const FocusElementByName = 'Viewlet.focusElementByName';
 const SetDom2 = 'Viewlet.setDom2';
@@ -1641,6 +1642,9 @@ const MatchCase$2 = 1 << 4; // 16
 const DetailsExpanded = 1 << 5; // 32
 const OpenEditors = 1 << 6; // 64
 const UseIgnoreFiles = 1 << 7; // 128
+const hasReplaceExpanded = flags => {
+  return (flags & ReplaceExpanded) === ReplaceExpanded;
+};
 const hasDetailsExpanded = flags => {
   return (flags & DetailsExpanded) === DetailsExpanded;
 };
@@ -1658,7 +1662,7 @@ const collapseDetails = state => {
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$2 = id => {
@@ -1680,7 +1684,7 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$4(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$2(rpcId);
@@ -1689,6 +1693,14 @@ const create$2 = rpcId => {
   };
 };
 
+const {
+  invoke: invoke$3,
+  set: set$3} = create$2(IconThemeWorker);
+const getIcons$1 = async iconRequests => {
+  // @ts-ignore
+  return invoke$3('IconTheme.getIcons', iconRequests);
+};
+
 const {
   invoke: invoke$2,
   invokeAndTransfer,
@@ -1839,7 +1851,7 @@ const handleDebugResumed = async params => {
 const openWidget = async name => {
   await invoke$2('Viewlet.openWidget', name);
 };
-const getIcons$1 = async requests => {
+const getIcons = async requests => {
   const icons = await invoke$2('IconTheme.getIcons', requests);
   return icons;
 };
@@ -1986,7 +1998,7 @@ const RendererWorker = {
   getFilePathElectron,
   getFolderIcon,
   getFolderSize,
-  getIcons: getIcons$1,
+  getIcons,
   getKeyBindings: getKeyBindings$1,
   getLogsDir,
   getMarkdownDom,
@@ -2049,7 +2061,7 @@ const createLazyRpc = rpcId => {
   let factory;
   const createRpc = async () => {
     const rpc = await factory();
-    set$3(rpcId, rpc);
+    set$4(rpcId, rpc);
   };
   const ensureRpc = async () => {
     if (!rpcPromise) {
@@ -2075,9 +2087,7 @@ const {
   sendMessagePortToSearchProcess,
   set: set$1,
   showContextMenu,
-  writeClipBoardText,
-  getIcons
-} = RendererWorker;
+  writeClipBoardText} = RendererWorker;
 
 const copy = async state => {
   const {
@@ -2192,7 +2202,8 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     useFileIcons: true,
     limitHit: false,
     limitHitWarning: '',
-    limit: 20_000
+    limit: 20_000,
+    fileIconCache: {}
   };
   set(uid, state, state);
   return state;
@@ -2880,29 +2891,100 @@ const handleUpdateError = async (state, update, error) => {
   };
 };
 
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent]);
+};
+
 const getFileName$1 = text => {
+  // TODO make api stricter so that results always have the same shape
   if (text.startsWith('./')) {
     return text.slice(2);
   }
   return text;
 };
-const getFileIcons = async matches => {
-  const requests = [];
-  for (const item of matches) {
-    if (item.type === File) {
-      const fileName = getFileName$1(item.text);
-      requests.push({
-        type: File$1,
-        name: fileName,
-        path: `/${fileName}`
-      });
+
+const getFileName = text => {
+  if (text.startsWith('./')) {
+    return text.slice(2);
+  }
+  return text;
+};
+const getMissingDirents = (items, fileIconCache) => {
+  const missingDirents = [];
+  for (const item of items) {
+    const uri = getFileName(item.text);
+    if (!(uri in fileIconCache)) {
+      missingDirents.push(item);
     }
   }
-  const icons = await getIcons(requests);
-  // TODO cache file icons
+  return missingDirents;
+};
+const toIconRequest = item => {
+  return {
+    type: File$1,
+    name: getFileName(item.text),
+    path: getFileName(item.text)
+  };
+};
+const getMissingIconRequests = (dirents, fileIconCache) => {
+  const missingRequests = getMissingDirents(dirents, fileIconCache);
+  const iconRequests = missingRequests.map(toIconRequest);
+  return iconRequests;
+};
+
+const Directory = 3;
+const DirectoryExpanded = 4;
+
+const getSimpleIconRequestType = direntType => {
+  if (direntType === Directory || direntType === DirectoryExpanded) {
+    return 2;
+  }
+  return 1;
+};
+
+const toSimpleIconRequest = request => {
+  return {
+    name: request.name,
+    type: getSimpleIconRequestType(request.type)
+  };
+};
+
+const requestFileIcons = async requests => {
+  if (requests.length === 0) {
+    return [];
+  }
+  const simpleRequests = requests.map(toSimpleIconRequest);
+  const icons = await getIcons$1(simpleRequests);
   return icons;
 };
 
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getFileIcons = async (items, fileIconCache) => {
+  const missingRequests = getMissingIconRequests(items, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const paths = items.map(item => getFileName$1(item.text));
+  const icons = getIconsCached(paths, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
 // TODO optimize this function to return the minimum number
 // of visible items needed, e.g. when not scrolled 5 items with
 // 20px fill 100px but when scrolled 6 items are needed
@@ -2988,7 +3070,8 @@ const handleUpdateFull = async (state, update) => {
     excludeValue,
     assetDir,
     platform,
-    limit
+    limit,
+    fileIconCache
   } = partialNewState;
   const root = state.workspacePath;
   const scheme = getProtocol(root);
@@ -3025,7 +3108,10 @@ const handleUpdateFull = async (state, update) => {
   const maxLineY = Math.min(numberOfVisible, total);
   const finalDeltaY = Math.max(contentHeight - listHeight, 0);
   const visible = results.slice(0, maxLineY);
-  const icons = await getFileIcons(visible);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, fileIconCache);
 
   // TODO add info message if limit was hit
 
@@ -3034,6 +3120,7 @@ const handleUpdateFull = async (state, update) => {
     ...partialNewState,
     deltaY: 0,
     fileCount,
+    fileIconCache: newFileIconCache,
     finalDeltaY,
     icons,
     items: results,
@@ -3286,14 +3373,6 @@ const getReplacedMessage = (fileCount, replaceCount, replacement) => {
   return replacedManyOccurrencesInManyFiles(replaceCount, fileCount, replacement);
 };
 
-const getFileName = text => {
-  // TODO make api stricter so that results always have the same shape
-  if (text.startsWith('./')) {
-    return text.slice(2);
-  }
-  return text;
-};
-
 const getReplaceElements = (items, workspacePath, replacement) => {
   let element = {
     uri: '',
@@ -3312,7 +3391,7 @@ const getReplaceElements = (items, workspacePath, replacement) => {
     } = match;
     if (type === File) {
       changes = [];
-      const fileName = getFileName(text);
+      const fileName = getFileName$1(text);
       const absolutePath = `${workspacePath}/${fileName}`;
       element = {
         uri: absolutePath,
@@ -3383,8 +3462,31 @@ const togglePreserveCase = state => {
   return toggleSearchFlag(state, PreserveCase$2);
 };
 
-const toggleReplace = state => {
-  return toggleSearchFlag(state, ReplaceExpanded);
+const collapseReplace = state => {
+  const {
+    flags
+  } = state;
+  return {
+    ...state,
+    flags: flags & -5
+  };
+};
+
+const expandReplace = state => {
+  const {
+    flags
+  } = state;
+  return {
+    ...state,
+    flags: flags | ReplaceExpanded
+  };
+};
+
+const toggleReplace = async state => {
+  if (hasReplaceExpanded(state.flags)) {
+    return collapseReplace(state);
+  }
+  return expandReplace(state);
 };
 
 const toggleUseIgnoreFiles = state => {
@@ -3455,10 +3557,14 @@ const handleIconThemeChange = async state => {
     maxLineY
   } = state;
   const visibleItems = items.slice(minLineY, maxLineY);
-  const icons = await getFileIcons(visibleItems);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visibleItems, {});
   return {
     ...state,
-    icons
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -3575,6 +3681,23 @@ const handleSharedInput = (state, name, value, inputSource = Script) => {
   return fn(state, value, inputSource);
 };
 
+const send = async port => {
+  await sendMessagePortToIconThemeWorker(port, 0);
+};
+const launchIconThemeWorker = async () => {
+  // TODO connect to icon theme worker
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    send
+  });
+  return rpc;
+};
+
+const initializeIconThemeWorker = async () => {
+  const rpc = await launchIconThemeWorker();
+  set$3(rpc);
+};
+
 const launchSearchProcessElectron = async () => {
   const rpc = await TransferMessagePortRpcParent.create({
     commandMap: {},
@@ -3601,8 +3724,7 @@ const setSearchProcessFactory = platform => {
 };
 const initialize = async platform => {
   setSearchProcessFactory(platform);
-
-  // TODO connect to icon theme worker
+  await initializeIconThemeWorker();
 };
 
 // TODO optimize this function to return the minimum number
@@ -3955,12 +4077,16 @@ const selectIndexFile = async (state, searchResult, index) => {
     items,
     itemHeight,
     headerHeight,
-    height
+    height,
+    fileIconCache
   } = state;
   const path = searchResult.text;
   const newCollapsedPaths = toggleCollapsedPath(collapsedPaths, path);
   const filteredResults = getFilteredResults(items, newCollapsedPaths);
-  const icons = await getFileIcons(filteredResults);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(filteredResults, fileIconCache);
   const total = filteredResults.length;
   const listHeight = height - headerHeight;
   const numberOfVisible = getNumberOfVisibleItems$1(listHeight, itemHeight);
@@ -3968,13 +4094,14 @@ const selectIndexFile = async (state, searchResult, index) => {
   return {
     ...state,
     collapsedPaths: newCollapsedPaths,
-    listFocusedIndex: index,
+    fileIconCache: newFileIconCache,
+    focus: FocusSearchResults,
+    focusSource: Script,
+    icons,
     listFocused: true,
+    listFocusedIndex: index,
     listItems: filteredResults,
-    maxLineY,
-    icons,
-    focus: FocusSearchResults,
-    focusSource: Script
+    maxLineY
   };
 };
 
@@ -4417,7 +4544,7 @@ const createViewModel = state => {
 };
 
 const HandleClick = 1;
-const HandleContextMenu = 2;
+const HandleListContextMenu = 2;
 const HandleHeaderContextMenu = 3;
 const HandleExcludeInput = 4;
 const HandleButtonClick = 5;
@@ -4613,7 +4740,7 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
     onInput,
     onFocus: HandleInputFocus,
     onBlur: HandleInputBlur,
-    onContextMenu: HandleContextMenu,
+    onContextMenu: HandleListContextMenu,
     childCount: 0
   }, {
     type: Div,
@@ -5010,7 +5137,7 @@ const getTreeItemsVirtualDom = (visibleItems, deltaY, itemHeight) => {
     onClick: HandleClick,
     onBlur: HandleListBlur,
     onWheel: HandleWheel,
-    onContextMenu: HandleContextMenu,
+    onContextMenu: HandleListContextMenu,
     id: TreeItems,
     top: `${-pixelOffset}px` // TODO use dynamic css instead
   }, ...visibleItems.flatMap(getSearchResultVirtualDom)];
@@ -5024,9 +5151,10 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
     role: Tree$1,
     tabIndex: 0,
     childCount,
-    onBlur: HandleListBlur,
-    onPointerDown: HandleListPointerDown,
-    onFocus: HandleListFocus
+    onBlur: HandleListBlur
+    // TODO renable this when dom diffing is supported
+    // onPointerDown: HandleListPointerDown,
+    // onFocus: HandleListFocus,
   }, ...getTreeItemsVirtualDom(visibleItems, deltaY, itemHeight), ...getScrollBarVirtualDom(scrollbarHeight, scrollBarY, scrollBarValue)];
 };
 
@@ -5214,7 +5342,7 @@ const renderEventListeners = () => {
     name: HandleListBlur,
     params: ['handleListBlur']
   }, {
-    name: HandleContextMenu,
+    name: HandleListContextMenu,
     params: ['handleContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }, {

package/static/index.html

@@ -6,9 +6,9 @@
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <meta name="theme-color" content="#282e2f" />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/26ac40c/css/App.css" />
-    <link rel="manifest" href="/26ac40c/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/26ac40c/icons/pwa-icon-192.png" />
-    <script type="module" src="/26ac40c/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/25fb5b2/css/App.css" />
+    <link rel="manifest" href="/25fb5b2/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/25fb5b2/icons/pwa-icon-192.png" />
+    <script type="module" src="/25fb5b2/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>