diff --git a/esbuild.config.mjs b/esbuild.config.mjs index f15c9e9..4c0a1cb 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -3,6 +3,14 @@ import process from "process"; import builtins from "builtin-modules"; import esbuildSvelte from "esbuild-svelte"; import { sveltePreprocess } from "svelte-preprocess"; +import dotenv from "dotenv"; +import dotenvExpand from "dotenv-expand"; +import manifest from "./manifest.json" with { type: "json" }; +import fs from "fs/promises"; +import path from "path"; + +const env = dotenv.config(); +dotenvExpand.expand(env); const banner = `/* THIS IS A GENERATED/BUNDLED FILE BY ESBUILD @@ -12,6 +20,21 @@ if you want to view the source, please visit the github repository of this plugi const prod = process.argv[2] === "production"; +let outDir = "dist"; +if (!prod) { + if (!process.env.OBSIDIAN_PLUGIN_DIR) { + console.log( + "Set OBSIDIAN_PLUGIN_DIR in the .env file to plugin directory to copy files to." + ); + } else { + outDir = process.env.OBSIDIAN_PLUGIN_DIR + "/" + manifest.id + "-dev"; + } +} + +if (outDir[0] === "~") { + outDir = path.join(process.env.HOME, outDir.slice(1)); +} + const context = await esbuild.context({ banner: { js: banner, @@ -21,11 +44,32 @@ const context = await esbuild.context({ plugins: [ esbuildSvelte({ preprocess: sveltePreprocess(), - compilerOptions: { - css: "injected", - dev: !prod, - }, + compilerOptions: { dev: !prod }, }), + { + name: 'copy-plugin', + setup(build) { + build.onEnd(async () => { + try { + await fs.copyFile(new URL('./manifest.json', import.meta.url), path.resolve(outDir, 'manifest.json')); + } catch (e) { + console.error('Failed to rename file:', e); + } + }); + }, + }, + { + name: 'rename-plugin', + setup(build) { + build.onEnd(async () => { + try { + await fs.rename(path.resolve(outDir, 'main.css'), path.resolve(outDir, 'styles.css')); + } catch (e) { + console.error('Failed to rename file:', e); + } + }); + }, + } ], external: [ "obsidian", @@ -48,8 +92,8 @@ const context = await esbuild.context({ logLevel: "info", sourcemap: prod ? false : "inline", treeShaking: true, - outfile: "main.js", - minify: prod, + outdir: outDir, + minify: prod }); if (prod) { diff --git a/package.json b/package.json index 37bff93..cc3bed0 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "This is a sample plugin for Obsidian (https://obsidian.md)", "main": "main.js", "scripts": { - "dev": "vite build --watch --mode=development", - "build": "vite build", + "dev": "node esbuild.config.mjs", + "build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production", "version": "node version-bump.mjs && git add manifest.json versions.json", "svelte-check": "svelte-check --tsconfig tsconfig.json" }, @@ -13,13 +13,10 @@ "author": "", "license": "MIT", "devDependencies": { - "@guanghechen/rollup-plugin-copy": "^6.0.7", "@popperjs/core": "^2.11.8", - "@sveltejs/vite-plugin-svelte": "^5.1.0", "@types/node": "^24.0.6", "@typescript-eslint/eslint-plugin": "5.29.0", "@typescript-eslint/parser": "5.29.0", - "bits-ui": "^2.8.10", "builtin-modules": "3.3.0", "dotenv": "^17.0.0", "dotenv-expand": "^12.0.2", @@ -29,12 +26,12 @@ "lucide-svelte": "^0.525.0", "npm-run-all": "^4.1.5", "obsidian": "latest", + "runed": "^0.29.1", "sass": "^1.89.2", "svelte": "^5.34.8", "svelte-check": "^4.2.2", "svelte-preprocess": "^6.0.3", "tslib": "2.4.0", - "typescript": "5.0.4", - "vite": "^6.0.0" + "typescript": "5.0.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 901a04b..4e8decd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,15 +8,9 @@ importers: .: devDependencies: - '@guanghechen/rollup-plugin-copy': - specifier: ^6.0.7 - version: 6.0.7(rollup@4.44.1) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 - '@sveltejs/vite-plugin-svelte': - specifier: ^5.1.0 - version: 5.1.0(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)) '@types/node': specifier: ^24.0.6 version: 24.0.6 @@ -26,9 +20,6 @@ importers: '@typescript-eslint/parser': specifier: 5.29.0 version: 5.29.0(eslint@8.57.1)(typescript@5.0.4) - bits-ui: - specifier: ^2.8.10 - version: 2.8.10(@internationalized/date@3.8.2)(svelte@5.34.8) builtin-modules: specifier: 3.3.0 version: 3.3.0 @@ -56,6 +47,9 @@ importers: obsidian: specifier: latest version: 1.8.7(@codemirror/state@6.5.2)(@codemirror/view@6.37.2) + runed: + specifier: ^0.29.1 + version: 0.29.1(svelte@5.34.8) sass: specifier: ^1.89.2 version: 1.89.2 @@ -74,9 +68,6 @@ importers: typescript: specifier: 5.0.4 version: 5.0.4 - vite: - specifier: ^6.0.0 - version: 6.3.5(@types/node@24.0.6)(sass@1.89.2) packages: @@ -90,288 +81,138 @@ packages: '@codemirror/view@6.37.2': resolution: {integrity: sha512-XD3LdgQpxQs5jhOOZ2HRVT+Rj59O4Suc7g2ULvZ+Yi8eCkickrkZ5JFuoDhs2ST1mNI5zSsNYgR3NGa4OUrbnw==} - '@esbuild/aix-ppc64@0.25.5': - resolution: {integrity: sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [aix] - '@esbuild/android-arm64@0.17.3': resolution: {integrity: sha512-XvJsYo3dO3Pi4kpalkyMvfQsjxPWHYjoX4MDiB/FUM4YMfWcXa5l4VCwFWVYI1+92yxqjuqrhNg0CZg3gSouyQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.25.5': - resolution: {integrity: sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm@0.17.3': resolution: {integrity: sha512-1Mlz934GvbgdDmt26rTLmf03cAgLg5HyOgJN+ZGCeP3Q9ynYTNMn2/LQxIl7Uy+o4K6Rfi2OuLsr12JQQR8gNg==} engines: {node: '>=12'} cpu: [arm] os: [android] - '@esbuild/android-arm@0.25.5': - resolution: {integrity: sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==} - engines: {node: '>=18'} - cpu: [arm] - os: [android] - '@esbuild/android-x64@0.17.3': resolution: {integrity: sha512-nuV2CmLS07Gqh5/GrZLuqkU9Bm6H6vcCspM+zjp9TdQlxJtIe+qqEXQChmfc7nWdyr/yz3h45Utk1tUn8Cz5+A==} engines: {node: '>=12'} cpu: [x64] os: [android] - '@esbuild/android-x64@0.25.5': - resolution: {integrity: sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==} - engines: {node: '>=18'} - cpu: [x64] - os: [android] - '@esbuild/darwin-arm64@0.17.3': resolution: {integrity: sha512-01Hxaaat6m0Xp9AXGM8mjFtqqwDjzlMP0eQq9zll9U85ttVALGCGDuEvra5Feu/NbP5AEP1MaopPwzsTcUq1cw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.25.5': - resolution: {integrity: sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==} - engines: {node: '>=18'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-x64@0.17.3': resolution: {integrity: sha512-Eo2gq0Q/er2muf8Z83X21UFoB7EU6/m3GNKvrhACJkjVThd0uA+8RfKpfNhuMCl1bKRfBzKOk6xaYKQZ4lZqvA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.25.5': - resolution: {integrity: sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==} - engines: {node: '>=18'} - cpu: [x64] - os: [darwin] - '@esbuild/freebsd-arm64@0.17.3': resolution: {integrity: sha512-CN62ESxaquP61n1ZjQP/jZte8CE09M6kNn3baos2SeUfdVBkWN5n6vGp2iKyb/bm/x4JQzEvJgRHLGd5F5b81w==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.25.5': - resolution: {integrity: sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-x64@0.17.3': resolution: {integrity: sha512-feq+K8TxIznZE+zhdVurF3WNJ/Sa35dQNYbaqM/wsCbWdzXr5lyq+AaTUSER2cUR+SXPnd/EY75EPRjf4s1SLg==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.25.5': - resolution: {integrity: sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==} - engines: {node: '>=18'} - cpu: [x64] - os: [freebsd] - '@esbuild/linux-arm64@0.17.3': resolution: {integrity: sha512-JHeZXD4auLYBnrKn6JYJ0o5nWJI9PhChA/Nt0G4MvLaMrvXuWnY93R3a7PiXeJQphpL1nYsaMcoV2QtuvRnF/g==} engines: {node: '>=12'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.25.5': - resolution: {integrity: sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm@0.17.3': resolution: {integrity: sha512-CLP3EgyNuPcg2cshbwkqYy5bbAgK+VhyfMU7oIYyn+x4Y67xb5C5ylxsNUjRmr8BX+MW3YhVNm6Lq6FKtRTWHQ==} engines: {node: '>=12'} cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.25.5': - resolution: {integrity: sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==} - engines: {node: '>=18'} - cpu: [arm] - os: [linux] - '@esbuild/linux-ia32@0.17.3': resolution: {integrity: sha512-FyXlD2ZjZqTFh0sOQxFDiWG1uQUEOLbEh9gKN/7pFxck5Vw0qjWSDqbn6C10GAa1rXJpwsntHcmLqydY9ST9ZA==} engines: {node: '>=12'} cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.25.5': - resolution: {integrity: sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==} - engines: {node: '>=18'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-loong64@0.17.3': resolution: {integrity: sha512-OrDGMvDBI2g7s04J8dh8/I7eSO+/E7nMDT2Z5IruBfUO/RiigF1OF6xoH33Dn4W/OwAWSUf1s2nXamb28ZklTA==} engines: {node: '>=12'} cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.25.5': - resolution: {integrity: sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==} - engines: {node: '>=18'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-mips64el@0.17.3': resolution: {integrity: sha512-DcnUpXnVCJvmv0TzuLwKBC2nsQHle8EIiAJiJ+PipEVC16wHXaPEKP0EqN8WnBe0TPvMITOUlP2aiL5YMld+CQ==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.25.5': - resolution: {integrity: sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==} - engines: {node: '>=18'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-ppc64@0.17.3': resolution: {integrity: sha512-BDYf/l1WVhWE+FHAW3FzZPtVlk9QsrwsxGzABmN4g8bTjmhazsId3h127pliDRRu5674k1Y2RWejbpN46N9ZhQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.25.5': - resolution: {integrity: sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-riscv64@0.17.3': resolution: {integrity: sha512-WViAxWYMRIi+prTJTyV1wnqd2mS2cPqJlN85oscVhXdb/ZTFJdrpaqm/uDsZPGKHtbg5TuRX/ymKdOSk41YZow==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.25.5': - resolution: {integrity: sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==} - engines: {node: '>=18'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-s390x@0.17.3': resolution: {integrity: sha512-Iw8lkNHUC4oGP1O/KhumcVy77u2s6+KUjieUqzEU3XuWJqZ+AY7uVMrrCbAiwWTkpQHkr00BuXH5RpC6Sb/7Ug==} engines: {node: '>=12'} cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.25.5': - resolution: {integrity: sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==} - engines: {node: '>=18'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-x64@0.17.3': resolution: {integrity: sha512-0AGkWQMzeoeAtXQRNB3s4J1/T2XbigM2/Mn2yU1tQSmQRmHIZdkGbVq2A3aDdNslPyhb9/lH0S5GMTZ4xsjBqg==} engines: {node: '>=12'} cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.25.5': - resolution: {integrity: sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==} - engines: {node: '>=18'} - cpu: [x64] - os: [linux] - - '@esbuild/netbsd-arm64@0.25.5': - resolution: {integrity: sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [netbsd] - '@esbuild/netbsd-x64@0.17.3': resolution: {integrity: sha512-4+rR/WHOxIVh53UIQIICryjdoKdHsFZFD4zLSonJ9RRw7bhKzVyXbnRPsWSfwybYqw9sB7ots/SYyufL1mBpEg==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.25.5': - resolution: {integrity: sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==} - engines: {node: '>=18'} - cpu: [x64] - os: [netbsd] - - '@esbuild/openbsd-arm64@0.25.5': - resolution: {integrity: sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openbsd] - '@esbuild/openbsd-x64@0.17.3': resolution: {integrity: sha512-cVpWnkx9IYg99EjGxa5Gc0XmqumtAwK3aoz7O4Dii2vko+qXbkHoujWA68cqXjhh6TsLaQelfDO4MVnyr+ODeA==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.25.5': - resolution: {integrity: sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==} - engines: {node: '>=18'} - cpu: [x64] - os: [openbsd] - '@esbuild/sunos-x64@0.17.3': resolution: {integrity: sha512-RxmhKLbTCDAY2xOfrww6ieIZkZF+KBqG7S2Ako2SljKXRFi+0863PspK74QQ7JpmWwncChY25JTJSbVBYGQk2Q==} engines: {node: '>=12'} cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.25.5': - resolution: {integrity: sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==} - engines: {node: '>=18'} - cpu: [x64] - os: [sunos] - '@esbuild/win32-arm64@0.17.3': resolution: {integrity: sha512-0r36VeEJ4efwmofxVJRXDjVRP2jTmv877zc+i+Pc7MNsIr38NfsjkQj23AfF7l0WbB+RQ7VUb+LDiqC/KY/M/A==} engines: {node: '>=12'} cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.25.5': - resolution: {integrity: sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-ia32@0.17.3': resolution: {integrity: sha512-wgO6rc7uGStH22nur4aLFcq7Wh86bE9cOFmfTr/yxN3BXvDEdCSXyKkO+U5JIt53eTOgC47v9k/C1bITWL/Teg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.25.5': - resolution: {integrity: sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==} - engines: {node: '>=18'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-x64@0.17.3': resolution: {integrity: sha512-FdVl64OIuiKjgXBjwZaJLKp0eaEckifbhn10dXWhysMJkWblg3OEEGKSIyhiD5RSgAya8WzP3DNkngtIg3Nt7g==} engines: {node: '>=12'} cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.25.5': - resolution: {integrity: sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==} - engines: {node: '>=18'} - cpu: [x64] - os: [win32] - '@eslint-community/eslint-utils@4.7.0': resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -390,35 +231,6 @@ packages: resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - '@floating-ui/core@1.7.1': - resolution: {integrity: sha512-azI0DrjMMfIug/ExbBaeDVJXcY0a7EPvPjb2xAJPa4HeimBX+Z18HK8QQR3jb6356SnDDdxx+hinMLcJEDdOjw==} - - '@floating-ui/dom@1.7.1': - resolution: {integrity: sha512-cwsmW/zyw5ltYTUeeYJ60CnQuPqmGwuGVhG9w0PRaRKkAyi38BT5CKrpIbb+jtahSwUl04cWzSx9ZOIxeS6RsQ==} - - '@floating-ui/utils@0.2.9': - resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} - - '@guanghechen/chalk.types@1.0.4': - resolution: {integrity: sha512-H9cnP7BJ8wxlRk4CkGTjgn1vvuU+DvcgmCwkJUTCsbHTQ8VCXb83xF98WSElJPZfh0EL2XTqG3fD9D7Zoab7OA==} - - '@guanghechen/chalk@1.0.4': - resolution: {integrity: sha512-9h6f5DOecmxX+ityDBwNVJcS91UGVp07DN4Do9Ul9X196O0Mbv44ky03ruUtf0FBRzg7Kdnf9zRtkwfSzBNeng==} - - '@guanghechen/globby@1.0.4': - resolution: {integrity: sha512-ZV+1MncBbMpGtTluoRlWfQhjWf8O5J+AtFudkCw1PWSlqffn/i4kLofKWsaKWF3XFY5RAc8zIUIEjcbNRzBWSA==} - engines: {node: '>= 18.0.0'} - - '@guanghechen/rollup-plugin-copy@6.0.7': - resolution: {integrity: sha512-r/S3G5oNDhrV53v1BaH22rxtk9PkFmjVt7D2dNXTNFBEO+gtOu5dLf35bfp7Ar/ENPXjr2eQh/1qnmhgU70fQg==} - engines: {node: '>= 18.0.0'} - peerDependencies: - rollup: ^2.0.0 || ^3.0.0 || ^4.0.0 - - '@guanghechen/std@1.0.4': - resolution: {integrity: sha512-jjFX1ud5AULLaF6koHuiIHZQMgGkwKi22D6LzkIea05zZ/I7MmR+HRzQ4+XkfcY2YvHbt9zMGyhBqJrQaiPi+w==} - engines: {node: '>= 18.0.0'} - '@humanwhocodes/config-array@0.13.0': resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} engines: {node: '>=10.10.0'} @@ -432,9 +244,6 @@ packages: resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} deprecated: Use @eslint/object-schema instead - '@internationalized/date@3.8.2': - resolution: {integrity: sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==} - '@jridgewell/gen-mapping@0.3.8': resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} engines: {node: '>=6.0.0'} @@ -553,129 +362,11 @@ packages: '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} - '@rollup/rollup-android-arm-eabi@4.44.1': - resolution: {integrity: sha512-JAcBr1+fgqx20m7Fwe1DxPUl/hPkee6jA6Pl7n1v2EFiktAHenTaXl5aIFjUIEsfn9w3HE4gK1lEgNGMzBDs1w==} - cpu: [arm] - os: [android] - - '@rollup/rollup-android-arm64@4.44.1': - resolution: {integrity: sha512-RurZetXqTu4p+G0ChbnkwBuAtwAbIwJkycw1n6GvlGlBuS4u5qlr5opix8cBAYFJgaY05TWtM+LaoFggUmbZEQ==} - cpu: [arm64] - os: [android] - - '@rollup/rollup-darwin-arm64@4.44.1': - resolution: {integrity: sha512-fM/xPesi7g2M7chk37LOnmnSTHLG/v2ggWqKj3CCA1rMA4mm5KVBT1fNoswbo1JhPuNNZrVwpTvlCVggv8A2zg==} - cpu: [arm64] - os: [darwin] - - '@rollup/rollup-darwin-x64@4.44.1': - resolution: {integrity: sha512-gDnWk57urJrkrHQ2WVx9TSVTH7lSlU7E3AFqiko+bgjlh78aJ88/3nycMax52VIVjIm3ObXnDL2H00e/xzoipw==} - cpu: [x64] - os: [darwin] - - '@rollup/rollup-freebsd-arm64@4.44.1': - resolution: {integrity: sha512-wnFQmJ/zPThM5zEGcnDcCJeYJgtSLjh1d//WuHzhf6zT3Md1BvvhJnWoy+HECKu2bMxaIcfWiu3bJgx6z4g2XA==} - cpu: [arm64] - os: [freebsd] - - '@rollup/rollup-freebsd-x64@4.44.1': - resolution: {integrity: sha512-uBmIxoJ4493YATvU2c0upGz87f99e3wop7TJgOA/bXMFd2SvKCI7xkxY/5k50bv7J6dw1SXT4MQBQSLn8Bb/Uw==} - cpu: [x64] - os: [freebsd] - - '@rollup/rollup-linux-arm-gnueabihf@4.44.1': - resolution: {integrity: sha512-n0edDmSHlXFhrlmTK7XBuwKlG5MbS7yleS1cQ9nn4kIeW+dJH+ExqNgQ0RrFRew8Y+0V/x6C5IjsHrJmiHtkxQ==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm-musleabihf@4.44.1': - resolution: {integrity: sha512-8WVUPy3FtAsKSpyk21kV52HCxB+me6YkbkFHATzC2Yd3yuqHwy2lbFL4alJOLXKljoRw08Zk8/xEj89cLQ/4Nw==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm64-gnu@4.44.1': - resolution: {integrity: sha512-yuktAOaeOgorWDeFJggjuCkMGeITfqvPgkIXhDqsfKX8J3jGyxdDZgBV/2kj/2DyPaLiX6bPdjJDTu9RB8lUPQ==} - cpu: [arm64] - os: [linux] - - '@rollup/rollup-linux-arm64-musl@4.44.1': - resolution: {integrity: sha512-W+GBM4ifET1Plw8pdVaecwUgxmiH23CfAUj32u8knq0JPFyK4weRy6H7ooxYFD19YxBulL0Ktsflg5XS7+7u9g==} - cpu: [arm64] - os: [linux] - - '@rollup/rollup-linux-loongarch64-gnu@4.44.1': - resolution: {integrity: sha512-1zqnUEMWp9WrGVuVak6jWTl4fEtrVKfZY7CvcBmUUpxAJ7WcSowPSAWIKa/0o5mBL/Ij50SIf9tuirGx63Ovew==} - cpu: [loong64] - os: [linux] - - '@rollup/rollup-linux-powerpc64le-gnu@4.44.1': - resolution: {integrity: sha512-Rl3JKaRu0LHIx7ExBAAnf0JcOQetQffaw34T8vLlg9b1IhzcBgaIdnvEbbsZq9uZp3uAH+JkHd20Nwn0h9zPjA==} - cpu: [ppc64] - os: [linux] - - '@rollup/rollup-linux-riscv64-gnu@4.44.1': - resolution: {integrity: sha512-j5akelU3snyL6K3N/iX7otLBIl347fGwmd95U5gS/7z6T4ftK288jKq3A5lcFKcx7wwzb5rgNvAg3ZbV4BqUSw==} - cpu: [riscv64] - os: [linux] - - '@rollup/rollup-linux-riscv64-musl@4.44.1': - resolution: {integrity: sha512-ppn5llVGgrZw7yxbIm8TTvtj1EoPgYUAbfw0uDjIOzzoqlZlZrLJ/KuiE7uf5EpTpCTrNt1EdtzF0naMm0wGYg==} - cpu: [riscv64] - os: [linux] - - '@rollup/rollup-linux-s390x-gnu@4.44.1': - resolution: {integrity: sha512-Hu6hEdix0oxtUma99jSP7xbvjkUM/ycke/AQQ4EC5g7jNRLLIwjcNwaUy95ZKBJJwg1ZowsclNnjYqzN4zwkAw==} - cpu: [s390x] - os: [linux] - - '@rollup/rollup-linux-x64-gnu@4.44.1': - resolution: {integrity: sha512-EtnsrmZGomz9WxK1bR5079zee3+7a+AdFlghyd6VbAjgRJDbTANJ9dcPIPAi76uG05micpEL+gPGmAKYTschQw==} - cpu: [x64] - os: [linux] - - '@rollup/rollup-linux-x64-musl@4.44.1': - resolution: {integrity: sha512-iAS4p+J1az6Usn0f8xhgL4PaU878KEtutP4hqw52I4IO6AGoyOkHCxcc4bqufv1tQLdDWFx8lR9YlwxKuv3/3g==} - cpu: [x64] - os: [linux] - - '@rollup/rollup-win32-arm64-msvc@4.44.1': - resolution: {integrity: sha512-NtSJVKcXwcqozOl+FwI41OH3OApDyLk3kqTJgx8+gp6On9ZEt5mYhIsKNPGuaZr3p9T6NWPKGU/03Vw4CNU9qg==} - cpu: [arm64] - os: [win32] - - '@rollup/rollup-win32-ia32-msvc@4.44.1': - resolution: {integrity: sha512-JYA3qvCOLXSsnTR3oiyGws1Dm0YTuxAAeaYGVlGpUsHqloPcFjPg+X0Fj2qODGLNwQOAcCiQmHub/V007kiH5A==} - cpu: [ia32] - os: [win32] - - '@rollup/rollup-win32-x64-msvc@4.44.1': - resolution: {integrity: sha512-J8o22LuF0kTe7m+8PvW9wk3/bRq5+mRo5Dqo6+vXb7otCm3TPhYOJqOaQtGU9YMWQSL3krMnoOxMr0+9E6F3Ug==} - cpu: [x64] - os: [win32] - '@sveltejs/acorn-typescript@1.0.5': resolution: {integrity: sha512-IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ==} peerDependencies: acorn: ^8.9.0 - '@sveltejs/vite-plugin-svelte-inspector@4.0.1': - resolution: {integrity: sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22} - peerDependencies: - '@sveltejs/vite-plugin-svelte': ^5.0.0 - svelte: ^5.0.0 - vite: ^6.0.0 - - '@sveltejs/vite-plugin-svelte@5.1.0': - resolution: {integrity: sha512-wojIS/7GYnJDYIg1higWj2ROA6sSRWvcR1PO/bqEyFr/5UZah26c8Cz4u0NaqjPeVltzsVpt2Tm8d2io0V+4Tw==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22} - peerDependencies: - svelte: ^5.0.0 - vite: ^6.0.0 - - '@swc/helpers@0.5.17': - resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} - '@types/codemirror@5.60.8': resolution: {integrity: sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==} @@ -811,13 +502,6 @@ packages: balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - bits-ui@2.8.10: - resolution: {integrity: sha512-MOobkqapDZNrpcNmeL2g664xFmH4tZBOKBTxFmsQYMZQuybSZHQnPXy+AjM5XZEXRmCFx5+XRmo6+fC3vHh1hQ==} - engines: {node: '>=20'} - peerDependencies: - '@internationalized/date': ^3.8.1 - svelte: ^5.33.0 - brace-expansion@1.1.12: resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==} @@ -912,10 +596,6 @@ packages: deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - deepmerge@4.3.1: - resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} - engines: {node: '>=0.10.0'} - define-data-property@1.1.4: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} @@ -992,11 +672,6 @@ packages: engines: {node: '>=12'} hasBin: true - esbuild@0.25.5: - resolution: {integrity: sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==} - engines: {node: '>=18'} - hasBin: true - escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -1113,11 +788,6 @@ packages: fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - fsevents@2.3.3: - resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} @@ -1220,10 +890,6 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} - ignore@7.0.5: - resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} - engines: {node: '>= 4'} - immutable@5.1.3: resolution: {integrity: sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==} @@ -1242,9 +908,6 @@ packages: inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - inline-style-parser@0.2.4: - resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==} - internal-slot@1.1.0: resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==} engines: {node: '>= 0.4'} @@ -1384,10 +1047,6 @@ packages: keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} - kleur@4.1.5: - resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} - engines: {node: '>=6'} - levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} @@ -1620,11 +1279,6 @@ packages: deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true - rollup@4.44.1: - resolution: {integrity: sha512-x8H8aPvD+xbl0Do8oez5f5o8eMS3trfCghc4HhLAnCkj7Vl0d1JWGs0UF/D886zLW2rOj2QymV/JcSSsw+XDNg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -1770,9 +1424,6 @@ packages: style-mod@4.1.2: resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==} - style-to-object@1.0.9: - resolution: {integrity: sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw==} - supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -1830,26 +1481,13 @@ packages: typescript: optional: true - svelte-toolbelt@0.9.3: - resolution: {integrity: sha512-HCSWxCtVmv+c6g1ACb8LTwHVbDqLKJvHpo6J8TaqwUme2hj9ATJCpjCPNISR1OCq2Q4U1KT41if9ON0isINQZw==} - engines: {node: '>=18', pnpm: '>=8.7.0'} - peerDependencies: - svelte: ^5.30.2 - svelte@5.34.8: resolution: {integrity: sha512-TF+8irl7rpj3+fpaLuPRX5BqReTAqckp0Fumxa/mCeK3fo0/MnBb9W/Z2bLwtqj3C3r5Lm6NKIAw7YrgIv1Fwg==} engines: {node: '>=18'} - tabbable@6.2.0: - resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} - tinyglobby@0.2.14: - resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==} - engines: {node: '>=12.0.0'} - to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -1860,9 +1498,6 @@ packages: tslib@2.4.0: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} - tslib@2.8.1: - resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - tsutils@3.21.0: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} @@ -1916,54 +1551,6 @@ packages: validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} - vite@6.3.5: - resolution: {integrity: sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - jiti: '>=1.21.0' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - sass-embedded: '*' - stylus: '*' - sugarss: '*' - terser: ^5.16.0 - tsx: ^4.8.1 - yaml: ^2.4.2 - peerDependenciesMeta: - '@types/node': - optional: true - jiti: - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - sass-embedded: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - tsx: - optional: true - yaml: - optional: true - - vitefu@1.0.7: - resolution: {integrity: sha512-eRWXLBbJjW3X5z5P5IHcSm2yYbYRPb2kQuc+oqsbAl99WB5kVsPbiiox+cymo8twTzifA6itvhr2CmjnaZZp0Q==} - peerDependencies: - vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0 - peerDependenciesMeta: - vite: - optional: true - w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} @@ -2027,147 +1614,72 @@ snapshots: style-mod: 4.1.2 w3c-keyname: 2.2.8 - '@esbuild/aix-ppc64@0.25.5': - optional: true - '@esbuild/android-arm64@0.17.3': optional: true - '@esbuild/android-arm64@0.25.5': - optional: true - '@esbuild/android-arm@0.17.3': optional: true - '@esbuild/android-arm@0.25.5': - optional: true - '@esbuild/android-x64@0.17.3': optional: true - '@esbuild/android-x64@0.25.5': - optional: true - '@esbuild/darwin-arm64@0.17.3': optional: true - '@esbuild/darwin-arm64@0.25.5': - optional: true - '@esbuild/darwin-x64@0.17.3': optional: true - '@esbuild/darwin-x64@0.25.5': - optional: true - '@esbuild/freebsd-arm64@0.17.3': optional: true - '@esbuild/freebsd-arm64@0.25.5': - optional: true - '@esbuild/freebsd-x64@0.17.3': optional: true - '@esbuild/freebsd-x64@0.25.5': - optional: true - '@esbuild/linux-arm64@0.17.3': optional: true - '@esbuild/linux-arm64@0.25.5': - optional: true - '@esbuild/linux-arm@0.17.3': optional: true - '@esbuild/linux-arm@0.25.5': - optional: true - '@esbuild/linux-ia32@0.17.3': optional: true - '@esbuild/linux-ia32@0.25.5': - optional: true - '@esbuild/linux-loong64@0.17.3': optional: true - '@esbuild/linux-loong64@0.25.5': - optional: true - '@esbuild/linux-mips64el@0.17.3': optional: true - '@esbuild/linux-mips64el@0.25.5': - optional: true - '@esbuild/linux-ppc64@0.17.3': optional: true - '@esbuild/linux-ppc64@0.25.5': - optional: true - '@esbuild/linux-riscv64@0.17.3': optional: true - '@esbuild/linux-riscv64@0.25.5': - optional: true - '@esbuild/linux-s390x@0.17.3': optional: true - '@esbuild/linux-s390x@0.25.5': - optional: true - '@esbuild/linux-x64@0.17.3': optional: true - '@esbuild/linux-x64@0.25.5': - optional: true - - '@esbuild/netbsd-arm64@0.25.5': - optional: true - '@esbuild/netbsd-x64@0.17.3': optional: true - '@esbuild/netbsd-x64@0.25.5': - optional: true - - '@esbuild/openbsd-arm64@0.25.5': - optional: true - '@esbuild/openbsd-x64@0.17.3': optional: true - '@esbuild/openbsd-x64@0.25.5': - optional: true - '@esbuild/sunos-x64@0.17.3': optional: true - '@esbuild/sunos-x64@0.25.5': - optional: true - '@esbuild/win32-arm64@0.17.3': optional: true - '@esbuild/win32-arm64@0.25.5': - optional: true - '@esbuild/win32-ia32@0.17.3': optional: true - '@esbuild/win32-ia32@0.25.5': - optional: true - '@esbuild/win32-x64@0.17.3': optional: true - '@esbuild/win32-x64@0.25.5': - optional: true - '@eslint-community/eslint-utils@4.7.0(eslint@8.57.1)': dependencies: eslint: 8.57.1 @@ -2191,40 +1703,6 @@ snapshots: '@eslint/js@8.57.1': {} - '@floating-ui/core@1.7.1': - dependencies: - '@floating-ui/utils': 0.2.9 - - '@floating-ui/dom@1.7.1': - dependencies: - '@floating-ui/core': 1.7.1 - '@floating-ui/utils': 0.2.9 - - '@floating-ui/utils@0.2.9': {} - - '@guanghechen/chalk.types@1.0.4': {} - - '@guanghechen/chalk@1.0.4': - dependencies: - '@guanghechen/chalk.types': 1.0.4 - - '@guanghechen/globby@1.0.4': - dependencies: - fast-glob: 3.3.3 - ignore: 7.0.5 - - '@guanghechen/rollup-plugin-copy@6.0.7(rollup@4.44.1)': - dependencies: - '@guanghechen/chalk': 1.0.4 - '@guanghechen/globby': 1.0.4 - '@guanghechen/std': 1.0.4 - chokidar: 4.0.3 - dir-glob: 3.0.1 - micromatch: 4.0.8 - rollup: 4.44.1 - - '@guanghechen/std@1.0.4': {} - '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 @@ -2237,10 +1715,6 @@ snapshots: '@humanwhocodes/object-schema@2.0.3': {} - '@internationalized/date@3.8.2': - dependencies: - '@swc/helpers': 0.5.17 - '@jridgewell/gen-mapping@0.3.8': dependencies: '@jridgewell/set-array': 1.2.1 @@ -2335,96 +1809,10 @@ snapshots: '@popperjs/core@2.11.8': {} - '@rollup/rollup-android-arm-eabi@4.44.1': - optional: true - - '@rollup/rollup-android-arm64@4.44.1': - optional: true - - '@rollup/rollup-darwin-arm64@4.44.1': - optional: true - - '@rollup/rollup-darwin-x64@4.44.1': - optional: true - - '@rollup/rollup-freebsd-arm64@4.44.1': - optional: true - - '@rollup/rollup-freebsd-x64@4.44.1': - optional: true - - '@rollup/rollup-linux-arm-gnueabihf@4.44.1': - optional: true - - '@rollup/rollup-linux-arm-musleabihf@4.44.1': - optional: true - - '@rollup/rollup-linux-arm64-gnu@4.44.1': - optional: true - - '@rollup/rollup-linux-arm64-musl@4.44.1': - optional: true - - '@rollup/rollup-linux-loongarch64-gnu@4.44.1': - optional: true - - '@rollup/rollup-linux-powerpc64le-gnu@4.44.1': - optional: true - - '@rollup/rollup-linux-riscv64-gnu@4.44.1': - optional: true - - '@rollup/rollup-linux-riscv64-musl@4.44.1': - optional: true - - '@rollup/rollup-linux-s390x-gnu@4.44.1': - optional: true - - '@rollup/rollup-linux-x64-gnu@4.44.1': - optional: true - - '@rollup/rollup-linux-x64-musl@4.44.1': - optional: true - - '@rollup/rollup-win32-arm64-msvc@4.44.1': - optional: true - - '@rollup/rollup-win32-ia32-msvc@4.44.1': - optional: true - - '@rollup/rollup-win32-x64-msvc@4.44.1': - optional: true - '@sveltejs/acorn-typescript@1.0.5(acorn@8.15.0)': dependencies: acorn: 8.15.0 - '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)))(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2))': - dependencies: - '@sveltejs/vite-plugin-svelte': 5.1.0(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)) - debug: 4.4.1 - svelte: 5.34.8 - vite: 6.3.5(@types/node@24.0.6)(sass@1.89.2) - transitivePeerDependencies: - - supports-color - - '@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2))': - dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.0(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)))(svelte@5.34.8)(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)) - debug: 4.4.1 - deepmerge: 4.3.1 - kleur: 4.1.5 - magic-string: 0.30.17 - svelte: 5.34.8 - vite: 6.3.5(@types/node@24.0.6)(sass@1.89.2) - vitefu: 1.0.7(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)) - transitivePeerDependencies: - - supports-color - - '@swc/helpers@0.5.17': - dependencies: - tslib: 2.8.1 - '@types/codemirror@5.60.8': dependencies: '@types/tern': 0.23.9 @@ -2577,17 +1965,6 @@ snapshots: balanced-match@1.0.2: {} - bits-ui@2.8.10(@internationalized/date@3.8.2)(svelte@5.34.8): - dependencies: - '@floating-ui/core': 1.7.1 - '@floating-ui/dom': 1.7.1 - '@internationalized/date': 3.8.2 - esm-env: 1.2.2 - runed: 0.29.1(svelte@5.34.8) - svelte: 5.34.8 - svelte-toolbelt: 0.9.3(svelte@5.34.8) - tabbable: 6.2.0 - brace-expansion@1.1.12: dependencies: balanced-match: 1.0.2 @@ -2689,8 +2066,6 @@ snapshots: deep-is@0.1.4: {} - deepmerge@4.3.1: {} - define-data-property@1.1.4: dependencies: es-define-property: 1.0.1 @@ -2841,34 +2216,6 @@ snapshots: '@esbuild/win32-ia32': 0.17.3 '@esbuild/win32-x64': 0.17.3 - esbuild@0.25.5: - optionalDependencies: - '@esbuild/aix-ppc64': 0.25.5 - '@esbuild/android-arm': 0.25.5 - '@esbuild/android-arm64': 0.25.5 - '@esbuild/android-x64': 0.25.5 - '@esbuild/darwin-arm64': 0.25.5 - '@esbuild/darwin-x64': 0.25.5 - '@esbuild/freebsd-arm64': 0.25.5 - '@esbuild/freebsd-x64': 0.25.5 - '@esbuild/linux-arm': 0.25.5 - '@esbuild/linux-arm64': 0.25.5 - '@esbuild/linux-ia32': 0.25.5 - '@esbuild/linux-loong64': 0.25.5 - '@esbuild/linux-mips64el': 0.25.5 - '@esbuild/linux-ppc64': 0.25.5 - '@esbuild/linux-riscv64': 0.25.5 - '@esbuild/linux-s390x': 0.25.5 - '@esbuild/linux-x64': 0.25.5 - '@esbuild/netbsd-arm64': 0.25.5 - '@esbuild/netbsd-x64': 0.25.5 - '@esbuild/openbsd-arm64': 0.25.5 - '@esbuild/openbsd-x64': 0.25.5 - '@esbuild/sunos-x64': 0.25.5 - '@esbuild/win32-arm64': 0.25.5 - '@esbuild/win32-ia32': 0.25.5 - '@esbuild/win32-x64': 0.25.5 - escape-string-regexp@1.0.5: {} escape-string-regexp@4.0.0: {} @@ -3010,9 +2357,6 @@ snapshots: fs.realpath@1.0.0: {} - fsevents@2.3.3: - optional: true - function-bind@1.1.2: {} function.prototype.name@1.1.8: @@ -3130,8 +2474,6 @@ snapshots: ignore@5.3.2: {} - ignore@7.0.5: {} - immutable@5.1.3: {} import-fresh@3.3.1: @@ -3148,8 +2490,6 @@ snapshots: inherits@2.0.4: {} - inline-style-parser@0.2.4: {} - internal-slot@1.1.0: dependencies: es-errors: 1.3.0 @@ -3291,8 +2631,6 @@ snapshots: dependencies: json-buffer: 3.0.1 - kleur@4.1.5: {} - levn@0.4.1: dependencies: prelude-ls: 1.2.1 @@ -3344,7 +2682,8 @@ snapshots: ms@2.1.3: {} - nanoid@3.3.11: {} + nanoid@3.3.11: + optional: true natural-compare@1.4.0: {} @@ -3450,7 +2789,8 @@ snapshots: picomatch@2.3.1: {} - picomatch@4.0.2: {} + picomatch@4.0.2: + optional: true pidtree@0.3.1: {} @@ -3463,6 +2803,7 @@ snapshots: nanoid: 3.3.11 picocolors: 1.1.1 source-map-js: 1.2.1 + optional: true prelude-ls@1.2.1: {} @@ -3514,32 +2855,6 @@ snapshots: dependencies: glob: 7.2.3 - rollup@4.44.1: - dependencies: - '@types/estree': 1.0.8 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.44.1 - '@rollup/rollup-android-arm64': 4.44.1 - '@rollup/rollup-darwin-arm64': 4.44.1 - '@rollup/rollup-darwin-x64': 4.44.1 - '@rollup/rollup-freebsd-arm64': 4.44.1 - '@rollup/rollup-freebsd-x64': 4.44.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.44.1 - '@rollup/rollup-linux-arm-musleabihf': 4.44.1 - '@rollup/rollup-linux-arm64-gnu': 4.44.1 - '@rollup/rollup-linux-arm64-musl': 4.44.1 - '@rollup/rollup-linux-loongarch64-gnu': 4.44.1 - '@rollup/rollup-linux-powerpc64le-gnu': 4.44.1 - '@rollup/rollup-linux-riscv64-gnu': 4.44.1 - '@rollup/rollup-linux-riscv64-musl': 4.44.1 - '@rollup/rollup-linux-s390x-gnu': 4.44.1 - '@rollup/rollup-linux-x64-gnu': 4.44.1 - '@rollup/rollup-linux-x64-musl': 4.44.1 - '@rollup/rollup-win32-arm64-msvc': 4.44.1 - '@rollup/rollup-win32-ia32-msvc': 4.44.1 - '@rollup/rollup-win32-x64-msvc': 4.44.1 - fsevents: 2.3.3 - run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -3713,10 +3028,6 @@ snapshots: style-mod@4.1.2: {} - style-to-object@1.0.9: - dependencies: - inline-style-parser: 0.2.4 - supports-color@5.5.0: dependencies: has-flag: 3.0.0 @@ -3747,13 +3058,6 @@ snapshots: sass: 1.89.2 typescript: 5.0.4 - svelte-toolbelt@0.9.3(svelte@5.34.8): - dependencies: - clsx: 2.1.1 - runed: 0.29.1(svelte@5.34.8) - style-to-object: 1.0.9 - svelte: 5.34.8 - svelte@5.34.8: dependencies: '@ampproject/remapping': 2.3.0 @@ -3771,15 +3075,8 @@ snapshots: magic-string: 0.30.17 zimmerframe: 1.1.2 - tabbable@6.2.0: {} - text-table@0.2.0: {} - tinyglobby@0.2.14: - dependencies: - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 - to-regex-range@5.0.1: dependencies: is-number: 7.0.0 @@ -3788,8 +3085,6 @@ snapshots: tslib@2.4.0: {} - tslib@2.8.1: {} - tsutils@3.21.0(typescript@5.0.4): dependencies: tslib: 1.14.1 @@ -3857,23 +3152,6 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vite@6.3.5(@types/node@24.0.6)(sass@1.89.2): - dependencies: - esbuild: 0.25.5 - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 - postcss: 8.5.6 - rollup: 4.44.1 - tinyglobby: 0.2.14 - optionalDependencies: - '@types/node': 24.0.6 - fsevents: 2.3.3 - sass: 1.89.2 - - vitefu@1.0.7(vite@6.3.5(@types/node@24.0.6)(sass@1.89.2)): - optionalDependencies: - vite: 6.3.5(@types/node@24.0.6)(sass@1.89.2) - w3c-keyname@2.2.8: {} which-boxed-primitive@1.1.1: diff --git a/src/components/GoodreadsSearch.svelte b/src/components/GoodreadsSearch.svelte index add9f88..dfbdac2 100644 --- a/src/components/GoodreadsSearch.svelte +++ b/src/components/GoodreadsSearch.svelte @@ -1,46 +1,48 @@
-

Goodreads Search

- +

Goodreads Search

+
\ No newline at end of file + .obt-goodreads-search { + padding-bottom: var(--size-4-4); + + input { + width: 100%; + } + } + diff --git a/src/components/RatingInput.svelte b/src/components/RatingInput.svelte index b2b80c6..ee9d558 100644 --- a/src/components/RatingInput.svelte +++ b/src/components/RatingInput.svelte @@ -1,5 +1,4 @@ -
- - {#snippet children({ items })} - {#each items as item (item.index)} - - {#if item.state === "inactive"} - - {:else if item.state === "active"} - - {:else if item.state === "partial"} - - - {/if} - - {/each} - {/snippet} - + + + + +
+ +
+
+ {#each items as item (item.index)} +
+ {#if item.state === "inactive"} + + {:else if item.state === "active"} + + {:else if item.state === "partial"} + + + {/if} +
+ {/each} +
diff --git a/src/components/ReadingLogViewer.svelte b/src/components/ReadingLogViewer.svelte index 46e9e0b..289efb0 100644 --- a/src/components/ReadingLogViewer.svelte +++ b/src/components/ReadingLogViewer.svelte @@ -1,6 +1,9 @@
@@ -85,6 +117,7 @@ Book Pages Read Percent Complete + Actions @@ -102,6 +135,16 @@ 100, )}% + + + + {/each} @@ -109,6 +152,8 @@
diff --git a/src/styles/_utils.scss b/src/styles/_utils.scss new file mode 100644 index 0000000..7f3e109 --- /dev/null +++ b/src/styles/_utils.scss @@ -0,0 +1,26 @@ +// Source: https://gist.github.com/ffoodd/000b59f431e3e64e4ce1a24d5bb36034 + +@mixin visually-hidden { + border: 0 !important; + clip-path: inset(50%) !important; /* 2 */ + height: 1px !important; + margin: -1px !important; + overflow: hidden !important; + padding: 0 !important; + width: 1px !important; + white-space: nowrap !important; /* 3 */ + + &:not(caption) { + position: absolute !important; + } + + * { + overflow: hidden !important; + } +} + +@mixin visually-hidden-focusable { + &:not(:focus, :focus-within) { + @include visually-hidden; + } +} diff --git a/src/types.ts b/src/types.ts index a38caf2..a4d62b2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -21,3 +21,11 @@ export interface Book { isbn: string; isbn13: string; } + +export interface ReadingLogEntry { + book: string; + pagesRead: number; + pagesReadTotal: number; + pagesRemaining: number; + createdAt: Date; +} diff --git a/src/utils/event.ts b/src/utils/event.ts new file mode 100644 index 0000000..a1988d2 --- /dev/null +++ b/src/utils/event.ts @@ -0,0 +1,59 @@ +export abstract class Event {} + +export type EventHandler = (event: T) => void; + +export type EventHandlerMap = Record< + T, + EventHandler[] +>; + +type Constructor = new (...args: any[]) => {}; + +export function EventEmitter( + Base: TBase +) { + return class extends Base { + private readonly listeners: EventHandlerMap< + TEventMap, + keyof TEventMap + > = {} as EventHandlerMap; + + public on( + type: T, + handler: EventHandler + ) { + if (!this.listeners[type]) { + this.listeners[type] = []; + } + this.listeners[type].push(handler); + } + + public off( + type: T, + handler: EventHandler + ) { + if (this.listeners[type]) { + this.listeners[type] = this.listeners[type].filter( + (h) => h !== handler + ); + } + } + + public once( + type: T, + handler: EventHandler + ) { + const wrappedHandler = (event: TEventMap[T]) => { + handler(event); + this.off(type, wrappedHandler); + }; + this.on(type, wrappedHandler); + } + + public emit(type: T, event: TEventMap[T]) { + if (this.listeners[type]) { + this.listeners[type].forEach((handler) => handler(event)); + } + } + }; +} diff --git a/src/utils/storage.ts b/src/utils/storage.ts index 5315b2c..1a813e7 100644 --- a/src/utils/storage.ts +++ b/src/utils/storage.ts @@ -1,4 +1,5 @@ import BookTrackerPlugin from "@src/main"; +import type { ReadingLogEntry } from "@src/types"; import { App } from "obsidian"; export class Storage { @@ -33,14 +34,6 @@ export class Storage { } } -interface ReadingLogEntry { - readonly book: string; - readonly pagesRead: number; - readonly pagesReadTotal: number; - readonly pagesRemaining: number; - readonly createdAt: Date; -} - export class ReadingLog { private entries: ReadingLogEntry[] = []; @@ -120,6 +113,17 @@ export class ReadingLog { } } + public async updateEntry(i: number, entry: ReadingLogEntry): Promise { + this.entries[i] = entry; + await this.storeEntries(); + } + + public async spliceEntry(i: number): Promise { + const entry = this.entries.splice(i, 1); + await this.storeEntries(); + return entry[0]; + } + public async clearEntries(): Promise { this.entries = []; await this.storeEntries(); diff --git a/src/views/goodreads-search-modal.ts b/src/views/goodreads-search-modal.ts index 46b81a7..c7d9704 100644 --- a/src/views/goodreads-search-modal.ts +++ b/src/views/goodreads-search-modal.ts @@ -1,29 +1,44 @@ import GoodreadsSearch from "@components/GoodreadsSearch.svelte"; import { type SearchResult } from "@data-sources/goodreads"; +import { Event, EventEmitter } from "@utils/event"; import { App, Modal, Notice } from "obsidian"; import { mount, unmount } from "svelte"; -export class GoodreadsSearchModal extends Modal { - private component: ReturnType | undefined; - +export class SearchEvent extends Event { constructor( - app: App, - private readonly onSearch: (error: any, results: SearchResult[]) => void + public readonly query: string, + public readonly results: SearchResult[] ) { - super(app); + super(); } +} + +export class ErrorEvent extends Event { + constructor(public readonly error: Error) { + super(); + } +} + +interface GoodreadsSearchModalEventMap { + search: SearchEvent; + error: ErrorEvent; +} + +export class GoodreadsSearchModal extends EventEmitter< + GoodreadsSearchModalEventMap, + typeof Modal +>(Modal) { + private component: ReturnType | undefined; onOpen() { this.component = mount(GoodreadsSearch, { target: this.contentEl, props: { - onError(error) { - this.onSearch(error, []); - this.close(); + onError: (error: Error) => { + this.emit("error", new ErrorEvent(error)); }, - onSearch: (results: SearchResult[]) => { - this.onSearch(null, results); - this.close(); + onSearch: (query: string, results: SearchResult[]) => { + this.emit("search", new SearchEvent(query, results)); }, }, }); @@ -38,13 +53,14 @@ export class GoodreadsSearchModal extends Modal { static createAndOpen(app: App): Promise { return new Promise((resolve, reject) => { - const modal = new GoodreadsSearchModal(app, (error, results) => { - if (error) { - new Notice(`Error: ${error.message}`); - reject(error); - } else { - resolve(results); - } + const modal = new GoodreadsSearchModal(app); + modal.once("search", (event: SearchEvent) => { + modal.close(); + resolve(event.results); + }); + modal.once("error", (event: ErrorEvent) => { + modal.close(); + reject(event.error); }); modal.open(); }); diff --git a/src/views/rating-modal.ts b/src/views/rating-modal.ts index beb610a..15f8682 100644 --- a/src/views/rating-modal.ts +++ b/src/views/rating-modal.ts @@ -1,22 +1,30 @@ import Rating from "@components/Rating.svelte"; +import { Event, EventEmitter } from "@utils/event"; import { App, Modal } from "obsidian"; import { mount, unmount } from "svelte"; -export class RatingModal extends Modal { - private component: ReturnType | undefined; - - constructor(app: App, private readonly onSubmit: (rating: number) => void) { - super(app); +class SubmitEvent extends Event { + constructor(public readonly rating: number) { + super(); } +} + +interface RatingModalEventMap { + submit: SubmitEvent; +} + +export class RatingModal extends EventEmitter< + RatingModalEventMap, + typeof Modal +>(Modal) { + private component: ReturnType | undefined; onOpen(): void { this.component = mount(Rating, { target: this.contentEl, props: { - onSubmit: (rating) => { - this.onSubmit(rating); - this.close(); - }, + onSubmit: (rating: number) => + this.emit("submit", new SubmitEvent(rating)), }, }); } @@ -30,8 +38,10 @@ export class RatingModal extends Modal { static createAndOpen(app: App): Promise { return new Promise((resolve) => { - const modal = new RatingModal(app, (rating) => { - resolve(rating); + const modal = new RatingModal(app); + modal.once("submit", (event: SubmitEvent) => { + modal.close(); + resolve(event.rating); }); modal.open(); }); diff --git a/src/views/reading-log-entry-edit-modal.ts b/src/views/reading-log-entry-edit-modal.ts new file mode 100644 index 0000000..4958035 --- /dev/null +++ b/src/views/reading-log-entry-edit-modal.ts @@ -0,0 +1,44 @@ +import ReadingLogEntryEditor from "@components/ReadingLogEntryEditor.svelte"; +import type { ReadingLogEntry } from "@src/types"; +import { Event, EventEmitter } from "@utils/event"; +import { App, Modal } from "obsidian"; +import { mount, unmount } from "svelte"; + +class SubmitEvent extends Event { + constructor(public readonly entry: ReadingLogEntry) { + super(); + } +} + +interface ReadingLogEntryEditModalEventMap { + submit: SubmitEvent; +} + +export class ReadingLogEntryEditModal extends EventEmitter< + ReadingLogEntryEditModalEventMap, + typeof Modal +>(Modal) { + private component: ReturnType | undefined; + + constructor(app: App, private readonly entry: ReadingLogEntry) { + super(app); + } + + onOpen(): void { + this.component = mount(ReadingLogEntryEditor, { + target: this.contentEl, + props: { + entry: this.entry, + onSubmit: (entry: ReadingLogEntry) => + this.emit("submit", new SubmitEvent(entry)), + }, + }); + } + + onClose(): void { + if (this.component) { + unmount(this.component); + this.component = undefined; + } + } +} diff --git a/src/views/reading-progress-modal.ts b/src/views/reading-progress-modal.ts index 2dd1b39..7e1860b 100644 --- a/src/views/reading-progress-modal.ts +++ b/src/views/reading-progress-modal.ts @@ -1,15 +1,25 @@ import ReadingProgress from "@components/ReadingProgress.svelte"; +import { Event, EventEmitter } from "@utils/event"; import { App, Modal } from "obsidian"; import { mount, unmount } from "svelte"; -export class ReadingProgressModal extends Modal { +class SubmitEvent extends Event { + constructor(public readonly pageNumber: number) { + super(); + } +} + +interface ReadingProgressModalEventMap { + submit: SubmitEvent; +} + +export class ReadingProgressModal extends EventEmitter< + ReadingProgressModalEventMap, + typeof Modal +>(Modal) { private component: ReturnType | undefined; - constructor( - app: App, - private readonly pageLength: number, - private readonly onSubmit: (pageNumber: number) => void - ) { + constructor(app: App, private readonly pageLength: number) { super(app); } @@ -18,9 +28,8 @@ export class ReadingProgressModal extends Modal { target: this.contentEl, props: { pageLength: this.pageLength, - onSubmit: (pageNumber) => { - this.onSubmit(pageNumber); - this.close(); + onSubmit: (pageNumber: number) => { + this.emit("submit", new SubmitEvent(pageNumber)); }, }, }); @@ -35,13 +44,11 @@ export class ReadingProgressModal extends Modal { static createAndOpen(app: App, pageLength: number): Promise { return new Promise((resolve) => { - const modal = new ReadingProgressModal( - app, - pageLength, - (pageNumber) => { - resolve(pageNumber); - } - ); + const modal = new ReadingProgressModal(app, pageLength); + modal.once("submit", (event: SubmitEvent) => { + modal.close(); + resolve(event.pageNumber); + }); modal.open(); }); } diff --git a/vite.config.mts b/vite.config.mts deleted file mode 100644 index f85b01d..0000000 --- a/vite.config.mts +++ /dev/null @@ -1,89 +0,0 @@ -import { UserConfig, defineConfig } from "vite"; -import { svelte } from "@sveltejs/vite-plugin-svelte"; -import copy from "@guanghechen/rollup-plugin-copy"; -import manifest from "./manifest.json"; -import path from "path"; -import builtins from "builtin-modules"; - -import dotenv from "dotenv"; -import dotenvExpand from "dotenv-expand"; -const env = dotenv.config(); -dotenvExpand.expand(env); - -export default defineConfig(async ({ mode }) => { - const { resolve } = path; - const prod = mode === "production"; - - let outDir = "dist"; - if (!prod) { - if (!process.env.OBSIDIAN_PLUGIN_DIR) { - console.log( - "Set OBSIDIAN_PLUGIN_DIR in the .env file to plugin directory to copy files to." - ); - } else { - outDir = - process.env.OBSIDIAN_PLUGIN_DIR + "/" + manifest.id + "-dev"; - } - } - - if (outDir[0] === "~") { - outDir = path.join(process.env.HOME!, outDir.slice(1)); - } - - return { - plugins: [ - svelte(), - copy({ - targets: [{ src: "manifest.json", dest: outDir }], - }), - ], - resolve: { - alias: { - "@components": resolve(__dirname, "./src/components"), - "@data-sources": resolve(__dirname, "./src/data-sources"), - "@settings": resolve(__dirname, "./src/settings"), - "@utils": resolve(__dirname, "./src/utils"), - "@views": resolve(__dirname, "./src/views"), - "@src": resolve(__dirname, "./src"), - }, - }, - build: { - lib: { - entry: resolve(__dirname, "src/main.ts"), - name: "main", - fileName: () => "main.js", - formats: ["cjs"], - }, - minify: prod, - sourcemap: prod ? false : "inline", - cssCodeSplit: false, - emptyOutDir: false, - outDir, - rollupOptions: { - input: { - main: resolve(__dirname, "src/main.ts"), - }, - output: { - entryFileNames: "main.js", - assetFileNames: "styles.css", - }, - external: [ - "obsidian", - "electron", - "@codemirror/autocomplete", - "@codemirror/collab", - "@codemirror/commands", - "@codemirror/language", - "@codemirror/lint", - "@codemirror/search", - "@codemirror/state", - "@codemirror/view", - "@lezer/common", - "@lezer/highlight", - "@lezer/lr", - ...builtins, - ], - }, - }, - } as UserConfig; -});