@adecore/database 0.21.0 → 0.21.2

package/dist/host/validate.js

@@ -13,6 +13,7 @@ const fail = (message) => {
     throw new InvalidRequest(message);
 };
 const isDict = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const isRequestId = (value) => typeof value === 'string' && value.length > 0 && value.length <= MAX_ID_LENGTH;
 /* Rejects a key nobody asked for, so a typo cannot pass for an option the helper ignores. */
 const shape = (value, label, required, optional = []) => {
     if (!isDict(value)) {
@@ -30,12 +31,12 @@ const shape = (value, label, required, optional = []) => {
     }
     return value;
 };
-const text = (value, label) => {
+const filledText = (value, label) => {
     if (typeof value !== 'string' || value.length === 0) {
         fail(`"${label}" must be a non-empty string.`);
     }
 };
-const plainText = (value, label) => {
+const anyText = (value, label) => {
     if (typeof value !== 'string') {
         fail(`"${label}" must be a string.`);
     }
@@ -56,7 +57,7 @@ const oneOf = (allowed) => (value, label) => {
     }
 };
 const absolutePath = (value, label) => {
-    text(value, label);
+    filledText(value, label);
     if (!ABSOLUTE_PATH.test(value)) {
         fail(`"${label}" must be an absolute path.`);
     }
@@ -112,17 +113,17 @@ const tunnel = (input, label) => {
     }
     if (input.kind === 'ssh') {
         const config = shape(input, label, ['kind', 'host'], ['port', 'user', 'identityFile']);
-        text(config.host, `${label}.host`);
+        filledText(config.host, `${label}.host`);
         optional(config, 'port', label, port);
-        optional(config, 'user', label, text);
-        optional(config, 'identityFile', label, text);
+        optional(config, 'user', label, filledText);
+        optional(config, 'identityFile', label, filledText);
         return;
     }
     if (input.kind === 'docker') {
         const config = shape(input, label, ['kind', 'container'], ['port', 'context']);
-        text(config.container, `${label}.container`);
+        filledText(config.container, `${label}.container`);
         optional(config, 'port', label, port);
-        optional(config, 'context', label, text);
+        optional(config, 'context', label, filledText);
         return;
     }
     fail(`"${label}.kind" must be "ssh" or "docker".`);
@@ -144,12 +145,12 @@ const connection = (input, label) => {
         optional(config, 'tunnel', label, tunnel);
         // A Docker tunnel finds the server by its container, so the host is left empty.
         const viaDocker = isDict(config.tunnel) && config.tunnel.kind === 'docker';
-        (viaDocker ? plainText : text)(config.host, `${label}.host`);
-        text(config.user, `${label}.user`);
+        (viaDocker ? anyText : filledText)(config.host, `${label}.host`);
+        filledText(config.user, `${label}.user`);
         optional(config, 'port', label, port);
-        optional(config, 'socket', label, text);
-        optional(config, 'password', label, plainText);
-        optional(config, 'database', label, plainText);
+        optional(config, 'socket', label, filledText);
+        optional(config, 'password', label, anyText);
+        optional(config, 'database', label, anyText);
         optional(config, 'tls', label, oneOf(TLS_MODES));
         optional(config, 'readOnly', label, flag);
         return;
@@ -185,43 +186,43 @@ const exportSource = (input, label) => {
     }
     if (input.kind === 'table') {
         const source = shape(input, label, ['kind', 'schema', 'table'], ['where', 'orderBy']);
-        text(source.schema, `${label}.schema`);
-        text(source.table, `${label}.table`);
-        optional(source, 'where', label, plainText);
-        optional(source, 'orderBy', label, plainText);
+        filledText(source.schema, `${label}.schema`);
+        filledText(source.table, `${label}.table`);
+        optional(source, 'where', label, anyText);
+        optional(source, 'orderBy', label, anyText);
         return;
     }
     if (input.kind === 'query') {
         const source = shape(input, label, ['kind', 'sql'], ['schema']);
-        text(source.sql, `${label}.sql`);
-        optional(source, 'schema', label, text);
+        filledText(source.sql, `${label}.sql`);
+        optional(source, 'schema', label, filledText);
         return;
     }
     fail(`"${label}.kind" must be "table" or "query".`);
 };
 const cellLimit = (params) => optional(params, 'cellLimit', 'params', (limit, name) => integer(limit, name, 1, MAX_CELL_LIMIT));
 const table = (params) => {
-    text(params.session, 'params.session');
-    text(params.schema, 'params.schema');
-    text(params.table, 'params.table');
+    filledText(params.session, 'params.session');
+    filledText(params.schema, 'params.schema');
+    filledText(params.table, 'params.table');
 };
 const TARGET = ['session', 'schema', 'table'];
 const PARAMS = {
     open: (input) => connection(shape(input, 'params', ['connection']).connection, 'params.connection'),
     test: (input) => connection(shape(input, 'params', ['connection']).connection, 'params.connection'),
-    close: (input) => text(shape(input, 'params', ['session']).session, 'params.session'),
-    schemas: (input) => text(shape(input, 'params', ['session']).session, 'params.session'),
+    close: (input) => filledText(shape(input, 'params', ['session']).session, 'params.session'),
+    schemas: (input) => filledText(shape(input, 'params', ['session']).session, 'params.session'),
     tables: (input) => {
         const params = shape(input, 'params', ['session', 'schema']);
-        text(params.session, 'params.session');
-        text(params.schema, 'params.schema');
+        filledText(params.session, 'params.session');
+        filledText(params.schema, 'params.schema');
     },
     structure: (input) => table(shape(input, 'params', TARGET)),
     rows: (input) => {
         const params = shape(input, 'params', [...TARGET, 'offset', 'limit'], ['where', 'orderBy', 'cellLimit']);
         table(params);
-        optional(params, 'where', 'params', plainText);
-        optional(params, 'orderBy', 'params', plainText);
+        optional(params, 'where', 'params', anyText);
+        optional(params, 'orderBy', 'params', anyText);
         integer(params.offset, 'params.offset', 0, Number.MAX_SAFE_INTEGER);
         integer(params.limit, 'params.limit', 1, MAX_LIMIT);
         cellLimit(params);
@@ -229,13 +230,13 @@ const PARAMS = {
     count: (input) => {
         const params = shape(input, 'params', TARGET, ['where']);
         table(params);
-        optional(params, 'where', 'params', plainText);
+        optional(params, 'where', 'params', anyText);
     },
     cell: (input) => {
         const params = shape(input, 'params', [...TARGET, 'key', 'column']);
         table(params);
         values(params.key, 'params.key', value, true);
-        text(params.column, 'params.column');
+        filledText(params.column, 'params.column');
     },
     apply: (input) => {
         const params = shape(input, 'params', [...TARGET, 'changes']);
@@ -248,34 +249,34 @@ const PARAMS = {
     },
     execute: (input) => {
         const params = shape(input, 'params', ['session', 'sql'], ['schema', 'limit', 'cellLimit']);
-        text(params.session, 'params.session');
-        text(params.sql, 'params.sql');
-        optional(params, 'schema', 'params', text);
+        filledText(params.session, 'params.session');
+        filledText(params.sql, 'params.sql');
+        optional(params, 'schema', 'params', filledText);
         optional(params, 'limit', 'params', (limit, name) => integer(limit, name, 1, MAX_LIMIT));
         cellLimit(params);
     },
     page: (input) => {
         const params = shape(input, 'params', ['session', 'sql', 'offset', 'limit'], ['schema', 'cellLimit']);
-        text(params.session, 'params.session');
-        text(params.sql, 'params.sql');
-        optional(params, 'schema', 'params', text);
+        filledText(params.session, 'params.session');
+        filledText(params.sql, 'params.sql');
+        optional(params, 'schema', 'params', filledText);
         integer(params.offset, 'params.offset', 0, Number.MAX_SAFE_INTEGER);
         integer(params.limit, 'params.limit', 1, MAX_LIMIT);
         cellLimit(params);
     },
     transaction: (input) => {
         const params = shape(input, 'params', ['session', 'action']);
-        text(params.session, 'params.session');
+        filledText(params.session, 'params.session');
         oneOf(TRANSACTION_ACTIONS)(params.action, 'params.action');
     },
     export: (input) => {
         const params = shape(input, 'params', ['session', 'source', 'format', 'path'], ['header', 'tableName']);
-        text(params.session, 'params.session');
+        filledText(params.session, 'params.session');
         exportSource(params.source, 'params.source');
         oneOf(EXPORT_FORMATS)(params.format, 'params.format');
         absolutePath(params.path, 'params.path');
         optional(params, 'header', 'params', flag);
-        optional(params, 'tableName', 'params', text);
+        optional(params, 'tableName', 'params', filledText);
     },
     sample: (input) => {
         const params = shape(input, 'params', ['path', 'format', 'header'], ['limit']);
@@ -296,25 +297,25 @@ const PARAMS = {
         }
         params.columns.forEach((column, i) => {
             if (column !== null) {
-                text(column, `params.columns[${i}]`);
+                filledText(column, `params.columns[${i}]`);
             }
         });
     },
     discover: (input) => {
         const params = shape(input, 'params', ['kind'], ['context']);
         oneOf(['docker'])(params.kind, 'params.kind');
-        optional(params, 'context', 'params', text);
+        optional(params, 'context', 'params', filledText);
     },
     cancel: (input) => {
         const params = shape(input, 'params', ['request']);
-        if (typeof params.request !== 'string' || params.request.length === 0 || params.request.length > MAX_ID_LENGTH) {
+        if (!isRequestId(params.request)) {
             fail(`"params.request" must be a string of 1 to ${MAX_ID_LENGTH} characters.`);
         }
     }
 };
 /* Checks the whole request before anything reaches the helper, which then never has to defend itself against a page. */
 export const parseRequest = (input) => {
-    const id = isDict(input) && typeof input.id === 'string' && input.id.length > 0 && input.id.length <= MAX_ID_LENGTH ? input.id : '';
+    const id = isDict(input) && isRequestId(input.id) ? input.id : '';
     try {
         const envelope = shape(input, 'request', ['id', 'method', 'params']);
         if (id === '') {

package/dist/sql.d.ts

@@ -12,6 +12,8 @@ export interface SqlTarget {
 export type LiteralValue = Cell | Value | {
     readonly kind: 'default';
 };
+export declare const NUMERIC_TEXT: RegExp;
+export declare const isNumericKind: (kind: ValueKind) => boolean;
 export declare const quoteIdentifier: (engine: Engine, name: string) => string;
 export declare const qualifiedName: (target: SqlTarget) => string;
 export declare const sqlLiteral: (engine: Engine, value: LiteralValue, kind?: ValueKind) => string;

package/dist/sql.js

@@ -1,5 +1,8 @@
 const NUMERIC_KINDS = new Set(['integer', 'decimal', 'float']);
-const NUMERIC_TEXT = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?$/;
+/* A number as SQL and most people write it: a sign, digits with an optional fraction, and an exponent. */
+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) => NUMERIC_KINDS.has(kind);
 const ORDER_ITEM = /\s*(`(?:[^`]|``)+`|"(?:[^"]|"")+"|[A-Za-z_][\w$]*)(?:\s+(asc|desc))?\s*(,|$)/iy;
 const markOf = (engine) => (engine === 'mysql' ? '`' : '"');
 export const quoteIdentifier = (engine, name) => {
@@ -28,7 +31,7 @@ export const sqlLiteral = (engine, value, kind) => {
             return Number.isFinite(value) ? String(value) : 'NULL';
         case 'string': {
             const trimmed = value.trim();
-            return kind !== undefined && NUMERIC_KINDS.has(kind) && NUMERIC_TEXT.test(trimmed) ? trimmed : stringLiteral(engine, value);
+            return kind !== undefined && isNumericKind(kind) && NUMERIC_TEXT.test(trimmed) ? trimmed : stringLiteral(engine, value);
         }
     }
     switch (value.kind) {

package/dist/structure/StructureView.js

@@ -10,14 +10,13 @@ import { useSchemaChange } from '../use-schema-change.js';
 import { referenceOf } from './structure-text.js';
 const TH = 'sticky top-0 h-7 bg-surface px-3 text-left text-xs font-medium whitespace-nowrap text-text-faint';
 const TD = 'h-7 border-t border-border-soft px-3 text-xs whitespace-nowrap text-text select-text';
-const MONO = CODE_TEXT;
 /* The columns, indexes, foreign keys and DDL of one table or view. */
 export function StructureView({ connection, schema, table, toolbarStart, className, ref }) {
     const { t } = useTranslation('database');
     const client = useDatabaseClient();
     const [answer, setAnswer] = useState(null);
     const [attempt, setAttempt] = useState(0);
-    // A schema change reloads without leaving the structure on screen: the answer keeps its place until the new one arrives.
+    // A schema change reloads in place: the old answer stays on screen until the new one arrives.
     const [reloads, setReloads] = useState(0);
     const answered = answer !== null && answer.connection === connection && answer.schema === schema && answer.table === table && answer.attempt === attempt;
     const load = answered ? answer.load : { status: 'loading' };
@@ -69,14 +68,14 @@ function ColumnsTable({ structure }) {
 }
 function ColumnRow({ column, primary, foreign }) {
     const { t } = useTranslation('database');
-    return (_jsxs("tr", { children: [_jsx("td", { className: TD, children: _jsxs("span", { className: "flex items-center gap-1.5", children: [primary ? (_jsx(Icon, { icon: KeyRound, size: 12, className: "shrink-0 text-status-needs-you" })) : foreign ? (_jsx(Icon, { icon: Link2, size: 12, className: "shrink-0 text-text-muted" })) : (_jsx("span", { className: "size-3 shrink-0" })), column.name] }) }), _jsx("td", { className: clsx(TD, MONO), children: column.type }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: _jsx(YesNo, { value: column.nullable }) }), _jsx("td", { className: clsx(TD, MONO), children: column.defaultValue }), _jsx("td", { className: TD, children: _jsxs("span", { className: "flex gap-1", children: [column.autoIncrement && _jsx(Pill, { children: t('structure.autoIncrement') }), column.generated && _jsx(Pill, { children: t('structure.generated') })] }) }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: column.comment })] }));
+    return (_jsxs("tr", { children: [_jsx("td", { className: TD, children: _jsxs("span", { className: "flex items-center gap-1.5", children: [primary ? (_jsx(Icon, { icon: KeyRound, size: 12, className: "shrink-0 text-status-needs-you" })) : foreign ? (_jsx(Icon, { icon: Link2, size: 12, className: "shrink-0 text-text-muted" })) : (_jsx("span", { className: "size-3 shrink-0" })), column.name] }) }), _jsx("td", { className: clsx(TD, CODE_TEXT), children: column.type }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: _jsx(YesNo, { value: column.nullable }) }), _jsx("td", { className: clsx(TD, CODE_TEXT), children: column.defaultValue }), _jsx("td", { className: TD, children: _jsxs("span", { className: "flex gap-1", children: [column.autoIncrement && _jsx(Pill, { children: t('structure.autoIncrement') }), column.generated && _jsx(Pill, { children: t('structure.generated') })] }) }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: column.comment })] }));
 }
 function IndexesTable({ indexes }) {
     const { t } = useTranslation('database');
     if (indexes.length === 0) {
         return _jsx(EmptyState, { children: t('structure.noIndexes') });
     }
-    return (_jsx(Grid, { heads: [t('structure.index.name'), t('structure.index.columns'), t('structure.index.kind')], children: indexes.map((index) => (_jsxs("tr", { children: [_jsx("td", { className: TD, children: index.name }), _jsx("td", { className: clsx(TD, MONO), children: index.columns.join(', ') }), _jsx("td", { className: TD, children: _jsxs("span", { className: "flex gap-1", children: [index.primary && _jsx(Pill, { tone: "accent", children: t('structure.primary') }), index.unique && !index.primary && _jsx(Pill, { children: t('structure.unique') })] }) })] }, index.name))) }));
+    return (_jsx(Grid, { heads: [t('structure.index.name'), t('structure.index.columns'), t('structure.index.kind')], children: indexes.map((index) => (_jsxs("tr", { children: [_jsx("td", { className: TD, children: index.name }), _jsx("td", { className: clsx(TD, CODE_TEXT), children: index.columns.join(', ') }), _jsx("td", { className: TD, children: _jsxs("span", { className: "flex gap-1", children: [index.primary && _jsx(Pill, { tone: "accent", children: t('structure.primary') }), index.unique && !index.primary && _jsx(Pill, { children: t('structure.unique') })] }) })] }, index.name))) }));
 }
 function ForeignKeysTable({ foreignKeys }) {
     const { t } = useTranslation('database');
@@ -90,12 +89,12 @@ function ForeignKeysTable({ foreignKeys }) {
             t('structure.foreignKey.references'),
             t('structure.foreignKey.onUpdate'),
             t('structure.foreignKey.onDelete')
-        ], children: foreignKeys.map((key, i) => (_jsxs("tr", { children: [_jsx("td", { className: TD, children: key.name }), _jsx("td", { className: clsx(TD, MONO), children: key.columns.join(', ') }), _jsx("td", { className: clsx(TD, MONO), children: referenceOf(key) }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: action(key.onUpdate) }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: action(key.onDelete) })] }, key.name ?? i))) }));
+        ], children: foreignKeys.map((key, i) => (_jsxs("tr", { children: [_jsx("td", { className: TD, children: key.name }), _jsx("td", { className: clsx(TD, CODE_TEXT), children: key.columns.join(', ') }), _jsx("td", { className: clsx(TD, CODE_TEXT), children: referenceOf(key) }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: action(key.onUpdate) }), _jsx("td", { className: clsx(TD, 'text-text-muted'), children: action(key.onDelete) })] }, key.name ?? i))) }));
 }
 function Ddl({ ddl }) {
     const { t } = useTranslation('database');
     if (ddl === null) {
         return _jsx(EmptyState, { children: t('structure.noDdl') });
     }
-    return (_jsxs("div", { className: "relative", children: [_jsxs(Button, { variant: "secondary", size: "xs", className: "absolute top-2 right-3", onClick: () => copyText(ddl), children: [_jsx(Icon, { icon: Copy, size: 12 }), t('structure.copy')] }), _jsx("pre", { className: clsx(MONO, 'overflow-auto p-3 pr-24 whitespace-pre text-text select-text'), children: ddl })] }));
+    return (_jsxs("div", { className: "relative", children: [_jsxs(Button, { variant: "secondary", size: "xs", className: "absolute top-2 right-3", onClick: () => copyText(ddl), children: [_jsx(Icon, { icon: Copy, size: 12 }), t('structure.copy')] }), _jsx("pre", { className: clsx(CODE_TEXT, 'overflow-auto p-3 pr-24 whitespace-pre text-text select-text'), children: ddl })] }));
 }

