Fix issue #31 (allow capitalization changes in space names). Add unit test coverage.

Author: codedread

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.8] - 2025-11-30
+
+### Changes
+
+- Fixed [issue #31](https://github.com/codedread/spaces/issues/31): Allow changing the capitalization of space names.
+- Increased unit test coverage from 16.17% to 22.69%.
+- 
 ## [1.1.7] - 2025-10-01
 
 ### Changes

js/background/background.js

@@ -10,6 +10,7 @@
 import { dbService } from './dbService.js';
 import { spacesService } from './spacesService.js';
 import * as common from '../common.js';
+/** @typedef {common.SessionPresence} SessionPresence */
 /** @typedef {common.Space} Space */
 /** @typedef {import('./dbService.js').WindowBounds} WindowBounds */
 
@@ -41,17 +42,17 @@ async function rediscoverWindowByUrl(storageKey, htmlFilename) {
 
     // If not in storage or window doesn't exist, search for window by URL
     const targetUrl = chrome.runtime.getURL(htmlFilename);
-    const allWindows = await chrome.windows.getAll({populate: true});
-    
+    const allWindows = await chrome.windows.getAll({ populate: true });
+
     for (const window of allWindows) {
         for (const tab of window.tabs) {
             if (tab.url && tab.url.startsWith(targetUrl)) {
-                await chrome.storage.local.set({[storageKey]: window.id});
+                await chrome.storage.local.set({ [storageKey]: window.id });
                 return window.id;
             }
         }
     }
-    
+
     return false;
 }
 
@@ -166,19 +167,19 @@ export function initializeServiceWorker() {
                 await closePopupWindow();
             }
         }
-        
+
         spacesService.handleWindowFocussed(windowId);
     });
 
     // Listen for window bounds changes (resize/move) with debouncing
     chrome.windows.onBoundsChanged.addListener(async (window) => {
         if (checkInternalSpacesWindows(window.id, false)) return;
-        
+
         // Capture bounds - await ensures proper event ordering and timer management
         await spacesService.captureWindowBounds(window.id, {
             left: window.left,
             top: window.top,
-            width: window.width, 
+            width: window.width,
             height: window.height
         });
     });
