@lvce-editor/static-server 0.85.1 → 0.85.3

package/static/{6f0f9b3 → bbc1fd1}/packages/status-bar-worker/dist/statusBarWorkerMain.js

@@ -240,6 +240,49 @@ class VError extends Error {
   }
 }
 
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
+  }
+}
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown;
+  }
+};
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -1260,17 +1303,20 @@ const create = rpcId => {
   };
 };
 
-const Button$1 = 'button';
+const Button$2 = 'button';
 const Status = 'status';
 
 const MaskIcon = 'MaskIcon';
 
-const Button = 1;
+const Button$1 = 1;
 const Div = 4;
 const Span = 8;
 const Text = 12;
 const Reference = 100;
 
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
 
 const ExtensionHostWorker = 44;
@@ -1295,6 +1341,13 @@ const {
   invokeAndTransfer,
   set
 } = create(RendererWorker);
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
@@ -1353,7 +1406,16 @@ const handleClick = async (state, name) => {
   return state;
 };
 
-const handleContextMenu = async state => {
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const StatusBar = 31;
+
+const handleContextMenu = async (state, button, x, y) => {
+  await show2(state.uid, StatusBar, x, y, {
+    menuId: StatusBar
+  });
   return state;
 };
 
@@ -2027,10 +2089,10 @@ const getStatusBarItemVirtualDom = statusBarItem => {
     childCount: elements.length,
     className: StatusBarItem,
     name,
-    role: Button$1,
+    role: Button$2,
     tabIndex: -1,
     title: tooltip,
-    type: Button
+    type: Button$1
   };
   return [buttonNode, ...elementNodes];
 };
