diff --git a/package-lock.json b/package-lock.json index 440be5a9b..5c661dea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -356,14 +356,14 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.29.7.tgz", - "integrity": "sha512-907Uymvqgg1dwUA+7IGwFAOSYzQOuzPXKNJ1yxzwPffzkYFg2q2eHi1fIOs6sXkG9NbIUMunnUlkYsfRFNvomg==", + "version": "7.29.10", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.29.10.tgz", + "integrity": "sha512-/YY9soQuWa8TURtHXHT+GbklpbAA+dZErxFGHIr6qgDg96xuGWrTAs1+MfjgVJPF0YLQsOVsOYs8lhgsPbOinQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", - "regexpu-core": "^6.3.1", + "regexpu-core": "^6.5.3", "semver": "^6.3.1" }, "engines": { @@ -565,14 +565,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", - "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", + "version": "7.29.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.10.tgz", + "integrity": "sha512-EMCx3AGZ3WfAl6ht7AyQoPm2Lh+BGYEMdc4Q6Hf7uSCDOZFuLq44qNwL+iaim8VlyYhRAo4X43+weadK8ZB4Yg==", "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.29.7", - "@babel/types": "^7.29.7" + "@babel/types": "^7.29.8" }, "engines": { "node": ">=6.9.0" @@ -1874,9 +1874,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", - "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", + "version": "7.29.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.10.tgz", + "integrity": "sha512-NpugTzbKgGrNe45Ui32cN8vCFFMxVtP/9rtfwv0nP5FRDAjvYBxJcLVpYA9mr1jxP6cnIT7x9LUzuDTbWYYNRA==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1898,16 +1898,16 @@ } }, "node_modules/@babel/traverse": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.8.tgz", - "integrity": "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==", + "version": "7.29.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.10.tgz", + "integrity": "sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.8", "@babel/helper-globals": "^7.29.7", - "@babel/parser": "^7.29.8", + "@babel/parser": "^7.29.9", "@babel/template": "^7.29.7", "@babel/types": "^7.29.8", "debug": "^4.3.1" @@ -1941,13 +1941,13 @@ } }, "node_modules/@bramus/specificity": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz", - "integrity": "sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.3.tgz", + "integrity": "sha512-0GEz8qJWokkUVYQYRukmkSHIFNoBH8QTreeHrAFbvz1XFYc3Y+puhMs8PQ5x8GNugiC2l5jvDBXKLbBIByeSBw==", "devOptional": true, "license": "MIT", "dependencies": { - "css-tree": "^3.0.0" + "css-tree": "^3.2.1" }, "bin": { "specificity": "bin/cli.js" @@ -2062,12 +2062,13 @@ } }, "node_modules/@codemirror/language": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.4.tgz", - "integrity": "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.13.1.tgz", + "integrity": "sha512-zfvU2r3TyylQLMj/te+5CnQ0rSqZi8B1oTCBbQkagcLW4Xc6imab6qN+pEJhsuNOLaJqiRyBXp9UhWA1DhVvDw==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", + "@codemirror/streamparser": "^6.0.0", "@codemirror/view": "^6.23.0", "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0", @@ -2076,12 +2077,12 @@ } }, "node_modules/@codemirror/legacy-modes": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.4.tgz", - "integrity": "sha512-/cZr6qZyl08iYNLGsJ862CXXNI51LryRFRE40ejgoIjXZz0C1rGkD3/Ek5jM/8w1ceRjqtt4qx/KLMh4zBTgew==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.5.tgz", + "integrity": "sha512-9ltT214oMb3Y1w5eAZMSigzrjzZnMI2Wa3Feq73rU/i4C56MkwrpfswfQYOr28C5pXr6dWwspNTMyeHXlzWMxg==", "license": "MIT", "dependencies": { - "@codemirror/language": "^6.0.0" + "@codemirror/streamparser": "^6.0.0" } }, "node_modules/@codemirror/lint": { @@ -2104,10 +2105,16 @@ "@marijn/find-cluster-break": "^1.0.0" } }, + "node_modules/@codemirror/streamparser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@codemirror/streamparser/-/streamparser-6.0.0.tgz", + "integrity": "sha512-JTFPF6xrfjt0mnfGPgzcLiMwYmvIyNaoizp8BYzv8FE8KrT6GBGDZ190rtt+O7Wke3gG/MFHyiY9YGNeimof4w==", + "license": "MIT" + }, "node_modules/@codemirror/view": { - "version": "6.43.13", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.13.tgz", - "integrity": "sha512-sihaFrUzAsYBQsL9J2t69y8nfMQGwcYmggAZsk+kjPbjYZMyuf2hU8tUNTZ+P+isb6XRr8JE22TZlJxBoVdH1A==", + "version": "6.43.14", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.14.tgz", + "integrity": "sha512-hC45YnmJNR1rz42OF57BLoQNFMV12/13drnvibDsR2quNDmldcb4WvYVV81hFQg56i9lcqQMEDqilhX2QDcGQQ==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.7.0", @@ -3253,9 +3260,9 @@ "license": "MIT" }, "node_modules/@lezer/css": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.8.tgz", - "integrity": "sha512-EJn1zcL9qoDptief6ipWKZKLiOpXkxSe0+t8CH9oiMVcZlq7NBWrjCqnc/41EIjeo/ITj1gFFiATdTkaJDL+Og==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.9.tgz", + "integrity": "sha512-ZmzgvTOBdJWGIsY/ItAfN7UW8DV802oZG+jeG6E508SwEzz5YhuAajptpWPICvIyqYAD2+VjMdOS40GgGkyEOQ==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -3306,18 +3313,18 @@ } }, "node_modules/@lezer/lr": { - "version": "1.4.10", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz", - "integrity": "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==", + "version": "1.4.11", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.11.tgz", + "integrity": "sha512-UwgZcl1R66H2hDzBrA7kWyYmX6s8p5TQ+e/t7CuvgCtBEPxbEPaHYHu+pJBvTvDotEJpuQkJjbXuHiw5Cixxgw==", "license": "MIT", "dependencies": { "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/markdown": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.7.2.tgz", - "integrity": "sha512-iTkYvoVcKt3WkeL7qUDyXHONZEwLio4wj8KTNi2dnjQEXBZKMV63BpQrPqfsM+OkvuRbiSTAcycYAsQzLhRNoQ==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.8.0.tgz", + "integrity": "sha512-X6w3A2NpyhdtGqTWRJB8gR4QDXBaFMbTOs780ZdZ15KKCfBXOQTKcB3Vr+W6tqJHVlealt53tLmHRvOqPTQgYA==", "license": "MIT", "dependencies": { "@lezer/common": "^1.5.0", @@ -3442,27 +3449,27 @@ } }, "node_modules/@mswjs/interceptors": { - "version": "0.39.8", - "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.39.8.tgz", - "integrity": "sha512-2+BzZbjRO7Ct61k8fMNHEtoKjeWI9pIlHFTqBwZ5icHpqszIgEZbjb1MW5Z0+bITTCTl3gk4PDBxs9tA/csXvA==", + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.44.0.tgz", + "integrity": "sha512-IYHevRStF4ijM20GI9c9Ndhw483NSAjCydQhUr4/zIB0BNLsTVw3vFAxTo6TlvX4QnV60wEHttUa9539TTAq+A==", "dev": true, "license": "MIT", "dependencies": { - "@open-draft/deferred-promise": "^2.2.0", - "@open-draft/logger": "^0.3.0", - "@open-draft/until": "^2.0.0", + "@open-draft/until": "^3.0.1", + "@types/debug": "^4.1.13", + "debug": "^4.4.3", "is-node-process": "^1.2.0", "outvariant": "^1.4.3", - "strict-event-emitter": "^0.5.1" + "rettime": "^0.11.11" }, "engines": { - "node": ">=18" + "node": ">=22" } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.4.tgz", - "integrity": "sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.5.tgz", + "integrity": "sha512-HshSvXzmBxNzqejd3k/KemgQ3hdREUYFRRrgxOZ+gPljDIsO2SDZrVZMd4Z/HsxudQbE62OVyVFE8z9BCurfjA==", "dev": true, "license": "MIT", "optional": true, @@ -3516,31 +3523,16 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@open-draft/deferred-promise": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz", - "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@open-draft/logger": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz", - "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==", + "node_modules/@open-draft/until": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-3.0.1.tgz", + "integrity": "sha512-s7/9ELP4aP9YZtW7RJaa0Xf3RISaRH9+EFN18FtykJYRHGNrl8f9ymvoNXzjhrjmftFvkQudtuDU9RYhk0xs3A==", "dev": true, "license": "MIT", - "dependencies": { - "is-node-process": "^1.2.0", - "outvariant": "^1.4.0" + "funding": { + "url": "https://github.com/sponsors/kettanaito" } }, - "node_modules/@open-draft/until": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", - "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==", - "dev": true, - "license": "MIT" - }, "node_modules/@oxc-parser/binding-android-arm-eabi": { "version": "0.127.0", "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.127.0.tgz", @@ -3908,9 +3900,9 @@ } }, "node_modules/@oxc-project/types": { - "version": "0.152.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.152.0.tgz", - "integrity": "sha512-oM/5rLBm2tPkg0iBgkH/FOeR3PCDpY19GTgAZjMFM8h9WI9VW7cLgzp6nwtarYKmovavIQZ+Fe/RKX/8C8O/Rw==", + "version": "0.153.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.153.0.tgz", + "integrity": "sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/oxc-project" @@ -4264,9 +4256,9 @@ } }, "node_modules/@rolldown/binding-android-arm-eabi": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.12.tgz", - "integrity": "sha512-dB/a1214qKfHMXCpgqR4OZT+jS4kTyEXbQGJPqzobt5EwH5rX080pxE37alt3RzvR1bf1Yz/yGqRfrYAxuPw0A==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.13.tgz", + "integrity": "sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==", "cpu": [ "arm" ], @@ -4280,9 +4272,9 @@ } }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.12.tgz", - "integrity": "sha512-7KHFgQ5VJxIHcLlrwrc3Xbds7oTNQT7Pgi9gQCJKrd2VGab/UksIOYp6VD8MzCstGxOKMgNamPwUCfxPdP1OHg==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.13.tgz", + "integrity": "sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==", "cpu": [ "arm64" ], @@ -4296,9 +4288,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.12.tgz", - "integrity": "sha512-3YIhqHD96nA5SaYNRBR16HnGv4oavZvXfD/ayHM+oYZ0WD/8lBAtf6zQua4kEyAvpqrluKXl0lnOBoiNby7x9w==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.13.tgz", + "integrity": "sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==", "cpu": [ "arm64" ], @@ -4312,9 +4304,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.12.tgz", - "integrity": "sha512-UuuJ35MFw4gmFOrE9pEqIV+K3syIKveph+Qc1/ljHZVdoDW4pz/JHR/eMVom+TZGl/5OOvGJOWaOCVt3ZfqhxA==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.13.tgz", + "integrity": "sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==", "cpu": [ "x64" ], @@ -4328,9 +4320,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.12.tgz", - "integrity": "sha512-uMvssit0a4W+/7D8CbHUvG719mH3R2jwXAlh/XcPvuHTE0g++LymF88DCGNX0HM2rBOn0xrzgXktIB6fLSJBTQ==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.13.tgz", + "integrity": "sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==", "cpu": [ "x64" ], @@ -4344,9 +4336,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.12.tgz", - "integrity": "sha512-XcFu0R0xWnwzSf4IQgFH1rJIckPN1pLy2R+4r9IDB7Yfu/ys9cVqfa4pBrMHj7a3gl8mIR4nRNPg0e5IvEVs6g==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.13.tgz", + "integrity": "sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==", "cpu": [ "arm" ], @@ -4360,9 +4352,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.12.tgz", - "integrity": "sha512-260UrKgn8tz39ak+SMDOirKzr7V04M9dWPw5llW00SwBivCZoWcRBKV1d8cXnRkUmSZA3BdiUmBHWk7734Ulpw==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.13.tgz", + "integrity": "sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==", "cpu": [ "arm64" ], @@ -4379,9 +4371,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.12.tgz", - "integrity": "sha512-5YK1I9SqDkbPgc1IA8BgDl34suqUS2q0KWnBrirm0E51YjOs6eo6dV6jbQfNE/argHRSvd0QUGgtpIoYx+WWpw==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.13.tgz", + "integrity": "sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==", "cpu": [ "arm64" ], @@ -4398,9 +4390,9 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.12.tgz", - "integrity": "sha512-Rkcrmp7eFRg74yL5fXEU91JEWbdEPLevWwGtXpmhbjlD1StScbWTmO94Bhly+Mo+ketKYkdmM1vNUKeWSlx8cQ==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.13.tgz", + "integrity": "sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==", "cpu": [ "ppc64" ], @@ -4417,9 +4409,9 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.12.tgz", - "integrity": "sha512-qvK4DuAsQc2BSjlx+Xr+IzOIvvxbGZqxFwdWfG6F518Erj0GGISyQbJ6pIappnOxlNPzNHvo/L0BwB30GZ+zVw==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.13.tgz", + "integrity": "sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==", "cpu": [ "s390x" ], @@ -4436,9 +4428,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.12.tgz", - "integrity": "sha512-Q9uLBO53Xd4QIq1WOycVQyPP1O4HhraEV2qqb3uTrnVw6QZih9duY4vNXOivL1xoUS1/z+W8eF4NMfl2a8Sdjw==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.13.tgz", + "integrity": "sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==", "cpu": [ "x64" ], @@ -4455,9 +4447,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.12.tgz", - "integrity": "sha512-3IBxWFMjbOZskDPKv8Lf9BCnahlKuHthWkYnyIxOH/QcJrFcS4EmcenthApkwr/5+nEqZlLzeYbxeMaX7A5u4g==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.13.tgz", + "integrity": "sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==", "cpu": [ "x64" ], @@ -4474,9 +4466,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.12.tgz", - "integrity": "sha512-xtX61xg4LKPkPWilZU1ynKClz5Gj4bf74LML4r3eVLWumKnGjoEr1OSHQhMdbBDoYTi+yjrujvpZe2pUnqCrrA==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.13.tgz", + "integrity": "sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==", "cpu": [ "arm64" ], @@ -4490,9 +4482,9 @@ } }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.12.tgz", - "integrity": "sha512-At7fPB6PCaIjzgIhEZFxuT+BBFqiQibJDT4d3PhiR3f4E7bbMZF4aKblbFfEM3sETRDd1YiQx/+U/g/B/ou5Ew==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.13.tgz", + "integrity": "sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==", "cpu": [ "arm64" ], @@ -4506,9 +4498,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.12.tgz", - "integrity": "sha512-WIw2haVKwjuYdXkHaoC0mF8Le71TuCBxjrdKqLbJGctbBABj+ClfmNvtbOnzpq3RokNo5+V1qhtSzJyXorsklQ==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.13.tgz", + "integrity": "sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==", "cpu": [ "x64" ], @@ -5254,6 +5246,16 @@ "assertion-error": "^2.0.1" } }, + "node_modules/@types/debug": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", + "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/ms": "*" + } + }, "node_modules/@types/deep-eql": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", @@ -5336,6 +5338,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", + "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "24.19.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.19.1.tgz", @@ -5382,17 +5391,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.71.0.tgz", - "integrity": "sha512-pqcS9c1HxZTHt7End4nXqd0s5lJrrFzrgCkKFJrsbUnaL6M3+6oBFZaslg6Gjsl3argl2DDRFROnXARaZ2e4Nw==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.71.1.tgz", + "integrity": "sha512-nNlBf6HuotqMgZvSkWD5hNdemiBIxQ2NmrlgfcUIeZRs+BbakjscCQRq/Hb74EFVnFiSWWdL12JruqwBy3ERDw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.71.0", - "@typescript-eslint/type-utils": "8.71.0", - "@typescript-eslint/utils": "8.71.0", - "@typescript-eslint/visitor-keys": "8.71.0", + "@typescript-eslint/scope-manager": "8.71.1", + "@typescript-eslint/type-utils": "8.71.1", + "@typescript-eslint/utils": "8.71.1", + "@typescript-eslint/visitor-keys": "8.71.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -5405,7 +5414,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.71.0", + "@typescript-eslint/parser": "^8.71.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } @@ -5421,16 +5430,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.71.0.tgz", - "integrity": "sha512-CG4nPk1f2zc8yw4pALqHsFYH2hdo+h1T9daSp21+Hnxi9LOE3GT9hAfTKJCBXVNM2GmYs1eMEP615wPoeOgk3A==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.71.1.tgz", + "integrity": "sha512-oM/5sAqz/l1v/zYK1qTOPrn2+JIrBGC1V6uNYucRO5gh6eT9vWJ/RhPbGE59byvZEUQ4VP6XkLBaS5Jti5jpvw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.71.0", - "@typescript-eslint/types": "8.71.0", - "@typescript-eslint/typescript-estree": "8.71.0", - "@typescript-eslint/visitor-keys": "8.71.0", + "@typescript-eslint/scope-manager": "8.71.1", + "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/typescript-estree": "8.71.1", + "@typescript-eslint/visitor-keys": "8.71.1", "debug": "^4.4.3" }, "engines": { @@ -5446,14 +5455,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.71.0.tgz", - "integrity": "sha512-aABjw5rjBacYONVPaPiWOCjJu0vEF4a25iQuodlmQYL1trtLZ0X/y+2Vzl3BKI1odM4LnwLE1oUDXYp1wzx1TQ==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.71.1.tgz", + "integrity": "sha512-Oijc9RUsohHjncg6iGi7gCtjnEjYt9FWv9u6ygK8uKcHK5eLjLAkqERQ9BaytbpceOFdk6kifPCS/zAZE+A99g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.71.0", - "@typescript-eslint/types": "^8.71.0", + "@typescript-eslint/tsconfig-utils": "^8.71.1", + "@typescript-eslint/types": "^8.71.1", "debug": "^4.4.3" }, "engines": { @@ -5468,14 +5477,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.71.0.tgz", - "integrity": "sha512-gWF0BhUcnjZxSpLE8ngS/59n2SB0J3YqRxvX1+2aoRJk9hNtHSLOV+TcarFiOr5ipXm3yc1QrI4c9YZc8zyCxw==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.71.1.tgz", + "integrity": "sha512-1YUDZXdTnXLlob03SFHBipdyMBsDVm7zoSz0ytTJ39dk5J1TgsTK03VlR/dLXG/RLLUrPcYbD4rp23BmHxHP0w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.71.0", - "@typescript-eslint/visitor-keys": "8.71.0" + "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/visitor-keys": "8.71.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -5486,9 +5495,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.71.0.tgz", - "integrity": "sha512-Z1UlWHADEK2Mlb9NpWfDeSjqoZ5EyrOv4R3eQpbkzqn/EwaIdOpXXupEA1+0ZIOSJSZZDBHG0BrQyN8zUG6Pwg==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.71.1.tgz", + "integrity": "sha512-oTvkml5SxXhgg+WWKhod5qWQICDXtOB+/Hi9VdPKFAANJ2b7YOgMffgvzXuqog7R6A/JtrzRf128dsxummyWhg==", "dev": true, "license": "MIT", "engines": { @@ -5503,15 +5512,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.71.0.tgz", - "integrity": "sha512-i8uO1qbdxeKgRnS5sCRt6On3/nfo2d2DwQe3Yvjx543zLy7r8ySqRuPPiIIXAhS03U0v5NfAFx+rUgxFzKKwNw==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.71.1.tgz", + "integrity": "sha512-kH3t3jZCYv2PZSBEWPKTariLrCaoF1CLoPitYFBJOhAGEwWnSRAtGEifrfrpBa4K9JlwWNZotgA5w3/wLSk/FQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.71.0", - "@typescript-eslint/typescript-estree": "8.71.0", - "@typescript-eslint/utils": "8.71.0", + "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/typescript-estree": "8.71.1", + "@typescript-eslint/utils": "8.71.1", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -5528,9 +5537,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.71.0.tgz", - "integrity": "sha512-cJ4OoxPGWvFnBTnSZyaU+qJzGTqPTGJY+gDchj6cRyLRdmIdt4rcsE4twj+zPfrNiWuVi38wijHzShL++Z9atQ==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.71.1.tgz", + "integrity": "sha512-ybYnPTUwg3VQQOFEiBPLs8Jxl1ry2vXdn1kVKguomBbvxpetdu3MKTNDqFNUrlG8ylP9MpZosmXMFYlGQHk1oQ==", "dev": true, "license": "MIT", "engines": { @@ -5542,16 +5551,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.71.0.tgz", - "integrity": "sha512-PEEF4G5sLLWAS5BpPrUvms4ySZkiBQQZM4z+3ReI46axK5Vqr/vXBQatJQIZZOYdGyPUAKTtsrWzpqKuU+3DEw==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.71.1.tgz", + "integrity": "sha512-pSKSEK1JJpHs6KiKVtABCE4iJK5d7FLFzDXQNBQ2oRY7LEd3UwOt3TZemTgu9syTIf56dJWlTn/pdmrO9oKUXQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.71.0", - "@typescript-eslint/tsconfig-utils": "8.71.0", - "@typescript-eslint/types": "8.71.0", - "@typescript-eslint/visitor-keys": "8.71.0", + "@typescript-eslint/project-service": "8.71.1", + "@typescript-eslint/tsconfig-utils": "8.71.1", + "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/visitor-keys": "8.71.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -5583,16 +5592,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.71.0.tgz", - "integrity": "sha512-pKR/tEMVrXZG23UFKUn5BQf3zfmfk7KQceI2cGzywZ5nxM5Eu3hEJU1utjWzydtzBbcJAQhHN8iPCxobHpPcZQ==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.71.1.tgz", + "integrity": "sha512-CBjT6gfAz3DW2j9Q4moFnqt208Aq+506sVGXfpRcyAeqn0EpayL0mjdWoCO2t3RC7GewNrFxdeehuEaPg6DMzQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.71.0", - "@typescript-eslint/types": "8.71.0", - "@typescript-eslint/typescript-estree": "8.71.0" + "@typescript-eslint/scope-manager": "8.71.1", + "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/typescript-estree": "8.71.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -5607,13 +5616,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.71.0.tgz", - "integrity": "sha512-8eQ9R218XORK+KLosnf4bu/QsUXvUyVwTbArg7/0NMB1Pu87OJKvj4nhFblkYE8gQV73mW1dx1ptlPCkwRGa7A==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.71.1.tgz", + "integrity": "sha512-0GxiUGqMU0qXJt58cBsiG3DP8lUmBaFo2vChtUX+CT7PnR3v/VGLLrzVP4K9r1lNiZXjHYefMBbPunplr09v6w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.71.0", + "@typescript-eslint/types": "8.71.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -6285,9 +6294,9 @@ } }, "node_modules/acorn": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", - "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz", + "integrity": "sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==", "dev": true, "license": "MIT", "bin": { @@ -6900,9 +6909,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001814", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001814.tgz", - "integrity": "sha512-/Uaf1lAzr59XcMpW0o96WoEfr+VXK2OX4U9AgFoiSHsVJ4HppnIFUjtYzsyDH2+tgANaQb2/oxYGwCPapN1FpA==", + "version": "1.0.30001815", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001815.tgz", + "integrity": "sha512-uDybUEyfgbyJJ93J1vikTylBX31AkdVYeVPeffMQpf8XN7hSfr0oZOn4VFOIMNvtU5+rHvC5Udg2TgtJKHm23Q==", "dev": true, "funding": [ { @@ -7513,9 +7522,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.444", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.444.tgz", - "integrity": "sha512-5ss/uJfoDYDHT0lfJzT6FbcskIzROIOPf0BbbFkGcvDzoJU7i//9GDrwwIHQVmIsrAGiF3ihpADBRIsrEFt1rQ==", + "version": "1.5.449", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.449.tgz", + "integrity": "sha512-dKeYk/3SFQz+nXi5whp3OuJzeWABEG4zCtkWJ9+Vby1E1iFM2y0gElRtQvNXRPJTsj8WAF4HMP7hvP790QtJ9g==", "dev": true, "license": "ISC" }, @@ -8199,9 +8208,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/js-yaml": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.4.2.tgz", - "integrity": "sha512-m+aqu+LwO1O6sIopafj8HUVl5aawITwZQe/yHpMCKjaWBaA/d07B/QdMb3529REftiU+RMMHL3Vlsw3hON7vWg==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.4.3.tgz", + "integrity": "sha512-yzzNtgczwgoVHNigCyKTXcQJU4Y8t/ikU4UxXW0BvrLfHTGWZhsNcOT2s/a7vn81/4KqVnNmHjaUEPlvWnNwVw==", "dev": true, "funding": [ { @@ -10231,13 +10240,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, - "license": "ISC" - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -11045,9 +11047,9 @@ "license": "MIT" }, "node_modules/n3": { - "version": "2.10.6", - "resolved": "https://registry.npmjs.org/n3/-/n3-2.10.6.tgz", - "integrity": "sha512-LtWkgNd9dtqOTLBIScGei02zo3U0JTh9JtGKpOiEWJ15vEfxXZbIX5XURyjstAoc6YYTElQvJ+8vTvJ8G4pEZw==", + "version": "2.13.9", + "resolved": "https://registry.npmjs.org/n3/-/n3-2.13.9.tgz", + "integrity": "sha512-in/z8EVU9QY3Q0K8+59sfcb+V44aaki9hTkfDLcbtudKS9ut40w+WjLkxBJWj54sMg0qZ/uN4sfeAbp4MyPdIA==", "license": "MIT", "dependencies": { "buffer": "^6.0.3", @@ -11257,18 +11259,16 @@ } }, "node_modules/nock": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/nock/-/nock-15.0.0.tgz", - "integrity": "sha512-EoAVk4Y8Yv4JUQz62sv8zmv+DoBblD/pht/q7aW/td1WietaFWrivzhMGGCLmx2qjpLcOrbyammedW8IRUU5TA==", - "deprecated": "v15.0.0 was released accidentally and is unstable. Please use v14.x until v15 is officially ready.", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/nock/-/nock-15.0.1.tgz", + "integrity": "sha512-Mjx5Xl4t9vP13eUZPWqwwpjjXNjvhUTo1qTdryVM3+7t6Z2w6WHZ9GVZk/zQ8Ym1vbmloWaglye3cloyHAJ8FA==", "dev": true, "license": "MIT", "dependencies": { - "@mswjs/interceptors": "^0.39.5", - "json-stringify-safe": "^5.0.1" + "@mswjs/interceptors": "^0.44.0" }, "engines": { - "node": ">=18.20.0 <20 || >=20.12.1" + "node": ">=20.12.1" } }, "node_modules/node-domexception": { @@ -11668,9 +11668,9 @@ } }, "node_modules/package-manager-detector": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.8.0.tgz", - "integrity": "sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.9.0.tgz", + "integrity": "sha512-zAMfbta9nPA8AKkA4WdmNAT8R8s6Dk0/xwPsqNnRidMFcLo1YkLuPDTgs2f64XdzS8vbLNnoJ+uUIkgbz7oRHA==", "dev": true, "license": "MIT" }, @@ -11920,9 +11920,9 @@ } }, "node_modules/postcss": { - "version": "8.5.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", - "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", + "version": "8.5.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.29.tgz", + "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==", "funding": [ { "type": "opencollective", @@ -11939,9 +11939,9 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.18", + "nanoid": "^3.3.19", "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" + "source-map-js": "^1.2.2" }, "engines": { "node": "^10 || ^12 || >=14" @@ -11977,9 +11977,9 @@ } }, "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.19", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", - "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", + "version": "3.3.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz", + "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==", "funding": [ { "type": "github", @@ -12241,9 +12241,9 @@ } }, "node_modules/regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.5.0.tgz", + "integrity": "sha512-1s+CxXjJ71i7LNVy8nYwg47XV4y6lAnOEhsMtSKq3WpmPfhl9LuKlTqKIn/3yUpE8lBz+W+TT88Bxyhnr0U4yw==", "dev": true, "license": "MIT" }, @@ -12282,13 +12282,13 @@ } }, "node_modules/regexpu-core": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.5.2.tgz", - "integrity": "sha512-zkmVH92DlzjSFc4xKGZp/2BXIFrDIdBQBC8gUXKCsMgKYb1bkCkxfSuoW1werDjaTEMTbULkHtKFHe1L+Abnaw==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.5.3.tgz", + "integrity": "sha512-E8VgUoSK+LMQrLboDxavm76MTBGrQhx9RiNuomRmYnZ10Uw12HrI8fkxOOncktb2hBpzIZ9SV/347euQHG5z+g==", "dev": true, "license": "MIT", "dependencies": { - "regenerate": "^1.4.2", + "regenerate": "^1.5.0", "regenerate-unicode-properties": "^10.3.0", "regjsgen": "^0.8.0", "regjsparser": "^0.13.0", @@ -12307,9 +12307,9 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.3.tgz", - "integrity": "sha512-ycwFAS14Jw4mppvmK4GR/J6u3WpWpjkEApehuHtLc/8VpPNpDMbQ4WjqwplXifGeyKOzHSFLmSPqzksDQE2Sfg==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.4.tgz", + "integrity": "sha512-EWV80YgFaVgFrjGCAsV7oybp4GOxbls5RzBg8OB0nKEVXsBJR1JlV8Di1JhCROg3MzTfe1RI8yitIm1eOs68iA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -12330,14 +12330,14 @@ } }, "node_modules/resolve": { - "version": "1.22.12", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", - "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", + "version": "1.22.13", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.13.tgz", + "integrity": "sha512-Dj/cW9zBV2aRj6XzCxuGIs3ESZKv02jixne3q6jFZYZ3/Tg09gHHviSMDL4kObh9pqSahdRHEnDoaP2gn8YLhA==", "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "is-core-module": "^2.16.1", + "is-core-module": "^2.17.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -12371,13 +12371,20 @@ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" } }, + "node_modules/rettime": { + "version": "0.11.12", + "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.11.12.tgz", + "integrity": "sha512-5ExtR1ppiDBQkVoPw5NAqdbfH4Iq2VOmQKHMtUoaFxA9bo2krzFYBtyq6K40xxbYp+2w/YOr6D+1ToF6tTN53A==", + "dev": true, + "license": "MIT" + }, "node_modules/rolldown": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.12.tgz", - "integrity": "sha512-8wafseiaG80xmXSfqidUNqZcylTlhmPZZt+za2m+js2sFZ8dTNlhIOV2WcbIPx2hgwPBJpEUGFAMZ9bgBBLTSQ==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.13.tgz", + "integrity": "sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==", "license": "MIT", "dependencies": { - "@oxc-project/types": "=0.152.0", + "@oxc-project/types": "=0.153.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -12387,21 +12394,21 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm-eabi": "1.2.12", - "@rolldown/binding-android-arm64": "1.2.12", - "@rolldown/binding-darwin-arm64": "1.2.12", - "@rolldown/binding-darwin-x64": "1.2.12", - "@rolldown/binding-freebsd-x64": "1.2.12", - "@rolldown/binding-linux-arm-gnueabihf": "1.2.12", - "@rolldown/binding-linux-arm64-gnu": "1.2.12", - "@rolldown/binding-linux-arm64-musl": "1.2.12", - "@rolldown/binding-linux-ppc64-gnu": "1.2.12", - "@rolldown/binding-linux-s390x-gnu": "1.2.12", - "@rolldown/binding-linux-x64-gnu": "1.2.12", - "@rolldown/binding-linux-x64-musl": "1.2.12", - "@rolldown/binding-openharmony-arm64": "1.2.12", - "@rolldown/binding-win32-arm64-msvc": "1.2.12", - "@rolldown/binding-win32-x64-msvc": "1.2.12" + "@rolldown/binding-android-arm-eabi": "1.2.13", + "@rolldown/binding-android-arm64": "1.2.13", + "@rolldown/binding-darwin-arm64": "1.2.13", + "@rolldown/binding-darwin-x64": "1.2.13", + "@rolldown/binding-freebsd-x64": "1.2.13", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.13", + "@rolldown/binding-linux-arm64-gnu": "1.2.13", + "@rolldown/binding-linux-arm64-musl": "1.2.13", + "@rolldown/binding-linux-ppc64-gnu": "1.2.13", + "@rolldown/binding-linux-s390x-gnu": "1.2.13", + "@rolldown/binding-linux-x64-gnu": "1.2.13", + "@rolldown/binding-linux-x64-musl": "1.2.13", + "@rolldown/binding-openharmony-arm64": "1.2.13", + "@rolldown/binding-win32-arm64-msvc": "1.2.13", + "@rolldown/binding-win32-x64-msvc": "1.2.13" } }, "node_modules/run-applescript": { @@ -12737,9 +12744,9 @@ "license": "MIT" }, "node_modules/solidos-toolkit": { - "version": "0.0.0-dev.998a984ddf8fda587eedb0c8125cb952ac28d191", - "resolved": "https://registry.npmjs.org/solidos-toolkit/-/solidos-toolkit-0.0.0-dev.998a984ddf8fda587eedb0c8125cb952ac28d191.tgz", - "integrity": "sha512-m2b3sZkKbjV5X/J8N25h3UIbsiQARdnXCGs1AeGqFiueoq8cWm+pdOyPpqiVuqRnnA5osmKG2wovUcBBYumL0Q==", + "version": "0.0.0-dev.660f6b5b49d5ef8ddaf7c9e6ce146cf29e879e4d", + "resolved": "https://registry.npmjs.org/solidos-toolkit/-/solidos-toolkit-0.0.0-dev.660f6b5b49d5ef8ddaf7c9e6ce146cf29e879e4d.tgz", + "integrity": "sha512-tIq2WjntNnmOT6TZa22SfeHrri2Q4LnCl7z+I+Rf+4hmzW2yA8wN7QZdoQ/zB3WIFN2ixCAh9R9vyQHTD0kB3g==", "dev": true, "dependencies": { "@babel/core": "^7.29.0", @@ -12934,13 +12941,6 @@ "node": ">=10" } }, - "node_modules/strict-event-emitter": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz", - "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==", - "dev": true, - "license": "MIT" - }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -13535,16 +13535,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.71.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.71.0.tgz", - "integrity": "sha512-fBdHYiqQ14RW6mOMXD14Svn82ZsCYAoQSzGRzyEjR59S5A2Krh/l7fGTOQ7iCr8gGy/mHVXtEF7s5fgjEdV0Pw==", + "version": "8.71.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.71.1.tgz", + "integrity": "sha512-oiNVPC3/NbV1FpaHU07l8O6ynqG9v4PAiW2WvTrAmZdR0f2HI/gE668ElMLCK7Xbsu5k2fK5C4fXNiq05j7/nQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.71.0", - "@typescript-eslint/parser": "8.71.0", - "@typescript-eslint/typescript-estree": "8.71.0", - "@typescript-eslint/utils": "8.71.0" + "@typescript-eslint/eslint-plugin": "8.71.1", + "@typescript-eslint/parser": "8.71.1", + "@typescript-eslint/typescript-estree": "8.71.1", + "@typescript-eslint/utils": "8.71.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -13886,9 +13886,9 @@ } }, "node_modules/vite": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.2.tgz", - "integrity": "sha512-SQr1x6W5vVSbROg7vsyXIaxK9b0G7zsT68acdWWRmnBUsgDieLCRG+Rep9WdZgcposvv/GSnr4GUUBqB3vXq6w==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.3.tgz", + "integrity": "sha512-cTAldKPImjg6c+gk48U19POPn3GCBzZwpdsN8ZMEEcbpes+6/wvfqUd0C2y3qYY4wsj8PwgFwrZ/1jBPVttMSg==", "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", diff --git a/package.json b/package.json index 7a1b6343d..a7a3e079e 100644 --- a/package.json +++ b/package.json @@ -173,7 +173,6 @@ }, "solidosDependencies": [ "rdflib", - "solid-logic", "pane-registry" ] } diff --git a/src/components/access-control-modal/AccessControlModal.styles.css b/src/components/access-control-modal/AccessControlModal.styles.css index c904a35ca..670d0571c 100644 --- a/src/components/access-control-modal/AccessControlModal.styles.css +++ b/src/components/access-control-modal/AccessControlModal.styles.css @@ -7,19 +7,93 @@ .access-grants-form { display: flex; + flex-direction: column; padding: 10px 10px; - flex-direction: row; align-items: flex-start; gap: 10px; align-self: stretch; + font-size: var(--solid-ui-font-size-sm, .875rem); --access-role-select-width: 129px; - solid-ui-input { - flex: 1 1 auto; + p { + color: var(--solid-ui-color-gray-600, #4A5565); + line-height: 1.5; + } + + .access-grants-form-main { + display: flex; + align-items: flex-start; + gap: 10px; + align-self: stretch; + + .access-grants-input { + display: flex; + flex-direction: column; + flex: 1 1 auto; + min-width: 0; + padding: 10px 15px; + gap: 12px; + align-items: flex-start; + border-radius: 5px; + border: 1px solid var(--solid-ui-color-slate-200, #E2E8F0); + background: var(--solid-ui-color-white, #FFF); + + solid-ui-combobox { + width: 100%; + /* color: var(--solid-ui-color-gray-300, #D1D5DC); it is so light you can't read*/ + + --solid-ui-input-border-color: var(--solid-ui-color-slate-200, #E2E8F0); + } + } + } + + .access-grants-pending { + display: flex; + flex-wrap: wrap; + gap: 8px; + min-height: 42px; + align-items: center; + } + + .access-grants-pending-item { + display: flex; + padding: 5px 10px; + align-items: center; + gap: 6px; + max-width: 100%; + border-radius: 5px; + border: 1px solid var(--solid-ui-color-gray-300, #D1D5DC); + background: var(--solid-ui-color-gray-50, #F9FAFB); + color: var(--solid-ui-color-gray-700, #374151); + } + + .access-grants-pending-item-label { min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: var(--solid-ui-color-gray-500, #6A7282); + font-size: var(--solid-ui-font-size-xs, .75rem); + line-height: 1; + } + + .access-grants-pending-item-remove { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0; + border: none; + border-radius: 999px; + background: transparent; + color: var(--solid-ui-color-gray-300, #D1D5DC); + cursor: pointer; - --solid-ui-input-border-color: var(--solid-ui-color-slate-200, #E2E8F0); + } + + .access-grants-pending-item-remove icon-lucide-circle-x { + width: 14px; + height: 14px; } } @@ -57,6 +131,10 @@ align-items: flex-start; gap: 15px; flex: 1 0 0; + min-height: 0; + box-sizing: border-box; + overflow-y: auto; + overflow-x: hidden; border-radius: 10px; border: 1px solid var(--solid-ui-color-gray-200, #E5E7EB); } @@ -92,6 +170,11 @@ } span { + display: flex; + width: 100%; + height: 100%; + align-items: center; + justify-content: center; line-height: 1; } } @@ -139,7 +222,6 @@ } .access-grants-role--editable { - width: fit-content; max-width: 100%; } } @@ -235,6 +317,26 @@ margin-top: 25px; flex: 0 0 auto; width: var(--access-role-select-width); + --solid-ui-input-border-color: var(--solid-ui-color-slate-200, #E2E8F0); + } + + .access-role-select--top { + margin-top: 0; + } + + .access-role-select--compact { + width: 110px; + min-width: 110px; + flex: 0 0 110px; + max-width: 100%; + --solid-ui-input-border-color: transparent; + margin-top: 0; + } + + .access-grants-list li .access-role-select--compact { + width: 110px; + min-width: 110px; + flex: 0 0 110px; } .access-control-footer-actions { diff --git a/src/components/access-control-modal/AccessControlModal.ts b/src/components/access-control-modal/AccessControlModal.ts index c9c7d718c..0182d0dce 100644 --- a/src/components/access-control-modal/AccessControlModal.ts +++ b/src/components/access-control-modal/AccessControlModal.ts @@ -5,34 +5,26 @@ import { property, query, state } from 'lit/decorators.js' import { label } from '@/utils/label' import { findImage } from '@/widgets' import type Dialog from '@/components/dialog' -import { solidLogicSingleton } from 'solid-logic' -import type { AccessMode, Authorization, SubjectType } from 'solid-logic' -import type { AccessControlBadgeKind, AccessRole, DraftGrant } from './types' +import { ACCESS_ROLES, DEFAULT_DIRECTORY_SOURCES, solidLogicSingleton, type AccessMode, type AccessRole, type Authorization, type DirectoryEntry } from 'solid-logic' +import { defineAsyncComboboxOptionsProvider, type ComboboxChangeEvent, type ComboboxOptionData } from '@/components/combobox' import { sym } from 'rdflib' import '~icons/lucide/chevron-down' import '~icons/lucide/link' -import '~icons/lucide/search' import '~icons/lucide/globe' +import '~icons/lucide/book-user' +import '~icons/lucide/user-round' +import '~icons/lucide/users' +import '~icons/lucide/circle-x' import '@/components/dialog' import '@/components/dialog-content' import '@/components/dialog-footer' import '@/components/button' -import '@/components/input' import '@/components/combobox' import '@/components/combobox-option' - import styles from './AccessControlModal.styles.css' - - -const ACCESS_ROLE_RULES = [ - { modes: ['Control'], label: 'Owner' }, - { modes: ['Write'], label: 'Editor' }, - { modes: ['Append', 'Read'], label: 'Poster' }, - { modes: ['Append'], label: 'Submitter' }, - { modes: ['Read'], label: 'Viewer' } -] as const +import type { AccessControlBadgeKind, PendingAccessGrant } from './types' @customElement('solid-ui-access-control-modal') export default class AccessControlModal extends WebComponent { @@ -45,10 +37,13 @@ export default class AccessControlModal extends WebComponent { accessor accessGrants: Authorization[] | undefined = undefined @state() - private accessor principleInputValue: string = '' + private accessor principalInputValue: string = '' @state() - private accessor roleValue: string = 'Viewer' + private accessor addAccessRoleValue: AccessRole = 'Viewer' + + @state() + private accessor sharedAccessRoleValue: AccessRole = 'No Access' @state() private accessor searchValue: string = '' @@ -59,29 +54,85 @@ export default class AccessControlModal extends WebComponent { @state() private accessor submitting: boolean = false + @state() + private accessor pendingAccessGrants: PendingAccessGrant[] = [] + @state() private accessor accessGrantRoles: AccessRole[] = [] + @state() + private accessor accessGrantLabels: string[] = [] + @query('solid-ui-dialog') private accessor dialog: Dialog | null = null - connectedCallback () { - super.connectedCallback() - } - protected willUpdate (changedProperties: PropertyValues) { super.willUpdate(changedProperties) if (changedProperties.has('accessGrants')) { this.accessGrantRoles = this.accessGrants?.map(item => this.getAuthorizationRole(item)) ?? [] + void this.refreshAccessGrantLabels() } } + private async refreshAccessGrantLabels () { + const grants = this.accessGrants ?? [] + if (!grants.length) { + this.accessGrantLabels = [] + return + } + + const labels = await Promise.all(grants.map(async authorization => { + const groupUri = authorization.agentGroup[0] + if (groupUri) { + try { + await solidLogicSingleton.store.fetcher.load(sym(groupUri).doc()) + } catch { + // Keep the fallback label if the group document cannot be loaded. + } + } + + return this.getAuthorizationSubjectLabel(authorization) + })) + + if (this.accessGrants === grants) { + this.accessGrantLabels = labels + } + } + + private getAccessGrantEntries () { + return (this.accessGrants ?? []) + .map((authorization, index) => ({ + authorization, + index, + role: this.accessGrantRoles[index] ?? this.getAuthorizationRole(authorization), + subjectLabel: this.accessGrantLabels[index] ?? this.getAuthorizationSubjectLabel(authorization) + })) + .sort((left, right) => { + const leftIsOwner = left.role === 'Owner' + const rightIsOwner = right.role === 'Owner' + + if (leftIsOwner && !rightIsOwner) return -1 + if (!leftIsOwner && rightIsOwner) return 1 + return left.index - right.index + }) + } + private renderAccessGrants() { + const query = this.searchValue.trim().toLowerCase() + const accessGrants = this.getAccessGrantEntries().filter(({ subjectLabel }) => { + if (!query) { + return true + } + + return subjectLabel.toLowerCase().includes(query) + }) + return html` ` } @@ -89,11 +140,12 @@ export default class AccessControlModal extends WebComponent { private renderAccessGrant (authorization: Authorization, index: number) { const badge = this.getAuthorizationBadge(authorization) const role = this.accessGrantRoles[index] ?? this.getAuthorizationRole(authorization) + const subjectLabel = this.accessGrantLabels[index] ?? this.getAuthorizationSubjectLabel(authorization) return html`
  • ${this.renderAuthorizationBadge(badge)} -

    ${this.renderAuthorizationSubjects(authorization)}

    +

    ${subjectLabel}

    ${this.renderAuthorizationRole(role, index)}
    • ` @@ -106,7 +158,7 @@ export default class AccessControlModal extends WebComponent { return { kind: 'agent' as const, image, - text: image ? '' : this.getInitials(this.renderAuthorizationSubjects(authorization), 2) + text: image ? '' : this.getInitials(this.getAuthorizationSubjectLabel(authorization), 2) } } @@ -114,7 +166,7 @@ export default class AccessControlModal extends WebComponent { if (agentGroup) { return { kind: 'group' as const, - text: this.getInitials(this.renderAuthorizationSubjects(authorization), 1) + text: this.getInitials(this.getAuthorizationSubjectLabel(authorization), 1) } } @@ -124,7 +176,7 @@ export default class AccessControlModal extends WebComponent { return { kind: 'agentClass' as const, image, - text: image ? '' : this.getInitials(this.renderAuthorizationSubjects(authorization), 2) + text: image ? '' : this.getInitials(this.getAuthorizationSubjectLabel(authorization), 2) } } @@ -156,22 +208,35 @@ export default class AccessControlModal extends WebComponent { return (initials || label.slice(0, maxWords)).toUpperCase() } - private renderAuthorizationSubjects (authorization: Authorization): string { - const subjects = [ + private getAuthorizationSubjects (authorization: Authorization) { + return [ ...authorization.agent, ...authorization.agentGroup, ...authorization.agentClass, ...authorization.origin ] + } + private getAuthorizationSubjectLabel (authorization: Authorization): string { + const subjects = this.getAuthorizationSubjects(authorization) return subjects.length ? subjects.map(subject => label(sym(subject))).join(', ') : 'Unknown access holder' } private getAuthorizationRole (authorization: Authorization): AccessRole { - const modes = new Set(authorization.mode) - const matchingRule = ACCESS_ROLE_RULES.find(rule => rule.modes.every(mode => modes.has(mode))) + return solidLogicSingleton.acl.roleFromModes(authorization.mode) + } + + private getRoleValueFromEvent (event: Event, fallback: AccessRole = 'Viewer'): AccessRole { + const customEvent = event as ComboboxChangeEvent + const selectedValue = customEvent.detail?.option?.value + + if (typeof selectedValue === 'string') { + return selectedValue as AccessRole + } - return matchingRule?.label ?? 'Viewer' + const target = event.currentTarget as { value?: string | null } | null + + return typeof target?.value === 'string' ? target.value as AccessRole : fallback } private renderAuthorizationRole (role: AccessRole, index: number) { @@ -181,66 +246,122 @@ export default class AccessControlModal extends WebComponent { return html` this.onAccessGrantRoleInput(index, event)} + @change=${(event: Event) => this.onAccessGrantRoleInput(index, event)} > - Editor - Viewer - Poster - Submitter - Remove + ${this.renderGrantRoleOptions()} ` } - private renderModeSelector () { + private renderModeSelector (variant: 'add' | 'general' = 'add') { + const className = variant === 'add' + ? 'access-role-select access-role-select--top' + : 'access-role-select access-role-select--compact' + const value = variant === 'add' ? this.addAccessRoleValue : this.sharedAccessRoleValue return html` - Owner - Editor - Viewer - Poster - Submitter - Remove + ${variant === 'add' ? this.renderAddRoleOptions() : this.renderGeneralRoleOptions()} ` } + private renderAddRoleOptions () { + return ACCESS_ROLES + .filter(role => role !== 'No Access') + .map(role => html` + ${role} + `) + } + + private renderGeneralRoleOptions () { + return ACCESS_ROLES.map(role => html` + ${role} + `) + } + + private renderGrantRoleOptions () { + return ACCESS_ROLES.map(role => html` + ${role === 'No Access' ? 'Remove' : role} + `) + } + private renderAddAccessForm () { return html`
    - - ${this.renderModeSelector()} +

    Add person, group or software agent URL.

    +
    +
    + + ${this.renderPendingAccessGrants()} +
    + ${this.renderModeSelector('add')} +
    +
    + ` + } + + private renderPendingAccessGrants () { + if (!this.pendingAccessGrants.length) { + return nothing + } + + return html` +
    + ${this.pendingAccessGrants.map((grant, index) => html` +
    + ${grant.label} + this.removePendingAccessGrant(index)} + > + Remove ${grant.label} + + +
    + `)}
    ` } private renderAccessGrantsSection () { + const accessGrantOptions = this.getAccessGrantSearchOptions() + return html`

    Share with

    - - - + ${accessGrantOptions.map(option => html` + + ${option.label} + + `)} +
    ${this.renderAccessGrants()} @@ -270,7 +391,7 @@ export default class AccessControlModal extends WebComponent {
    - ${this.renderModeSelector()} + ${this.renderModeSelector('general')} ` @@ -287,32 +408,18 @@ export default class AccessControlModal extends WebComponent { } private getRoleModes (role: AccessRole): AccessMode[] { - return [...(ACCESS_ROLE_RULES.find(rule => rule.label === role)?.modes ?? [])] - } - - private parsePrincipleInput (): DraftGrant[] | undefined { - const value = this.principleInputValue.trim() - if (!value) return undefined - - const principleList = value.split(',').map(item => item.trim()).filter(item => item) - if (!principleList.length) return undefined - - return principleList.map((principle): DraftGrant => { - const subjectType: SubjectType = solidLogicSingleton.resource.isWebId(principle) ? 'agent' : 'agentGroup' - - return { - subjectType, - subjectValue: principle, - role: this.roleValue as AccessRole - } - }) + return solidLogicSingleton.acl.modesFromRole(role) } private getDialogTitle (): string { const subject = this.subjectUri ? sym(this.subjectUri) : undefined - const subjectLabel = subject ? label(subject) : '' + const subjectLabel = subject ? label(subject).trim() : '' + + if (!subjectLabel || subjectLabel === 'this resource') { + return 'Share this resource' + } - return `Share ${subjectLabel || 'this resource'}` + return `Share "${subjectLabel}"` } protected render () { @@ -331,14 +438,15 @@ export default class AccessControlModal extends WebComponent {
    Cancel Save Changes @@ -352,10 +460,36 @@ export default class AccessControlModal extends WebComponent { private async onSubmit (e: Event) { e.preventDefault() - this.failed = false + if (this.submitting) { + return + } + + await this.commitPrinciplesFromInput() + } + + private async onSaveClick () { + if (this.submitting) { + return + } + + if (this.principalInputValue.trim()) { + await this.commitPrinciplesFromInput() + } + + await this.savePendingAccessGrants() + } + + private onCancelClick () { + this.dialog?.close() + } + + private async savePendingAccessGrants () { + if (this.submitting) { + return + } - const draftGrants = this.parsePrincipleInput() - if (!draftGrants?.length) { + if (!this.pendingAccessGrants.length) { + this.failed = true return } @@ -365,19 +499,21 @@ export default class AccessControlModal extends WebComponent { } this.submitting = true - // Basic added to address PR feedback has not been tested, currently only structure implemented + this.failed = false + try { - for (const draftGrant of draftGrants) { + for (const draftGrant of this.pendingAccessGrants) { const subject = { type: draftGrant.subjectType, iri: draftGrant.subjectValue } - const plan = this.roleValue === 'Remove' + const plan = draftGrant.role === 'No Access' ? await solidLogicSingleton.acl.planRevoke(this.subjectUri, subject) : await solidLogicSingleton.acl.planGrant(this.subjectUri, subject, this.getRoleModes(draftGrant.role)) await solidLogicSingleton.acl.applyPlan(plan) } - this.principleInputValue = '' + this.principalInputValue = '' + this.pendingAccessGrants = [] this.dialog?.close() } catch (error) { this.failed = true @@ -385,35 +521,307 @@ export default class AccessControlModal extends WebComponent { } finally { this.submitting = false } + } + private onPrincipalInput (event: Event) { + const target = event.currentTarget as { value?: string } | null + this.principalInputValue = target?.value ?? '' } - private onPrincipleInput (event: Event) { - const target = event.currentTarget as HTMLInputElement | null - this.principleInputValue = target?.value ?? '' + private onPrincipalSelect (event: Event) { + const customEvent = event as ComboboxChangeEvent + const option = customEvent.detail?.option + + if (!option) { + return + } + + if (typeof option.value !== 'string' || !option.value) { + return + } + + void this.queuePendingPrinciples([option.value], this.addAccessRoleValue, option.label) } private onSearchInput (event: Event) { - const target = event.currentTarget as HTMLInputElement | null + const target = event.currentTarget as { value?: string } | null this.searchValue = target?.value ?? '' } - private onRoleInput (event: Event) { - const target = event.currentTarget as { value?: string } | null - this.roleValue = target?.value ?? 'Viewer' + private onSearchSelect (event: Event) { + const customEvent = event as ComboboxChangeEvent + const option = customEvent.detail?.option + + if (option && typeof option.label === 'string') { + this.searchValue = option.label + } } - private onAccessGrantRoleInput (index: number, event: Event) { - const target = event.currentTarget as { value?: string } | null - const value = target?.value + private onAddAccessRoleInput (event: Event) { + const nextRole = this.getRoleValueFromEvent(event) + this.addAccessRoleValue = nextRole + this.pendingAccessGrants = this.pendingAccessGrants.map(grant => ({ + ...grant, + role: nextRole + })) + } - if (!value) return + private onSharedAccessRoleInput (event: Event) { + const nextRole = this.getRoleValueFromEvent(event) + this.sharedAccessRoleValue = nextRole + } + + private onAccessGrantRoleInput (index: number, event: Event) { + const value = this.getRoleValueFromEvent(event) this.accessGrantRoles = this.accessGrantRoles.map((role, roleIndex) => { - return roleIndex === index ? value as AccessRole : role + return roleIndex === index ? value : role }) } + private removePendingAccessGrant (index: number) { + this.pendingAccessGrants = this.pendingAccessGrants.filter((_, pendingIndex) => pendingIndex !== index) + } + + private async commitPrinciplesFromInput (): Promise { + const rawValue = this.principalInputValue.trim() + if (!rawValue) { + return false + } + + await this.queuePendingPrinciples([rawValue], this.addAccessRoleValue, undefined, rawValue) + return true + } + + private async queuePendingPrinciples ( + principles: string[], + role: AccessRole = this.addAccessRoleValue, + preferredLabel?: string, + inputSnapshot?: string + ) { + const snapshot = inputSnapshot ?? this.principalInputValue.trim() + const pendingGrants = await Promise.all(principles.map(async principle => this.createPendingAccessGrant(principle, role, preferredLabel))) + const newGrants = pendingGrants.filter((grant): grant is PendingAccessGrant => Boolean(grant)) + + if (!newGrants.length) { + return + } + + const merged = [...this.pendingAccessGrants, ...newGrants] + this.pendingAccessGrants = this.dedupePendingAccessGrants(merged) + + if (this.principalInputValue.trim() === snapshot) { + this.principalInputValue = '' + } + } + + private async createPendingAccessGrant ( + principle: string, + role: AccessRole = this.addAccessRoleValue, + preferredLabel?: string + ): Promise { + const normalizedPrinciple = this.normalizeAccessPrincipleInput(principle) + const resolvedPrinciple = await solidLogicSingleton.acl.classifyAccessControlSubject(normalizedPrinciple) + const fallbackKind = this.isHttpUri(principle) ? 'agent' : undefined + const subjectType = resolvedPrinciple?.kind ?? fallbackKind + const subjectValue = resolvedPrinciple?.subjectValue ?? normalizedPrinciple + + if (!subjectType) { + console.error(`Could not classify access target: ${principle}`) + return undefined + } + + const label = preferredLabel ?? await this.resolvePendingAccessGrantLabel(subjectValue, principle) + + return { + subjectType, + subjectValue, + role, + label + } + } + + private async resolvePendingAccessGrantLabel (subjectValue: string, fallbackLabel: string): Promise { + try { + const subject = sym(subjectValue) + await solidLogicSingleton.store.fetcher.load(subject.doc()) + const resolved = label(subject).trim() + return resolved || fallbackLabel + } catch { + return label(sym(subjectValue)) || fallbackLabel + } + } + + private dedupePendingAccessGrants (draftGrants: PendingAccessGrant[]): PendingAccessGrant[] { + const seen = new Set() + + return draftGrants.filter(draftGrant => { + const key = `${draftGrant.subjectType}:${draftGrant.subjectValue}` + if (seen.has(key)) { + return false + } + + seen.add(key) + return true + }) + } + + private readonly accessPrincipleOptionsProvider = defineAsyncComboboxOptionsProvider(async (filter: string) => { + const query = this.getPrincipleSearchTerm(filter) + const originCandidate = this.normalizeOriginInput(query) + const originOption = originCandidate ? await this.createOriginOption(originCandidate) : undefined + const urlOption = this.isHttpUri(query) ? await this.createUrlOption(query) : undefined + const preferredOptions = this.dedupeComboboxOptions([originOption, urlOption].filter((option): option is ComboboxOptionData => Boolean(option))) + + if (query.length < 2) { + return preferredOptions.length ? preferredOptions : [{ + label: 'Type at least 2 characters to search', + value: '', + selectable: false + }] + } + + let entries: DirectoryEntry[] = [] + + try { + entries = await solidLogicSingleton.directory.search({ + query, + sources: DEFAULT_DIRECTORY_SOURCES + }) + } catch (error) { + if (!urlOption) { + throw error + } + } + + const options = entries.map((entry: DirectoryEntry) => this.directoryEntryToOption(entry)) + return [...preferredOptions, ...options] + }) + + private async createUrlOption (uri: string): Promise { + try { + await solidLogicSingleton.store.fetcher.load(sym(uri).doc()) + } catch { + return undefined + } + + const labelText = await this.resolvePendingAccessGrantLabel(uri, uri) + + return { + label: labelText === uri ? `Use ${uri}` : labelText, + value: uri + } + } + + private async createOriginOption (uri: string): Promise { + const labelText = await this.resolvePendingAccessGrantLabel(uri, uri) + + return { + label: labelText === uri ? `Use ${uri}` : labelText, + value: uri + } + } + + private dedupeComboboxOptions (options: ComboboxOptionData[]): ComboboxOptionData[] { + const seen = new Set() + + return options.filter(option => { + if (seen.has(option.value)) { + return false + } + + seen.add(option.value) + return true + }) + } + + private directoryEntryToOption (entry: DirectoryEntry): ComboboxOptionData { + return { + label: entry.label, + value: entry.uri, + template: this.directoryEntryToOptionTemplate(entry) + } + } + + private directoryEntryToOptionTemplate (entry: DirectoryEntry) { + return html` + + ${this.renderDirectoryEntryIcon(entry)} + ${entry.label} + + ` + } + + private renderDirectoryEntryIcon (entry: DirectoryEntry) { + if (entry.sources.includes('contacts') || entry.sources.includes('groups')) { + return html`` + } + + if (entry.sources.includes('friends')) { + return html`` + } + + if (entry.sources.includes('catalog')) { + return html`` + } + + return nothing + } + + private getAccessGrantSearchOptions (): ComboboxOptionData[] { + return this.getAccessGrantEntries().map(({ subjectLabel }) => ({ + label: subjectLabel, + value: subjectLabel + })) + } + + private getPrincipleSearchTerm (value: string): string { + const lastCommaIndex = value.lastIndexOf(',') + if (lastCommaIndex < 0) { + return value.trim() + } + + return value.slice(lastCommaIndex + 1).trim() + } + + private isHttpUri (value: string): boolean { + return value.startsWith('http://') || value.startsWith('https://') + } + + private isBareOriginDomain (value: string): boolean { + return /^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/i.test(value.trim()) + } + + private normalizeOriginInput (value: string): string | undefined { + const trimmed = value.trim() + if (!trimmed) { + return undefined + } + + if (this.isHttpUri(trimmed)) { + try { + const parsed = new URL(trimmed) + if ((parsed.protocol === 'http:' || parsed.protocol === 'https:') && parsed.pathname === '/' && !parsed.search && !parsed.hash) { + return `${parsed.protocol}//${parsed.host}` + } + } catch { + return undefined + } + + return undefined + } + + if (!this.isBareOriginDomain(trimmed)) { + return undefined + } + + return `https://${trimmed}` + } + + private normalizeAccessPrincipleInput (value: string): string { + return this.normalizeOriginInput(value) ?? value.trim() + } + private async onCopyLinkClick (event: Event) { event.preventDefault() diff --git a/src/components/access-control-modal/types.ts b/src/components/access-control-modal/types.ts index 000deff53..96b510a5c 100644 --- a/src/components/access-control-modal/types.ts +++ b/src/components/access-control-modal/types.ts @@ -1,15 +1,11 @@ -import type { SubjectType } from 'solid-logic' - -export const ACCESS_ROLES = ['Owner', 'Editor', 'Viewer', 'Poster', 'Submitter', 'Remove'] as const - -export type AccessRole = typeof ACCESS_ROLES[number] +import type { AccessControlSubjectKind, AccessRole } from 'solid-logic' export type AccessControlBadgeKind = 'agent' | 'group' | 'agentClass' | 'origin' | 'unknown' -export type DraftGrant = { +export type PendingAccessGrant = { id?: string - subjectType: SubjectType + subjectType: AccessControlSubjectKind subjectValue: string role: AccessRole - removed?: boolean + label: string } diff --git a/src/components/combobox/Combobox.stories.ts b/src/components/combobox/Combobox.stories.ts index 6dac7daf1..f7049a73e 100644 --- a/src/components/combobox/Combobox.stories.ts +++ b/src/components/combobox/Combobox.stories.ts @@ -48,14 +48,14 @@ const meta = { }, render ({ label, options, asyncJSOptions, asyncHtmlOptions, srOnlyLabel }) { if (asyncJSOptions) { - return html`` + return html`` } if (asyncHtmlOptions) { return html` option.trim()) return html` - + ${parsedOptions.map((option, index) => { const indent = index === 0 ? '' : ' ' diff --git a/src/components/input/Input.stories.ts b/src/components/input/Input.stories.ts index 4ae45e176..1ec4149a2 100644 --- a/src/components/input/Input.stories.ts +++ b/src/components/input/Input.stories.ts @@ -27,7 +27,7 @@ const meta = { return html` option.trim()) return html` - + ${parsedOptions.map((option, index) => { const indent = index === 0 ? '' : ' ' diff --git a/src/styles/theme.css b/src/styles/theme.css index 933f25f89..037b18856 100644 --- a/src/styles/theme.css +++ b/src/styles/theme.css @@ -15,6 +15,7 @@ --solid-ui-color-gray-100: #f3f4f6; --solid-ui-color-gray-200: #cbd5e1; + --solid-ui-color-gray-300: #d1d5dc; --solid-ui-color-gray-400: #99a1af; --solid-ui-color-gray-500: #6a7282; --solid-ui-color-gray-600: #4a5565; @@ -23,6 +24,7 @@ --solid-ui-color-gray-900: #101828; --solid-ui-color-slate-50: #f8fafc; + --solid-ui-color-gray-50: #f9fafb; --solid-ui-color-slate-200: #e2e8f0; --solid-ui-color-slate-400: #90a1b9; --solid-ui-color-slate-800: #1d293d; diff --git a/test/components/access-control-modal.test.ts b/test/components/access-control-modal.test.ts index 50fd12b33..c13817e05 100644 --- a/test/components/access-control-modal.test.ts +++ b/test/components/access-control-modal.test.ts @@ -5,6 +5,13 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const planGrant = vi.fn() const planRevoke = vi.fn() const applyPlan = vi.fn() +const classifyAccessControlSubject = vi.fn() + +vi.mock('@/components/combobox', () => ({ + defineAsyncComboboxOptionsProvider: (provider: T) => provider +})) + +vi.mock('@/components/combobox-option', () => ({})) vi.mock('solid-logic', async (importOriginal) => { const actual = await importOriginal() @@ -15,10 +22,18 @@ vi.mock('solid-logic', async (importOriginal) => { ...actual.solidLogicSingleton, acl: { ...actual.solidLogicSingleton.acl, + classifyAccessControlSubject, planGrant, planRevoke, applyPlan }, + store: { + ...actual.solidLogicSingleton.store, + fetcher: { + ...actual.solidLogicSingleton.store.fetcher, + load: vi.fn().mockResolvedValue(undefined) + } + }, resource: { ...actual.solidLogicSingleton.resource, isWebId: vi.fn(() => true) @@ -32,23 +47,236 @@ describe('AccessControlModal submit', () => { planGrant.mockReset() planRevoke.mockReset() applyPlan.mockReset() + classifyAccessControlSubject.mockReset() + classifyAccessControlSubject.mockImplementation(async (principle: string) => ({ + kind: 'agent' as const, + subjectValue: principle + })) planGrant.mockResolvedValue({ target: 'https://example.com/resource.ttl.acl', deletes: [], inserts: [] }) applyPlan.mockResolvedValue(new Response('ok', { status: 200 })) await import('../../src/components/access-control-modal/AccessControlModal') }) - it('applies a grant plan and clears the loading state after save', async () => { + it('queues a grant on submit without saving it', async () => { const element = document.createElement('solid-ui-access-control-modal') as any element.subjectUri = 'https://example.com/resource.ttl' - element.principleInputValue = 'https://alice.example.com/profile/card.ttl#me' - element.roleValue = 'Editor' + element.principalInputValue = 'https://alice.example.com/profile/card.ttl#me' + element.addAccessRoleValue = 'Editor' await element.onSubmit(new Event('submit')) + expect(planGrant).not.toHaveBeenCalled() + expect(applyPlan).not.toHaveBeenCalled() + expect(element.pendingAccessGrants).toHaveLength(1) + expect(element.principalInputValue).toBe('') + }) + + it('keeps newer input when an async lookup resolves later', async () => { + let resolveClassification!: (value: { kind: 'agent', subjectValue: string }) => void + classifyAccessControlSubject.mockImplementationOnce(() => new Promise(resolve => { + resolveClassification = resolve + })) + + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.principalInputValue = 'https://alice.example.com/profile/card.ttl#me' + element.addAccessRoleValue = 'Editor' + + const submitPromise = element.onSubmit(new Event('submit')) + element.principalInputValue = 'https://bob.example.com/profile/card.ttl#me' + resolveClassification({ kind: 'agent', subjectValue: 'https://alice.example.com/profile/card.ttl#me' }) + await submitPromise + + expect(element.principalInputValue).toBe('https://bob.example.com/profile/card.ttl#me') + expect(element.pendingAccessGrants).toHaveLength(1) + }) + + it('keeps the selected role for a queued grant even if the mode changes later', async () => { + let resolveClassification!: (value: { kind: 'agent', subjectValue: string }) => void + classifyAccessControlSubject.mockImplementationOnce(() => new Promise(resolve => { + resolveClassification = resolve + })) + + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.principalInputValue = 'https://alice.example.com/profile/card.ttl#me' + element.addAccessRoleValue = 'Editor' + + const submitPromise = element.onSubmit(new Event('submit')) + element.addAccessRoleValue = 'Viewer' + resolveClassification({ kind: 'agent', subjectValue: 'https://alice.example.com/profile/card.ttl#me' }) + await submitPromise + + expect(element.pendingAccessGrants).toEqual([ + expect.objectContaining({ + role: 'Editor' + }) + ]) + }) + + it('applies a grant plan and clears the loading state after save', async () => { + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.principalInputValue = 'https://alice.example.com/profile/card.ttl#me' + element.addAccessRoleValue = 'Editor' + + await element.onSaveClick() + expect(planGrant).toHaveBeenCalledTimes(1) + expect(planGrant).toHaveBeenCalledWith( + 'https://example.com/resource.ttl', + { + type: 'agent', + iri: 'https://alice.example.com/profile/card.ttl#me' + }, + ['Read', 'Write'] + ) expect(applyPlan).toHaveBeenCalledTimes(1) expect(element.submitting).toBe(false) - expect(element.principleInputValue).toBe('') + expect(element.pendingAccessGrants).toEqual([]) + }) + + it.each([ + { role: 'Owner', modes: ['Read', 'Write', 'Control'] }, + { role: 'Editor', modes: ['Read', 'Write'] }, + { role: 'Viewer', modes: ['Read'] }, + { role: 'Poster', modes: ['Append', 'Read'] }, + { role: 'Submitter', modes: ['Append'] } + ])('saves $role using the modes supplied by solid-logic', async ({ role, modes }) => { + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.principalInputValue = 'https://alice.example.com/profile/card.ttl#me' + element.addAccessRoleValue = role + + await element.onSaveClick() + + expect(planGrant).toHaveBeenCalledWith( + element.subjectUri, + { type: 'agent', iri: 'https://alice.example.com/profile/card.ttl#me' }, + modes + ) + expect(applyPlan).toHaveBeenCalledTimes(1) + expect(element.failed).toBe(false) + }) + + it('revokes a queued no-access grant instead of granting empty modes', async () => { + planRevoke.mockResolvedValue({ target: 'https://example.com/resource.ttl.acl', deletes: [], inserts: [] }) + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.pendingAccessGrants = [{ + subjectType: 'agent', + subjectValue: 'https://alice.example.com/profile/card.ttl#me', + role: 'No Access', + label: 'Alice' + }] + + await element.onSaveClick() + + expect(planGrant).not.toHaveBeenCalled() + expect(planRevoke).toHaveBeenCalledWith( + element.subjectUri, + { type: 'agent', iri: 'https://alice.example.com/profile/card.ttl#me' } + ) + expect(applyPlan).toHaveBeenCalledTimes(1) + expect(element.pendingAccessGrants).toEqual([]) + }) + + it('normalizes a bare origin domain and saves it as an origin grant', async () => { + classifyAccessControlSubject.mockResolvedValueOnce({ + kind: 'origin' as const, + subjectValue: 'https://app.example.com' + }) + + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.principalInputValue = 'app.example.com' + element.addAccessRoleValue = 'Viewer' + + await element.onSaveClick() + + expect(classifyAccessControlSubject).toHaveBeenCalledWith('https://app.example.com') + expect(planGrant).toHaveBeenCalledWith( + element.subjectUri, + { + type: 'origin', + iri: 'https://app.example.com' + }, + ['Read'] + ) + expect(planRevoke).not.toHaveBeenCalled() + expect(applyPlan).toHaveBeenCalledTimes(1) + expect(element.failed).toBe(false) + expect(element.pendingAccessGrants).toEqual([]) + }) + + it('offers a normalized origin option for a bare domain input', async () => { + const element = document.createElement('solid-ui-access-control-modal') as any + document.body.appendChild(element) + await element.updateComplete + + const options = await element.accessPrincipleOptionsProvider('app.example.com') + + expect(options.map((option: { value: string }) => option.value)).toContain('https://app.example.com') + + document.body.removeChild(element) + }) + + it('reads the selected role from the rendered combobox change event', async () => { + const element = document.createElement('solid-ui-access-control-modal') as any + document.body.appendChild(element) + await element.updateComplete + + const roleSelect = element.shadowRoot.querySelector('solid-ui-combobox.access-role-select--top') + roleSelect.dispatchEvent(new CustomEvent('change', { + bubbles: true, + composed: true, + detail: { + option: { + value: 'Editor', + label: 'Editor' + } + } + })) + + expect(element.addAccessRoleValue).toBe('Editor') + expect(element.sharedAccessRoleValue).toBe('No Access') + + document.body.removeChild(element) + }) + + it('keeps the general access selector independent from the top selector', async () => { + const element = document.createElement('solid-ui-access-control-modal') as any + element.subjectUri = 'https://example.com/resource.ttl' + element.principalInputValue = 'https://alice.example.com/profile/card.ttl#me' + element.addAccessRoleValue = 'Viewer' + element.sharedAccessRoleValue = 'No Access' + + await element.onSubmit(new Event('submit')) + + document.body.appendChild(element) + await element.updateComplete + + const sharedRoleSelect = element.shadowRoot.querySelector('solid-ui-combobox.access-role-select--compact') + sharedRoleSelect.dispatchEvent(new CustomEvent('change', { + bubbles: true, + composed: true, + detail: { + option: { + value: 'Editor', + label: 'Editor' + } + } + })) + + expect(element.addAccessRoleValue).toBe('Viewer') + expect(element.sharedAccessRoleValue).toBe('Editor') + expect(element.pendingAccessGrants).toEqual([ + expect.objectContaining({ + role: 'Viewer' + }) + ]) + + document.body.removeChild(element) }) it('uses the default share title when no subject uri is present', async () => { @@ -56,4 +284,44 @@ describe('AccessControlModal submit', () => { expect(element.getDialogTitle()).toBe('Share this resource') }) -}) \ No newline at end of file + + it('hides no access in the add selector and keeps no access in the general selector', async () => { + const element = document.createElement('solid-ui-access-control-modal') as any + document.body.appendChild(element) + await element.updateComplete + + const addRoleSelect = element.shadowRoot.querySelector('solid-ui-combobox.access-role-select--top') + const generalRoleSelect = element.shadowRoot.querySelector('solid-ui-combobox.access-role-select--compact') + + const addOptions = [...addRoleSelect.querySelectorAll('solid-ui-combobox-option')].map((option: Element) => option.textContent?.trim()) + const generalOptions = [...generalRoleSelect.querySelectorAll('solid-ui-combobox-option')].map((option: Element) => option.textContent?.trim()) + + expect(addOptions).not.toContain('No Access') + expect(addOptions).toContain('Viewer') + expect(generalOptions).toContain('No Access') + + document.body.removeChild(element) + }) + + it('shows remove for no access in grant rows', async () => { + const element = document.createElement('solid-ui-access-control-modal') as any + element.accessGrants = [{ + agent: ['https://alice.example.com/profile/card.ttl#me'], + agentGroup: [], + agentClass: [], + origin: [], + mode: ['Read'] + }] + + document.body.appendChild(element) + await element.updateComplete + + const grantRoleSelect = element.shadowRoot.querySelector('solid-ui-combobox.access-grants-role--editable') + const grantOptions = [...grantRoleSelect.querySelectorAll('solid-ui-combobox-option')].map((option: Element) => option.textContent?.trim()) + + expect(grantOptions).toContain('Remove') + expect(grantOptions).not.toContain('No Access') + + document.body.removeChild(element) + }) +})