@lvce-editor/title-bar-worker 4.2.0 → 4.3.0

package/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",