package/dist/table/TableView.js

@@ -40,6 +40,18 @@ const parseRecordWidth = (raw) => {
     }
 };
 const NO_KEYS = new Set();
+const readOnlyReasonOf = (connection, structure, t) => {
+    if (connection.config.readOnly === true) {
+        return t('table.readOnly.connection');
+    }
+    if (structure?.kind === 'view') {
+        return t('table.readOnly.view');
+    }
+    if (structure !== null && structure.rowKey === null) {
+        return t('table.readOnly.noKey');
+    }
+    return null;
+};
 /* What the strip over the table, or the app's notice, says of an export or an import. */
 const transferText = (found, t) => {
     switch (found.kind) {
@@ -53,7 +65,6 @@ const transferText = (found, t) => {
             return found.message;
     }
 };
-/* How much of a value a menu item spells out before it cuts it. */
 const MENU_VALUE_LENGTH = 40;
 const FOCUS_COMMAND = shortcut('Mod+F');
 const DUPLICATE_ROWS = shortcut('Mod+D');
@@ -112,15 +123,7 @@ function TableBody({ connection, schema, table, toolbarStart, defaultWhere, defa
     const structure = structureLoad.value;
     const loaded = rowsLoad.value?.result ?? null;
     const loadedOffset = rowsLoad.value?.offset ?? 0;
-    const readOnlyReason = connection.config.readOnly === true
-        ? t('table.readOnly.connection')
-        : structure === null
-            ? null
-            : structure.kind === 'view'
-                ? t('table.readOnly.view')
-                : structure.rowKey === null
-                    ? t('table.readOnly.noKey')
-                    : null;
+    const readOnlyReason = readOnlyReasonOf(connection, structure, t);
     const editable = readOnlyReason === null && structure !== null && loaded !== null && !rowsLoad.loading;
     const columns = useMemo(() => (loaded === null ? [] : buildGridColumns(loaded, structure)), [loaded, structure]);
     const rows = useMemo(() => (loaded === null ? [] : buildGridRows({ structure, loaded, pending, offset: loadedOffset })), [loaded, structure, pending, loadedOffset]);
@@ -220,7 +223,7 @@ function TableBody({ connection, schema, table, toolbarStart, defaultWhere, defa
             });
         }
     };
-    /* Every change of the chips applies at once; one that changes the page asks first when it would throw pending changes away. */
+    /* A change that leaves the SQL alone only remembers the filters and keeps the page. */
     const applyChips = (next) => {
         const where = chipsToWhere(next);
         const orderBy = chipsToOrderBy(engine, next);
@@ -469,7 +472,7 @@ function TableBody({ connection, schema, table, toolbarStart, defaultWhere, defa
                         busy: transfer.notice?.kind === 'exporting',
                         onExport: transfer.exportAs,
                         onImport: readOnlyReason === null && structure !== null ? () => guard(transfer.chooseImportFile) : undefined
-                    }, pendingCount: changeCount, submitting: submitting, engine: engine, chips: chips, columns: commandColumns, pageSize: pageSize, bounds: bounds, commandRef: command, onChipsChange: applyChips, onJumpToColumn: jumpToColumn, onRefresh: refresh, onAddRow: () => setPending((now) => addInsertWith(now, {})), onDeleteRows: deleteSelected, onCloneRows: () => cloneRows([...selected]), onRevertRows: () => revertRowKeys(selected), onToggleRecordView: toggleRecordView, onPageSizeChange: changePageSize, onFirstPage: () => goToPage(0), onLastPage: () => void goToLast(), onSubmit: () => void submit(), onRevert: discardPending }), notice !== null && (_jsx(Banner, { icon: CircleAlert, tone: "error", message: notice, className: "shrink-0 pt-2", children: failure === null ? (_jsx(Button, { size: "xs", onClick: refresh, children: t('table.retry') })) : (_jsx(Button, { size: "xs", onClick: () => setFailure(null), children: t('table.dismiss') })) })), shapeChanged && (_jsx(Banner, { icon: RefreshCw, tone: "neutral", message: t('table.changed'), className: "shrink-0 pt-2", children: _jsx(Button, { size: "xs", onClick: refresh, children: t('table.reload') }) })), transfer.notice !== null && (_jsx(Banner, { icon: transfer.notice.kind === 'failed' ? CircleAlert : transfer.notice.kind === 'exporting' ? Download : Check, tone: transfer.notice.kind === 'failed' ? 'error' : 'neutral', message: transferText(transfer.notice, t), className: "shrink-0 pt-2", children: transfer.notice.kind === 'exporting' ? (_jsxs(_Fragment, { children: [_jsx(Spinner, { size: 12, label: t('table.export.running', { format: transfer.notice.format.toUpperCase() }) }), _jsx(Button, { size: "xs", onClick: transfer.cancelExport, children: t('table.export.cancel') })] })) : (_jsx(Button, { size: "xs", onClick: transfer.dismiss, children: t('table.dismiss') })) })), loaded === null ? (_jsx(PanelEmpty, { busy: notice === null, children: notice === null ? t('table.loading') : t('table.notLoaded') })) : (_jsxs(_Fragment, { children: [_jsx(ValueDock, { open: recordOpen, width: recordWidth ?? RECORD_WIDTH, onWidthChange: setRecordWidth, panel: _jsx(RecordView, { label: t('table.recordFields', { table }), columns: columns, rows: rows, index: recordIndex, onIndexChange: changeRecordIndex, focusedColumn: focus !== null && focusedIndex === recordIndex ? focus.column : null, editable: editable, onCommit: commit, loadValue: loadValue, onFocusedCellChange: followInGrid, onFollow: onAction === undefined ? undefined : follow, canFollow: (cell) => referenceAt(cell) !== null, onClose: () => setRecordOpen(false), empty: t('table.empty') }), children: _jsx("div", { "aria-busy": rowsLoad.loading, className: clsx('relative flex min-h-0 flex-1 flex-col', rowsLoad.loading && 'pointer-events-none opacity-60'), children: _jsx(DataGrid, { ref: grid, label: t('table.grid', { table }), columns: columns, rows: rows, editable: editable, empty: t('table.empty'), selectedKeys: selected, onSelectedKeysChange: setSelected, onCommit: commit, loadValue: loadValue, sorts: sorts, onSortsChange: changeSorts, onFocusedCellChange: setFocus, onDeleteSelected: editable ? deleteSelected : undefined, sqlTarget: sqlTarget, queryMenu: queryMenu, menu: gridMenu, onDuplicateRows: editable ? cloneRows : undefined, onFollow: onAction === undefined ? undefined : follow, canFollow: (cell) => referenceAt(cell) !== null, onRangeChange: setRange, initialLayout: stored ?? undefined, onLayoutChange: remember, focusRequest: focusRequest, columnRequest: columnRequest }) }) }), _jsx(TableStatusBar, { elapsedMs: loaded.elapsedMs, bounds: bounds, counting: counting, selection: selectionFigures, onCount: () => void countRows(), onPrevious: () => goToPage(offset - pageSize), onNext: () => goToPage(offset + pageSize) })] })), transfer.importDraft !== null && structure !== null && (_jsx(ImportDialog, { open: true, path: transfer.importDraft.path, tableColumns: importableColumns(structure.columns), sample: transfer.importDraft.sample, header: transfer.importDraft.header, mapping: transfer.importDraft.mapping, busy: transfer.importDraft.busy, error: transfer.importDraft.error, onHeaderChange: transfer.changeHeader, onMappingChange: transfer.changeMapping, onImport: transfer.runImport, onCancel: transfer.closeImport, onOpenChange: (open) => !open && transfer.closeImport() })), _jsx(PromptDialog, { open: discard !== null, danger: true, title: t('table.discard.title'), description: t('table.discard.description'), confirmLabel: t('table.discard.confirm'), onConfirm: () => {
+                    }, pendingCount: changeCount, submitting: submitting, engine: engine, chips: chips, columns: commandColumns, pageSize: pageSize, bounds: bounds, commandRef: command, onChipsChange: applyChips, onJumpToColumn: jumpToColumn, onRefresh: refresh, onAddRow: () => setPending((now) => addInsertWith(now, {})), onDeleteRows: deleteSelected, onCloneRows: () => cloneRows([...selected]), onRevertRows: () => revertRowKeys(selected), onToggleRecordView: toggleRecordView, onPageSizeChange: changePageSize, onFirstPage: () => goToPage(0), onLastPage: () => void goToLast(), onSubmit: () => void submit(), onRevert: discardPending }), notice !== null && (_jsx(Banner, { icon: CircleAlert, tone: "error", message: notice, className: "shrink-0 pt-2", children: failure === null ? (_jsx(Button, { size: "xs", onClick: refresh, children: t('table.retry') })) : (_jsx(Button, { size: "xs", onClick: () => setFailure(null), children: t('table.dismiss') })) })), shapeChanged && (_jsx(Banner, { icon: RefreshCw, tone: "neutral", message: t('table.changed'), className: "shrink-0 pt-2", children: _jsx(Button, { size: "xs", onClick: refresh, children: t('table.reload') }) })), transfer.notice !== null && _jsx(TransferBanner, { notice: transfer.notice, onCancel: transfer.cancelExport, onDismiss: transfer.dismiss }), loaded === null ? (_jsx(PanelEmpty, { busy: notice === null, children: notice === null ? t('table.loading') : t('table.notLoaded') })) : (_jsxs(_Fragment, { children: [_jsx(ValueDock, { open: recordOpen, width: recordWidth ?? RECORD_WIDTH, onWidthChange: setRecordWidth, panel: _jsx(RecordView, { label: t('table.recordFields', { table }), columns: columns, rows: rows, index: recordIndex, onIndexChange: changeRecordIndex, focusedColumn: focus !== null && focusedIndex === recordIndex ? focus.column : null, editable: editable, onCommit: commit, loadValue: loadValue, onFocusedCellChange: followInGrid, onFollow: onAction === undefined ? undefined : follow, canFollow: (cell) => referenceAt(cell) !== null, onClose: () => setRecordOpen(false), empty: t('table.empty') }), children: _jsx("div", { "aria-busy": rowsLoad.loading, className: clsx('relative flex min-h-0 flex-1 flex-col', rowsLoad.loading && 'pointer-events-none opacity-60'), children: _jsx(DataGrid, { ref: grid, label: t('table.grid', { table }), columns: columns, rows: rows, editable: editable, empty: t('table.empty'), selectedKeys: selected, onSelectedKeysChange: setSelected, onCommit: commit, loadValue: loadValue, sorts: sorts, onSortsChange: changeSorts, onFocusedCellChange: setFocus, onDeleteSelected: editable ? deleteSelected : undefined, sqlTarget: sqlTarget, queryMenu: queryMenu, menu: gridMenu, onDuplicateRows: editable ? cloneRows : undefined, onFollow: onAction === undefined ? undefined : follow, canFollow: (cell) => referenceAt(cell) !== null, onRangeChange: setRange, initialLayout: stored ?? undefined, onLayoutChange: remember, focusRequest: focusRequest, columnRequest: columnRequest }) }) }), _jsx(TableStatusBar, { elapsedMs: loaded.elapsedMs, bounds: bounds, counting: counting, selection: selectionFigures, onCount: () => void countRows(), onPrevious: () => goToPage(offset - pageSize), onNext: () => goToPage(offset + pageSize) })] })), transfer.importDraft !== null && structure !== null && (_jsx(ImportDialog, { open: true, path: transfer.importDraft.path, tableColumns: importableColumns(structure.columns), sample: transfer.importDraft.sample, header: transfer.importDraft.header, mapping: transfer.importDraft.mapping, busy: transfer.importDraft.busy, error: transfer.importDraft.error, onHeaderChange: transfer.changeHeader, onMappingChange: transfer.changeMapping, onImport: transfer.runImport, onCancel: transfer.closeImport, onOpenChange: (open) => !open && transfer.closeImport() })), _jsx(PromptDialog, { open: discard !== null, danger: true, title: t('table.discard.title'), description: t('table.discard.description'), confirmLabel: t('table.discard.confirm'), onConfirm: () => {
                     discard?.run();
                     setDiscard(null);
                 }, onOpenChange: (open) => {
@@ -478,3 +481,7 @@ function TableBody({ connection, schema, table, toolbarStart, defaultWhere, defa
                     }
                 } })] }));
 }
