@sqlrooms/kepler 0.29.0-rc.6 → 0.29.0-rc.8

package/LICENSE.md

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright 2025 SQLRooms Contributors
+Copyright 2024-2026 SQLRooms Contributors
+Copyright Vis.gl contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -63,14 +63,18 @@ function MapPanel() {
   const mapId = useRoomStore((state) => state.kepler.config.maps[0]?.id);
   const addTableToMap = useRoomStore((state) => state.kepler.addTableToMap);
   const isTableReady = useRoomStore((state) =>
-    Boolean(state.db.findTableByName('earthquakes')),
+    Boolean(state.db.findTable('earthquakes')),
   );
 
   useEffect(() => {
     if (!isTableReady || !mapId) return;
-    void addTableToMap(mapId, 'earthquakes', {
-      autoCreateLayers: true,
-      centerMap: true,
+    void addTableToMap({
+      mapId,
+      tableName: 'earthquakes',
+      options: {
+        autoCreateLayers: true,
+        centerMap: true,
+      },
     });
   }, [isTableReady, mapId, addTableToMap]);
 
@@ -88,19 +92,132 @@ export function App() {
 }
 ```
 
+## Adding tables to maps
+
+Use `state.kepler.addTableToMap()` to load a DuckDB table into a Kepler map. The
+preferred API is an object parameter:
+
+```ts
+await state.kepler.addTableToMap({
+  mapId,
+  tableName: 'earthquakes',
+  options: {
+    autoCreateLayers: true,
+    centerMap: true,
+  },
+});
+```
+
+`tableName` is the SQL table reference to load. It can also be a saved Kepler
+dataset id when the configured table-selection policy can resolve that id back
+to a DuckDB table.
+
+For normal add-table flows, omit `datasetId`. SQLRooms derives the persisted
+Kepler dataset id from the table-selection policy:
+
+```ts
+await state.kepler.addTableToMap({
+  mapId,
+  tableName: 'main.places',
+});
+```
+
+Only pass `datasetId` when you need to load a table under an existing Kepler
+`dataId`, such as when restoring a saved map config:
+
+```ts
+await state.kepler.addTableToMap({
+  mapId,
+  tableName: savedDataId,
+  options: {
+    autoCreateLayers: false,
+    centerMap: false,
+  },
+  datasetId: savedDataId,
+});
+```
+
+The older positional signature is still accepted for compatibility, but new code
+should use the object form so the table reference, Kepler options, config, and
+dataset-id override remain clear at the call site.
+
 ## Common customization
 
 Pass options to `createKeplerSlice()`:
 
 ```ts
+import {createKeplerTheme, type KeplerThemeOverrides} from '@sqlrooms/kepler';
+
 createKeplerSlice({
   basicKeplerProps: {
     mapboxApiAccessToken: import.meta.env.VITE_MAPBOX_TOKEN,
   },
+  keplerTheme: createKeplerTheme({
+    modalOverLayZ: 40,
+  } satisfies KeplerThemeOverrides),
+  modalPortalTarget: 'body',
   actionLogging: false,
 });
 ```
 
+Notes:
+
+- `basicKeplerProps` is for base Kepler registration/component props.
+- `keplerTheme` (optional) sets the theme passed to Kepler `ThemeProvider`.
+- `modalPortalTarget` controls modal portal placement: `'container'` (default)
+  or `'body'`.
+
+### Table selection and dataset ids
+
+`tableSelection` controls which DuckDB tables Kepler exposes and how those
+tables are represented in persisted Kepler layer and filter config.
+
+```ts
+createKeplerSlice({
+  tableSelection: {
+    defaultDbSchema: {
+      database: 'project',
+      schema: 'main',
+    },
+    includeTable: (table) => table.table.database === 'project',
+  },
+});
+```
+
+By default, tables in `defaultDbSchema` use bare dataset ids such as `places`.
+Tables outside that database/schema use qualified SQL table references. This
+keeps common main-schema project tables readable while preserving enough
+identity for tables from other schemas.
+
+Use `includeTable` to hide tables from Kepler's Add Layer UI and to skip matching
+saved dataset ids during dataset synchronization. Host apps commonly use this to
+hide attached databases that will not be available when a project is reopened.
+
+If the default dataset-id policy is not right for your app, provide both
+`getDatasetIdForTable` and `findTableForDatasetId` so new layers and restored
+layers agree on the same identity scheme:
+
+```ts
+createKeplerSlice({
+  tableSelection: {
+    getDatasetIdForTable: (table) =>
+      `${table.table.schema}:${table.table.table}`,
+    findTableForDatasetId: (tables, datasetId) => {
+      const [schema, tableName] = datasetId.split(':');
+      return tables.find(
+        (table) =>
+          table.table.schema === schema && table.table.table === tableName,
+      );
+    },
+    getTableLabel: (table) =>
+      [table.table.schema, table.table.table].filter(Boolean).join('.'),
+  },
+});
+```
+
+`getTableLabel` only affects display labels in Kepler table selectors. It does
+not change persisted dataset ids.
+
 ## Related packages
 
 - `@sqlrooms/artifacts` for artifact-backed map tabs

package/dist/KeplerSlice.d.ts

@@ -7,9 +7,12 @@ import { RoomShellSliceState, type StateCreator } from '@sqlrooms/room-shell';
 import type { AnyAction, Store as ReduxStore } from 'redux';
 import { Dispatch, Middleware } from 'redux';
 import { ReduxLoggerOptions } from 'redux-logger';
+import type { DefaultTheme } from 'styled-components';
+import { type KeplerTableSelectionOptions } from './keplerTableSelection';
 export type KeplerGLBasicProps = {
     mapboxApiAccessToken?: string;
 };
+export type KeplerModalPortalTarget = 'body' | 'container';
 export type CreateInitialMapKeplerStateContext = {
     reason: 'initialize' | 'create-map' | 'duplicate-map' | 'register-map' | 'sync-config';
     defaultInitialMapKeplerState: Partial<KeplerGlState>;
@@ -20,9 +23,26 @@ export type CreateKeplerSliceOptions = {
     config?: Partial<KeplerSliceConfig>;
     createInitialMapKeplerState?: (context: CreateInitialMapKeplerStateContext) => Partial<KeplerGlState>;
     basicKeplerProps?: Partial<KeplerGLBasicProps>;
+    /**
+     * Theme passed to Kepler's ThemeProvider.
+     * Use createKeplerTheme() to merge app-level overrides into the default theme.
+     */
+    keplerTheme?: DefaultTheme;
+    /**
+     * Where the Kepler modal (Add Map Style, Export, etc.) should be portaled.
+     * - 'body': portals to document.body (escapes stacking contexts)
+     * - 'container': portals inside the kepler map container element
+     * @default 'container'
+     */
+    modalPortalTarget?: KeplerModalPortalTarget;
     actionLogging?: boolean | ReduxLoggerOptions;
     middlewares?: Middleware[];
     applicationConfig?: KeplerApplicationConfig;
+    /**
+     * Controls which DuckDB tables appear in Kepler's Add Layer menu and how
+     * those tables are represented in saved Kepler dataset ids.
+     */
+    tableSelection?: KeplerTableSelectionOptions;
     /**
      * Called when a kepler action is dispatched
      * @param mapId - The map id
@@ -45,11 +65,44 @@ export declare function hasMapId(action: KeplerAction): action is KeplerAction &
 export type KeplerGlReduxState = {
     [id: string]: KeplerGlState;
 };
+export type AddTableToMapLoadOptions = {
+    /**
+     * Load the table under an explicit Kepler dataset id.
+     *
+     * Normal callers should omit this so the table-selection policy decides the
+     * id. Restore uses it to satisfy already-saved layer/filter dataIds.
+     */
+    datasetId?: string;
+};
+export type AddTableToMapParams = {
+    mapId: string;
+    /**
+     * Table reference to load. This can also be an existing/saved Kepler dataset
+     * id when the table-selection policy can resolve it back to a table.
+     */
+    tableName: string;
+    options?: AddDataToMapPayload['options'];
+    config?: AddDataToMapPayload['config'];
+    /**
+     * Explicit Kepler dataset id to write into `datasets.info.id`.
+     *
+     * Most callers should omit this so `tableSelection.getDatasetIdForTable`
+     * controls new ids. Restore passes it to preserve saved layer/filter dataIds.
+     */
+    datasetId?: string;
+};
+export type AddTableToMapFn = {
+    (params: AddTableToMapParams): Promise<void>;
+    (mapId: string, tableName: string, options?: AddDataToMapPayload['options'], config?: AddDataToMapPayload['config'], loadOptions?: AddTableToMapLoadOptions): Promise<void>;
+};
 export type KeplerSliceState = {
     kepler: {
         config: KeplerSliceConfig;
         map: KeplerGlReduxState;
         basicKeplerProps?: Partial<KeplerGLBasicProps>;
+        keplerTheme?: DefaultTheme;
+        modalPortalTarget: KeplerModalPortalTarget;
+        tableSelection: KeplerTableSelectionOptions;
         forwardDispatch: {
             [mapId: string]: Dispatch;
         };
@@ -70,13 +123,16 @@ export type KeplerSliceState = {
         updateTooltipFields: (mapId: string, datasetId: string, fieldNames: string[]) => void;
         toggleSplitMap: (mapId: string, index?: number) => void;
         toggleLayerForMap: (mapId: string, mapIndex: number, layerId: string) => void;
-        addTableToMap: (mapId: string, tableName: string, options?: AddDataToMapPayload['options'], config?: AddDataToMapPayload['config']) => Promise<void>;
+        addTableToMap: AddTableToMapFn;
         addTileSetToMap: (mapId: string, tableName: string, tileset: {
             name: string;
             type: string;
             metadata: VectorTileDatasetMetadata;
         }, tileMetadata: Record<string, any>, autoCreateLayers: boolean) => void;
         addConfigToMap: (mapId: string, config: KeplerMapSchema) => void;
+        isRestoringConfig: boolean;
+        withConfigPersistencePaused: <TResult>(fn: () => TResult | Promise<TResult>) => Promise<TResult>;
+        waitForConfigRestore: () => Promise<void>;
         removeDatasetFromMaps: (datasetId: string) => void;
         dispatchAction: (mapId: string, action: KeplerAction) => void;
         ensureMap: (mapId: string, name?: string) => void;
@@ -99,7 +155,7 @@ export type KeplerSliceState = {
         __reduxProviderStore: ReduxStore<KeplerGlReduxState, AnyAction> | undefined;
     };
 };
-export declare function createKeplerSlice({ basicKeplerProps, config: initialConfigProps, createInitialMapKeplerState, actionLogging, middlewares: additionalMiddlewares, applicationConfig, onAction, }?: CreateKeplerSliceOptions): StateCreator<KeplerSliceState>;
+export declare function createKeplerSlice({ basicKeplerProps, keplerTheme, modalPortalTarget, config: initialConfigProps, createInitialMapKeplerState, actionLogging, middlewares: additionalMiddlewares, applicationConfig, tableSelection, onAction, }?: CreateKeplerSliceOptions): StateCreator<KeplerSliceState>;
 type RoomStateWithDiscuss = RoomShellSliceState & KeplerSliceState;
 export declare function useStoreWithKepler<T>(selector: (state: RoomStateWithDiscuss) => T): T;
 export {};

package/dist/KeplerSlice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KeplerSlice.d.ts","sourceRoot":"","sources":["../src/KeplerSlice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"KeplerSlice.d.ts","sourceRoot":"","sources":["../src/KeplerSlice.ts"],"names":[],"mappings":"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"}

package/dist/KeplerSlice.js

@@ -14,6 +14,8 @@ import { produce, setAutoFreeze } from 'immer';
 import { taskMiddleware } from 'react-palm/tasks';
 import { compose } from 'redux';
 import { createLogger } from 'redux-logger';
+import { getUnqualifiedSqlIdentifier } from '@sqlrooms/duckdb-core';
+import { findKeplerTableForDatasetId, getKeplerDatasetIdForTable, getKeplerTableLabel, } from './keplerTableSelection';
 setAutoFreeze(false); // Kepler attempts to mutate redux state, so we need to disable immer's auto freeze to avoid errors
 const KeplerGLSchemaManager = new KeplerGLSchemaClass();
 class DesktopKeplerTable extends KeplerTable {
@@ -29,6 +31,7 @@ function createDefaultMapKeplerState(resolvedTheme) {
         },
         uiState: {
             ...INITIAL_UI_STATE,
+            activeSidePanel: null,
             currentModal: null,
             mapControls: {
                 visibleLayers: INITIAL_UI_STATE.mapControls.visibleLayers,
@@ -75,6 +78,25 @@ export function hasMapId(action) {
         action.payload.meta !== null &&
         '_id_' in action.payload.meta);
 }
+function normalizeAddTableToMapParams(paramsOrMapId, tableName, options = {}, config = {}, loadOptions = {}) {
+    if (typeof paramsOrMapId === 'object') {
+        return {
+            options: {},
+            config: {},
+            ...paramsOrMapId,
+        };
+    }
+    if (!tableName) {
+        throw new Error('addTableToMap requires a tableName.');
+    }
+    return {
+        mapId: paramsOrMapId,
+        tableName,
+        options,
+        config,
+        datasetId: loadOptions.datasetId,
+    };
+}
 // Auto save will be triggered in middleware on every kepler action
 // skip these actions to avoid unnecessary save
 const SKIP_AUTO_SAVE_ACTIONS = [
@@ -82,13 +104,15 @@ const SKIP_AUTO_SAVE_ACTIONS = [
     KeplerActionTypes.UPDATE_MAP,
     KeplerActionTypes.MOUSE_MOVE,
 ];
-export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfigProps, createInitialMapKeplerState, actionLogging = false, middlewares: additionalMiddlewares = [], applicationConfig, onAction, } = {}) {
+export function createKeplerSlice({ basicKeplerProps = {}, keplerTheme, modalPortalTarget = 'container', config: initialConfigProps, createInitialMapKeplerState, actionLogging = false, middlewares: additionalMiddlewares = [], applicationConfig, tableSelection = {}, onAction, } = {}) {
     const initialConfig = createDefaultKeplerConfig(initialConfigProps);
     initApplicationConfig({
         table: DesktopKeplerTable,
         ...applicationConfig,
     });
     let syncKeplerPromise = null;
+    let configRestoreDepth = 0;
+    const configRestorePromises = new Set();
     // When a caller arrives while a sync is already in-flight, the in-flight run
     // may have captured a stale snapshot of db.tables/kepler.map (missing maps or
     // tables added by createMap, duplicateMap, etc.). Setting this flag tells the
@@ -102,6 +126,23 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
         }
     };
     return createSlice((set, get, _store) => {
+        function getDefaultDbSchema() {
+            const currentDatabase = get().db.currentDatabase;
+            const currentSchema = get().db.currentSchema;
+            if (!currentDatabase || !currentSchema) {
+                return undefined;
+            }
+            return {
+                database: currentDatabase,
+                schema: currentSchema,
+            };
+        }
+        const resolvedTableSelection = {
+            ...tableSelection,
+        };
+        if (!resolvedTableSelection.defaultDbSchema) {
+            resolvedTableSelection.defaultDbSchema = getDefaultDbSchema;
+        }
         function resolveInitialMapKeplerState(context) {
             const resolvedTheme = getTheme();
             const defaultInitialMapKeplerState = createDefaultMapKeplerState(resolvedTheme);
@@ -146,19 +187,29 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
             kepler: {
                 config: initialConfig,
                 basicKeplerProps,
+                keplerTheme,
+                modalPortalTarget,
+                tableSelection: resolvedTableSelection,
                 map: {},
+                isRestoringConfig: false,
                 dispatchAction: () => { },
                 __reduxProviderStore: undefined,
                 forwardDispatch: {},
                 setConfig: (config) => {
-                    const nextConfig = KeplerSliceConfig.parse(config);
-                    set((state) => produce(state, (draft) => {
-                        draft.kepler.config = nextConfig;
-                    }));
-                    updateMapReduxStates();
-                    updateForwardDispatch();
-                    get().kepler.syncKeplerDatasets();
-                    updateMapConfigs();
+                    void get()
+                        .kepler.withConfigPersistencePaused(async () => {
+                        const nextConfig = KeplerSliceConfig.parse(config);
+                        set((state) => produce(state, (draft) => {
+                            draft.kepler.config = nextConfig;
+                        }));
+                        updateMapReduxStates();
+                        updateForwardDispatch();
+                        updateMapConfigs();
+                        await get().kepler.syncKeplerDatasets();
+                    })
+                        .catch((error) => {
+                        console.error('setConfig: failed to restore Kepler config', error);
+                    });
                 },
                 async initialize() {
                     const config = get().kepler.config;
@@ -189,6 +240,7 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
                                 // @ts-expect-error - Symbol.observable is not defined in the Redux type definitions
                                 [Symbol.observable]: () => { },
                             },
+                            isRestoringConfig: get().kepler.isRestoringConfig,
                         },
                     });
                     updateForwardDispatch();
@@ -262,13 +314,25 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
                     get().kepler.registerKeplerMapIfNotExists(mapId);
                     get().kepler.dispatchAction(mapId, toggleLayerForMapAction(mapIndex, layerId));
                 },
-                addTableToMap: async (mapId, tableName, options = {}, config = {}) => {
+                addTableToMap: (async (paramsOrMapId, legacyTableName, legacyOptions, legacyConfig, legacyLoadOptions) => {
+                    const { mapId, tableName, options, config, datasetId: explicitDatasetId, } = normalizeAddTableToMapParams(paramsOrMapId, legacyTableName, legacyOptions, legacyConfig, legacyLoadOptions);
+                    const tableSelection = get().kepler.tableSelection;
+                    const table = findKeplerTableForDatasetId(get().db.tables, tableName, tableSelection);
+                    const sqlTableName = table ? table.table.toString() : tableName;
+                    let datasetId = explicitDatasetId;
+                    if (!datasetId && table) {
+                        datasetId = getKeplerDatasetIdForTable(table, tableSelection);
+                    }
+                    if (!datasetId) {
+                        datasetId =
+                            getUnqualifiedSqlIdentifier(String(sqlTableName)) ?? tableName;
+                    }
                     const connector = await get().db.getConnector();
                     const duckDbColumns = await getDuckDBColumnTypes({
                         query: (query) => connector.query(query).result,
-                    }, tableName);
+                    }, sqlTableName);
                     const tableDuckDBTypes = getDuckDBColumnTypesMap(duckDbColumns);
-                    const adjustedQuery = castDuckDBTypesForKepler(tableName, duckDbColumns);
+                    const adjustedQuery = castDuckDBTypesForKepler(sqlTableName, duckDbColumns);
                     const arrowResult = await connector.query(adjustedQuery).result;
                     setGeoArrowWKBExtension(arrowResult, duckDbColumns);
                     // TODO remove once DuckDB doesn't drop geoarrow metadata
@@ -276,14 +340,22 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
                     const fields = arrowSchemaToFields(arrowResult, tableDuckDBTypes);
                     const cols = Array.from({ length: arrowResult.numCols }, (_, i) => arrowResult.getChildAt(i)).filter((col) => col);
                     if (fields && cols) {
+                        let label = tableName;
+                        if (table) {
+                            label = getKeplerTableLabel(table, tableSelection);
+                        }
+                        else {
+                            label =
+                                getUnqualifiedSqlIdentifier(String(sqlTableName)) ?? tableName;
+                        }
                         const datasets = {
                             data: { fields, cols, rows: [], arrowTable: arrowResult },
-                            info: { label: tableName, id: tableName },
-                            metadata: { tableName },
+                            info: { label, id: datasetId },
+                            metadata: { tableName: sqlTableName },
                         };
                         get().kepler.dispatchAction(mapId, addDataToMap({ datasets, options, config }));
                     }
-                },
+                }),
                 ensureMap: (mapId, name) => {
                     const now = Date.now();
                     set((state) => produce(state, (draft) => {
@@ -345,15 +417,30 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
                                         referencedDataIds.add(dataId);
                                     }
                                 }
-                                const availableTables = new Set(get()
-                                    .db.tables.filter((t) => t.table.schema === 'main')
-                                    .map((t) => t.table.table));
+                                const availableTables = get().db.tables;
                                 for (const dataId of referencedDataIds) {
-                                    if (!keplerDatasets?.[dataId] &&
-                                        availableTables.has(dataId)) {
-                                        await get().kepler.addTableToMap(mapId, dataId, {
-                                            autoCreateLayers: false,
-                                            centerMap: false,
+                                    if (keplerDatasets?.[dataId]) {
+                                        continue;
+                                    }
+                                    const table = findKeplerTableForDatasetId(availableTables, dataId, get().kepler.tableSelection);
+                                    if (!table) {
+                                        continue;
+                                    }
+                                    try {
+                                        await get().kepler.addTableToMap({
+                                            mapId,
+                                            tableName: dataId,
+                                            options: {
+                                                autoCreateLayers: false,
+                                                centerMap: false,
+                                            },
+                                            datasetId: dataId,
+                                        });
+                                    }
+                                    catch (e) {
+                                        console.error('syncKeplerDatasets: addTableToMap failed', {
+                                            dataId,
+                                            e,
                                         });
                                     }
                                 }
@@ -472,6 +559,44 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
                     }
                     get().kepler.dispatchAction(mapId, addDataToMap({ config: parsedConfig, datasets: [] }));
                 },
+                withConfigPersistencePaused: async (fn) => {
+                    configRestoreDepth += 1;
+                    if (configRestoreDepth === 1) {
+                        set((state) => produce(state, (draft) => {
+                            draft.kepler.isRestoringConfig = true;
+                        }));
+                    }
+                    const restorePromise = (async () => {
+                        try {
+                            return await fn();
+                        }
+                        finally {
+                            // Kepler restore actions can enqueue follow-up work through
+                            // react-palm; let those actions settle before persisted config
+                            // writes are allowed again.
+                            await new Promise((resolve) => setTimeout(resolve, 0));
+                            await new Promise((resolve) => setTimeout(resolve, 0));
+                            configRestoreDepth -= 1;
+                            if (configRestoreDepth === 0) {
+                                set((state) => produce(state, (draft) => {
+                                    draft.kepler.isRestoringConfig = false;
+                                }));
+                            }
+                        }
+                    })();
+                    configRestorePromises.add(restorePromise);
+                    try {
+                        return await restorePromise;
+                    }
+                    finally {
+                        configRestorePromises.delete(restorePromise);
+                    }
+                },
+                waitForConfigRestore: async () => {
+                    while (configRestorePromises.size > 0) {
+                        await Promise.allSettled(Array.from(configRestorePromises));
+                    }
+                },
                 registerKeplerMapIfNotExists(mapId) {
                     if (!get().kepler.map[mapId]) {
                         set({
@@ -514,7 +639,10 @@ export function createKeplerSlice({ basicKeplerProps = {}, config: initialConfig
                 if (!mapId)
                     throw new Error('Map ID not found in action payload');
                 const result = next(action);
-                if (!SKIP_AUTO_SAVE_ACTIONS.includes(action.type) && mapId) {
+                if (configRestoreDepth === 0 &&
+                    !get().kepler.isRestoringConfig &&
+                    !SKIP_AUTO_SAVE_ACTIONS.includes(action.type) &&
+                    mapId) {
                     // save kepler config to store
                     set((state) => produce(state, (draft) => {
                         const mapToSave = draft.kepler.config.maps.find((map) => map.id === mapId);