@@ -2133,7 +2195,7 @@ const render2 = (uid, diffResult) => {
 const renderEventListeners = () => {
   return [{
     name: HandleContextMenu,
-    params: ['handleContextMenu'],
+    params: ['handleContextMenu', Button, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleClick,

package/static/{6f0f9b3 → bbc1fd1}/packages/text-search-worker/dist/textSearchWorkerMain.js

@@ -6552,7 +6552,7 @@ const handleContextMenuMouseAt = async (state, eventX, eventY) => {
     focusedIndex: index,
     listFocusedIndex: index
   });
-  await show2(uid, Search$1, x, y, {
+  await show2(uid, Search$1, eventX, eventY, {
     index,
     menuId: Search$1
   });

package/static/{6f0f9b3 → bbc1fd1}/packages/title-bar-worker/dist/titleBarWorkerMain.js

@@ -1391,13 +1391,13 @@ const create$1 = () => {
     },
     diff(uid, modules, numbers) {
       const {
-        newState,
-        oldState
+        oldState,
+        scheduledState
       } = states[uid];
       const diffResult = [];
       for (let i = 0; i < modules.length; i++) {
         const fn = modules[i];
-        if (!fn(oldState, newState)) {
+        if (!fn(oldState, scheduledState)) {
           diffResult.push(numbers[i]);
         }
       }
@@ -1415,17 +1415,16 @@ const create$1 = () => {
       return ids;
     },
     getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseFloat(key);
-      });
+      return Object.keys(states).map(Number);
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
     },
-    set(uid, oldState, newState) {
+    set(uid, oldState, newState, scheduledState) {
       states[uid] = {
         newState,
-        oldState
+        oldState,
+        scheduledState: scheduledState ?? newState
       };
     },
     wrapCommand(fn) {
@@ -1445,7 +1444,8 @@ const create$1 = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
       };
       return wrapped;
@@ -1482,7 +1482,8 @@ const create$1 = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
         return {
           error
@@ -1502,6 +1503,7 @@ const Remote = 3;
 
 const DEFAULT_UID = 1;
 const DEFAULT_APP_NAME = 'Lvce Editor';
+const DEFAULT_MAIN_AREA_UID$1 = 2;
 const createDefaultState = (uid = DEFAULT_UID) => ({
   appName: DEFAULT_APP_NAME,
   assetDir: '',
@@ -1520,6 +1522,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   labelLetterSpacing: 0,
   labelPadding: 8,
   layoutControlsEnabled: false,
+  mainAreaUid: DEFAULT_MAIN_AREA_UID$1,
   menus: [],
   platform: Electron,
   title: '',
@@ -1858,6 +1861,14 @@ const getMenuIds = () => {
   return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$3, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
 };
 
+const hasActiveTextEditor = async mainAreaUid => {
+  try {
+    return await invoke('Main.hasActiveTextEditor', mainAreaUid);
+  } catch {
+    return false;
+  }
+};
+
 const getMenuEntries$e = () => {
   return [];
 };
@@ -1980,6 +1991,7 @@ const getMenuEntries$c = () => {
  * @enum {string}
  */
 const UiStrings = {
+  AutoSave: 'Auto Save',
   Exit: 'Exit',
   NewFile: 'New File',
   NewWindow: 'New Window',
@@ -1988,6 +2000,9 @@ const UiStrings = {
   OpenRecent: 'Open Recent',
   Save: 'Save',
   SaveAll: 'Save All'};
+const autoSave = () => {
+  return i18nString(UiStrings.AutoSave);
+};
 const newFile = () => {
   return i18nString(UiStrings.NewFile);
 };
@@ -2024,7 +2039,25 @@ const Terminal = 14;
 const TitleBar$1 = 15;
 const View = 16;
 
-const getMenuEntries$b = platform => {
+const getAutoSave = async () => {
+  try {
+    return await invoke('Preferences.get', 'files.autoSave');
+  } catch {
+    return 'off';
+  }
+};
+const isAutoSaveEnabled = autoSave => {
+  return autoSave !== 'off';
+};
+const getSaveFlags = hasActiveTextEditor => {
+  if (hasActiveTextEditor) {
+    return None;
+  }
+  return Disabled;
+};
+const getMenuEntries$b = async (platform, autoSave$1, hasActiveTextEditor = false) => {
+  const autoSaveValue = autoSave$1 ?? (await getAutoSave());
+  const saveFlags = getSaveFlags(hasActiveTextEditor);
   const entries = [{
     command: 'Main.newFile',
     flags: None,
@@ -2052,14 +2085,19 @@ const getMenuEntries$b = platform => {
     label: openRecent()
   }, menuEntrySeparator, {
     command: 'Main.save',
-    flags: None,
+    flags: saveFlags,
     id: 'save',
     label: save()
   }, {
     command: 'Main.saveAll',
-    flags: None,
+    flags: saveFlags,
     id: 'saveAll',
     label: saveAll()
+  }, menuEntrySeparator, {
+    command: 'Preferences.toggleAutoSave',
+    flags: isAutoSaveEnabled(autoSaveValue) ? Checked : Unchecked,
+    id: 'autoSave',
+    label: autoSave()
   }];
   if (platform === Electron) {
     entries.push(menuEntrySeparator, {
@@ -2113,20 +2151,37 @@ const getMenuEntries$9 = async platform => {
   return entries;
 };
 
-const getRecentlyOpened = () => {
-  return invoke(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
-};
-
-const File = 'file://';
-
-const getTitle$1 = (homeDir, uri) => {
-  if (!uri) {
+const DriveLetterProtocolRegex = /^[a-zA-Z]:$/;
+const normalizeUri = value => {
+  try {
+    const url = new URL(value);
+    if (DriveLetterProtocolRegex.test(url.protocol)) {
+      return '';
+    }
+    return url.href;
+  } catch {
     return '';
   }
-  if (uri.startsWith(File)) {
-    return uri.slice(File.length);
+};
+const getRecentlyOpened = async () => {
+  const recentlyOpened = await invoke(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+  if (!Array.isArray(recentlyOpened)) {
+    return [];
   }
-  return uri;
+  const seen = new Set();
+  const uniqueUris = [];
+  for (const item of recentlyOpened) {
+    if (typeof item !== 'string') {
+      continue;
+    }
+    const uri = normalizeUri(item);
+    if (!uri || seen.has(uri)) {
+      continue;
+    }
+    seen.add(uri);
+    uniqueUris.push(uri);
+  }
+  return uniqueUris;
 };
 
 const moreDot = () => {
@@ -2136,13 +2191,43 @@ const clearRecentlyOpened = () => {
   return i18nString(ClearRecentlyOpened);
 };
 
-const getHomeDir = () => {
-  return '';
+const File = 'file://';
+
+const HomeDirRegex = /^\/(?:home|Users)\/[^/]+/;
+const startsWithHomeDir = (homeDir, path) => {
+  return path === homeDir || path.startsWith(`${homeDir}/`);
+};
+const getPath = uri => {
+  if (uri.startsWith(File)) {
+    return uri.slice(File.length);
+  }
+  return uri;
+};
+const getHomeDir = uri => {
+  const path = getPath(uri);
+  const match = HomeDirRegex.exec(path);
+  return match?.[0] || '';
+};
+const getTitle$1 = (homeDir, uri) => {
+  if (!uri) {
+    return '';
+  }
+  const path = getPath(uri);
+  if (path !== uri) {
+    if (homeDir && startsWithHomeDir(homeDir, path)) {
+      return `~${path.slice(homeDir.length)}`;
+    }
+    return path;
+  }
+  // TODO tree shake this out in web
+  if (homeDir && startsWithHomeDir(homeDir, uri)) {
+    return `~${uri.slice(homeDir.length)}`;
+  }
+  return uri;
 };
 
-const MAX_MENU_RECENT_ENTRIES = 10;
 const toMenuItem = folder => {
-  const homeDir = getHomeDir();
+  const homeDir = getHomeDir(folder);
   const label = getTitle$1(homeDir, folder);
   return {
     args: [folder],
@@ -2151,6 +2236,8 @@ const toMenuItem = folder => {
     label
   };
 };
+
+const MAX_MENU_RECENT_ENTRIES = 10;
 const getMenuEntries$8 = async () => {
   const allItems = await getRecentlyOpened();
   const itemsToShow = allItems.slice(0, MAX_MENU_RECENT_ENTRIES);
@@ -2429,12 +2516,13 @@ const getMenuEntries$1 = () => {
   }];
 };
 
+const DEFAULT_MAIN_AREA_UID = 2;
 const getMenuEntries2 = async (state, props) => {
   switch (props.menuId) {
     case Edit$2:
       return getMenuEntries$d();
     case File$3:
-      return getMenuEntries$b(props.platform);
+      return getMenuEntries$b(props.platform, undefined, await hasActiveTextEditor(state.mainAreaUid ?? DEFAULT_MAIN_AREA_UID));
     case Go$2:
       return getMenuEntries$a();
     case Help$3:
@@ -2860,14 +2948,7 @@ const CONTEXT_MENU_PADDING = 8;
 const getMenuHeight = items => {
   let height = CONTEXT_MENU_PADDING;
   for (const item of items) {
-    switch (item.flags) {
-      case Separator$1:
-        height += CONTEXT_MENU_SEPARATOR_HEIGHT;
-        break;
-      default:
-        height += CONTEXT_MENU_ITEM_HEIGHT;
-        break;
-    }
+    height += item.flags === Separator$1 ? CONTEXT_MENU_SEPARATOR_HEIGHT : CONTEXT_MENU_ITEM_HEIGHT;
   }
   return height;
 };
@@ -2912,7 +2993,7 @@ const getIndexToFocusPreviousStartingAt = (items, startIndex) => {
   return -1;
 };
 const getIndexToFocusPrevious = menu => {
-  const startIndex = menu.focusedIndex === -1 ? menu.items.length - 1 : menu.focusedIndex - 1;
+  const startIndex = (menu.focusedIndex === -1 ? menu.items.length : menu.focusedIndex) - 1;
   return getIndexToFocusPreviousStartingAt(menu.items, startIndex);
 };
 const canBeFocused = item => {
@@ -3089,7 +3170,7 @@ const handleTitleBarContextMenu = async state => {
  * @returns The parsed title string
  */
 const parseTitleTemplate = (template, folderName, appName) => {
-  return template.replaceAll('${folderName}', folderName).replaceAll('${appName}', appName);
+  return template.replaceAll('${folderName}', () => folderName).replaceAll('${appName}', () => appName);
 };
 
 const getTitle = (workspaceUri, titleTemplate, appName) => {
@@ -3234,7 +3315,7 @@ const loadContent2 = async state => {
 
   // TODO load preferences here
 
-  if (titleBarStyleCustom === false && platform === Electron$1) {
+  if (!titleBarStyleCustom && platform === Electron$1) {
     return hydrate(state);
   }
   return {
@@ -3894,7 +3975,7 @@ const next = (items, index) => {
   return (index + 1) % items.length;
 };
 const previous = (items, index) => {
-  return index === 0 ? items.length - 1 : index - 1;
+  return (index === 0 ? items.length : index) - 1;
 };
 
 const focusFirst = state => {

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="/6f0f9b3/css/App.css" />
-    <link rel="manifest" href="/6f0f9b3/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/6f0f9b3/icons/pwa-icon-192.png" />
-    <script type="module" src="/6f0f9b3/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/bbc1fd1/css/App.css" />
+    <link rel="manifest" href="/bbc1fd1/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/bbc1fd1/icons/pwa-icon-192.png" />
+    <script type="module" src="/bbc1fd1/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>

package/static/6f0f9b3/css/parts/Category.css

@@ -1,18 +0,0 @@
-:root {
-  --CategoryHoverBackground: #2f6260;
-  --CategoryHoverForeground: white;
-  --CategoryBorderColor: rgba(136, 136, 136, 0.45);
-}
-
-.Category {
-  background: transparent;
-  border: none;
-  color: inherit;
-  border: 1px solid var(--CategoryBorderColor);
-  cursor: pointer;
-}
-
-.Category:hover {
-  background: var(--CategoryHoverBackground);
-  color: var(--CategoryHoverForeground);
-}

package/static/6f0f9b3/css/parts/ScrollToTop.css

@@ -1,31 +0,0 @@
-:root {
-  --ScrollToTopBackground: #3a3d41;
-  --ScrollToTopHoverBackground: #45494e;
-  --ScrollToTopShadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
-  --ScrollToTopHoverShadow: 2px 2px 2px rgba(0, 0, 0, 0.25);
-  --ScrollToTopForeground: white;
-}
-
-.ScrollToTopButton {
-  position: absolute;
-  align-items: center;
-  background: var(--ScrollToTopBackground);
-  border-radius: 50%;
-  border: none;
-  bottom: 0;
-  box-shadow: var(--ScrollToTopShadow);
-  contain: strict;
-  cursor: pointer;
-  display: flex;
-  height: 32px;
-  justify-content: center;
-  right: 0;
-  width: 32px;
-  z-index: 1;
-  color: var(--ScrollToTopForeground);
-}
-
-.ScrollToTopButton:hover {
-  background: var(--ScrollToTopHoverBackground);
-  box-shadow: var(--ScrollToTopHoverShadow);
-}