Merge pull request #3688 from opral/lixdk-460-incremental

reduce change storage by 90%

Author: samuelstroschein

packages/csv-app/src/components/ChangeSet.tsx

@@ -4,7 +4,7 @@ import {
 	createThread,
 	createCheckpoint,
 	Thread,
-	Version,
+	LixVersion,
 } from "@lix-js/sdk";
 import { useAtom } from "jotai";
 import { useCallback, useEffect, useState } from "react";
@@ -252,7 +252,7 @@ const getChanges = async (
 	changeSetId: string,
 	fileId: string,
 	// @ts-expect-error - not used yet
-	currentVersion: Version,
+	currentVersion: LixVersion,
 	previousChangeSetId?: string | undefined | null
 ): Promise<
 	Record<

packages/csv-app/src/layouts/OpenFileLayout.tsx

@@ -22,11 +22,7 @@ import { useCallback, useMemo, useState } from "react";
 import { currentVersionAtom, existingVersionsAtom, lixAtom } from "../state.ts";
 import { saveLixToOpfs } from "../helper/saveLixToOpfs.ts";
 import clsx from "clsx";
-import {
-	Version,
-	createVersion,
-	switchVersion,
-} from "@lix-js/sdk";
+import { LixVersion, createVersion, switchVersion } from "@lix-js/sdk";
 import CustomLink from "../components/CustomLink.tsx";
 
 export default function Layout(props: { children: React.ReactNode }) {
@@ -221,7 +217,7 @@ const VersionDropdown = () => {
 	const [lix] = useAtom(lixAtom);
 
 	const switchToversion = useCallback(
-		async (version: Version) => {
+		async (version: LixVersion) => {
 			await switchVersion({ lix, to: version });
 			await saveLixToOpfs({ lix });
 		},

packages/csv-app/src/state.ts

@@ -1,10 +1,4 @@
-import {
-	Account,
-	Lix,
-	Version,
-	openLix,
-	switchAccount,
-} from "@lix-js/sdk";
+import { Account, Lix, LixVersion, openLix, switchAccount } from "@lix-js/sdk";
 import { atom } from "jotai";
 import { plugin as csvPlugin } from "@lix-js/plugin-csv";
 import { getOriginPrivateDirectory } from "native-file-system-adapter";
@@ -155,7 +149,7 @@ export const lixAtom = atom(async (get) => {
 });
 
 export const currentVersionAtom = atom<
-	Promise<Version & { targets: Version[] }>
+	Promise<LixVersion & { targets: LixVersion[] }>
 >(async (get) => {
 	get(withPollingAtom);
 	const lix = await get(lixAtom);

packages/lix-file-manager/src/components/MergeDialog.tsx

@@ -6,7 +6,7 @@ import {
 	DialogTitle,
 	DialogFooter,
 } from "@/components/ui/dialog.js";
-import { Version } from "@lix-js/sdk";
+import { LixVersion } from "@lix-js/sdk";
 import {
 	Select,
 	SelectContent,
@@ -20,10 +20,10 @@ import { transition } from "@lix-js/sdk";
 interface MergeDialogProps {
 	open: boolean;
 	onOpenChange: (open: boolean) => void;
-	versions: Version[];
-	activeVersion: Version;
+	versions: LixVersion[];
+	activeVersion: LixVersion;
 	lix: any;
-	initialSourceVersion: Version | null;
+	initialSourceVersion: LixVersion | null;
 	onMergeComplete: () => void;
 }
 

packages/lix-file-manager/src/components/VersionDropdown.tsx

@@ -21,7 +21,7 @@ import {
 	isSyncingAtom,
 	lixAtom,
 } from "../state.js";
-import { Version, createVersion, switchVersion } from "@lix-js/sdk";
+import { LixVersion, createVersion, switchVersion } from "@lix-js/sdk";
 import { saveLixToOpfs } from "../helper/saveLixToOpfs.js";
 import { Check, Trash2, ChevronDown, Plus } from "lucide-react";
 import { MergeDialog } from "./MergeDialog.js";
@@ -32,16 +32,18 @@ export function VersionDropdown() {
 	const [existingVersions] = useAtom(existingVersionsAtom);
 	const [lix] = useAtom(lixAtom);
 	const [isSyncing] = useAtom(isSyncingAtom);
-	const [versionToDelete, setVersionToDelete] = useState<Version | null>(null);
+	const [versionToDelete, setVersionToDelete] = useState<LixVersion | null>(
+		null
+	);
 	const [dropdownOpen, setDropdownOpen] = useState(false);
 	const [deleteConfirmation, setDeleteConfirmation] = useState("");
 	const [isHovered, setIsHovered] = useState(false);
 	const [mergeDialogOpen, setMergeDialogOpen] = useState(false);
 	const [selectedSourceVersion, setSelectedSourceVersion] =
-		useState<Version | null>(null);
+		useState<LixVersion | null>(null);
 
 	const switchToVersion = useCallback(
-		async (version: Version) => {
+		async (version: LixVersion) => {
 			if (!lix) return;
 			await switchVersion({ lix, to: version });
 			await saveLixToOpfs({ lix });
@@ -60,7 +62,7 @@ export function VersionDropdown() {
 		await switchToVersion(newVersion);
 	}, [lix, activeVersion, switchToVersion]);
 
-	const handleDeleteVersion = async (version: Version) => {
+	const handleDeleteVersion = async (version: LixVersion) => {
 		if (!lix) return;
 
 		await lix.db.transaction().execute(async (trx) => {

packages/lix-file-manager/src/state.ts

@@ -1,10 +1,4 @@
-import {
-	openLix,
-	Account,
-	switchAccount,
-	Lix,
-	Version,
-} from "@lix-js/sdk";
+import { openLix, Account, switchAccount, Lix, LixVersion } from "@lix-js/sdk";
 import { atom } from "jotai";
 import { plugin as csvPlugin } from "@lix-js/plugin-csv";
 import { plugin as txtPlugin } from "@lix-js/plugin-txt";
@@ -211,19 +205,21 @@ export const lixAtom = atom(async (get) => {
  */
 export const withPollingAtom = atom(Date.now());
 
-export const activeVersionAtom = atom<Promise<Version | null>>(async (get) => {
-	get(withPollingAtom);
-	const lix = await get(lixAtom);
-	if (!lix) return null;
+export const activeVersionAtom = atom<Promise<LixVersion | null>>(
+	async (get) => {
+		get(withPollingAtom);
+		const lix = await get(lixAtom);
+		if (!lix) return null;
 
-	const activeVersion = await lix.db
-		.selectFrom("active_version")
-		.innerJoin("version", "active_version.version_id", "version.id")
-		.selectAll("version")
-		.executeTakeFirstOrThrow();
+		const activeVersion = await lix.db
+			.selectFrom("active_version")
+			.innerJoin("version", "active_version.version_id", "version.id")
+			.selectAll("version")
+			.executeTakeFirstOrThrow();
 
-	return activeVersion;
-});
+		return activeVersion;
+	}
+);
 
 export const existingVersionsAtom = atom(async (get) => {
 	get(withPollingAtom);