+function TransferBanner({ notice, onCancel, onDismiss }) {
+    const { t } = useTranslation('database');
+    return (_jsx(Banner, { icon: notice.kind === 'failed' ? CircleAlert : notice.kind === 'exporting' ? Download : Check, tone: notice.kind === 'failed' ? 'error' : 'neutral', message: transferText(notice, t), className: "shrink-0 pt-2", children: notice.kind === 'exporting' ? (_jsxs(_Fragment, { children: [_jsx(Spinner, { size: 12, label: t('table.export.running', { format: notice.format.toUpperCase() }) }), _jsx(Button, { size: "xs", onClick: onCancel, children: t('table.export.cancel') })] })) : (_jsx(Button, { size: "xs", onClick: onDismiss, children: t('table.dismiss') })) }));
+}

package/dist/table/command-field.js

@@ -14,6 +14,7 @@ const NAME_BEING_TYPED = /^\s*(?:[\w$]*|[`"][^`"]*[`"]?)$/;
 export const chipKey = (chip) => (chip.kind === 'sort' ? `sort:${chip.column}` : `${chip.kind}:${chip.kind === 'filter' ? chip.sql : chip.text}`);
 const isFilter = (chip) => chip.kind === 'filter';
 const isSort = (chip) => chip.kind === 'sort';