@@ -196,7 +197,7 @@ export function initializeServiceWorker() {
             try {
                 // Ensure spacesService is initialized before processing any message
                 await spacesService.ensureInitialized();
-                
+
                 const response = await processMessage(request, sender);
                 if (response !== undefined) {
                     sendResponse(response);
@@ -206,7 +207,7 @@ export function initializeServiceWorker() {
                 sendResponse(false);
             }
         })();
-        
+
         // We must return true synchronously to keep the message port open
         // for our async sendResponse() calls
         return true;
@@ -361,7 +362,7 @@ async function processMessage(request, sender) {
             if (!windowId) {
                 return false;
             }
-            
+
             try {
                 const window = await chrome.windows.get(windowId);
                 // Capture bounds before programmatically closing the window
@@ -755,7 +756,11 @@ function checkInternalSpacesWindows(windowId, windowClosed) {
  */
 async function requestSessionPresence(sessionName) {
     const session = await dbService.fetchSessionByName(sessionName);
-    return { exists: !!session, isOpen: !!session && !!session.windowId };
+    return {
+        exists: !!session,
+        isOpen: !!session && !!session.windowId,
+        sessionName: session?.name || false,
+    };
 }
 
 /**
@@ -798,7 +803,7 @@ async function requestSpaceFromWindowId(windowId) {
         };
         return space;
 
-    // otherwise build a space object out of the actual window
+        // otherwise build a space object out of the actual window
     } else {
         try {
             const window = await chrome.windows.get(windowId, { populate: true });
@@ -827,11 +832,11 @@ async function requestSpaceFromWindowId(windowId) {
  */
 async function requestSpaceFromSessionId(sessionId) {
     const session = await dbService.fetchSessionById(sessionId);
-    
+
     if (!session) {
         return null;
     }
-    
+
     return {
         sessionId: session.id,
         windowId: session.windowId,
@@ -893,12 +898,12 @@ async function handleLoadSession(sessionId, tabUrl) {
             await focusOrLoadTabInWindow(newWindow, tabUrl);
         }
 
-                /* session.tabs.forEach(function (curTab) {
-                chrome.tabs.create({windowId: newWindow.id, url: curTab.url, pinned: curTab.pinned, active: false});
-            });
+        /* session.tabs.forEach(function (curTab) {
+        chrome.tabs.create({windowId: newWindow.id, url: curTab.url, pinned: curTab.pinned, active: false});
+    });
 
-            const tabs = await chrome.tabs.query({windowId: newWindow.id, index: 0});
-            chrome.tabs.remove(tabs[0].id); */
+    const tabs = await chrome.tabs.query({windowId: newWindow.id, index: 0});
+    chrome.tabs.remove(tabs[0].id); */
     }
 }
 
@@ -945,11 +950,11 @@ async function handleSaveNewSession(windowId, sessionName, deleteOld) {
         sessionName,
         curWindow.tabs,
         curWindow.id,
-        { 
-            left: curWindow.left, 
-            top: curWindow.top, 
-            width: curWindow.width, 
-            height: curWindow.height 
+        {
+            left: curWindow.left,
+            top: curWindow.top,
+            width: curWindow.width,
+            height: curWindow.height
         },
     );
     return result ?? false;
@@ -977,7 +982,7 @@ async function handleRestoreFromBackup(space, deleteOld) {
             );
             return null;
         }
-        
+
         // if we choose to overwrite, delete the existing session
         await handleDeleteSession(existingSession.id);
     }
@@ -1024,24 +1029,22 @@ async function handleImportNewSession(urlList) {
 async function handleUpdateSessionName(sessionId, sessionName, deleteOld) {
     // check to make sure session name doesn't already exist
     const existingSession = await dbService.fetchSessionByName(sessionName);
-    // Fix: allow renaming when only capitalization is changed
-if (existingSession && existingSession.id === sessionId) {
-    return spacesService.updateSessionName(sessionId, sessionName) ?? false;
-}
 
-    // if session with same name already exist, then prompt to override the existing session
-    if (existingSession) {
+    // If a different session with same name already exists, then prompt to
+    // override the existing session.
+    // TESTME: Only delete if session ids differ.
+    if (existingSession && existingSession.id !== sessionId) {
         if (!deleteOld) {
             console.error(
                 `handleUpdateSessionName: Session with name "${sessionName}" already exists and deleteOld was not true.`
             );
             return false;
         }
-        
+
         // if we choose to override, then delete the existing session
         await handleDeleteSession(existingSession.id);
     }
-    
+
     return spacesService.updateSessionName(sessionId, sessionName) ?? false;
 }
 
@@ -1188,7 +1191,7 @@ async function handleMoveTabToSession(tabId, sessionId) {
     if (!session) {
         return false;
     }
-    
+
     // if session is currently open then move it directly
     if (session.windowId) {
         moveTabToWindow(tab, session.windowId);
@@ -1345,7 +1348,7 @@ async function getTargetDisplayWorkArea() {
         const activeDisplay = displays.find(display => {
             const d = display.workArea;
             return windowCenterX >= d.left && windowCenterX < (d.left + d.width) &&
-                   windowCenterY >= d.top && windowCenterY < (d.top + d.height);
+                windowCenterY >= d.top && windowCenterY < (d.top + d.height);
         });
         if (activeDisplay) {
             targetDisplay = activeDisplay;
@@ -1402,5 +1405,6 @@ export {
     getEffectiveTabUrl,
     getTargetDisplayWorkArea,
     handleLoadSession,
+    handleUpdateSessionName,
     requestAllSpaces,
 };

js/background/main.js

@@ -1,3 +1,4 @@
 import { initializeServiceWorker } from './background.js';
 
+console.log(`Spaces ${chrome.runtime.getManifest().version}`)
 initializeServiceWorker();

js/common.js

@@ -22,6 +22,7 @@
  * @typedef SessionPresence
  * @property {boolean} exists A session with this name exists in the database.
  * @property {boolean} isOpen The session is currently open in a window.
+ * @property {string|false} sessionName The name of the session, or false if not named.
  */
 
 /**

js/popup.js

@@ -25,6 +25,10 @@ let globalUrl;
 let globalWindowId;
 let globalSessionName;
 
+export function setGlobalCurrentSpace(space) {
+    globalCurrentSpace = space;
+}
+
 /** Initialize the popup window. */
 function initializePopup() {
     document.addEventListener('DOMContentLoaded', async () => {
@@ -77,8 +81,8 @@ function renderCommon() {
     document.getElementById(
         'activeSpaceTitle'
     ).value = globalCurrentSpace.name
-        ? globalCurrentSpace.name
-        : UNSAVED_SESSION;
+            ? globalCurrentSpace.name
+            : UNSAVED_SESSION;
 
     document.querySelector('body').onkeyup = e => {
         // listen for escape key
@@ -126,12 +130,12 @@ function handleCloseAction() {
 
 async function renderMainCard() {
     const hotkeys = await requestHotkeys();
-        document.querySelector(
-            '#switcherLink .hotkey'
-        ).innerHTML = hotkeys.switchCode ? hotkeys.switchCode : NO_HOTKEY;
-        document.querySelector(
-            '#moverLink .hotkey'
-        ).innerHTML = hotkeys.moveCode ? hotkeys.moveCode : NO_HOTKEY;
+    document.querySelector(
+        '#switcherLink .hotkey'
+    ).innerHTML = hotkeys.switchCode ? hotkeys.switchCode : NO_HOTKEY;
+    document.querySelector(
+        '#moverLink .hotkey'
+    ).innerHTML = hotkeys.moveCode ? hotkeys.moveCode : NO_HOTKEY;
 
     const hotkeyEls = document.querySelectorAll('.hotkey');
     for (let i = 0; i < hotkeyEls.length; i += 1) {
@@ -190,7 +194,8 @@ function handleNameEdit() {
     }
 }
 
-async function handleNameSave() {
+export async function handleNameSave() {
+    /** @type {HTMLInputElement} */
     const inputEl = document.getElementById('activeSpaceTitle');
     const newName = inputEl.value;
 
@@ -200,14 +205,19 @@ async function handleNameSave() {
         return;
     }
 
-    if (
-        newName === UNSAVED_SESSION ||
-        newName === globalCurrentSpace.name
-    ) {
+    // If the session is unnamed or the name has not changed, do nothing.
+    if (newName === UNSAVED_SESSION || newName === globalCurrentSpace.name) {
         return;
     }
 
-    const canOverwrite = await checkSessionOverwrite(newName);
+    // Spaces are looked up in the database by case-insensitive name. That means we do not allow
+    // two spaces to have case-insensitive identical names (e.g. "main" and "Main"). If the new
+    // name is a case-insensitive match of the previous name of the current session, we do not need
+    // to check for overwrite, we just let the capitalization change happen.
+    // TESTME: Save should occur when the name is a case-insensitive match of the previous name and
+    //     the requestSessionPresence message should not be sent.
+    const caseInsensitiveMatch = globalCurrentSpace.name.toLowerCase() === newName.toLowerCase();
+    const canOverwrite = caseInsensitiveMatch || await checkSessionOverwrite(newName);
     if (!canOverwrite) {
         inputEl.value = globalCurrentSpace.name || UNSAVED_SESSION;
         inputEl.blur();
@@ -246,7 +256,7 @@ async function renderSwitchCard() {
     document.getElementById(
         'popupContainer'
     ).innerHTML = document.getElementById('switcherTemplate').innerHTML;
-    
+
     const spaces = await chrome.runtime.sendMessage({ action: 'requestAllSpaces' });
     spacesRenderer.initialise(8, true);
     spacesRenderer.renderSpaces(spaces);
@@ -367,7 +377,7 @@ async function updateTabDetails() {
             action: 'requestTabDetail',
             tabId: globalTabId,
         });
-        
+
         if (tab) {
             nodes.activeTabTitle.innerHTML = escapeHtml(tab.title);
 
@@ -397,9 +407,9 @@ async function updateTabDetails() {
         const cleanUrl =
             globalUrl.indexOf('://') > 0
                 ? globalUrl.substr(
-                        globalUrl.indexOf('://') + 3,
-                        globalUrl.length
-                    )
+                    globalUrl.indexOf('://') + 3,
+                    globalUrl.length
+                )
                 : globalUrl;
         nodes.activeTabTitle.innerHTML = escapeHtml(cleanUrl);
         nodes.activeTabFavicon.setAttribute('src', '/img/new.png');