@adecore/database 0.39.0 → 0.40.1

package/src/explorer/use-explorer-loads.ts

@@ -60,6 +60,7 @@ export function useExplorerLoads(connections: readonly Connection[]): ExplorerLo
                 started.current.delete(key);
             }
         }
+
         setLoads((current) => ({
             entries: new Map([...current.entries].filter(([, entry]) => !within(target, entry.target))),
             versions: target.schema === undefined ? new Map([...current.versions].filter(([id]) => id !== target.connectionId)) : current.versions
@@ -71,16 +72,20 @@ export function useExplorerLoads(connections: readonly Connection[]): ExplorerLo
         if (!silent) {
             store(target, { status: 'loading' });
         }
+
         const session = client.session(connection);
+
         const request: Promise<Loaded> =
             target.schema === undefined
                 ? session.schemas()
                 : target.table === undefined
                   ? session.tables(target.schema)
                   : session.structure(target.schema, target.table);
+
         request.then(
             (value) => {
                 store(target, { status: 'ready', value });
+
                 if (target.schema === undefined) {
                     // Chained after the schemas so the version never opens a session by itself.
                     session.server().then(
@@ -95,13 +100,17 @@ export function useExplorerLoads(connections: readonly Connection[]): ExplorerLo
 
     const start = (target: LoadTarget): void => {
         const key = loadKey(target);
+
         if (started.current.has(key)) {
             return;
         }
+
         const connection = connections.find((entry) => entry.id === target.connectionId);
+
         if (connection === undefined) {
             return;
         }
+
         started.current.set(key, target);
         run(target, connection, false);
     };
@@ -110,10 +119,12 @@ export function useExplorerLoads(connections: readonly Connection[]): ExplorerLo
     const reload = (change: SchemaChange): void => {
         const connection = connections.find((entry) => entry.id === change.connectionId);
         const dropped: LoadTarget[] = [];
+
         for (const [key, began] of [...started.current]) {
             if (!touches(change, began)) {
                 continue;
             }
+
             if (began.table !== undefined) {
                 started.current.delete(key);
                 dropped.push(began);
@@ -121,6 +132,7 @@ export function useExplorerLoads(connections: readonly Connection[]): ExplorerLo
                 run(began, connection, true);
             }
         }
+
         if (dropped.length > 0) {
             const gone = new Set(dropped.map(loadKey));
             setLoads((current) => ({ ...current, entries: new Map([...current.entries].filter(([key]) => !gone.has(key))) }));
@@ -132,13 +144,16 @@ export function useExplorerLoads(connections: readonly Connection[]): ExplorerLo
     // A connection that was edited or removed is a different session, so what it listed is stale.
     useEffect(() => {
         const known = configs.current;
+
         for (const [id, config] of known) {
             const now = connections.find((entry) => entry.id === id);
+
             if (now === undefined || now.config !== config) {
                 known.delete(id);
                 reset({ connectionId: id });
             }
         }
+
         for (const connection of connections) {
             known.set(connection.id, connection.config);
         }

package/src/explorer/use-stored-expansion.ts

@@ -15,15 +15,18 @@ const restore = (storage: DatabaseStorage | undefined, connections: readonly Con
     const expanded = new Set(from.expanded);
     const collapsed = new Set(from.collapsed);
     const loaded = new Set(from.loaded);
+
     for (const { id } of connections) {
         if (loaded.has(id)) {
             continue;
         }
+
         loaded.add(id);
         const stored = parseExpansion(storage?.get(expansionKey(id)) ?? null, id);
         stored.expanded.forEach((key) => expanded.add(key));
         stored.collapsed.forEach((key) => collapsed.add(key));
     }
+
     return { expanded, collapsed, loaded };
 };
 
@@ -51,6 +54,7 @@ export function useStoredExpansion(connections: readonly Connection[]): StoredEx
             const next = serializeExpansion(id, state);
             const last = written.current.get(id);
             written.current.set(id, next);
+
             if (last !== undefined && last !== next) {
                 storage?.set(expansionKey(id), next);
             }

package/src/export-formats.ts

@@ -0,0 +1,3 @@
+import type { FileFormat } from './protocol/index.ts';
+
+export const EXPORT_FORMATS: readonly FileFormat[] = ['csv', 'tsv', 'json', 'sql'];

package/src/grid/CellEditor.tsx

@@ -27,6 +27,7 @@ export function CellEditor({ value, label, onValueChange, onCommit, onCancel }:
         if (event.nativeEvent.isComposing) {
             return;
         }
+
         if (event.key === 'Enter') {
             event.preventDefault();
             onCommit();

package/src/grid/CopyAsMenu.tsx

@@ -11,9 +11,9 @@ export interface CopyAsMenuProps {
     onCopy(format: CopyFormat): void;
 }
 
-/* The "Copy as" submenu of the grid's context menu. */
 export function CopyAsMenu({ disabled, formats, onCopy }: CopyAsMenuProps) {
     const { t } = useTranslation('database');
+
     return (
         <ContextMenu.SubmenuRoot>
             <ContextMenu.SubmenuTrigger disabled={disabled}>

package/src/grid/DataGrid.tsx

@@ -133,14 +133,11 @@ const signatureOf = (columns: readonly GridColumn[]): string => columns.map((col
 
 const textOf = (view: CellView): string => (view.suffix === undefined ? view.text : `${view.text} ${view.suffix}`);
 
+const columnTexts = (column: GridColumn, index: number, rows: readonly GridRow[], notation: NumberNotation): string[] =>
+    rows.map((row) => textOf(cellView(row.cells[index] ?? null, column.kind, columnNotation(column, notation))));
+
 const estimateWidths = (columns: readonly GridColumn[], rows: readonly GridRow[], notation: NumberNotation): number[] =>
-    columns.map((column, index) =>
-        estimateColumnWidth(
-            column.name,
-            rows.slice(0, 50).map((row) => textOf(cellView(row.cells[index] ?? null, column.kind, columnNotation(column, notation)))),
-            column.primaryKey === true
-        )
-    );
+    columns.map((column, index) => estimateColumnWidth(column.name, columnTexts(column, index, rows.slice(0, 50), notation), column.primaryKey === true));
 
 /*
  * The table of the table view and of the console, and of any rows an app has on its own: it needs no
@@ -201,6 +198,7 @@ export function DataGrid({
     const [menuTarget, setMenuTarget] = useState<MenuTarget | null>(null);
     const [editing, setEditing] = useState<CellEdit | null>(null);
     const [ownSelection, setOwnSelection] = useState<ReadonlySet<string>>(NO_KEYS);
+
     const [layout, setLayout] = useState<Layout>(() => ({
         signature: signatureOf(columns),
         rows,
@@ -208,13 +206,16 @@ export function DataGrid({
         estimated: estimateWidths(columns, rows, notation),
         ...restoreLayout(columns, initialLayout)
     }));
+
     const reportedLayout = useRef<GridLayout>(captureLayout(columns, layout));
 
     const signature = signatureOf(columns);
     let current = layout;
+
     if (layout.signature !== signature || layout.rows !== rows || layout.notation !== notation) {
         const same = layout.signature === signature;
         const estimated = estimateWidths(columns, rows, notation);
+
         current = {
             signature,
             rows,
@@ -222,6 +223,7 @@ export function DataGrid({
             estimated: same ? growWidths(layout.estimated, estimated) : estimated,
             ...(same ? { resized: layout.resized, view: layout.view } : restoreLayout(columns, initialLayout))
         };
+
         setLayout(current);
     }
 
@@ -229,10 +231,12 @@ export function DataGrid({
     const order = useMemo(() => displayOrder(columns.length, current.view), [columns.length, current.view]);
     const pinnedShown = pinnedCount(columns.length, current.view);
     const displayOf = useMemo(() => new Map(order.map((index, position) => [index, position])), [order]);
+
     const widths = useMemo(
         () => columns.map((_, index) => current.resized[index] ?? current.estimated[index] ?? clampColumnWidth(0)),
         [columns, current.resized, current.estimated]
     );
+
     const shownWidths = useMemo(() => order.map((index) => widths[index]!), [order, widths]);
     const offsets = columnOffsets(shownWidths);
     const gutter = gutterWidth(rows.length);
@@ -241,12 +245,17 @@ export function DataGrid({
     const viewportHeight = size.height > 0 ? size.height : FALLBACK_VIEWPORT_HEIGHT;
     const range = drawnRange(scrolledBlock, viewportHeight, rows.length);
     const selection = selectedKeys ?? ownSelection;
+
     const isShown = (position: CellPosition | null): position is CellPosition =>
         position !== null && position.row < rows.length && displayOf.has(position.column);
+
     const focusCell = isShown(focused) ? focused : null;
     const anchorCell = isShown(rangeAnchor) ? rangeAnchor : null;
+
     const toDisplay = (position: CellPosition): CellPosition => ({ row: position.row, column: displayOf.get(position.column)! });
+
     const fromDisplay = (position: CellPosition): CellPosition => ({ row: position.row, column: order[position.column]! });
+
     const rect = focusCell === null ? null : rectBetween(toDisplay(anchorCell ?? focusCell), toDisplay(focusCell));
     const page = Math.max(1, Math.floor((viewportHeight - HEADER_HEIGHT) / ROW_HEIGHT));
     const sortable = onSortsChange !== undefined;
@@ -259,7 +268,9 @@ export function DataGrid({
     const cellBlock: RangeBlock | null = rect === null ? null : { top: rect.top, bottom: rect.bottom, columns: order.slice(rect.left, rect.right + 1) };
     const block = columnBlock ?? cellBlock;
     const blockKey = block === null ? '' : `${block.top}:${block.bottom}:${block.columns.join(',')}`;
+
     const headerId = (column: number): string => `${gridId}-h-${column}`;
+
     const enumTypes = useMemo(() => columns.map((column) => parseEnumType(column.type)), [columns]);
 
     useEffect(() => {
@@ -270,6 +281,7 @@ export function DataGrid({
 
     useEffect(() => {
         const captured = captureLayout(columns, current);
+
         if (!sameLayout(captured, reportedLayout.current)) {
             reportedLayout.current = captured;
             reportLayout.current?.(captured);
@@ -283,8 +295,10 @@ export function DataGrid({
     useEffect(() => {
         if (blockKey === '') {
             reportRange.current?.(null);
+
             return;
         }
+
         const [top, bottom, list] = blockKey.split(':');
         reportRange.current?.({ top: Number(top), bottom: Number(bottom), columns: list === '' ? [] : list!.split(',').map(Number) });
     }, [blockKey]);
@@ -293,9 +307,12 @@ export function DataGrid({
         if (focusRequest === null || focusRequest === undefined) {
             return;
         }
+
         const index = rows.findIndex((row) => row.key === focusRequest.rowKey);
+
         if (index >= 0) {
             focusAt({ row: index, column: focusRequest.column });
+
             if (focusRequest.quiet !== true) {
                 scroller.current?.focus();
             }
@@ -318,8 +335,10 @@ export function DataGrid({
         const stop = (): void => {
             dragging.current = false;
         };
+
         window.addEventListener('pointerup', stop);
         window.addEventListener('pointercancel', stop);
+
         return () => {
             window.removeEventListener('pointerup', stop);
             window.removeEventListener('pointercancel', stop);
@@ -340,19 +359,24 @@ export function DataGrid({
     const canEdit = (position: CellPosition): boolean => {
         const row = rows[position.row];
         const column = columns[position.column];
+
         if (!editable || row === undefined || column === undefined || row.locked === true || row.state === 'deleted' || column.readOnly === true) {
             return false;
         }
+
         return !isPreview(row.cells[position.column] ?? null) || loadValue !== undefined;
     };
 
     const revealColumn = (column: number): void => {
         const element = scroller.current;
         const at = displayOf.get(column);
+
         if (element === null || at === undefined || at < pinnedShown) {
             return;
         }
+
         const left = scrollToReveal(gutter + (offsets[at] ?? 0), shownWidths[at] ?? 0, element.scrollLeft, element.clientWidth, gutter + pinnedWidth);
+
         if (left !== element.scrollLeft) {
             element.scrollLeft = left;
         }
@@ -360,13 +384,17 @@ export function DataGrid({
 
     const reveal = (position: CellPosition): void => {
         const element = scroller.current;
+
         if (element === null) {
             return;
         }
+
         const top = scrollToReveal(HEADER_HEIGHT + position.row * ROW_HEIGHT, ROW_HEIGHT, element.scrollTop, element.clientHeight, HEADER_HEIGHT);
+
         if (top !== element.scrollTop) {
             element.scrollTop = top;
         }
+
         revealColumn(position.column);
     };
 
@@ -385,6 +413,7 @@ export function DataGrid({
 
     const step = (from: CellPosition | null, input: NavigationKey): CellPosition | null => {
         const next = moveFocus(isShown(from) ? toDisplay(from) : null, input, { rows: rows.length, columns: order.length, page });
+
         return next === null ? null : fromDisplay(next);
     };
 
@@ -392,31 +421,41 @@ export function DataGrid({
         if (selectedKeys === undefined) {
             setOwnSelection(next);
         }
+
         onSelectedKeysChange?.(next);
     };
 
     const beginEdit = async (position: CellPosition): Promise<void> => {
         const row = rows[position.row];
+
         if (row === undefined || !canEdit(position)) {
             return;
         }
+
         const cell = row.cells[position.column] ?? null;
         settled.current = false;
+
         if (!isPreview(cell)) {
             const text = draftOf(cell);
             setEditing({ ...position, draft: text, initial: text, loading: false });
+
             return;
         }
+
         setEditing({ ...position, draft: '', initial: '', loading: true });
         const value = await loadValue?.(row.key, position.column);
+
         setEditing((now) => {
             if (now === null || !now.loading || now.row !== position.row || now.column !== position.column) {
                 return now;
             }
+
             if (value === undefined) {
                 return null;
             }
+
             const text = draftOf(value);
+
             return { ...now, draft: text, initial: text, loading: false };
         });
     };
@@ -425,16 +464,21 @@ export function DataGrid({
         if (editing === null || settled.current) {
             return;
         }
+
         settled.current = true;
         const column = columns[editing.column];
         const row = rows[editing.row];
+
         if (commit && !editing.loading && editing.draft !== editing.initial && column !== undefined && row !== undefined) {
             onCommit?.(row.key, editing.column, parseDraft(editing.draft, column.kind));
         }
+
         setEditing(null);
         scroller.current?.focus();
+
         if (move !== undefined) {
             const next = step(editing, { key: 'Tab', shiftKey: move === 'previous', mod: false });
+
             if (next !== null) {
                 focusAt(next);
             }
@@ -445,33 +489,40 @@ export function DataGrid({
         if (editing === null || settled.current) {
             return;
         }
+
         settled.current = true;
         const row = rows[editing.row];
         const before = row?.cells[editing.column] ?? null;
+
         if (result !== undefined && row !== undefined && result.value !== (typeof before === 'string' ? before : null)) {
             onCommit?.(row.key, editing.column, result.value);
         }
+
         setEditing(null);
         scroller.current?.focus();
     };
 
     const followCell = (cell: FocusedCell): boolean => onFollow !== undefined && (canFollow?.(cell) ?? true);
 
+    const menuCell: CellPosition | null = menuTarget === null || menuTarget.column === null ? null : { row: menuTarget.row, column: menuTarget.column };
+
     const commitValue = (value: EditValue): void => {
-        const position = menuTarget === null || menuTarget.column === null ? null : { row: menuTarget.row, column: menuTarget.column };
-        const row = position === null ? undefined : rows[position.row];
-        if (position !== null && row !== undefined && canEdit(position)) {
-            onCommit?.(row.key, position.column, value);
+        const row = menuCell === null ? undefined : rows[menuCell.row];
+
+        if (menuCell !== null && row !== undefined && canEdit(menuCell)) {
+            onCommit?.(row.key, menuCell.column, value);
         }
     };
 
     /* The cells from row `top` to `bottom` in the given columns, with the whole value of every preview `loadValue` can fetch. */
     const wholeCellsOf = async (top: number, bottom: number, indexes: readonly number[]): Promise<readonly (readonly Shown[])[]> => {
         const shown = rows.slice(top, bottom + 1);
+
         const whole = await loadWholeCells(
             shown.map((row) => indexes.map((index) => row.cells[index] ?? null)),
             loadValue === undefined ? undefined : (row, column) => loadValue(shown[row]!.key, indexes[column]!)
         );
+
         if (whole.previews > 0) {
             onNotice?.({
                 tone: 'error',
@@ -479,6 +530,7 @@ export function DataGrid({
                 description: t(whole.tooLarge ? 'grid.copyPreviews.tooLarge' : 'grid.copyPreviews.unavailable')
             });
         }
+
         return whole.rows;
     };
 
@@ -486,8 +538,10 @@ export function DataGrid({
         if (block === null) {
             return;
         }
+
         const picked = block.columns;
         const cells = await wholeCellsOf(block.top, block.bottom, picked);
+
         await copyText(
             formatCopy(format, {
                 columns: picked.map((index) => ({ name: columns[index]!.name, kind: columns[index]!.kind })),
@@ -512,13 +566,14 @@ export function DataGrid({
     };
 
     const copyCell = (): void => {
-        if (menuTarget !== null && menuTarget.column !== null && rows[menuTarget.row] !== undefined) {
-            void copyOne(menuTarget.row, menuTarget.column);
+        if (menuCell !== null && rows[menuCell.row] !== undefined) {
+            void copyOne(menuCell.row, menuCell.column);
         }
     };
 
     const selectAll = (): void => {
         const all = fullRect(rows.length, order.length);
+
         if (all !== null) {
             setColumnSelection(NO_COLUMN_SELECTION);
             setRangeAnchor(fromDisplay({ row: all.top, column: all.left }));
@@ -534,8 +589,10 @@ export function DataGrid({
             index,
             click
         );
+
         anchor.current = result.anchor;
         setSelection(result.selected);
+
         if (!click.mod && order.length > 0) {
             setColumnSelection(NO_COLUMN_SELECTION);
             setRangeAnchor({ row: result.anchor, column: order[order.length - 1]! });
@@ -547,14 +604,18 @@ export function DataGrid({
         if (event.target !== event.currentTarget || event.altKey) {
             return;
         }
+
         if (editing !== null) {
             if (event.key === 'Escape') {
                 finishEdit(false);
             }
+
             return;
         }
+
         const mod = isModHeld(event, isApplePlatform());
         const key = event.key.toLowerCase();
+
         if (mod && key === 'c') {
             event.preventDefault();
             copyRange();
@@ -563,8 +624,10 @@ export function DataGrid({
             selectAll();
         } else if (mod && key === 'd' && onDuplicateRows !== undefined) {
             event.preventDefault();
+
             const keys =
                 selection.size > 0 ? rows.filter((row) => selection.has(row.key)).map((row) => row.key) : focusedRowKey === null ? [] : [focusedRowKey];
+
             if (keys.length > 0) {
                 onDuplicateRows(keys);
             }
@@ -582,6 +645,7 @@ export function DataGrid({
             setColumnSelection(NO_COLUMN_SELECTION);
         } else {
             const next = step(focusCell, { key: event.key, shiftKey: event.shiftKey, mod });
+
             if (next !== null) {
                 event.preventDefault();
                 focusAt(next, event.shiftKey && event.key !== 'Tab');
@@ -593,12 +657,16 @@ export function DataGrid({
         if (event.button !== 0 || isEditing) {
             return;
         }
+
         const row = rows[position.row];
+
         if (row !== undefined && isModHeld(event, isApplePlatform()) && followCell({ rowKey: row.key, column: position.column })) {
             focusAt(position);
             onFollow?.({ rowKey: row.key, column: position.column });
+
             return;
         }
+
         const extend = event.shiftKey && focusCell !== null;
         dragOrigin.current = extend ? (anchorCell ?? focusCell) : position;
         dragging.current = true;
@@ -616,14 +684,17 @@ export function DataGrid({
         if (!rectContains(rect, position.row, displayOf.get(position.column)!)) {
             focusAt(position);
         }
+
         setMenuTarget(position);
     };
 
     const openRowMenu = (index: number): void => {
         const row = rows[index];
+
         if (row !== undefined && !selection.has(row.key)) {
             selectRowAt(index, { shiftKey: false, mod: false });
         }
+
         setMenuTarget({ row: index, column: null });
     };
 
@@ -633,15 +704,9 @@ export function DataGrid({
 
     const fitColumn = (index: number): void => {
         const column = columns[index];
+
         if (column !== undefined) {
-            resizeColumn(
-                index,
-                fitColumnWidth(
-                    column.name,
-                    rows.map((row) => textOf(cellView(row.cells[index] ?? null, column.kind, columnNotation(column, notation)))),
-                    column.primaryKey === true
-                )
-            );
+            resizeColumn(index, fitColumnWidth(column.name, columnTexts(column, index, rows, notation), column.primaryKey === true));
         }
     };
 
@@ -684,14 +749,17 @@ export function DataGrid({
     const stableDragTo = useStableCallback(dragTo);
     const stableBeginEdit = useStableCallback((position: CellPosition) => void beginEdit(position));
     const stableOpenCellMenu = useStableCallback(openCellMenu);
+
     const stablePressRowNumber = useStableCallback((index: number, event: MouseEvent) => {
         if (!pressedInPopup()) {
             selectRowAt(index, { shiftKey: event.shiftKey, mod: isModHeld(event, isApplePlatform()) });
         }
     });
+
     const stableOpenRowMenu = useStableCallback(openRowMenu);
     const stableFinishPick = useStableCallback(finishPick);
     const stableFinishEdit = useStableCallback(finishEdit);
+
     const rowActions = useMemo(
         (): RowActions => ({
             pressCell: stablePressCell,
@@ -710,6 +778,7 @@ export function DataGrid({
     const renderRow = (index: number): ReactNode => {
         const row = rows[index]!;
         const inRect = columnBlock === null && rect !== null && index >= rect.top && index <= rect.bottom;
+
         return (
             <GridRowView
                 key={row.key}
@@ -728,6 +797,7 @@ export function DataGrid({
 
     const headerCells = order.map((columnIndex, position) => {
         const column = columns[columnIndex]!;
+
         return (
             <GridHeaderCell
                 key={columnIndex}
@@ -752,11 +822,11 @@ export function DataGrid({
     });
 
     const menuRow = menuTarget === null ? undefined : rows[menuTarget.row];
-    const menuCell: CellPosition | null = menuTarget === null || menuTarget.column === null ? null : { row: menuTarget.row, column: menuTarget.column };
     const settable = menuCell !== null && canEdit(menuCell);
-    const nullable = menuCell !== null && columns[menuCell.column]?.nullable !== false;
     const menuColumn = menuCell === null ? undefined : columns[menuCell.column];
+    const nullable = menuColumn?.nullable !== false;
     const hasDefault = menuColumn !== undefined && ((menuColumn.defaultValue ?? null) !== null || menuColumn.autoIncrement === true);
+
     const menuContext: GridMenuContext | null =
         menuRow === undefined || menuTarget === null
             ? null

package/src/grid/EnumPicker.tsx

@@ -38,7 +38,9 @@ const LOOK = {
 export function EnumPicker({ type, value, nullable, label, autoOpen = false, disabled = false, onDone, look = 'cell', className, ref }: EnumPickerProps) {
     const { t } = useTranslation('database');
     const set = type.kind === 'set';
+
     const membersOfValue = (): ReadonlySet<string> => new Set(set && value !== null ? membersOf(value) : []);
+
     const settled = useRef(false);
     const [members, setMembers] = useState(membersOfValue);
 
@@ -53,8 +55,10 @@ export function EnumPicker({ type, value, nullable, label, autoOpen = false, dis
         if (open) {
             settled.current = false;
             setMembers(membersOfValue());
+
             return;
         }
+
         const joined = joinMembers(type, members);
         settle(set && joined !== value ? { value: joined } : undefined);
     };
@@ -62,11 +66,13 @@ export function EnumPicker({ type, value, nullable, label, autoOpen = false, dis
     const toggle = (member: string, checked: boolean): void => {
         setMembers((now) => {
             const next = new Set(now);
+
             if (checked) {
                 next.add(member);
             } else {
                 next.delete(member);
             }
+
             return next;
         });
     };