@rebasepro/studio 0.13.0 → 0.13.1-canary.g18cfeb7

package/dist/{SQLEditor-CL6DcGRM.js → SQLEditor-BmI0iIWK.js}

@@ -3,7 +3,7 @@ import { ConfirmationDialog, ErrorView, IconForView, useRebaseContext, useSnackb
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Button, Checkbox, CircularProgress, Collapse, CopyIcon, DatabaseIcon, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, Menu, MenuIcon, MenuItem, MoreVerticalIcon, PencilIcon, PlayIcon, PlusIcon, RefreshCwIcon, ResizablePanels, Tab, Tabs, TerminalIcon, TextField, TextareaAutosize, Tooltip, Trash2Icon, Typography, VirtualTable, XIcon, cls, defaultBorderMixin, iconSize } from "@rebasepro/ui";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { toSnakeCase } from "@rebasepro/utils";
+import { isArrayValue, isRecordValue, readStoredJson, readStoredString, toSnakeCase, writeStoredJson, writeStoredString } from "@rebasepro/utils";
 import { createPortal } from "react-dom";
 import { parseFirst } from "pgsql-ast-parser";
 //#region src/components/SQLEditor/SchemaBrowser.tsx
@@ -763,6 +763,16 @@ var getStoragePrefix = (baseUrl) => {
 	if (!baseUrl) return "default";
 	return baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_");
 };
