@adecore/database 0.39.0 → 0.40.1

package/src/sql-split.ts

@@ -22,6 +22,7 @@ const isWordCode = (code: number): boolean =>
 
 const lineEnd = (text: string, at: number): number => {
     const newline = text.indexOf('\n', at);
+
     return newline === -1 ? text.length : newline + 1;
 };
 
@@ -31,9 +32,12 @@ const startsLineComment = (text: string, at: number, engine: Engine): boolean =>
         if (engine === 'sqlite') {
             return true;
         }
+
         const next = text[at + 2];
+
         return next === undefined || WHITESPACE.test(next) || next.charCodeAt(0) < 32;
     }
+
     return text[at] === '#' && engine === 'mysql';
 };
 
@@ -42,6 +46,7 @@ const quotedEnd = (text: string, at: number, engine: Engine): number => {
     const quote = text[at]!;
     const backslashEscapes = engine === 'mysql' && quote !== '`';
     let i = at + 1;
+
     while (i < text.length) {
         if (backslashEscapes && text[i] === '\\') {
             i += 2;
@@ -55,6 +60,7 @@ const quotedEnd = (text: string, at: number, engine: Engine): number => {
             i += 1;
         }
     }
+
     return text.length;
 };
 
@@ -62,9 +68,11 @@ const quotedEnd = (text: string, at: number, engine: Engine): number => {
 export const tokenize = (text: string, engine: Engine): SqlToken[] => {
     const tokens: SqlToken[] = [];
     let i = 0;
+
     while (i < text.length) {
         const char = text[i]!;
         const code = text.charCodeAt(i);
+
         if (WHITESPACE.test(char)) {
             i += 1;
         } else if (char === "'" || char === '"' || char === '`') {
@@ -90,9 +98,11 @@ export const tokenize = (text: string, engine: Engine): SqlToken[] => {
             i += 1;
         } else if (isWordCode(code)) {
             let end = i + 1;
+
             while (end < text.length && isWordCode(text.charCodeAt(end))) {
                 end += 1;
             }
+
             tokens.push({ kind: 'word', start: i, end });
             i = end;
         } else {
@@ -100,6 +110,7 @@ export const tokenize = (text: string, engine: Engine): SqlToken[] => {
             i += 1;
         }
     }
+
     return tokens;
 };
 
@@ -112,12 +123,15 @@ class TriggerState {
 
     word(word: string): void {
         const upper = word.toUpperCase();
+
         if (this.leading.length < 3) {
             this.leading.push(upper);
         }
+
         if (!this.isTrigger()) {
             return;
         }
+
         if (upper === 'BEGIN' && !this.inBody) {
             this.inBody = true;
         } else if (upper === 'CASE' && this.inBody) {
@@ -137,6 +151,7 @@ class TriggerState {
 
     private isTrigger(): boolean {
         const [first, second, third] = this.leading;
+
         return first === 'CREATE' && (second === 'TRIGGER' || ((second === 'TEMP' || second === 'TEMPORARY') && third === 'TRIGGER'));
     }
 }
@@ -144,12 +159,15 @@ class TriggerState {
 const trimmed = (text: string, from: number, to: number): SqlStatement => {
     let start = from;
     let end = to;
+
     while (start < end && WHITESPACE.test(text[start]!)) {
         start += 1;
     }
+
     while (end > start && WHITESPACE.test(text[end - 1]!)) {
         end -= 1;
     }
+
     return { text: text.slice(start, end), start, end };
 };
 
@@ -170,12 +188,14 @@ export const splitStatements = (text: string, engine: Engine): SqlStatement[] =>
                 if (hasContent) {
                     statements.push(trimmed(text, start, token.start));
                 }
+
                 start = token.end;
                 hasContent = false;
                 trigger = new TriggerState();
             }
         } else if (token.kind !== 'comment') {
             hasContent = true;
+
             if (token.kind === 'word' && engine === 'sqlite') {
                 trigger.word(text.slice(token.start, token.end));
             }
@@ -185,6 +205,7 @@ export const splitStatements = (text: string, engine: Engine): SqlStatement[] =>
     if (hasContent) {
         statements.push(trimmed(text, start, text.length));
     }
+
     return statements;
 };
 
@@ -195,16 +216,21 @@ export const splitStatements = (text: string, engine: Engine): SqlStatement[] =>
  */
 export const statementAt = (text: string, offset: number, engine: Engine): SqlStatement | null => {
     const statements = splitStatements(text, engine);
+
     for (const [index, statement] of statements.entries()) {
         if (offset >= statement.start && offset <= statement.end) {
             return statement;
         }
+
         const next = statements[index + 1];
+
         if (offset > statement.end && (next === undefined || offset < next.start)) {
             const gap = text.slice(statement.end, offset);
+
             return gap.includes('\n') && next !== undefined ? next : statement;
         }
     }
+
     return statements[0] ?? null;
 };
 
@@ -214,7 +240,9 @@ export const firstKeyword = (text: string, engine: Engine): string => {
         if (token.kind === 'comment' || (token.kind === 'punct' && text[token.start] === '(')) {
             continue;
         }
+
         return token.kind === 'word' ? (/^[A-Za-z]*/.exec(text.slice(token.start, token.end))?.[0] ?? '').toUpperCase() : '';
     }
+
     return '';
 };

package/src/sql.ts

@@ -24,12 +24,14 @@ export const NUMERIC_TEXT = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?$/;
 
 /* Whether a value of this kind is a number, which a grid aligns against the end of its cell. */
 export const isNumericKind = (kind: ValueKind): boolean => NUMERIC_KINDS.has(kind);
+
 const ORDER_ITEM = /\s*(`(?:[^`]|``)+`|"(?:[^"]|"")+"|[A-Za-z_][\w$]*)(?:\s+(asc|desc))?\s*(,|$)/iy;
 
 const markOf = (engine: Engine): string => (engine === 'mysql' ? '`' : '"');
 
 export const quoteIdentifier = (engine: Engine, name: string): string => {
     const mark = markOf(engine);
+
     return `${mark}${name.replaceAll(mark, mark + mark)}${mark}`;
 };
 
@@ -42,6 +44,7 @@ export const qualifiedName = (target: SqlTarget): string =>
 const stringLiteral = (engine: Engine, text: string): string => {
     // MySQL reads a backslash as an escape unless the server runs with NO_BACKSLASH_ESCAPES.
     const escaped = engine === 'mysql' ? text.replaceAll('\\', '\\\\') : text;
+
     return `'${escaped.replaceAll("'", "''")}'`;
 };
 
@@ -52,6 +55,7 @@ export const sqlLiteral = (engine: Engine, value: LiteralValue, kind?: ValueKind
     if (value === null) {
         return 'NULL';
     }
+
     switch (typeof value) {
         case 'boolean':
             return engine === 'mysql' ? (value ? 'TRUE' : 'FALSE') : value ? '1' : '0';
@@ -59,9 +63,11 @@ export const sqlLiteral = (engine: Engine, value: LiteralValue, kind?: ValueKind
             return Number.isFinite(value) ? String(value) : 'NULL';
         case 'string': {
             const trimmed = value.trim();
+
             return kind !== undefined && isNumericKind(kind) && NUMERIC_TEXT.test(trimmed) ? trimmed : stringLiteral(engine, value);
         }
     }
+
     switch (value.kind) {
         case 'default':
             return 'DEFAULT';
@@ -96,43 +102,56 @@ export const orderByClause = (engine: Engine, sorts: readonly ColumnSort[]): str
 
 const unquote = (engine: Engine, word: string): string | null => {
     const mark = word[0]!;
+
     if (mark !== '`' && mark !== '"') {
         return word;
     }
+
     // A double quoted word is a string in MySQL, which sorts by a constant and so is not a column.
     if (mark === '"' && engine === 'mysql') {
         return null;
     }
+
     return word.slice(1, -1).replaceAll(mark + mark, mark);
 };
 
 const readOrderBy = (engine: Engine, text: string, resolve: (word: string) => string | undefined): ColumnSort[] | null => {
     const source = text.trim();
+
     if (source === '') {
         return [];
     }
+
     const sorts: ColumnSort[] = [];
     let position = 0;
+
     while (position < source.length) {
         ORDER_ITEM.lastIndex = position;
         const match = ORDER_ITEM.exec(source);
+
         if (match === null) {
             return null;
         }
+
         const word = unquote(engine, match[1]!);
         const column = word === null ? undefined : resolve(word);
+
         if (column === undefined || sorts.some((sort) => sort.column === column)) {
             return null;
         }
+
         sorts.push({ column, direction: match[2]?.toLowerCase() === 'desc' ? 'desc' : 'asc' });
         position = ORDER_ITEM.lastIndex;
+
         if (match[3] === '') {
             return sorts;
         }
+
         if (position >= source.length) {
             return null;
         }
     }
+
     return sorts;
 };
 
@@ -153,5 +172,6 @@ export const parseOrderByLoose = (engine: Engine, text: string): ColumnSort[] |
 /* The column a word names, which may be quoted the way the engine quotes, or `undefined` when none of the columns is meant. */
 export const findColumn = (engine: Engine, word: string, columns: readonly string[]): string | undefined => {
     const bare = unquote(engine, word);
+
     return bare === null ? undefined : matchColumn(columns, bare);
 };

package/src/stored-size.ts

@@ -0,0 +1,10 @@
+/* A size in pixels a view wrote to the app's storage, or `null` when the text is missing, broken or not at least `minimum`. */
+export const parseStoredSize = (raw: string | null | undefined, minimum: number): number | null => {
+    try {
+        const value: unknown = JSON.parse(raw ?? 'null');
+
+        return typeof value === 'number' && Number.isFinite(value) && value >= minimum ? Math.round(value) : null;
+    } catch {
+        return null;
+    }
+};

package/src/structure/StructureView.tsx

@@ -52,11 +52,13 @@ export function StructureView({ connection, schema, table, toolbarStart, classNa
 
     useEffect(() => {
         let current = true;
+
         const settle = (outcome: Load): void => {
             if (current) {
                 setAnswer({ connection, schema, table, attempt, load: outcome });
             }
         };
+
         client
             .session(connection)
             .structure(schema, table)
@@ -64,6 +66,7 @@ export function StructureView({ connection, schema, table, toolbarStart, classNa
                 (structure) => settle({ status: 'ready', structure }),
                 (e: unknown) => settle({ status: 'error', message: messageOf(e, t('structure.failed')) })
             );
+
         return () => {
             current = false;
         };
@@ -92,6 +95,7 @@ export function StructureView({ connection, schema, table, toolbarStart, classNa
 
 export function StructureTabs({ structure, start }: { structure: TableStructure; start?: ReactNode }) {
     const { t } = useTranslation('database');
+
     const head =
         start === undefined || start === null || start === false ? undefined : (
             <span className="flex items-center gap-4">
@@ -99,6 +103,7 @@ export function StructureTabs({ structure, start }: { structure: TableStructure;
                 <Separator />
             </span>
         );
+
     return (
         <Tabs.Root defaultValue="columns" className="flex min-h-0 grow flex-col">
             <Tabs.List className="shrink-0 px-3" start={head}>
@@ -151,11 +156,13 @@ function Grid({ heads, children }: { heads: readonly string[]; children: ReactNo
 
 function YesNo({ value }: { value: boolean }) {
     const { t } = useTranslation('database');
+
     return <>{value ? t('structure.yes') : t('structure.no')}</>;
 }
 
 function ColumnsTable({ structure }: { structure: TableStructure }) {
     const { t } = useTranslation('database');
+
     const heads = [
         t('structure.column.name'),
         t('structure.column.type'),
@@ -164,10 +171,13 @@ function ColumnsTable({ structure }: { structure: TableStructure }) {
         t('structure.column.extra'),
         t('structure.column.comment')
     ];
+
     const foreign = new Set(structure.foreignKeys.flatMap((key) => key.columns));
+
     if (structure.columns.length === 0) {
         return <EmptyState>{t('structure.noColumns')}</EmptyState>;
     }
+
     return (
         <Grid heads={heads}>
             {structure.columns.map((column) => (
@@ -179,6 +189,7 @@ function ColumnsTable({ structure }: { structure: TableStructure }) {
 
 function ColumnRow({ column, primary, foreign }: { column: ColumnInfo; primary: boolean; foreign: boolean }) {
     const { t } = useTranslation('database');
+
     return (
         <tr>
             <td className={TD}>
@@ -211,9 +222,11 @@ function ColumnRow({ column, primary, foreign }: { column: ColumnInfo; primary:
 
 function IndexesTable({ indexes }: { indexes: readonly IndexInfo[] }) {
     const { t } = useTranslation('database');
+
     if (indexes.length === 0) {
         return <EmptyState>{t('structure.noIndexes')}</EmptyState>;
     }
+
     return (
         <Grid heads={[t('structure.index.name'), t('structure.index.columns'), t('structure.index.kind')]}>
             {indexes.map((index) => (
@@ -234,10 +247,13 @@ function IndexesTable({ indexes }: { indexes: readonly IndexInfo[] }) {
 
 function ForeignKeysTable({ foreignKeys }: { foreignKeys: readonly ForeignKeyInfo[] }) {
     const { t } = useTranslation('database');
+
     if (foreignKeys.length === 0) {
         return <EmptyState>{t('structure.noForeignKeys')}</EmptyState>;
     }
+
     const action = (value: string | null): string => value ?? t('structure.engineDefault');
+
     return (
         <Grid
             heads={[
@@ -263,9 +279,11 @@ function ForeignKeysTable({ foreignKeys }: { foreignKeys: readonly ForeignKeyInf
 
 function Ddl({ ddl }: { ddl: string | null }) {
     const { t } = useTranslation('database');
+
     if (ddl === null) {
         return <EmptyState>{t('structure.noDdl')}</EmptyState>;
     }
+
     return (
         <div className="relative">
             <Button variant="secondary" size="xs" className="absolute top-2 right-3" onClick={() => copyText(ddl)}>

package/src/table/CommandField.tsx

@@ -59,6 +59,7 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
     const [dismissed, setDismissed] = useState(false);
     const suggestions = useMemo(() => suggest(engine, text, columns), [engine, text, columns]);
     const open = focused && !dismissed && suggestions.length > 0;
+
     const optionId = (index: number): string => `${listId}-${index}`;
 
     useImperativeHandle(inputRef, () => input.current!, []);
@@ -86,18 +87,22 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
             case 'condition':
             case 'sql':
                 commit(suggestion.chip);
+
                 break;
             case 'filter':
                 change(filterStartText(suggestion.column));
                 input.current?.focus();
+
                 break;
             case 'sort':
                 onChipsChange(toggleSort(chips, suggestion.column.name));
                 clear();
+
                 break;
             case 'jump':
                 clear();
                 onJumpToColumn(suggestion.column.name);
+
                 break;
         }
     };
@@ -122,6 +127,7 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
         if (event.nativeEvent.isComposing) {
             return;
         }
+
         if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
             if (suggestions.length > 0) {
                 event.preventDefault();
@@ -131,6 +137,7 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
         } else if (event.key === 'Enter') {
             event.preventDefault();
             const suggestion = suggestions[Math.min(active, suggestions.length - 1)];
+
             if (suggestion !== undefined) {
                 pick(suggestion);
             } else if (editing !== null) {
@@ -153,6 +160,7 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
 
     const handleBlur = (): void => {
         setFocused(false);
+
         if (editing !== null) {
             clear();
         }
@@ -207,6 +215,7 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
                         const column = columnOf(suggestion);
                         const previous = suggestions[index - 1];
                         const startsGroup = column !== null && (previous === undefined || columnOf(previous)?.name !== column.name);
+
                         return (
                             <div key={`${suggestion.kind}:${column?.name ?? ''}`} role="presentation">
                                 {startsGroup && (
@@ -240,6 +249,7 @@ export function CommandField({ chips, columns, engine, onChipsChange, onJumpToCo
 
 function SuggestionLabel({ suggestion }: { suggestion: Suggestion }) {
     const { t } = useTranslation('database');
+
     switch (suggestion.kind) {
         case 'condition':
             return (
@@ -280,6 +290,7 @@ interface ChipViewProps {
 /* A filter opens its text for editing, a sort flips its direction, and a raw ORDER BY is only shown. */
 function ChipView({ chip, onActivate, onRemove }: ChipViewProps) {
     const { t } = useTranslation('database');
+
     return (
         <span className="inline-flex h-5 max-w-72 min-w-0 shrink-0 items-center rounded-md bg-text/10 font-mono text-code text-text">
             {chip.kind === 'filter' && (

package/src/table/ImportDialog.tsx

@@ -54,10 +54,13 @@ export function ImportForm({
 }: ImportFormProps) {
     const { t } = useTranslation('database');
     const items = [{ value: SKIP, label: t('table.import.skip') }, ...tableColumns.map((column, index) => ({ value: String(index), label: column.name }))];
+
     const valueOf = (name: string | null): string => {
         const index = name === null ? -1 : tableColumns.findIndex((column) => column.name === name);
+
         return index < 0 ? SKIP : String(index);
     };
+
     const canImport = sample !== null && hasMapping(mapping) && !busy;
 
     return (
@@ -156,6 +159,7 @@ export interface ImportDialogProps extends ImportFormProps {
 /* The import of a file into the table: pick how the columns map, look at the rows, confirm. */
 export function ImportDialog({ open, onOpenChange, ...form }: ImportDialogProps) {
     const { t } = useTranslation('database');
+
     return (
         <Dialog.Root open={open} onOpenChange={(next) => !form.busy && onOpenChange(next)}>
             <Dialog.Popup className="flex max-h-[calc(100vh-96px)] w-[720px] max-w-[calc(100vw-48px)] flex-col p-5">

package/src/table/TableStatusBar.tsx

@@ -66,6 +66,7 @@ function SelectionSummary({ selection }: { selection: SelectionFigures }) {
     const { columns, aggregates } = selection;
     const { count, numeric } = aggregates;
     const notation = useNumberNotation();
+
     const figure = (label: string, value: string) => (
         <span className="shrink-0">
             <span className="text-text-faint">{label}</span> <span className="text-text">{value}</span>

package/src/table/TableToolbar.tsx

@@ -18,6 +18,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import { Button, ButtonGroup, Icon, IconButton, Menu, Separator } from '@adecore/ui';
 import { formatNumber } from '@adecore/ui/format';
+import { EXPORT_FORMATS } from '../export-formats.ts';
 import type { Engine, FileFormat } from '../protocol/index.ts';
 import { CommandField } from './CommandField.tsx';
 import type { Chip, CommandColumn } from './command-field.ts';
@@ -32,8 +33,6 @@ export interface TransferMenu {
     onImport?(): void;
 }
 
-const EXPORT_FORMATS: readonly FileFormat[] = ['csv', 'tsv', 'json', 'sql'];
-
 export interface TableToolbarProps {
     /* The app's own content before the command field, such as where the table is, with a separator after it and after the field. */
     start?: ReactNode;
@@ -110,6 +109,7 @@ export function TableToolbar({
     const { t } = useTranslation('database');
     const readOnly = readOnlyReason !== null;
     const hasStart = start !== undefined && start !== null && start !== false;
+
     const tooltipOf = (label: string): string => (readOnly ? t('table.unavailable', { action: label, reason: readOnlyReason }) : label);
 
     return (