sqlite-hub 0.9.4 → 0.9.8

package/frontend/js/app.js

@@ -4,6 +4,11 @@ import { renderQueryHistoryDetail } from './components/queryHistoryDetail.js';
 import { renderQueryHistoryListItem } from './components/queryHistoryPanel.js';
 import { renderSidebar } from './components/sidebar.js';
 import { renderStatusBar } from './components/statusBar.js';
+import {
+    renderTableDesignerFeedback,
+    renderTableDesignerReferenceColumnOptions,
+} from './components/tableDesignerEditor.js';
+import { renderTableDesignerSqlPreview } from './components/tableDesignerSqlPreview.js';
 import {
     mountStructureGraph,
     teardownStructureGraph,
@@ -122,11 +127,15 @@ import { renderOverviewView } from './views/overview.js';
 import { renderSettingsView } from './views/settings.js';
 import { renderStructureView } from './views/structure.js';
 import { renderTableDesignerView } from './views/tableDesigner.js';
+import {
+    replaceChildrenFromRenderedMarkup,
+    replaceElementFromRenderedMarkup,
+} from './utils/dom.js';
 import { highlightSql } from './utils/format.js';
 
 const appRoot = document.querySelector('#app');
 
-appRoot.innerHTML = renderAppShell();
+replaceChildrenFromRenderedMarkup(appRoot, renderAppShell());
 
 const shellRefs = {
     shell: document.querySelector('.app-shell'),
@@ -186,7 +195,7 @@ function syncQueryEditorHighlight(textarea) {
         return;
     }
 
-    highlightNode.innerHTML = renderQueryHighlightMarkup(textarea.value);
+    replaceChildrenFromRenderedMarkup(highlightNode, renderQueryHighlightMarkup(textarea.value));
 }
 
 function syncQueryEditorScroll(textarea) {
@@ -258,12 +267,20 @@ function syncMediaTaggingCurrentMediaUi(button, detailsVisible) {
     const nextVisible = Boolean(detailsVisible);
     const expandedLabel = button.dataset.expandedLabel || 'Shrink Media Viewer';
     const collapsedLabel = button.dataset.collapsedLabel || 'Show Media Viewer';
-    const expandedMarkup = `<span class="material-symbols-outlined">visibility_off</span> ${expandedLabel}`;
-
     preview.classList.toggle('media-tagging-preview--meta-hidden', !nextVisible);
     button.dataset.nextValue = nextVisible ? 'false' : 'true';
     button.setAttribute('aria-expanded', nextVisible ? 'true' : 'false');
-    button.innerHTML = nextVisible ? expandedMarkup : collapsedLabel;
+
+    if (nextVisible) {
+        const icon = document.createElement('span');
+
+        icon.className = 'material-symbols-outlined';
+        icon.textContent = 'visibility_off';
+        button.replaceChildren(icon, document.createTextNode(` ${expandedLabel}`));
+    } else {
+        button.textContent = collapsedLabel;
+    }
+
     return true;
 }
 
@@ -332,6 +349,84 @@ function syncMediaTaggingTagSearchUi(input) {
     return true;
 }
 
+function syncTableDesignerReferenceColumnOptions(sourceNode, state) {
+    if (
+        !(sourceNode instanceof HTMLSelectElement) ||
+        sourceNode.dataset.bind !== 'table-designer-column-field' ||
+        sourceNode.dataset.field !== 'referencesTable'
+    ) {
+        return true;
+    }
+
+    const rowNode = sourceNode.closest('.table-designer-grid__row');
+    const referenceColumnSelect = rowNode?.querySelector(
+        '[data-bind="table-designer-column-field"][data-field="referencesColumn"]',
+    );
+    const column = state.tableDesigner.draft?.columns.find(item => item.id === sourceNode.dataset.columnId);
+
+    if (!(referenceColumnSelect instanceof HTMLSelectElement) || !column) {
+        return false;
+    }
+
+    replaceChildrenFromRenderedMarkup(
+        referenceColumnSelect,
+        renderTableDesignerReferenceColumnOptions(
+            state.tableDesigner.draft,
+            state.tableDesigner.tables ?? [],
+            column.referencesTable,
+            column.referencesColumn,
+        ),
+    );
+    referenceColumnSelect.value = column.referencesColumn ?? '';
+    return true;
+}
+
+function syncTableDesignerDraftUi(sourceNode) {
+    const state = getState();
+    const draft = state.tableDesigner.draft;
+
+    if (state.route.name !== 'tableDesigner' || !draft) {
+        return false;
+    }
+
+    let synced = syncTableDesignerReferenceColumnOptions(sourceNode, state);
+
+    const saveButton = shellRefs.view.querySelector('[data-table-designer-save-button]');
+    if (saveButton instanceof HTMLButtonElement) {
+        saveButton.disabled = !draft.canSave;
+    } else {
+        synced = false;
+    }
+
+    const feedbackNode = shellRefs.view.querySelector('[data-table-designer-feedback]');
+    if (feedbackNode instanceof HTMLElement) {
+        replaceChildrenFromRenderedMarkup(
+            feedbackNode,
+            renderTableDesignerFeedback(draft, state.tableDesigner.saveError),
+        );
+    } else {
+        synced = false;
+    }
+
+    const previewNode = shellRefs.view.querySelector('.table-designer-workspace__bottom');
+    if (previewNode instanceof HTMLElement) {
+        previewNode.classList.toggle('is-collapsed', !state.tableDesigner.sqlPreviewVisible);
+        replaceChildrenFromRenderedMarkup(
+            previewNode,
+            renderTableDesignerSqlPreview(draft, state.tableDesigner.sqlPreviewVisible),
+        );
+    } else {
+        synced = false;
+    }
+
+    if (synced) {
+        lastRenderedMainMarkup = renderTableDesignerView(state).main;
+        lastRenderedPanelMarkup = '';
+    }
+
+    return synced;
+}
+
 function syncDataRowSelectionUi(selectedRowIndex = null) {
     if (getState().route.name !== 'data') {
         return false;
@@ -350,7 +445,7 @@ function syncDataRowSelectionUi(selectedRowIndex = null) {
     const panelMarkup = renderDataRowEditorPanel(getState());
     const panelOpen = Boolean(panelMarkup);
 
-    shellRefs.panel.innerHTML = panelMarkup;
+    replaceChildrenFromRenderedMarkup(shellRefs.panel, panelMarkup);
     shellRefs.shell.classList.toggle('panel-open', panelOpen);
     lastRenderedPanelMarkup = panelMarkup;
     lastRenderedPanelOpen = panelOpen;
@@ -375,10 +470,13 @@ function syncQueryHistoryUi(historyId) {
     )?.closest('.query-history-item');
 
     if (historyItem && listItemNode instanceof HTMLElement) {
-        listItemNode.outerHTML = renderQueryHistoryListItem(
-            historyItem,
-            state.editor.historyActiveId,
-            state.editor.historySelectedId,
+        replaceElementFromRenderedMarkup(
+            listItemNode,
+            renderQueryHistoryListItem(
+                historyItem,
+                state.editor.historyActiveId,
+                state.editor.historySelectedId,
+            ),
         );
     }
 
@@ -391,7 +489,7 @@ function syncQueryHistoryUi(historyId) {
         });
         const panelOpen = Boolean(panelMarkup);
 
-        shellRefs.panel.innerHTML = panelMarkup;
+        replaceChildrenFromRenderedMarkup(shellRefs.panel, panelMarkup);
         shellRefs.shell.classList.toggle('panel-open', panelOpen);
         lastRenderedPanelMarkup = panelMarkup;
         lastRenderedPanelOpen = panelOpen;
@@ -414,7 +512,7 @@ function syncQueryHistorySelectionUi(selectedHistoryId = null) {
     }
 
     if (selectedHistoryId === null) {
-        shellRefs.panel.innerHTML = '';
+        shellRefs.panel.replaceChildren();
         shellRefs.shell.classList.remove('panel-open');
         lastRenderedPanelMarkup = '';
         lastRenderedPanelOpen = false;
@@ -600,7 +698,7 @@ function patchChartsDetailUi(state) {
         return false;
     }
 
-    detailNode.innerHTML = renderChartsDetail(state);
+    replaceChildrenFromRenderedMarkup(detailNode, renderChartsDetail(state));
     syncChartsHistorySelectionUi(state);
     return true;
 }
@@ -976,7 +1074,7 @@ function renderApp(state) {
         !lockedRouteChanged;
 
     if (shellMarkupUnchanged && toastMarkup !== lastRenderedToastMarkup) {
-        shellRefs.toast.innerHTML = toastMarkup;
+        replaceChildrenFromRenderedMarkup(shellRefs.toast, toastMarkup);
         lastRenderedToastMarkup = toastMarkup;
         return;
     }
@@ -1013,7 +1111,7 @@ function renderApp(state) {
     }
 
     if (topNavChanged) {
-        shellRefs.topNav.innerHTML = topNavMarkup;
+        replaceChildrenFromRenderedMarkup(shellRefs.topNav, topNavMarkup);
     }
 
     if (sidebarChanged) {
@@ -1023,16 +1121,16 @@ function renderApp(state) {
             syncSidebarActiveRoute(state.route.name);
 
         if (!sidebarSynced) {
-            shellRefs.sidebar.innerHTML = sidebarMarkup;
+            replaceChildrenFromRenderedMarkup(shellRefs.sidebar, sidebarMarkup);
         }
     }
 
     if (statusBarChanged) {
-        shellRefs.statusBar.innerHTML = statusBarMarkup;
+        replaceChildrenFromRenderedMarkup(shellRefs.statusBar, statusBarMarkup);
     }
 
     if (mainChanged && !mainPatched) {
-        shellRefs.view.innerHTML = main;
+        replaceChildrenFromRenderedMarkup(shellRefs.view, main);
     }
 
     if (mainChanged || lockedRouteChanged) {
@@ -1040,15 +1138,15 @@ function renderApp(state) {
     }
 
     if (panelChanged) {
-        shellRefs.panel.innerHTML = panel;
+        replaceChildrenFromRenderedMarkup(shellRefs.panel, panel);
     }
 
     if (modalChanged) {
-        shellRefs.modal.innerHTML = modalMarkup;
+        replaceChildrenFromRenderedMarkup(shellRefs.modal, modalMarkup);
     }
 
     if (toastMarkup !== lastRenderedToastMarkup) {
-        shellRefs.toast.innerHTML = toastMarkup;
+        replaceChildrenFromRenderedMarkup(shellRefs.toast, toastMarkup);
     }
 
     if (panelChanged || panelOpenChanged) {
@@ -1640,7 +1738,10 @@ document.addEventListener('input', event => {
     }
 
     if (bindNode.dataset.bind === 'table-designer-field') {
-        if (bindNode instanceof HTMLInputElement && bindNode.type === 'checkbox') {
+        if (
+            (bindNode instanceof HTMLInputElement && bindNode.type === 'checkbox') ||
+            bindNode instanceof HTMLSelectElement
+        ) {
             return;
         }
 
@@ -1649,6 +1750,10 @@ document.addEventListener('input', event => {
     }
 
     if (bindNode.dataset.bind === 'table-designer-column-field') {
+        if (bindNode instanceof HTMLSelectElement) {
+            return;
+        }
+
         updateCurrentTableDesignerColumnField(bindNode.dataset.columnId, bindNode.dataset.field, bindNode.value);
         return;
     }
@@ -1753,11 +1858,33 @@ document.addEventListener('change', event => {
             return;
         }
 
+        if (bindNode instanceof HTMLSelectElement) {
+            updateCurrentTableDesignerField(bindNode.dataset.field, bindNode.value, { notify: false });
+
+            if (!syncTableDesignerDraftUi(bindNode)) {
+                renderApp(getState());
+            }
+
+            return;
+        }
+
         updateCurrentTableDesignerField(bindNode.dataset.field, bindNode.value);
         return;
     }
 
     if (bindNode.dataset.bind === 'table-designer-column-field') {
+        if (bindNode instanceof HTMLSelectElement) {
+            updateCurrentTableDesignerColumnField(bindNode.dataset.columnId, bindNode.dataset.field, bindNode.value, {
+                notify: false,
+            });
+
+            if (!syncTableDesignerDraftUi(bindNode)) {
+                renderApp(getState());
+            }
+
+            return;
+        }
+
         updateCurrentTableDesignerColumnField(bindNode.dataset.columnId, bindNode.dataset.field, bindNode.value);
         return;
     }

package/frontend/js/components/structureGraph.js

@@ -1,4 +1,5 @@
 import { showToast } from '../store.js';
+import { replaceChildrenFromRenderedMarkup } from '../utils/dom.js';
 import { escapeHtml, formatNumber } from '../utils/format.js';
 
 let cytoscapeFactory = null;
@@ -530,12 +531,12 @@ function updateInspectorToggleButton() {
     }
 
     currentGraph.inspectorToggleButton.classList.toggle('is-active', currentGraph.inspectorHidden);
-    currentGraph.inspectorToggleButton.innerHTML = `
-    <span class="material-symbols-outlined text-sm">${
-        currentGraph.inspectorHidden ? 'right_panel_open' : 'right_panel_close'
-    }</span>
-    ${currentGraph.inspectorHidden ? 'Show Inspector' : 'Hide Inspector'}
-  `;
+    const icon = document.createElement('span');
+    const label = currentGraph.inspectorHidden ? 'Show Inspector' : 'Hide Inspector';
+
+    icon.className = 'material-symbols-outlined text-sm';
+    icon.textContent = currentGraph.inspectorHidden ? 'right_panel_open' : 'right_panel_close';
+    currentGraph.inspectorToggleButton.replaceChildren(icon, document.createTextNode(` ${label}`));
 }
 
 function clearSelection() {
@@ -546,7 +547,7 @@ function clearSelection() {
     currentGraph.selectedTableName = null;
     resetHighlights(currentGraph.cy);
     syncEntryHighlights();
-    currentGraph.inspector.innerHTML = getDefaultInspectorMarkup();
+    replaceChildrenFromRenderedMarkup(currentGraph.inspector, getDefaultInspectorMarkup());
     updateOpenDataButton();
 }
 
@@ -557,7 +558,7 @@ function applyTableSelection(node, { focus = true } = {}) {
 
     const tableData = node.data('table');
     currentGraph.selectedTableName = tableData.name;
-    currentGraph.inspector.innerHTML = renderInspector(tableData);
+    replaceChildrenFromRenderedMarkup(currentGraph.inspector, renderInspector(tableData));
     highlightConnectedElements(currentGraph.cy, node);
     syncEntryHighlights([tableData.name]);
     updateOpenDataButton();
@@ -742,7 +743,7 @@ export async function mountStructureGraph(snapshot) {
 
     if (!schema.tables?.length) {
         empty?.removeAttribute('hidden');
-        inspector.innerHTML = clearInspector();
+        replaceChildrenFromRenderedMarkup(inspector, clearInspector());
         return;
     }
 

package/frontend/js/components/tableDesignerEditor.js

@@ -55,8 +55,33 @@ function getReferencedColumns(draft, catalogTables, referencesTable) {
   );
 }
 
+export function renderTableDesignerReferenceColumnOptions(
+  draft,
+  catalogTables,
+  referencesTable,
+  selectedValue
+) {
+  const referenceColumns = getReferencedColumns(draft, catalogTables, referencesTable);
+
+  return [
+    '<option value="">No FK column</option>',
+    referenceColumns
+      .map((name) =>
+        [
+          '<option value="',
+          escapeHtml(name),
+          '" ',
+          name === selectedValue ? "selected" : "",
+          ">",
+          escapeHtml(name),
+          "</option>",
+        ].join("")
+      )
+      .join(""),
+  ].join("");
+}
+
 function renderColumnRow(column, draft, catalogTables) {
-  const referenceColumns = getReferencedColumns(draft, catalogTables, column.referencesTable);
   const typeOptions = draft.supportedTypes
     .map((type) =>
       [
@@ -83,19 +108,12 @@ function renderColumnRow(column, draft, catalogTables) {
       ].join("")
     )
     .join("");
-  const referenceColumnOptions = referenceColumns
-    .map((name) =>
-      [
-        '<option value="',
-        escapeHtml(name),
-        '" ',
-        name === column.referencesColumn ? "selected" : "",
-        ">",
-        escapeHtml(name),
-        "</option>",
-      ].join("")
-    )
-    .join("");
+  const referenceColumnOptions = renderTableDesignerReferenceColumnOptions(
+    draft,
+    catalogTables,
+    column.referencesTable,
+    column.referencesColumn
+  );
 
   const columnId = escapeHtml(column.id);
 
@@ -141,7 +159,7 @@ function renderColumnRow(column, draft, catalogTables) {
     "</select>",
     '<select class="table-designer-field" data-bind="table-designer-column-field" data-column-id="',
     columnId,
-    '" data-field="referencesColumn"><option value="">No FK column</option>',
+    '" data-field="referencesColumn">',
     referenceColumnOptions,
     "</select>",
     '<button class="delete-button" data-action="remove-table-designer-column" data-column-id="',
@@ -202,6 +220,26 @@ function renderFillToggle(draft) {
   `;
 }
 
+export function renderTableDesignerFeedback(draft, saveError) {
+  const validationItems = (draft?.validationErrors ?? []).map((message) => ({
+    title: message,
+  }));
+  const warningItems = draft?.warnings ?? [];
+
+  return [
+    saveError
+      ? `
+              <div class="table-designer-main__error">
+                <div class="table-designer-main__error-code">${escapeHtml(saveError.code)}</div>
+                <div class="table-designer-main__error-text">${escapeHtml(saveError.message)}</div>
+              </div>
+            `
+      : "",
+    renderWarningList(validationItems, "table-designer-banner is-validation", "Validation", "alert"),
+    renderWarningList(warningItems, "table-designer-banner is-warning", "Warnings", "alert"),
+  ].join("");
+}
+
 export function renderTableDesignerEditor(state) {
   const draft = state.tableDesigner.draft;
 
@@ -228,10 +266,6 @@ export function renderTableDesignerEditor(state) {
     `;
   }
 
-  const validationItems = (draft.validationErrors ?? []).map((message) => ({
-    title: message,
-  }));
-  const warningItems = draft.warnings ?? [];
   const catalogTables = state.tableDesigner.tables ?? [];
   const visibleColumns = draft.columns.filter((column) => !column.deleted);
   const saveLabel =
@@ -286,6 +320,7 @@ export function renderTableDesignerEditor(state) {
           <button
             class="standard-button"
             data-action="save-table-designer"
+            data-table-designer-save-button
             ${draft.canSave ? "" : "disabled"}
             type="button"
           >
@@ -294,23 +329,9 @@ export function renderTableDesignerEditor(state) {
         </div>
       </header>
 
-      ${
-        state.tableDesigner.saveError
-          ? `
-              <div class="table-designer-main__error">
-                <div class="table-designer-main__error-code">${escapeHtml(
-                  state.tableDesigner.saveError.code
-                )}</div>
-                <div class="table-designer-main__error-text">${escapeHtml(
-                  state.tableDesigner.saveError.message
-                )}</div>
-              </div>
-            `
-          : ""
-      }
-
-      ${renderWarningList(validationItems, "table-designer-banner is-validation", "Validation", "alert")}
-      ${renderWarningList(warningItems, "table-designer-banner is-warning", "Warnings", "alert")}
+      <div data-table-designer-feedback>
+        ${renderTableDesignerFeedback(draft, state.tableDesigner.saveError)}
+      </div>
 
       <section class="table-designer-main__section">
         <div class="table-designer-main__section-header">

package/frontend/js/store.js

@@ -2856,7 +2856,7 @@ export function setTableDesignerSqlPreviewVisibility(visible) {
     emitChange();
 }
 
-export function updateCurrentTableDesignerField(field, value) {
+export function updateCurrentTableDesignerField(field, value, options = {}) {
     if (!state.tableDesigner.draft) {
         return;
     }
@@ -2868,10 +2868,13 @@ export function updateCurrentTableDesignerField(field, value) {
         getTableDesignerContext(),
     );
     state.tableDesigner.saveError = null;
-    emitChange();
+
+    if (options.notify !== false) {
+        emitChange();
+    }
 }
 
-export function updateCurrentTableDesignerColumnField(columnId, field, value) {
+export function updateCurrentTableDesignerColumnField(columnId, field, value, options = {}) {
     if (!state.tableDesigner.draft) {
         return;
     }
@@ -2884,7 +2887,10 @@ export function updateCurrentTableDesignerColumnField(columnId, field, value) {
         getTableDesignerContext(),
     );
     state.tableDesigner.saveError = null;
-    emitChange();
+
+    if (options.notify !== false) {
+        emitChange();
+    }
 }
 
 export function addCurrentTableDesignerColumn() {

package/frontend/js/utils/dom.js

@@ -0,0 +1,28 @@
+function createRenderedMarkupFragment(contextNode, markup) {
+    const range = document.createRange();
+
+    range.selectNodeContents(contextNode);
+    return range.createContextualFragment(String(markup ?? ''));
+}
+
+// Renderers must escape user-controlled values before markup reaches this DOM boundary.
+export function replaceChildrenFromRenderedMarkup(target, markup) {
+    if (!(target instanceof Element)) {
+        return false;
+    }
+
+    target.replaceChildren(createRenderedMarkupFragment(target, markup));
+    return true;
+}
+
+export function replaceElementFromRenderedMarkup(target, markup) {
+    if (!(target instanceof Element)) {
+        return false;
+    }
+
+    const range = document.createRange();
+
+    range.selectNode(target);
+    target.replaceWith(range.createContextualFragment(String(markup ?? '')));
+    return true;
+}

package/frontend/styles/base.css

@@ -131,6 +131,7 @@ img {
 
 .font-headline {
     font-family: var(--font-family-headline);
+    word-break: break-all;
 }
 
 .font-body {