+const sortChip = (sort) => ({ kind: 'sort', column: sort.column, direction: sort.direction });
 /* A name as typed in SQL: bare when it can be, else in double quotes. The quotes are only for the text of a chip; `sql` quotes per engine. */
 export const identifierText = (name) => (BARE_NAME.test(name) ? name : `"${name.replaceAll('"', '""')}"`);
 /* The conditions AND-ed together, each in parentheses when it holds an OR and there is more than one. */
@@ -39,10 +40,7 @@ export const chipsToOrderBy = (engine, chips) => chips
     .join(', ');
 export const sortsOf = (chips) => chips.filter(isSort).map(({ column, direction }) => ({ column, direction }));
 /* The sorts of a header menu replace every sort and raw ORDER BY, keeping the filters where they are. */
-export const withSorts = (chips, sorts) => [
-    ...chips.filter(isFilter),
-    ...sorts.map((sort) => ({ kind: 'sort', column: sort.column, direction: sort.direction }))
-];
+export const withSorts = (chips, sorts) => [...chips.filter(isFilter), ...sorts.map(sortChip)];
 /* A column that is not sorted joins as ascending; one that is flips its direction where it stands. */
 export const toggleSort = (chips, column) => {
     if (!chips.some((chip) => isSort(chip) && chip.column === column)) {
@@ -75,7 +73,7 @@ export const sortChipsOf = (engine, orderBy) => {
         return [];
     }
     const sorts = parseOrderByLoose(engine, text);
-    return sorts === null ? [{ kind: 'order', text }] : sorts.map((sort) => ({ kind: 'sort', column: sort.column, direction: sort.direction }));
+    return sorts === null ? [{ kind: 'order', text }] : sorts.map(sortChip);
 };
 export const chipsFromQuery = (engine, { where, orderBy, remembered }) => [
     ...filterChipsOf(where, remembered),
@@ -112,13 +110,11 @@ const readOperation = (rest) => {
         const operator = compare[1] === '==' ? '=' : compare[1] === '!=' ? '<>' : compare[1];
         return isClosed(compare[2]) ? `${operator} ${compare[2]}` : null;
     }
-    const pattern = PATTERN.exec(rest);
-    if (pattern !== null) {
-        return isClosed(pattern[2]) ? `${upper(pattern[1])} ${pattern[2]}` : null;
-    }
-    const member = MEMBER.exec(rest);
-    if (member !== null) {
-        return isClosed(member[2]) ? `${upper(member[1])} ${member[2]}` : null;
+    for (const form of [PATTERN, MEMBER]) {
+        const found = form.exec(rest);
+        if (found !== null) {
+            return isClosed(found[2]) ? `${upper(found[1])} ${found[2]}` : null;
+        }
     }
     const between = BETWEEN.exec(rest);
     if (between !== null) {

package/dist/table/grid-rows.js

@@ -7,7 +7,8 @@ export const insertedRowKey = (id) => `new:${id}`;
 export const parseRowKey = (key) => key.startsWith('new:') ? { kind: 'inserted', id: Number(key.slice(4)) } : { kind: 'loaded', index: Number(key.slice(4)) };
 export const buildGridColumns = (loaded, structure) => {
     const keys = { primaryKey: structure?.primaryKey ?? [], foreignKey: structure?.foreignKeys.flatMap((key) => key.columns) ?? [] };
-    return loaded.columns.map((column) => gridColumnOf(column, structure?.columns.find((info) => info.name === column.name), keys));
+    const infoOf = (name) => structure?.columns.find((info) => info.name === name);
+    return loaded.columns.map((column) => gridColumnOf(column, infoOf(column.name), keys));
 };
 /* The loaded rows with their pending edits laid over them, then the rows waiting to be inserted. */
 export const buildGridRows = ({ structure, loaded, pending, offset }) => {

package/dist/table/layout-store.js

@@ -1,11 +1,14 @@
 import { PAGE_SIZES } from './paging.js';
-/* Bump when the shape changes; a stored value of another version is ignored rather than migrated. `filters` was added alongside `where`, which still says the same thing for a value without it. */
+/*
+ * Bump when the shape changes; a stored value of another version is ignored rather than migrated. `filters`
+ * came later without a bump, since `where` still says the same thing for a value without it.
+ */
 export const LAYOUT_VERSION = 1;
 export const EMPTY_LAYOUT = { widths: {}, hidden: [], pinned: [], pageSize: null, where: '', orderBy: '', filters: [] };
 export const layoutStorageKey = (connectionId, schema, table) => `database:table:${connectionId}:${schema}.${table}`;
 const isStringList = (value) => Array.isArray(value) && value.every((item) => typeof item === 'string');
-const isStoredFilter = (value) => isRecord(value) && typeof value.text === 'string' && typeof value.sql === 'string' && value.sql.trim() !== '';
 const isRecord = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
+const isStoredFilter = (value) => isRecord(value) && typeof value.text === 'string' && typeof value.sql === 'string' && value.sql.trim() !== '';
 export const serializeLayout = (layout) => JSON.stringify({ version: LAYOUT_VERSION, ...layout });
 /* The layout a stored text holds, or `null` when it is missing, broken or from another version. A field that is off is dropped alone. */
 export const parseStoredLayout = (text) => {

package/dist/table/pending.js

@@ -69,7 +69,6 @@ export const rowKeyOf = (structure, loaded, row) => {
     }
     return key;
 };
-const numeric = (text) => Number(text);
 /* Updates, then deletes, then inserts, all computed against the page as loaded. Throws for a change on a row without a usable key, which the grid never lets a person make. */
 export const toRowChanges = (structure, loaded, pending) => {
     const keyOf = (row) => {
@@ -80,7 +79,7 @@ export const toRowChanges = (structure, loaded, pending) => {
         return key;
     };
     const updates = Object.keys(pending.edits)
-        .map(numeric)
+        .map(Number)
         .filter((row) => !pending.deletes.has(row))
         .sort((left, right) => left - right)
         .map((row) => ({ kind: 'update', key: keyOf(row), values: pending.edits[row] }));
@@ -88,7 +87,16 @@ export const toRowChanges = (structure, loaded, pending) => {
     const inserts = pending.inserts.map((row) => ({ kind: 'insert', values: row.values }));
     return [...updates, ...deletes, ...inserts];
 };
+const keyValueText = (value) => {
+    if (value === null) {
+        return 'NULL';
+    }
+    if (typeof value === 'object') {
+        return `0x${value.hex}`;
+    }
+    return typeof value === 'string' ? `'${value}'` : String(value);
+};
 /* A key as a person would write it in a WHERE: `id = 5, tenant = 'a'`. */
 export const describeKey = (key) => Object.entries(key)
-    .map(([column, value]) => `${column} = ${value === null ? 'NULL' : typeof value === 'object' ? `0x${value.hex}` : typeof value === 'string' ? `'${value}'` : String(value)}`)
+    .map(([column, value]) => `${column} = ${keyValueText(value)}`)
     .join(', ');

package/dist/table/useTableTransfer.js

@@ -1,7 +1,9 @@
 import { useEffect, useRef, useState } from 'react';
 import { messageOf } from '@adecore/ui';
-import { DatabaseRequestError } from '../client/types.js';
+import { isCancelled } from '../client/types.js';
 import { formatOfPath, importableColumns, mapColumn, matchColumns } from './import-mapping.js';
+/* How long a finished export or import stays on the strip. */
+const NOTICE_MS = 8000;
 /* Export of the table as filtered, and import of a file into it, with the state both need between the dialogs and the strip. */
 export function useTableTransfer({ client, session, files, schema, table, structure, where, orderBy, onImported, report }) {
     const [notice, setNotice] = useState(null);
@@ -13,7 +15,7 @@ export function useTableTransfer({ client, session, files, schema, table, struct
         if (notice?.kind !== 'exported' && notice?.kind !== 'imported') {
             return;
         }
-        const timer = setTimeout(() => setNotice(null), 8000);
+        const timer = setTimeout(() => setNotice(null), NOTICE_MS);
         return () => clearTimeout(timer);
     }, [notice]);
     useEffect(() => () => sampling.current?.abort(), []);
@@ -43,8 +45,7 @@ export function useTableTransfer({ client, session, files, schema, table, struct
                 show({ kind: 'exported', rows: result.rows });
             }
             catch (error) {
-                const cancelled = controller.signal.aborted || (error instanceof DatabaseRequestError && error.code === 'cancelled');
-                if (cancelled) {
+                if (controller.signal.aborted || isCancelled(error)) {
                     setNotice(null);
                 }
                 else {
@@ -93,7 +94,7 @@ export function useTableTransfer({ client, session, files, schema, table, struct
                 setImportDraft((now) => now === null || now.path !== path ? now : { ...now, header, sample: read, mapping: matchColumns(read.columns, tableColumns, header) });
             }
             catch (error) {
-                if (!(error instanceof DatabaseRequestError && error.code === 'cancelled')) {
+                if (!isCancelled(error)) {
                     setImportDraft((now) => (now === null || now.path !== path ? now : { ...now, error: messageOf(error) }));
                 }
             }

package/dist/testing/fake.js

@@ -32,12 +32,15 @@ const toTables = (database) => new Map(Object.entries(database.schemas).map(([sc
         }
     ]))
 ]));
-const findTable = (session, schema, name) => {
+const findSchema = (session, schema) => {
     const tables = session.schemas.get(schema);
     if (tables === undefined) {
         throw new FakeError('query-failed', `Unknown database '${schema}'`, '42000');
     }
-    const table = tables.get(name);
+    return tables;
+};
+const findTable = (session, schema, name) => {
+    const table = findSchema(session, schema).get(name);
     if (table === undefined) {
         throw new FakeError('query-failed', `Table '${schema}.${name}' doesn't exist`, '42S02');
     }
@@ -191,9 +194,7 @@ const selectSchema = (session, schema) => {
     if (schema === undefined) {
         return;
     }
-    if (!session.schemas.has(schema)) {
-        throw new FakeError('query-failed', `Unknown database '${schema}'`, '42000');
-    }
+    findSchema(session, schema);
     session.schema = schema;
 };
 /*
@@ -246,10 +247,7 @@ export const fakeDatabaseTransport = (options) => {
             schemas: [...sessionOf(session).schemas.keys()].map((name) => ({ name, system: SYSTEM_SCHEMAS.includes(name) }))
         }),
         tables: ({ session, schema }) => {
-            const tables = sessionOf(session).schemas.get(schema);
-            if (tables === undefined) {
-                throw new FakeError('query-failed', `Unknown database '${schema}'`, '42000');
-            }
+            const tables = findSchema(sessionOf(session), schema);
             return { tables: [...tables].map(([name, table]) => ({ name, kind: table.kind, rowEstimate: table.rows.length, comment: null })) };
         },
         structure: ({ session, schema, table: name }) => {

package/dist/value/ValueEditor.js

@@ -69,7 +69,7 @@ export function ValueEditor({ column, value, editable, onCommit }) {
             copyText(rendered.text);
         }
         else {
-            copyText(draft.mode === 'value' ? draft.text : draft.mode === 'null' ? 'NULL' : 'DEFAULT');
+            copyText(placeholder ?? draft.text);
         }
     };
     const editor = (extra) => (_jsx(TextArea, { "aria-label": t(source.binary ? 'value.hexEditor' : 'value.editor', { column: column.name }), wrap: wrap || source.binary ? 'soft' : 'off', spellCheck: false, readOnly: !editable, placeholder: placeholder, value: draft.mode === 'value' ? draft.text : '', className: clsx(CODE_TEXT, extra), onChange: (event) => change({ text: event.target.value, mode: 'value' }), onKeyDown: handleKeyDown }));

package/dist/value/draft.js

@@ -2,12 +2,7 @@ import { parseDraft } from '../grid/edit-value.js';
 import { parseHex } from './hex.js';
 import { checkJson, isJsonDocument } from './json.js';
 /* The text a value is edited as: a binary value as its hex, everything else as it is written. */
-const textOf = (value) => {
-    if (typeof value === 'object') {
-        return value.hex;
-    }
-    return String(value);
-};
+const textOf = (value) => (typeof value === 'object' ? value.hex : String(value));
 export const sourceOf = (column, value) => {
     const binary = column.kind === 'binary' || (value !== null && typeof value === 'object');
     const original = value === null ? { text: '', mode: 'null' } : { text: textOf(value), mode: 'value' };

package/dist/value/json.js

@@ -42,11 +42,11 @@ export const prettyJson = (text) => {
             continue;
         }
         if (char === '{' || char === '[') {
-            const empty = nextToken(i + 1) === (char === '{' ? '}' : ']');
+            const close = char === '{' ? '}' : ']';
             output += char;
-            if (empty) {
-                output += char === '{' ? '}' : ']';
-                i = text.indexOf(char === '{' ? '}' : ']', i + 1) + 1;
+            if (nextToken(i + 1) === close) {
+                output += close;
+                i = text.indexOf(close, i + 1) + 1;
                 continue;
             }
             depth++;