From 98d9673e3027ac7ee09c4c9a6ad9ed1491370e35 Mon Sep 17 00:00:00 2001 From: Sergey Kurdin Date: Mon, 9 Jun 2025 17:09:11 -0400 Subject: [PATCH] Add user settings management with custom DB path support - Introduced `pastebar_settings.yaml` for storing user settings. - Implemented commands for getting, setting, and removing the custom DB path. - Added functionality to manage general key-value settings. - Created a `UserConfig` struct to handle user settings serialization and deserialization. - Implemented methods to load and save user configuration. --- package-lock.json | 210 ++++--- package.json | 2 +- ....timestamp-1749488629181-54149b69f9d44.mjs | 527 ++++++++++++++++++ pastebar_settings.yaml | 1 + src-tauri/Cargo.lock | 222 +++++--- src-tauri/Cargo.toml | 6 +- src-tauri/src/clipboard/mod.rs | 186 +++++-- src-tauri/src/commands/mod.rs | 1 + .../src/commands/user_settings_command.rs | 57 ++ src-tauri/src/db.rs | 114 +++- src-tauri/src/main.rs | 9 + src-tauri/src/services/mod.rs | 1 + .../src/services/user_settings_service.rs | 99 ++++ src-tauri/src/window_ext.rs | 29 +- 14 files changed, 1227 insertions(+), 237 deletions(-) create mode 100644 packages/pastebar-app-ui/vite.config.mts.timestamp-1749488629181-54149b69f9d44.mjs create mode 100644 pastebar_settings.yaml create mode 100644 src-tauri/src/commands/user_settings_command.rs create mode 100644 src-tauri/src/services/user_settings_service.rs diff --git a/package-lock.json b/package-lock.json index eed90125..b1c5cb79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -135,7 +135,7 @@ "devDependencies": { "@changesets/cli": "^2.27.1", "@tailwindcss/line-clamp": "^0.4.4", - "@tauri-apps/cli": "^1.6.0", + "@tauri-apps/cli": "^1.6.3", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/bcryptjs": "^2.4.6", "@types/codemirror": "^5.60.15", @@ -7000,10 +7000,14 @@ } }, "node_modules/@tauri-apps/cli": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.0.tgz", - "integrity": "sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.3.tgz", + "integrity": "sha512-q46umd6QLRKDd4Gg6WyZBGa2fWvk0pbeUA5vFomm4uOs1/17LIciHv2iQ4UD+2Yv5H7AO8YiE1t50V0POiEGEw==", "dev": true, + "license": "Apache-2.0 OR MIT", + "dependencies": { + "semver": ">=7.5.2" + }, "bin": { "tauri": "tauri.js" }, @@ -7015,26 +7019,27 @@ "url": "https://opencollective.com/tauri" }, "optionalDependencies": { - "@tauri-apps/cli-darwin-arm64": "1.6.0", - "@tauri-apps/cli-darwin-x64": "1.6.0", - "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.0", - "@tauri-apps/cli-linux-arm64-gnu": "1.6.0", - "@tauri-apps/cli-linux-arm64-musl": "1.6.0", - "@tauri-apps/cli-linux-x64-gnu": "1.6.0", - "@tauri-apps/cli-linux-x64-musl": "1.6.0", - "@tauri-apps/cli-win32-arm64-msvc": "1.6.0", - "@tauri-apps/cli-win32-ia32-msvc": "1.6.0", - "@tauri-apps/cli-win32-x64-msvc": "1.6.0" + "@tauri-apps/cli-darwin-arm64": "1.6.3", + "@tauri-apps/cli-darwin-x64": "1.6.3", + "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.3", + "@tauri-apps/cli-linux-arm64-gnu": "1.6.3", + "@tauri-apps/cli-linux-arm64-musl": "1.6.3", + "@tauri-apps/cli-linux-x64-gnu": "1.6.3", + "@tauri-apps/cli-linux-x64-musl": "1.6.3", + "@tauri-apps/cli-win32-arm64-msvc": "1.6.3", + "@tauri-apps/cli-win32-ia32-msvc": "1.6.3", + "@tauri-apps/cli-win32-x64-msvc": "1.6.3" } }, "node_modules/@tauri-apps/cli-darwin-arm64": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.0.tgz", - "integrity": "sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.3.tgz", + "integrity": "sha512-fQN6IYSL8bG4NvkdKE4sAGF4dF/QqqQq4hOAU+t8ksOzHJr0hUlJYfncFeJYutr/MMkdF7hYKadSb0j5EE9r0A==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -7044,13 +7049,14 @@ } }, "node_modules/@tauri-apps/cli-darwin-x64": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.0.tgz", - "integrity": "sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.3.tgz", + "integrity": "sha512-1yTXZzLajKAYINJOJhZfmMhCzweHSgKQ3bEgJSn6t+1vFkOgY8Yx4oFgWcybrrWI5J1ZLZAl47+LPOY81dLcyA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -7060,13 +7066,14 @@ } }, "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.0.tgz", - "integrity": "sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.3.tgz", + "integrity": "sha512-CjTEr9r9xgjcvos09AQw8QMRPuH152B1jvlZt4PfAsyJNPFigzuwed5/SF7XAd8bFikA7zArP4UT12RdBxrx7w==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -7076,13 +7083,14 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-gnu": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.0.tgz", - "integrity": "sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.3.tgz", + "integrity": "sha512-G9EUUS4M8M/Jz1UKZqvJmQQCKOzgTb8/0jZKvfBuGfh5AjFBu8LHvlFpwkKVm1l4951Xg4ulUp6P9Q7WRJ9XSA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -7092,13 +7100,14 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-musl": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.0.tgz", - "integrity": "sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.3.tgz", + "integrity": "sha512-MuBTHJyNpZRbPVG8IZBN8+Zs7aKqwD22tkWVBcL1yOGL4zNNTJlkfL+zs5qxRnHlUsn6YAlbW/5HKocfpxVwBw==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -7108,13 +7117,14 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-gnu": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.0.tgz", - "integrity": "sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.3.tgz", + "integrity": "sha512-Uvi7M+NK3tAjCZEY1WGel+dFlzJmqcvu3KND+nqa22762NFmOuBIZ4KJR/IQHfpEYqKFNUhJfCGnpUDfiC3Oxg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -7124,13 +7134,14 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-musl": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.0.tgz", - "integrity": "sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.3.tgz", + "integrity": "sha512-rc6B342C0ra8VezB/OJom9j/N+9oW4VRA4qMxS2f4bHY2B/z3J9NPOe6GOILeg4v/CV62ojkLsC3/K/CeF3fqQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -7140,13 +7151,14 @@ } }, "node_modules/@tauri-apps/cli-win32-arm64-msvc": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.0.tgz", - "integrity": "sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.3.tgz", + "integrity": "sha512-cSH2qOBYuYC4UVIFtrc1YsGfc5tfYrotoHrpTvRjUGu0VywvmyNk82+ZsHEnWZ2UHmu3l3lXIGRqSWveLln0xg==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -7156,13 +7168,14 @@ } }, "node_modules/@tauri-apps/cli-win32-ia32-msvc": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.0.tgz", - "integrity": "sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.3.tgz", + "integrity": "sha512-T8V6SJQqE4PSWmYBl0ChQVmS6AR2hXFHURH2DwAhgSGSQ6uBXgwlYFcfIeQpBQA727K2Eq8X2hGfvmoySyHMRw==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -7172,13 +7185,14 @@ } }, "node_modules/@tauri-apps/cli-win32-x64-msvc": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.0.tgz", - "integrity": "sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.3.tgz", + "integrity": "sha512-HUkWZ+lYHI/Gjkh2QjHD/OBDpqLVmvjZGpLK9losur1Eg974Jip6k+vsoTUxQBCBDfj30eDBct9E1FvXOspWeg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -7187,6 +7201,19 @@ "node": ">= 10" } }, + "node_modules/@tauri-apps/cli/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -22361,90 +22388,99 @@ "integrity": "sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==" }, "@tauri-apps/cli": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.0.tgz", - "integrity": "sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.3.tgz", + "integrity": "sha512-q46umd6QLRKDd4Gg6WyZBGa2fWvk0pbeUA5vFomm4uOs1/17LIciHv2iQ4UD+2Yv5H7AO8YiE1t50V0POiEGEw==", "dev": true, "requires": { - "@tauri-apps/cli-darwin-arm64": "1.6.0", - "@tauri-apps/cli-darwin-x64": "1.6.0", - "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.0", - "@tauri-apps/cli-linux-arm64-gnu": "1.6.0", - "@tauri-apps/cli-linux-arm64-musl": "1.6.0", - "@tauri-apps/cli-linux-x64-gnu": "1.6.0", - "@tauri-apps/cli-linux-x64-musl": "1.6.0", - "@tauri-apps/cli-win32-arm64-msvc": "1.6.0", - "@tauri-apps/cli-win32-ia32-msvc": "1.6.0", - "@tauri-apps/cli-win32-x64-msvc": "1.6.0" + "@tauri-apps/cli-darwin-arm64": "1.6.3", + "@tauri-apps/cli-darwin-x64": "1.6.3", + "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.3", + "@tauri-apps/cli-linux-arm64-gnu": "1.6.3", + "@tauri-apps/cli-linux-arm64-musl": "1.6.3", + "@tauri-apps/cli-linux-x64-gnu": "1.6.3", + "@tauri-apps/cli-linux-x64-musl": "1.6.3", + "@tauri-apps/cli-win32-arm64-msvc": "1.6.3", + "@tauri-apps/cli-win32-ia32-msvc": "1.6.3", + "@tauri-apps/cli-win32-x64-msvc": "1.6.3", + "semver": ">=7.5.2" + }, + "dependencies": { + "semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true + } } }, "@tauri-apps/cli-darwin-arm64": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.0.tgz", - "integrity": "sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.3.tgz", + "integrity": "sha512-fQN6IYSL8bG4NvkdKE4sAGF4dF/QqqQq4hOAU+t8ksOzHJr0hUlJYfncFeJYutr/MMkdF7hYKadSb0j5EE9r0A==", "dev": true, "optional": true }, "@tauri-apps/cli-darwin-x64": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.0.tgz", - "integrity": "sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.3.tgz", + "integrity": "sha512-1yTXZzLajKAYINJOJhZfmMhCzweHSgKQ3bEgJSn6t+1vFkOgY8Yx4oFgWcybrrWI5J1ZLZAl47+LPOY81dLcyA==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.0.tgz", - "integrity": "sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.3.tgz", + "integrity": "sha512-CjTEr9r9xgjcvos09AQw8QMRPuH152B1jvlZt4PfAsyJNPFigzuwed5/SF7XAd8bFikA7zArP4UT12RdBxrx7w==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-arm64-gnu": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.0.tgz", - "integrity": "sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.3.tgz", + "integrity": "sha512-G9EUUS4M8M/Jz1UKZqvJmQQCKOzgTb8/0jZKvfBuGfh5AjFBu8LHvlFpwkKVm1l4951Xg4ulUp6P9Q7WRJ9XSA==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-arm64-musl": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.0.tgz", - "integrity": "sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.3.tgz", + "integrity": "sha512-MuBTHJyNpZRbPVG8IZBN8+Zs7aKqwD22tkWVBcL1yOGL4zNNTJlkfL+zs5qxRnHlUsn6YAlbW/5HKocfpxVwBw==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-x64-gnu": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.0.tgz", - "integrity": "sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.3.tgz", + "integrity": "sha512-Uvi7M+NK3tAjCZEY1WGel+dFlzJmqcvu3KND+nqa22762NFmOuBIZ4KJR/IQHfpEYqKFNUhJfCGnpUDfiC3Oxg==", "dev": true, "optional": true }, "@tauri-apps/cli-linux-x64-musl": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.0.tgz", - "integrity": "sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.3.tgz", + "integrity": "sha512-rc6B342C0ra8VezB/OJom9j/N+9oW4VRA4qMxS2f4bHY2B/z3J9NPOe6GOILeg4v/CV62ojkLsC3/K/CeF3fqQ==", "dev": true, "optional": true }, "@tauri-apps/cli-win32-arm64-msvc": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.0.tgz", - "integrity": "sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.3.tgz", + "integrity": "sha512-cSH2qOBYuYC4UVIFtrc1YsGfc5tfYrotoHrpTvRjUGu0VywvmyNk82+ZsHEnWZ2UHmu3l3lXIGRqSWveLln0xg==", "dev": true, "optional": true }, "@tauri-apps/cli-win32-ia32-msvc": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.0.tgz", - "integrity": "sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.3.tgz", + "integrity": "sha512-T8V6SJQqE4PSWmYBl0ChQVmS6AR2hXFHURH2DwAhgSGSQ6uBXgwlYFcfIeQpBQA727K2Eq8X2hGfvmoySyHMRw==", "dev": true, "optional": true }, "@tauri-apps/cli-win32-x64-msvc": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.0.tgz", - "integrity": "sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.3.tgz", + "integrity": "sha512-HUkWZ+lYHI/Gjkh2QjHD/OBDpqLVmvjZGpLK9losur1Eg974Jip6k+vsoTUxQBCBDfj30eDBct9E1FvXOspWeg==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index 792f4a65..b6ea5beb 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "devDependencies": { "@changesets/cli": "^2.27.1", "@tailwindcss/line-clamp": "^0.4.4", - "@tauri-apps/cli": "^1.6.0", + "@tauri-apps/cli": "^1.6.3", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/bcryptjs": "^2.4.6", "@types/codemirror": "^5.60.15", diff --git a/packages/pastebar-app-ui/vite.config.mts.timestamp-1749488629181-54149b69f9d44.mjs b/packages/pastebar-app-ui/vite.config.mts.timestamp-1749488629181-54149b69f9d44.mjs new file mode 100644 index 00000000..3543c5ce --- /dev/null +++ b/packages/pastebar-app-ui/vite.config.mts.timestamp-1749488629181-54149b69f9d44.mjs @@ -0,0 +1,527 @@ +var __getOwnPropNames = Object.getOwnPropertyNames; +var __commonJS = (cb, mod) => function __require() { + return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports; +}; + +// package.json +var require_package = __commonJS({ + "package.json"(exports, module) { + module.exports = { + name: "pastebar-app-ui", + version: "0.6.2", + private: true, + scripts: { + dev: "vite", + start: "npm run dev", + build: "vite build", + "build:ts": "tsc && vite build", + format: "npx prettier --write . --ignore-path .gitignore ", + taze: "taze major -I", + "taze:minor": "taze minor -w", + preview: "vite preview", + "audit:prod": "npm audit --omit=dev" + }, + dependencies: { + "@codastic/react-positioning-portal": "^0.7.0", + "@dnd-kit/core": "^6.1.0", + "@dnd-kit/modifiers": "^7.0.0", + "@dnd-kit/sortable": "^8.0.0", + "@emotion/css": "^11.11.2", + "@ianvs/prettier-plugin-sort-imports": "^4.1.1", + "@preact/signals-react": "^2.0.1", + "@radix-ui/react-accessible-icon": "^1.0.3", + "@radix-ui/react-accordion": "^1.1.2", + "@radix-ui/react-alert-dialog": "^1.0.5", + "@radix-ui/react-aspect-ratio": "^1.0.3", + "@radix-ui/react-avatar": "^1.0.4", + "@radix-ui/react-checkbox": "^1.0.4", + "@radix-ui/react-collapsible": "^1.0.3", + "@radix-ui/react-context-menu": "^2.1.5", + "@radix-ui/react-dialog": "^1.0.5", + "@radix-ui/react-dropdown-menu": "^2.0.6", + "@radix-ui/react-hover-card": "^1.0.7", + "@radix-ui/react-label": "^2.0.2", + "@radix-ui/react-menubar": "^1.0.4", + "@radix-ui/react-navigation-menu": "^1.1.4", + "@radix-ui/react-popover": "^1.0.7", + "@radix-ui/react-progress": "^1.0.3", + "@radix-ui/react-radio-group": "^1.1.3", + "@radix-ui/react-scroll-area": "^1.0.5", + "@radix-ui/react-select": "^2.0.0", + "@radix-ui/react-separator": "^1.0.3", + "@radix-ui/react-slider": "^1.1.2", + "@radix-ui/react-slot": "^1.0.2", + "@radix-ui/react-switch": "^1.0.3", + "@radix-ui/react-tabs": "^1.0.4", + "@radix-ui/react-toast": "^1.1.5", + "@radix-ui/react-toggle": "^1.0.3", + "@radix-ui/react-toggle-group": "^1.0.4", + "@radix-ui/react-tooltip": "^1.0.7", + "@react-aria/i18n": "^3.9.0", + "@react-aria/utils": "^3.22.0", + "@react-stately/utils": "^3.9.0", + "@rollup/plugin-commonjs": "^25.0.7", + "@svgr/webpack": "^8.1.0", + "@tanstack/react-query": "5.25.0", + "@tanstack/react-query-devtools": "5.25.0", + "@tanstack/react-query-persist-client": "5.25.0", + "@tauri-apps/api": "^1.5.3", + "@types/node": "^20.10.0", + "@uiw/codemirror-extensions-langs": "^4.21.21", + "@uiw/codemirror-theme-github": "^4.21.21", + "@uiw/codemirror-theme-vscode": "^4.21.21", + "@vitejs/plugin-react-swc": "^3.5.0", + "babel-plugin-react-compiler": "^0.0.0-experimental-696af53-20240625", + "class-variance-authority": "^0.7.0", + classnames: "^2.5.1", + clsx: "^2.0.0", + cmdk: "^0.2.0", + codemirror: "^5.65.16", + "date-fns": "^2.30.0", + dayjs: "^1.11.10", + dompurify: "^3.1.3", + "dot-prop": "^8.0.2", + dotenv: "^16.4.5", + emery: "^1.4.2", + "emoji-picker-react": "^4.5.16", + "eslint-plugin-react-compiler": "^0.0.0-experimental-51a85ea-20240601", + events: "^3.3.0", + facepaint: "^1.2.1", + "framer-motion": "^10.16.5", + "garbados-crypt": "^3.0.0-beta", + "glob-all": "^3.3.1", + i18next: "^23.10.0", + "i18next-browser-languagedetector": "^7.2.0", + "idb-keyval": "^6.2.1", + "javascript-time-ago": "^2.5.9", + jotai: "^2.6.0", + "jotai-zustand": "^0.3.0", + "js-yaml": "^4.1.0", + "linkify-it": "^5.0.0", + "lodash-es": "^4.17.21", + "lucide-react": "0.363.0", + "markdown-wasm": "^1.2.0", + marked: "^12.0.0", + "marked-terminal": "^7.0.0", + "next-themes": "^0.2.1", + overlayscrollbars: "^2.4.5", + "overlayscrollbars-react": "^0.5.3", + "prism-react-renderer": "^2.3.1", + prismjs: "^1.29.0", + react: "^18.3.1", + "react-canvas-confetti": "^2.0.7", + "react-compiler-runtime": "file:./scripts/react-compiler-runtime", + "react-complex-tree": "^2.2.3", + "react-day-picker": "^8.9.1", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", + "react-dom": "^18.3.1", + "react-error-boundary": "^4.0.13", + "react-hotkeys-hook": "^4.4.1", + "react-html-props": "^2.0.9", + "react-i18next": "^14.0.5", + "react-router-dom": "^6.20.0", + "react-sub-unsub": "^2.2.7", + "react-textarea-autosize": "^8.5.3", + "react-time-ago": "^7.2.1", + "react-twitter-embed": "^4.0.4", + "react-use-hoverintent": "^1.3.0", + "react-virtualized-auto-sizer": "^1.0.20", + "react-virtuoso": "^4.6.2", + "react-window": "^1.8.10", + "react-window-infinite-loader": "^1.0.9", + recharts: "^2.10.1", + "resize-observer-polyfill": "^1.5.1", + rimraf: "^5.0.5", + rollup: "^4.10.0", + scriptjs: "^2.5.9", + "short-unique-id": "^5.0.3", + "tailwind-scrollbar": "^3.0.5", + "tailwindcss-animate": "^1.0.7", + "tauri-plugin-clipboard-api": "^0.5.5", + "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log", + "tauri-plugin-positioner-api": "github:tauri-apps/tauri-plugin-positioner", + "ts-deepmerge": "^7.0.0", + "url-parse": "^1.5.10", + "use-resize-observer": "^9.1.0", + "vite-plugin-babel": "^1.2.0", + "vite-plugin-dynamic-import": "^1.5.0", + "vite-plugin-static-copy": "^1.0.2", + zod: "^3.22.2", + zustand: "^4.4.6", + "zustand-logger-middleware": "^1.0.9" + }, + devDependencies: { + "@changesets/cli": "^2.27.1", + "@preact/signals-react-transform": "^0.3.1", + "@tailwindcss/line-clamp": "^0.4.4", + "@tauri-apps/cli": "^1.5.6", + "@trivago/prettier-plugin-sort-imports": "^4.3.0", + "@types/bcryptjs": "^2.4.6", + "@types/codemirror": "^5.60.15", + "@types/dompurify": "^3.0.5", + "@types/events": "^3.0.3", + "@types/js-yaml": "^4.0.9", + "@types/linkify-it": "^3.0.5", + "@types/lodash-es": "^4.17.12", + "@types/marked-terminal": "^6.1.1", + "@types/prismjs": "^1.26.3", + "@types/react": "^18.3.3", + "@types/react-dom": "^18.3.0", + "@types/react-window": "^1.8.8", + "@types/react-window-infinite-loader": "^1.0.9", + "@types/url-parse": "^1.4.11", + "@types/use-sync-external-store": "^0.0.6", + "@vitejs/plugin-react": "^4.2.0", + autoprefixer: "^10.4.16", + "eslint-config-prettier": "^9.0.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-react": "^7.33.2", + "eslint-plugin-sonarjs": "^0.23.0", + postcss: "^8.4.31", + prettier: "^3.1.0", + "prettier-plugin-tailwindcss": "^0.5.7", + "tailwind-merge": "^2.0.0", + tailwindcss: "^3.3.5", + taze: "^0.12.2", + typescript: "^5.3.2", + vite: "^5.0.11", + "vite-plugin-tauri": "^3.3.0" + }, + optionalDependencies: { + "@rollup/rollup-linux-x64-gnu": "4.14.1" + } + }; + } +}); + +// vite.config.mts +import fs2 from "fs"; +import path3 from "path"; +import react from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/@vitejs/plugin-react/dist/index.mjs"; +import { defineConfig } from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/node_modules/vite/dist/node/index.js"; +import * as dotenv from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/dotenv/lib/main.js"; +import dynamicImport from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/vite-plugin-dynamic-import/dist/index.mjs"; +import { viteStaticCopy } from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/node_modules/vite-plugin-static-copy/dist/index.js"; +import { pathToFileURL } from "url"; + +// src/lib/i18n-vite-loaded/loader.ts +import path2 from "node:path"; +import { setProperty } from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/dot-prop/index.js"; +import { marked } from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/marked/lib/marked.esm.js"; +import TerminalRenderer from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/marked-terminal/index.js"; +import { merge } from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/ts-deepmerge/esm/index.js"; +import { createLogger } from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/node_modules/vite/dist/node/index.js"; + +// src/lib/i18n-vite-loaded/utils.ts +import fs from "node:fs"; +import path from "node:path"; +import globAll from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/glob-all/glob-all.js"; +import * as yaml from "file:///Users/kurdin/projects/pasteBar/PasteBarApp/node_modules/js-yaml/dist/js-yaml.mjs"; +var virtualModuleId = "virtual:i18next-loader"; +var resolvedVirtualModuleId = "\0" + virtualModuleId; +function jsNormalizedLang(lang) { + return lang.replace(/-/, "_"); +} +function enumerateLangs(dir) { + return fs.readdirSync(dir).filter(function(file) { + return fs.statSync(path.join(dir, file)).isDirectory(); + }); +} +function findAll(globs, cwd) { + const globArray = Array.isArray(globs) ? globs : [globs]; + return globAll.sync(globArray, { cwd, realpath: true }); +} +function resolvePaths(paths, cwd) { + return paths.map((override) => { + if (path.isAbsolute(override)) { + return override; + } else { + return path.join(cwd, override); + } + }); +} +function assertExistence(paths) { + for (const dir of paths) { + if (!fs.existsSync(dir)) { + throw new Error(`Directory does not exist: ${dir}`); + } + } +} +function loadAndParse(langFile) { + const fileContent = String(fs.readFileSync(langFile)); + const extname = path.extname(langFile); + let parsedContent; + if (extname === ".yaml" || extname === ".yml") { + parsedContent = yaml.load(fileContent); + } else { + parsedContent = JSON.parse(fileContent); + } + return parsedContent; +} + +// src/lib/i18n-vite-loaded/loader.ts +marked.setOptions({ + // @ts-expect-error - marked-terminal is not typed well + renderer: new TerminalRenderer() +}); +var LogLevels = { + silent: 0, + error: 1, + warn: 2, + info: 3 +}; +var loadedFiles = []; +var allLangs = /* @__PURE__ */ new Set(); +var factory = (options) => { + const log = createLogger(options.logLevel || "warn", { prefix: "[i18next-loader]" }); + function loadLocales() { + const localeDirs = resolvePaths(options.paths, process.cwd()); + assertExistence(localeDirs); + let appResBundle = {}; + loadedFiles = []; + log.info("Bundling locales (ordered least specific to most):", { + timestamp: true + }); + localeDirs.forEach((nextLocaleDir) => { + const langs = enumerateLangs(nextLocaleDir); + allLangs = /* @__PURE__ */ new Set([...allLangs, ...langs]); + for (const lang of langs) { + const resBundle = {}; + resBundle[lang] = {}; + const langDir = path2.join(nextLocaleDir, lang); + const langFiles = findAll( + options.include || ["**/*.json", "**/*.yml", "**/*.yaml"], + langDir + ); + for (const langFile of langFiles) { + loadedFiles.push(langFile); + log.info(" " + langFile, { + timestamp: true + }); + const content = loadAndParse(langFile); + if (options.namespaceResolution) { + let namespaceFilepath = langFile; + if (options.namespaceResolution === "relativePath") { + namespaceFilepath = path2.relative(path2.join(nextLocaleDir, lang), langFile); + } else if (options.namespaceResolution === "basename") { + namespaceFilepath = path2.basename(langFile); + } + const extname = path2.extname(langFile); + const namespaceParts = namespaceFilepath.replace(extname, "").split(path2.sep); + const namespace = [lang].concat(namespaceParts).join("."); + setProperty(resBundle, namespace, content); + } else { + resBundle[lang] = content; + } + appResBundle = merge(appResBundle, resBundle); + } + } + }); + let namedBundle = ""; + for (const lang of allLangs) { + namedBundle += `export const ${jsNormalizedLang(lang)} = ${JSON.stringify( + appResBundle[lang] + )} +`; + } + let defaultExport = "const resources = { \n"; + for (const lang of allLangs) { + defaultExport += `"${lang}": ${jsNormalizedLang(lang)}, +`; + } + defaultExport += "}"; + defaultExport += "\nexport default resources\n"; + const bundle = namedBundle + defaultExport; + log.info(`Locales module '${resolvedVirtualModuleId}':`, { + timestamp: true + }); + if (LogLevels[options.logLevel || "warn"] >= LogLevels["info"]) { + console.log( + marked(` +\`\`\`js +${bundle} +\`\`\` +`) + ); + } + return bundle; + } + const plugin = { + name: "vite-plugin-i18next-loader", + // required, will show up in warnings and errors + resolveId(id) { + if (id === virtualModuleId) { + return resolvedVirtualModuleId; + } + return null; + }, + load(id) { + if (id !== resolvedVirtualModuleId) { + return null; + } + const bundle = loadLocales(); + for (const file of loadedFiles) { + this.addWatchFile(file); + } + return bundle; + }, + /** + * Watch translation message files and trigger an update. + * + * @see https://github.com/vitejs/vite/issues/6871 <- as is implemented now, with a full reload + * @see https://github.com/vitejs/vite/pull/10333 <- TODO this is the one that would be easiest and may not be a full reload + */ + handleHotUpdate({ file, server }) { + if (loadedFiles.includes(file)) { + log.info(`Changed locale file: ${file}`, { + timestamp: true + }); + const { moduleGraph, ws } = server; + const module = moduleGraph.getModuleById(resolvedVirtualModuleId); + if (module) { + log.info( + `Invalidated module '${resolvedVirtualModuleId}' - sending full reload`, + { + timestamp: true + } + ); + moduleGraph.invalidateModule(module); + if (ws) { + ws.send({ + type: "full-reload", + path: "*" + }); + } + } + } + } + }; + return plugin; +}; +var loader_default = factory; + +// vite.config.mts +var __vite_injected_original_dirname = "/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui"; +dotenv.config(); +var ReactCompilerConfig = { + runtimeModule: "react-compiler-runtime", + target: "19" + // '17' | '18' | '19' +}; +var pastebarAppPackage; +var pastebarUIVersion = require_package().version; +async function loadPasteBarAppPackage() { + try { + const pastebarAppPath = process.env.PASTEBAR_APP_PATH || path3.resolve(__vite_injected_original_dirname, "../.."); + const packageJsonPath = path3.join(pastebarAppPath, "package.json"); + const packageJsonUrl = pathToFileURL(packageJsonPath).href; + pastebarAppPackage = await import(packageJsonUrl, { + with: { type: "json" } + }); + } catch (e) { + console.log("Please make sure main PasteBarApp repo exist"); + console.error("\nError reading package.json:", e); + process.exit(1); + } +} +var vite_config_default = async () => { + await loadPasteBarAppPackage(); + console.log("PasteBar App Path:", process.env.PASTEBAR_APP_PATH); + console.log("PasteBar App Version:", pastebarAppPackage.default.version); + console.log("PasteBar UI Version:", pastebarUIVersion); + console.log(""); + return defineConfig({ + clearScreen: false, + server: { + port: 4422, + open: false, + strictPort: true + }, + define: { + BUILD_DATE: JSON.stringify((/* @__PURE__ */ new Date()).valueOf()), + APP_VERSION: JSON.stringify(pastebarAppPackage.default.version), + APP_UI_VERSION: JSON.stringify(pastebarUIVersion) + }, + envPrefix: [ + "VITE_", + "TAURI_PLATFORM", + "TAURI_ARCH", + "TAURI_FAMILY", + "TAURI_PLATFORM_VERSION", + "TAURI_PLATFORM_TYPE", + "TAURI_DEBUG" + ], + build: { + outDir: path3.join(__vite_injected_original_dirname, "dist-ui"), + emptyOutDir: true, + commonjsOptions: { defaultIsModuleExports: "auto" }, + target: ["es2015", "safari11"], + minify: !process.env.TAURI_DEBUG ? "esbuild" : false, + sourcemap: !!process.env.TAURI_DEBUG, + rollupOptions: { + input: { + main: path3.resolve(__vite_injected_original_dirname, "index.html"), + history: path3.resolve(__vite_injected_original_dirname, "history-index.html"), + quickpaste: path3.resolve(__vite_injected_original_dirname, "quickpaste-index.html") + } + } + }, + optimizeDeps: { + esbuildOptions: { + plugins: [] + } + }, + resolve: { + alias: { + "~": path3.join(__vite_injected_original_dirname, "src") + } + }, + plugins: [ + react({ + babel: { + plugins: [ + "module:@preact/signals-react-transform", + ["babel-plugin-react-compiler", ReactCompilerConfig] + ] + } + }), + dynamicImport(), + loader_default({ + paths: ["./src/locales/lang"], + namespaceResolution: "basename" + }), + viteStaticCopy({ + targets: [ + { + src: "drop-*", + dest: "." + } + ] + }), + { + name: "build-script", + closeBundle() { + const packageJson = require_package(); + const version = packageJson.version; + fs2.mkdir(path3.join(__vite_injected_original_dirname, "dist-ui"), { recursive: false }, () => { + const versionFile = path3.join(__vite_injected_original_dirname, "dist-ui", `ui.version.${version}`); + fs2.writeFileSync(versionFile, version); + const stylesSrc = path3.join(__vite_injected_original_dirname, "assets/styles"); + const stylesDest = path3.join(__vite_injected_original_dirname, "dist-ui/assets/styles"); + fs2.cpSync(stylesSrc, stylesDest, { recursive: true }); + const wasmSrc = path3.join(__vite_injected_original_dirname, "assets/markdown"); + const wasmDest = path3.join(__vite_injected_original_dirname, "dist-ui/assets/markdown"); + fs2.cpSync(wasmSrc, wasmDest, { recursive: true }); + }); + } + } + ] + }); +}; +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["package.json", "vite.config.mts", "src/lib/i18n-vite-loaded/loader.ts", "src/lib/i18n-vite-loaded/utils.ts"],
  "sourcesContent": ["{\n  \"name\": \"pastebar-app-ui\",\n  \"version\": \"0.6.2\",\n  \"private\": true,\n  \"scripts\": {\n    \"dev\": \"vite\",\n    \"start\": \"npm run dev\",\n    \"build\": \"vite build\",\n    \"build:ts\": \"tsc && vite build\",\n    \"format\": \"npx prettier --write . --ignore-path .gitignore \",\n    \"taze\": \"taze major -I\",\n    \"taze:minor\": \"taze minor -w\",\n    \"preview\": \"vite preview\",\n    \"audit:prod\": \"npm audit --omit=dev\"\n  },\n  \"dependencies\": {\n    \"@codastic/react-positioning-portal\": \"^0.7.0\",\n    \"@dnd-kit/core\": \"^6.1.0\",\n    \"@dnd-kit/modifiers\": \"^7.0.0\",\n    \"@dnd-kit/sortable\": \"^8.0.0\",\n    \"@emotion/css\": \"^11.11.2\",\n    \"@ianvs/prettier-plugin-sort-imports\": \"^4.1.1\",\n    \"@preact/signals-react\": \"^2.0.1\",\n    \"@radix-ui/react-accessible-icon\": \"^1.0.3\",\n    \"@radix-ui/react-accordion\": \"^1.1.2\",\n    \"@radix-ui/react-alert-dialog\": \"^1.0.5\",\n    \"@radix-ui/react-aspect-ratio\": \"^1.0.3\",\n    \"@radix-ui/react-avatar\": \"^1.0.4\",\n    \"@radix-ui/react-checkbox\": \"^1.0.4\",\n    \"@radix-ui/react-collapsible\": \"^1.0.3\",\n    \"@radix-ui/react-context-menu\": \"^2.1.5\",\n    \"@radix-ui/react-dialog\": \"^1.0.5\",\n    \"@radix-ui/react-dropdown-menu\": \"^2.0.6\",\n    \"@radix-ui/react-hover-card\": \"^1.0.7\",\n    \"@radix-ui/react-label\": \"^2.0.2\",\n    \"@radix-ui/react-menubar\": \"^1.0.4\",\n    \"@radix-ui/react-navigation-menu\": \"^1.1.4\",\n    \"@radix-ui/react-popover\": \"^1.0.7\",\n    \"@radix-ui/react-progress\": \"^1.0.3\",\n    \"@radix-ui/react-radio-group\": \"^1.1.3\",\n    \"@radix-ui/react-scroll-area\": \"^1.0.5\",\n    \"@radix-ui/react-select\": \"^2.0.0\",\n    \"@radix-ui/react-separator\": \"^1.0.3\",\n    \"@radix-ui/react-slider\": \"^1.1.2\",\n    \"@radix-ui/react-slot\": \"^1.0.2\",\n    \"@radix-ui/react-switch\": \"^1.0.3\",\n    \"@radix-ui/react-tabs\": \"^1.0.4\",\n    \"@radix-ui/react-toast\": \"^1.1.5\",\n    \"@radix-ui/react-toggle\": \"^1.0.3\",\n    \"@radix-ui/react-toggle-group\": \"^1.0.4\",\n    \"@radix-ui/react-tooltip\": \"^1.0.7\",\n    \"@react-aria/i18n\": \"^3.9.0\",\n    \"@react-aria/utils\": \"^3.22.0\",\n    \"@react-stately/utils\": \"^3.9.0\",\n    \"@rollup/plugin-commonjs\": \"^25.0.7\",\n    \"@svgr/webpack\": \"^8.1.0\",\n    \"@tanstack/react-query\": \"5.25.0\",\n    \"@tanstack/react-query-devtools\": \"5.25.0\",\n    \"@tanstack/react-query-persist-client\": \"5.25.0\",\n    \"@tauri-apps/api\": \"^1.5.3\",\n    \"@types/node\": \"^20.10.0\",\n    \"@uiw/codemirror-extensions-langs\": \"^4.21.21\",\n    \"@uiw/codemirror-theme-github\": \"^4.21.21\",\n    \"@uiw/codemirror-theme-vscode\": \"^4.21.21\",\n    \"@vitejs/plugin-react-swc\": \"^3.5.0\",\n    \"babel-plugin-react-compiler\": \"^0.0.0-experimental-696af53-20240625\",\n    \"class-variance-authority\": \"^0.7.0\",\n    \"classnames\": \"^2.5.1\",\n    \"clsx\": \"^2.0.0\",\n    \"cmdk\": \"^0.2.0\",\n    \"codemirror\": \"^5.65.16\",\n    \"date-fns\": \"^2.30.0\",\n    \"dayjs\": \"^1.11.10\",\n    \"dompurify\": \"^3.1.3\",\n    \"dot-prop\": \"^8.0.2\",\n    \"dotenv\": \"^16.4.5\",\n    \"emery\": \"^1.4.2\",\n    \"emoji-picker-react\": \"^4.5.16\",\n    \"eslint-plugin-react-compiler\": \"^0.0.0-experimental-51a85ea-20240601\",\n    \"events\": \"^3.3.0\",\n    \"facepaint\": \"^1.2.1\",\n    \"framer-motion\": \"^10.16.5\",\n    \"garbados-crypt\": \"^3.0.0-beta\",\n    \"glob-all\": \"^3.3.1\",\n    \"i18next\": \"^23.10.0\",\n    \"i18next-browser-languagedetector\": \"^7.2.0\",\n    \"idb-keyval\": \"^6.2.1\",\n    \"javascript-time-ago\": \"^2.5.9\",\n    \"jotai\": \"^2.6.0\",\n    \"jotai-zustand\": \"^0.3.0\",\n    \"js-yaml\": \"^4.1.0\",\n    \"linkify-it\": \"^5.0.0\",\n    \"lodash-es\": \"^4.17.21\",\n    \"lucide-react\": \"0.363.0\",\n    \"markdown-wasm\": \"^1.2.0\",\n    \"marked\": \"^12.0.0\",\n    \"marked-terminal\": \"^7.0.0\",\n    \"next-themes\": \"^0.2.1\",\n    \"overlayscrollbars\": \"^2.4.5\",\n    \"overlayscrollbars-react\": \"^0.5.3\",\n    \"prism-react-renderer\": \"^2.3.1\",\n    \"prismjs\": \"^1.29.0\",\n    \"react\": \"^18.3.1\",\n    \"react-canvas-confetti\": \"^2.0.7\",\n    \"react-compiler-runtime\": \"file:./scripts/react-compiler-runtime\",\n    \"react-complex-tree\": \"^2.2.3\",\n    \"react-day-picker\": \"^8.9.1\",\n    \"react-dnd\": \"^16.0.1\",\n    \"react-dnd-html5-backend\": \"^16.0.1\",\n    \"react-dom\": \"^18.3.1\",\n    \"react-error-boundary\": \"^4.0.13\",\n    \"react-hotkeys-hook\": \"^4.4.1\",\n    \"react-html-props\": \"^2.0.9\",\n    \"react-i18next\": \"^14.0.5\",\n    \"react-router-dom\": \"^6.20.0\",\n    \"react-sub-unsub\": \"^2.2.7\",\n    \"react-textarea-autosize\": \"^8.5.3\",\n    \"react-time-ago\": \"^7.2.1\",\n    \"react-twitter-embed\": \"^4.0.4\",\n    \"react-use-hoverintent\": \"^1.3.0\",\n    \"react-virtualized-auto-sizer\": \"^1.0.20\",\n    \"react-virtuoso\": \"^4.6.2\",\n    \"react-window\": \"^1.8.10\",\n    \"react-window-infinite-loader\": \"^1.0.9\",\n    \"recharts\": \"^2.10.1\",\n    \"resize-observer-polyfill\": \"^1.5.1\",\n    \"rimraf\": \"^5.0.5\",\n    \"rollup\": \"^4.10.0\",\n    \"scriptjs\": \"^2.5.9\",\n    \"short-unique-id\": \"^5.0.3\",\n    \"tailwind-scrollbar\": \"^3.0.5\",\n    \"tailwindcss-animate\": \"^1.0.7\",\n    \"tauri-plugin-clipboard-api\": \"^0.5.5\",\n    \"tauri-plugin-log-api\": \"github:tauri-apps/tauri-plugin-log\",\n    \"tauri-plugin-positioner-api\": \"github:tauri-apps/tauri-plugin-positioner\",\n    \"ts-deepmerge\": \"^7.0.0\",\n    \"url-parse\": \"^1.5.10\",\n    \"use-resize-observer\": \"^9.1.0\",\n    \"vite-plugin-babel\": \"^1.2.0\",\n    \"vite-plugin-dynamic-import\": \"^1.5.0\",\n    \"vite-plugin-static-copy\": \"^1.0.2\",\n    \"zod\": \"^3.22.2\",\n    \"zustand\": \"^4.4.6\",\n    \"zustand-logger-middleware\": \"^1.0.9\"\n  },\n  \"devDependencies\": {\n    \"@changesets/cli\": \"^2.27.1\",\n    \"@preact/signals-react-transform\": \"^0.3.1\",\n    \"@tailwindcss/line-clamp\": \"^0.4.4\",\n    \"@tauri-apps/cli\": \"^1.5.6\",\n    \"@trivago/prettier-plugin-sort-imports\": \"^4.3.0\",\n    \"@types/bcryptjs\": \"^2.4.6\",\n    \"@types/codemirror\": \"^5.60.15\",\n    \"@types/dompurify\": \"^3.0.5\",\n    \"@types/events\": \"^3.0.3\",\n    \"@types/js-yaml\": \"^4.0.9\",\n    \"@types/linkify-it\": \"^3.0.5\",\n    \"@types/lodash-es\": \"^4.17.12\",\n    \"@types/marked-terminal\": \"^6.1.1\",\n    \"@types/prismjs\": \"^1.26.3\",\n    \"@types/react\": \"^18.3.3\",\n    \"@types/react-dom\": \"^18.3.0\",\n    \"@types/react-window\": \"^1.8.8\",\n    \"@types/react-window-infinite-loader\": \"^1.0.9\",\n    \"@types/url-parse\": \"^1.4.11\",\n    \"@types/use-sync-external-store\": \"^0.0.6\",\n    \"@vitejs/plugin-react\": \"^4.2.0\",\n    \"autoprefixer\": \"^10.4.16\",\n    \"eslint-config-prettier\": \"^9.0.0\",\n    \"eslint-import-resolver-typescript\": \"^3.6.1\",\n    \"eslint-plugin-import\": \"^2.29.0\",\n    \"eslint-plugin-prettier\": \"^5.0.1\",\n    \"eslint-plugin-react\": \"^7.33.2\",\n    \"eslint-plugin-sonarjs\": \"^0.23.0\",\n    \"postcss\": \"^8.4.31\",\n    \"prettier\": \"^3.1.0\",\n    \"prettier-plugin-tailwindcss\": \"^0.5.7\",\n    \"tailwind-merge\": \"^2.0.0\",\n    \"tailwindcss\": \"^3.3.5\",\n    \"taze\": \"^0.12.2\",\n    \"typescript\": \"^5.3.2\",\n    \"vite\": \"^5.0.11\",\n    \"vite-plugin-tauri\": \"^3.3.0\"\n  },\n  \"optionalDependencies\": {\n    \"@rollup/rollup-linux-x64-gnu\": \"4.14.1\"\n  }\n}\n", "const __vite_injected_original_dirname = \"/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui\";const __vite_injected_original_filename = \"/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/vite.config.mts\";const __vite_injected_original_import_meta_url = \"file:///Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/vite.config.mts\";import fs from 'fs'\nimport path from 'path'\nimport react from \"@vitejs/plugin-react\";\nimport { defineConfig, PluginOption } from 'vite'\nimport * as dotenv from 'dotenv'\nimport dynamicImport from 'vite-plugin-dynamic-import'\nimport { viteStaticCopy } from 'vite-plugin-static-copy'\nimport { pathToFileURL } from 'url';\n\nimport i18nextLoader from './src/lib/i18n-vite-loaded/loader'\n\ndotenv.config()\n\nconst ReactCompilerConfig = {\n  runtimeModule: 'react-compiler-runtime',\n  target: '19', // '17' | '18' | '19'\n}\n\nlet pastebarAppPackage\nconst pastebarUIVersion = require('./package.json').version\n\n\nasync function loadPasteBarAppPackage() {\n  try {\n    const pastebarAppPath = process.env.PASTEBAR_APP_PATH || path.resolve(__dirname, '../..');\n    const packageJsonPath = path.join(pastebarAppPath, 'package.json');\n    const packageJsonUrl = pathToFileURL(packageJsonPath).href;\n\n    pastebarAppPackage = await import(packageJsonUrl, {\n      with: { type: 'json' }\n    });\n\n  } catch (e) {\n    console.log('Please make sure main PasteBarApp repo exist')\n    console.error('\\nError reading package.json:', e)\n    process.exit(1)\n  }\n}\n\nexport default async () => {\n  await loadPasteBarAppPackage()\n\n  console.log('PasteBar App Path:', process.env.PASTEBAR_APP_PATH)\n  console.log('PasteBar App Version:', pastebarAppPackage.default.version)\n  console.log('PasteBar UI Version:', pastebarUIVersion)\n  console.log('')\n\n  return defineConfig({\n    clearScreen: false,\n      server: {\n      port: 4422,\n      open: false,\n      strictPort: true,\n    },\n    define: {\n      BUILD_DATE: JSON.stringify(new Date().valueOf()),\n      APP_VERSION: JSON.stringify(pastebarAppPackage.default.version),\n      APP_UI_VERSION: JSON.stringify(pastebarUIVersion),\n    },\n    envPrefix: [\n      'VITE_',\n      'TAURI_PLATFORM',\n      'TAURI_ARCH',\n      'TAURI_FAMILY',\n      'TAURI_PLATFORM_VERSION',\n      'TAURI_PLATFORM_TYPE',\n      'TAURI_DEBUG',\n    ],\n\n    build: {\n      outDir: path.join(__dirname, 'dist-ui'),\n      emptyOutDir: true,\n      commonjsOptions: { defaultIsModuleExports: 'auto' },\n      target: ['es2015', 'safari11'],\n      minify: !process.env.TAURI_DEBUG ? 'esbuild' : false,\n      sourcemap: !!process.env.TAURI_DEBUG,\n      rollupOptions: {\n        input: {\n          main: path.resolve(__dirname, 'index.html'),\n          history: path.resolve(__dirname, 'history-index.html'),\n          quickpaste: path.resolve(__dirname, 'quickpaste-index.html'),\n        },\n      },\n    },\n    optimizeDeps: {\n      esbuildOptions: {\n        plugins: [],\n      },\n    },\n    resolve: {\n      alias: {\n        '~': path.join(__dirname, 'src'),\n      },\n    },\n    plugins: [\n      react({\n        babel: {\n          plugins: [\n            \"module:@preact/signals-react-transform\",\n            [\"babel-plugin-react-compiler\", ReactCompilerConfig],\n          ],\n        },\n      }) as PluginOption,\n      dynamicImport() as any,\n      i18nextLoader({\n        paths: ['./src/locales/lang'],\n        namespaceResolution: 'basename',\n      }) as PluginOption,\n      viteStaticCopy({\n        targets: [\n          {\n            src: 'drop-*',\n            dest: '.',\n          },\n        ],\n      }),\n      {\n        name: 'build-script',\n        closeBundle() {\n          const packageJson = require('./package.json')\n          const version = packageJson.version\n          fs.mkdir(path.join(__dirname, 'dist-ui'), { recursive: false }, () => {\n            const versionFile = path.join(__dirname, 'dist-ui', `ui.version.${version}`)\n            fs.writeFileSync(versionFile, version)\n            const stylesSrc = path.join(__dirname, 'assets/styles')\n            const stylesDest = path.join(__dirname, 'dist-ui/assets/styles')\n            fs.cpSync(stylesSrc, stylesDest, {recursive: true});\n            const wasmSrc = path.join(__dirname, 'assets/markdown')\n            const wasmDest = path.join(__dirname, 'dist-ui/assets/markdown')\n            fs.cpSync(wasmSrc, wasmDest, {recursive: true});\n          })\n        },\n      },\n    ],\n  })\n}\n", "const __vite_injected_original_dirname = \"/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/src/lib/i18n-vite-loaded\";const __vite_injected_original_filename = \"/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/src/lib/i18n-vite-loaded/loader.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/src/lib/i18n-vite-loaded/loader.ts\";import path from 'node:path'\nimport { setProperty } from 'dot-prop'\nimport { marked } from 'marked'\nimport TerminalRenderer from 'marked-terminal'\nimport { merge } from 'ts-deepmerge'\nimport { createLogger, LogLevel, Plugin } from 'vite'\n\nimport {\n  assertExistence,\n  enumerateLangs,\n  findAll,\n  jsNormalizedLang,\n  loadAndParse,\n  resolvedVirtualModuleId,\n  resolvePaths,\n  virtualModuleId,\n} from './utils'\n\nmarked.setOptions({\n  // @ts-expect-error - marked-terminal is not typed well\n  renderer: new TerminalRenderer(),\n})\n\n// unfortunately not exported\nexport const LogLevels: Record<LogLevel, number> = {\n  silent: 0,\n  error: 1,\n  warn: 2,\n  info: 3,\n}\n\nexport interface Options {\n  /**\n   * Set to 'info' for noisy information.\n   *\n   * Default: 'warn'\n   */\n  logLevel?: LogLevel\n\n  /**\n   * Glob patterns to match files\n   *\n   * Default: ['**\\/*.json', '**\\/*.yml', '**\\/*.yaml']\n   */\n  include?: string[]\n\n  /**\n   * Locale top level directory paths ordered from least specialized to most specialized\n   *  e.g. lib locale -> app locale\n   *\n   * Locales loaded later will overwrite any duplicated key via a deep merge strategy.\n   */\n  paths: string[]\n\n  /**\n   * Default: none\n   */\n  namespaceResolution?: 'basename' | 'relativePath'\n}\n\nexport interface ResBundle {\n  [key: string]: string | object\n}\n\n// for fast match on hot reloading check?\nlet loadedFiles: string[] = []\nlet allLangs: Set<string> = new Set()\n\nconst factory = (options: Options) => {\n  const log = createLogger(options.logLevel || 'warn', { prefix: '[i18next-loader]' })\n\n  function loadLocales() {\n    const localeDirs = resolvePaths(options.paths, process.cwd())\n    assertExistence(localeDirs)\n\n    //\n    let appResBundle: ResBundle = {}\n    loadedFiles = [] // reset\n    log.info('Bundling locales (ordered least specific to most):', {\n      timestamp: true,\n    })\n    localeDirs.forEach(nextLocaleDir => {\n      // all subdirectories match language codes\n      const langs = enumerateLangs(nextLocaleDir)\n      allLangs = new Set([...allLangs, ...langs])\n      for (const lang of langs) {\n        const resBundle: ResBundle = {}\n        resBundle[lang] = {}\n\n        const langDir = path.join(nextLocaleDir, lang) // top level lang dir\n        const langFiles = findAll(\n          options.include || ['**/*.json', '**/*.yml', '**/*.yaml'],\n          langDir\n        ) // all lang files matching patterns in langDir\n\n        for (const langFile of langFiles) {\n          loadedFiles.push(langFile) // track for fast hot reload matching\n          log.info('\\t' + langFile, {\n            timestamp: true,\n          })\n\n          const content = loadAndParse(langFile)\n\n          if (options.namespaceResolution) {\n            let namespaceFilepath: string = langFile\n            if (options.namespaceResolution === 'relativePath') {\n              namespaceFilepath = path.relative(path.join(nextLocaleDir, lang), langFile)\n            } else if (options.namespaceResolution === 'basename') {\n              namespaceFilepath = path.basename(langFile)\n            }\n            const extname = path.extname(langFile)\n            const namespaceParts = namespaceFilepath.replace(extname, '').split(path.sep)\n            const namespace = [lang].concat(namespaceParts).join('.')\n            setProperty(resBundle, namespace, content)\n          } else {\n            resBundle[lang] = content\n          }\n          appResBundle = merge(appResBundle, resBundle)\n        }\n      }\n    })\n\n    // one bundle - works, no issues with dashes in names\n    // const bundle = `export default ${JSON.stringify(appResBundle)}`\n\n    // named exports, requires manipulation of names\n    let namedBundle = ''\n    for (const lang of allLangs) {\n      namedBundle += `export const ${jsNormalizedLang(lang)} = ${JSON.stringify(\n        appResBundle[lang]\n      )}\\n`\n    }\n    let defaultExport = 'const resources = { \\n'\n    for (const lang of allLangs) {\n      defaultExport += `\"${lang}\": ${jsNormalizedLang(lang)},\\n`\n    }\n    defaultExport += '}'\n    defaultExport += '\\nexport default resources\\n'\n\n    const bundle = namedBundle + defaultExport\n\n    log.info(`Locales module '${resolvedVirtualModuleId}':`, {\n      timestamp: true,\n    })\n\n    // emulate log.info for our marked terminal output\n    if (LogLevels[options.logLevel || 'warn'] >= LogLevels['info']) {\n      // eslint-disable-next-line no-console\n      console.log(\n        marked(`\n\\`\\`\\`js\n${bundle}\n\\`\\`\\`\n`)\n      )\n    }\n    return bundle\n  }\n\n  const plugin: Plugin = {\n    name: 'vite-plugin-i18next-loader', // required, will show up in warnings and errors\n    resolveId(id) {\n      if (id === virtualModuleId) {\n        return resolvedVirtualModuleId\n      }\n      return null\n    },\n    load(id) {\n      if (id !== resolvedVirtualModuleId) {\n        return null\n      }\n\n      const bundle = loadLocales()\n      for (const file of loadedFiles) {\n        this.addWatchFile(file)\n      }\n      return bundle\n    },\n\n    /**\n     * Watch translation message files and trigger an update.\n     *\n     * @see https://github.com/vitejs/vite/issues/6871 <- as is implemented now, with a full reload\n     * @see https://github.com/vitejs/vite/pull/10333 <- TODO this is the one that would be easiest and may not be a full reload\n     */\n    handleHotUpdate({ file, server }) {\n      if (loadedFiles.includes(file)) {\n        log.info(`Changed locale file: ${file}`, {\n          timestamp: true,\n        })\n\n        const { moduleGraph, ws } = server\n        const module = moduleGraph.getModuleById(resolvedVirtualModuleId)\n        if (module) {\n          log.info(\n            `Invalidated module '${resolvedVirtualModuleId}' - sending full reload`,\n            {\n              timestamp: true,\n            }\n          )\n          moduleGraph.invalidateModule(module)\n          // server.reloadModule(module) // TODO with vite 3.2 see https://github.com/vitejs/vite/pull/10333, may also be able to remove full reload\n          if (ws) {\n            ws.send({\n              type: 'full-reload',\n              path: '*',\n            })\n          }\n        }\n      }\n    },\n  }\n  return plugin\n}\n\nexport default factory\n", "const __vite_injected_original_dirname = \"/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/src/lib/i18n-vite-loaded\";const __vite_injected_original_filename = \"/Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/src/lib/i18n-vite-loaded/utils.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/kurdin/projects/pasteBar/PasteBarApp/packages/pastebar-app-ui/src/lib/i18n-vite-loaded/utils.ts\";import fs from 'node:fs'\nimport path from 'node:path'\n// @ts-expect-error no types\nimport globAll from 'glob-all'\nimport * as yaml from 'js-yaml'\n\n// don't export these from index so the external types are cleaner\nexport const virtualModuleId = 'virtual:i18next-loader'\nexport const resolvedVirtualModuleId = '\\0' + virtualModuleId\n\nexport function jsNormalizedLang(lang: string) {\n  return lang.replace(/-/, '_')\n}\n\nexport function enumerateLangs(dir: string) {\n  return fs.readdirSync(dir).filter(function (file) {\n    return fs.statSync(path.join(dir, file)).isDirectory()\n  })\n}\n\n//https://github.com/jpillora/node-glob-all#usage\nexport function findAll(globs: string | string[], cwd: string): string[] {\n  const globArray = Array.isArray(globs) ? globs : [globs]\n  // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n  return globAll.sync(globArray, { cwd, realpath: true }) as string[]\n}\n\nexport function resolvePaths(paths: string[], cwd: string) {\n  return paths.map(override => {\n    if (path.isAbsolute(override)) {\n      return override\n    } else {\n      return path.join(cwd, override)\n    }\n  })\n}\n\nexport function assertExistence(paths: string[]) {\n  for (const dir of paths) {\n    if (!fs.existsSync(dir)) {\n      throw new Error(`Directory does not exist: ${dir}`)\n    }\n  }\n}\n\nexport function loadAndParse(langFile: string) {\n  const fileContent = String(fs.readFileSync(langFile))\n  const extname = path.extname(langFile)\n  let parsedContent: string\n  if (extname === '.yaml' || extname === '.yml') {\n    parsedContent = yaml.load(fileContent) as string\n  } else {\n    parsedContent = JSON.parse(fileContent)\n  }\n  return parsedContent\n}\n"],
  "mappings": "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",
  "names": ["fs", "path", "path", "path", "path", "fs"]
}
 diff --git a/pastebar_settings.yaml b/pastebar_settings.yaml new file mode 100644 index 00000000..9975a40d --- /dev/null +++ b/pastebar_settings.yaml @@ -0,0 +1 @@ +custom_db_path: "/Users/kurdin/" diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 020ec3a9..8ecd1147 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9c1d770875c536934a8e7150061b0dbddb919298f0ff762b0f8fc12c8928877" dependencies = [ "appkit-nsworkspace-bindings", - "core-foundation", + "core-foundation 0.9.4", "core-graphics 0.23.2", "objc", "windows 0.48.0", @@ -549,9 +549,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.5.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -560,9 +560,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -816,8 +816,8 @@ checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types 0.3.2", "libc", @@ -826,15 +826,15 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.23.2", + "cocoa-foundation 0.2.1", + "core-foundation 0.10.1", + "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", "objc", @@ -848,12 +848,25 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", "libc", "objc", ] +[[package]] +name = "cocoa-foundation" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.1", + "core-graphics-types 0.2.0", + "objc", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -938,6 +951,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -951,8 +974,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", "foreign-types 0.3.2", "libc", ] @@ -964,8 +987,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.1", + "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", ] @@ -977,7 +1013,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.1", "libc", ] @@ -1588,6 +1635,15 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "flume" version = "0.11.0" @@ -2450,9 +2506,9 @@ dependencies = [ [[package]] name = "ico" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" dependencies = [ "byteorder", "png", @@ -2581,15 +2637,6 @@ dependencies = [ "serde", ] -[[package]] -name = "infer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" -dependencies = [ - "cfb", -] - [[package]] name = "infer" version = "0.13.0" @@ -2809,6 +2856,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "json-patch" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "jsonpath-rust" version = "0.4.0" @@ -2822,6 +2881,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + [[package]] name = "keyring" version = "2.3.3" @@ -3053,7 +3123,7 @@ name = "macos-accessibility-client" version = "0.0.1" source = "git+https://github.com/kurdin/macos-accessibility-client?branch=master#03025a91c471d4a115ad116739a8576216e527e2" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", ] @@ -3881,7 +3951,7 @@ dependencies = [ "chrono", "clipboard-master", "clokwerk", - "cocoa 0.25.0", + "cocoa 0.26.1", "colored_json", "diesel", "diesel_migrations", @@ -4874,7 +4944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -5048,9 +5118,9 @@ dependencies = [ [[package]] name = "serialize-to-javascript" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" dependencies = [ "serde", "serde_json", @@ -5059,13 +5129,13 @@ dependencies = [ [[package]] name = "serialize-to-javascript-impl" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -5355,15 +5425,11 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sys-locale" -version = "0.2.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" dependencies = [ - "js-sys", "libc", - "wasm-bindgen", - "web-sys", - "windows-sys 0.45.0", ] [[package]] @@ -5373,7 +5439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -5427,7 +5493,7 @@ dependencies = [ "cairo-rs", "cc", "cocoa 0.24.1", - "core-foundation", + "core-foundation 0.9.4", "core-graphics 0.22.3", "crossbeam-channel", "dirs-next 2.0.0", @@ -5503,12 +5569,12 @@ dependencies = [ [[package]] name = "tauri" -version = "1.7.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" +checksum = "3ae1f57c291a6ab8e1d2e6b8ad0a35ff769c9925deb8a89de85425ff08762d0c" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bytes 1.7.1", "cocoa 0.24.1", "dirs-next 2.0.0", @@ -5525,7 +5591,8 @@ dependencies = [ "http", "ignore", "indexmap 1.9.3", - "infer 0.9.0", + "infer", + "log", "minisign-verify", "nix 0.26.4", "notify-rust", @@ -5535,6 +5602,7 @@ dependencies = [ "os_info", "os_pipe", "percent-encoding", + "plist", "png", "rand 0.8.5", "raw-window-handle", @@ -5576,7 +5644,7 @@ dependencies = [ "cargo_toml", "dirs-next 2.0.0", "heck 0.5.0", - "json-patch", + "json-patch 1.4.0", "semver", "serde", "serde_json", @@ -5587,14 +5655,14 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.4" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" +checksum = "53438d78c4a037ffe5eafa19e447eea599bedfb10844cb08ec53c2471ac3ac3f" dependencies = [ "base64 0.21.7", "brotli", "ico", - "json-patch", + "json-patch 2.0.0", "plist", "png", "proc-macro2", @@ -5613,9 +5681,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.5" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" +checksum = "233988ac08c1ed3fe794cd65528d48d8f7ed4ab3895ca64cdaa6ad4d00c45c0b" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5651,9 +5719,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" +checksum = "8066855882f00172935e3fa7d945126580c34dcbabab43f5d4f0c2398a67d47b" dependencies = [ "gtk", "http", @@ -5672,9 +5740,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.9" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" +checksum = "ce361fec1e186705371f1c64ae9dd2a3a6768bc530d0a2d5e75a634bb416ad4d" dependencies = [ "arboard", "cocoa 0.24.1", @@ -5693,9 +5761,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" +checksum = "c357952645e679de02cd35007190fcbce869b93ffc61b029f33fe02648453774" dependencies = [ "brotli", "ctor", @@ -5703,8 +5771,8 @@ dependencies = [ "glob", "heck 0.5.0", "html5ever 0.26.0", - "infer 0.13.0", - "json-patch", + "infer", + "json-patch 2.0.0", "kuchikiki", "log", "memchr", @@ -6806,15 +6874,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -6842,21 +6901,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.48.5" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 6d5c2623..c7e8a2c2 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" rust-version = "1.75.0" [build-dependencies.tauri-build] -version = "1.4" +version = "1.5" features = [] [target.'cfg(target_os = "windows")'.dependencies] @@ -40,7 +40,7 @@ reqwest = "0.11.12" nanoid = "0.4.0" anyhow = "1.0.66" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.7.1", features = [ "api-all", "system-tray", "icon-png", "clipboard", "updater", "reqwest-client"] } +tauri = { version = "1.8.3", features = [ "api-all", "system-tray", "icon-png", "clipboard", "updater", "reqwest-client"] } tokio = { version = "1.28.2", features = ["full"] } #single-instance = "0.3.3" @@ -89,7 +89,7 @@ html-escape = "0.2.13" [target.'cfg(target_os = "macos")'.dependencies] macos-accessibility-client = { git = "https://github.com/kurdin/macos-accessibility-client", branch = "master", version = "0.0.1" } objc = "0.2.7" -cocoa = "0.25.0" +cocoa = "0.26.1" [target.'cfg(target_os = "linux")'.dependencies] inputbotlinux = { path = "libs/inputbotlinux" } diff --git a/src-tauri/src/clipboard/mod.rs b/src-tauri/src/clipboard/mod.rs index 64507296..8798c54f 100644 --- a/src-tauri/src/clipboard/mod.rs +++ b/src-tauri/src/clipboard/mod.rs @@ -299,58 +299,7 @@ impl ClipboardManager { clipboard.set_text(text).map_err(|err| err.to_string()) } - pub fn read_image(&self) -> Result { - let mut clipboard = Clipboard::new().unwrap(); - let image = clipboard.get_image().map_err(|err| err.to_string())?; - let tmp_dir = tempfile::Builder::new() - .prefix("clipboard-img") - .tempdir() - .map_err(|err| err.to_string())?; - let fname = tmp_dir.path().join("clipboard-img.png"); - - let image2: RgbaImage = ImageBuffer::from_raw( - image.width.try_into().unwrap(), - image.height.try_into().unwrap(), - image.bytes.into_owned(), - ) - .unwrap(); - image2.save(fname.clone()).map_err(|err| err.to_string())?; - let mut file = File::open(fname.clone()).unwrap(); - let mut buffer = vec![]; - file.read_to_end(&mut buffer).unwrap(); - let base64_str = general_purpose::STANDARD_NO_PAD.encode(buffer); - Ok(base64_str) - } - - pub fn get_image_binary(&self) -> Result { - let mut clipboard = Clipboard::new().unwrap(); - let image_data = clipboard.get_image().map_err(|err| err.to_string())?; - - Ok(image_data) - } - - pub fn read_image_binary(&self) -> Result, String> { - let mut clipboard = Clipboard::new().unwrap(); - let image = clipboard.get_image().map_err(|err| err.to_string())?; - let tmp_dir = tempfile::Builder::new() - .prefix("clipboard-img") - .tempdir() - .map_err(|err| err.to_string())?; - let fname = tmp_dir.path().join("clipboard-img.png"); - - let image2: RgbaImage = ImageBuffer::from_raw( - image.width.try_into().unwrap(), - image.height.try_into().unwrap(), - image.bytes.into_owned(), - ) - .unwrap(); - image2.save(fname.clone()).map_err(|err| err.to_string())?; - let mut file = File::open(fname.clone()).unwrap(); - let mut buffer = vec![]; - file.read_to_end(&mut buffer).unwrap(); - Ok(buffer) - } - + // write_image function remains unchanged as it's writing, not reading pub fn write_image(&self, base64_image: String) -> Result<(), String> { let mut clipboard = Clipboard::new().unwrap(); let decoded = general_purpose::STANDARD_NO_PAD @@ -373,6 +322,139 @@ impl ClipboardManager { .map_err(|err| err.to_string())?; Ok(()) } + + pub fn read_image(&self) -> Result { + let mut clipboard = Clipboard::new().unwrap(); + let image = clipboard.get_image().map_err(|err| err.to_string())?; + + // Handle stride alignment + let bytes_per_pixel = 4; // RGBA + let expected_bytes_per_row = image.width * bytes_per_pixel; + let actual_bytes_per_row = image.bytes.len() / image.height; + + let cleaned_bytes = if actual_bytes_per_row != expected_bytes_per_row { + // Remove stride padding + let mut cleaned = Vec::with_capacity(expected_bytes_per_row * image.height); + + for row in 0..image.height { + let row_start = row * actual_bytes_per_row; + let row_end = row_start + expected_bytes_per_row; + cleaned.extend_from_slice(&image.bytes[row_start..row_end]); + } + cleaned + } else { + image.bytes.into_owned() + }; + + // Create image from cleaned bytes + let image2: RgbaImage = ImageBuffer::from_raw( + image.width.try_into().unwrap(), + image.height.try_into().unwrap(), + cleaned_bytes, + ) + .ok_or_else(|| "Failed to create image from raw bytes".to_string())?; + + // Save to temporary file and encode as base64 + let tmp_dir = tempfile::Builder::new() + .prefix("clipboard-img") + .tempdir() + .map_err(|err| err.to_string())?; + let fname = tmp_dir.path().join("clipboard-img.png"); + + image2.save(&fname).map_err(|err| err.to_string())?; + + let mut file = File::open(&fname).map_err(|err| err.to_string())?; + let mut buffer = vec![]; + file + .read_to_end(&mut buffer) + .map_err(|err| err.to_string())?; + + let base64_str = general_purpose::STANDARD_NO_PAD.encode(buffer); + Ok(base64_str) + } + + pub fn get_image_binary(&self) -> Result { + let mut clipboard = Clipboard::new().unwrap(); + let image_data = clipboard.get_image().map_err(|err| err.to_string())?; + + // Only check for stride alignment on Windows + #[cfg(target_os = "windows")] + { + let bytes_per_pixel = 4; // RGBA + let expected_bytes_per_row = image_data.width * bytes_per_pixel; + let actual_bytes_per_row = image_data.bytes.len() / image_data.height; + + if actual_bytes_per_row != expected_bytes_per_row { + // We have stride padding, need to remove it + let mut cleaned_bytes = Vec::with_capacity(expected_bytes_per_row * image_data.height); + + for row in 0..image_data.height { + let row_start = row * actual_bytes_per_row; + let row_end = row_start + expected_bytes_per_row; + cleaned_bytes.extend_from_slice(&image_data.bytes[row_start..row_end]); + } + + return Ok(ImageData { + width: image_data.width, + height: image_data.height, + bytes: Cow::Owned(cleaned_bytes), + }); + } + } + + // For macOS, Linux, and Windows without padding, return as-is + Ok(image_data) + } + + // Function 2: Returns Vec of PNG file data + pub fn read_image_binary(&self) -> Result, String> { + let mut clipboard = Clipboard::new().unwrap(); + let image = clipboard.get_image().map_err(|err| err.to_string())?; + + // Handle stride alignment + let bytes_per_pixel = 4; // RGBA + let expected_bytes_per_row = image.width * bytes_per_pixel; + let actual_bytes_per_row = image.bytes.len() / image.height; + + let cleaned_bytes = if actual_bytes_per_row != expected_bytes_per_row { + // Remove stride padding + let mut cleaned = Vec::with_capacity(expected_bytes_per_row * image.height); + + for row in 0..image.height { + let row_start = row * actual_bytes_per_row; + let row_end = row_start + expected_bytes_per_row; + cleaned.extend_from_slice(&image.bytes[row_start..row_end]); + } + cleaned + } else { + image.bytes.into_owned() + }; + + // Create image from cleaned bytes + let image2: RgbaImage = ImageBuffer::from_raw( + image.width.try_into().unwrap(), + image.height.try_into().unwrap(), + cleaned_bytes, + ) + .ok_or_else(|| "Failed to create image from raw bytes".to_string())?; + + // Save to temporary file and read back + let tmp_dir = tempfile::Builder::new() + .prefix("clipboard-img") + .tempdir() + .map_err(|err| err.to_string())?; + let fname = tmp_dir.path().join("clipboard-img.png"); + + image2.save(&fname).map_err(|err| err.to_string())?; + + let mut file = File::open(&fname).map_err(|err| err.to_string())?; + let mut buffer = vec![]; + file + .read_to_end(&mut buffer) + .map_err(|err| err.to_string())?; + + Ok(buffer) + } } /// Initializes the plugin. diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index 3444f702..194ef356 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -9,3 +9,4 @@ pub(crate) mod security_commands; pub(crate) mod shell_commands; pub(crate) mod tabs_commands; pub(crate) mod translations_commands; +pub(crate) mod user_settings_command; diff --git a/src-tauri/src/commands/user_settings_command.rs b/src-tauri/src/commands/user_settings_command.rs new file mode 100644 index 00000000..a0e63f55 --- /dev/null +++ b/src-tauri/src/commands/user_settings_command.rs @@ -0,0 +1,57 @@ +use serde_yaml::Value; +use std::collections::HashMap; +use tauri::command; + +use crate::services::user_settings_service::{ + get_all_settings, get_custom_db_path, get_setting, remove_custom_db_path, remove_setting, + set_custom_db_path, set_setting, +}; + +/// Returns the current `custom_db_path` (if any). +#[command] +pub fn cmd_get_custom_db_path() -> Option { + get_custom_db_path() +} + +/// Insert or update a new `custom_db_path`. +#[command] +pub fn cmd_set_custom_db_path(new_path: String) -> Result<(), String> { + set_custom_db_path(&new_path) +} + +/// Remove (clear) the `custom_db_path`. +#[command] +pub fn cmd_remove_custom_db_path() -> Result<(), String> { + remove_custom_db_path() +} + +/// Return all key-value pairs from the `data` map. +#[command] +pub fn cmd_get_all_settings() -> HashMap { + get_all_settings() +} + +/// Return a single setting by key (from the `data` map). +#[command] +pub fn cmd_get_setting(key: String) -> Option { + get_setting(&key) +} + +/// Insert (or update) a setting in the `data` map. +/// `value_yaml` is a string containing valid YAML (e.g. `"true"`, `"42"`, `"some string"`). +#[command] +pub fn cmd_set_setting(key: String, value_yaml: String) -> Result<(), String> { + // If your front end only sends strings, + // you could store them directly as `Value::String(value_yaml)`. + // But here we parse the YAML so you can handle booleans, numbers, etc. + match serde_yaml::from_str::(&value_yaml) { + Ok(val) => set_setting(&key, val), + Err(e) => Err(format!("Failed to parse YAML string: {}", e)), + } +} + +/// Remove a setting by key from the `data` map. +#[command] +pub fn cmd_remove_setting(key: String) -> Result<(), String> { + remove_setting(&key) +} diff --git a/src-tauri/src/db.rs b/src-tauri/src/db.rs index 932aa02a..eac6f2b2 100644 --- a/src-tauri/src/db.rs +++ b/src-tauri/src/db.rs @@ -10,6 +10,7 @@ use diesel::connection::SimpleConnection; use diesel::prelude::*; use diesel::r2d2 as diesel_r2d2; +use crate::services::user_settings_service::load_user_config; use diesel::sqlite::SqliteConnection; // use diesel::connection::{set_default_instrumentation, Instrumentation, InstrumentationEvent}; @@ -61,7 +62,7 @@ impl diesel::r2d2::CustomizeConnection } } -fn adjust_canonicalization>(p: P) -> String { +pub fn adjust_canonicalization>(p: P) -> String { const VERBATIM_PREFIX: &str = r#"\\?\"#; let p = p.as_ref().display().to_string(); if p.starts_with(VERBATIM_PREFIX) { @@ -217,6 +218,22 @@ fn db_file_exists() -> bool { } fn get_db_path() -> String { + let user_config = load_user_config(); + + if let Some(custom_path) = user_config.custom_db_path { + let final_path = adjust_custom_db_path(&custom_path); + + // Check if it's valid/writable + if can_access_or_create(&final_path) { + return final_path; + } else { + eprintln!( + "Warning: custom_db_path=\"{}\" is invalid or not writable. Falling back to default...", + custom_path + ); + } + } + if cfg!(debug_assertions) { let app_dir = APP_CONSTANTS.get().unwrap().app_dev_data_dir.clone(); let path = if cfg!(target_os = "macos") { @@ -253,6 +270,101 @@ fn get_db_path() -> String { } } +fn can_access_or_create(db_path: &str) -> bool { + let path = std::path::Path::new(db_path); + + if let Some(parent) = path.parent() { + if let Err(e) = std::fs::create_dir_all(parent) { + eprintln!( + "Failed to create parent directory '{}': {}", + parent.display(), + e + ); + return false; + } + } + + match std::fs::OpenOptions::new() + .read(true) + .write(true) + .create(true) + .open(&path) + { + Ok(_file) => true, + Err(e) => { + eprintln!("Failed to open custom DB path '{}': {}", db_path, e); + false + } + } +} + +fn adjust_custom_db_path(custom_path: &str) -> String { + use std::path::PathBuf; + let path = PathBuf::from(custom_path); + + match fs::metadata(&path) { + Ok(metadata) => { + if metadata.is_dir() { + // It's a directory, so append "pastebar-db.data" to it + let mut dir_path = path.clone(); + dir_path.push("pastebar-db.data"); + dir_path.to_string_lossy().into_owned() + } else { + // It's a file or symlink, so leave it as is + custom_path.to_string() + } + } + Err(_) => { + // If we can’t read metadata (e.g. it doesn't exist yet), + // we treat `custom_path` as a file path already. + custom_path.to_string() + } + } +} + +pub fn get_config_file_path() -> PathBuf { + if cfg!(debug_assertions) { + let app_dir = APP_CONSTANTS.get().unwrap().app_dev_data_dir.clone(); + if cfg!(target_os = "macos") { + PathBuf::from(format!( + "{}/pastebar_settings.yaml", + adjust_canonicalization(app_dir) + )) + } else if cfg!(target_os = "windows") { + PathBuf::from(format!( + "{}\\pastebar_settings.yaml", + adjust_canonicalization(app_dir) + )) + } else { + PathBuf::from(format!( + "{}/pastebar_settings.yaml", + adjust_canonicalization(app_dir) + )) + } + } else { + // Release mode + let app_data_dir = APP_CONSTANTS.get().unwrap().app_data_dir.clone(); + let data_dir = app_data_dir.as_path(); + + if cfg!(target_os = "macos") { + PathBuf::from(format!( + "{}/pastebar_settings.yaml", + adjust_canonicalization(data_dir) + )) + } else if cfg!(target_os = "windows") { + PathBuf::from(format!( + "{}\\pastebar_settings.yaml", + adjust_canonicalization(data_dir) + )) + } else { + PathBuf::from(format!( + "{}/pastebar_settings.yaml", + adjust_canonicalization(data_dir) + )) + } + } +} + // fn simple_sql_logger() -> Option> { // Some(Box::new( // move |event: InstrumentationEvent<'_>| match event { diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 4d1f7efc..fa7923c9 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -63,6 +63,8 @@ use commands::security_commands; use commands::shell_commands; use commands::tabs_commands; use commands::translations_commands; +use commands::user_settings_command; + use db::AppConstants; use mouse_position::mouse_position::Mouse; use std::collections::HashMap; @@ -1182,6 +1184,13 @@ async fn main() { security_commands::verify_os_password, security_commands::delete_os_password, security_commands::get_stored_os_password, + user_settings_command::cmd_get_custom_db_path, + user_settings_command::cmd_set_custom_db_path, + user_settings_command::cmd_remove_custom_db_path, + user_settings_command::cmd_get_all_settings, + user_settings_command::cmd_get_setting, + user_settings_command::cmd_set_setting, + user_settings_command::cmd_remove_setting, open_osx_accessibility_preferences, check_osx_accessibility_preferences, open_path_or_app, diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs index 1b63b7bb..52866de9 100644 --- a/src-tauri/src/services/mod.rs +++ b/src-tauri/src/services/mod.rs @@ -7,4 +7,5 @@ pub mod settings_service; pub mod shell_service; pub mod tabs_service; pub mod translations; +pub mod user_settings_service; pub mod utils; diff --git a/src-tauri/src/services/user_settings_service.rs b/src-tauri/src/services/user_settings_service.rs new file mode 100644 index 00000000..f4df3885 --- /dev/null +++ b/src-tauri/src/services/user_settings_service.rs @@ -0,0 +1,99 @@ +use serde::{Deserialize, Serialize}; +use serde_yaml; +use std::collections::HashMap; + +use crate::db::get_config_file_path; + +#[derive(Debug, Serialize, Deserialize, Default)] +pub struct UserConfig { + /// The custom DB path, if user specified one. + pub custom_db_path: Option, + + /// General-purpose key-value settings. + #[serde(default)] + pub data: HashMap, +} + +pub fn load_user_config() -> UserConfig { + let path = get_config_file_path(); + if !path.exists() { + return UserConfig::default(); + } + + match std::fs::read_to_string(&path) { + Ok(contents) => match serde_yaml::from_str::(&contents) { + Ok(cfg) => cfg, + Err(e) => { + eprintln!("Error parsing user config YAML: {:#}", e); + UserConfig::default() + } + }, + Err(e) => { + eprintln!("Error reading user config file: {:#}", e); + UserConfig::default() + } + } +} + +/// Save the `UserConfig` back to `pastebar_settings.yaml`. +pub fn save_user_config(cfg: &UserConfig) -> Result<(), String> { + let path = get_config_file_path(); + if let Some(parent) = path.parent() { + std::fs::create_dir_all(parent) + .map_err(|e| format!("Failed to create config directory: {}", e))?; + } + + let yaml_str = + serde_yaml::to_string(cfg).map_err(|e| format!("Failed to serialize config to YAML: {}", e))?; + std::fs::write(&path, yaml_str).map_err(|e| format!("Failed to write config file: {}", e))?; + + Ok(()) +} + +// =========================== +// Custom DB Path Methods +// =========================== + +/// Get the current `custom_db_path` (if any). +pub fn get_custom_db_path() -> Option { + load_user_config().custom_db_path +} + +/// Insert or update the `custom_db_path`. +pub fn set_custom_db_path(new_path: &str) -> Result<(), String> { + let mut config = load_user_config(); + config.custom_db_path = Some(new_path.to_string()); + save_user_config(&config) +} + +/// Remove (clear) the `custom_db_path`. +pub fn remove_custom_db_path() -> Result<(), String> { + let mut config = load_user_config(); + config.custom_db_path = None; + save_user_config(&config) +} + +// =========================== +// Key–Value data Methods +// =========================== + +pub fn get_setting(key: &str) -> Option { + let config = load_user_config(); + config.data.get(key).cloned() +} + +pub fn set_setting(key: &str, value: serde_yaml::Value) -> Result<(), String> { + let mut config = load_user_config(); + config.data.insert(key.to_string(), value); + save_user_config(&config) +} + +pub fn remove_setting(key: &str) -> Result<(), String> { + let mut config = load_user_config(); + config.data.remove(key); + save_user_config(&config) +} + +pub fn get_all_settings() -> HashMap { + load_user_config().data +} diff --git a/src-tauri/src/window_ext.rs b/src-tauri/src/window_ext.rs index 2ae04ff7..eaed3f03 100644 --- a/src-tauri/src/window_ext.rs +++ b/src-tauri/src/window_ext.rs @@ -39,11 +39,32 @@ impl WindowToolBar for Window { let miniaturize = window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton); let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton); - window - .standardWindowButton_(NSWindowButton::NSWindowDocumentIconButton) - .setCanHide_(cocoa::base::YES); + // Check if standard buttons exist + if close.is_null() || miniaturize.is_null() || zoom.is_null() { + eprintln!("Warning: Window buttons are null, skipping traffic light positioning"); + return; + } - let title_bar_container_view = close.superview().superview(); + let document_icon = window.standardWindowButton_(NSWindowButton::NSWindowDocumentIconButton); + if !document_icon.is_null() { + let mut doc_rect: NSRect = NSView::frame(document_icon); + doc_rect.origin.x = -200.0; // Move it off-screen + // document_icon.setFrameOrigin(doc_rect.origin); + // document_icon.setCanHide_(cocoa::base::YES); + } + + // Check superviews exist + let superview = close.superview(); + if superview.is_null() { + eprintln!("Warning: Close button superview is null"); + return; + } + + let title_bar_container_view = superview.superview(); + if title_bar_container_view.is_null() { + eprintln!("Warning: Title bar container view is null"); + return; + } let close_rect: NSRect = msg_send![close, frame]; let button_height = close_rect.size.height;