+/**
+* Whether a stored entry is a tab this release can restore. Storage holds
+* whatever the last version to run wrote, so the fields are checked rather
+* than assumed.
+*/
+function isStoredTab(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const tab = value;
+	return typeof tab.id === "string" && typeof tab.name === "string" && typeof tab.sql === "string";
+}
 var SQLEditor = () => {
 	const { databaseAdmin, client } = useRebaseContext();
 	const sidePanelController = useStudioSidePanelController();
@@ -775,21 +785,21 @@ var SQLEditor = () => {
 	const schemaFetchedRef = useRef(false);
 	const [schemaError, setSchemaError] = useState(null);
 	const [selectedDatabase, setSelectedDatabase] = useState(() => {
-		const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-		return localStorage.getItem(`rebase_sql_selected_db_${projectPrefixSync}`) || void 0;
+		return readStoredString(`rebase_sql_selected_db_${client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default"}`) || void 0;
 	});
 	const [selectedRole, setSelectedRole] = useState(() => {
-		const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-		return localStorage.getItem(`rebase_sql_selected_role_${projectPrefixSync}`) || void 0;
+		return readStoredString(`rebase_sql_selected_role_${client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default"}`) || void 0;
 	});
 	const [availableDatabases, setAvailableDatabases] = useState([]);
 	const [availableRoles, setAvailableRoles] = useState([]);
 	const [isLoadingConfig, setIsLoadingConfig] = useState(true);
 	const [connectionConfigError, setConnectionConfigError] = useState(null);
 	const [tabs, setTabs] = useState(() => {
-		const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-		const saved = localStorage.getItem(`rebase_sql_tabs_${projectPrefixSync}`);
-		if (saved) return JSON.parse(saved).map((t) => ({
+		const projectPrefixSync = getStoragePrefix(client?.baseUrl);
+		const restored = readStoredJson(`rebase_sql_tabs_${projectPrefixSync}`, {
+			fallback: [],
+			accept: isArrayValue
+		}).filter(isStoredTab).map((t) => ({
 			...t,
 			results: null,
 			loading: false,
@@ -797,12 +807,13 @@ var SQLEditor = () => {
 			execTime: null,
 			lastExecutedSql: null
 		}));
+		if (restored.length > 0) return restored;
 		return [{
 			id: "1",
 			name: "Query 1",
 			sql: "SELECT * FROM ",
-			database: localStorage.getItem(`rebase_sql_selected_db_${projectPrefixSync}`) || void 0,
-			role: localStorage.getItem(`rebase_sql_selected_role_${projectPrefixSync}`) || void 0,
+			database: readStoredString(`rebase_sql_selected_db_${projectPrefixSync}`) || void 0,
+			role: readStoredString(`rebase_sql_selected_role_${projectPrefixSync}`) || void 0,
 			results: null,
 			loading: false,
 			error: null,
@@ -811,8 +822,7 @@ var SQLEditor = () => {
 		}];
 	});
 	const [activeTabId, setActiveTabId] = useState(() => {
-		const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-		return localStorage.getItem(`rebase_sql_active_tab_${projectPrefixSync}`) || "1";
+		return readStoredString(`rebase_sql_active_tab_${client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default"}`) || "1";
 	});
 	const activeTab = tabs.find((t) => t.id === activeTabId) || tabs[0];
 	const updateActiveTab = useCallback((update) => {
@@ -845,21 +855,19 @@ var SQLEditor = () => {
 				if (mounted) {
 					setAvailableDatabases(dbs);
 					setAvailableRoles(roles);
-					const loadedDb = localStorage.getItem(`rebase_sql_selected_db_${projectPrefix}`) || void 0;
-					const loadedRole = localStorage.getItem(`rebase_sql_selected_role_${projectPrefix}`) || void 0;
-					const initialActiveTabId = localStorage.getItem(`rebase_sql_active_tab_${projectPrefix}`) || "1";
-					let initialTabs = [];
-					try {
-						const savedTabs = localStorage.getItem(`rebase_sql_tabs_${projectPrefix}`);
-						if (savedTabs) initialTabs = JSON.parse(savedTabs);
-					} catch (e) {}
-					const currentActiveTab = initialTabs.find((t) => t.id === initialActiveTabId);
+					const loadedDb = readStoredString(`rebase_sql_selected_db_${projectPrefix}`) || void 0;
+					const loadedRole = readStoredString(`rebase_sql_selected_role_${projectPrefix}`) || void 0;
+					const initialActiveTabId = readStoredString(`rebase_sql_active_tab_${projectPrefix}`) || "1";
+					const currentActiveTab = readStoredJson(`rebase_sql_tabs_${projectPrefix}`, {
+						fallback: [],
+						accept: isArrayValue
+					}).find((t) => t.id === initialActiveTabId);
 					let actualDb = currentActiveTab?.database || loadedDb;
 					if (actualDb && !dbs.includes(actualDb)) actualDb = void 0;
 					if (!actualDb && dbs.length > 0) actualDb = currentDbFromApi && dbs.includes(currentDbFromApi) ? currentDbFromApi : dbs[0];
 					if (actualDb) {
 						setSelectedDatabase(actualDb);
-						localStorage.setItem(`rebase_sql_selected_db_${projectPrefix}`, actualDb);
+						writeStoredString(`rebase_sql_selected_db_${projectPrefix}`, actualDb);
 						setTabs((prev) => prev.map((t) => t.id === initialActiveTabId && (!t.database || !dbs.includes(t.database)) ? {
 							...t,
 							database: actualDb
@@ -872,7 +880,7 @@ var SQLEditor = () => {
 					else actualRole = roles.includes("postgres") ? "postgres" : roles[0];
 					if (actualRole) {
 						setSelectedRole(actualRole);
-						localStorage.setItem(`rebase_sql_selected_role_${projectPrefix}`, actualRole);
+						writeStoredString(`rebase_sql_selected_role_${projectPrefix}`, actualRole);
 						setTabs((prev) => prev.map((t) => t.id === initialActiveTabId && (!t.role || !roles.includes(t.role)) ? {
 							...t,
 							role: actualRole
@@ -896,7 +904,7 @@ var SQLEditor = () => {
 	}, [databaseAdmin, projectPrefix]);
 	const handleDatabaseChange = (db, tabId) => {
 		setSelectedDatabase(db);
-		localStorage.setItem(`rebase_sql_selected_db_${projectPrefix}`, db);
+		writeStoredString(`rebase_sql_selected_db_${projectPrefix}`, db);
 		setTabs((prev) => prev.map((t) => t.id === (tabId || activeTabId) ? {
 			...t,
 			database: db
@@ -905,7 +913,7 @@ var SQLEditor = () => {
 	};
 	const handleRoleChange = (role, tabId) => {
 		setSelectedRole(role);
-		localStorage.setItem(`rebase_sql_selected_role_${projectPrefix}`, role);
+		writeStoredString(`rebase_sql_selected_role_${projectPrefix}`, role);
 		setTabs((prev) => prev.map((t) => t.id === (tabId || activeTabId) ? {
 			...t,
 			role
@@ -917,7 +925,7 @@ var SQLEditor = () => {
 		if (newTab) {
 			if (newTab.database && newTab.database !== selectedDatabase) {
 				setSelectedDatabase(newTab.database);
-				localStorage.setItem(`rebase_sql_selected_db_${projectPrefix}`, newTab.database);
+				writeStoredString(`rebase_sql_selected_db_${projectPrefix}`, newTab.database);
 				schemaFetchedRef.current = false;
 			} else if (!newTab.database && selectedDatabase) setTabs((prev) => prev.map((t) => t.id === newTabId ? {
 				...t,
@@ -925,7 +933,7 @@ var SQLEditor = () => {
 			} : t));
 			if (newTab.role && newTab.role !== selectedRole) {
 				setSelectedRole(newTab.role);
-				localStorage.setItem(`rebase_sql_selected_role_${projectPrefix}`, newTab.role);
+				writeStoredString(`rebase_sql_selected_role_${projectPrefix}`, newTab.role);
 			} else if (!newTab.role && selectedRole) setTabs((prev) => prev.map((t) => t.id === newTabId ? {
 				...t,
 				role: selectedRole
@@ -1128,21 +1136,24 @@ var SQLEditor = () => {
 		selectedRole
 	]);
 	const [columnWidths, setColumnWidths] = useState(() => {
-		const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-		const saved = localStorage.getItem(`rebase_sql_column_widths_${projectPrefixSync}`);
-		return saved ? JSON.parse(saved) : {};
+		return readStoredJson(`rebase_sql_column_widths_${client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default"}`, {
+			fallback: {},
+			accept: isRecordValue
+		});
 	});
 	const [snippets, setSnippets] = useState([]);
 	const [history, setHistory] = useState([]);
 	const [isSaveDialogOpen, setIsSaveDialogOpen] = useState(false);
 	const [newSnippetName, setNewSnippetName] = useState("");
 	useEffect(() => {
-		const savedSnippets = localStorage.getItem(`rebase_sql_snippets_${projectPrefix}`);
-		if (savedSnippets) setSnippets(JSON.parse(savedSnippets));
-		else setSnippets([]);
-		const savedHistory = localStorage.getItem(`rebase_sql_history_${projectPrefix}`);
-		if (savedHistory) setHistory(JSON.parse(savedHistory));
-		else setHistory([]);
+		setSnippets(readStoredJson(`rebase_sql_snippets_${projectPrefix}`, {
+			fallback: [],
+			accept: isArrayValue
+		}));
+		setHistory(readStoredJson(`rebase_sql_history_${projectPrefix}`, {
+			fallback: [],
+			accept: isArrayValue
+		}));
 	}, [projectPrefix]);
 	useEffect(() => {
 		const sanitizedTabs = tabs.map((t) => ({
@@ -1152,18 +1163,18 @@ var SQLEditor = () => {
 			database: t.database,
 			role: t.role
 		}));
-		localStorage.setItem(`rebase_sql_tabs_${projectPrefix}`, JSON.stringify(sanitizedTabs));
+		writeStoredJson(`rebase_sql_tabs_${projectPrefix}`, sanitizedTabs);
 	}, [tabs, projectPrefix]);
 	useEffect(() => {
-		localStorage.setItem(`rebase_sql_active_tab_${projectPrefix}`, activeTabId);
+		writeStoredString(`rebase_sql_active_tab_${projectPrefix}`, activeTabId);
 	}, [activeTabId, projectPrefix]);
 	const saveSnippets = (newSnippets) => {
 		setSnippets(newSnippets);
-		localStorage.setItem(`rebase_sql_snippets_${projectPrefix}`, JSON.stringify(newSnippets));
+		writeStoredJson(`rebase_sql_snippets_${projectPrefix}`, newSnippets);
 	};
 	const saveHistory = (newHistory) => {
 		setHistory(newHistory);
-		localStorage.setItem(`rebase_sql_history_${projectPrefix}`, JSON.stringify(newHistory.slice(-50)));
+		writeStoredJson(`rebase_sql_history_${projectPrefix}`, newHistory.slice(-50));
 	};
 	const handleDeleteSnippet = (id) => {
 		saveSnippets(snippets.filter((s) => s.id !== id));
@@ -1213,7 +1224,7 @@ var SQLEditor = () => {
 					[key]: width
 				}
 			};
-			localStorage.setItem(`rebase_sql_column_widths_${projectPrefix}`, JSON.stringify(newWidths));
+			writeStoredJson(`rebase_sql_column_widths_${projectPrefix}`, newWidths);
 			return newWidths;
 		});
 	}, [activeTab.sql, projectPrefix]);
@@ -1654,33 +1665,18 @@ var SQLEditor = () => {
 			]
 		});
 	};
-	const [sidebarSize, setSidebarSize] = useState(() => {
-		try {
-			const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-			const saved = localStorage.getItem(`rebase_sql_editor_sidebar_size_${projectPrefixSync}`);
-			return saved !== null ? parseFloat(saved) : 20;
-		} catch (e) {
-			return 20;
-		}
-	});
-	const [editorHeight, setEditorHeight] = useState(() => {
-		try {
-			const projectPrefixSync = client?.baseUrl ? client.baseUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9]/g, "_") : "default";
-			const saved = localStorage.getItem(`rebase_sql_editor_height_${projectPrefixSync}`);
-			return saved !== null ? parseFloat(saved) : 50;
-		} catch (e) {
-			return 50;
-		}
-	});
+	const readStoredSize = (key, fallback) => {
+		const saved = readStoredString(`${key}_${getStoragePrefix(client?.baseUrl)}`);
+		const parsed = saved === null ? NaN : parseFloat(saved);
+		return Number.isFinite(parsed) ? parsed : fallback;
+	};
+	const [sidebarSize, setSidebarSize] = useState(() => readStoredSize("rebase_sql_editor_sidebar_size", 20));
+	const [editorHeight, setEditorHeight] = useState(() => readStoredSize("rebase_sql_editor_height", 50));
 	useEffect(() => {
-		try {
-			localStorage.setItem(`rebase_sql_editor_sidebar_size_${projectPrefix}`, sidebarSize.toString());
-		} catch (e) {}
+		writeStoredString(`rebase_sql_editor_sidebar_size_${projectPrefix}`, sidebarSize.toString());
 	}, [sidebarSize, projectPrefix]);
 	useEffect(() => {
-		try {
-			localStorage.setItem(`rebase_sql_editor_height_${projectPrefix}`, editorHeight.toString());
-		} catch (e) {}
+		writeStoredString(`rebase_sql_editor_height_${projectPrefix}`, editorHeight.toString());
 	}, [editorHeight, projectPrefix]);
 	const activeSnippet = snippets.find((s) => s.sql === activeTab.sql);
 	const isFavorite = activeSnippet?.isFavorite || false;
@@ -1973,4 +1969,4 @@ var SQLEditor = () => {
 //#endregion
 export { SQLEditor };
 
-//# sourceMappingURL=SQLEditor-CL6DcGRM.js.map
+//# sourceMappingURL=SQLEditor-BmI0iIWK.js.map