From d9f617bb554ea12703be6fafe2985fe51b8c5e73 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sun, 27 Sep 2026 09:20:56 +1000 Subject: [PATCH 01/32] support for manage access dialog --- package-lock.json | 2101 +++++++++------------------------ package.json | 1 + src/acl/aclLogic.ts | 48 +- src/resource/resourceLogic.ts | 17 +- src/types.ts | 10 +- test/resourceLogic.test.ts | 12 + 6 files changed, 658 insertions(+), 1531 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdf956de..2c190282 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "6.0.0", "license": "MIT", "dependencies": { + "@dokieli/web-access-control": "^1.0.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", "solid-namespace": "^0.5.4", "vite": "^8.0.16", @@ -120,14 +121,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", - "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz", + "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.7", - "@babel/types": "^7.29.7", + "@babel/parser": "^7.29.8", + "@babel/types": "^7.29.8", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -481,13 +482,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", - "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", + "version": "7.29.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz", + "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.7" + "@babel/types": "^7.29.8" }, "bin": { "parser": "bin/babel-parser.js" @@ -1147,16 +1148,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz", - "integrity": "sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.8.tgz", + "integrity": "sha512-6iSnEK0zlkLKU4heofK/AdmRD4e2SHVpJMtrwnTCzhnaM98ria4rTrOXBBi45BTTYnJtO8txnPsX4fChYXkmeA==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7", - "@babel/traverse": "^7.29.7" + "@babel/traverse": "^7.29.8" }, "engines": { "node": ">=6.9.0" @@ -1385,9 +1386,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz", - "integrity": "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.8.tgz", + "integrity": "sha512-0UpIXPtdDtMXfnV2OJAVMLpj3H/92vmkA6lpSRakmycJvj3VUy6Xs1dM8tXRugupykr5WB+LpiVl0J8LMVg2mg==", "dev": true, "license": "MIT", "dependencies": { @@ -1481,9 +1482,9 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.7.tgz", - "integrity": "sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.8.tgz", + "integrity": "sha512-4S9ksMGVWUshvgK0mKfvZky7leuG5/uoFVwMpAomJ8bMoDJiNHRVmc1EglwW/CmGVSqqWpEbXm9FmbRit22qoA==", "dev": true, "license": "MIT", "dependencies": { @@ -1546,9 +1547,9 @@ } }, "node_modules/@babel/plugin-transform-typescript": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.29.7.tgz", - "integrity": "sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw==", + "version": "7.29.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.29.9.tgz", + "integrity": "sha512-FFwIwzU+7SCOuxxV4YtJql6T9981ZVTm+FHO5GhVsRqCTdy0WwrEZh3l42ARpXruJUDGOptdduHW6Zr7pNPLNg==", "dev": true, "license": "MIT", "dependencies": { @@ -1803,18 +1804,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", - "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.8.tgz", + "integrity": "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.7", + "@babel/generator": "^7.29.8", "@babel/helper-globals": "^7.29.7", - "@babel/parser": "^7.29.7", + "@babel/parser": "^7.29.8", "@babel/template": "^7.29.7", - "@babel/types": "^7.29.7", + "@babel/types": "^7.29.8", "debug": "^4.3.1" }, "engines": { @@ -1822,9 +1823,9 @@ } }, "node_modules/@babel/types": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", - "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", + "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", "dev": true, "license": "MIT", "dependencies": { @@ -1893,9 +1894,9 @@ } }, "node_modules/@csstools/css-tokenizer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz", - "integrity": "sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.1.tgz", + "integrity": "sha512-bPlN9S9O1A0euCpEWE4qnvB5YDuyYVsUTrxSgmAM1Is0j4tICHoVyOVAXfWMP/kS9ZrjvyIXWV2PmomiAXXqOw==", "dev": true, "funding": [ { @@ -1937,54 +1938,34 @@ } }, "node_modules/@digitalbazaar/http-client": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@digitalbazaar/http-client/-/http-client-4.3.0.tgz", - "integrity": "sha512-6lMpxpt9BOmqHKGs9Xm6DP4LlZTBFer/ZjHvP3FcW3IaUWYIWC7dw5RFZnvw4fP57kAVcm1dp3IF+Y50qhBvAw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@digitalbazaar/http-client/-/http-client-4.4.0.tgz", + "integrity": "sha512-ODhCGmElUPmR3IR+KZmBNkRAFyjJ01rxvk2E+/qQ2h2EGPJH5k6bz3N24ympGc5+i4YCGk/ipIpmkwc0+iSmRg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "ky": "^1.14.2", - "undici": "^6.23.0" + "ky": "^1.14.3", + "undici": "^6.28.0" }, "engines": { "node": ">=18.0" } }, - "node_modules/@emnapi/core": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz", - "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.2.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz", - "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==", - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", - "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", - "license": "MIT", - "optional": true, + "node_modules/@dokieli/web-access-control": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@dokieli/web-access-control/-/web-access-control-1.0.0.tgz", + "integrity": "sha512-KEmpqbEtGTxk2+YUK69GHWwgO5c34foOF6AClTfvqk3O9r5RaEAYa+L0sRaOLfWs1eCXt/quqqFpFzEwC7IP6Q==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.4.0" + "@rdfjs/data-model": "^2.1.1", + "@rdfjs/types": "^2.0.1", + "n3": "^2.2.0" } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", - "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", + "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==", "dev": true, "license": "MIT", "dependencies": { @@ -2046,9 +2027,9 @@ "license": "MIT" }, "node_modules/@eslint/config-array/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "dev": true, "license": "MIT", "dependencies": { @@ -2096,9 +2077,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", - "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.7.tgz", + "integrity": "sha512-F42g89Qd5oAWtp0k0nnSrjziAKza7w8SVT4mStc18LZMaRb4J1HQAHLCalEtDCxrTuksx7NU9qsmeLwpOfPqWw==", "dev": true, "license": "MIT", "dependencies": { @@ -2108,7 +2089,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.1", + "js-yaml": "^4.3.2", "minimatch": "^3.1.5", "strip-json-comments": "^3.1.1" }, @@ -2127,9 +2108,9 @@ "license": "MIT" }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "dev": true, "license": "MIT", "dependencies": { @@ -2151,9 +2132,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.39.4", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz", - "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==", + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.5.tgz", + "integrity": "sha512-QywQuszQh77pIXCsq998c8hbhSTI/azTty1Z6N53dmAudKHhy573j3yvRLsX2BSp8YpLtoCEG8E9DJe+8zUh4A==", "dev": true, "license": "MIT", "engines": { @@ -2271,17 +2252,31 @@ "license": "MIT" }, "node_modules/@iconify/utils": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.3.tgz", - "integrity": "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.7.tgz", + "integrity": "sha512-JZHlwdID+dy+lTgbYC8NEC4zeugqeYsc6jewvzb4c58kHauJn+X7rNwQjxz5p2qSjqaEeQoLkCIQ9v/H4PK0/w==", "dev": true, "license": "MIT", "dependencies": { - "@antfu/install-pkg": "^1.1.0", + "@antfu/install-pkg": "^2.0.1", "@iconify/types": "^2.0.0", "import-meta-resolve": "^4.2.0" } }, + "node_modules/@iconify/utils/node_modules/@antfu/install-pkg": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-2.1.0.tgz", + "integrity": "sha512-sdg9NxU3zR4Mnawfbc/x6GB5Wf17WYud5qOuEuxXjaKpYpMkISSJEjItGebXJ2bQ4DIcly4NYH23mtkGJjvKUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "package-manager-detector": "^1.8.0", + "tinyexec": "^1.3.1" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", @@ -2327,9 +2322,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", + "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", "devOptional": true, "license": "MIT" }, @@ -2363,47 +2358,53 @@ "@lit-labs/ssr-dom-shim": "^1.5.0" } }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", - "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", + "node_modules/@oxc-project/types": { + "version": "0.151.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.151.0.tgz", + "integrity": "sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==", "license": "MIT", - "optional": true, - "dependencies": { - "@tybys/wasm-util": "^0.10.3" - }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - }, - "peerDependencies": { - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1" + "url": "https://github.com/sponsors/oxc-project" } }, - "node_modules/@oxc-project/types": { - "version": "0.138.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.138.0.tgz", - "integrity": "sha512-1a7ZKmrRTCoN1XMZ4L0PyyqrMnrNlLyPuOkdSX2MZg7IiIGRUyurNhAm73ptDOraoBcIordsIGKNPKUzy3ZmfA==", + "node_modules/@rdfjs/data-model": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-2.1.2.tgz", + "integrity": "sha512-yoSVlyCltqbaCTse3uSdf5Vo3q4UskcTm+3klaUQTwOq7Z5aCZLtLPZatXTPzr+S0WEcjTZvD++A+r3QmgamsA==", "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/Boshen" + "bin": { + "rdfjs-data-model-test": "bin/test.js" } }, "node_modules/@rdfjs/types": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@rdfjs/types/-/types-2.0.1.tgz", "integrity": "sha512-uyAzpugX7KekAXAHq26m3JlUIZJOC0uSBhpnefGV5i15bevDyyejoB7I+9MKeUrzXD8OOUI3+4FeV1wwQr5ihA==", - "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" } }, + "node_modules/@rolldown/binding-android-arm-eabi": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.10.tgz", + "integrity": "sha512-bp9svZb+QurZeh+8H4BhrZkifEB0YBNvTVzNSJnJQkj4NrRwmQoDUCGP0vSN7PbvLeM7l1tK6GXL8mrTiH2myg==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.4.tgz", - "integrity": "sha512-EZLpf/8y7GXkkra90ML47kzik/GMP3EMcE9bPyHmRfxLC6z9+aW5A8poCsoxjrT5GfEcNAAvWwUHjvP1pUQkfw==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.10.tgz", + "integrity": "sha512-wm6Dld3RXUAZ/gRWKyUy+4W1B5CB5UeFaOzsSWJWEdxZXHH8rCYiZ5dGe6oJmhsunAPWzL7FZV+VtvmN5Ye2eA==", "cpu": [ "arm64" ], @@ -2417,9 +2418,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.4.tgz", - "integrity": "sha512-aUi+HBvmYb7j8krl1+qJgkG8C17fO79gk3c+jPw4S8glRFc1DTija9S3EyaTSQUm5GJXYKDAsugBEhFHH2vYiQ==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.10.tgz", + "integrity": "sha512-UbEfXq/AqGNgRTV3ik+X/iR6mUxu2QdYAadwRxJWquUGnW6gDqdP1FtLtFXRow7RJx0ssRwi80XAPr4r+4DtsA==", "cpu": [ "arm64" ], @@ -2433,9 +2434,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.4.tgz", - "integrity": "sha512-F7hHC3gwY11+vByKPRWqwGbeXWVgKmL+pTGCinaEhdihzBV2aQ0fvZOch9cXYUOKuKKq429HeYXOqQLc7wFCEg==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.10.tgz", + "integrity": "sha512-7f5h17q5KZVx/ji1vb8OTq31ch1O2I7K8NPIr44GkyWTApXMIsmhWqZfgpOH10xeauqghDAvGlZktasCkcF6Eg==", "cpu": [ "x64" ], @@ -2449,9 +2450,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.4.tgz", - "integrity": "sha512-sI5yw+7s92SK6odiEhD5lKCBlWcpjHS5qyqpVQbZAJ0fIzEUXrmbl3DH2ybR3PZogulNJF+COLtmA8hUfvkCCQ==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.10.tgz", + "integrity": "sha512-ynOk/eEYhC6ZB2xCGvKrEOwE58oBy9LnrAqtkrDF9Fz1VTaNdGZTsV0VarJdhPwb+sOJTGjCLwcuyRJZ1dnMcQ==", "cpu": [ "x64" ], @@ -2465,9 +2466,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.4.tgz", - "integrity": "sha512-mCi0OKgEieFircrtVYmQAFGszRtMnZ6fpZAXrxanXAu7lqZcsK1E1RAaZNG0uKAnxox3B1f4EyQNnoyMfN1vAA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.10.tgz", + "integrity": "sha512-ERrAs185meZZhGan7a4l3RiiJK1ArSDlHdST++uvSxe+FDbR4TwUPahT/cbZJvaG6fIpDpF78surN+tX708Y4Q==", "cpu": [ "arm" ], @@ -2481,12 +2482,15 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.4.tgz", - "integrity": "sha512-B9Ial3Kv5sh0SHnB1g/QWcUQCEvCF6QKGAl4zXypYj65mVI+B4AhFBwPtSN7pDrJeIx8Z7zdy4ntx+wQABom7w==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.10.tgz", + "integrity": "sha512-KN7OHKD0J3jy1UzBwZWPxpwhODf9IARUIJcrH+yLYKOcmegZ8luEUM38lDP1bDVj40yP6PsSzCqOJF76vljFnQ==", "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2497,12 +2501,15 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.4.tgz", - "integrity": "sha512-lZVym0PuHE1KZ22gmFTC15lAkrg9iTszR617oYRB/iPY1A56ywoJzVKOJBKaot5RiikCObmur6pogpse3gRcng==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.10.tgz", + "integrity": "sha512-8l9wP8O+wa8zD6iw6egSfzVtu7oZVfH3hlUsMM4MwbLMhxleqeoXbZzjddyK3YyNlwLhqznq3tF7PkNJ8T/V2w==", "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2513,12 +2520,15 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.4.tgz", - "integrity": "sha512-t2DNiLJWNTbnEHyUzTumldML6ET4/g16467LZoDDJ3tSxGvguL5/NyC2lCsNKuyRycg9XeDQF5SSv+TNOhQEXg==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.10.tgz", + "integrity": "sha512-SeXNKeQzA5kLhz/J0CH6ZP0/HJ3v1xm/0YbiYpE0kK7emfRC2OIGGIaE14xzkISEGv2aYuUSpiLiU5Gbq+OI0A==", "cpu": [ "ppc64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2529,12 +2539,15 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.4.tgz", - "integrity": "sha512-0WIRnL1Uw4BvTZRLQt+PVgo6ZKTJadlC2btP+/EOXv2f/DWbY0rEgl+y834mIVwP1FkTlWVTrGGJXf12lru7EQ==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.10.tgz", + "integrity": "sha512-mtht0nR+y8/hart4175Ll15w7lY8dg7CtQ+j2FDNTsDRspOWTK/2V3l0aj9sIj7XmvqxT8Yli/wq22e7feTTWg==", "cpu": [ "s390x" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2545,12 +2558,15 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.4.tgz", - "integrity": "sha512-JWtGshGfX+oENAKonoNkqEJX+7hC8yfhi9GUyPX1VX4mdh1y5r+ZiJLR5XzAB0aoP6s/PcILsGjKq8O0mm24bw==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.10.tgz", + "integrity": "sha512-FSM94nGd55NYo48usCyM/nHfUKRnqc9+b0vJNuKV0oCCpIp/OGims7rO1Nv/DkFkt0S/s2rxsJ2kkS8J3HcpeA==", "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2561,12 +2577,15 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.4.tgz", - "integrity": "sha512-rT6yQcxUuXs4CnbofqwHRRV0iem349rLMYpTjkgQGLjrY4ado/eDzwPZPTCgTOlF6Nkp8NEv70yLMTn6qkWxsQ==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.10.tgz", + "integrity": "sha512-C3YxNB16myRLs7o+B+6PnQ6jBsdIS4+AE4Ah8glVGhDpEv9AOvxhZ/1duAb4B0UGczEK/lBbccksd8VI+p6zfw==", "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2577,9 +2596,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.4.tgz", - "integrity": "sha512-KXMGoboq5cyaCQjDA4GLuRiOwBQ0EyFnJoVViLeZ45/3rFItRODEr+NdsBcVpll40hhNArlm/speWGRvj08LzA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.10.tgz", + "integrity": "sha512-571TlE/F1eeTjjdjYAMMMPs1Mfv3MtX6s3+ZKVU6HiUjZ5Njc6c/qzNy/8K3zALTZnaw3JQVYrHxvNfjm43KAg==", "cpu": [ "arm64" ], @@ -2592,28 +2611,10 @@ "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@rolldown/binding-wasm32-wasi": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.4.tgz", - "integrity": "sha512-5K83rb36oJiY7BCyE9zLZtGcPV4g5wvq+xwdO0XPIwDVZI8cyB/AUjkNXGb92/rnmezEkjMOpgY61rtwjQtFwg==", - "cpu": [ - "wasm32" - ], - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "1.11.1", - "@emnapi/runtime": "1.11.1", - "@napi-rs/wasm-runtime": "^1.1.6" - }, - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.4.tgz", - "integrity": "sha512-PnWBtw3TV5KOg69HQQDR0mnQuyCmSGR2pAB4DC1rPF808fgKeTUMj2EOEyKATpgiuxuR5APQmiDO7PDgEjTFSA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.10.tgz", + "integrity": "sha512-QXW+ZWaiqs2c7Fi++D/SsW07LTPcUrncxcskJGfGNBoaLik1IU6fJymz4HsqwEO0u5Iq11yTO0B/mc4cPk7jrQ==", "cpu": [ "arm64" ], @@ -2627,9 +2628,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.4.tgz", - "integrity": "sha512-M1lpniBePobTfsa7Ks9a199e1akxsXn+GYBUKsEzv3YFzOm1HJAMNwKI3qr0Zq+mxwx9gOZoTdP1yXRYsZUocQ==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.10.tgz", + "integrity": "sha512-5FQFGgah17YeMtG1Yd5a+rMxQpTksyNXxRtKz06FVTaQw3RKYUJQbUoKk0/5jrXBpDo+7makNP7UHA2LQyH64A==", "cpu": [ "x64" ], @@ -2643,13 +2644,13 @@ } }, "node_modules/@rolldown/plugin-babel": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@rolldown/plugin-babel/-/plugin-babel-0.2.3.tgz", - "integrity": "sha512-+zEk16yGlz1F9STiRr6uG9hmIXb6nprjLczV/htGptYuLoCuxb+itZ03RKCEeOhBpDDd1NU7qF6x1VLMUp62bw==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@rolldown/plugin-babel/-/plugin-babel-0.2.4.tgz", + "integrity": "sha512-ygmm2j/mN+aCvstHo0x3IOu4uc6LqXT9SJ3q4kpfG/+Yhfz0B+E47FITcC0FljZADwUFARP6E2kiE+Lc26D8wg==", "dev": true, "license": "MIT", "dependencies": { - "picomatch": "^4.0.4" + "picomatch": "^4.0.7" }, "engines": { "node": ">=22.12.0 || ^24.0.0" @@ -2733,16 +2734,6 @@ "node": ">= 10" } }, - "node_modules/@tybys/wasm-util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", - "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@types/chai": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", @@ -2783,13 +2774,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "26.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.0.tgz", - "integrity": "sha512-O0A1G3xPGy4w7AgQdAQYUlQ+BKk2Oovw8eRpofyp5KdBZULnbe+WqaOVNrm705SHphCiG4XHsACrSmPu1f+Kgw==", - "devOptional": true, + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.2.tgz", + "integrity": "sha512-X1P21scMv4zGKLYqjdGjaKa7COa0RKVYYZZN/NfvLQ1JegxFhdhpZG/Lyn8AXx6CDUavKAd11v6BvfpkDByK8g==", "license": "MIT", "dependencies": { - "undici-types": "~8.3.0" + "undici-types": "~8.9.0" } }, "node_modules/@types/trusted-types": { @@ -2801,16 +2791,16 @@ "peer": true }, "node_modules/@typescript-eslint/parser": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.1.tgz", - "integrity": "sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.70.1.tgz", + "integrity": "sha512-nO974WLllwhSFWQXnMLj6nDGa8f0khKEz1JzpPJ1u7Vm/4X1X6ZHajpoknU4bb41vJyMB0HHVyS2GqdhWfIXZw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.62.1", - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/typescript-estree": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1", + "@typescript-eslint/scope-manager": "8.70.1", + "@typescript-eslint/types": "8.70.1", + "@typescript-eslint/typescript-estree": "8.70.1", + "@typescript-eslint/visitor-keys": "8.70.1", "debug": "^4.4.3" }, "engines": { @@ -2826,14 +2816,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.1.tgz", - "integrity": "sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.70.1.tgz", + "integrity": "sha512-62xOgboPfwc3/IgPSX/W6oQR3ZbF04194FPGUGH8HL8iLFHbt/456/8Ph1wLNUgVF+s94FlHoipBsz+v7+LMnA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.62.1", - "@typescript-eslint/types": "^8.62.1", + "@typescript-eslint/tsconfig-utils": "^8.70.1", + "@typescript-eslint/types": "^8.70.1", "debug": "^4.4.3" }, "engines": { @@ -2848,14 +2838,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.1.tgz", - "integrity": "sha512-r4d249KbQ1SFdpeStvob8Ih6aPPIzfqllPVOtvhve6ZcpuVcYo5/7zUWckKpHE7StASX4kTKZTLf0WQm/wPkcg==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.70.1.tgz", + "integrity": "sha512-Pa0EeSeAusQc1WbjQMac+YfenewYTBu0KjgYvkUKwhXaHUKbFog23Dm/rp0DX/6tyYOQ3Xl1a+3EcFNZynGHCw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1" + "@typescript-eslint/types": "8.70.1", + "@typescript-eslint/visitor-keys": "8.70.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2866,9 +2856,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.1.tgz", - "integrity": "sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.70.1.tgz", + "integrity": "sha512-jumze1fPI+sDOaM2TWGQdn39PDxTr7TZGeuyLkAbNyx2vtMT3uRnVKChN0hfht5V2TugphJzF6bYXvBcE09qqg==", "dev": true, "license": "MIT", "engines": { @@ -2883,9 +2873,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.1.tgz", - "integrity": "sha512-ooCzJFaf+Hg+uG6fA3NRFGuFjlfNlDhBthbv4ZPU/0elCAFUfnyXUvf/WOpHz/jYwSmvU2GkR2LtyUfy1AxZ1Q==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.70.1.tgz", + "integrity": "sha512-Dm1ypdhhrGCTyyehxElhgJ6kgk8MVCv5qXdoOVqPr1uqk42jX8KjrZqhROvdShczA8qrDoYiOWn1ykWlx2k81Q==", "dev": true, "license": "MIT", "engines": { @@ -2897,16 +2887,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.1.tgz", - "integrity": "sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.70.1.tgz", + "integrity": "sha512-TU8PwyGN0PQJUcE96mw8eCQ44SmxGdQlJmlWakHaHQ15eIuuvye5yNtmh/i6oS88jzXVQB71xdNkbkB/fMwL0g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.62.1", - "@typescript-eslint/tsconfig-utils": "8.62.1", - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1", + "@typescript-eslint/project-service": "8.70.1", + "@typescript-eslint/tsconfig-utils": "8.70.1", + "@typescript-eslint/types": "8.70.1", + "@typescript-eslint/visitor-keys": "8.70.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -2925,13 +2915,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.1.tgz", - "integrity": "sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==", + "version": "8.70.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.70.1.tgz", + "integrity": "sha512-Vwj9lUIW5Xq3wQ9w6gv3R86g1hMK8f2zNOdGTAgeXUMMXFK78G9ruCjjqutHMNJc0+CH7LYRnHeUB9IT8wFmcw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/types": "8.70.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -2952,14 +2942,14 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.9.tgz", - "integrity": "sha512-G9/lgqibheLVBDRuya45EbsEXTYcWoSG+TLg7i2axuzx0Eq62eXn+aWXyaVdV5vKvFSWd6ywcX8hA7la9Pvu8g==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.11.tgz", + "integrity": "sha512-8MVGEFnJIcdGjcbfKmeq8z0pZHH0JlVtoVZH9Q/qwUp6wyFnEJUBMrw9DCaj+ra3vShGmhavjalMIhPNxZAUcw==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.1.9", + "@vitest/utils": "4.1.11", "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", @@ -2973,8 +2963,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.1.9", - "vitest": "4.1.9" + "@vitest/browser": "4.1.11", + "vitest": "4.1.11" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2983,16 +2973,16 @@ } }, "node_modules/@vitest/expect": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.9.tgz", - "integrity": "sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.11.tgz", + "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==", "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.1.9", - "@vitest/utils": "4.1.9", + "@vitest/spy": "4.1.11", + "@vitest/utils": "4.1.11", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" }, @@ -3001,13 +2991,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.9.tgz", - "integrity": "sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.11.tgz", + "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.1.9", + "@vitest/spy": "4.1.11", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -3028,9 +3018,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.9.tgz", - "integrity": "sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.11.tgz", + "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==", "dev": true, "license": "MIT", "dependencies": { @@ -3041,13 +3031,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.9.tgz", - "integrity": "sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.11.tgz", + "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.1.9", + "@vitest/utils": "4.1.11", "pathe": "^2.0.3" }, "funding": { @@ -3055,14 +3045,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.9.tgz", - "integrity": "sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.11.tgz", + "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.9", - "@vitest/utils": "4.1.9", + "@vitest/pretty-format": "4.1.11", + "@vitest/utils": "4.1.11", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -3071,9 +3061,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.9.tgz", - "integrity": "sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.11.tgz", + "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==", "dev": true, "license": "MIT", "funding": { @@ -3081,13 +3071,13 @@ } }, "node_modules/@vitest/utils": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.9.tgz", - "integrity": "sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.11.tgz", + "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.9", + "@vitest/pretty-format": "4.1.11", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" }, @@ -3301,9 +3291,9 @@ } }, "node_modules/@xmldom/xmldom": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.10.tgz", - "integrity": "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==", + "version": "0.9.12", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.12.tgz", + "integrity": "sha512-5AXjrcMClTryPe9LgZrygpB1lj7s0S9E0+W+AHaVKAVyHanafK86iPSvG5xHVSp/jC+VH1UXu0TAEmY279xH7A==", "dev": true, "license": "MIT", "engines": { @@ -3338,7 +3328,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dev": true, "license": "MIT", "dependencies": { "event-target-shim": "^5.0.0" @@ -3347,20 +3336,10 @@ "node": ">=6.5" } }, - "node_modules/abs": { - "version": "1.3.15", - "resolved": "https://registry.npmjs.org/abs/-/abs-1.3.15.tgz", - "integrity": "sha512-bpFChpVyZ2F2ppgx7qjZ5TTEO6VVwBauUZDZibpclRGhfcXTHyj11nlqwrg5dN1knxCchssROehm76uCcCayRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ul": "^5.0.0" - } - }, "node_modules/acorn": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", - "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", + "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", "devOptional": true, "license": "MIT", "bin": { @@ -3381,20 +3360,6 @@ "acorn-walk": "^8.0.2" } }, - "node_modules/acorn-import-phases": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz", - "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=10.13.0" - }, - "peerDependencies": { - "acorn": "^8.14.0" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -3449,9 +3414,9 @@ } }, "node_modules/ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", "dev": true, "license": "MIT", "peer": true, @@ -3534,18 +3499,18 @@ } }, "node_modules/array-includes": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz", - "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.2.0.tgz", + "integrity": "sha512-VXY5eFRarnXcYxwBjJzPmEhH55+rmP79/+ueDhi0F+TuqfHCItagIHqxeUZrmgrOPa31QTh9H85DjX3FfJ0FTg==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.8", + "call-bind": "^1.0.9", "call-bound": "^1.0.4", "define-properties": "^1.2.1", - "es-abstract": "^1.24.0", - "es-object-atoms": "^1.1.1", - "get-intrinsic": "^1.3.0", + "es-abstract": "^1.24.2", + "es-object-atoms": "^1.1.2", + "es-shim-unscopables": "^1.1.0", "is-string": "^1.1.1", "math-intrinsics": "^1.1.0" }, @@ -3649,9 +3614,9 @@ } }, "node_modules/ast-v8-to-istanbul": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.4.tgz", - "integrity": "sha512-0bC0/4bTSrnwdhU3IsZDwEdojvuPrSg59OYZfKsLRtJZ0u8VBx9DebfqqG8bRdCC0I7vjgxmPi41P0lpkhJHtA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.7.tgz", + "integrity": "sha512-kFL68AG6ajd8fg248zwM9GQrUWEp79gsmjum34OEXjs4yHuUMZfYKwOLW9GMmB4oNvVrj+EAGxsP7ye2UR9UlA==", "dev": true, "license": "MIT", "dependencies": { @@ -3759,7 +3724,6 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -3777,9 +3741,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.42", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.42.tgz", - "integrity": "sha512-c/jurFrDLyui7o1J86yLkRu4LMsTYcBohveus7/I2Hzdn9KIP2bdJPTue/lR1KH46enoPbD77GKeSYNdyPoD3Q==", + "version": "2.11.25", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.25.tgz", + "integrity": "sha512-gMmEShwwq7FJqMwvfRwvCl00v4kN+KOfJqXn+f4nrufak5gNHJOksd/60Dvjuz7sI8Y5WiSFBa8FEYr+zoyqCw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -3790,22 +3754,22 @@ } }, "node_modules/brace-expansion": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", - "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" } }, "node_modules/browserslist": { - "version": "4.28.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.4.tgz", - "integrity": "sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==", + "version": "4.29.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.0.tgz", + "integrity": "sha512-3GSvyjvDI4Dur1Meg2BekJquu5uF+9R9a1+5M1Mde192eZoXbeXjzgOsgqPS2V8D5wrrip0gR5Hf/GhWQ9ZzaA==", "dev": true, "funding": [ { @@ -3823,11 +3787,11 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.10.38", - "caniuse-lite": "^1.0.30001799", - "electron-to-chromium": "^1.5.376", - "node-releases": "^2.0.48", - "update-browserslist-db": "^1.2.3" + "baseline-browser-mapping": "^2.11.23", + "caniuse-lite": "^1.0.30001810", + "electron-to-chromium": "^1.5.427", + "node-releases": "^2.0.55", + "update-browserslist-db": "^1.3.3" }, "bin": { "browserslist": "cli.js" @@ -3840,7 +3804,6 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, "funding": [ { "type": "github", @@ -3930,9 +3893,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001800", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001800.tgz", - "integrity": "sha512-MMHtuAz9Ys840zAY5F4k6fV5GaivZ9sPk+nz0mY+GYVzRBnYkN0mpqkSR92oWRQ19yQWo4HvBV/FnC16AJX8MA==", + "version": "1.0.30001812", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001812.tgz", + "integrity": "sha512-qN+QNNBr93TCmFrmte0bBCjSDMuRvt78VlHT99qIGPszm4QsqCX8lnyWUFkHi8B7ZBAPq8SH+UqyXNy/odMdng==", "dev": true, "funding": [ { @@ -3960,19 +3923,6 @@ "canonicalize": "bin/canonicalize.js" } }, - "node_modules/capture-stack-trace": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz", - "integrity": "sha512-X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/chai": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", @@ -4067,9 +4017,9 @@ "license": "MIT" }, "node_modules/confbox": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.4.tgz", - "integrity": "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.3.1.tgz", + "integrity": "sha512-cKUSoKa8YxFZZSmraVi7onONx3amu77ngK3kGpsYHDH7drPwCRkQE1RYMPlLRrMtnciRj274XNRxcHxnKmDSnA==", "dev": true, "license": "MIT" }, @@ -4081,39 +4031,22 @@ "license": "MIT" }, "node_modules/core-js-compat": { - "version": "3.49.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.49.0.tgz", - "integrity": "sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA==", + "version": "3.50.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.50.0.tgz", + "integrity": "sha512-XGpFGbMLHwSt74YLTKho7Ib242qi6O8MSX+sRokV4oz7iKXvQWGYZthjIhjRGMxjzVkAubBO512dKGYcefmX3Q==", "dev": true, "license": "MIT", "dependencies": { - "browserslist": "^4.28.1" + "browserslist": "^4.28.7" + }, + "engines": { + "node": ">=6.4.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" } }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "capture-stack-trace": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/cross-fetch": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz", @@ -4246,16 +4179,6 @@ "dev": true, "license": "MIT" }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -4263,16 +4186,6 @@ "dev": true, "license": "MIT" }, - "node_modules/deffy": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/deffy/-/deffy-2.2.5.tgz", - "integrity": "sha512-6TX2cfIo97eKqWmqgMDAUulCwnveAe3K+4VGsTGPJsL3NtSEnSBFZ3sUXdS4EBhZ8GbdaZBzXQ04ton18dJrug==", - "dev": true, - "license": "MIT", - "dependencies": { - "typpy": "^2.0.0" - } - }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", @@ -4370,67 +4283,17 @@ "node": ">= 0.4" } }, - "node_modules/duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "readable-stream": "^2.0.2" - } - }, - "node_modules/duplexer2/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/duplexer2/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/duplexer2/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/duplexer2/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/electron-to-chromium": { - "version": "1.5.387", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.387.tgz", - "integrity": "sha512-TaxwufTFDufvPEoXdhwVrA3UdFWBeWGkYoJ1K8ldF1xe6gKfth6iRNS5lTQ5JPNOHdGQm8PT1QYKUqFLCiUefQ==", + "version": "1.5.438", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.438.tgz", + "integrity": "sha512-AN9xMU1hJiT65LkCUPL1DZm5TCbOPb2Qsm5pYwFLEXp6/qj9SdT4yMiqs7Qqstwvkn1zF7l36SRGt+s6XcJ0FA==", "dev": true, "license": "ISC" }, "node_modules/enhanced-resolve": { - "version": "5.24.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.1.tgz", - "integrity": "sha512-7DdUaTjmNwMcH2gLr1qycesKII3BK4RLy/mdAb7x10Lq7bR4aNKHt1BR1ZALSv0rPM/hF5wYF0PhGop/rJm8vw==", + "version": "5.25.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.25.1.tgz", + "integrity": "sha512-nGXts5znJzmWPu+mIE9izCOzdg63oJca2mDzGWWTth7sr4aCToKcoyFVBQwN75Ij5Pf6p510EwkTqViTRzDV+w==", "dev": true, "license": "MIT", "peer": true, @@ -4455,26 +4318,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/err": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/err/-/err-1.1.1.tgz", - "integrity": "sha512-N97Ybd2jJHVQ+Ft3Q5+C2gM3kgygkdeQmEqbN2z15UTVyyEsIwLA1VK39O1DHEJhXbwIFcJLqm6iARNhFANcQA==", - "dev": true, - "license": "MIT", - "dependencies": { - "typpy": "^2.2.0" - } - }, - "node_modules/error-ex": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", - "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, "node_modules/es-abstract": { "version": "1.24.2", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.2.tgz", @@ -4584,9 +4427,9 @@ } }, "node_modules/es-module-lexer": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.0.tgz", - "integrity": "sha512-KLdwQm2NvGLDkQDCGvmiQrhkd0JbMzXthwQAUgWjQuQdBLFa3eiBP5arXZyA+f8x+x7OXgud6bq2rxjGtHV2tw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz", + "integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==", "dev": true, "license": "MIT" }, @@ -4699,9 +4542,10 @@ } }, "node_modules/eslint": { - "version": "9.39.4", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz", - "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.5.tgz", + "integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", "dependencies": { @@ -4710,8 +4554,8 @@ "@eslint/config-array": "^0.21.2", "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", - "@eslint/eslintrc": "^3.3.5", - "@eslint/js": "9.39.4", + "@eslint/eslintrc": "^3.3.6", + "@eslint/js": "9.39.5", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -4866,9 +4710,9 @@ "license": "MIT" }, "node_modules/eslint-plugin-import/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "dev": true, "license": "MIT", "dependencies": { @@ -4947,9 +4791,9 @@ "license": "MIT" }, "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "dev": true, "license": "MIT", "dependencies": { @@ -5088,7 +4932,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -5098,23 +4941,11 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.x" } }, - "node_modules/exec-limiter": { - "version": "3.2.14", - "resolved": "https://registry.npmjs.org/exec-limiter/-/exec-limiter-3.2.14.tgz", - "integrity": "sha512-ZQjJmAnXD+1kQ6ejMZAS5Vxdt7LLMz0Eq7mEu6+7NhlauykuyLihhUkpp4S784QKsmJQIpuuERhQ8Tav8bF3zQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "limit-it": "^3.0.0", - "typpy": "^2.1.0" - } - }, "node_modules/expect-type": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz", @@ -5126,9 +4957,9 @@ } }, "node_modules/exsolve": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.0.tgz", - "integrity": "sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.1.tgz", + "integrity": "sha512-9U/jZUgjnSGyntRr6y5Muu1MJcwFl6kPu7k8qLF0IMNfLqvw0NZ4nnVDq0RVoZ0RvCyumib4Ez3KYrVfilrw+g==", "dev": true, "license": "MIT" }, @@ -5154,9 +4985,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz", - "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", + "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", "dev": true, "funding": [ { @@ -5233,9 +5064,9 @@ } }, "node_modules/flatted": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", - "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz", + "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==", "dev": true, "license": "ISC" }, @@ -5296,16 +5127,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/function.name": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/function.name/-/function.name-1.0.14.tgz", - "integrity": "sha512-s99L814NRuLxwF2sJMIcLhkQhueGXb3oKyvorzrUKKwlVB0SBbWrgZt4+EwKAo3ujCXnT7vshmCvXgZA09kCMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "noop6": "^1.0.1" - } - }, "node_modules/function.prototype.name": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz", @@ -5417,55 +5238,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/git-package-json": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/git-package-json/-/git-package-json-1.4.11.tgz", - "integrity": "sha512-A/P5K2qqQ52+BwBf+qyrjtdauMlb7n1WVa++/VPDxTcgKZ2X5/Eh/EQwbxNvRKBsKAkMAeyV/UIdnb/saVFnnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "deffy": "^2.2.1", - "err": "^1.1.1", - "gry": "^5.0.0", - "normalize-package-data": "^2.3.5", - "oargv": "^3.4.1", - "one-by-one": "^3.1.0", - "r-json": "^1.2.1", - "r-package-json": "^1.0.0", - "tmp": "0.0.28" - } - }, - "node_modules/git-source": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/git-source/-/git-source-1.1.11.tgz", - "integrity": "sha512-oubUf/uply9xvR5olZxxPpip19wMEpESN3bFfPcFMvl/0fwrVrcAppwOJ7Dghcguze68WAIjs/A1YrdMDIW8XA==", - "dev": true, - "license": "MIT", - "dependencies": { - "git-url-parse": "^5.0.1" - } - }, - "node_modules/git-up": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/git-up/-/git-up-1.2.1.tgz", - "integrity": "sha512-SRVN3rOLACva8imc7BFrB6ts5iISWKH1/h/1Z+JZYoUI7UVQM7gQqk4M2yxUENbq2jUUT09NEND5xwP1i7Ktlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-ssh": "^1.0.0", - "parse-url": "^1.0.0" - } - }, - "node_modules/git-url-parse": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-5.0.1.tgz", - "integrity": "sha512-4uSiOgrryNEMBX+gTWogenYRUh2j1D+95STTSEF2RCTgLkfJikl8c7BGr0Bn274hwuxTsbS2/FQ5pVS9FoXegQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "git-up": "^1.0.0" - } - }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -5479,8 +5251,15 @@ "node": ">=10.13.0" } }, - "node_modules/globals": { - "version": "14.0.0", + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/globals": { + "version": "14.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, @@ -5522,74 +5301,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/got": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz", - "integrity": "sha512-MnypzkaW8dldA8AbJFjMs7y14+ykd2V8JCLKSvX1Gmzx1alH3Y+3LArywHDoAF2wS3pnZp4gacoYtvqBeF6drQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "create-error-class": "^3.0.1", - "duplexer2": "^0.1.4", - "is-plain-obj": "^1.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "node-status-codes": "^1.0.0", - "object-assign": "^4.0.1", - "parse-json": "^2.1.0", - "pinkie-promise": "^2.0.0", - "read-all-stream": "^3.0.0", - "readable-stream": "^2.0.5", - "timed-out": "^2.0.0", - "unzip-response": "^1.0.0", - "url-parse-lax": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/got/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/got/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/got/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/got/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -5598,19 +5309,6 @@ "license": "ISC", "peer": true }, - "node_modules/gry": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/gry/-/gry-5.0.8.tgz", - "integrity": "sha512-meq9ZjYVpLzZh3ojhTg7IMad9grGsx6rUUKHLqPnhLXzJkRQvEL2U3tQpS5/WentYTtHtxkT3Ew/mb10D6F6/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "abs": "^1.2.1", - "exec-limiter": "^3.0.0", - "one-by-one": "^3.0.0", - "ul": "^5.0.0" - } - }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -5705,13 +5403,6 @@ "node": ">= 0.4" } }, - "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true, - "license": "ISC" - }, "node_modules/html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", @@ -5778,7 +5469,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -5843,20 +5533,6 @@ "node": ">=0.8.19" } }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true, - "license": "ISC" - }, "node_modules/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", @@ -5890,13 +5566,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT" - }, "node_modules/is-async-function": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", @@ -5964,13 +5633,13 @@ } }, "node_modules/is-core-module": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", - "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.17.0.tgz", + "integrity": "sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==", "dev": true, "license": "MIT", "dependencies": { - "hasown": "^2.0.3" + "hasown": "^2.0.4" }, "engines": { "node": ">= 0.4" @@ -6132,16 +5801,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", @@ -6149,16 +5808,6 @@ "dev": true, "license": "MIT" }, - "node_modules/is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-regex": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", @@ -6178,16 +5827,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-retry-allowed": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", - "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", @@ -6217,26 +5856,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-ssh": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.1.tgz", - "integrity": "sha512-JNeu1wQsHjyHgn9NcWTaXq6zWSR6hqE0++zhfZlkFBbScNkyvxCdeV8sRkSBaeLKxmbpR21brail63ACNxJ0Tg==", - "dev": true, - "license": "MIT", - "dependencies": { - "protocols": "^2.0.1" - } - }, - "node_modules/is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-string": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", @@ -6387,13 +6006,6 @@ "node": ">=8" } }, - "node_modules/iterate-object": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.5.tgz", - "integrity": "sha512-eL23u8oFooYTq6TtJKjp2RYjZnCkUYQvC0T/6fJfWykXJ3quvdDdzKZ3CEjy8b3JGOvLTjDYMEMIp5243R906A==", - "dev": true, - "license": "MIT" - }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -6444,9 +6056,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", - "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz", + "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==", "dev": true, "funding": [ { @@ -6620,9 +6232,9 @@ } }, "node_modules/lightningcss": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", - "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz", + "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==", "license": "MPL-2.0", "dependencies": { "detect-libc": "^2.0.3" @@ -6635,23 +6247,23 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "lightningcss-android-arm64": "1.32.0", - "lightningcss-darwin-arm64": "1.32.0", - "lightningcss-darwin-x64": "1.32.0", - "lightningcss-freebsd-x64": "1.32.0", - "lightningcss-linux-arm-gnueabihf": "1.32.0", - "lightningcss-linux-arm64-gnu": "1.32.0", - "lightningcss-linux-arm64-musl": "1.32.0", - "lightningcss-linux-x64-gnu": "1.32.0", - "lightningcss-linux-x64-musl": "1.32.0", - "lightningcss-win32-arm64-msvc": "1.32.0", - "lightningcss-win32-x64-msvc": "1.32.0" + "lightningcss-android-arm64": "1.33.0", + "lightningcss-darwin-arm64": "1.33.0", + "lightningcss-darwin-x64": "1.33.0", + "lightningcss-freebsd-x64": "1.33.0", + "lightningcss-linux-arm-gnueabihf": "1.33.0", + "lightningcss-linux-arm64-gnu": "1.33.0", + "lightningcss-linux-arm64-musl": "1.33.0", + "lightningcss-linux-x64-gnu": "1.33.0", + "lightningcss-linux-x64-musl": "1.33.0", + "lightningcss-win32-arm64-msvc": "1.33.0", + "lightningcss-win32-x64-msvc": "1.33.0" } }, "node_modules/lightningcss-android-arm64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", - "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz", + "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==", "cpu": [ "arm64" ], @@ -6669,9 +6281,9 @@ } }, "node_modules/lightningcss-darwin-arm64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", - "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz", + "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==", "cpu": [ "arm64" ], @@ -6689,9 +6301,9 @@ } }, "node_modules/lightningcss-darwin-x64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", - "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz", + "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==", "cpu": [ "x64" ], @@ -6709,9 +6321,9 @@ } }, "node_modules/lightningcss-freebsd-x64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", - "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz", + "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==", "cpu": [ "x64" ], @@ -6729,9 +6341,9 @@ } }, "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", - "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz", + "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==", "cpu": [ "arm" ], @@ -6749,12 +6361,15 @@ } }, "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", - "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz", + "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==", "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -6769,12 +6384,15 @@ } }, "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", - "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz", + "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==", "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -6789,12 +6407,15 @@ } }, "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", - "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz", + "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==", "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -6809,12 +6430,15 @@ } }, "node_modules/lightningcss-linux-x64-musl": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", - "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz", + "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==", "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -6829,9 +6453,9 @@ } }, "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", - "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz", + "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==", "cpu": [ "arm64" ], @@ -6849,9 +6473,9 @@ } }, "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", - "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz", + "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==", "cpu": [ "x64" ], @@ -6868,16 +6492,6 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/limit-it": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/limit-it/-/limit-it-3.2.11.tgz", - "integrity": "sha512-VdLa1lZYZnzT98oLMeCDl6Lwd9cEYIMQlPg34qL6CYuA+yQKoG7K12tfgI5K6bRC51kRM8v1UX67IhpNsnvo3A==", - "dev": true, - "license": "MIT", - "dependencies": { - "typpy": "^2.0.0" - } - }, "node_modules/lit": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/lit/-/lit-3.3.3.tgz", @@ -6915,21 +6529,6 @@ "@types/trusted-types": "^2.0.2" } }, - "node_modules/loader-runner": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz", - "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=6.11.5" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/local-pkg": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.2.1.tgz", @@ -6978,16 +6577,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -7012,14 +6601,14 @@ } }, "node_modules/magicast": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.3.tgz", - "integrity": "sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.5.tgz", + "integrity": "sha512-UicdXN8zQ3JHlxVq+28afMXPr1z7WNY6+7EJnzTdQWkTAlMLF5fNCCKxJHBQwGaNGR11581EiQmQzx73+MvszA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.3", - "@babel/types": "^7.29.0", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7", "source-map-js": "^1.2.1" } }, @@ -7081,13 +6670,13 @@ } }, "node_modules/minimatch": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.5" + "brace-expansion": "^5.0.8" }, "engines": { "node": "18 || 20 || >=22" @@ -7107,17 +6696,17 @@ } }, "node_modules/minimizer-webpack-plugin": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz", - "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.11.0.tgz", + "integrity": "sha512-2JVy2DY+iBtfRyrQB5cRM7lfurnJIi6jFTgLip/7FxDu0WxswrIRzr4fBySQ0X7HqM7BcwE28zm+HfQ5V6y4Cg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", + "@jridgewell/trace-mapping": "^0.3.31", "jest-worker": "^27.4.5", - "schema-utils": "^4.3.0", - "terser": "^5.31.1" + "schema-utils": "^4.3.3", + "terser": "^5.51.0" }, "engines": { "node": ">= 10.13.0" @@ -7133,6 +6722,9 @@ "@minify-html/node": { "optional": true }, + "@napi-rs/image": { + "optional": true + }, "@swc/core": { "optional": true }, @@ -7157,12 +6749,21 @@ "html-minifier-terser": { "optional": true }, + "imagemin": { + "optional": true + }, "lightningcss": { "optional": true }, "postcss": { "optional": true }, + "sharp": { + "optional": true + }, + "svgo": { + "optional": true + }, "uglify-js": { "optional": true } @@ -7208,10 +6809,9 @@ "license": "MIT" }, "node_modules/n3": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/n3/-/n3-2.1.1.tgz", - "integrity": "sha512-kqg8ers6Lc+uAmHeS+ycd3b8mC4x8wr8V8Fi6+w7l4hX6b0KZ5bT05Tf49qM2mujwaqZT3+08zcgtXgfxivbVQ==", - "dev": true, + "version": "2.7.12", + "resolved": "https://registry.npmjs.org/n3/-/n3-2.7.12.tgz", + "integrity": "sha512-Hy6dfGg9yniLQpSBirvH2E2yO3EG7dSmA3aefRbtO411oqtzG8roD3h1kTc/N065bivCOPfTFIjf0KlwW7KlnQ==", "license": "MIT", "dependencies": { "buffer": "^6.0.3", @@ -7222,9 +6822,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.15", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz", - "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==", + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", + "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", "funding": [ { "type": "github", @@ -7246,14 +6846,6 @@ "dev": true, "license": "MIT" }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/node-exports-info": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.2.tgz", @@ -7330,115 +6922,22 @@ } }, "node_modules/node-releases": { - "version": "2.0.50", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.50.tgz", - "integrity": "sha512-J6l92tKHX6w8Jy5nO1Vuc01NoIiRGi/d6qBKVxh+IQ8Cr3b6HbVNfKiF8ZpFKufTwpwxMmce2W3iQZ861ZRyTg==", + "version": "2.0.57", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.57.tgz", + "integrity": "sha512-kQK9LGGFiHtrWiNhZtA7Qbw17AQz+dmsEKODRIVTXA9+e5MS/2gZEBhYJt13GrAz5/IOZKddH/0Z3TP/Zgo+yw==", "dev": true, "license": "MIT", "engines": { "node": ">=18" } }, - "node_modules/node-status-codes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", - "integrity": "sha512-1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/noop6": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/noop6/-/noop6-1.0.10.tgz", - "integrity": "sha512-WZvuCILZFZHK+WuqCQwxLBGllkBK1ct8s8Mu9FMDbEsBE6/bqNxyFGbX7Xky+6bYFL8X2Ou4Cis4CJyrwXLvQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/normalize-package-data/node_modules/resolve": { - "version": "1.22.12", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", - "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "is-core-module": "^2.16.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, "node_modules/nwsapi": { - "version": "2.2.24", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.24.tgz", - "integrity": "sha512-7YRhZ3jS45LwmSCT4b2sVFHt/WuovaktDU07QrtOBY2PXskss5a9jfmR9jptyumwXST+rFjrmppMY1KT/yn35A==", + "version": "2.2.28", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.28.tgz", + "integrity": "sha512-IlVB7OS7qrOsVYlpnFIkETjMwT9jwvmocJmmM+GZU/PAB3uGi9Ezd7vcWhWBUnSc0ya4ppmQITOyP1ez9gg8cg==", "dev": true, "license": "MIT" }, - "node_modules/oargv": { - "version": "3.4.11", - "resolved": "https://registry.npmjs.org/oargv/-/oargv-3.4.11.tgz", - "integrity": "sha512-FGTon9C71936EnOjx/NTsMxlLeWmw8zQQld4KDmgRxRtZ8fH1XpbLLRHmOioeZs/WoURz2OGR4KmDoTaL4ErJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "iterate-object": "^1.1.0", - "ul": "^5.0.0" - } - }, - "node_modules/obj-def": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/obj-def/-/obj-def-1.0.10.tgz", - "integrity": "sha512-RJpNUkO+1r/rXTBs82iU4scoC9Q1yp9HZbSk0ldpFe8362S6eTjUjSgTmECa1TtOBIe5pn4pwSzxIiWc8+jmWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "deffy": "^2.2.2" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -7553,9 +7052,9 @@ } }, "node_modules/obug": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz", - "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.2.1.tgz", + "integrity": "sha512-XrsrhT5sybtKI6wakr2SPOlGZWWYbUXZ7a0jT8/QOeAPau+1X/bSegNe5YR75oJmEZQbKningirmGOEJCIk61Q==", "dev": true, "funding": [ "https://github.com/sponsors/sxzz", @@ -7566,17 +7065,6 @@ "node": ">=12.20.0" } }, - "node_modules/one-by-one": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/one-by-one/-/one-by-one-3.2.9.tgz", - "integrity": "sha512-H10TAq02LKrkSRTQz1mgvcKb64rRajZ+B5HWHBvkGigYNCPqL0Q/tLIN3vfha/DqZxXeKNfyCmgfEYo2hgFQgA==", - "dev": true, - "license": "MIT", - "dependencies": { - "obj-def": "^1.0.0", - "sliced": "^1.0.1" - } - }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -7595,24 +7083,15 @@ "node": ">= 0.8.0" } }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/own-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", - "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.2.tgz", + "integrity": "sha512-19YVAg7T+WTrxggPukVq7DjTv6+PJ867TmhCvBsYwmbFCsZd344rq2Ld1p0wo8f8Qrrhgp82c6FJRqdXWtSEhg==", "dev": true, "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.6", + "call-bound": "^1.0.4", + "get-intrinsic": "^1.3.0", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" }, @@ -7655,68 +7134,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/package-json": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz", - "integrity": "sha512-PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg==", - "dev": true, - "license": "MIT", - "dependencies": { - "got": "^5.0.0", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/package-json-path": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/package-json-path/-/package-json-path-1.0.10.tgz", - "integrity": "sha512-DOlmVIfx+qDHHWaaxg573brZ8mH0Nxo4ecYA4SKkrpCOhCP64NXk7VxJtWVKZQ9urfU2Ivl74HeYUO42PLCpLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "abs": "^1.2.1" - } - }, - "node_modules/package-json/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/package-lock.json": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-lock.json/-/package-lock.json-1.0.0.tgz", - "integrity": "sha512-+yEXtNdlCs5N0Zy/9uvkifgf/RqnGu0WqP4j9Wu1Us4YReFe1YNBh2Krmf8B1xGxjpYnta63K55QP8bkafnOzA==", - "dev": true - }, "node_modules/package-manager-detector": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.7.0.tgz", - "integrity": "sha512-xg1eHpwYL/D/HEdWw2goFZP6vV0FH7W+PZ5rFkGjdIDLtxq7EkzBUeT3m+lndYCt8wKbmofUu1MUdMCXkCk9ZQ==", + "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==", "dev": true, "license": "MIT" }, - "node_modules/package.json": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/package.json/-/package.json-2.0.1.tgz", - "integrity": "sha512-pSxZ6XR5yEawRN2ekxx9IKgPN5uNAYco7MCPxtBEWMKO3UKWa1X2CtQMzMgloeGj2g2o6cue3Sb5iPkByIJqlw==", - "deprecated": "Use pkg.json instead.", - "dev": true, - "license": "MIT", - "dependencies": { - "git-package-json": "^1.4.0", - "git-source": "^1.1.0", - "package-json": "^2.3.1" - } - }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -7730,37 +7154,6 @@ "node": ">=6" } }, - "node_modules/parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "error-ex": "^1.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/parse-url": { - "version": "1.3.11", - "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-1.3.11.tgz", - "integrity": "sha512-1wj9nkgH/5EboDxLwaTMGJh3oH3f+Gue+aGdh631oCqoSBpokzmMmOldvOeBPtB8GJBYJbaF93KPzlkU+Y1ksg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-ssh": "^1.3.0", - "protocols": "^1.4.0" - } - }, - "node_modules/parse-url/node_modules/protocols": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz", - "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==", - "dev": true, - "license": "MIT" - }, "node_modules/parse5": { "version": "7.3.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", @@ -7822,9 +7215,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", - "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", "license": "MIT", "engines": { "node": ">=12" @@ -7833,38 +7226,15 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "pinkie": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/pkg-types": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.1.tgz", - "integrity": "sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.3.tgz", + "integrity": "sha512-j/lCFdcppV0JxWpCEITdbDltBxPP6cHT+yNJ6Go2OgoSA9518X847X9z0p6LtA4Nc16+eQzCZjRrWanTGvHJ5w==", "dev": true, "license": "MIT", "dependencies": { - "confbox": "^0.2.4", - "exsolve": "^1.0.8", + "confbox": "^0.3.1", + "exsolve": "^1.1.1", "pathe": "^2.0.3" } }, @@ -7879,9 +7249,9 @@ } }, "node_modules/postcss": { - "version": "8.5.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.16.tgz", - "integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==", + "version": "8.5.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", + "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", "funding": [ { "type": "opencollective", @@ -7898,7 +7268,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.12", + "nanoid": "^3.3.18", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -7945,40 +7315,15 @@ "node": ">= 0.8.0" } }, - "node_modules/prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/protocols": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.2.tgz", - "integrity": "sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==", - "dev": true, - "license": "MIT" - }, "node_modules/psl": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", @@ -8026,53 +7371,6 @@ "dev": true, "license": "MIT" }, - "node_modules/r-json": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/r-json/-/r-json-1.3.1.tgz", - "integrity": "sha512-5nhRFfjVMQdrwKUfUlRpDUCocdKtjSnYZ1R/86mpZDV3MfsZ3dYYNjSGuMX+mPBvFvQBhdzxSqxkuLPLv4uFGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "w-json": "1.3.10" - } - }, - "node_modules/r-package-json": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/r-package-json/-/r-package-json-1.0.10.tgz", - "integrity": "sha512-g+KLu+aq3tkhW6gzjsfdWAyd+ZkueLTzkX2zpB2GIW7M/lOXal3nB8U36XOrIBGogJsz2H//xWA4mj9uGlcigw==", - "dev": true, - "license": "MIT", - "dependencies": { - "package-json-path": "^1.0.0", - "r-json": "^1.2.1" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/rdf-canonize": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/rdf-canonize/-/rdf-canonize-5.0.0.tgz", @@ -8100,70 +7398,13 @@ "cross-fetch": "^4.1.0", "jsonld": "^9.0.0", "n3": "^2.0.3", - "package-lock.json": "^1.0.0", - "package.json": "^2.0.1", "solid-namespace": "^0.5.4" } }, - "node_modules/read-all-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", - "integrity": "sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "pinkie-promise": "^2.0.0", - "readable-stream": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/read-all-stream/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/read-all-stream/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/read-all-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/read-all-stream/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/readable-stream": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", - "dev": true, "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", @@ -8258,30 +7499,6 @@ "node": ">=4" } }, - "node_modules/registry-auth-token": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", - "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==", - "dev": true, - "license": "MIT", - "dependencies": { - "rc": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/regjsgen": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", @@ -8290,9 +7507,9 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.2.tgz", - "integrity": "sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ==", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.3.tgz", + "integrity": "sha512-ycwFAS14Jw4mppvmK4GR/J6u3WpWpjkEApehuHtLc/8VpPNpDMbQ4WjqwplXifGeyKOzHSFLmSPqzksDQE2Sfg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -8355,12 +7572,12 @@ } }, "node_modules/rolldown": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.4.tgz", - "integrity": "sha512-IjZYiLxZwpnhwhdBH2ugdTGVSdhCQUmLxLoqyjiL0JxYjyRst+5a0P3xfrTxJ5F638j4Mvvw5FAX5XE6eHpXbA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.10.tgz", + "integrity": "sha512-OxkA08pSryMK7B3XiFA09B4OJ1xJMPgIYCBMY2xchzpqgBGsV1o0DetPAE+Sl3N3L4oCPiEzmHVSOj7iR04Zog==", "license": "MIT", "dependencies": { - "@oxc-project/types": "=0.138.0", + "@oxc-project/types": "=0.151.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -8370,21 +7587,21 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm64": "1.1.4", - "@rolldown/binding-darwin-arm64": "1.1.4", - "@rolldown/binding-darwin-x64": "1.1.4", - "@rolldown/binding-freebsd-x64": "1.1.4", - "@rolldown/binding-linux-arm-gnueabihf": "1.1.4", - "@rolldown/binding-linux-arm64-gnu": "1.1.4", - "@rolldown/binding-linux-arm64-musl": "1.1.4", - "@rolldown/binding-linux-ppc64-gnu": "1.1.4", - "@rolldown/binding-linux-s390x-gnu": "1.1.4", - "@rolldown/binding-linux-x64-gnu": "1.1.4", - "@rolldown/binding-linux-x64-musl": "1.1.4", - "@rolldown/binding-openharmony-arm64": "1.1.4", - "@rolldown/binding-wasm32-wasi": "1.1.4", - "@rolldown/binding-win32-arm64-msvc": "1.1.4", - "@rolldown/binding-win32-x64-msvc": "1.1.4" + "@rolldown/binding-android-arm-eabi": "1.2.10", + "@rolldown/binding-android-arm64": "1.2.10", + "@rolldown/binding-darwin-arm64": "1.2.10", + "@rolldown/binding-darwin-x64": "1.2.10", + "@rolldown/binding-freebsd-x64": "1.2.10", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.10", + "@rolldown/binding-linux-arm64-gnu": "1.2.10", + "@rolldown/binding-linux-arm64-musl": "1.2.10", + "@rolldown/binding-linux-ppc64-gnu": "1.2.10", + "@rolldown/binding-linux-s390x-gnu": "1.2.10", + "@rolldown/binding-linux-x64-gnu": "1.2.10", + "@rolldown/binding-linux-x64-musl": "1.2.10", + "@rolldown/binding-openharmony-arm64": "1.2.10", + "@rolldown/binding-win32-arm64-msvc": "1.2.10", + "@rolldown/binding-win32-x64-msvc": "1.2.10" } }, "node_modules/rrweb-cssom": { @@ -8418,7 +7635,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -8491,16 +7707,16 @@ } }, "node_modules/schema-utils": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz", - "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.5.0.tgz", + "integrity": "sha512-zJlMCZ0cAR5p/Y4oVpRoqioDMJcGxaXRrQ/4rP4WyR84vc5z/DolXdbvXeDpTwbtocDFr2rhPqHPErDCUtz2kA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.9.0", - "ajv-formats": "^2.1.1", + "@types/json-schema": "^7.0.15", + "ajv": "^8.20.0", + "ajv-formats": "^3.0.1", "ajv-keywords": "^5.1.0" }, "engines": { @@ -8726,14 +7942,6 @@ "dev": true, "license": "ISC" }, - "node_modules/sliced": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", - "integrity": "sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA==", - "deprecated": "Unsupported", - "dev": true, - "license": "MIT" - }, "node_modules/solid-namespace": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/solid-namespace/-/solid-namespace-0.5.4.tgz", @@ -8741,9 +7949,9 @@ "license": "MIT" }, "node_modules/solidos-toolkit": { - "version": "0.0.0-dev.c10f4a56fdff825429b4c22b82be09e14afd8fe8", - "resolved": "https://registry.npmjs.org/solidos-toolkit/-/solidos-toolkit-0.0.0-dev.c10f4a56fdff825429b4c22b82be09e14afd8fe8.tgz", - "integrity": "sha512-NrU4Lv9xNWj272N+CH9Iakm3WjpwWOyCVErK4X8tYe51EGaJtxZxezSn8RjqMUhe+aYNg8zM2IB+6YoKWV6Iew==", + "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==", "dev": true, "dependencies": { "@babel/core": "^7.29.0", @@ -8762,10 +7970,10 @@ "vite-plugin-lit-css": "^3.0.0" }, "peerDependencies": { - "pane-registry": "^3.1.1 || ^3.1.2-0", + "pane-registry": "^3.1.1 || ^3.1.2-0 || ^5.0.0 || ^5.0.0-0", "rdflib": "^2.3.6", - "solid-logic": "^4.0.7 || ^4.0.8-0", - "solid-ui": "^3.1.2 || ^3.1.3-0", + "solid-logic": "^4.0.7 || ^4.0.8-0 || ^6.0.0 || ^6.0.0-0", + "solid-ui": "^3.1.2 || ^3.1.3-0 || ^5.0.0 || ^5.0.0-0", "vite": "^8.0.0", "vitest": "^4.0.0" }, @@ -8821,42 +8029,6 @@ "source-map": "^0.6.0" } }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true, - "license": "CC-BY-3.0" - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", - "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==", - "dev": true, - "license": "CC0-1.0" - }, "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -8865,9 +8037,9 @@ "license": "MIT" }, "node_modules/std-env": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz", - "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", + "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", "dev": true, "license": "MIT" }, @@ -8889,7 +8061,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -9027,9 +8198,9 @@ } }, "node_modules/terser": { - "version": "5.48.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz", - "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==", + "version": "5.51.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.51.2.tgz", + "integrity": "sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==", "devOptional": true, "license": "BSD-2-Clause", "peer": true, @@ -9046,16 +8217,6 @@ "node": ">=10" } }, - "node_modules/timed-out": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz", - "integrity": "sha512-pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -9064,9 +8225,9 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz", - "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.1.tgz", + "integrity": "sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==", "dev": true, "license": "MIT", "engines": { @@ -9090,28 +8251,15 @@ } }, "node_modules/tinyrainbow": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz", - "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz", + "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==", "dev": true, "license": "MIT", "engines": { "node": ">=14.0.0" } }, - "node_modules/tmp": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", - "integrity": "sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.1" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/tough-cookie": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", @@ -9219,7 +8367,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "devOptional": true, + "dev": true, "license": "0BSD" }, "node_modules/type-check": { @@ -9271,19 +8419,18 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", - "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.5.tgz", + "integrity": "sha512-0FHJvLPqZ7KJzp17O13jfsAjsqazgrxBu2zEK95PmUz8lv2+GjRuxUInCr2Rk9Dms3ihN21zJ929ZO43yJ95QQ==", "dev": true, "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.8", - "for-each": "^0.3.3", + "call-bind": "^1.0.9", + "for-each": "^0.3.5", "gopd": "^1.2.0", - "has-proto": "^1.2.0", "is-typed-array": "^1.1.15", - "reflect.getprototypeof": "^1.0.9" + "reflect.getprototypeof": "^1.0.10" }, "engines": { "node": ">= 0.4" @@ -9327,16 +8474,6 @@ "node": ">=14.17" } }, - "node_modules/typpy": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/typpy/-/typpy-2.4.0.tgz", - "integrity": "sha512-a16Uv5doNtvHzaG4wZCHmXN+l9xxmTMpyODtPz7B3DSTsDVNXilTSJGuNw68sUh0Un4bf+ghRMbEcJCI6r06mQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "function.name": "^1.0.3" - } - }, "node_modules/ufo": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.4.tgz", @@ -9344,17 +8481,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ul": { - "version": "5.2.16", - "resolved": "https://registry.npmjs.org/ul/-/ul-5.2.16.tgz", - "integrity": "sha512-v1YrSEsJZpJsywzF/MKgsQwMdOwBlwwmNiUOJh/yX6FHrq7dYjeua1YOhLV0q0KioqEFZC4P7MsKmpEsGdZz3w==", - "dev": true, - "license": "MIT", - "dependencies": { - "deffy": "^2.2.2", - "typpy": "^2.3.4" - } - }, "node_modules/unbox-primitive": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", @@ -9375,9 +8501,9 @@ } }, "node_modules/undici": { - "version": "6.27.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", - "integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==", + "version": "6.28.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.1.tgz", + "integrity": "sha512-zWpdTVD54H48CIybL0rWQ3ukpb9d23wM7eH5RtfdmeP70cWHNjtfo7P4vZX+5CoDcO53J4Pu5uXp7lNfjc6DRA==", "dev": true, "license": "MIT", "engines": { @@ -9385,10 +8511,9 @@ } }, "node_modules/undici-types": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", - "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", - "devOptional": true, + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz", + "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==", "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { @@ -9462,9 +8587,9 @@ } }, "node_modules/unplugin-dts": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/unplugin-dts/-/unplugin-dts-1.0.3.tgz", - "integrity": "sha512-/GR887wfG4r1cWyt1UZsLRuMIjsmEbGkS9yJrz+0dsToHAYUD5CTyP3JMGVLv25j9K0mJcwAVvZno/aTuSUvNg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unplugin-dts/-/unplugin-dts-1.1.1.tgz", + "integrity": "sha512-Z2VcabC0hjYuzF62oWmZXVoxagkM8bUWgqUy+dotoJTPnooR5mNaxbpv63JCmcaxdGCW2Bb75omK6FOryOYCRg==", "dev": true, "license": "MIT", "dependencies": { @@ -9472,6 +8597,7 @@ "@volar/typescript": "^2.4.26", "compare-versions": "^6.1.1", "debug": "^4.4.0", + "glob-to-regexp": "0.4.1", "kolorist": "^1.8.0", "local-pkg": "^1.1.1", "magic-string": "^0.30.17", @@ -9552,20 +8678,10 @@ } } }, - "node_modules/unzip-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", - "integrity": "sha512-pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/update-browserslist-db": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", - "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz", + "integrity": "sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==", "dev": true, "funding": [ { @@ -9614,47 +8730,16 @@ "requires-port": "^1.0.0" } }, - "node_modules/url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "prepend-http": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, "node_modules/vite": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.3.tgz", - "integrity": "sha512-Ds+gBRbj0lwRO2Y5hwnUBdxSwlAve9LeRyU4sNnAr0ewW0gWF0n5bgXgUzbgZ49MV9BVUAQUFYVcDUcilUExMA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.0.tgz", + "integrity": "sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==", "license": "MIT", "dependencies": { - "lightningcss": "^1.32.0", - "picomatch": "^4.0.4", - "postcss": "^8.5.16", - "rolldown": "~1.1.3", + "lightningcss": "^1.33.0", + "picomatch": "^4.0.7", + "postcss": "^8.5.28", + "rolldown": "~1.2.6", "tinyglobby": "^0.2.17" }, "bin": { @@ -9671,7 +8756,7 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", - "@vitejs/devtools": "^0.3.0", + "@vitejs/devtools": "^0.7.1", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", @@ -9733,9 +8818,9 @@ } }, "node_modules/vite-plugin-lit-css": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/vite-plugin-lit-css/-/vite-plugin-lit-css-3.0.0.tgz", - "integrity": "sha512-3cp46w6OuPbYSICwQBqLqqV62KojqopeqF7nYqxlZlJhhLO8phB8kku7LR986uEVQibfCuEhuRz9V6jtBQENwg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-lit-css/-/vite-plugin-lit-css-3.1.0.tgz", + "integrity": "sha512-hrOvv1ZHOBlc+ETAGCneg2gPqTIwojyZ127+L4P6Cc5adsu1yffbjgE+c608JYNFdyLxKDe0yzVTFpOFZMwL2w==", "dev": true, "engines": { "node": ">=18.2.0" @@ -9746,19 +8831,19 @@ } }, "node_modules/vitest": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.9.tgz", - "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.11.tgz", + "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.1.9", - "@vitest/mocker": "4.1.9", - "@vitest/pretty-format": "4.1.9", - "@vitest/runner": "4.1.9", - "@vitest/snapshot": "4.1.9", - "@vitest/spy": "4.1.9", - "@vitest/utils": "4.1.9", + "@vitest/expect": "4.1.11", + "@vitest/mocker": "4.1.11", + "@vitest/pretty-format": "4.1.11", + "@vitest/runner": "4.1.11", + "@vitest/snapshot": "4.1.11", + "@vitest/spy": "4.1.11", + "@vitest/utils": "4.1.11", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", @@ -9786,12 +8871,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.1.9", - "@vitest/browser-preview": "4.1.9", - "@vitest/browser-webdriverio": "4.1.9", - "@vitest/coverage-istanbul": "4.1.9", - "@vitest/coverage-v8": "4.1.9", - "@vitest/ui": "4.1.9", + "@vitest/browser-playwright": "4.1.11", + "@vitest/browser-preview": "4.1.11", + "@vitest/browser-webdriverio": "4.1.11", + "@vitest/coverage-istanbul": "4.1.11", + "@vitest/coverage-v8": "4.1.11", + "@vitest/ui": "4.1.11", "happy-dom": "*", "jsdom": "*", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -9836,16 +8921,9 @@ } }, "node_modules/vscode-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", - "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/w-json": { - "version": "1.3.10", - "resolved": "https://registry.npmjs.org/w-json/-/w-json-1.3.10.tgz", - "integrity": "sha512-XadVyw0xE+oZ5FGApXsdswv96rOhStzKqL53uSe5UaTadABGkWIg1+DTx8kiZ/VqTZTBneoL0l65RcPe4W3ecw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz", + "integrity": "sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==", "dev": true, "license": "MIT" }, @@ -9887,9 +8965,9 @@ } }, "node_modules/webpack": { - "version": "5.108.4", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.108.4.tgz", - "integrity": "sha512-yur8LyJoeiWh47dErD+Ok7vlbmDsJ3UbbRPAoxbGJ54WpE2y5yVo5G/inUzujnYgw3tPmBRdn+G7PoxXaYC33w==", + "version": "5.111.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.111.1.tgz", + "integrity": "sha512-cNypaz0RP+S4cvQVi1M/3bRUkvNP0xZpL0TjFx+c6jg64VbxD+2weWDgY9UnjRI6dhZgtaj8DU76GGFcJ79xPQ==", "dev": true, "license": "MIT", "peer": true, @@ -9899,23 +8977,18 @@ "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", - "acorn": "^8.16.0", - "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.22.2", + "enhanced-resolve": "^5.25.0", "es-module-lexer": "^2.1.0", - "eslint-scope": "5.1.1", "events": "^3.2.0", "graceful-fs": "^4.2.11", - "loader-runner": "^4.3.2", "mime-db": "^1.54.0", - "minimizer-webpack-plugin": "^5.6.1", - "neo-async": "^2.6.2", - "schema-utils": "^4.3.3", + "minimizer-webpack-plugin": "^5.7.0", + "schema-utils": "^4.5.0", "tapable": "^2.3.0", "watchpack": "^2.5.2", - "webpack-sources": "^3.5.0" + "webpack-sources": "^3.5.1" }, "bin": { "webpack": "bin/webpack.js" @@ -9934,9 +9007,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.0.tgz", - "integrity": "sha512-HPuy+uuoTCaaoEoI1LQ3JN9+vrPBvEesnnX1jADHy728cHSMlq4wUc4afYqahq2B1mhQVZxCXOkNTnXltr+2vQ==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz", + "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==", "dev": true, "license": "MIT", "peer": true, @@ -9951,32 +9024,6 @@ "dev": true, "license": "MIT" }, - "node_modules/webpack/node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "license": "BSD-2-Clause", - "peer": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/webpack/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "license": "BSD-2-Clause", - "peer": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/webpack/node_modules/mime-db": { "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", @@ -10110,9 +9157,9 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.22", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.22.tgz", - "integrity": "sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==", + "version": "1.1.24", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.24.tgz", + "integrity": "sha512-wk4Mf4pR5mRP7eYuuTBCIQ9d0ud2Fv2jRLQpfgnRjbOxAFHmjKFValgTpitVKzJJS8ajnYQV2Du1SZ8j6b/EUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10159,9 +9206,9 @@ } }, "node_modules/ws": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", - "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz", + "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index e05e8faa..c769a934 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "solidos-toolkit": "dev" }, "dependencies": { + "@dokieli/web-access-control": "^1.0.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", "solid-namespace": "^0.5.4", "vite": "^8.0.16", diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index d3be04cc..8dfd8dd7 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -1,7 +1,17 @@ +import { findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' import { graph, NamedNode, Namespace, serialize, sym } from 'rdflib' -import { AclLogic } from '../types' +import type { AclLogic } from '../types' import { ns as namespace } from '../util/ns' +// Helpers available from @dokieli/web-access-control: +// - Discovery: findEffectiveACL, parentContainer +// - ACL context and parsing: buildACLContext, authorizationsFromDataset, parseTurtle +// - Query helpers: agentsWithMode, hasControl, isPublic, modesFor, subjectsWithMode +// - Plan helpers: planContainerACL, planGrant, planOwnerControl, planPublicRead, planRevoke +// - Serialization and application: serializeTerm, toN3Patch, toSparqlUpdate, toTurtle, applyPlan, negotiatePatchContentType +// - Link and allow parsing: allows, parseWacAllow, linkTargets, parseLinkHeader +// - Terms and constants: ACCESS_MODES, ACL, Authenticated, FOAF, modeFromIRI, modeIRI, namedNode, Public, quad, RDF_TYPE, variable + export const ACL_LINK = sym( 'http://www.iana.org/assignments/link-relations/acl' @@ -10,6 +20,18 @@ export const ACL_LINK = sym( export function createAclLogic(store): AclLogic { const ns = namespace + + function getFetch() { + const fetcher = store.fetcher as { + _fetch?: (url: string, init?: RequestInit) => Promise + fetch?: (url: string, init?: RequestInit) => Promise + } | undefined + const fetch = fetcher?._fetch ?? fetcher?.fetch + if (!fetch) { + throw new Error('Cannot find effective ACL, store has no fetcher') + } + return fetch.bind(fetcher) + } async function findAclDocUrl(url: NamedNode) { await store.fetcher.load(url) @@ -19,6 +41,26 @@ export function createAclLogic(store): AclLogic { } return docNode.value } + + async function findEffectiveAcl(resourceURL: string | NamedNode): Promise { + const url = typeof resourceURL === 'string' ? resourceURL : resourceURL.value + return findEffectiveACL(url, { fetch: getFetch() }) + } + + async function findAccessGrants(resourceURL: string | NamedNode): Promise { + const context = await findEffectiveAcl(resourceURL) + return context.authorizations + } + + async function planGrant(resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { + const context = await findEffectiveAcl(resourceURL) + return planAuthorizationGrant(context, subject, modes) + } + + async function planPublicRead(resourceURL: string | NamedNode, enabled: boolean): Promise { + const context = await findEffectiveAcl(resourceURL) + return planAuthorizationPublicRead(context, enabled) + } /** * Simple Access Control * @@ -149,6 +191,10 @@ export function createAclLogic(store): AclLogic { } return { findAclDocUrl, + findEffectiveAcl, + findAccessGrants, + planGrant, + planPublicRead, setACLUserPublic, genACLText } diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index 7d39f00b..95b64895 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -3,7 +3,8 @@ import { ACL_LINK } from '../acl/aclLogic' import { ns } from '../util/ns' import { assertSuccessfulHttpResponse, isMissingError } from './resourceHttp' import { readWacAccessInfo } from './resourceMetadata' -import { type AclLogic, type ResourceAccess, type ResourceAccessWithDelete, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type TypeIndexLogic } from '../types' +import { type ResourceAccess, type ResourceAccessWithDelete, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type TypeIndexLogic } from '../types' +import type { AclLogic } from '../types' export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, typeIndexLogic: TypeIndexLogic): ResourceLogic { function createContainer(url: string) { @@ -18,6 +19,17 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t return containerLogic.getContainerMemberCount(resourceNode) } + function isWebId(resource: string | NamedNode) { + const uri = typeof resource === 'string' ? resource : resource.value + + try { + const parsed = new URL(uri) + return parsed.hash === '#me' && /\/profile\/card\.ttl$/.test(parsed.pathname) + } catch (_error) { + return false + } + } + function readMetadata(subject: NamedNode, response: Response): ResourceMetadata { let contentType: string | undefined let canEdit = false @@ -175,6 +187,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t fetchMetadataWithDelete, createContainer, isContainer, - getContainerMemberCount + getContainerMemberCount, + isWebId } } diff --git a/src/types.ts b/src/types.ts index 81017615..8ce36570 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,5 @@ import type { SessionWithLegacyEvents } from './authSession/authSession' +import type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from '@dokieli/web-access-control' import { LiveStore, NamedNode, Statement } from 'rdflib' export type AppDetails = { @@ -79,6 +80,10 @@ export interface ProfileLogic { export interface AclLogic { findAclDocUrl: (url: NamedNode) => Promise, + findEffectiveAcl: (resourceURL: string | NamedNode) => Promise, + findAccessGrants: (resourceURL: string | NamedNode) => Promise, + planGrant: (resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, + planPublicRead: (resourceURL: string | NamedNode, enabled: boolean) => Promise, setACLUserPublic: (docURI: string, me: NamedNode, options: { defaultForNew?: boolean, @@ -93,6 +98,8 @@ export interface AclLogic { ) => string | undefined } +export type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } + export interface InboxLogic { createInboxFor: (peerWebId: string, nick: string) => Promise, getNewMessages: (user?: NamedNode) => Promise, @@ -132,7 +139,8 @@ export interface ResourceLogic { fetchMetadataWithDelete: (subject: NamedNode) => Promise, createContainer: (url: string) => Promise, isContainer: (resource: NamedNode) => boolean, - getContainerMemberCount: (resource: NamedNode) => number + getContainerMemberCount: (resource: NamedNode) => number, + isWebId: (resource: string | NamedNode) => boolean } export interface TypeIndexLogic { diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 62007feb..b677280f 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -35,6 +35,10 @@ describe('resourceLogic', () => { store = makeStore() aclLogic = { findAclDocUrl: vi.fn().mockResolvedValue(undefined), + findEffectiveAcl: vi.fn().mockResolvedValue({ authorizations: [] }), + findAccessGrants: vi.fn().mockResolvedValue([]), + planGrant: vi.fn(), + planPublicRead: vi.fn(), setACLUserPublic: vi.fn(), genACLText: vi.fn() } @@ -103,4 +107,12 @@ describe('resourceLogic', () => { await expect(resourceLogic.recursiveDelete(resource)).resolves.toBeUndefined() expect(store.removeDocument).toHaveBeenCalledWith(resource) }) + + it('recognizes only profile-card.ttl WebIDs', () => { + const resourceLogic = createResourceLogic(store, aclLogic, containerLogic, typeIndexLogic) + + expect(resourceLogic.isWebId(sym('https://alice.example.com/profile/card.ttl#me'))).toBe(true) + expect(resourceLogic.isWebId(sym('https://alice.example.com/profile/card#me'))).toBe(false) + expect(resourceLogic.isWebId(sym('https://alice.example.com/profile/card.jsonld#me'))).toBe(false) + }) }) From 10ae9ef2193b7638c3a03e248cc4be03699ef3ec Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sun, 27 Sep 2026 10:52:53 +1000 Subject: [PATCH 02/32] Add tests for new acl functions Prompt: Add basic tests to cover the new acl logic functions that have been added Co-authored-by: GPT-5.4 Mini --- test/aclLogic.test.ts | 134 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 111 insertions(+), 23 deletions(-) diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index 82dfd1d1..5f9477d5 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -1,25 +1,113 @@ -import { beforeAll, describe, expect, it } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { Fetcher, Store, sym, UpdateManager } from 'rdflib' -import { createAclLogic } from '../src/acl/aclLogic' - -describe('setACLUserPublic', () => { - let aclLogic: any - let store: Store - beforeAll(() => { - const options = { fetch: fetch } - store = new Store() - store.fetcher = new Fetcher(store, options) - store.updater = new UpdateManager(store) - aclLogic = createAclLogic(store) - }) - it('exists', () => { - expect(aclLogic.setACLUserPublic).toBeInstanceOf(Function) - }) - it.skip('runs', async () => { - expect(await aclLogic.setACLUserPublic( - 'https://test.test#', - sym('https://test.test#'), - {} - )).toEqual({}) - }) +import { findEffectiveACL, planGrant, planPublicRead } from '@dokieli/web-access-control' +import { ACL_LINK, createAclLogic } from '../src/acl/aclLogic' + +vi.mock('@dokieli/web-access-control', () => ({ + findEffectiveACL: vi.fn(), + planGrant: vi.fn(), + planPublicRead: vi.fn(), + Authenticated: Symbol('Authenticated'), + Public: Symbol('Public'), + planOwnerControl: vi.fn(), + planRevoke: vi.fn() +})) + +describe('createAclLogic', () => { + let store: Store & { + fetcher: Fetcher & { + _fetch: ReturnType + load: ReturnType + webOperation: ReturnType + } + any: ReturnType + } + let aclLogic: ReturnType + + beforeEach(() => { + const fetcher = { + _fetch: vi.fn(), + load: vi.fn(), + webOperation: vi.fn(), + unload: vi.fn() + } as unknown as Fetcher & { + _fetch: ReturnType + load: ReturnType + webOperation: ReturnType + unload: ReturnType + } + + store = { + fetcher, + updater: new UpdateManager(new Store()), + any: vi.fn() + } as unknown as Store & { + fetcher: typeof fetcher + any: ReturnType + } + + aclLogic = createAclLogic(store) + }) + + it('exports the ACL link relation constant', () => { + expect(ACL_LINK.value).toBe('http://www.iana.org/assignments/link-relations/acl') + }) + + it('finds the ACL document URL from the discovered link', async () => { + const resource = sym('https://example.com/resource.ttl') + const aclDoc = sym('https://example.com/resource.ttl.acl') + const loadResult = { ok: true } + + store.fetcher.load.mockResolvedValue(loadResult) + store.any.mockReturnValue(aclDoc) + + await expect(aclLogic.findAclDocUrl(resource)).resolves.toBe(aclDoc.value) + expect(store.fetcher.load).toHaveBeenCalledWith(resource) + expect(store.any).toHaveBeenCalledWith(resource, ACL_LINK) + }) + + it('returns the authorizations from the effective ACL context', async () => { + const resource = sym('https://example.com/resource.ttl') + const context = { authorizations: [{ id: 'a1' }] } + + vi.mocked(findEffectiveACL).mockResolvedValue(context as any) + store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) + + await expect(aclLogic.findAccessGrants(resource)).resolves.toEqual(context.authorizations) + expect(findEffectiveACL).toHaveBeenCalledWith(resource.value, expect.objectContaining({ fetch: expect.any(Function) })) + }) + + it('delegates planGrant through the effective ACL context', async () => { + const resource = sym('https://example.com/resource.ttl') + const subject = { type: 'agent', value: 'https://example.com/profile/card#me' } + const plan = { updates: [] } + + vi.mocked(findEffectiveACL).mockResolvedValue({ authorizations: [] } as any) + vi.mocked(planGrant).mockReturnValue(plan as any) + store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) + + await expect(aclLogic.planGrant(resource, subject as any, ['Read'])).resolves.toBe(plan) + expect(planGrant).toHaveBeenCalledWith(expect.objectContaining({ authorizations: [] }), subject, ['Read']) + }) + + it('delegates planPublicRead through the effective ACL context', async () => { + const resource = sym('https://example.com/resource.ttl') + const plan = { updates: [] } + + vi.mocked(findEffectiveACL).mockResolvedValue({ authorizations: [] } as any) + vi.mocked(planPublicRead).mockReturnValue(plan as any) + store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) + + await expect(aclLogic.planPublicRead(resource, true)).resolves.toBe(plan) + expect(planPublicRead).toHaveBeenCalledWith(expect.objectContaining({ authorizations: [] }), true) + }) + + it('throws when the store cannot supply a fetch function', async () => { + const resource = sym('https://example.com/resource.ttl') + store.fetcher = { _fetch: vi.fn(), load: vi.fn(), webOperation: vi.fn(), unload: vi.fn() } as any + delete (store.fetcher as any).fetch + delete (store.fetcher as any)._fetch + + await expect(aclLogic.findEffectiveAcl(resource)).rejects.toThrow('Cannot find effective ACL, store has no fetcher') + }) }) From 0431915654363239166caefa756d09333692ef99 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sun, 27 Sep 2026 11:21:45 +1000 Subject: [PATCH 03/32] made changes to support PR feedback from solid-ui PR --- src/acl/aclLogic.ts | 13 ++++++++++++- src/types.ts | 2 ++ test/aclLogic.test.ts | 31 ++++++++++++++++++++++++++++--- test/resourceLogic.test.ts | 2 ++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index 8dfd8dd7..9d694193 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -1,4 +1,4 @@ -import { findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' +import { applyPlan as applyAuthorizationPlan, findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, planRevoke as planAuthorizationRevoke, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' import { graph, NamedNode, Namespace, serialize, sym } from 'rdflib' import type { AclLogic } from '../types' import { ns as namespace } from '../util/ns' @@ -57,10 +57,19 @@ export function createAclLogic(store): AclLogic { return planAuthorizationGrant(context, subject, modes) } + async function planRevoke(resourceURL: string | NamedNode, subject: AccessSubject): Promise { + const context = await findEffectiveAcl(resourceURL) + return planAuthorizationRevoke(context, subject) + } + async function planPublicRead(resourceURL: string | NamedNode, enabled: boolean): Promise { const context = await findEffectiveAcl(resourceURL) return planAuthorizationPublicRead(context, enabled) } + + async function applyPlan(plan: PatchPlan): Promise { + return applyAuthorizationPlan(plan, { fetch: getFetch() }) + } /** * Simple Access Control * @@ -194,7 +203,9 @@ export function createAclLogic(store): AclLogic { findEffectiveAcl, findAccessGrants, planGrant, + planRevoke, planPublicRead, + applyPlan, setACLUserPublic, genACLText } diff --git a/src/types.ts b/src/types.ts index 8ce36570..45893070 100644 --- a/src/types.ts +++ b/src/types.ts @@ -83,7 +83,9 @@ export interface AclLogic { findEffectiveAcl: (resourceURL: string | NamedNode) => Promise, findAccessGrants: (resourceURL: string | NamedNode) => Promise, planGrant: (resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, + planRevoke: (resourceURL: string | NamedNode, subject: AccessSubject) => Promise, planPublicRead: (resourceURL: string | NamedNode, enabled: boolean) => Promise, + applyPlan: (plan: PatchPlan) => Promise, setACLUserPublic: (docURI: string, me: NamedNode, options: { defaultForNew?: boolean, diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index 5f9477d5..ca8c7d79 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -1,16 +1,17 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { Fetcher, Store, sym, UpdateManager } from 'rdflib' -import { findEffectiveACL, planGrant, planPublicRead } from '@dokieli/web-access-control' +import { applyPlan, findEffectiveACL, planGrant, planPublicRead, planRevoke } from '@dokieli/web-access-control' import { ACL_LINK, createAclLogic } from '../src/acl/aclLogic' vi.mock('@dokieli/web-access-control', () => ({ findEffectiveACL: vi.fn(), planGrant: vi.fn(), planPublicRead: vi.fn(), + planRevoke: vi.fn(), + applyPlan: vi.fn(), Authenticated: Symbol('Authenticated'), Public: Symbol('Public'), - planOwnerControl: vi.fn(), - planRevoke: vi.fn() + planOwnerControl: vi.fn() })) describe('createAclLogic', () => { @@ -102,6 +103,30 @@ describe('createAclLogic', () => { expect(planPublicRead).toHaveBeenCalledWith(expect.objectContaining({ authorizations: [] }), true) }) + it('delegates planRevoke through the effective ACL context', async () => { + const resource = sym('https://example.com/resource.ttl') + const subject = { type: 'agent', iri: 'https://example.com/profile/card#me' } + const plan = { target: 'https://example.com/resource.ttl.acl', deletes: [], inserts: [] } + + vi.mocked(findEffectiveACL).mockResolvedValue({ authorizations: [] } as any) + vi.mocked(planRevoke).mockReturnValue(plan as any) + store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) + + await expect(aclLogic.planRevoke(resource, subject as any)).resolves.toBe(plan) + expect(planRevoke).toHaveBeenCalledWith(expect.objectContaining({ authorizations: [] }), subject) + }) + + it('applies a patch plan with the store fetcher', async () => { + const plan = { target: 'https://example.com/resource.ttl.acl', deletes: [], inserts: [] } + const response = new Response('ok', { status: 200 }) + + store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) + vi.mocked(applyPlan).mockResolvedValue(response) + + await expect(aclLogic.applyPlan(plan as any)).resolves.toBe(response) + expect(applyPlan).toHaveBeenCalledWith(plan, expect.objectContaining({ fetch: expect.any(Function) })) + }) + it('throws when the store cannot supply a fetch function', async () => { const resource = sym('https://example.com/resource.ttl') store.fetcher = { _fetch: vi.fn(), load: vi.fn(), webOperation: vi.fn(), unload: vi.fn() } as any diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index b677280f..5ce53b95 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -38,7 +38,9 @@ describe('resourceLogic', () => { findEffectiveAcl: vi.fn().mockResolvedValue({ authorizations: [] }), findAccessGrants: vi.fn().mockResolvedValue([]), planGrant: vi.fn(), + planRevoke: vi.fn(), planPublicRead: vi.fn(), + applyPlan: vi.fn(), setACLUserPublic: vi.fn(), genACLText: vi.fn() } From b0c6e2cebc3098d6bc6edef339c751897265ba09 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sun, 4 Oct 2026 15:27:59 +1100 Subject: [PATCH 04/32] acl classify subject --- src/acl/accessControlSubjects.ts | 87 ++++++++++++++++++++++++++++++++ src/acl/aclLogic.ts | 6 +++ 2 files changed, 93 insertions(+) create mode 100644 src/acl/accessControlSubjects.ts diff --git a/src/acl/accessControlSubjects.ts b/src/acl/accessControlSubjects.ts new file mode 100644 index 00000000..c326aeb7 --- /dev/null +++ b/src/acl/accessControlSubjects.ts @@ -0,0 +1,87 @@ +import { LiveStore, sym } from 'rdflib' +import { ns } from '../util/ns' + +export type AccessControlSubjectKind = 'agent' | 'agentGroup' | 'agentClass' | 'origin' + +export type AccessControlSubject = { + kind: AccessControlSubjectKind + subjectValue: string +} + +const ACCESS_CONTROL_SUBJECT_GROUPS = { + agentClass: [ns.foaf('Agent'), ns.acl('AuthenticatedAgent'), ns.rdf('Resource'), ns.owl('Thing')], + agent: [ns.vcard('WebID'), ns.vcard('Individual'), ns.foaf('Person'), ns.foaf('Agent')], + group: [ns.vcard('Group')], + origin: [ns.solid('AppProvider'), ns.solid('AppProviderClass')] +} as const + +function hasKnownTypes (types: Record): boolean { + return Object.keys(types).length > 0 +} + +function isHttpUrl (value: string): boolean { + return value.startsWith('http://') || value.startsWith('https://') +} + +function isBareOriginUrl (value: string): boolean { + try { + const parsed = new URL(value) + return parsed.pathname === '/' && !parsed.hash + } catch (_error) { + return false + } +} + +function normalizeOriginUrl (value: string): string { + try { + const parsed = new URL(value) + if (parsed.pathname === '/' && !parsed.hash) { + return `${parsed.protocol}//${parsed.host}` + } + } catch (_error) { + // Return the original value below when parsing fails. + } + + return value +} + +export async function classifyAccessControlSubject (store: LiveStore, principle: string): Promise { + const subject = sym(principle) + let types = store.findTypeURIs(subject) + + if (isBareOriginUrl(principle)) { + return { kind: 'origin', subjectValue: normalizeOriginUrl(principle) } + } + + if (!hasKnownTypes(types) && isHttpUrl(principle)) { + try { + await store.fetcher.load(subject.doc()) + } catch (error) { + console.error(`Failed to load access target ${principle}`, error) + } + + types = store.findTypeURIs(subject) + } + + if (ACCESS_CONTROL_SUBJECT_GROUPS.origin.some(term => term.uri in types)) { + return { kind: 'origin', subjectValue: principle } + } + + if (ACCESS_CONTROL_SUBJECT_GROUPS.agent.some(term => term.uri in types)) { + const preferredURI = store.any(subject, ns.foaf('preferredURI')) + return { + kind: 'agent', + subjectValue: preferredURI?.value ?? principle + } + } + + if (ACCESS_CONTROL_SUBJECT_GROUPS.group.some(term => term.uri in types)) { + return { kind: 'agentGroup', subjectValue: principle } + } + + if (ACCESS_CONTROL_SUBJECT_GROUPS.agentClass.some(term => subject.sameTerm(term))) { + return { kind: 'agentClass', subjectValue: principle } + } + + return undefined +} diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index 9d694193..90b7390c 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -2,6 +2,7 @@ import { applyPlan as applyAuthorizationPlan, findEffectiveACL, planGrant as pla import { graph, NamedNode, Namespace, serialize, sym } from 'rdflib' import type { AclLogic } from '../types' import { ns as namespace } from '../util/ns' +import * as accessControlSubjects from './accessControlSubjects' // Helpers available from @dokieli/web-access-control: // - Discovery: findEffectiveACL, parentContainer @@ -70,6 +71,10 @@ export function createAclLogic(store): AclLogic { async function applyPlan(plan: PatchPlan): Promise { return applyAuthorizationPlan(plan, { fetch: getFetch() }) } + + async function classifyAccessControlSubject(principle: string) { + return accessControlSubjects.classifyAccessControlSubject(store, principle) + } /** * Simple Access Control * @@ -206,6 +211,7 @@ export function createAclLogic(store): AclLogic { planRevoke, planPublicRead, applyPlan, + classifyAccessControlSubject, setACLUserPublic, genACLText } From 918c145a4b733c12a51c97b5e5a40a3d91c0c111 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sun, 4 Oct 2026 15:28:32 +1100 Subject: [PATCH 05/32] directory logic --- package-lock.json | 4 +- package.json | 2 +- src/acl/accessControlSubjects.ts | 16 +- src/acl/aclLogic.ts | 25 +++ src/directory/catalogDirectory.ts | 90 ++++++++ src/directory/contactsDirectory.ts | 157 +++++++++++++ src/directory/directoryHelpers.ts | 147 ++++++++++++ src/directory/directoryLogic.ts | 82 +++++++ src/directory/friendsDirectory.ts | 103 +++++++++ src/index.ts | 8 +- src/logic/solidLogic.ts | 3 + src/types.ts | 32 +++ test/aclLogic.test.ts | 32 +++ test/directoryLogic.test.ts | 337 ++++++++++++++++++++++++++++ test/resource/resourceLogic.test.ts | 2 + test/resourceLogic.test.ts | 3 + 16 files changed, 1033 insertions(+), 10 deletions(-) create mode 100644 src/directory/catalogDirectory.ts create mode 100644 src/directory/contactsDirectory.ts create mode 100644 src/directory/directoryHelpers.ts create mode 100644 src/directory/directoryLogic.ts create mode 100644 src/directory/friendsDirectory.ts create mode 100644 test/directoryLogic.test.ts diff --git a/package-lock.json b/package-lock.json index 2c190282..f419c514 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.0", + "version": "6.0.0-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.0", + "version": "6.0.0-1", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.0.0", diff --git a/package.json b/package.json index c769a934..0934f796 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.0", + "version": "6.0.0-1", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/src/acl/accessControlSubjects.ts b/src/acl/accessControlSubjects.ts index c326aeb7..ee5671d4 100644 --- a/src/acl/accessControlSubjects.ts +++ b/src/acl/accessControlSubjects.ts @@ -11,7 +11,7 @@ export type AccessControlSubject = { const ACCESS_CONTROL_SUBJECT_GROUPS = { agentClass: [ns.foaf('Agent'), ns.acl('AuthenticatedAgent'), ns.rdf('Resource'), ns.owl('Thing')], agent: [ns.vcard('WebID'), ns.vcard('Individual'), ns.foaf('Person'), ns.foaf('Agent')], - group: [ns.vcard('Group')], + agentGroup: [ns.vcard('Group')], origin: [ns.solid('AppProvider'), ns.solid('AppProviderClass')] } as const @@ -26,7 +26,10 @@ function isHttpUrl (value: string): boolean { function isBareOriginUrl (value: string): boolean { try { const parsed = new URL(value) - return parsed.pathname === '/' && !parsed.hash + return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && + parsed.pathname === '/' && + !parsed.search && + !parsed.hash } catch (_error) { return false } @@ -35,7 +38,12 @@ function isBareOriginUrl (value: string): boolean { function normalizeOriginUrl (value: string): string { try { const parsed = new URL(value) - if (parsed.pathname === '/' && !parsed.hash) { + if ( + (parsed.protocol === 'http:' || parsed.protocol === 'https:') && + parsed.pathname === '/' && + !parsed.search && + !parsed.hash + ) { return `${parsed.protocol}//${parsed.host}` } } catch (_error) { @@ -75,7 +83,7 @@ export async function classifyAccessControlSubject (store: LiveStore, principle: } } - if (ACCESS_CONTROL_SUBJECT_GROUPS.group.some(term => term.uri in types)) { + if (ACCESS_CONTROL_SUBJECT_GROUPS.agentGroup.some(term => term.uri in types)) { return { kind: 'agentGroup', subjectValue: principle } } diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index 90b7390c..e07307b0 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -4,6 +4,7 @@ import type { AclLogic } from '../types' import { ns as namespace } from '../util/ns' import * as accessControlSubjects from './accessControlSubjects' +// Will remove the below comment when i'm done with the manage access work // Helpers available from @dokieli/web-access-control: // - Discovery: findEffectiveACL, parentContainer // - ACL context and parsing: buildACLContext, authorizationsFromDataset, parseTurtle @@ -13,6 +14,9 @@ import * as accessControlSubjects from './accessControlSubjects' // - Link and allow parsing: allows, parseWacAllow, linkTargets, parseLinkHeader // - Terms and constants: ACCESS_MODES, ACL, Authenticated, FOAF, modeFromIRI, modeIRI, namedNode, Public, quad, RDF_TYPE, variable +export const ACCESS_ROLES = ['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter'] as const + +export type AccessRole = typeof ACCESS_ROLES[number] export const ACL_LINK = sym( 'http://www.iana.org/assignments/link-relations/acl' @@ -21,6 +25,25 @@ export const ACL_LINK = sym( export function createAclLogic(store): AclLogic { const ns = namespace + const ACCESS_ROLE_RULES: Array<{ label: AccessRole, modes: AccessMode[] }> = [ + { label: 'Owner', modes: ['Read', 'Write', 'Control'] }, + { label: 'Editor', modes: ['Read', 'Write'] }, + { label: 'Poster', modes: ['Append', 'Read'] }, + { label: 'Submitter', modes: ['Append'] }, + { label: 'Viewer', modes: ['Read'] }, + { label: 'No Access', modes: [] } + ] + + function roleFromModes (modes: Iterable): AccessRole { + const modeSet = new Set(modes) + const matchingRule = ACCESS_ROLE_RULES.find(rule => rule.label !== 'No Access' && rule.modes.every(mode => modeSet.has(mode))) + + return matchingRule?.label ?? 'No Access' + } + + function modesFromRole (role: AccessRole): AccessMode[] { + return [...(ACCESS_ROLE_RULES.find(rule => rule.label === role)?.modes ?? [])] + } function getFetch() { const fetcher = store.fetcher as { @@ -207,6 +230,8 @@ export function createAclLogic(store): AclLogic { findAclDocUrl, findEffectiveAcl, findAccessGrants, + roleFromModes, + modesFromRole, planGrant, planRevoke, planPublicRead, diff --git a/src/directory/catalogDirectory.ts b/src/directory/catalogDirectory.ts new file mode 100644 index 00000000..9ded6b18 --- /dev/null +++ b/src/directory/catalogDirectory.ts @@ -0,0 +1,90 @@ +import { type DirectoryEntry } from '../types' +import { graph, type LiveStore, NamedNode, parse } from 'rdflib' +import { ns } from '../util/ns' +import * as debug from '../util/debug' +import { isHttpUri } from './directoryHelpers' + +const CATALOG_VOCAB = 'http://example.org#' + +export function createCatalogDirectoryDiscovery () { + const catalogEntriesCache = new Map>() + + async function discoverCatalogEntries ( + catalogUrl: string, + onEntry: (entry: DirectoryEntry) => void | Promise + ): Promise { + const entries = await fetchCatalogEntries(catalogUrl) + for (const entry of entries) { + await onEntry(entry) + } + } + + async function fetchCatalogEntries (catalogUrl: string): Promise { + const cached = catalogEntriesCache.get(catalogUrl) + if (cached) { + return cached + } + + const promise = loadCatalogEntries(catalogUrl).catch(error => { + catalogEntriesCache.delete(catalogUrl) + throw error + }) + + catalogEntriesCache.set(catalogUrl, promise) + try { + return await promise + } catch (error) { + debug.warn('[Directory] Error fetching directory catalog:', error) + return [] + } + } + + async function loadCatalogEntries (catalogUrl: string): Promise { + if (typeof fetch !== 'function') { + throw new Error('Fetch API is unavailable') + } + + const response = await fetch(catalogUrl, { + headers: { accept: 'text/turtle' } + }) + + if (!response.ok) { + throw new Error(`Failed to fetch ${catalogUrl}: ${response.status}`) + } + + const turtle = await response.text() + const catalogStore = graph() as LiveStore + parse(turtle, catalogStore, catalogUrl, 'text/turtle') + + const personType = new NamedNode(`${CATALOG_VOCAB}Person`) + const webIdPredicate = new NamedNode(`${CATALOG_VOCAB}webid`) + const namePredicate = new NamedNode(`${CATALOG_VOCAB}name`) + const catalogPeople = new Map() + + const statements = catalogStore.statementsMatching(undefined, ns.rdf('type'), personType) + for (const statement of statements) { + const subject = statement.subject + const webIdNode = catalogStore.any(subject, webIdPredicate) + if (webIdNode && webIdNode.termType === 'NamedNode') { + const webId = webIdNode.value + const personName = catalogStore.anyValue(subject, namePredicate) + if (isHttpUri(webId) && personName) { + catalogPeople.set(webId, { + kind: 'person', + uri: webId, + label: personName, + subjectType: 'agent', + relationshipLabel: 'People', + sources: ['catalog'] + }) + } + } + } + + return Array.from(catalogPeople.values()) + } + + return { + discoverCatalogEntries + } +} diff --git a/src/directory/contactsDirectory.ts b/src/directory/contactsDirectory.ts new file mode 100644 index 00000000..728382e9 --- /dev/null +++ b/src/directory/contactsDirectory.ts @@ -0,0 +1,157 @@ +import { type DirectoryEntry, type DirectorySource, type TypeIndexLogic } from '../types' +import { type LiveStore, NamedNode } from 'rdflib' +import { ns } from '../util/ns' +import { isHttpUri, labelForNode, loadDocumentSilently, uniqueNamedNodes } from './directoryHelpers' + +const CONTACT_CARD_CONCURRENCY = 8 + +export function createContactsDirectoryDiscovery ( + store: LiveStore, + typeIndexLogic: TypeIndexLogic +) { + const personalAddressBooksCache = new Map>() + const contactWebIdCache = new Map>() + + async function loadPersonalAddressBooks (user: NamedNode): Promise { + const cached = personalAddressBooksCache.get(user.value) + if (cached) { + return cached + } + + const promise = (async () => { + const scopes = await typeIndexLogic.loadTypeIndexesFor(user) + let scopedApps = [] as Awaited> + + for (const scope of scopes) { + const apps = await typeIndexLogic.getScopedAppsFromIndex(scope, ns.vcard('AddressBook')) + scopedApps = scopedApps.concat(apps) + } + + return uniqueNamedNodes(scopedApps.map(app => app.instance)) + })().catch(error => { + personalAddressBooksCache.delete(user.value) + throw error + }) + + personalAddressBooksCache.set(user.value, promise) + return promise + } + + async function webIdForAddressBookContact (contact: NamedNode): Promise { + const cached = contactWebIdCache.get(contact.value) + if (cached) { + return cached + } + + const promise = (async () => { + if (!await loadDocumentSilently(store, contact)) { + return null + } + + const urlNodes = store.each(contact, ns.vcard('url'), null, contact.doc()) as NamedNode[] + for (const urlNode of urlNodes) { + const webId = resolveWebIdFromAddressBookUrlNode(urlNode, contact.doc()) + if (webId) { + return webId + } + } + + return null + })().catch(error => { + contactWebIdCache.delete(contact.value) + throw error + }) + + contactWebIdCache.set(contact.value, promise) + return promise + } + + function resolveWebIdFromAddressBookUrlNode (urlNode: NamedNode, doc: NamedNode): string | null { + if (!store.holds(urlNode, ns.rdf('type'), ns.vcard('WebID'), doc)) { + return null + } + + const valueNode = store.any(urlNode, ns.vcard('value'), null, doc) + const webId = valueNode?.value || '' + return isHttpUri(webId) ? webId : null + } + + async function discoverAddressBookContacts ( + user: NamedNode, + onEntry: (entry: DirectoryEntry) => void | Promise + ): Promise { + const books = await loadPersonalAddressBooks(user) + + for (const book of books) { + if (await loadDocumentSilently(store, book)) { + const nameEmailIndex = store.any(book, ns.vcard('nameEmailIndex'), null, book.doc()) as NamedNode | null + if (nameEmailIndex) { + if (await loadDocumentSilently(store, nameEmailIndex)) { + const contacts = store.each(undefined, ns.vcard('inAddressBook'), book, nameEmailIndex) as NamedNode[] + for (let index = 0; index < contacts.length; index += CONTACT_CARD_CONCURRENCY) { + const batch = contacts.slice(index, index + CONTACT_CARD_CONCURRENCY) + const entries = await Promise.all(batch.map(async contact => { + const webId = await webIdForAddressBookContact(contact) + if (!webId) { + return null + } + + return { + kind: 'person' as const, + uri: webId, + label: store.anyValue(contact, ns.vcard('fn'), null, nameEmailIndex) || labelForNode(store, contact), + subjectType: 'agent' as const, + relationshipLabel: 'Contact' as const, + sources: ['contacts'] as DirectorySource[] + } + })) + + for (const entry of entries.filter((entry): entry is NonNullable => Boolean(entry))) { + await onEntry(entry) + } + } + } + } + } + } + } + + async function discoverAddressBookGroups ( + user: NamedNode, + onEntry: (entry: DirectoryEntry) => void | Promise + ): Promise { + const books = await loadPersonalAddressBooks(user) + + for (const book of books) { + if (await loadDocumentSilently(store, book)) { + const groupIndex = store.any(book, ns.vcard('groupIndex'), null, book.doc()) as NamedNode | null + if (groupIndex) { + if (await loadDocumentSilently(store, groupIndex)) { + const groups = uniqueNamedNodes([ + ...(store.each(book, ns.vcard('includesGroup'), null, groupIndex) as NamedNode[]), + ...(store.each(book, ns.vcard('includesGroup'), null, book.doc()) as NamedNode[]) + ]) + + for (const group of groups) { + await loadDocumentSilently(store, group) + + await onEntry({ + kind: 'group', + uri: group.value, + label: labelForNode(store, group), + subjectType: 'agentGroup', + relationshipLabel: 'Group', + sources: ['groups'] + }) + } + } + } + } + } + } + + return { + discoverAddressBookContacts, + discoverAddressBookGroups + } +} diff --git a/src/directory/directoryHelpers.ts b/src/directory/directoryHelpers.ts new file mode 100644 index 00000000..c506ea0a --- /dev/null +++ b/src/directory/directoryHelpers.ts @@ -0,0 +1,147 @@ +import type { LiveStore, NamedNode } from 'rdflib' +import type { DirectoryEntry, DirectoryRelationshipLabel, DirectorySource } from '../types' +import { ns } from '../util/ns' + +const DIRECTORY_SOURCE_PRIORITY: DirectorySource[] = ['contacts', 'groups', 'friends', 'catalog'] + +export function tokenizeQuery (query: string): string[] { + return query + .toLowerCase() + .trim() + .split(/\s+/) + .filter(Boolean) +} + +export function matchesQuery (label: string, query: string): boolean { + return matchesAnyLabel([label], query) +} + +export function matchesAnyLabel (labels: string[], query: string): boolean { + const queryWords = tokenizeQuery(query) + if (queryWords.length === 0) return true + + const labelWords = labels.flatMap(label => tokenizeQuery(label)) + const fallbackHaystack = labels.join(' ').toLowerCase() + return queryWords.every(word => + labelWords.some(labelWord => labelWord.includes(word)) || fallbackHaystack.includes(word) + ) +} + +export function sortEntries (entries: Iterable): DirectoryEntry[] { + return Array.from(entries) + .sort((left, right) => left.label.localeCompare(right.label, undefined, { sensitivity: 'base' })) +} + +export function mergeDirectoryEntry ( + discoveredEntries: Map, + entry: DirectoryEntry +): DirectoryEntry { + const key = directoryEntryKey(entry) + const existing = discoveredEntries.get(key) + if (existing) { + const preferred = preferredDirectoryEntry(existing, entry) + const labels = canonicalizeSearchableLabels( + preferred.label, + [...(existing.searchableLabels ?? [existing.label]), ...(entry.searchableLabels ?? [entry.label])] + ) + const merged = { + ...existing, + label: preferred.label, + relationshipLabel: bestRelationshipLabel(existing.relationshipLabel, entry.relationshipLabel), + sources: canonicalizeDirectorySources([...existing.sources, ...entry.sources]), + searchableLabels: labels + } + discoveredEntries.set(key, merged) + return merged + } + + const normalized = { + ...entry, + sources: canonicalizeDirectorySources(entry.sources), + searchableLabels: entry.searchableLabels ?? [entry.label] + } + discoveredEntries.set(key, normalized) + return normalized +} + +function preferredDirectoryEntry (current: DirectoryEntry, incoming: DirectoryEntry): DirectoryEntry { + return directoryEntrySourcePriority(incoming) < directoryEntrySourcePriority(current) ? incoming : current +} + +function directoryEntrySourcePriority (entry: DirectoryEntry): number { + const priorities = entry.sources.map(source => DIRECTORY_SOURCE_PRIORITY.indexOf(source)) + return priorities.length ? Math.min(...priorities) : DIRECTORY_SOURCE_PRIORITY.length +} + +export function canonicalizeDirectorySources (sources: DirectorySource[]): DirectorySource[] { + return DIRECTORY_SOURCE_PRIORITY.filter(source => sources.includes(source)) +} + +function canonicalizeSearchableLabels (preferredLabel: string, labels: string[]): string[] { + return uniqueStrings(labels).sort((left, right) => { + if (left === preferredLabel) return -1 + if (right === preferredLabel) return 1 + return left.localeCompare(right, undefined, { sensitivity: 'base' }) + }) +} + +export function bestRelationshipLabel ( + current: DirectoryRelationshipLabel | undefined, + incoming: DirectoryRelationshipLabel +): DirectoryRelationshipLabel { + if (current === 'Contact' || incoming === 'Contact') return 'Contact' + if (current === 'Friend' || incoming === 'Friend') return 'Friend' + if (current === 'Group' || incoming === 'Group') return 'Group' + return 'People' +} + +export function directoryEntryKey (entry: DirectoryEntry): string { + return `${entry.kind}:${entry.uri}` +} + +export function uniqueNamedNodes (nodes: NamedNode[]): NamedNode[] { + const seen = new Set() + return nodes.filter(node => { + if (seen.has(node.value)) return false + seen.add(node.value) + return true + }) +} + +export function uniqueStrings (values: T[]): T[] { + return [...new Set(values)] +} + +export function isHttpUri (value: string | null | undefined): boolean { + return !!value && (value.startsWith('https://') || value.startsWith('http://')) +} + +export function fallbackLabel (uri: string): string { + const withoutFragment = uri.split('#')[0] + const fragment = uri.includes('#') ? uri.slice(uri.indexOf('#') + 1) : '' + const base = fragment && fragment !== 'this' && fragment !== 'me' + ? fragment + : withoutFragment.slice(withoutFragment.lastIndexOf('/') + 1) + return decodeURIComponent(base || uri).replace(/[_-]+/g, ' ') +} + +export function storedLabelForNode (store: LiveStore, node: NamedNode): string | null { + return store.anyValue(node, ns.vcard('fn')) || + store.anyValue(node, ns.foaf('name')) || + store.anyValue(node, ns.schema('name')) || + store.anyValue(node, ns.rdfs('label')) || + null +} + +export function labelForNode (store: LiveStore, node: NamedNode): string { + return storedLabelForNode(store, node) || fallbackLabel(node.value) +} + +export async function loadDocumentSilently (store: LiveStore, node: NamedNode): Promise { + try { + await store.fetcher.load(node.doc()) + return true + } catch (_error) { + return false + } +} diff --git a/src/directory/directoryLogic.ts b/src/directory/directoryLogic.ts new file mode 100644 index 00000000..9391f364 --- /dev/null +++ b/src/directory/directoryLogic.ts @@ -0,0 +1,82 @@ +import { type AuthnLogic, type DirectoryEntry, type DirectoryLogic, type DirectorySearchOptions, type DirectorySource, type TypeIndexLogic } from '../types' +import { type LiveStore } from 'rdflib' +import { createContactsDirectoryDiscovery } from './contactsDirectory' +import { createFriendsDirectoryDiscovery } from './friendsDirectory' +import { createCatalogDirectoryDiscovery } from './catalogDirectory' +import { matchesAnyLabel, mergeDirectoryEntry, sortEntries } from './directoryHelpers' + +const DEFAULT_FOAF_DISTANCE = 3 + +export const DEFAULT_DIRECTORY_CATALOG_URL = 'https://raw.githubusercontent.com/solid/catalog/refs/heads/main/catalog-data.ttl' +export const DEFAULT_DIRECTORY_SOURCES: DirectorySource[] = ['contacts', 'friends', 'catalog', 'groups'] + +export function createDirectoryLogic ( + store: LiveStore, + authn: AuthnLogic, + typeIndexLogic: TypeIndexLogic +): DirectoryLogic { + const contactsDiscovery = createContactsDirectoryDiscovery(store, typeIndexLogic) + const friendsDiscovery = createFriendsDirectoryDiscovery(store) + const catalogDiscovery = createCatalogDirectoryDiscovery() + + async function discoverWithNormalizedOptions ( + normalized: ReturnType + ): Promise { + const discoveredEntries = new Map() + const discoveryTasks: Promise[] = [] + + const mergeEntry = (entry: DirectoryEntry): void => { + mergeDirectoryEntry(discoveredEntries, entry) + } + + if (normalized.sources.includes('catalog')) { + discoveryTasks.push(catalogDiscovery.discoverCatalogEntries(normalized.catalogUrl, mergeEntry)) + } + + if (normalized.user) { + if (normalized.sources.includes('contacts')) { + discoveryTasks.push(contactsDiscovery.discoverAddressBookContacts(normalized.user, mergeEntry)) + } + + if (normalized.sources.includes('groups')) { + discoveryTasks.push(contactsDiscovery.discoverAddressBookGroups(normalized.user, mergeEntry)) + } + + if (normalized.sources.includes('friends')) { + discoveryTasks.push(friendsDiscovery.discoverFoafPeople(normalized.user, normalized.maxFoafDistance, mergeEntry)) + } + } + + if (!discoveryTasks.length) { + return [] + } + + const results = await Promise.allSettled(discoveryTasks) + if (results.every(result => result.status === 'rejected')) { + throw new Error('Unable to load directory entries.') + } + + return sortEntries(discoveredEntries.values()) + } + + async function search (options: DirectorySearchOptions = {}): Promise { + const normalized = normalizeOptions(options) + const entries = await discoverWithNormalizedOptions(normalized) + return entries.filter(entry => matchesAnyLabel([entry.label, ...(entry.searchableLabels ?? [])], normalized.query)) + } + + return { + search + } + + function normalizeOptions (options: DirectorySearchOptions = {}) { + const sources = options.sources === undefined ? [...DEFAULT_DIRECTORY_SOURCES] : [...options.sources] + return { + query: options.query ?? '', + sources, + catalogUrl: options.catalogUrl ?? DEFAULT_DIRECTORY_CATALOG_URL, + user: options.user ?? authn.currentUser(), + maxFoafDistance: options.maxFoafDistance ?? DEFAULT_FOAF_DISTANCE + } + } +} diff --git a/src/directory/friendsDirectory.ts b/src/directory/friendsDirectory.ts new file mode 100644 index 00000000..b5115b4b --- /dev/null +++ b/src/directory/friendsDirectory.ts @@ -0,0 +1,103 @@ +import { type DirectoryEntry } from '../types' +import { type LiveStore, NamedNode } from 'rdflib' +import { ns } from '../util/ns' +import { loadDocumentSilently, storedLabelForNode } from './directoryHelpers' + +const PEOPLE_SEARCH_CONCURRENCY = 6 + +export function createFriendsDirectoryDiscovery (store: LiveStore) { + function relationshipLabelForDepth (depth: number) { + return depth === 1 ? 'Friend' : 'People' + } + + async function emitPersonEntry ( + person: NamedNode, + depth: number, + onEntry: (entry: DirectoryEntry) => void | Promise + ): Promise { + const personName = storedLabelForNode(store, person) + if (!personName) return + + await onEntry({ + kind: 'person', + uri: person.value, + label: personName, + subjectType: 'agent', + relationshipLabel: relationshipLabelForDepth(depth), + sources: ['friends'] + }) + } + + async function discoverFoafPeople ( + user: NamedNode, + maxFoafDistance: number, + onEntry: (entry: DirectoryEntry) => void | Promise + ): Promise { + const visited = new Set([user.value]) + const emitted = new Set() + const loadedDocs = new Set() + let queue: Array<{ person: NamedNode, depth: number }> = [{ person: user, depth: 0 }] + + const processPerson = async (currentEntry: { person: NamedNode, depth: number }) => { + const { person: current, depth } = currentEntry + const currentDoc = current.doc().value + if (!loadedDocs.has(currentDoc)) { + loadedDocs.add(currentDoc) + await loadDocumentSilently(store, current) + } + + if (current.value !== user.value) { + if (!emitted.has(current.value)) { + emitted.add(current.value) + await emitPersonEntry(current, depth, onEntry) + } + } + + if (depth >= maxFoafDistance) { + return [] as Array<{ person: NamedNode, depth: number }> + } + + const nextPeople: Array<{ person: NamedNode, depth: number }> = [] + const contacts = store.each(current, ns.foaf('knows')) as NamedNode[] + for (const contact of contacts) { + if (contact.termType === 'NamedNode') { + const contactName = storedLabelForNode(store, contact) + if (contact.value !== user.value && contactName && !emitted.has(contact.value)) { + emitted.add(contact.value) + await onEntry({ + kind: 'person', + uri: contact.value, + label: contactName, + subjectType: 'agent', + relationshipLabel: depth === 0 ? 'Friend' : 'People', + sources: ['friends'] + }) + } + + if (!visited.has(contact.value)) { + visited.add(contact.value) + nextPeople.push({ person: contact, depth: depth + 1 }) + } + } + } + + return nextPeople + } + + while (queue.length > 0) { + const nextQueue: Array<{ person: NamedNode, depth: number }> = [] + + for (let index = 0; index < queue.length; index += PEOPLE_SEARCH_CONCURRENCY) { + const batch = queue.slice(index, index + PEOPLE_SEARCH_CONCURRENCY) + const nested = await Promise.all(batch.map(processPerson)) + nested.forEach(entries => nextQueue.push(...entries)) + } + + queue = nextQueue + } + } + + return { + discoverFoafPeople + } +} diff --git a/src/index.ts b/src/index.ts index c38a985a..dc9b8c56 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,13 +6,16 @@ const authn = solidLogicSingleton.authn const authSession = solidLogicSingleton.authn.authSession const store = solidLogicSingleton.store -export { ACL_LINK } from './acl/aclLogic' +export { ACL_LINK, ACCESS_ROLES } from './acl/aclLogic' +export type { AccessRole } from './acl/aclLogic' export { offlineTestID, appContext } from './authn/authUtil' export { performServerSideLogout } from './authn/serverLogout' export { reloadOnIdentityReplaced } from './authSession/identityState' export { getSuggestedIssuers } from './issuer/issuerLogic' export { createTypeIndexLogic } from './typeIndex/typeIndexLogic' -export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ChatLogic } from './types' +export { createDirectoryLogic, DEFAULT_DIRECTORY_CATALOG_URL, DEFAULT_DIRECTORY_SOURCES } from './directory/directoryLogic' +export type { AccessControlSubjectKind, AccessControlSubject } from './acl/accessControlSubjects' +export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' export { UnauthorizedError, CrossOriginForbiddenError, SameOriginForbiddenError, NotFoundError, FetchError, NotEditableError, WebOperationError } from './logic/CustomError' export { @@ -21,4 +24,3 @@ export { authn, authSession } - diff --git a/src/logic/solidLogic.ts b/src/logic/solidLogic.ts index fd45df52..f7110c44 100644 --- a/src/logic/solidLogic.ts +++ b/src/logic/solidLogic.ts @@ -9,6 +9,7 @@ import { createInboxLogic } from '../inbox/inboxLogic' import { createResourceLogic } from '../resource/resourceLogic' import { createProfileLogic } from '../profile/profileLogic' import { createTypeIndexLogic } from '../typeIndex/typeIndexLogic' +import { createDirectoryLogic } from '../directory/directoryLogic' import { createContainerLogic } from '../util/containerLogic' import { createUtilityLogic } from '../util/utilityLogic' import type { AuthnLogic, SolidLogic } from '../types' @@ -50,6 +51,7 @@ export function createSolidLogic(specialFetch: { fetch: (url: any, requestInit: const chat = createChatLogic(store, profile) const inbox = createInboxLogic(store, profile, utilityLogic, containerLogic, acl) const typeIndex = createTypeIndexLogic(store, authn, profile, utilityLogic) + const directory = createDirectoryLogic(store, authn, typeIndex) const resource = createResourceLogic(store, acl, containerLogic, typeIndex) debug.log('SolidAuthnLogic initialized') @@ -86,6 +88,7 @@ export function createSolidLogic(specialFetch: { fetch: (url: any, requestInit: chat, profile, typeIndex, + directory, load, updatePromise, clearStore diff --git a/src/types.ts b/src/types.ts index 45893070..eea8426d 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,6 +1,8 @@ import type { SessionWithLegacyEvents } from './authSession/authSession' import type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from '@dokieli/web-access-control' import { LiveStore, NamedNode, Statement } from 'rdflib' +import type { AccessControlSubject } from './acl/accessControlSubjects' +import type { AccessRole } from './acl/aclLogic' export type AppDetails = { noun: string @@ -82,6 +84,9 @@ export interface AclLogic { findAclDocUrl: (url: NamedNode) => Promise, findEffectiveAcl: (resourceURL: string | NamedNode) => Promise, findAccessGrants: (resourceURL: string | NamedNode) => Promise, + classifyAccessControlSubject: (principle: string) => Promise, + roleFromModes: (modes: Iterable) => AccessRole, + modesFromRole: (role: AccessRole) => AccessMode[], planGrant: (resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, planRevoke: (resourceURL: string | NamedNode, subject: AccessSubject) => Promise, planPublicRead: (resourceURL: string | NamedNode, enabled: boolean) => Promise, @@ -160,6 +165,32 @@ export interface TypeIndexLogic { getScopedAppsFromIndex: (scope: TypeIndexScope, theClass: NamedNode | null) => Promise, } +export type DirectorySource = 'contacts' | 'friends' | 'catalog' | 'groups' + +export type DirectoryRelationshipLabel = 'Friend' | 'People' | 'Contact' | 'Group' + +export type DirectoryEntry = { + kind: 'person' | 'group' + uri: string + label: string + searchableLabels?: string[] + subjectType: 'agent' | 'agentGroup' + relationshipLabel: DirectoryRelationshipLabel + sources: DirectorySource[] +} + +export type DirectorySearchOptions = { + query?: string + sources?: DirectorySource[] + catalogUrl?: string + user?: NamedNode | null + maxFoafDistance?: number +} + +export interface DirectoryLogic { + search: (options?: DirectorySearchOptions) => Promise +} + export interface SolidLogic { store: LiveStore, authn: AuthnLogic, @@ -169,6 +200,7 @@ export interface SolidLogic { inbox: InboxLogic, typeIndex: TypeIndexLogic, chat: ChatLogic, + directory: DirectoryLogic, load: (doc: NamedNode | NamedNode[] | string) => void, updatePromise: (del: Array, ins: Array) => Promise, clearStore: () => void diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index ca8c7d79..e8d343c0 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -54,6 +54,15 @@ describe('createAclLogic', () => { expect(ACL_LINK.value).toBe('http://www.iana.org/assignments/link-relations/acl') }) + it('maps roles to ACL modes and back', () => { + expect(aclLogic.modesFromRole('Editor')).toEqual(['Read', 'Write']) + expect(aclLogic.modesFromRole('Owner')).toEqual(['Read', 'Write', 'Control']) + expect(aclLogic.modesFromRole('No Access')).toEqual([]) + expect(aclLogic.roleFromModes(['Read', 'Write'])).toBe('Editor') + expect(aclLogic.roleFromModes(['Read'])).toBe('Viewer') + expect(aclLogic.roleFromModes([])).toBe('No Access') + }) + it('finds the ACL document URL from the discovered link', async () => { const resource = sym('https://example.com/resource.ttl') const aclDoc = sym('https://example.com/resource.ttl.acl') @@ -135,4 +144,27 @@ describe('createAclLogic', () => { await expect(aclLogic.findEffectiveAcl(resource)).rejects.toThrow('Cannot find effective ACL, store has no fetcher') }) + + it('only classifies bare HTTP(S) origins as origin subjects', async () => { + store.findTypeURIs = vi.fn(() => ({})) as any + + await expect(aclLogic.classifyAccessControlSubject('https://example.com/')).resolves.toEqual({ + kind: 'origin', + subjectValue: 'https://example.com' + }) + + await expect(aclLogic.classifyAccessControlSubject('https://example.com/?tenant=a')).resolves.toBeUndefined() + await expect(aclLogic.classifyAccessControlSubject('file:///')).resolves.toBeUndefined() + }) + + it('classifies vcard groups as agentGroup subjects', async () => { + store.findTypeURIs = vi.fn(() => ({ + 'http://www.w3.org/2006/vcard/ns#Group': true + })) as any + + await expect(aclLogic.classifyAccessControlSubject('https://example.com/group.ttl')).resolves.toEqual({ + kind: 'agentGroup', + subjectValue: 'https://example.com/group.ttl' + }) + }) }) diff --git a/test/directoryLogic.test.ts b/test/directoryLogic.test.ts new file mode 100644 index 00000000..8fb220ae --- /dev/null +++ b/test/directoryLogic.test.ts @@ -0,0 +1,337 @@ +import { beforeEach, describe, expect, it } from 'vitest' +import { Fetcher, Store, UpdateManager, sym } from 'rdflib' +import { createAclLogic } from '../src/acl/aclLogic' +import { createDirectoryLogic, DEFAULT_DIRECTORY_CATALOG_URL } from '../src/directory/directoryLogic' +import { createProfileLogic } from '../src/profile/profileLogic' +import { createTypeIndexLogic } from '../src/typeIndex/typeIndexLogic' +import { createContainerLogic } from '../src/util/containerLogic' +import { createUtilityLogic } from '../src/util/utilityLogic' +import { matchesAnyLabel, mergeDirectoryEntry } from '../src/directory/directoryHelpers' +import type { DirectoryEntry, DirectoryLogic } from '../src/types' + +const alice = sym('https://alice.example.com/profile/card.ttl#me') + +window.$SolidTestEnvironment = { username: alice.uri } + +describe('Directory logic', () => { + let directoryLogic: DirectoryLogic + let web: Record + + beforeEach(() => { + web = { + 'https://alice.example.com/profile/card.ttl': ` + @prefix foaf: . + @prefix solid: . + @prefix space: . + @prefix vcard: . + + <#me> + a vcard:Individual; + foaf:name "Alice"; + foaf:knows ; + space:preferencesFile ; + solid:publicTypeIndex . + `, + 'https://alice.example.com/settings/prefs.ttl': ` + @prefix solid: . + + solid:privateTypeIndex . + `, + 'https://alice.example.com/profile/publicTypeIndex.ttl': ` + @prefix solid: . + <> a solid:TypeIndex, solid:ListedDocument. + `, + 'https://alice.example.com/settings/privateTypeIndex.ttl': ` + @prefix solid: . + @prefix rdf: . + @prefix vcard: . + + <> a solid:TypeIndex, solid:UnlistedDocument. + + <#address-book> + rdf:type solid:TypeRegistration; + solid:forClass vcard:AddressBook; + solid:instance . + `, + 'https://alice.example.com/contacts/index.ttl': ` + @prefix dc: . + @prefix vcard: . + + <#this> + a vcard:AddressBook; + dc:title "Address Book"; + vcard:nameEmailIndex ; + vcard:groupIndex . + `, + 'https://alice.example.com/contacts/people.ttl': ` + @prefix vcard: . + + + vcard:inAddressBook ; + vcard:fn "Bobby Contact". + `, + 'https://alice.example.com/contacts/Person/bob/index.ttl': ` + @prefix rdf: . + @prefix vcard: . + + <#this> + a vcard:Individual; + vcard:fn "Bobby Contact"; + vcard:url [ + rdf:type vcard:URL; + vcard:value "https://bobby.example.com/" + ]; + vcard:url [ + rdf:type vcard:WebID; + vcard:value "https://bob.example.com/profile/card.ttl#me" + ]. + `, + 'https://alice.example.com/contacts/groups.ttl': ` + @prefix rdf: . + @prefix vcard: . + + + vcard:includesGroup . + + + rdf:type vcard:Group; + vcard:fn "Team Access". + `, + 'https://alice.example.com/contacts/Group/team.ttl': ` + @prefix rdf: . + @prefix vcard: . + + <#this> + rdf:type vcard:Group; + vcard:fn "Team Access". + `, + 'https://bob.example.com/profile/card.ttl': ` + @prefix foaf: . + @prefix vcard: . + + <#me> + a vcard:Individual; + foaf:name "Bob Example"; + foaf:knows . + `, + 'https://charlie.example.com/profile/card.ttl': ` + @prefix foaf: . + @prefix vcard: . + + <#me> + a vcard:Individual; + foaf:name "Charlie Example". + ` + } + + fetchMock.resetMocks() + fetchMock.mockIf(/^https?.*$/, async (req: Request) => { + if (req.method !== 'GET') { + return { status: 200, body: '' } + } + + if (req.url === DEFAULT_DIRECTORY_CATALOG_URL) { + return { + status: 200, + body: ` + @prefix cat: . + @prefix rdf: . + + <#zoe> + rdf:type cat:Person; + cat:webid ; + cat:name "Zoe Catalog". + `, + headers: { 'Content-Type': 'text/turtle' } + } + } + + const contents = web[req.url] + if (contents !== undefined) { + return { + status: 200, + body: contents, + headers: { + 'Content-Type': 'text/turtle', + 'WAC-Allow': 'user="write", public="read"', + 'Accept-Patch': 'application/sparql-update' + } + } + } + + return { status: 404, body: 'Not Found' } + }) + + const store = new Store() + store.fetcher = new Fetcher(store, { fetch }) + store.updater = new UpdateManager(store) + const authn = { + currentUser: () => alice + } + const utilityLogic = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store)) + const profileLogic = createProfileLogic(store, authn, utilityLogic) + const typeIndexLogic = createTypeIndexLogic(store, authn, profileLogic, utilityLogic) + directoryLogic = createDirectoryLogic(store as any, authn as any, typeIndexLogic) + }) + + it('returns contact entries when searching contacts only', async () => { + const entries = await directoryLogic.search({ query: 'bobby', sources: ['contacts'] }) + + expect(entries).toEqual([ + expect.objectContaining({ + kind: 'person', + uri: 'https://bob.example.com/profile/card.ttl#me', + label: 'Bobby Contact', + subjectType: 'agent', + relationshipLabel: 'Contact', + sources: ['contacts'] + }) + ]) + }) + + it('ignores non-WebID vcard:url values when resolving contacts', async () => { + const entries = await directoryLogic.search({ query: 'bobby', sources: ['contacts'] }) + + expect(entries).toEqual([ + expect.objectContaining({ + uri: 'https://bob.example.com/profile/card.ttl#me' + }) + ]) + }) + + it('returns group entries when searching groups only', async () => { + const entries = await directoryLogic.search({ query: 'team', sources: ['groups'] }) + + expect(entries).toEqual([ + expect.objectContaining({ + kind: 'group', + uri: 'https://alice.example.com/contacts/Group/team.ttl#this', + label: 'Team Access', + subjectType: 'agentGroup', + relationshipLabel: 'Group', + sources: ['groups'] + }) + ]) + }) + + it('returns foaf friends when searching friends only', async () => { + const entries = await directoryLogic.search({ query: 'bob', sources: ['friends'] }) + + expect(entries).toEqual([ + expect.objectContaining({ + kind: 'person', + uri: 'https://bob.example.com/profile/card.ttl#me', + label: 'Bob Example', + subjectType: 'agent', + relationshipLabel: 'Friend', + sources: ['friends'] + }) + ]) + }) + + it('keeps merged person labels and sources deterministic across concurrent discoveries', () => { + const contactEntry = { + kind: 'person' as const, + uri: 'https://bob.example.com/profile/card.ttl#me', + label: 'Bobby Contact', + subjectType: 'agent' as const, + relationshipLabel: 'Contact' as const, + sources: ['contacts' as const] + } + const friendEntry = { + kind: 'person' as const, + uri: 'https://bob.example.com/profile/card.ttl#me', + label: 'Bob Example', + subjectType: 'agent' as const, + relationshipLabel: 'Friend' as const, + sources: ['friends' as const] + } + + const firstOrder = new Map() + const secondOrder = new Map() + + mergeDirectoryEntry(firstOrder, contactEntry) + mergeDirectoryEntry(firstOrder, friendEntry) + mergeDirectoryEntry(secondOrder, friendEntry) + mergeDirectoryEntry(secondOrder, contactEntry) + + const mergedContactFirst = firstOrder.get(contactEntry.kind + ':' + contactEntry.uri) + const mergedFriendFirst = secondOrder.get(friendEntry.kind + ':' + friendEntry.uri) + + expect(mergedContactFirst).toBeDefined() + expect(mergedFriendFirst).toBeDefined() + if (!mergedContactFirst || !mergedFriendFirst) return + + expect(mergedContactFirst).toEqual(mergedFriendFirst) + expect(mergedContactFirst).toEqual(expect.objectContaining({ + label: 'Bobby Contact', + searchableLabels: expect.arrayContaining(['Bobby Contact', 'Bob Example']), + sources: ['contacts', 'friends'] + })) + expect(matchesAnyLabel([mergedContactFirst.label, ...(mergedContactFirst.searchableLabels ?? [])], 'bobby')).toBe(true) + expect(matchesAnyLabel([mergedFriendFirst.label, ...(mergedFriendFirst.searchableLabels ?? [])], 'bobby')).toBe(true) + }) + + it('returns catalog people when searching catalog only', async () => { + const entries = await directoryLogic.search({ query: 'zoe', sources: ['catalog'] }) + + expect(entries).toEqual([ + expect.objectContaining({ + kind: 'person', + uri: 'https://zoe.example.com/profile/card.ttl#me', + label: 'Zoe Catalog', + subjectType: 'agent', + relationshipLabel: 'People', + sources: ['catalog'] + }) + ]) + }) + + it('returns no entries when sources are explicitly empty', async () => { + const entries = await directoryLogic.search({ query: 'bob', sources: [] }) + + expect(entries).toEqual([]) + }) + + it('retries catalog fetches after a transient failure', async () => { + const catalogUrl = 'https://catalog.example.com/catalog.ttl' + let attempts = 0 + + fetchMock.mockIf(catalogUrl, async () => { + attempts += 1 + if (attempts === 1) { + return { status: 500, body: 'Transient failure' } + } + + return { + status: 200, + body: ` + @prefix cat: . + @prefix rdf: . + + <#zoe> + rdf:type cat:Person; + cat:webid ; + cat:name "Zoe Catalog". + `, + headers: { 'Content-Type': 'text/turtle' } + } + }) + + const firstEntries = await directoryLogic.search({ query: 'zoe', sources: ['catalog'], catalogUrl }) + const secondEntries = await directoryLogic.search({ query: 'zoe', sources: ['catalog'], catalogUrl }) + + expect(firstEntries).toEqual([]) + expect(secondEntries).toEqual([ + expect.objectContaining({ + kind: 'person', + uri: 'https://zoe.example.com/profile/card.ttl#me', + label: 'Zoe Catalog', + subjectType: 'agent', + relationshipLabel: 'People', + sources: ['catalog'] + }) + ]) + expect(attempts).toBe(2) + }) +}) diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 13ddca5b..0819e830 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -35,6 +35,8 @@ function buildResourceLogic(overrides: { store as any, { findAclDocUrl: vi.fn(overrides.findAclDocUrl ?? (async () => undefined)), + roleFromModes: vi.fn(), + modesFromRole: vi.fn(), setACLUserPublic: vi.fn(), genACLText: vi.fn() } as any, diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 5ce53b95..642f6e1b 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -37,6 +37,9 @@ describe('resourceLogic', () => { findAclDocUrl: vi.fn().mockResolvedValue(undefined), findEffectiveAcl: vi.fn().mockResolvedValue({ authorizations: [] }), findAccessGrants: vi.fn().mockResolvedValue([]), + classifyAccessControlSubject: vi.fn().mockResolvedValue(undefined), + roleFromModes: vi.fn(), + modesFromRole: vi.fn(), planGrant: vi.fn(), planRevoke: vi.fn(), planPublicRead: vi.fn(), From 879d79faf61c35742ee6d0265cfa6f676abe9715 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Wed, 7 Oct 2026 09:43:00 +1100 Subject: [PATCH 06/32] needed exported types --- package-lock.json | 4 ++-- package.json | 9 +++++---- src/index.ts | 1 + test/publicAclApi.test.ts | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 test/publicAclApi.test.ts diff --git a/package-lock.json b/package-lock.json index f419c514..cf55dab9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.0-1", + "version": "6.0.0-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.0-1", + "version": "6.0.0-2", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.0.0", diff --git a/package.json b/package.json index 0934f796..737ad0a3 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { "name": "solid-logic", - "version": "6.0.0-1", + "version": "6.0.0-2", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", "types": "dist/index.d.ts", "exports": { ".": { + "types": "./dist/index.d.ts", "import": "./dist/index.esm.js", - "require": "./dist/index.cjs.js", - "types": "./dist/index.d.ts" + "require": "./dist/index.cjs.js" } }, "sideEffects": false, @@ -20,7 +20,8 @@ ], "scripts": { "clean": "rm -rf dist src/versionInfo.ts", - "build": "npm run clean && npm run typecheck && vite build", + "build": "npm run clean && npm run typecheck && vite build && npm run build-types", + "build-types": "tsc --emitDeclarationOnly", "watch": "vite build --watch", "postbuild": "npm run postbuild-js", "postbuild-js": "rm -f dist/versionInfo.d.ts dist/versionInfo.d.ts.map dist/index.js dist/index.js.map", diff --git a/src/index.ts b/src/index.ts index dc9b8c56..4dc0f9ef 100644 --- a/src/index.ts +++ b/src/index.ts @@ -15,6 +15,7 @@ export { getSuggestedIssuers } from './issuer/issuerLogic' export { createTypeIndexLogic } from './typeIndex/typeIndexLogic' export { createDirectoryLogic, DEFAULT_DIRECTORY_CATALOG_URL, DEFAULT_DIRECTORY_SOURCES } from './directory/directoryLogic' export type { AccessControlSubjectKind, AccessControlSubject } from './acl/accessControlSubjects' +export type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from './types' export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' export { UnauthorizedError, CrossOriginForbiddenError, SameOriginForbiddenError, NotFoundError, FetchError, NotEditableError, WebOperationError } from './logic/CustomError' diff --git a/test/publicAclApi.test.ts b/test/publicAclApi.test.ts new file mode 100644 index 00000000..a2f99261 --- /dev/null +++ b/test/publicAclApi.test.ts @@ -0,0 +1,32 @@ +import { describe, expect, expectTypeOf, it } from 'vitest' +import { + ACCESS_ROLES, + solidLogicSingleton, + type ACLContext, + type AccessControlSubjectKind, + type AccessMode, + type AccessRole, + type AccessSubject, + type Authorization, + type PatchPlan +} from '../src' + +describe('public ACL API', () => { + it('exports the role list and exposes mapping through the singleton', () => { + expect(ACCESS_ROLES).toEqual(['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter']) + for (const role of ACCESS_ROLES) { + expect(solidLogicSingleton.acl.roleFromModes(solidLogicSingleton.acl.modesFromRole(role))).toBe(role) + } + }) + + it('exports the types used by access-control consumers', () => { + expectTypeOf(solidLogicSingleton.acl.modesFromRole).toEqualTypeOf<(role: AccessRole) => AccessMode[]>() + expectTypeOf(solidLogicSingleton.acl.roleFromModes).toEqualTypeOf<(modes: Iterable) => AccessRole>() + expectTypeOf(solidLogicSingleton.acl.findEffectiveAcl).returns.toEqualTypeOf>() + expectTypeOf(solidLogicSingleton.acl.findAccessGrants).returns.toEqualTypeOf>() + expectTypeOf(solidLogicSingleton.acl.planGrant).toEqualTypeOf< + (resource: string | import('rdflib').NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise + >() + expectTypeOf().toEqualTypeOf<'agent' | 'agentGroup' | 'agentClass' | 'origin'>() + }) +}) From 20af41ac9a373611e58d2a5f8024d76bc8af0243 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Thu, 8 Oct 2026 04:52:37 +1100 Subject: [PATCH 07/32] update version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf55dab9..2882960e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.0-2", + "version": "6.0.1-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.0-2", + "version": "6.0.1-0", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.0.0", diff --git a/package.json b/package.json index 737ad0a3..6a6757da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.0-2", + "version": "6.0.1-0", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", From 52001b987f75a6bfd7d800c4dc8f8591503c096b Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 9 Oct 2026 17:14:49 +1100 Subject: [PATCH 08/32] support the general access dialog section Prompt: tests were added by ai, multiple prompts Co-authored-by: GPT-5.4 Mini --- package-lock.json | 4 ++-- package.json | 2 +- src/acl/aclLogic.ts | 27 +++++++++++++++++++++++++-- src/index.ts | 4 ++-- src/types.ts | 7 ++++++- test/publicAclApi.test.ts | 14 +++++++++++++- test/resource/resourceLogic.test.ts | 7 ++++++- test/resourceLogic.test.ts | 7 ++++++- 8 files changed, 61 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2882960e..f45c9dd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.1-0", + "version": "6.0.1-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.1-0", + "version": "6.0.1-1", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.0.0", diff --git a/package.json b/package.json index 6a6757da..feb0fed0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.1-0", + "version": "6.0.1-1", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index e07307b0..a73f3922 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -1,4 +1,4 @@ -import { applyPlan as applyAuthorizationPlan, findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, planRevoke as planAuthorizationRevoke, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' +import { applyPlan as applyAuthorizationPlan, Authenticated, findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, planRevoke as planAuthorizationRevoke, Public, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' import { graph, NamedNode, Namespace, serialize, sym } from 'rdflib' import type { AclLogic } from '../types' import { ns as namespace } from '../util/ns' @@ -15,8 +15,11 @@ import * as accessControlSubjects from './accessControlSubjects' // - Terms and constants: ACCESS_MODES, ACL, Authenticated, FOAF, modeFromIRI, modeIRI, namedNode, Public, quad, RDF_TYPE, variable export const ACCESS_ROLES = ['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter'] as const +export const PUBLIC_ACCESS_ROLES = ['No Access', 'Viewer'] as const +export { Authenticated, Public } from '@dokieli/web-access-control' export type AccessRole = typeof ACCESS_ROLES[number] +export type PublicAccessRole = typeof PUBLIC_ACCESS_ROLES[number] export const ACL_LINK = sym( 'http://www.iana.org/assignments/link-relations/acl' @@ -33,6 +36,10 @@ export function createAclLogic(store): AclLogic { { label: 'Viewer', modes: ['Read'] }, { label: 'No Access', modes: [] } ] + const PUBLIC_ROLE_RULES: Array<{ label: PublicAccessRole, modes: AccessMode[] }> = [ + { label: 'Viewer', modes: ['Read'] }, + { label: 'No Access', modes: [] } + ] function roleFromModes (modes: Iterable): AccessRole { const modeSet = new Set(modes) @@ -45,6 +52,17 @@ export function createAclLogic(store): AclLogic { return [...(ACCESS_ROLE_RULES.find(rule => rule.label === role)?.modes ?? [])] } + function publicRoleFromModes (modes: Iterable): PublicAccessRole { + const modeSet = new Set(modes) + const matchingRule = PUBLIC_ROLE_RULES.find(rule => rule.label !== 'No Access' && rule.modes.every(mode => modeSet.has(mode))) + + return matchingRule?.label ?? 'No Access' + } + + function modesFromPublicRole (role: PublicAccessRole): AccessMode[] { + return [...(PUBLIC_ROLE_RULES.find(rule => rule.label === role)?.modes ?? [])] + } + function getFetch() { const fetcher = store.fetcher as { _fetch?: (url: string, init?: RequestInit) => Promise @@ -232,12 +250,17 @@ export function createAclLogic(store): AclLogic { findAccessGrants, roleFromModes, modesFromRole, + publicRoleFromModes, + modesFromPublicRole, planGrant, planRevoke, planPublicRead, applyPlan, classifyAccessControlSubject, setACLUserPublic, - genACLText + genACLText, + Authenticated, + Public, + PUBLIC_ACCESS_ROLES } } \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 4dc0f9ef..8cefa819 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,8 +6,8 @@ const authn = solidLogicSingleton.authn const authSession = solidLogicSingleton.authn.authSession const store = solidLogicSingleton.store -export { ACL_LINK, ACCESS_ROLES } from './acl/aclLogic' -export type { AccessRole } from './acl/aclLogic' +export { ACL_LINK, ACCESS_ROLES, PUBLIC_ACCESS_ROLES, Authenticated, Public } from './acl/aclLogic' +export type { AccessRole, PublicAccessRole } from './acl/aclLogic' export { offlineTestID, appContext } from './authn/authUtil' export { performServerSideLogout } from './authn/serverLogout' export { reloadOnIdentityReplaced } from './authSession/identityState' diff --git a/src/types.ts b/src/types.ts index eea8426d..d5deb033 100644 --- a/src/types.ts +++ b/src/types.ts @@ -2,7 +2,7 @@ import type { SessionWithLegacyEvents } from './authSession/authSession' import type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from '@dokieli/web-access-control' import { LiveStore, NamedNode, Statement } from 'rdflib' import type { AccessControlSubject } from './acl/accessControlSubjects' -import type { AccessRole } from './acl/aclLogic' +import type { AccessRole, PublicAccessRole } from './acl/aclLogic' export type AppDetails = { noun: string @@ -87,6 +87,8 @@ export interface AclLogic { classifyAccessControlSubject: (principle: string) => Promise, roleFromModes: (modes: Iterable) => AccessRole, modesFromRole: (role: AccessRole) => AccessMode[], + publicRoleFromModes: (modes: Iterable) => PublicAccessRole, + modesFromPublicRole: (role: PublicAccessRole) => AccessMode[], planGrant: (resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, planRevoke: (resourceURL: string | NamedNode, subject: AccessSubject) => Promise, planPublicRead: (resourceURL: string | NamedNode, enabled: boolean) => Promise, @@ -103,6 +105,9 @@ export interface AclLogic { public?: [] } ) => string | undefined + Authenticated: AccessSubject + Public: AccessSubject + PUBLIC_ACCESS_ROLES: readonly PublicAccessRole[] } export type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } diff --git a/test/publicAclApi.test.ts b/test/publicAclApi.test.ts index a2f99261..984864bc 100644 --- a/test/publicAclApi.test.ts +++ b/test/publicAclApi.test.ts @@ -1,6 +1,9 @@ import { describe, expect, expectTypeOf, it } from 'vitest' import { ACCESS_ROLES, + Authenticated, + PUBLIC_ACCESS_ROLES, + Public, solidLogicSingleton, type ACLContext, type AccessControlSubjectKind, @@ -8,15 +11,22 @@ import { type AccessRole, type AccessSubject, type Authorization, - type PatchPlan + type PatchPlan, + type PublicAccessRole } from '../src' describe('public ACL API', () => { it('exports the role list and exposes mapping through the singleton', () => { expect(ACCESS_ROLES).toEqual(['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter']) + expect(PUBLIC_ACCESS_ROLES).toEqual(['No Access', 'Viewer']) + expect(Authenticated).toMatchObject({ type: 'agentClass', iri: 'http://www.w3.org/ns/auth/acl#AuthenticatedAgent' }) + expect(Public).toMatchObject({ type: 'agentClass', iri: 'http://xmlns.com/foaf/0.1/Agent' }) for (const role of ACCESS_ROLES) { expect(solidLogicSingleton.acl.roleFromModes(solidLogicSingleton.acl.modesFromRole(role))).toBe(role) } + for (const role of PUBLIC_ACCESS_ROLES) { + expect(solidLogicSingleton.acl.publicRoleFromModes(solidLogicSingleton.acl.modesFromPublicRole(role))).toBe(role) + } }) it('exports the types used by access-control consumers', () => { @@ -27,6 +37,8 @@ describe('public ACL API', () => { expectTypeOf(solidLogicSingleton.acl.planGrant).toEqualTypeOf< (resource: string | import('rdflib').NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise >() + expectTypeOf(solidLogicSingleton.acl.publicRoleFromModes).toEqualTypeOf<(modes: Iterable) => PublicAccessRole>() + expectTypeOf(solidLogicSingleton.acl.modesFromPublicRole).toEqualTypeOf<(role: PublicAccessRole) => AccessMode[]>() expectTypeOf().toEqualTypeOf<'agent' | 'agentGroup' | 'agentClass' | 'origin'>() }) }) diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 0819e830..1e79fdd3 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -37,8 +37,13 @@ function buildResourceLogic(overrides: { findAclDocUrl: vi.fn(overrides.findAclDocUrl ?? (async () => undefined)), roleFromModes: vi.fn(), modesFromRole: vi.fn(), + publicRoleFromModes: vi.fn(), + modesFromPublicRole: vi.fn(), setACLUserPublic: vi.fn(), - genACLText: vi.fn() + genACLText: vi.fn(), + Authenticated: { type: 'agentClass', iri: 'http://www.w3.org/ns/acl#AuthenticatedAgent' }, + Public: { type: 'agentClass', iri: 'http://xmlns.com/foaf/0.1/Agent' }, + PUBLIC_ACCESS_ROLES: ['No Access', 'Viewer'] } as any, { createContainer: vi.fn(async () => undefined), diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 642f6e1b..05ce7615 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -40,12 +40,17 @@ describe('resourceLogic', () => { classifyAccessControlSubject: vi.fn().mockResolvedValue(undefined), roleFromModes: vi.fn(), modesFromRole: vi.fn(), + publicRoleFromModes: vi.fn(), + modesFromPublicRole: vi.fn(), planGrant: vi.fn(), planRevoke: vi.fn(), planPublicRead: vi.fn(), applyPlan: vi.fn(), setACLUserPublic: vi.fn(), - genACLText: vi.fn() + genACLText: vi.fn(), + Authenticated: { type: 'agentClass', iri: 'http://www.w3.org/ns/acl#AuthenticatedAgent' }, + Public: { type: 'agentClass', iri: 'http://xmlns.com/foaf/0.1/Agent' }, + PUBLIC_ACCESS_ROLES: ['No Access', 'Viewer'] } containerLogic = { createContainer: vi.fn(), From f9eb986705255faa18fef6dbb953a22e50db7306 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 9 Oct 2026 18:39:17 +1100 Subject: [PATCH 09/32] Fix AuthenticatedAgent IRI in resourceLogic test Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- test/resource/resourceLogic.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 1e79fdd3..661e9488 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -41,7 +41,7 @@ function buildResourceLogic(overrides: { modesFromPublicRole: vi.fn(), setACLUserPublic: vi.fn(), genACLText: vi.fn(), - Authenticated: { type: 'agentClass', iri: 'http://www.w3.org/ns/acl#AuthenticatedAgent' }, + Authenticated: { type: 'agentClass', iri: 'http://www.w3.org/ns/auth/acl#AuthenticatedAgent' }, Public: { type: 'agentClass', iri: 'http://xmlns.com/foaf/0.1/Agent' }, PUBLIC_ACCESS_ROLES: ['No Access', 'Viewer'] } as any, From ab36e23d2c91b4ae30a496c7a97a141e9cb6c468 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 9 Oct 2026 18:39:30 +1100 Subject: [PATCH 10/32] Fix AuthenticatedAgent IRI in resourceLogic test Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- test/resourceLogic.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 05ce7615..63d02776 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -48,7 +48,7 @@ describe('resourceLogic', () => { applyPlan: vi.fn(), setACLUserPublic: vi.fn(), genACLText: vi.fn(), - Authenticated: { type: 'agentClass', iri: 'http://www.w3.org/ns/acl#AuthenticatedAgent' }, + Authenticated: { type: 'agentClass', iri: 'http://www.w3.org/ns/auth/acl#AuthenticatedAgent' }, Public: { type: 'agentClass', iri: 'http://xmlns.com/foaf/0.1/Agent' }, PUBLIC_ACCESS_ROLES: ['No Access', 'Viewer'] } From e8e6dd045fd1af59c4458205ec33b37920ba0cdb Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sat, 10 Oct 2026 05:29:20 +1100 Subject: [PATCH 11/32] change dokeili version, trying to trigger publish --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f45c9dd6..0cb3c5aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "6.0.1-1", "license": "MIT", "dependencies": { - "@dokieli/web-access-control": "^1.0.0", + "@dokieli/web-access-control": "^1.1.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", "solid-namespace": "^0.5.4", "vite": "^8.0.16", @@ -1952,9 +1952,9 @@ } }, "node_modules/@dokieli/web-access-control": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@dokieli/web-access-control/-/web-access-control-1.0.0.tgz", - "integrity": "sha512-KEmpqbEtGTxk2+YUK69GHWwgO5c34foOF6AClTfvqk3O9r5RaEAYa+L0sRaOLfWs1eCXt/quqqFpFzEwC7IP6Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@dokieli/web-access-control/-/web-access-control-1.1.0.tgz", + "integrity": "sha512-LId2cNz0pKafc6dwohaX6j+mr886uEV2o8L0VrAWUDxU0LPN4+8Yc8Yx3D94zrsRSJuBWRtQzSjgtEqhYg5y/w==", "license": "Apache-2.0", "dependencies": { "@rdfjs/data-model": "^2.1.1", diff --git a/package.json b/package.json index feb0fed0..72b83cb1 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "solidos-toolkit": "dev" }, "dependencies": { - "@dokieli/web-access-control": "^1.0.0", + "@dokieli/web-access-control": "^1.1.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", "solid-namespace": "^0.5.4", "vite": "^8.0.16", From c518df7357555a583d98661ac6e1d9f50c75a20d Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Wed, 14 Oct 2026 14:24:30 +1100 Subject: [PATCH 12/32] saving latest work --- package-lock.json | 1182 +++++++----------------------- src/acl/accessControlSubjects.ts | 13 +- src/index.ts | 2 +- src/resource/resourceLogic.ts | 41 ++ src/types.ts | 5 + test/aclLogic.test.ts | 1 + 6 files changed, 303 insertions(+), 941 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cb3c5aa..b99ad9fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -227,14 +227,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": { @@ -272,14 +272,14 @@ } }, "node_modules/@babel/helper-define-polyfill-provider/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" }, @@ -468,14 +468,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" @@ -1779,9 +1779,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==", "dev": true, "license": "MIT", "engines": { @@ -1804,16 +1804,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" @@ -1847,9 +1847,9 @@ } }, "node_modules/@csstools/cascade-layer-name-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-3.0.0.tgz", - "integrity": "sha512-/3iksyevwRfSJx5yH0RkcrcYXwuhMQx3Juqf40t97PeEy2/Mz2TItZ/z/216qpe4GgOyFBP8MKIwVvytzHmfIQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-3.0.2.tgz", + "integrity": "sha512-B731RJ9pfJj3D5GJPp8ccsaaHMdwBmlOb4QWAYQUFpmMxonxJvNeeIoo0E89CjMJaKDvQXy9MKpSXY/i7XgeFA==", "dev": true, "funding": [ { @@ -1866,14 +1866,14 @@ "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^4.0.0", - "@csstools/css-tokenizer": "^4.0.0" + "@csstools/css-parser-algorithms": "^4.0.2", + "@csstools/css-tokenizer": "^4.0.2" } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz", - "integrity": "sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.2.tgz", + "integrity": "sha512-40cSKyMvK+tq4qz6Awrlye2WGuOKt3FwPgtGg6KTfbHOWNw+Rk1rzbAtZnZ6IBhsY491HLRnDXwoyBAijmmILA==", "dev": true, "funding": [ { @@ -1890,13 +1890,13 @@ "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-tokenizer": "^4.0.0" + "@csstools/css-tokenizer": "^4.0.2" } }, "node_modules/@csstools/css-tokenizer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.1.tgz", - "integrity": "sha512-bPlN9S9O1A0euCpEWE4qnvB5YDuyYVsUTrxSgmAM1Is0j4tICHoVyOVAXfWMP/kS9ZrjvyIXWV2PmomiAXXqOw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.2.tgz", + "integrity": "sha512-OoKoR0f76dCY666JlcbhmVTs2drYj1GUXZTYTcbUgJjh9Nv41aFfZ21bPQTERm5+L5cBDo466NltB2lplS5GBw==", "dev": true, "funding": [ { @@ -1914,9 +1914,9 @@ } }, "node_modules/@csstools/media-query-list-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-5.0.0.tgz", - "integrity": "sha512-T9lXmZOfnam3eMERPsszjY5NK0jX8RmThmmm99FZ8b7z8yMaFZWKwLWGZuTwdO3ddRY5fy13GmmEYZXB4I98Eg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-5.0.2.tgz", + "integrity": "sha512-qx19O8AbbLLbDSAcI6YOby/Vq8rV51psgIvlF5OZT/L8fQJDCyQifL6k+kYU4a8ySpzJ4RBzZkIs530bAn8y4Q==", "dev": true, "funding": [ { @@ -1933,8 +1933,8 @@ "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^4.0.0", - "@csstools/css-tokenizer": "^4.0.0" + "@csstools/css-parser-algorithms": "^4.0.2", + "@csstools/css-tokenizer": "^4.0.2" } }, "node_modules/@digitalbazaar/http-client": { @@ -2281,7 +2281,7 @@ "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -2303,65 +2303,34 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" } }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", - "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", - "devOptional": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" - } - }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.6.0.tgz", - "integrity": "sha512-VHb0ALPMTlgKjM6yIxxoQNnpKyUKLD04VzeQdsiXkMqkvYlAHxq9glGLmgbb889/1GsohSOAjvQYoiBppXFqrQ==", - "dev": true, - "license": "BSD-3-Clause", - "peer": true - }, - "node_modules/@lit/reactive-element": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.1.2.tgz", - "integrity": "sha512-pbCDiVMnne1lYUIaYNN5wrwQXDtHaYtg7YEFPeW+hws6U47WeFvISGUWekPGKWOP1ygrs0ef0o1VJMk1exos5A==", - "dev": true, - "license": "BSD-3-Clause", - "peer": true, - "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.5.0" - } - }, "node_modules/@oxc-project/types": { - "version": "0.151.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.151.0.tgz", - "integrity": "sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==", + "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" @@ -2386,9 +2355,9 @@ } }, "node_modules/@rolldown/binding-android-arm-eabi": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.10.tgz", - "integrity": "sha512-bp9svZb+QurZeh+8H4BhrZkifEB0YBNvTVzNSJnJQkj4NrRwmQoDUCGP0vSN7PbvLeM7l1tK6GXL8mrTiH2myg==", + "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" ], @@ -2402,9 +2371,9 @@ } }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.10.tgz", - "integrity": "sha512-wm6Dld3RXUAZ/gRWKyUy+4W1B5CB5UeFaOzsSWJWEdxZXHH8rCYiZ5dGe6oJmhsunAPWzL7FZV+VtvmN5Ye2eA==", + "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" ], @@ -2418,9 +2387,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.10.tgz", - "integrity": "sha512-UbEfXq/AqGNgRTV3ik+X/iR6mUxu2QdYAadwRxJWquUGnW6gDqdP1FtLtFXRow7RJx0ssRwi80XAPr4r+4DtsA==", + "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" ], @@ -2434,9 +2403,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.10.tgz", - "integrity": "sha512-7f5h17q5KZVx/ji1vb8OTq31ch1O2I7K8NPIr44GkyWTApXMIsmhWqZfgpOH10xeauqghDAvGlZktasCkcF6Eg==", + "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" ], @@ -2450,9 +2419,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.10.tgz", - "integrity": "sha512-ynOk/eEYhC6ZB2xCGvKrEOwE58oBy9LnrAqtkrDF9Fz1VTaNdGZTsV0VarJdhPwb+sOJTGjCLwcuyRJZ1dnMcQ==", + "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" ], @@ -2466,9 +2435,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.10.tgz", - "integrity": "sha512-ERrAs185meZZhGan7a4l3RiiJK1ArSDlHdST++uvSxe+FDbR4TwUPahT/cbZJvaG6fIpDpF78surN+tX708Y4Q==", + "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" ], @@ -2482,9 +2451,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.10.tgz", - "integrity": "sha512-KN7OHKD0J3jy1UzBwZWPxpwhODf9IARUIJcrH+yLYKOcmegZ8luEUM38lDP1bDVj40yP6PsSzCqOJF76vljFnQ==", + "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" ], @@ -2501,9 +2470,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.10.tgz", - "integrity": "sha512-8l9wP8O+wa8zD6iw6egSfzVtu7oZVfH3hlUsMM4MwbLMhxleqeoXbZzjddyK3YyNlwLhqznq3tF7PkNJ8T/V2w==", + "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" ], @@ -2520,9 +2489,9 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.10.tgz", - "integrity": "sha512-SeXNKeQzA5kLhz/J0CH6ZP0/HJ3v1xm/0YbiYpE0kK7emfRC2OIGGIaE14xzkISEGv2aYuUSpiLiU5Gbq+OI0A==", + "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" ], @@ -2539,9 +2508,9 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.10.tgz", - "integrity": "sha512-mtht0nR+y8/hart4175Ll15w7lY8dg7CtQ+j2FDNTsDRspOWTK/2V3l0aj9sIj7XmvqxT8Yli/wq22e7feTTWg==", + "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" ], @@ -2558,9 +2527,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.10.tgz", - "integrity": "sha512-FSM94nGd55NYo48usCyM/nHfUKRnqc9+b0vJNuKV0oCCpIp/OGims7rO1Nv/DkFkt0S/s2rxsJ2kkS8J3HcpeA==", + "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" ], @@ -2577,9 +2546,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.10.tgz", - "integrity": "sha512-C3YxNB16myRLs7o+B+6PnQ6jBsdIS4+AE4Ah8glVGhDpEv9AOvxhZ/1duAb4B0UGczEK/lBbccksd8VI+p6zfw==", + "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" ], @@ -2596,9 +2565,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.10.tgz", - "integrity": "sha512-571TlE/F1eeTjjdjYAMMMPs1Mfv3MtX6s3+ZKVU6HiUjZ5Njc6c/qzNy/8K3zALTZnaw3JQVYrHxvNfjm43KAg==", + "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" ], @@ -2612,9 +2581,9 @@ } }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.10.tgz", - "integrity": "sha512-QXW+ZWaiqs2c7Fi++D/SsW07LTPcUrncxcskJGfGNBoaLik1IU6fJymz4HsqwEO0u5Iq11yTO0B/mc4cPk7jrQ==", + "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" ], @@ -2628,9 +2597,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.10.tgz", - "integrity": "sha512-5FQFGgah17YeMtG1Yd5a+rMxQpTksyNXxRtKz06FVTaQw3RKYUJQbUoKk0/5jrXBpDo+7makNP7UHA2LQyH64A==", + "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" ], @@ -2774,33 +2743,25 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.2.tgz", - "integrity": "sha512-X1P21scMv4zGKLYqjdGjaKa7COa0RKVYYZZN/NfvLQ1JegxFhdhpZG/Lyn8AXx6CDUavKAd11v6BvfpkDByK8g==", + "version": "26.6.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz", + "integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==", "license": "MIT", "dependencies": { "undici-types": "~8.9.0" } }, - "node_modules/@types/trusted-types": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/@typescript-eslint/parser": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.70.1.tgz", - "integrity": "sha512-nO974WLllwhSFWQXnMLj6nDGa8f0khKEz1JzpPJ1u7Vm/4X1X6ZHajpoknU4bb41vJyMB0HHVyS2GqdhWfIXZw==", + "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.70.1", - "@typescript-eslint/types": "8.70.1", - "@typescript-eslint/typescript-estree": "8.70.1", - "@typescript-eslint/visitor-keys": "8.70.1", + "@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": { @@ -2816,14 +2777,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.70.1.tgz", - "integrity": "sha512-62xOgboPfwc3/IgPSX/W6oQR3ZbF04194FPGUGH8HL8iLFHbt/456/8Ph1wLNUgVF+s94FlHoipBsz+v7+LMnA==", + "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.70.1", - "@typescript-eslint/types": "^8.70.1", + "@typescript-eslint/tsconfig-utils": "^8.71.1", + "@typescript-eslint/types": "^8.71.1", "debug": "^4.4.3" }, "engines": { @@ -2838,14 +2799,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.70.1.tgz", - "integrity": "sha512-Pa0EeSeAusQc1WbjQMac+YfenewYTBu0KjgYvkUKwhXaHUKbFog23Dm/rp0DX/6tyYOQ3Xl1a+3EcFNZynGHCw==", + "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.70.1", - "@typescript-eslint/visitor-keys": "8.70.1" + "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/visitor-keys": "8.71.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2856,9 +2817,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.70.1.tgz", - "integrity": "sha512-jumze1fPI+sDOaM2TWGQdn39PDxTr7TZGeuyLkAbNyx2vtMT3uRnVKChN0hfht5V2TugphJzF6bYXvBcE09qqg==", + "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": { @@ -2873,9 +2834,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.70.1.tgz", - "integrity": "sha512-Dm1ypdhhrGCTyyehxElhgJ6kgk8MVCv5qXdoOVqPr1uqk42jX8KjrZqhROvdShczA8qrDoYiOWn1ykWlx2k81Q==", + "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": { @@ -2887,16 +2848,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.70.1.tgz", - "integrity": "sha512-TU8PwyGN0PQJUcE96mw8eCQ44SmxGdQlJmlWakHaHQ15eIuuvye5yNtmh/i6oS88jzXVQB71xdNkbkB/fMwL0g==", + "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.70.1", - "@typescript-eslint/tsconfig-utils": "8.70.1", - "@typescript-eslint/types": "8.70.1", - "@typescript-eslint/visitor-keys": "8.70.1", + "@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", @@ -2915,13 +2876,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.70.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.70.1.tgz", - "integrity": "sha512-Vwj9lUIW5Xq3wQ9w6gv3R86g1hMK8f2zNOdGTAgeXUMMXFK78G9ruCjjqutHMNJc0+CH7LYRnHeUB9IT8wFmcw==", + "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.70.1", + "@typescript-eslint/types": "8.71.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -3114,182 +3075,6 @@ "vscode-uri": "^3.0.8" } }, - "node_modules/@webassemblyjs/ast": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", - "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.13.2", - "@webassemblyjs/helper-wasm-bytecode": "1.13.2" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", - "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", - "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", - "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", - "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.13.2", - "@webassemblyjs/helper-api-error": "1.13.2", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", - "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", - "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.14.1", - "@webassemblyjs/helper-buffer": "1.14.1", - "@webassemblyjs/helper-wasm-bytecode": "1.13.2", - "@webassemblyjs/wasm-gen": "1.14.1" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", - "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", - "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", - "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", - "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.14.1", - "@webassemblyjs/helper-buffer": "1.14.1", - "@webassemblyjs/helper-wasm-bytecode": "1.13.2", - "@webassemblyjs/helper-wasm-section": "1.14.1", - "@webassemblyjs/wasm-gen": "1.14.1", - "@webassemblyjs/wasm-opt": "1.14.1", - "@webassemblyjs/wasm-parser": "1.14.1", - "@webassemblyjs/wast-printer": "1.14.1" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", - "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.14.1", - "@webassemblyjs/helper-wasm-bytecode": "1.13.2", - "@webassemblyjs/ieee754": "1.13.2", - "@webassemblyjs/leb128": "1.13.2", - "@webassemblyjs/utf8": "1.13.2" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", - "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.14.1", - "@webassemblyjs/helper-buffer": "1.14.1", - "@webassemblyjs/wasm-gen": "1.14.1", - "@webassemblyjs/wasm-parser": "1.14.1" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", - "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.14.1", - "@webassemblyjs/helper-api-error": "1.13.2", - "@webassemblyjs/helper-wasm-bytecode": "1.13.2", - "@webassemblyjs/ieee754": "1.13.2", - "@webassemblyjs/leb128": "1.13.2", - "@webassemblyjs/utf8": "1.13.2" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", - "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.14.1", - "@xtuc/long": "4.2.2" - } - }, "node_modules/@xmldom/xmldom": { "version": "0.9.12", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.12.tgz", @@ -3300,22 +3085,6 @@ "node": ">=14.6" } }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "license": "BSD-3-Clause", - "peer": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "license": "Apache-2.0", - "peer": true - }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -3337,10 +3106,10 @@ } }, "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==", - "devOptional": true, + "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": { "acorn": "bin/acorn" @@ -3413,51 +3182,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, - "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", - "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -3741,9 +3465,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.11.25", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.25.tgz", - "integrity": "sha512-gMmEShwwq7FJqMwvfRwvCl00v4kN+KOfJqXn+f4nrufak5gNHJOksd/60Dvjuz7sI8Y5WiSFBa8FEYr+zoyqCw==", + "version": "2.11.28", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.28.tgz", + "integrity": "sha512-br0LOmjJqr6Rt4AEkadbcNf67Zpo7EPwKsWbjnRrJIa1QYFHQBqM4C7F2WTbV8ahTEcg1Eo+Y0aWjjORInYFyA==", "dev": true, "license": "Apache-2.0", "bin": { @@ -3767,9 +3491,9 @@ } }, "node_modules/browserslist": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.0.tgz", - "integrity": "sha512-3GSvyjvDI4Dur1Meg2BekJquu5uF+9R9a1+5M1Mde192eZoXbeXjzgOsgqPS2V8D5wrrip0gR5Hf/GhWQ9ZzaA==", + "version": "4.29.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.3.tgz", + "integrity": "sha512-1R4kiYKXGViqEN0CnoDrXc1StD9niAwu+j2dukWzrD4bJgsD4lDmEp0CRbc6E/vYJIfTHwPmwyaKtVSudICdPA==", "dev": true, "funding": [ { @@ -3787,10 +3511,10 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.11.23", - "caniuse-lite": "^1.0.30001810", - "electron-to-chromium": "^1.5.427", - "node-releases": "^2.0.55", + "baseline-browser-mapping": "^2.11.26", + "caniuse-lite": "^1.0.30001813", + "electron-to-chromium": "^1.5.439", + "node-releases": "^2.0.57", "update-browserslist-db": "^1.3.3" }, "bin": { @@ -3824,14 +3548,6 @@ "ieee754": "^1.2.1" } }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "devOptional": true, - "license": "MIT", - "peer": true - }, "node_modules/call-bind": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz", @@ -3893,9 +3609,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001812", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001812.tgz", - "integrity": "sha512-qN+QNNBr93TCmFrmte0bBCjSDMuRvt78VlHT99qIGPszm4QsqCX8lnyWUFkHi8B7ZBAPq8SH+UqyXNy/odMdng==", + "version": "1.0.30001815", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001815.tgz", + "integrity": "sha512-uDybUEyfgbyJJ93J1vikTylBX31AkdVYeVPeffMQpf8XN7hSfr0oZOn4VFOIMNvtU5+rHvC5Udg2TgtJKHm23Q==", "dev": true, "funding": [ { @@ -3924,9 +3640,9 @@ } }, "node_modules/chai": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", - "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz", + "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==", "dev": true, "license": "MIT", "engines": { @@ -3950,17 +3666,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chrome-trace-event": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", - "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=6.0" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -3994,14 +3699,6 @@ "node": ">= 0.8" } }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "devOptional": true, - "license": "MIT", - "peer": true - }, "node_modules/compare-versions": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz", @@ -4284,27 +3981,12 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.438", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.438.tgz", - "integrity": "sha512-AN9xMU1hJiT65LkCUPL1DZm5TCbOPb2Qsm5pYwFLEXp6/qj9SdT4yMiqs7Qqstwvkn1zF7l36SRGt+s6XcJ0FA==", + "version": "1.5.452", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.452.tgz", + "integrity": "sha512-cVvk1YBSj6571VmV6hdJTqj94Y79xSu8cj6Y9t6ae4Y4431z8/7EJFvu3rVp90xhfuv9BpPKUmaLfTo4+FOGBg==", "dev": true, "license": "ISC" }, - "node_modules/enhanced-resolve": { - "version": "5.25.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.25.1.tgz", - "integrity": "sha512-nGXts5znJzmWPu+mIE9izCOzdg63oJca2mDzGWWTth7sr4aCToKcoyFVBQwN75Ij5Pf6p510EwkTqViTRzDV+w==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.3.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/entities": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", @@ -4957,9 +4639,9 @@ } }, "node_modules/exsolve": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.1.tgz", - "integrity": "sha512-9U/jZUgjnSGyntRr6y5Muu1MJcwFl6kPu7k8qLF0IMNfLqvw0NZ4nnVDq0RVoZ0RvCyumib4Ez3KYrVfilrw+g==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.3.tgz", + "integrity": "sha512-kuzL9zherLQoqDeQaS55AiiIg1kb4KYXaSusTtgZTPlvKP2gGCI82LNmBNh5RjDVUXIcmgx+/Mx7vPwRzBbhJA==", "dev": true, "license": "MIT" }, @@ -4984,24 +4666,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-uri": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz", - "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "BSD-3-Clause", - "peer": true - }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -5301,14 +4965,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC", - "peer": true - }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -6006,39 +5662,6 @@ "node": ">=8" } }, - "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/jose": { "version": "5.10.0", "resolved": "https://registry.npmjs.org/jose/-/jose-5.10.0.tgz", @@ -6492,43 +6115,6 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/lit": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.3.3.tgz", - "integrity": "sha512-fycuvZg/hkpozL00lm1pEJH5nN/lr9ZXd6mJI2HSN4+Bzc+LDNdEApJ6HFbPkdFNHLvOplIIuJvxkS4XUxqirw==", - "dev": true, - "license": "BSD-3-Clause", - "peer": true, - "dependencies": { - "@lit/reactive-element": "^2.1.0", - "lit-element": "^4.2.0", - "lit-html": "^3.3.0" - } - }, - "node_modules/lit-element": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.2.2.tgz", - "integrity": "sha512-aFKhNToWxoyhkNDmWZwEva2SlQia+jfG0fjIWV//YeTaWrVnOxD89dPKfigCUspXFmjzOEUQpOkejH5Ly6sG0w==", - "dev": true, - "license": "BSD-3-Clause", - "peer": true, - "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.5.0", - "@lit/reactive-element": "^2.1.0", - "lit-html": "^3.3.0" - } - }, - "node_modules/lit-html": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.3.3.tgz", - "integrity": "sha512-el8M6jK2o3RXBnrSHX3ZKrsN8zEV63pSExTO1wYJz7QndGYZ8353e2a5PPX+qHe2aGayfnchQmkAojaWAREOIA==", - "dev": true, - "license": "BSD-3-Clause", - "peer": true, - "dependencies": { - "@types/trusted-types": "^2.0.2" - } - }, "node_modules/local-pkg": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.2.1.tgz", @@ -6638,14 +6224,6 @@ "node": ">= 0.4" } }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -6695,80 +6273,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/minimizer-webpack-plugin": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.11.0.tgz", - "integrity": "sha512-2JVy2DY+iBtfRyrQB5cRM7lfurnJIi6jFTgLip/7FxDu0WxswrIRzr4fBySQ0X7HqM7BcwE28zm+HfQ5V6y4Cg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.31", - "jest-worker": "^27.4.5", - "schema-utils": "^4.3.3", - "terser": "^5.51.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@minify-html/node": { - "optional": true - }, - "@napi-rs/image": { - "optional": true - }, - "@swc/core": { - "optional": true - }, - "@swc/css": { - "optional": true - }, - "@swc/html": { - "optional": true - }, - "clean-css": { - "optional": true - }, - "cssnano": { - "optional": true - }, - "csso": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "html-minifier-terser": { - "optional": true - }, - "imagemin": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "postcss": { - "optional": true - }, - "sharp": { - "optional": true - }, - "svgo": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, "node_modules/mlly": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.2.tgz", @@ -6809,9 +6313,9 @@ "license": "MIT" }, "node_modules/n3": { - "version": "2.7.12", - "resolved": "https://registry.npmjs.org/n3/-/n3-2.7.12.tgz", - "integrity": "sha512-Hy6dfGg9yniLQpSBirvH2E2yO3EG7dSmA3aefRbtO411oqtzG8roD3h1kTc/N065bivCOPfTFIjf0KlwW7KlnQ==", + "version": "2.13.12", + "resolved": "https://registry.npmjs.org/n3/-/n3-2.13.12.tgz", + "integrity": "sha512-z944NsyJi58WXcYevtNkUL2JhVr0KP6nvED9AgymQq5V35TDaNn1N8kO+OWJk/kj4PR0L/ilWB3d7/bWceg1CQ==", "license": "MIT", "dependencies": { "buffer": "^6.0.3", @@ -6822,9 +6326,9 @@ } }, "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", @@ -6922,9 +6426,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.57", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.57.tgz", - "integrity": "sha512-kQK9LGGFiHtrWiNhZtA7Qbw17AQz+dmsEKODRIVTXA9+e5MS/2gZEBhYJt13GrAz5/IOZKddH/0Z3TP/Zgo+yw==", + "version": "2.0.58", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.58.tgz", + "integrity": "sha512-BdiKAgbfRlvfMq/XzO/AF9NPmaA8a+YpLAyAFTVFBj3gARrAIfWvNq7Q7NE4se3KgFu0KkrvQMxTS0XVnsGzHg==", "dev": true, "license": "MIT", "engines": { @@ -7135,9 +6639,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" }, @@ -7249,9 +6753,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", @@ -7268,18 +6772,18 @@ ], "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" } }, "node_modules/postcss-custom-media": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-12.0.1.tgz", - "integrity": "sha512-66syE14+VeqkUf0rRX0bvbTCbNRJF132jD+ceo8th1dap2YJEAqpdh5uG98CE3IbgHT7m9XM0GIlOazNWqQdeA==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-12.0.3.tgz", + "integrity": "sha512-pgOICT/unQexoA/Vh4ZvyAUrcwwA/nHh0SJcOwOombpwDEj1x5N6zK+kz97wy9NslhU6UxhE5c5Q/M2gpYfkJA==", "dev": true, "funding": [ { @@ -7293,10 +6797,10 @@ ], "license": "MIT", "dependencies": { - "@csstools/cascade-layer-name-parser": "^3.0.0", - "@csstools/css-parser-algorithms": "^4.0.0", - "@csstools/css-tokenizer": "^4.0.0", - "@csstools/media-query-list-parser": "^5.0.0" + "@csstools/cascade-layer-name-parser": "^3.0.2", + "@csstools/css-parser-algorithms": "^4.0.2", + "@csstools/css-tokenizer": "^4.0.2", + "@csstools/media-query-list-parser": "^5.0.2" }, "engines": { "node": ">=20.19.0" @@ -7402,9 +6906,9 @@ } }, "node_modules/readable-stream": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", - "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.8.0.tgz", + "integrity": "sha512-2jhTTU3Eilp/2DMT71gbcoqC35eQHasMJH0RHkYxwlxIv3+FR6Y5xAFZIwEGLxKkjZYEFlsiMNIdwUqjK2lLHQ==", "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", @@ -7441,16 +6945,16 @@ } }, "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" }, "node_modules/regenerate-unicode-properties": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz", - "integrity": "sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.3.0.tgz", + "integrity": "sha512-9ns8odR8e9q3otKeHj3DE80jZYKg6zVeZKE+zQmRKXFoVUcuiTGeO6iusDhPRoIQQPVPRvH+SfBhrTud4eczuw==", "dev": true, "license": "MIT", "dependencies": { @@ -7482,14 +6986,14 @@ } }, "node_modules/regexpu-core": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz", - "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==", + "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-unicode-properties": "^10.2.2", + "regenerate": "^1.5.0", + "regenerate-unicode-properties": "^10.3.0", "regjsgen": "^0.8.0", "regjsparser": "^0.13.0", "unicode-match-property-ecmascript": "^2.0.0", @@ -7507,9 +7011,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": { @@ -7519,17 +7023,6 @@ "regjsparser": "bin/parser" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -7572,12 +7065,12 @@ } }, "node_modules/rolldown": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.10.tgz", - "integrity": "sha512-OxkA08pSryMK7B3XiFA09B4OJ1xJMPgIYCBMY2xchzpqgBGsV1o0DetPAE+Sl3N3L4oCPiEzmHVSOj7iR04Zog==", + "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.151.0", + "@oxc-project/types": "=0.153.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -7587,21 +7080,21 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm-eabi": "1.2.10", - "@rolldown/binding-android-arm64": "1.2.10", - "@rolldown/binding-darwin-arm64": "1.2.10", - "@rolldown/binding-darwin-x64": "1.2.10", - "@rolldown/binding-freebsd-x64": "1.2.10", - "@rolldown/binding-linux-arm-gnueabihf": "1.2.10", - "@rolldown/binding-linux-arm64-gnu": "1.2.10", - "@rolldown/binding-linux-arm64-musl": "1.2.10", - "@rolldown/binding-linux-ppc64-gnu": "1.2.10", - "@rolldown/binding-linux-s390x-gnu": "1.2.10", - "@rolldown/binding-linux-x64-gnu": "1.2.10", - "@rolldown/binding-linux-x64-musl": "1.2.10", - "@rolldown/binding-openharmony-arm64": "1.2.10", - "@rolldown/binding-win32-arm64-msvc": "1.2.10", - "@rolldown/binding-win32-x64-msvc": "1.2.10" + "@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/rrweb-cssom": { @@ -7706,67 +7199,6 @@ "node": ">=v12.22.7" } }, - "node_modules/schema-utils": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.5.0.tgz", - "integrity": "sha512-zJlMCZ0cAR5p/Y4oVpRoqioDMJcGxaXRrQ/4rP4WyR84vc5z/DolXdbvXeDpTwbtocDFr2rhPqHPErDCUtz2kA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/json-schema": "^7.0.15", - "ajv": "^8.20.0", - "ajv-formats": "^3.0.1", - "ajv-keywords": "^5.1.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/schema-utils/node_modules/ajv": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", - "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/schema-utils/node_modules/ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.3" - }, - "peerDependencies": { - "ajv": "^8.8.2" - } - }, - "node_modules/schema-utils/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/semver": { "version": "7.8.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", @@ -7949,9 +7381,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": "1.0.0-dev.c11da40967c5d278451118142650415d688d8d4c", + "resolved": "https://registry.npmjs.org/solidos-toolkit/-/solidos-toolkit-1.0.0-dev.c11da40967c5d278451118142650415d688d8d4c.tgz", + "integrity": "sha512-i5FOuvpBBbXfYpRKBv4ygdccO5EUUpfo2rp1HoOspG+AOKMVeFqizuPokl+RZX6AVn3AulqRfnlo+NUEWkidEA==", "dev": true, "dependencies": { "@babel/core": "^7.29.0", @@ -7970,10 +7402,10 @@ "vite-plugin-lit-css": "^3.0.0" }, "peerDependencies": { - "pane-registry": "^3.1.1 || ^3.1.2-0 || ^5.0.0 || ^5.0.0-0", + "pane-registry": "^3.1.1 || ^3.1.2-0 || >=5.0.2-0 <6.0.0", "rdflib": "^2.3.6", - "solid-logic": "^4.0.7 || ^4.0.8-0 || ^6.0.0 || ^6.0.0-0", - "solid-ui": "^3.1.2 || ^3.1.3-0 || ^5.0.0 || ^5.0.0-0", + "solid-logic": "^4.0.7 || ^4.0.8-0 || >=6.0.1-0 <7.0.0", + "solid-ui": "^3.1.2 || ^3.1.3-0 || >=5.0.1-0 <6.0.0", "vite": "^8.0.0", "vitest": "^4.0.0" }, @@ -8002,33 +7434,22 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "devOptional": true, + "dev": true, "license": "BSD-3-Clause", + "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz", + "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "devOptional": true, - "license": "MIT", - "peer": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -8037,9 +7458,9 @@ "license": "MIT" }, "node_modules/std-env": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", - "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.3.0.tgz", + "integrity": "sha512-OtU/EgQ1kIm5KwqQpBC6ZEMXrZRui11w8zgfTWp8cdO9B8OaPsbA8bTHO2P+HNo1VlUTGMVBwPhydu6poeXiag==", "dev": true, "license": "MIT" }, @@ -8182,41 +7603,6 @@ "dev": true, "license": "MIT" }, - "node_modules/tapable": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz", - "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=6" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/terser": { - "version": "5.51.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.51.2.tgz", - "integrity": "sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==", - "devOptional": true, - "license": "BSD-2-Clause", - "peer": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.15.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -8251,9 +7637,9 @@ } }, "node_modules/tinyrainbow": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz", - "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.2.0.tgz", + "integrity": "sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==", "dev": true, "license": "MIT", "engines": { @@ -8501,9 +7887,9 @@ } }, "node_modules/undici": { - "version": "6.28.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.1.tgz", - "integrity": "sha512-zWpdTVD54H48CIybL0rWQ3ukpb9d23wM7eH5RtfdmeP70cWHNjtfo7P4vZX+5CoDcO53J4Pu5uXp7lNfjc6DRA==", + "version": "6.29.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.29.0.tgz", + "integrity": "sha512-R+RODBqp6i2pPflGdq+xIOUkl+RNfGgHwoinecKu/JCuf2uO06cOKoDbI2P7Dn6KcswdKwrczbU6IYJ6K8X+wg==", "dev": true, "license": "MIT", "engines": { @@ -8587,9 +7973,9 @@ } }, "node_modules/unplugin-dts": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unplugin-dts/-/unplugin-dts-1.1.1.tgz", - "integrity": "sha512-Z2VcabC0hjYuzF62oWmZXVoxagkM8bUWgqUy+dotoJTPnooR5mNaxbpv63JCmcaxdGCW2Bb75omK6FOryOYCRg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unplugin-dts/-/unplugin-dts-1.1.2.tgz", + "integrity": "sha512-RDqy90XUmFj6rz4U5YoTMdYdaCJe2ZnQZaWIjkWS4952Gv0zBTQyqWtlGgVMPYHa982dURvyoc+sUOFIcDFv+w==", "dev": true, "license": "MIT", "dependencies": { @@ -8679,9 +8065,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz", - "integrity": "sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.4.tgz", + "integrity": "sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==", "dev": true, "funding": [ { @@ -8731,15 +8117,15 @@ } }, "node_modules/vite": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.0.tgz", - "integrity": "sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.4.tgz", + "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==", "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.7", - "postcss": "^8.5.28", - "rolldown": "~1.2.6", + "postcss": "^8.5.29", + "rolldown": "~1.2.12", "tinyglobby": "^0.2.17" }, "bin": { @@ -8940,20 +8326,6 @@ "node": ">=14" } }, - "node_modules/watchpack": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz", - "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", @@ -8964,59 +8336,6 @@ "node": ">=12" } }, - "node_modules/webpack": { - "version": "5.111.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.111.1.tgz", - "integrity": "sha512-cNypaz0RP+S4cvQVi1M/3bRUkvNP0xZpL0TjFx+c6jg64VbxD+2weWDgY9UnjRI6dhZgtaj8DU76GGFcJ79xPQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/estree": "^1.0.8", - "@types/json-schema": "^7.0.15", - "@webassemblyjs/ast": "^1.14.1", - "@webassemblyjs/wasm-edit": "^1.14.1", - "@webassemblyjs/wasm-parser": "^1.14.1", - "browserslist": "^4.28.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.25.0", - "es-module-lexer": "^2.1.0", - "events": "^3.2.0", - "graceful-fs": "^4.2.11", - "mime-db": "^1.54.0", - "minimizer-webpack-plugin": "^5.7.0", - "schema-utils": "^4.5.0", - "tapable": "^2.3.0", - "watchpack": "^2.5.2", - "webpack-sources": "^3.5.1" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-sources": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz", - "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/webpack-virtual-modules": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz", @@ -9024,17 +8343,6 @@ "dev": true, "license": "MIT" }, - "node_modules/webpack/node_modules/mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/whatwg-encoding": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", @@ -9206,9 +8514,9 @@ } }, "node_modules/ws": { - "version": "8.21.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz", - "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.0.tgz", + "integrity": "sha512-Ydggc987+RO0AnWtZ/7Wq9FtNvcrL1b/RO0ud9mWjUPgDrsAAwQSF51sm2hm1XofbU/4jkpGEsLFsZZxU+1DOg==", "dev": true, "license": "MIT", "engines": { diff --git a/src/acl/accessControlSubjects.ts b/src/acl/accessControlSubjects.ts index ee5671d4..690ab9ee 100644 --- a/src/acl/accessControlSubjects.ts +++ b/src/acl/accessControlSubjects.ts @@ -1,5 +1,6 @@ import { LiveStore, sym } from 'rdflib' import { ns } from '../util/ns' +import * as debug from '../util/debug' export type AccessControlSubjectKind = 'agent' | 'agentGroup' | 'agentClass' | 'origin' @@ -27,9 +28,12 @@ function isBareOriginUrl (value: string): boolean { try { const parsed = new URL(value) return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && + Boolean(parsed.hostname) && parsed.pathname === '/' && !parsed.search && - !parsed.hash + !parsed.hash && + !parsed.username && + !parsed.password } catch (_error) { return false } @@ -40,9 +44,12 @@ function normalizeOriginUrl (value: string): string { const parsed = new URL(value) if ( (parsed.protocol === 'http:' || parsed.protocol === 'https:') && + parsed.hostname && parsed.pathname === '/' && !parsed.search && - !parsed.hash + !parsed.hash && + !parsed.username && + !parsed.password ) { return `${parsed.protocol}//${parsed.host}` } @@ -65,7 +72,7 @@ export async function classifyAccessControlSubject (store: LiveStore, principle: try { await store.fetcher.load(subject.doc()) } catch (error) { - console.error(`Failed to load access target ${principle}`, error) + debug.error(`Failed to load access target ${principle}`, error) } types = store.findTypeURIs(subject) diff --git a/src/index.ts b/src/index.ts index 8cefa819..85c649ce 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,7 @@ export { createTypeIndexLogic } from './typeIndex/typeIndexLogic' export { createDirectoryLogic, DEFAULT_DIRECTORY_CATALOG_URL, DEFAULT_DIRECTORY_SOURCES } from './directory/directoryLogic' export type { AccessControlSubjectKind, AccessControlSubject } from './acl/accessControlSubjects' export type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from './types' -export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' +export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ResourceLogic, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' export { UnauthorizedError, CrossOriginForbiddenError, SameOriginForbiddenError, NotFoundError, FetchError, NotEditableError, WebOperationError } from './logic/CustomError' export { diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index 95b64895..1abc5dd9 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -19,6 +19,42 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t return containerLogic.getContainerMemberCount(resourceNode) } + function getContainerMembers(resourceNode: NamedNode) { + return containerLogic.getContainerElements(resourceNode) + } + + function getContainerIndexThing(containerNode: NamedNode) { + const folderUri = containerNode.uri.endsWith('/') ? containerNode.uri : `${containerNode.uri}/` + return store.sym(`${folderUri}index.ttl#this`) + } + + function containerHasIndexDocument(containerNode: NamedNode) { + return store.holds( + containerNode, + ns.ldp('contains'), + getContainerIndexThing(containerNode).doc() + ) + } + + function isStorageRoot(resourceNode: NamedNode) { + return store.holds( + resourceNode, + ns.rdf('type'), + ns.space('Storage'), + resourceNode.doc() + ) + } + + function isHiddenFile(resourceNode: NamedNode) { + const directory = resourceNode.dir() + if (!directory) { + return false + } + + const pathEnd = resourceNode.uri.slice(directory.uri.length) + return pathEnd.startsWith('.') || pathEnd.endsWith('.acl') || pathEnd.endsWith('~') + } + function isWebId(resource: string | NamedNode) { const uri = typeof resource === 'string' ? resource : resource.value @@ -187,7 +223,12 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t fetchMetadataWithDelete, createContainer, isContainer, + getContainerMembers, getContainerMemberCount, + getContainerIndexThing, + containerHasIndexDocument, + isStorageRoot, + isHiddenFile, isWebId } } diff --git a/src/types.ts b/src/types.ts index d5deb033..925b5cbf 100644 --- a/src/types.ts +++ b/src/types.ts @@ -151,7 +151,12 @@ export interface ResourceLogic { fetchMetadataWithDelete: (subject: NamedNode) => Promise, createContainer: (url: string) => Promise, isContainer: (resource: NamedNode) => boolean, + getContainerMembers: (resource: NamedNode) => NamedNode[], getContainerMemberCount: (resource: NamedNode) => number, + getContainerIndexThing: (container: NamedNode) => NamedNode, + containerHasIndexDocument: (container: NamedNode) => boolean, + isStorageRoot: (resource: NamedNode) => boolean, + isHiddenFile: (resource: NamedNode) => boolean, isWebId: (resource: string | NamedNode) => boolean } diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index e8d343c0..d06e8677 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -154,6 +154,7 @@ describe('createAclLogic', () => { }) await expect(aclLogic.classifyAccessControlSubject('https://example.com/?tenant=a')).resolves.toBeUndefined() + await expect(aclLogic.classifyAccessControlSubject('https://user:password@example.com/')).resolves.toBeUndefined() await expect(aclLogic.classifyAccessControlSubject('file:///')).resolves.toBeUndefined() }) From 5e26ad0b04784e15c5042f090b483e0dc5fc0a82 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 16 Oct 2026 22:03:19 +1100 Subject: [PATCH 13/32] move the content fetch from source pane to resource logic --- src/index.ts | 2 +- src/resource/resourceLogic.ts | 24 ++++++++++++++++++++- src/types.ts | 6 ++++++ test/resource/resourceLogic.test.ts | 33 +++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 85c649ce..ab997692 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,7 @@ export { createTypeIndexLogic } from './typeIndex/typeIndexLogic' export { createDirectoryLogic, DEFAULT_DIRECTORY_CATALOG_URL, DEFAULT_DIRECTORY_SOURCES } from './directory/directoryLogic' export type { AccessControlSubjectKind, AccessControlSubject } from './acl/accessControlSubjects' export type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from './types' -export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ResourceLogic, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' +export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ResourceLogic, ResourceContent, ResourceMetadata, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' export { UnauthorizedError, CrossOriginForbiddenError, SameOriginForbiddenError, NotFoundError, FetchError, NotEditableError, WebOperationError } from './logic/CustomError' export { diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index 1abc5dd9..c5fc017e 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -3,7 +3,7 @@ import { ACL_LINK } from '../acl/aclLogic' import { ns } from '../util/ns' import { assertSuccessfulHttpResponse, isMissingError } from './resourceHttp' import { readWacAccessInfo } from './resourceMetadata' -import { type ResourceAccess, type ResourceAccessWithDelete, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type TypeIndexLogic } from '../types' +import { type ResourceAccess, type ResourceAccessWithDelete, type ResourceContent, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type TypeIndexLogic } from '../types' import type { AclLogic } from '../types' export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, typeIndexLogic: TypeIndexLogic): ResourceLogic { @@ -147,6 +147,27 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t return fetchHeadMetadata(subject) } + async function fetchContentAndMetadata(subject: NamedNode): Promise { + try { + const response = await store.fetcher.webOperation('GET', subject.uri) + assertSuccessfulHttpResponse(response, 'GET') + + const content = (response as Response & { responseText?: string }).responseText + if (content === undefined) { + throw new Error('No text in response object') + } + + const metadata = readMetadata(subject, response) + if (!metadata.contentType) { + throw new Error('No content-type available') + } + + return { content, metadata } + } catch (error) { + throw new Error(`Error reading file: ${error instanceof Error ? error.message : String(error)}`) + } + } + async function fetchMetadataWithDelete(subject: NamedNode): Promise { let resourceMetadata: ResourceMetadata @@ -221,6 +242,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t deleteResourceAndTypeIndexIfExists, fetchMetadata, fetchMetadataWithDelete, + fetchContentAndMetadata, createContainer, isContainer, getContainerMembers, diff --git a/src/types.ts b/src/types.ts index 925b5cbf..15c78b9d 100644 --- a/src/types.ts +++ b/src/types.ts @@ -144,11 +144,17 @@ export type ResourceMetadataWithDelete = ResourceMetadata & { access: ResourceAccessWithDelete } +export type ResourceContent = { + content: string + metadata: ResourceMetadata +} + export interface ResourceLogic { recursiveDelete: (resource: NamedNode, options?: ResourceDeleteOptions) => Promise, deleteResourceAndTypeIndexIfExists: (resource: NamedNode, user?: NamedNode | null) => Promise, fetchMetadata: (subject: NamedNode) => Promise, fetchMetadataWithDelete: (subject: NamedNode) => Promise, + fetchContentAndMetadata: (subject: NamedNode) => Promise, createContainer: (url: string) => Promise, isContainer: (resource: NamedNode) => boolean, getContainerMembers: (resource: NamedNode) => NamedNode[], diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 661e9488..90da504b 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -67,6 +67,39 @@ describe('createResourceLogic', () => { expect(resourceLogic.getContainerMemberCount(resource)).toBe(0) }) + it('fetches resource content with its metadata', async () => { + const subjectUri = 'https://example.com/workspace/doc.ttl' + const { resourceLogic, store } = buildResourceLogic({ + webOperation: async (method: string, uri: string) => { + if (method === 'GET' && uri === subjectUri) { + return { + ok: true, + headers: new Headers({ + 'content-type': 'text/turtle; charset=utf-8', + 'wac-allow': 'user="read write", public="read"', + etag: '"abc"' + }), + responseText: '<> a <#Thing>.' + } + } + + throw new Error(`unexpected request: ${method} ${uri}`) + } + }) + + await expect(resourceLogic.fetchContentAndMetadata(sym(subjectUri))).resolves.toEqual({ + content: '<> a <#Thing>.', + metadata: { + contentType: 'text/turtle', + access: { canEdit: true, isPublic: true }, + aclUri: undefined, + eTag: '"abc"', + modified: '2026-08-10T00:00:00Z' + } + }) + expect(store.fetcher.webOperation).toHaveBeenCalledWith('GET', subjectUri) + }) + it('returns resource metadata even when delete access probing fails for the container', async () => { const subjectUri = 'https://example.com/workspace/doc.ttl' const containerUri = 'https://example.com/workspace/' From a657fc5e7bf5c235c7c77746aef499f6c97ef32e Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 16 Oct 2026 22:12:14 +1100 Subject: [PATCH 14/32] Added tests Prompt: Add tests for container-member delegation, hidden-file rules, index/storage-root checks, direct fetchMetadata, successful content loading, and missing-content/missing-content-type failures. Co-authored-by: GPT-5.6 Luna --- src/resource/resourceLogic.ts | 2 +- test/resource/resourceLogic.test.ts | 107 +++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index c5fc017e..3c5bcf01 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -52,7 +52,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t } const pathEnd = resourceNode.uri.slice(directory.uri.length) - return pathEnd.startsWith('.') || pathEnd.endsWith('.acl') || pathEnd.endsWith('~') + return pathEnd.startsWith('.') || pathEnd.endsWith('.acl') || pathEnd.endsWith('.meta') || pathEnd.endsWith('~') } function isWebId(resource: string | NamedNode) { diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 90da504b..23e5c4d2 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -25,6 +25,7 @@ function buildResourceLogic(overrides: { return undefined }), any: vi.fn().mockReturnValue(undefined), + holds: vi.fn().mockReturnValue(false), each: vi.fn().mockReturnValue([]), removeMatches: vi.fn(), removeDocument: vi.fn(), @@ -49,6 +50,7 @@ function buildResourceLogic(overrides: { createContainer: vi.fn(async () => undefined), isContainer: vi.fn(overrides.isContainer ?? (() => false)), getContainerMemberCount: vi.fn().mockReturnValue(0), + getContainerElements: vi.fn(overrides.getContainerMembers ?? (async () => [])), getContainerMembers: vi.fn(overrides.getContainerMembers ?? (async () => [])) } as any, typeIndexLogic as any @@ -59,12 +61,16 @@ function buildResourceLogic(overrides: { describe('createResourceLogic', () => { it('delegates container helpers', async () => { - const { resourceLogic } = buildResourceLogic() + const members = ['https://example.com/workspace/item.ttl'] + const { resourceLogic } = buildResourceLogic({ + getContainerMembers: async () => members + }) const resource = sym('https://example.com/workspace/') expect(await resourceLogic.createContainer('https://example.com/workspace/new/')).toBeUndefined() expect(resourceLogic.isContainer(resource)).toBe(false) expect(resourceLogic.getContainerMemberCount(resource)).toBe(0) + await expect(resourceLogic.getContainerMembers(resource)).resolves.toEqual(members) }) it('fetches resource content with its metadata', async () => { @@ -100,6 +106,78 @@ describe('createResourceLogic', () => { expect(store.fetcher.webOperation).toHaveBeenCalledWith('GET', subjectUri) }) + it('rejects content responses without text', async () => { + const subjectUri = 'https://example.com/workspace/doc.ttl' + const { resourceLogic } = buildResourceLogic({ + webOperation: async () => ({ + ok: true, + headers: new Headers({ 'content-type': 'text/turtle' }) + }) + }) + + await expect(resourceLogic.fetchContentAndMetadata(sym(subjectUri))) + .rejects.toThrow('Error reading file: No text in response object') + }) + + it('rejects content responses without a content type', async () => { + const subjectUri = 'https://example.com/workspace/doc.ttl' + const { resourceLogic } = buildResourceLogic({ + webOperation: async () => ({ + ok: true, + headers: new Headers(), + responseText: 'content' + }) + }) + + await expect(resourceLogic.fetchContentAndMetadata(sym(subjectUri))) + .rejects.toThrow('Error reading file: No content-type available') + }) + + it('recognizes hidden Solid resource files', () => { + const { resourceLogic } = buildResourceLogic() + + expect(resourceLogic.isHiddenFile(sym('https://example.com/workspace/.private'))).toBe(true) + expect(resourceLogic.isHiddenFile(sym('https://example.com/workspace/file.acl'))).toBe(true) + expect(resourceLogic.isHiddenFile(sym('https://example.com/workspace/file.meta'))).toBe(true) + expect(resourceLogic.isHiddenFile(sym('https://example.com/workspace/file~'))).toBe(true) + expect(resourceLogic.isHiddenFile(sym('https://example.com/workspace/file.ttl'))).toBe(false) + }) + + it('builds index resources consistently for containers with or without a trailing slash', () => { + const { resourceLogic } = buildResourceLogic() + + expect(resourceLogic.getContainerIndexThing(sym('https://example.com/workspace')).uri) + .toBe('https://example.com/workspace/index.ttl#this') + expect(resourceLogic.getContainerIndexThing(sym('https://example.com/workspace/')).uri) + .toBe('https://example.com/workspace/index.ttl#this') + }) + + it('checks the container index and storage-root triples in the store', () => { + const { resourceLogic, store } = buildResourceLogic() + store.holds + .mockReturnValueOnce(true) + .mockReturnValueOnce(true) + + const container = sym('https://example.com/workspace/') + const storageRoot = sym('https://example.com/') + + expect(resourceLogic.containerHasIndexDocument(container)).toBe(true) + expect(resourceLogic.isStorageRoot(storageRoot)).toBe(true) + expect(store.holds).toHaveBeenNthCalledWith( + 1, + container, + expect.anything(), + sym('https://example.com/workspace/index.ttl#this').doc() + ) + expect(store.holds).toHaveBeenNthCalledWith( + 2, + storageRoot, + expect.anything(), + expect.anything(), + storageRoot.doc() + ) + }) + it('returns resource metadata even when delete access probing fails for the container', async () => { const subjectUri = 'https://example.com/workspace/doc.ttl' const containerUri = 'https://example.com/workspace/' @@ -167,6 +245,33 @@ describe('createResourceLogic', () => { expect(metadata.eTag).toBe('"abc"') }) + it('fetches metadata through the guarded HEAD request', async () => { + const subjectUri = 'https://example.com/workspace/doc.ttl' + const { resourceLogic, store } = buildResourceLogic({ + webOperation: async (method: string, uri: string) => { + if (method === 'HEAD' && uri === subjectUri) { + return new Response('', { + status: 200, + headers: { + 'content-type': 'text/turtle', + 'wac-allow': 'user="read write"', + etag: '"abc"' + } + }) + } + + throw new Error(`unexpected request: ${method} ${uri}`) + } + }) + + await expect(resourceLogic.fetchMetadata(sym(subjectUri))).resolves.toMatchObject({ + contentType: 'text/turtle', + access: { canEdit: true, isPublic: false }, + eTag: '"abc"' + }) + expect(store.fetcher.webOperation).toHaveBeenCalledWith('HEAD', subjectUri) + }) + it('recursively deletes containers and tolerates not found resource deletes', async () => { const rootUri = 'https://example.com/workspace/container/' const childUri = 'https://example.com/workspace/container/item.ttl' From 1e8e448ee5b512649f527ed8c18d89ae5f16f9be Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sun, 18 Oct 2026 20:04:36 +1100 Subject: [PATCH 15/32] Add new features to ensure we do not lose functionality from what was offered in the sharing Pane Prompt: Many prompts to get this correct. This will most likely change a bit as well once we decide for sure if this is the correct approach Co-authored-by: GPT-5.6 Luna Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- package-lock.json | 4 +- package.json | 2 +- src/acl/aclLogic.ts | 350 ++++++++++++++++++- src/index.ts | 4 +- src/types.ts | 9 +- test/aclLogic.test.ts | 684 ++++++++++++++++++++++++++++++++++++- test/resourceLogic.test.ts | 7 + 7 files changed, 1031 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cb3c5aa..8c86425b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.1-1", + "version": "6.0.1-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.1-1", + "version": "6.0.1-2", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.1.0", diff --git a/package.json b/package.json index 72b83cb1..5322212f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.1-1", + "version": "6.0.1-2", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index a73f3922..ef629a5a 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -1,25 +1,92 @@ -import { applyPlan as applyAuthorizationPlan, Authenticated, findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, planRevoke as planAuthorizationRevoke, Public, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' +import { ACL, namedNode, quad, applyPlan as applyAuthorizationPlan, Authenticated, findEffectiveACL, planGrant as planAuthorizationGrant, planPublicRead as planAuthorizationPublicRead, planRevoke as planAuthorizationRevoke, Public, type AccessMode, type AccessSubject, type ACLContext, type Authorization, type PatchPlan } from '@dokieli/web-access-control' import { graph, NamedNode, Namespace, serialize, sym } from 'rdflib' import type { AclLogic } from '../types' import { ns as namespace } from '../util/ns' import * as accessControlSubjects from './accessControlSubjects' -// Will remove the below comment when i'm done with the manage access work -// Helpers available from @dokieli/web-access-control: -// - Discovery: findEffectiveACL, parentContainer -// - ACL context and parsing: buildACLContext, authorizationsFromDataset, parseTurtle -// - Query helpers: agentsWithMode, hasControl, isPublic, modesFor, subjectsWithMode -// - Plan helpers: planContainerACL, planGrant, planOwnerControl, planPublicRead, planRevoke -// - Serialization and application: serializeTerm, toN3Patch, toSparqlUpdate, toTurtle, applyPlan, negotiatePatchContentType -// - Link and allow parsing: allows, parseWacAllow, linkTargets, parseLinkHeader -// - Terms and constants: ACCESS_MODES, ACL, Authenticated, FOAF, modeFromIRI, modeIRI, namedNode, Public, quad, RDF_TYPE, variable - export const ACCESS_ROLES = ['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter'] as const export const PUBLIC_ACCESS_ROLES = ['No Access', 'Viewer'] as const export { Authenticated, Public } from '@dokieli/web-access-control' export type AccessRole = typeof ACCESS_ROLES[number] export type PublicAccessRole = typeof PUBLIC_ACCESS_ROLES[number] +export type ContainerAccessScope = 'folder+contents' | 'folder' | 'contents' +export interface ContainerAccessScopeAnalysis { + distinctScopes: ContainerAccessScope[] + primaryScope: ContainerAccessScope + mixed: boolean +} + +export function classifyAuthorizationScope ( + resource: string, + authorization: Authorization, + inherited = false +): ContainerAccessScope | undefined { + // Effective ACL discovery keeps inherited `acl:default` targets on the + // parent container. They govern both this container and its contents + // (legacy adoptACLDefault copies them as accessTo + default). + const inheritedDefault = inherited && (authorization.default?.length ?? 0) > 0 + const hasAccessTo = inheritedDefault || (authorization.accessTo?.includes(resource) ?? false) + const hasDefault = inheritedDefault || (authorization.default?.includes(resource) ?? false) + if (hasAccessTo && hasDefault) return 'folder+contents' + if (hasAccessTo) return 'folder' + if (hasDefault) return 'contents' + return undefined +} + +export function filterAuthorizationsByContainerScope ( + resource: string, + authorizations: Authorization[], + scope: ContainerAccessScope, + inherited = false +): Authorization[] { + return authorizations.filter(authorization => + classifyAuthorizationScope(resource, authorization, inherited) === scope + ) +} + +/** + * Classify the direct ACL predicates for a container. Mixed grants are + * conservatively treated as covering both scopes. + */ +export function classifyContainerAccessScope (context: ACLContext): ContainerAccessScope { + return analyzeContainerAccessScope(context).primaryScope +} + +export function analyzeContainerAccessScope (context: ACLContext): ContainerAccessScopeAnalysis { + const scopes = new Set() + for (const authorization of context.authorizations ?? []) { + const scope = classifyAuthorizationScope(context.resource, authorization, context.inherited) + if (scope) scopes.add(scope) + } + // Older callers may provide only the graph. Preserve their classification + // while keeping the authorization-entry semantics for parsed contexts. + if (!scopes.size) { + const entries = new Map() + for (const statement of context.dataset ?? []) { + if (statement.object.value !== context.resource) continue + if (statement.predicate.value !== ACL + 'accessTo' && statement.predicate.value !== ACL + 'default') continue + const entry = entries.get(statement.subject.value) ?? { accessTo: false, default: false } + entry.accessTo ||= statement.predicate.value === ACL + 'accessTo' + entry.default ||= statement.predicate.value === ACL + 'default' + entries.set(statement.subject.value, entry) + } + for (const entry of entries.values()) { + if (entry.accessTo && entry.default) scopes.add('folder+contents') + else if (entry.accessTo) scopes.add('folder') + else if (entry.default) scopes.add('contents') + } + } + const distinctScopes = [...scopes] + const primaryScope = distinctScopes.includes('folder+contents') + ? 'folder+contents' + : distinctScopes.includes('contents') + ? 'contents' + : distinctScopes.includes('folder') + ? 'folder' + : 'folder+contents' + return { distinctScopes, primaryScope, mixed: distinctScopes.length > 1 } +} export const ACL_LINK = sym( 'http://www.iana.org/assignments/link-relations/acl' @@ -94,14 +161,252 @@ export function createAclLogic(store): AclLogic { return context.authorizations } + function classifyContainerScope(context: ACLContext): ContainerAccessScope { + return classifyContainerAccessScope(context) + } + + function isProtectedResource(resourceURL: string | NamedNode): boolean { + const resource = sym(typeof resourceURL === 'string' ? resourceURL : resourceURL.value) + return resource.value === resource.site().value || + (typeof store.holds === 'function' && + store.holds(resource, ns.rdf('type'), ns.space('Storage'), resource.doc())) + } + + function subjectMatchesAuthorization(subject: AccessSubject, authorization: Authorization): boolean { + const predicateByType = { + agent: 'agent', + agentGroup: 'agentGroup', + agentClass: 'agentClass', + origin: 'origin' + } as const + return authorization[predicateByType[subject.type]]?.includes(subject.iri) ?? false + } + + function assertProtectedControlPreserved(context: ACLContext, subject: AccessSubject, modes?: AccessMode[]): void { + if (!isProtectedResource(context.resource)) { + return + } + + const hasControl = context.authorizations.some(authorization => + authorization.mode.includes('Control') && subjectMatchesAuthorization(subject, authorization)) + const controlCount = context.authorizations.filter(authorization => authorization.mode.includes('Control')).length + const keepsControl = modes?.includes('Control') ?? false + + if (hasControl && controlCount <= 1 && !keepsControl) { + throw new Error('The protected storage resource must retain at least one Control authorization.') + } + } + + function withContainerDefaults(context: ACLContext, plan: PatchPlan): PatchPlan { + if (!new URL(context.resource).pathname.endsWith('/')) { + return plan + } + + // Materializing an inherited container ACL must not cut off its contents. + // The upstream resource planner emits accessTo only, even for containers. + const defaults = plan.inserts + .filter(statement => statement.predicate.value === ACL + 'accessTo' && statement.object.value === context.resource) + .filter(statement => !plan.inserts.some(existing => existing.subject.equals(statement.subject) && existing.predicate.value === ACL + 'default' && existing.object.value === context.resource)) + .map(statement => quad(statement.subject, namedNode(ACL + 'default'), statement.object)) + + return { ...plan, inserts: [...plan.inserts, ...defaults] } + } + async function planGrant(resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { const context = await findEffectiveAcl(resourceURL) + assertProtectedControlPreserved(context, subject, modes) + if (context.inherited && new URL(context.resource).pathname.endsWith('/')) { + return materializeInheritedContainer(context, subject, modes, 'folder') + } return planAuthorizationGrant(context, subject, modes) } + function assertContainer(context: ACLContext): void { + if (!new URL(context.resource).pathname.endsWith('/')) { + throw new Error(`Expected a container URL ending in "/": ${context.resource}`) + } + } + + function materializeInheritedContainer ( + context: ACLContext, + subject: AccessSubject, + modes: AccessMode[] | undefined, + scope: ContainerAccessScope, + revoke = false + ): PatchPlan { + const inserts: PatchPlan['inserts'] = [] + const subjectKey = subject.type + const subjectKeys = ['agent', 'agentClass', 'agentGroup', 'origin'] as const + const takenIds = new Set([ + ...(context.dataset ?? []).map(statement => statement.subject.value), + ...context.authorizations.flatMap(authorization => [ + authorization.id, + ...(authorization.condition ?? []).map(condition => condition.id) + ]) + ]) + const freshId = (base: string): string => { + let id = base + let suffix = 1 + while (takenIds.has(id)) { + id = `${base}-${suffix++}` + } + takenIds.add(id) + return id + } + const addRule = ( + authorization: Authorization, + baseId: string, + targets: { accessTo: boolean, default: boolean }, + modeOverride?: AccessMode[] + ) => { + const subjects = subjectKeys.flatMap(key => authorization[key].map(iri => ({ key, iri }))) + if (!subjects.length || (!targets.accessTo && !targets.default)) return + const id = freshId(baseId) + const rule = namedNode(id) + inserts.push( + quad(rule, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), namedNode(ACL + 'Authorization')), + ...(targets.accessTo ? [quad(rule, namedNode(ACL + 'accessTo'), namedNode(context.resource))] : []), + ...(targets.default ? [quad(rule, namedNode(ACL + 'default'), namedNode(context.resource))] : []), + ...(modeOverride ?? authorization.mode).map(mode => quad(rule, namedNode(ACL + 'mode'), namedNode(`http://www.w3.org/ns/auth/acl#${mode}`))), + ...subjects.map(({ key, iri }) => quad(rule, namedNode(ACL + key), namedNode(iri))), + ...(authorization.condition ?? []).flatMap(condition => { + const conditionId = freshId(`${id}-condition`) + const conditionNode = namedNode(conditionId) + return [ + quad(rule, namedNode(ACL + 'condition'), conditionNode), + ...Object.entries(condition.properties).flatMap(([predicate, values]) => + values.map(value => quad(conditionNode, namedNode(predicate), namedNode(value)))) + ] + }) + ) + } + const withoutSubject = (authorization: Authorization): Authorization => ({ + ...authorization, + [subjectKey]: authorization[subjectKey].filter(iri => iri !== subject.iri) + }) + const onlySubject = (authorization: Authorization): Authorization => ({ + ...authorization, + agent: [], agentClass: [], agentGroup: [], origin: [], + [subjectKey]: [subject.iri] + }) + context.authorizations.forEach((authorization, index) => { + const baseId = `${context.defaultACLResource}#inherited-${index + 1}` + // Legacy adoptACLDefault parity: an inherited acl:default governs + // this container itself and its contents, so it is copied as + // accessTo + default. Parent accessTo-only rules do not apply here. + const inheritedDefault = (authorization.default?.length ?? 0) > 0 + const targets = { + accessTo: inheritedDefault || authorization.accessTo.includes(context.resource), + default: inheritedDefault + } + const selected = authorization[subjectKey]?.includes(subject.iri) ?? false + if (!selected) { + addRule(authorization, baseId, targets) + return + } + addRule(withoutSubject(authorization), baseId, targets) + // Keep the subject's inherited access for the scope not being changed. + addRule(onlySubject(authorization), `${baseId}-retained`, { + accessTo: targets.accessTo && scope === 'contents', + default: targets.default && scope === 'folder' + }) + }) + if (!revoke) { + addRule(onlySubject({ + accessTo: [], default: [], agent: [], agentClass: [], agentGroup: [], origin: [], mode: [], condition: [] + } as unknown as Authorization), `${context.defaultACLResource}#inherited-new`, { + accessTo: scope !== 'contents', + default: scope !== 'folder' + }, modes ?? []) + } + return { target: context.defaultACLResource, deletes: [], inserts } + } + + async function planGrantContainer(containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { + const context = await findEffectiveAcl(containerURL) + assertContainer(context) + assertProtectedControlPreserved(context, subject, modes) + if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'folder') + return planAuthorizationGrant(context, subject, modes) + } + + async function planGrantContainerAndContents(containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { + const context = await findEffectiveAcl(containerURL) + assertContainer(context) + assertProtectedControlPreserved(context, subject, modes) + if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'folder+contents') + return withContainerDefaults(context, planAuthorizationGrant(context, subject, modes)) + } + + async function planGrantContainerContents(containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { + const context = await findEffectiveAcl(containerURL) + assertContainer(context) + if (isProtectedResource(context.resource)) { + throw new Error('Applying access to the contents of a protected storage resource is not allowed.') + } + if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'contents') + const existingDefaultOnly = context.authorizations.find(authorization => + authorization.default?.includes(context.resource) && + !authorization.accessTo?.includes(context.resource) && + authorization[subject.type]?.includes(subject.iri) && + (authorization.agent.length + authorization.agentClass.length + authorization.agentGroup.length + authorization.origin.length) === 1) + + if (existingDefaultOnly && !context.inherited) { + // The upstream planner can safely update a default-only rule in + // place; unlike a resource grant it will not add acl:accessTo. + return planAuthorizationGrant(context, subject, modes) + } + + const subjectKey = subject.type + const id = `${context.defaultACLResource}#contents-${Math.random().toString(36).slice(2)}` + const rule = namedNode(id) + const subjectQuad = quad(rule, namedNode(ACL + subjectKey), namedNode(subject.iri)) + const fresh = [ + quad(rule, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), namedNode(ACL + 'Authorization')), + quad(rule, namedNode(ACL + 'default'), namedNode(context.resource)), + ...modes.map(mode => quad(rule, namedNode(ACL + 'mode'), namedNode(`http://www.w3.org/ns/auth/acl#${mode}`))), + subjectQuad + ] + + // A folder-only authorization is unrelated and must remain untouched. + return { target: context.defaultACLResource, deletes: [], inserts: fresh } + } + + async function planRevokeContainerContents(containerURL: string | NamedNode, subject: AccessSubject): Promise { + const context = await findEffectiveAcl(containerURL) + assertContainer(context) + if (isProtectedResource(context.resource)) { + throw new Error('Removing access from the contents of a protected storage resource is not allowed.') + } + + const defaultPredicate = ACL + 'default' + if (!context.inherited) { + const deletes = context.dataset.filter(statement => + statement.predicate.value === defaultPredicate && + statement.object.value === context.resource && + context.authorizations.some(authorization => + authorization.id === statement.subject.value && + authorization[subject.type].includes(subject.iri))) + if (!deletes.length) { + throw new Error(`No default authorization found for ${subject.iri}`) + } + return { target: context.defaultACLResource, deletes, inserts: [] } + } + + const plan = materializeInheritedContainer(context, subject, undefined, 'contents', true) + if (!plan.inserts.length) { + throw new Error(`No default authorization found for ${subject.iri}`) + } + return plan + } + async function planRevoke(resourceURL: string | NamedNode, subject: AccessSubject): Promise { const context = await findEffectiveAcl(resourceURL) - return planAuthorizationRevoke(context, subject) + assertProtectedControlPreserved(context, subject) + if (context.inherited && new URL(context.resource).pathname.endsWith('/')) { + return materializeInheritedContainer(context, subject, undefined, 'folder+contents', true) + } + return withContainerDefaults(context, planAuthorizationRevoke(context, subject)) } async function planPublicRead(resourceURL: string | NamedNode, enabled: boolean): Promise { @@ -109,6 +414,20 @@ export function createAclLogic(store): AclLogic { return planAuthorizationPublicRead(context, enabled) } + async function resetToDefault(resourceURL: string | NamedNode): Promise { + const context = await findEffectiveAcl(resourceURL) + if (isProtectedResource(context.resource)) { + throw new Error('The protected storage resource cannot be reset to a default ACL.') + } + const response = await getFetch()(context.defaultACLResource, { method: 'DELETE' }) + + if (!response.ok && response.status !== 404) { + throw new Error(`Unable to remove ACL ${context.defaultACLResource}: HTTP ${response.status}`) + } + + return response + } + async function applyPlan(plan: PatchPlan): Promise { return applyAuthorizationPlan(plan, { fetch: getFetch() }) } @@ -248,13 +567,20 @@ export function createAclLogic(store): AclLogic { findAclDocUrl, findEffectiveAcl, findAccessGrants, + classifyContainerScope, + isProtectedResource, roleFromModes, modesFromRole, publicRoleFromModes, modesFromPublicRole, planGrant, + planGrantContainer, + planGrantContainerAndContents, + planGrantContainerContents, + planRevokeContainerContents, planRevoke, planPublicRead, + resetToDefault, applyPlan, classifyAccessControlSubject, setACLUserPublic, diff --git a/src/index.ts b/src/index.ts index 8cefa819..91a8e820 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,8 +6,8 @@ const authn = solidLogicSingleton.authn const authSession = solidLogicSingleton.authn.authSession const store = solidLogicSingleton.store -export { ACL_LINK, ACCESS_ROLES, PUBLIC_ACCESS_ROLES, Authenticated, Public } from './acl/aclLogic' -export type { AccessRole, PublicAccessRole } from './acl/aclLogic' +export { ACL_LINK, ACCESS_ROLES, PUBLIC_ACCESS_ROLES, Authenticated, Public, classifyContainerAccessScope, analyzeContainerAccessScope, classifyAuthorizationScope, filterAuthorizationsByContainerScope } from './acl/aclLogic' +export type { AccessRole, ContainerAccessScope, ContainerAccessScopeAnalysis, PublicAccessRole } from './acl/aclLogic' export { offlineTestID, appContext } from './authn/authUtil' export { performServerSideLogout } from './authn/serverLogout' export { reloadOnIdentityReplaced } from './authSession/identityState' diff --git a/src/types.ts b/src/types.ts index d5deb033..3f5e3459 100644 --- a/src/types.ts +++ b/src/types.ts @@ -2,7 +2,7 @@ import type { SessionWithLegacyEvents } from './authSession/authSession' import type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from '@dokieli/web-access-control' import { LiveStore, NamedNode, Statement } from 'rdflib' import type { AccessControlSubject } from './acl/accessControlSubjects' -import type { AccessRole, PublicAccessRole } from './acl/aclLogic' +import type { AccessRole, ContainerAccessScope, PublicAccessRole } from './acl/aclLogic' export type AppDetails = { noun: string @@ -84,14 +84,21 @@ export interface AclLogic { findAclDocUrl: (url: NamedNode) => Promise, findEffectiveAcl: (resourceURL: string | NamedNode) => Promise, findAccessGrants: (resourceURL: string | NamedNode) => Promise, + classifyContainerScope: (context: ACLContext) => ContainerAccessScope, + isProtectedResource: (resourceURL: string | NamedNode) => boolean, classifyAccessControlSubject: (principle: string) => Promise, roleFromModes: (modes: Iterable) => AccessRole, modesFromRole: (role: AccessRole) => AccessMode[], publicRoleFromModes: (modes: Iterable) => PublicAccessRole, modesFromPublicRole: (role: PublicAccessRole) => AccessMode[], planGrant: (resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, + planGrantContainer: (containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, + planGrantContainerAndContents: (containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, + planGrantContainerContents: (containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]) => Promise, + planRevokeContainerContents: (containerURL: string | NamedNode, subject: AccessSubject) => Promise, planRevoke: (resourceURL: string | NamedNode, subject: AccessSubject) => Promise, planPublicRead: (resourceURL: string | NamedNode, enabled: boolean) => Promise, + resetToDefault: (resourceURL: string | NamedNode) => Promise, applyPlan: (plan: PatchPlan) => Promise, setACLUserPublic: (docURI: string, me: NamedNode, options: { diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index e8d343c0..dbf3e85a 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -1,18 +1,68 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import { Fetcher, Store, sym, UpdateManager } from 'rdflib' -import { applyPlan, findEffectiveACL, planGrant, planPublicRead, planRevoke } from '@dokieli/web-access-control' -import { ACL_LINK, createAclLogic } from '../src/acl/aclLogic' - -vi.mock('@dokieli/web-access-control', () => ({ +import { Fetcher, Store, namedNode, sym, UpdateManager } from 'rdflib' +import { ACL, applyPlan, buildACLContext, findEffectiveACL, parseTurtle, planGrant, planPublicRead, planRevoke, Public, quad, type PatchPlan, type Quad } from '@dokieli/web-access-control' +import { ACL_LINK, analyzeContainerAccessScope, classifyAuthorizationScope, classifyContainerAccessScope, createAclLogic, filterAuthorizationsByContainerScope } from '../src/acl/aclLogic' + +var actualFindEffectiveACL: typeof findEffectiveACL +var actualPlanGrant: typeof planGrant +var actualPlanPublicRead: typeof planPublicRead +var actualPlanRevoke: typeof planRevoke + +vi.mock('@dokieli/web-access-control', async importOriginal => { + const actual = await importOriginal() + actualFindEffectiveACL = actual.findEffectiveACL + actualPlanGrant = actual.planGrant + actualPlanPublicRead = actual.planPublicRead + actualPlanRevoke = actual.planRevoke + + return { + ...actual, findEffectiveACL: vi.fn(), planGrant: vi.fn(), planPublicRead: vi.fn(), planRevoke: vi.fn(), applyPlan: vi.fn(), - Authenticated: Symbol('Authenticated'), - Public: Symbol('Public'), planOwnerControl: vi.fn() -})) + } +}) + +const root = 'http://localhost:3100/sharon/' +const owner = root + 'profile/card#me' +const container = root + 'Questionnaires/questionare1/published/2026-10-13T04-04-43.658Z/' +const rootACL = `@prefix acl: <${ACL}>. +<#owner> a acl:Authorization; + acl:accessTo <./>; acl:default <./>; + acl:agent <${owner}>; acl:mode acl:Read, acl:Write, acl:Control.` + +function sharingLogic(resource: string, ownACL?: string, inheritedACL = rootACL) { + const fetch = vi.fn(async (url: string, init?: RequestInit) => { + if (init?.method === 'HEAD') { + return new Response(null, { headers: { Link: `<${url + '.acl'}>; rel="acl"` } }) + } + if (url === root + '.acl') { + return new Response(inheritedACL, { headers: { 'Content-Type': 'text/turtle' } }) + } + if (url === resource + '.acl' && ownACL) { + return new Response(ownACL, { headers: { 'Content-Type': 'text/turtle' } }) + } + return new Response(null, { status: 404 }) + }) + vi.mocked(findEffectiveACL).mockImplementation(actualFindEffectiveACL as any) + vi.mocked(planGrant).mockImplementation(actualPlanGrant as any) + vi.mocked(planPublicRead).mockImplementation(actualPlanPublicRead as any) + vi.mocked(planRevoke).mockImplementation(actualPlanRevoke as any) + return createAclLogic({ fetcher: { _fetch: fetch } }) +} + +function accessFor(plan: PatchPlan, resource: string) { + return buildACLContext({ + resource, + dataset: plan.inserts, + defaultACLResource: resource + '.acl', + effectiveACLResource: plan.target, + effectiveContainer: container + }).authorizations +} describe('createAclLogic', () => { let store: Store & { @@ -22,6 +72,7 @@ describe('createAclLogic', () => { webOperation: ReturnType } any: ReturnType + holds: ReturnType } let aclLogic: ReturnType @@ -45,11 +96,68 @@ describe('createAclLogic', () => { } as unknown as Store & { fetcher: typeof fetcher any: ReturnType + holds: ReturnType } + ;(store as any).holds = vi.fn() aclLogic = createAclLogic(store) }) + describe('container scope analysis', () => { + const resource = 'https://example.com/container/' + const authorization = (scope: 'both' | 'folder' | 'contents') => ({ + id: scope, + blankNode: false, + accessTo: scope === 'contents' ? [] : [resource], + default: scope === 'folder' ? [] : [resource], + agent: ['https://example.com/person#me'], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read' as const], + condition: [] + }) + + it.each([ + ['both', ['folder+contents'], 'folder+contents'], + ['folder', ['folder'], 'folder'], + ['contents', ['contents'], 'contents'], + ['mixed', ['folder', 'contents'], 'contents'] + ] as const)('classifies %s authorization entries', (_label, distinctScopes, primaryScope) => { + const authorizations = _label === 'mixed' + ? [authorization('folder'), authorization('contents')] + : [authorization(_label as 'both' | 'folder' | 'contents')] + const analysis = analyzeContainerAccessScope({ resource, authorizations } as any) + expect(analysis.distinctScopes).toEqual(distinctScopes) + expect(analysis.primaryScope).toBe(primaryScope) + expect(analysis.mixed).toBe(_label === 'mixed') + expect(classifyContainerAccessScope({ resource, authorizations } as any)).toBe(primaryScope) + }) + + it('treats an inherited owner rule (accessTo + default on the parent) as folder and contents', () => { + const analysis = analyzeContainerAccessScope({ + resource, + inherited: true, + authorizations: [{ + agent: ['https://example.com/owner#me'], agentClass: [], agentGroup: [], origin: [], + mode: ['Read', 'Write', 'Control'], + accessTo: ['https://example.com/'], + default: ['https://example.com/'], + condition: [] + }, { + agent: [], agentClass: ['http://xmlns.com/foaf/0.1/Agent'], agentGroup: [], origin: [], + mode: ['Read'], + accessTo: ['https://example.com/'], + default: [], + condition: [] + }] + } as any) + expect(analysis.distinctScopes).toEqual(['folder+contents']) + expect(analysis.primaryScope).toBe('folder+contents') + expect(analysis.mixed).toBe(false) + }) + }) + it('exports the ACL link relation constant', () => { expect(ACL_LINK.value).toBe('http://www.iana.org/assignments/link-relations/acl') }) @@ -92,7 +200,7 @@ describe('createAclLogic', () => { const subject = { type: 'agent', value: 'https://example.com/profile/card#me' } const plan = { updates: [] } - vi.mocked(findEffectiveACL).mockResolvedValue({ authorizations: [] } as any) + vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, authorizations: [] } as any) vi.mocked(planGrant).mockReturnValue(plan as any) store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) @@ -100,11 +208,155 @@ describe('createAclLogic', () => { expect(planGrant).toHaveBeenCalledWith(expect.objectContaining({ authorizations: [] }), subject, ['Read']) }) + it('plans a container-only grant without adding defaults', async () => { + const resource = sym('https://example.com/container/') + const subject = { type: 'agent', iri: 'https://example.com/profile/card#me' } + const plan = { target: resource.value + '.acl', deletes: [], inserts: [] } + + vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, authorizations: [] } as any) + vi.mocked(planGrant).mockReturnValue(plan as any) + + await expect(aclLogic.planGrantContainer(resource, subject as any, ['Read'])).resolves.toBe(plan) + expect(planGrant).toHaveBeenCalledWith(expect.objectContaining({ resource: resource.value }), subject, ['Read']) + }) + + it('rejects the container-only grant API for files', async () => { + const resource = sym('https://example.com/file.ttl') + + vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, authorizations: [] } as any) + + await expect(aclLogic.planGrantContainer(resource, { type: 'agent', iri: 'https://example.com/me' } as any, ['Read'])) + .rejects.toThrow('Expected a container URL') + }) + + it('resets a resource ACL without deleting an inherited parent ACL', async () => { + const resource = sym('https://example.com/container/file.ttl') + const response = new Response(null, { status: 204 }) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: 'https://example.com/container/file.ttl.acl', + authorizations: [] + } as any) + store.fetcher._fetch.mockResolvedValue(response) + + await expect(aclLogic.resetToDefault(resource)).resolves.toBe(response) + expect(store.fetcher._fetch).toHaveBeenCalledWith( + 'https://example.com/container/file.ttl.acl', + { method: 'DELETE' } + ) + }) + + it('identifies storage roots as protected resources', () => { + const resource = sym('https://example.com/alice/') + store.holds.mockReturnValue(true) + + expect(aclLogic.isProtectedResource(resource)).toBe(true) + store.holds.mockReturnValue(false) + expect(aclLogic.isProtectedResource(sym('https://example.com/alice/file.ttl'))).toBe(false) + }) + + it('rejects resetting a protected storage resource', async () => { + const resource = sym('https://example.com/alice/') + store.holds.mockReturnValue(true) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + authorizations: [] + } as any) + + await expect(aclLogic.resetToDefault(resource)).rejects.toThrow('protected storage resource') + expect(store.fetcher._fetch).not.toHaveBeenCalled() + }) + + it('rejects applying access to protected storage contents', async () => { + const resource = sym('https://example.com/alice/') + store.holds.mockReturnValue(true) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + authorizations: [] + } as any) + + await expect(aclLogic.planGrantContainerContents(resource, { + type: 'agent', + iri: 'https://example.com/profile/card#me' + } as any, ['Read'])).rejects.toThrow('protected storage resource') + }) + + it('removes only a direct subject acl:default authorization', async () => { + const resource = sym('https://example.com/alice/') + const subject = { type: 'agent', iri: 'https://example.com/person#me' } + const authorization = namedNode('https://example.com/alice/.acl#person') + const accessTo = quad(authorization, namedNode(ACL + 'accessTo'), resource) + const defaultRule = quad(authorization, namedNode(ACL + 'default'), resource) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: false, + authorizations: [{ id: authorization.value, agent: [subject.iri], agentClass: [], agentGroup: [], origin: [], mode: ['Read'], default: [resource.value], accessTo: [resource.value], condition: [], blankNode: false }], + dataset: [accessTo, defaultRule] + } as any) + + const plan = await aclLogic.planRevokeContainerContents(resource, subject as any) + console.log(plan.inserts) + expect(plan.deletes).toEqual([defaultRule]) + expect(plan.deletes).not.toContain(accessTo) + expect(plan.inserts).toEqual([]) + }) + + it('keeps inherited folder access without an acl:default when revoking contents', async () => { + const resource = sym('https://example.com/alice/') + const subject = { type: 'agent', iri: 'https://example.com/person#me' } + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: true, + authorizations: [{ id: 'https://example.com/.acl#person', agent: [subject.iri], agentClass: [], agentGroup: [], origin: [], mode: ['Read'], default: [resource.value], accessTo: [], condition: [], blankNode: false }], + dataset: [] + } as any) + + const plan = await aclLogic.planRevokeContainerContents(resource, subject as any) + expect(plan.deletes).toEqual([]) + // Inherited defaults cover the folder too; revoking contents keeps folder access only. + expect(plan.inserts.some(statement => statement.predicate.value === ACL + 'accessTo')).toBe(true) + expect(plan.inserts.some(statement => statement.predicate.value === ACL + 'default')).toBe(false) + }) + + it('rejects revoking contents when no default authorization exists', async () => { + const resource = sym('https://example.com/alice/') + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + inherited: false, + authorizations: [], + dataset: [] + } as any) + + await expect(aclLogic.planRevokeContainerContents(resource, { + type: 'agent', + iri: 'https://example.com/person#me' + } as any)).rejects.toThrow('No default authorization found') + }) + + it('keeps the last Control authorization on a protected resource', async () => { + const resource = sym('https://example.com/alice/') + const subject = { type: 'agent', iri: 'https://example.com/profile/card#me' } + store.holds.mockReturnValue(true) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + authorizations: [{ + agent: [subject.iri], + mode: ['Read', 'Write', 'Control'] + }] + } as any) + + await expect(aclLogic.planGrant(resource, subject as any, ['Read'])).rejects.toThrow('retain at least one Control') + await expect(aclLogic.planRevoke(resource, subject as any)).rejects.toThrow('retain at least one Control') + }) + it('delegates planPublicRead through the effective ACL context', async () => { const resource = sym('https://example.com/resource.ttl') const plan = { updates: [] } - vi.mocked(findEffectiveACL).mockResolvedValue({ authorizations: [] } as any) + vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, authorizations: [] } as any) vi.mocked(planPublicRead).mockReturnValue(plan as any) store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) @@ -117,7 +369,7 @@ describe('createAclLogic', () => { const subject = { type: 'agent', iri: 'https://example.com/profile/card#me' } const plan = { target: 'https://example.com/resource.ttl.acl', deletes: [], inserts: [] } - vi.mocked(findEffectiveACL).mockResolvedValue({ authorizations: [] } as any) + vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, authorizations: [] } as any) vi.mocked(planRevoke).mockReturnValue(plan as any) store.fetcher._fetch.mockResolvedValue(new Response('', { status: 200 })) @@ -167,4 +419,414 @@ describe('createAclLogic', () => { subjectValue: 'https://example.com/group.ttl' }) }) + + describe('container sharing ACL inheritance', () => { + function inheritedContext(resource: string, authorizations: any[], dataset: Quad[] = []) { + return { + resource, + defaultACLResource: resource + '.acl', + effectiveACLResource: root + '.acl', + effectiveContainer: root, + inherited: true, + authorizations, + dataset + } as any + } + + function quadsFor(plan: PatchPlan, subject: string, predicate: string) { + return plan.inserts.filter(statement => + statement.predicate.value === predicate && statement.object.value === subject) + } + + it('materializes an inherited folder-only grant with only acl:accessTo', async () => { + const resource = sym('https://example.com/folder-only/') + const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: 'https://example.com/.acl#owner', + agent: ['https://example.com/owner#me'], agentClass: [], agentGroup: [], origin: [], + mode: ['Read', 'Write'], default: [resource.value], accessTo: [resource.value], + condition: [], blankNode: false + }])) + + const plan = await aclLogic.planGrantContainer(resource, subject, ['Read']) + const subjectRule = quadsFor(plan, subject.iri, ACL + 'agent')[0].subject.value + expect(quadsFor(plan, resource.value, ACL + 'accessTo').some(q => q.subject.value === subjectRule)).toBe(true) + expect(quadsFor(plan, resource.value, ACL + 'default').some(q => q.subject.value === subjectRule)).toBe(false) + }) + + it('materializes an inherited contents-only grant with only acl:default', async () => { + const resource = sym('https://example.com/contents-only/') + const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: 'https://example.com/.acl#owner', + agent: ['https://example.com/owner#me'], agentClass: [], agentGroup: [], origin: [], + mode: ['Read'], default: [resource.value], accessTo: [], condition: [], blankNode: false + }])) + + const plan = await aclLogic.planGrantContainerContents(resource, subject, ['Read']) + const subjectRule = quadsFor(plan, subject.iri, ACL + 'agent')[0].subject.value + expect(quadsFor(plan, resource.value, ACL + 'default').some(q => q.subject.value === subjectRule)).toBe(true) + expect(quadsFor(plan, resource.value, ACL + 'accessTo').some(q => q.subject.value === subjectRule)).toBe(false) + }) + + it('preserves inherited folder+contents grants while adding a scoped grant', async () => { + const resource = sym('https://example.com/folder-and-contents/') + const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } + const owner = 'https://example.com/owner#me' + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: 'https://example.com/.acl#owner', + agent: [owner], agentClass: [], agentGroup: [], origin: [], + mode: ['Read', 'Write'], default: [resource.value], accessTo: [resource.value], + condition: [], blankNode: false + }])) + + const plan = await aclLogic.planGrantContainer(resource, subject, ['Read']) + const ownerRule = quadsFor(plan, owner, ACL + 'agent')[0].subject.value + expect(quadsFor(plan, resource.value, ACL + 'accessTo').some(q => q.subject.value === ownerRule)).toBe(true) + expect(quadsFor(plan, resource.value, ACL + 'default').some(q => q.subject.value === ownerRule)).toBe(true) + }) + + it('clones inherited acl:condition descriptions and avoids authorization ID collisions', async () => { + const resource = sym('https://example.com/conditioned/') + const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } + const collidingId = resource.value + '.acl#inherited-1' + const conditionId = 'https://example.com/.acl#client-condition' + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: collidingId, + agent: ['https://example.com/owner#me'], agentClass: [], agentGroup: [], origin: [], + mode: ['Read'], default: [resource.value], accessTo: [resource.value], + condition: [{ + id: conditionId, blankNode: false, + properties: { + [ACL + 'ClientCondition']: ['https://example.com/client'], + [ACL + 'description']: ['only from the trusted client'] + } + }], + blankNode: false + }], [quad(namedNode(collidingId), namedNode(ACL + 'Authorization'), namedNode(ACL + 'Authorization'))])) + + const plan = await aclLogic.planGrantContainer(resource, subject, ['Read']) + const ruleIds = new Set(plan.inserts + .filter(statement => statement.predicate.value === 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' && + statement.object.value === ACL + 'Authorization') + .map(statement => statement.subject.value)) + expect(ruleIds.has(collidingId)).toBe(false) + expect(ruleIds.size).toBe(2) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'condition' && + statement.object.value !== conditionId)).toBe(true) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'description' && + statement.object.value === 'only from the trusted client')).toBe(true) + }) + + it('preserves inherited default access when materializing a contents-only grant', async () => { + const resource = sym('https://example.com/parent/') + const ownerSubject = 'https://example.com/owner#me' + const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: true, + authorizations: [ + { id: 'https://example.com/.acl#owner', agent: [ownerSubject], agentClass: [], agentGroup: [], origin: [], mode: ['Read', 'Write', 'Control'], default: [resource.value], accessTo: [], condition: [], blankNode: false } + ], + dataset: [] + } as any) + + const plan = await aclLogic.planGrantContainerContents(resource, subject, ['Read']) + const ownerRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agent' && + statement.object.value === ownerSubject)?.subject.value + expect(ownerRule).toBeDefined() + expect(plan.inserts.filter(statement => statement.subject.value === ownerRule && statement.predicate.value === ACL + 'default')).toHaveLength(1) + expect(plan.inserts.filter(statement => statement.subject.value === ownerRule && statement.predicate.value === ACL + 'mode')).toHaveLength(3) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'accessTo' && + statement.object.value === resource.value && + statement.object.value === resource.value && + statement.subject.value.includes('inherited-new'))).toBe(false) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'default' && + statement.object.value === resource.value && + statement.object.value === resource.value)).toBe(true) + }) + + it('supports an explicit container-only grant without adding a default', async () => { + const plan = await sharingLogic(container).planGrantContainer(container, Public, ['Read']) + const publicRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agentClass' && + statement.object.value === Public.iri)?.subject.value + expect(publicRule).toBeDefined() + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'default' && + statement.object.value === container && + statement.subject.value === publicRule + )).toBe(false) + }) + + it('supports an explicit contents-only grant without adding accessTo', async () => { + const plan = await sharingLogic(container).planGrantContainerContents(container, Public, ['Read']) + const publicRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agentClass' && + statement.object.value === Public.iri)?.subject.value + expect(publicRule).toBeDefined() + expect(plan.inserts.some(statement => + statement.subject.value === publicRule && + statement.predicate.value === ACL + 'default' && + statement.object.value === container + )).toBe(true) + expect(plan.inserts.some(statement => + statement.subject.value === publicRule && + statement.predicate.value === ACL + 'accessTo' && + statement.object.value === container + )).toBe(false) + }) + + it('keeps the inherited owner on the folder itself when materializing a first ACL', async () => { + const sharonRootACL = rootACL + ` +<#public> a acl:Authorization; + acl:accessTo <./>; + acl:agentClass ; acl:mode acl:Read.` + for (const planner of ['planGrantContainer', 'planGrantContainerContents', 'planGrantContainerAndContents'] as const) { + const plan = await sharingLogic(container, undefined, sharonRootACL)[planner](container, { type: 'agent', iri: 'https://example.com/friend#me' }, ['Read']) + const ownerRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agent' && + statement.object.value === owner)?.subject.value + expect(ownerRule, planner).toBeDefined() + const ownerQuads = plan.inserts.filter(statement => statement.subject.value === ownerRule) + expect(ownerQuads.some(q => q.predicate.value === ACL + 'accessTo' && q.object.value === container), planner).toBe(true) + expect(ownerQuads.some(q => q.predicate.value === ACL + 'default' && q.object.value === container), planner).toBe(true) + expect(ownerQuads.some(q => q.predicate.value === ACL + 'mode' && q.object.value === ACL + 'Control'), planner).toBe(true) + // The root public rule is accessTo-only on the parent, so it is not inherited. + expect(plan.inserts.some(q => q.predicate.value === ACL + 'agentClass' && q.object.value === Public.iri), planner).toBe(false) + } + }) + + it('writes accessTo and default for an inherited folder+contents grant', async () => { + const friend = 'https://example.com/friend#me' + const plan = await sharingLogic(container).planGrantContainerAndContents(container, { type: 'agent', iri: friend }, ['Read']) + const friendRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agent' && + statement.object.value === friend)?.subject.value + const friendQuads = plan.inserts.filter(statement => statement.subject.value === friendRule) + expect(friendQuads.some(q => q.predicate.value === ACL + 'accessTo' && q.object.value === container)).toBe(true) + expect(friendQuads.some(q => q.predicate.value === ACL + 'default' && q.object.value === container)).toBe(true) + }) + + it('replaces an inherited subject rule instead of dropping it on a folder+contents grant', async () => { + const resource = sym('https://example.com/shared/') + const viewer = 'https://example.com/viewer#me' + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: 'https://example.com/.acl#viewer', + agent: [viewer], agentClass: [], agentGroup: [], origin: [], + mode: ['Read'], default: ['https://example.com/'], accessTo: ['https://example.com/'], + condition: [], blankNode: false + }])) + + const plan = await aclLogic.planGrantContainerAndContents(resource, { type: 'agent', iri: viewer }, ['Read', 'Write']) + const viewerRules = plan.inserts.filter(q => q.predicate.value === ACL + 'agent' && q.object.value === viewer) + expect(viewerRules).toHaveLength(1) + const ruleQuads = plan.inserts.filter(q => q.subject.equals(viewerRules[0].subject)) + expect(ruleQuads.filter(q => q.predicate.value === ACL + 'mode').map(q => q.object.value).sort()) + .toEqual([ACL + 'Read', ACL + 'Write']) + expect(ruleQuads.some(q => q.predicate.value === ACL + 'accessTo')).toBe(true) + expect(ruleQuads.some(q => q.predicate.value === ACL + 'default')).toBe(true) + }) + + it('writes accessTo and default for a direct folder+contents grant', async () => { + const plan = await sharingLogic(container, rootACL).planGrantContainerAndContents(container, Public, ['Read']) + const publicRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agentClass' && + statement.object.value === Public.iri)?.subject.value + expect(publicRule).toBeDefined() + const ruleQuads = plan.inserts.filter(q => q.subject.value === publicRule) + expect(ruleQuads.some(q => q.predicate.value === ACL + 'accessTo' && q.object.value === container)).toBe(true) + expect(ruleQuads.some(q => q.predicate.value === ACL + 'default' && q.object.value === container)).toBe(true) + }) + + it('writes only acl:default for a direct contents-only grant', async () => { + const acl = rootACL.replace(`<${owner}>`, `<${owner}>`) + const plan = await sharingLogic(container, acl).planGrantContainerContents(container, Public, ['Read']) + expect(plan.inserts.some(statement => statement.predicate.value === ACL + 'accessTo')).toBe(false) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'default' && + statement.object.value === container && + statement.subject.value.includes('#contents-'))).toBe(true) + }) + + it('grants public Read to the container without opting into its contents', async () => { + const plan = await sharingLogic(container).planGrant(container, Public, ['Read']) + expect(plan.target).toBe(container + '.acl') + expect(plan.deletes).toEqual([]) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'accessTo' && + statement.object.value === container && + statement.subject.value.includes('new'))).toBe(true) + expect(accessFor(plan, container + 'index.ttl').some(grant => + grant.agent.includes(owner))).toBe(true) + }) + + it('does not opt into contents through the public-read convenience API', async () => { + const plan = await sharingLogic(container).planPublicRead(container, true) + expect(accessFor(plan, container + 'index.ttl')).toHaveLength(0) + }) + + it('preserves the inherited owner default when revoking an inherited public grant', async () => { + const inheritedACL = rootACL + ` + <#public> a acl:Authorization; acl:default <./>; + acl:agentClass <${Public.iri}>; acl:mode acl:Read.` + const plan = await sharingLogic(container, undefined, inheritedACL).planRevoke(container, Public) + const ownerRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agent' && + statement.object.value === owner) + expect(ownerRule).toBeDefined() + expect(plan.inserts.some(statement => + statement.subject.value === ownerRule?.subject.value && + statement.predicate.value === ACL + 'default' + )).toBe(true) + for (const resource of [container, container + 'index.ttl', container + 'questions/q1.ttl']) { + const grants = accessFor(plan, resource) + expect(grants.some(grant => grant.agentClass.includes(Public.iri))).toBe(false) + } + }) + + it('does not add a default when granting to a container that already has an ACL', async () => { + const acl = rootACL.split('<./>').join(`<${container}>`) + const plan = await sharingLogic(container, acl).planGrant(container, Public, ['Read']) + expect(accessFor(plan, container + 'index.ttl')).toHaveLength(0) + expect(plan.deletes).toEqual([]) + }) + + it('revokes a previously materialized public grant without removing owner defaults', async () => { + const granted = await sharingLogic(container).planGrantContainerContents(container, Public, ['Read']) + const directACL = rootACL + ` + <#public> a acl:Authorization; acl:default <${container}>; + acl:agentClass <${Public.iri}>; acl:mode acl:Read.` + const dataset: Quad[] = await parseTurtle(directACL, { baseIRI: container + '.acl', contentType: 'text/turtle' }) + const directContext = buildACLContext({ + resource: container, + dataset, + defaultACLResource: container + '.acl', + effectiveACLResource: container + '.acl', + effectiveContainer: container + }) + const publicRule = namedNode(container + '.acl#public') + directContext.authorizations.push({ + id: publicRule.value, + blankNode: false, + accessTo: [], + default: [container], + agent: [], + agentClass: [Public.iri], + agentGroup: [], + mode: ['Read'], + origin: [], + condition: [] + }) + directContext.dataset = [ + ...directContext.dataset, + quad(publicRule, namedNode(ACL + 'default'), namedNode(container)), + quad(publicRule, namedNode(ACL + 'agentClass'), namedNode(Public.iri)) + ] + vi.mocked(findEffectiveACL).mockResolvedValue(directContext as any) + const revoked = await aclLogic.planRevokeContainerContents(container, Public) + expect(revoked.deletes.some(statement => + statement.predicate.value === ACL + 'default' && + statement.object.value === container + )).toBe(true) + expect(revoked.deletes.some(statement => + statement.predicate.value === ACL + 'accessTo' + )).toBe(false) + expect(granted.inserts.some(statement => + statement.predicate.value === ACL + 'default' && + statement.object.value === container + )).toBe(true) + }) + + it('does not add defaults when sharing an individual resource', async () => { + const resource = container + 'index.ttl' + const plan = await sharingLogic(resource).planGrant(resource, Public, ['Read']) + expect(plan.inserts.some(statement => statement.predicate.value === ACL + 'default')).toBe(false) + const grants = accessFor(plan, resource) + expect(grants.find(grant => grant.agent.includes(owner))?.mode).toEqual(['Read', 'Write', 'Control']) + expect(grants.find(grant => grant.agentClass.includes(Public.iri))?.mode).toEqual(['Read']) + }) + + it('parses the stored relative owner WebID without changing its identity', () => { + const dataset = parseTurtle(`@prefix acl: <${ACL}>. @prefix card: <../../../../profile/card#>. <#owner> acl:agent card:me.`, { + baseIRI: container + '.acl', contentType: 'text/turtle' + }) + expect(dataset[0].object.value).toBe(owner) + }) + }) + + describe('container scope classification', () => { + const scopeContext = (predicates: string[]) => ({ + resource: container, + dataset: predicates.map(predicate => + quad(namedNode(container + '.acl#a1'), namedNode(ACL + predicate), namedNode(container))), + } as any) + + it('classifies accessTo-only ACLs as folder only', () => { + expect(classifyContainerAccessScope(scopeContext(['accessTo']))).toBe('folder') + }) + + it('classifies default-only ACLs as contents defaults', () => { + expect(classifyContainerAccessScope(scopeContext(['default']))).toBe('contents') + }) + + it('classifies ACLs with both predicates as folder and contents', () => { + expect(classifyContainerAccessScope(scopeContext(['accessTo', 'default']))).toBe('folder+contents') + }) + + it('classifies mixed grants conservatively as folder and contents', () => { + const context = { + resource: container, + dataset: [ + quad(namedNode(container + '.acl#a1'), namedNode(ACL + 'accessTo'), namedNode(container)), + quad(namedNode(container + '.acl#a2'), namedNode(ACL + 'default'), namedNode(container)) + ] + } as any + expect(classifyContainerAccessScope(context)).toBe('contents') + }) + + it('defaults an ACL with neither direct predicate to folder and contents', () => { + expect(classifyContainerAccessScope(scopeContext([]))).toBe('folder+contents') + }) + + it('filters mixed authorizations by their complete predicate scope without mutation', () => { + const grants = [ + { agent: [owner], agentGroup: [], agentClass: [], origin: [], mode: ['Read'], accessTo: [container], default: [] }, + { agent: ['https://example.com/contents#me'], agentGroup: [], agentClass: [], origin: [], mode: ['Read'], accessTo: [], default: [container] }, + { agent: ['https://example.com/both#me'], agentGroup: [], agentClass: [], origin: [], mode: ['Read'], accessTo: [container], default: [container] }, + { agent: ['https://example.com/other#me'], agentGroup: [], agentClass: [], origin: [], mode: ['Read'], accessTo: [container, 'https://example.com/other'], default: [container] } + ] as any + + expect(classifyAuthorizationScope(container, grants[0])).toBe('folder') + expect(classifyAuthorizationScope(container, grants[1])).toBe('contents') + expect(classifyAuthorizationScope(container, grants[2])).toBe('folder+contents') + expect(filterAuthorizationsByContainerScope(container, grants, 'folder')).toEqual([grants[0]]) + expect(filterAuthorizationsByContainerScope(container, grants, 'contents')).toEqual([grants[1]]) + expect(filterAuthorizationsByContainerScope(container, grants, 'folder+contents')).toEqual([grants[2], grants[3]]) + expect(grants).toHaveLength(4) + }) + + it('includes inherited parent defaults when filtering a container scope', () => { + const inheritedGrant = { + agent: ['https://example.com/inherited#me'], + agentGroup: [], + agentClass: [], + origin: [], + mode: ['Read'], + accessTo: [], + default: ['https://example.com/parent/'] + } as any + + expect(classifyAuthorizationScope(container, inheritedGrant)).toBeUndefined() + expect(classifyAuthorizationScope(container, inheritedGrant, true)).toBe('folder+contents') + expect(filterAuthorizationsByContainerScope(container, [inheritedGrant], 'folder+contents', true)) + .toEqual([inheritedGrant]) + }) + }) }) diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 63d02776..1bc176ac 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -37,14 +37,21 @@ describe('resourceLogic', () => { findAclDocUrl: vi.fn().mockResolvedValue(undefined), findEffectiveAcl: vi.fn().mockResolvedValue({ authorizations: [] }), findAccessGrants: vi.fn().mockResolvedValue([]), + classifyContainerScope: vi.fn().mockReturnValue('folder+contents'), + isProtectedResource: vi.fn(), classifyAccessControlSubject: vi.fn().mockResolvedValue(undefined), roleFromModes: vi.fn(), modesFromRole: vi.fn(), publicRoleFromModes: vi.fn(), modesFromPublicRole: vi.fn(), planGrant: vi.fn(), + planGrantContainer: vi.fn(), + planGrantContainerAndContents: vi.fn(), + planGrantContainerContents: vi.fn(), planRevoke: vi.fn(), + planRevokeContainerContents: vi.fn(), planPublicRead: vi.fn(), + resetToDefault: vi.fn(), applyPlan: vi.fn(), setACLUserPublic: vi.fn(), genACLText: vi.fn(), From 1f9ccd40ea28e5e74b0d806fc63d6279d98f3d40 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Tue, 20 Oct 2026 11:46:19 +1100 Subject: [PATCH 16/32] Handle when multiple principal contents authorizations have edits Prompt: Split shared direct authorizations when downgrading or revoking one subject. Co-authored-by: GPT-5.6 Luna --- src/acl/aclLogic.ts | 66 +++++++++++++++++++ test/aclLogic.test.ts | 149 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+) diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index ef629a5a..4e28504b 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -345,6 +345,16 @@ export function createAclLogic(store): AclLogic { throw new Error('Applying access to the contents of a protected storage resource is not allowed.') } if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'contents') + const sharedAuthorization = context.authorizations.find(authorization => + authorization.default?.includes(context.resource) && + subjectMatchesAuthorization(subject, authorization) && + ['agent', 'agentClass', 'agentGroup', 'origin'].reduce((count, key) => + count + authorization[key].length, 0) > 1) + + if (sharedAuthorization) { + return splitDirectContainerContentsAuthorization(context, sharedAuthorization, subject, modes) + } + const existingDefaultOnly = context.authorizations.find(authorization => authorization.default?.includes(context.resource) && !authorization.accessTo?.includes(context.resource) && @@ -381,6 +391,16 @@ export function createAclLogic(store): AclLogic { const defaultPredicate = ACL + 'default' if (!context.inherited) { + const sharedAuthorization = context.authorizations.find(authorization => + authorization.default?.includes(context.resource) && + subjectMatchesAuthorization(subject, authorization) && + ['agent', 'agentClass', 'agentGroup', 'origin'].reduce((count, key) => + count + authorization[key].length, 0) > 1) + + if (sharedAuthorization) { + return splitDirectContainerContentsAuthorization(context, sharedAuthorization, subject) + } + const deletes = context.dataset.filter(statement => statement.predicate.value === defaultPredicate && statement.object.value === context.resource && @@ -400,6 +420,52 @@ export function createAclLogic(store): AclLogic { return plan } + function splitDirectContainerContentsAuthorization ( + context: ACLContext, + authorization: Authorization, + subject: AccessSubject, + modes?: AccessMode[] + ): PatchPlan { + const subjectKeys = ['agent', 'agentClass', 'agentGroup', 'origin'] as const + const subjects = subjectKeys.flatMap(key => + authorization[key].map(iri => ({ key, iri })) + ) + const remainingSubjects = subjects.filter(({ key, iri }) => + !(key === subject.type && iri === subject.iri)) + const target = namedNode(context.defaultACLResource + `#split-${Math.random().toString(36).slice(2)}`) + const retained = namedNode(context.defaultACLResource + `#retained-${Math.random().toString(36).slice(2)}`) + const inserts: PatchPlan['inserts'] = [] + const addRule = ( + rule: ReturnType, + ruleSubjects: Array<{ key: typeof subjectKeys[number], iri: string }>, + ruleModes: AccessMode[], + includeAccessTo: boolean, + includeDefault: boolean + ) => { + if (!ruleSubjects.length || (!includeAccessTo && !includeDefault)) return + inserts.push( + quad(rule, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), namedNode(ACL + 'Authorization')), + ...(includeAccessTo ? [quad(rule, namedNode(ACL + 'accessTo'), namedNode(context.resource))] : []), + ...(includeDefault ? [quad(rule, namedNode(ACL + 'default'), namedNode(context.resource))] : []), + ...ruleModes.map(mode => quad(rule, namedNode(ACL + 'mode'), namedNode(`http://www.w3.org/ns/auth/acl#${mode}`))), + ...ruleSubjects.map(({ key, iri }) => quad(rule, namedNode(ACL + key), namedNode(iri))) + ) + } + + const hasAccessTo = authorization.accessTo.includes(context.resource) + const hasDefault = authorization.default.includes(context.resource) + addRule(retained, remainingSubjects, authorization.mode, hasAccessTo, hasDefault) + if (modes) { + addRule(target, [{ key: subject.type, iri: subject.iri }], modes, hasAccessTo, hasDefault) + } + + return { + target: context.defaultACLResource, + deletes: context.dataset.filter(statement => statement.subject.value === authorization.id), + inserts + } + } + async function planRevoke(resourceURL: string | NamedNode, subject: AccessSubject): Promise { const context = await findEffectiveAcl(resourceURL) assertProtectedControlPreserved(context, subject) diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index dbf3e85a..3f4f24ab 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -303,6 +303,99 @@ describe('createAclLogic', () => { expect(plan.inserts).toEqual([]) }) + it('splits a shared contents authorization when downgrading one subject', async () => { + const resource = sym('https://example.com/alice/') + const alice = 'https://example.com/alice#me' + const bob = 'https://example.com/bob#me' + const authorization = namedNode('https://example.com/alice/.acl#shared') + const statements = [ + quad(authorization, namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(authorization, namedNode(ACL + 'default'), resource), + quad(authorization, namedNode(ACL + 'agent'), namedNode(alice)), + quad(authorization, namedNode(ACL + 'agent'), namedNode(bob)), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Read')), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Write')) + ] + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: false, + authorizations: [{ + id: authorization.value, + agent: [alice, bob], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read', 'Write'], + default: [resource.value], + accessTo: [], + condition: [], + blankNode: false + }], + dataset: statements + } as any) + + const plan = await aclLogic.planGrantContainerContents(resource, { type: 'agent', iri: alice }, ['Read']) + expect(plan.deletes).toEqual(statements) + + const aliceRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agent' && statement.object.value === alice)?.subject + const bobRule = plan.inserts.find(statement => + statement.predicate.value === ACL + 'agent' && statement.object.value === bob)?.subject + expect(aliceRule).toBeDefined() + expect(bobRule).toBeDefined() + expect(plan.inserts.filter(statement => statement.subject.equals(aliceRule!)) + .some(statement => statement.predicate.value === ACL + 'mode' && statement.object.value === ACL + 'Read')).toBe(true) + expect(plan.inserts.filter(statement => statement.subject.equals(aliceRule!)) + .some(statement => statement.predicate.value === ACL + 'mode' && statement.object.value === ACL + 'Write')).toBe(false) + expect(plan.inserts.filter(statement => statement.subject.equals(bobRule!)) + .some(statement => statement.predicate.value === ACL + 'mode' && statement.object.value === ACL + 'Write')).toBe(true) + }) + + it('preserves other subjects when revoking one subject from a shared contents authorization', async () => { + const resource = sym('https://example.com/alice/') + const alice = 'https://example.com/alice#me' + const bob = 'https://example.com/bob#me' + const authorization = namedNode('https://example.com/alice/.acl#shared') + const statements = [ + quad(authorization, namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(authorization, namedNode(ACL + 'default'), resource), + quad(authorization, namedNode(ACL + 'agent'), namedNode(alice)), + quad(authorization, namedNode(ACL + 'agent'), namedNode(bob)), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Read')) + ] + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: false, + authorizations: [{ + id: authorization.value, + agent: [alice, bob], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read'], + default: [resource.value], + accessTo: [], + condition: [], + blankNode: false + }], + dataset: statements + } as any) + + const plan = await aclLogic.planRevokeContainerContents(resource, { type: 'agent', iri: alice }) + expect(plan.deletes).toEqual(statements) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'agent' && statement.object.value === bob + )).toBe(true) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'agent' && statement.object.value === alice + )).toBe(false) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'default' && statement.object.value === resource.value + )).toBe(true) + }) + it('keeps inherited folder access without an acl:default when revoking contents', async () => { const resource = sym('https://example.com/alice/') const subject = { type: 'agent', iri: 'https://example.com/person#me' } @@ -454,6 +547,62 @@ describe('createAclLogic', () => { expect(quadsFor(plan, resource.value, ACL + 'default').some(q => q.subject.value === subjectRule)).toBe(false) }) + it('preserves supported conditions while materializing an inherited authorization', async () => { + const resource = sym('https://example.com/conditioned/') + const subject = { type: 'agent' as const, iri: 'https://example.com/owner#me' } + const authorization = namedNode('https://example.com/.acl#conditioned') + const condition = namedNode('https://example.com/.acl#condition-1') + const conditionType = namedNode(ACL + 'ClientCondition') + const conditionClient = namedNode(ACL + 'client') + const conditionValue = namedNode('https://example.com/client') + const dataset = [ + quad(authorization, namedNode(ACL + 'condition'), condition), + quad(condition, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), conditionType), + quad(condition, conditionClient, conditionValue) + ] + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: authorization.value, + agent: [subject.iri], agentClass: [], agentGroup: [], origin: [], + mode: ['Read'], default: [root], accessTo: [], + condition: [{ + id: condition.value, + blankNode: false, + properties: { + [conditionClient.value]: [conditionValue.value] + } + }] + }], dataset)) + + const plan = await aclLogic.planGrantContainer(resource, subject, ['Read', 'Write']) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'condition' + )).toBe(true) + expect(plan.inserts.some(statement => + statement.predicate.value === conditionClient.value && + statement.object.value === conditionValue.value + )).toBe(true) + }) + + it('rejects unsupported condition properties instead of silently dropping them', async () => { + const resource = sym('https://example.com/unsupported-condition/') + const subject = { type: 'agent' as const, iri: 'https://example.com/owner#me' } + vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ + id: 'https://example.com/.acl#unsupported-condition', + agent: [subject.iri], agentClass: [], agentGroup: [], origin: [], + mode: ['Read'], default: [root], accessTo: [], + condition: [{ + id: 'https://example.com/.acl#condition-unsupported', + blankNode: false, + properties: { + 'https://example.com/unsupported-condition-property': ['https://example.com/value'] + } + }] + }])) + + await expect(aclLogic.planGrantContainer(resource, subject, ['Read', 'Write'])) + .rejects.toThrow('Unsupported ACL condition') + }) + it('materializes an inherited contents-only grant with only acl:default', async () => { const resource = sym('https://example.com/contents-only/') const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } From 9215db6b1d79de749727c8422f8db4afa824f22e Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Tue, 20 Oct 2026 12:32:48 +1100 Subject: [PATCH 17/32] Safety for conditions and authorization ids Prompt: Make sure to copy over any conditions even though this is not currently supported in solidos we don't want to lose this information if a user has it. Also make authorization ids consistent. Co-authored-by: GPT-5.6 Luna --- src/acl/aclLogic.ts | 96 ++++++++++++++++++++++++++++++++----------- test/aclLogic.test.ts | 72 ++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 25 deletions(-) diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index 4e28504b..8bb3c428 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -227,6 +227,64 @@ export function createAclLogic(store): AclLogic { } } + const subjectKeys = ['agent', 'agentClass', 'agentGroup', 'origin'] as const + const rdfType = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' + const supportedConditionPredicates = new Set([ + rdfType, + ACL + 'client', + ACL + 'clientClass', + ACL + 'clientGroup', + ACL + 'issuer', + ACL + 'issuerClass', + ACL + 'issuerGroup', + ACL + 'description', + // Some older ACL contexts expose the condition type as a property key + // rather than retaining it under rdf:type. + ACL + 'ClientCondition', + ACL + 'IssuerCondition' + ]) + const supportedConditionTypes = new Set([ + ACL + 'ClientCondition', + ACL + 'IssuerCondition' + ]) + + function createAuthorizationIdAllocator(context: ACLContext): (base: string) => string { + const takenIds = new Set([ + ...(context.dataset ?? []).map(statement => statement.subject.value), + ...context.authorizations.flatMap(authorization => [ + authorization.id, + ...(authorization.condition ?? []).map(condition => condition.id) + ]) + ]) + + return (base: string): string => { + let id = base + let suffix = 1 + while (takenIds.has(id)) { + id = `${base}-${suffix++}` + } + takenIds.add(id) + return id + } + } + + function assertSupportedConditions(context: ACLContext): void { + for (const authorization of context.authorizations) { + for (const condition of authorization.condition ?? []) { + const conditionTypes = condition.properties[rdfType] ?? [] + if (conditionTypes.length > 1 || + (conditionTypes.length === 1 && !supportedConditionTypes.has(conditionTypes[0]))) { + throw new Error(`Unsupported ACL condition type on ${condition.id}`) + } + for (const predicate of Object.keys(condition.properties)) { + if (!supportedConditionPredicates.has(predicate)) { + throw new Error(`Unsupported ACL condition property: ${predicate}`) + } + } + } + } + } + function materializeInheritedContainer ( context: ACLContext, subject: AccessSubject, @@ -236,23 +294,8 @@ export function createAclLogic(store): AclLogic { ): PatchPlan { const inserts: PatchPlan['inserts'] = [] const subjectKey = subject.type - const subjectKeys = ['agent', 'agentClass', 'agentGroup', 'origin'] as const - const takenIds = new Set([ - ...(context.dataset ?? []).map(statement => statement.subject.value), - ...context.authorizations.flatMap(authorization => [ - authorization.id, - ...(authorization.condition ?? []).map(condition => condition.id) - ]) - ]) - const freshId = (base: string): string => { - let id = base - let suffix = 1 - while (takenIds.has(id)) { - id = `${base}-${suffix++}` - } - takenIds.add(id) - return id - } + const freshId = createAuthorizationIdAllocator(context) + assertSupportedConditions(context) const addRule = ( authorization: Authorization, baseId: string, @@ -264,7 +307,7 @@ export function createAclLogic(store): AclLogic { const id = freshId(baseId) const rule = namedNode(id) inserts.push( - quad(rule, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), namedNode(ACL + 'Authorization')), + quad(rule, namedNode(rdfType), namedNode(ACL + 'Authorization')), ...(targets.accessTo ? [quad(rule, namedNode(ACL + 'accessTo'), namedNode(context.resource))] : []), ...(targets.default ? [quad(rule, namedNode(ACL + 'default'), namedNode(context.resource))] : []), ...(modeOverride ?? authorization.mode).map(mode => quad(rule, namedNode(ACL + 'mode'), namedNode(`http://www.w3.org/ns/auth/acl#${mode}`))), @@ -312,9 +355,12 @@ export function createAclLogic(store): AclLogic { }) }) if (!revoke) { - addRule(onlySubject({ + const newAuthorization: Authorization = { + id: `${context.defaultACLResource}#inherited-new-source`, + blankNode: false, accessTo: [], default: [], agent: [], agentClass: [], agentGroup: [], origin: [], mode: [], condition: [] - } as unknown as Authorization), `${context.defaultACLResource}#inherited-new`, { + } + addRule(onlySubject(newAuthorization), `${context.defaultACLResource}#inherited-new`, { accessTo: scope !== 'contents', default: scope !== 'folder' }, modes ?? []) @@ -368,11 +414,11 @@ export function createAclLogic(store): AclLogic { } const subjectKey = subject.type - const id = `${context.defaultACLResource}#contents-${Math.random().toString(36).slice(2)}` + const id = createAuthorizationIdAllocator(context)(`${context.defaultACLResource}#contents-1`) const rule = namedNode(id) const subjectQuad = quad(rule, namedNode(ACL + subjectKey), namedNode(subject.iri)) const fresh = [ - quad(rule, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), namedNode(ACL + 'Authorization')), + quad(rule, namedNode(rdfType), namedNode(ACL + 'Authorization')), quad(rule, namedNode(ACL + 'default'), namedNode(context.resource)), ...modes.map(mode => quad(rule, namedNode(ACL + 'mode'), namedNode(`http://www.w3.org/ns/auth/acl#${mode}`))), subjectQuad @@ -426,14 +472,14 @@ export function createAclLogic(store): AclLogic { subject: AccessSubject, modes?: AccessMode[] ): PatchPlan { - const subjectKeys = ['agent', 'agentClass', 'agentGroup', 'origin'] as const + const freshId = createAuthorizationIdAllocator(context) const subjects = subjectKeys.flatMap(key => authorization[key].map(iri => ({ key, iri })) ) const remainingSubjects = subjects.filter(({ key, iri }) => !(key === subject.type && iri === subject.iri)) - const target = namedNode(context.defaultACLResource + `#split-${Math.random().toString(36).slice(2)}`) - const retained = namedNode(context.defaultACLResource + `#retained-${Math.random().toString(36).slice(2)}`) + const target = namedNode(freshId(`${context.defaultACLResource}#split-1`)) + const retained = namedNode(freshId(`${context.defaultACLResource}#retained-1`)) const inserts: PatchPlan['inserts'] = [] const addRule = ( rule: ReturnType, diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index 3f4f24ab..6640ea17 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -352,6 +352,56 @@ describe('createAclLogic', () => { .some(statement => statement.predicate.value === ACL + 'mode' && statement.object.value === ACL + 'Write')).toBe(true) }) + it('allocates deterministic, collision-free IDs when splitting a shared authorization', async () => { + const resource = sym('https://example.com/alice/') + const alice = 'https://example.com/alice#me' + const bob = 'https://example.com/bob#me' + const aclResource = resource.value + '.acl' + const authorization = namedNode(aclResource + '#shared') + const statements = [ + quad(authorization, namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(authorization, namedNode(ACL + 'default'), resource), + quad(authorization, namedNode(ACL + 'agent'), namedNode(alice)), + quad(authorization, namedNode(ACL + 'agent'), namedNode(bob)), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Read')), + quad(namedNode(aclResource + '#split'), namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(namedNode(aclResource + '#retained'), namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')) + ] + const context = { + resource: resource.value, + defaultACLResource: aclResource, + inherited: false, + authorizations: [{ + id: authorization.value, + agent: [alice, bob], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read'], + default: [resource.value], + accessTo: [], + condition: [], + blankNode: false + }], + dataset: statements + } as any + vi.mocked(findEffectiveACL).mockResolvedValue(context) + + const first = await aclLogic.planGrantContainerContents(resource, { type: 'agent', iri: alice }, ['Read']) + const second = await aclLogic.planGrantContainerContents(resource, { type: 'agent', iri: alice }, ['Read']) + const insertedAuthorizationIds = (plan: PatchPlan) => [...new Set(plan.inserts + .filter(statement => + statement.predicate.value === 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' && + statement.object.value === ACL + 'Authorization') + .map(statement => statement.subject.value))] + + expect(insertedAuthorizationIds(first)).toEqual([ + aclResource + '#retained-1', + aclResource + '#split-1' + ]) + expect(insertedAuthorizationIds(second)).toEqual(insertedAuthorizationIds(first)) + }) + it('preserves other subjects when revoking one subject from a shared contents authorization', async () => { const resource = sym('https://example.com/alice/') const alice = 'https://example.com/alice#me' @@ -732,6 +782,28 @@ describe('createAclLogic', () => { )).toBe(false) }) + it('allocates a deterministic ID for a new direct contents authorization', async () => { + const resource = sym('https://example.com/alice/') + const aclResource = resource.value + '.acl' + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: aclResource, + inherited: false, + authorizations: [], + dataset: [ + quad(namedNode(aclResource + '#contents'), namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')) + ] + } as any) + + const subject = { type: 'agent' as const, iri: 'https://example.com/person#me' } + const first = await aclLogic.planGrantContainerContents(resource, subject, ['Read']) + const second = await aclLogic.planGrantContainerContents(resource, subject, ['Read']) + + expect(first.inserts[0]?.subject.value).toBe(aclResource + '#contents-1') + expect(second.inserts.map(statement => statement.subject.value)) + .toEqual(first.inserts.map(statement => statement.subject.value)) + }) + it('keeps the inherited owner on the folder itself when materializing a first ACL', async () => { const sharonRootACL = rootACL + ` <#public> a acl:Authorization; From 38a4a4bd684553f07c248ce59bdbbe0e54ae15e3 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Tue, 20 Oct 2026 14:33:45 +1100 Subject: [PATCH 18/32] Normalize role handling and prepare for owner (write locked) Prompt: Please normalize the role handling and add the ability to have a owner (write locked) which is read and control. Co-authored-by: GPT-5.6 Luna --- src/acl/aclLogic.ts | 20 ++++++++++++++++---- src/index.ts | 4 ++-- test/aclLogic.test.ts | 30 +++++++++++++++++++++++++++++- test/publicAclApi.test.ts | 8 ++++++++ 4 files changed, 55 insertions(+), 7 deletions(-) diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index 8bb3c428..9a248450 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -6,16 +6,25 @@ import * as accessControlSubjects from './accessControlSubjects' export const ACCESS_ROLES = ['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter'] as const export const PUBLIC_ACCESS_ROLES = ['No Access', 'Viewer'] as const +/** + * A Control grant without Write is the legacy "write locked" owner grant. + * + * It is intentionally not part of ACCESS_ROLES yet: that list is consumed by + * the existing UI, whose selector will be updated in a later change. + */ +export const WRITE_LOCKED_OWNER_ROLE = 'Owner (write locked)' as const export { Authenticated, Public } from '@dokieli/web-access-control' -export type AccessRole = typeof ACCESS_ROLES[number] +export type AccessRole = typeof ACCESS_ROLES[number] | typeof WRITE_LOCKED_OWNER_ROLE export type PublicAccessRole = typeof PUBLIC_ACCESS_ROLES[number] export type ContainerAccessScope = 'folder+contents' | 'folder' | 'contents' -export interface ContainerAccessScopeAnalysis { +export interface ContainerAccessScopeResult { distinctScopes: ContainerAccessScope[] primaryScope: ContainerAccessScope mixed: boolean } +/** @deprecated Use ContainerAccessScopeResult. */ +export type ContainerAccessScopeAnalysis = ContainerAccessScopeResult export function classifyAuthorizationScope ( resource: string, @@ -53,7 +62,7 @@ export function classifyContainerAccessScope (context: ACLContext): ContainerAcc return analyzeContainerAccessScope(context).primaryScope } -export function analyzeContainerAccessScope (context: ACLContext): ContainerAccessScopeAnalysis { +export function analyzeContainerAccessScope (context: ACLContext): ContainerAccessScopeResult { const scopes = new Set() for (const authorization of context.authorizations ?? []) { const scope = classifyAuthorizationScope(context.resource, authorization, context.inherited) @@ -97,6 +106,7 @@ export function createAclLogic(store): AclLogic { const ns = namespace const ACCESS_ROLE_RULES: Array<{ label: AccessRole, modes: AccessMode[] }> = [ { label: 'Owner', modes: ['Read', 'Write', 'Control'] }, + { label: WRITE_LOCKED_OWNER_ROLE, modes: ['Read', 'Control'] }, { label: 'Editor', modes: ['Read', 'Write'] }, { label: 'Poster', modes: ['Append', 'Read'] }, { label: 'Submitter', modes: ['Append'] }, @@ -110,7 +120,9 @@ export function createAclLogic(store): AclLogic { function roleFromModes (modes: Iterable): AccessRole { const modeSet = new Set(modes) - const matchingRule = ACCESS_ROLE_RULES.find(rule => rule.label !== 'No Access' && rule.modes.every(mode => modeSet.has(mode))) + const matchingRule = ACCESS_ROLE_RULES.find(rule => + rule.modes.length === modeSet.size && + rule.modes.every(mode => modeSet.has(mode))) return matchingRule?.label ?? 'No Access' } diff --git a/src/index.ts b/src/index.ts index 91a8e820..39294985 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,8 +6,8 @@ const authn = solidLogicSingleton.authn const authSession = solidLogicSingleton.authn.authSession const store = solidLogicSingleton.store -export { ACL_LINK, ACCESS_ROLES, PUBLIC_ACCESS_ROLES, Authenticated, Public, classifyContainerAccessScope, analyzeContainerAccessScope, classifyAuthorizationScope, filterAuthorizationsByContainerScope } from './acl/aclLogic' -export type { AccessRole, ContainerAccessScope, ContainerAccessScopeAnalysis, PublicAccessRole } from './acl/aclLogic' +export { ACL_LINK, ACCESS_ROLES, PUBLIC_ACCESS_ROLES, WRITE_LOCKED_OWNER_ROLE, Authenticated, Public, classifyContainerAccessScope, analyzeContainerAccessScope, classifyAuthorizationScope, filterAuthorizationsByContainerScope } from './acl/aclLogic' +export type { AccessRole, ContainerAccessScope, ContainerAccessScopeAnalysis, ContainerAccessScopeResult, PublicAccessRole } from './acl/aclLogic' export { offlineTestID, appContext } from './authn/authUtil' export { performServerSideLogout } from './authn/serverLogout' export { reloadOnIdentityReplaced } from './authSession/identityState' diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index 6640ea17..da73ca31 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { Fetcher, Store, namedNode, sym, UpdateManager } from 'rdflib' import { ACL, applyPlan, buildACLContext, findEffectiveACL, parseTurtle, planGrant, planPublicRead, planRevoke, Public, quad, type PatchPlan, type Quad } from '@dokieli/web-access-control' -import { ACL_LINK, analyzeContainerAccessScope, classifyAuthorizationScope, classifyContainerAccessScope, createAclLogic, filterAuthorizationsByContainerScope } from '../src/acl/aclLogic' +import { ACL_LINK, WRITE_LOCKED_OWNER_ROLE, analyzeContainerAccessScope, classifyAuthorizationScope, classifyContainerAccessScope, createAclLogic, filterAuthorizationsByContainerScope } from '../src/acl/aclLogic' var actualFindEffectiveACL: typeof findEffectiveACL var actualPlanGrant: typeof planGrant @@ -165,12 +165,40 @@ describe('createAclLogic', () => { it('maps roles to ACL modes and back', () => { expect(aclLogic.modesFromRole('Editor')).toEqual(['Read', 'Write']) expect(aclLogic.modesFromRole('Owner')).toEqual(['Read', 'Write', 'Control']) + expect(aclLogic.modesFromRole(WRITE_LOCKED_OWNER_ROLE)).toEqual(['Read', 'Control']) expect(aclLogic.modesFromRole('No Access')).toEqual([]) expect(aclLogic.roleFromModes(['Read', 'Write'])).toBe('Editor') expect(aclLogic.roleFromModes(['Read'])).toBe('Viewer') + expect(aclLogic.roleFromModes(['Control', 'Read'])).toBe(WRITE_LOCKED_OWNER_ROLE) + expect(aclLogic.roleFromModes(['Read', 'Write', 'Control', 'Append'])).toBe('No Access') expect(aclLogic.roleFromModes([])).toBe('No Access') }) + it('preserves write-locked owner modes in a grant plan', async () => { + const resource = 'https://example.com/write-locked.ttl' + const ownACL = `@prefix acl: <${ACL}>. +<#existing> a acl:Authorization; + acl:accessTo <${resource}>; + acl:agent ; + acl:mode acl:Read.` + const plan = await sharingLogic(resource, ownACL).planGrant(resource, { + type: 'agent', + iri: 'https://example.com/profile/card#owner' + }, aclLogic.modesFromRole(WRITE_LOCKED_OWNER_ROLE)) + + expect(plan.inserts + .filter(statement => statement.predicate.value === ACL + 'mode') + .map(statement => statement.object.value) + .sort()) + .toEqual([ + ACL + 'Control', + ACL + 'Read' + ].sort()) + expect(plan.inserts.some(statement => + statement.predicate.value === ACL + 'mode' && + statement.object.value === ACL + 'Write')).toBe(false) + }) + it('finds the ACL document URL from the discovered link', async () => { const resource = sym('https://example.com/resource.ttl') const aclDoc = sym('https://example.com/resource.ttl.acl') diff --git a/test/publicAclApi.test.ts b/test/publicAclApi.test.ts index 984864bc..8b5fd2e6 100644 --- a/test/publicAclApi.test.ts +++ b/test/publicAclApi.test.ts @@ -4,11 +4,13 @@ import { Authenticated, PUBLIC_ACCESS_ROLES, Public, + WRITE_LOCKED_OWNER_ROLE, solidLogicSingleton, type ACLContext, type AccessControlSubjectKind, type AccessMode, type AccessRole, + type ContainerAccessScopeResult, type AccessSubject, type Authorization, type PatchPlan, @@ -19,6 +21,7 @@ describe('public ACL API', () => { it('exports the role list and exposes mapping through the singleton', () => { expect(ACCESS_ROLES).toEqual(['Owner', 'Editor', 'No Access', 'Viewer', 'Poster', 'Submitter']) expect(PUBLIC_ACCESS_ROLES).toEqual(['No Access', 'Viewer']) + expect(WRITE_LOCKED_OWNER_ROLE).toBe('Owner (write locked)') expect(Authenticated).toMatchObject({ type: 'agentClass', iri: 'http://www.w3.org/ns/auth/acl#AuthenticatedAgent' }) expect(Public).toMatchObject({ type: 'agentClass', iri: 'http://xmlns.com/foaf/0.1/Agent' }) for (const role of ACCESS_ROLES) { @@ -40,5 +43,10 @@ describe('public ACL API', () => { expectTypeOf(solidLogicSingleton.acl.publicRoleFromModes).toEqualTypeOf<(modes: Iterable) => PublicAccessRole>() expectTypeOf(solidLogicSingleton.acl.modesFromPublicRole).toEqualTypeOf<(role: PublicAccessRole) => AccessMode[]>() expectTypeOf().toEqualTypeOf<'agent' | 'agentGroup' | 'agentClass' | 'origin'>() + expectTypeOf().toEqualTypeOf<{ + distinctScopes: ('folder+contents' | 'folder' | 'contents')[] + primaryScope: 'folder+contents' | 'folder' | 'contents' + mixed: boolean + }>() }) }) From ebb754f18adf28a29e31757864351776511f6bcf Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Tue, 20 Oct 2026 20:02:28 +1100 Subject: [PATCH 19/32] update version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c86425b..a56527d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.1-2", + "version": "6.0.1-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.1-2", + "version": "6.0.1-3", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.1.0", diff --git a/package.json b/package.json index 5322212f..fa1d30f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.1-2", + "version": "6.0.1-3", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", From 142a91230698a04f9505eec5eb5e7eb067c97d48 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Tue, 20 Oct 2026 20:44:05 +1100 Subject: [PATCH 20/32] address PR feedback Prompt: multiple to help resolve PR feedback Co-authored-by: GPT-5.6 Luna --- src/acl/aclLogic.ts | 193 ++++++++++++++++++++------------ src/index.ts | 2 +- test/aclLogic.test.ts | 254 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 368 insertions(+), 81 deletions(-) diff --git a/src/acl/aclLogic.ts b/src/acl/aclLogic.ts index 9a248450..b23ae5e9 100644 --- a/src/acl/aclLogic.ts +++ b/src/acl/aclLogic.ts @@ -23,9 +23,6 @@ export interface ContainerAccessScopeResult { primaryScope: ContainerAccessScope mixed: boolean } -/** @deprecated Use ContainerAccessScopeResult. */ -export type ContainerAccessScopeAnalysis = ContainerAccessScopeResult - export function classifyAuthorizationScope ( resource: string, authorization: Authorization, @@ -194,17 +191,33 @@ export function createAclLogic(store): AclLogic { return authorization[predicateByType[subject.type]]?.includes(subject.iri) ?? false } - function assertProtectedControlPreserved(context: ACLContext, subject: AccessSubject, modes?: AccessMode[]): void { + function assertProtectedControlPreserved(context: ACLContext, plan: PatchPlan): void { if (!isProtectedResource(context.resource)) { return } - const hasControl = context.authorizations.some(authorization => - authorization.mode.includes('Control') && subjectMatchesAuthorization(subject, authorization)) - const controlCount = context.authorizations.filter(authorization => authorization.mode.includes('Control')).length - const keepsControl = modes?.includes('Control') ?? false + const deletedAuthorizationIds = new Set(plan.deletes.map(statement => statement.subject.value)) + const insertedAuthorizations = new Map() + for (const statement of plan.inserts) { + const authorization = insertedAuthorizations.get(statement.subject.value) ?? { modes: [], accessTo: [] } + if (statement.predicate.value === ACL + 'mode') { + authorization.modes.push(statement.object.value) + } else if (statement.predicate.value === ACL + 'accessTo') { + authorization.accessTo.push(statement.object.value) + } + insertedAuthorizations.set(statement.subject.value, authorization) + } - if (hasControl && controlCount <= 1 && !keepsControl) { + const survivingControl = !context.inherited && context.authorizations.some(authorization => + !deletedAuthorizationIds.has(authorization.id) && + authorization.mode.includes('Control') && + authorization.accessTo.includes(context.resource) + ) || [...insertedAuthorizations.values()].some(authorization => + authorization.modes.includes(ACL + 'Control') && + authorization.accessTo.includes(context.resource) + ) + + if (!survivingControl) { throw new Error('The protected storage resource must retain at least one Control authorization.') } } @@ -226,11 +239,14 @@ export function createAclLogic(store): AclLogic { async function planGrant(resourceURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { const context = await findEffectiveAcl(resourceURL) - assertProtectedControlPreserved(context, subject, modes) if (context.inherited && new URL(context.resource).pathname.endsWith('/')) { - return materializeInheritedContainer(context, subject, modes, 'folder') + const plan = materializeInheritedContainer(context, subject, modes, 'folder') + assertProtectedControlPreserved(context, plan) + return plan } - return planAuthorizationGrant(context, subject, modes) + const plan = planAuthorizationGrant(context, subject, modes) + assertProtectedControlPreserved(context, plan) + return plan } function assertContainer(context: ACLContext): void { @@ -327,10 +343,16 @@ export function createAclLogic(store): AclLogic { ...(authorization.condition ?? []).flatMap(condition => { const conditionId = freshId(`${id}-condition`) const conditionNode = namedNode(conditionId) + const conditionStatements = context.dataset + .filter(statement => statement.subject.value === condition.id) + .map(statement => quad( + conditionNode, + statement.predicate, + statement.object + )) return [ quad(rule, namedNode(ACL + 'condition'), conditionNode), - ...Object.entries(condition.properties).flatMap(([predicate, values]) => - values.map(value => quad(conditionNode, namedNode(predicate), namedNode(value)))) + ...conditionStatements ] }) ) @@ -367,10 +389,14 @@ export function createAclLogic(store): AclLogic { }) }) if (!revoke) { + const selectedAuthorization = context.authorizations.find(authorization => + authorization[subjectKey]?.includes(subject.iri) && + (authorization.default?.length ?? 0) > 0) const newAuthorization: Authorization = { id: `${context.defaultACLResource}#inherited-new-source`, blankNode: false, - accessTo: [], default: [], agent: [], agentClass: [], agentGroup: [], origin: [], mode: [], condition: [] + accessTo: [], default: [], agent: [], agentClass: [], agentGroup: [], origin: [], mode: [], + condition: selectedAuthorization?.condition ?? [] } addRule(onlySubject(newAuthorization), `${context.defaultACLResource}#inherited-new`, { accessTo: scope !== 'contents', @@ -383,17 +409,21 @@ export function createAclLogic(store): AclLogic { async function planGrantContainer(containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { const context = await findEffectiveAcl(containerURL) assertContainer(context) - assertProtectedControlPreserved(context, subject, modes) - if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'folder') - return planAuthorizationGrant(context, subject, modes) + const plan = context.inherited + ? materializeInheritedContainer(context, subject, modes, 'folder') + : planAuthorizationGrant(context, subject, modes) + assertProtectedControlPreserved(context, plan) + return plan } async function planGrantContainerAndContents(containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { const context = await findEffectiveAcl(containerURL) assertContainer(context) - assertProtectedControlPreserved(context, subject, modes) - if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'folder+contents') - return withContainerDefaults(context, planAuthorizationGrant(context, subject, modes)) + const plan = context.inherited + ? materializeInheritedContainer(context, subject, modes, 'folder+contents') + : withContainerDefaults(context, planAuthorizationGrant(context, subject, modes)) + assertProtectedControlPreserved(context, plan) + return plan } async function planGrantContainerContents(containerURL: string | NamedNode, subject: AccessSubject, modes: AccessMode[]): Promise { @@ -403,26 +433,12 @@ export function createAclLogic(store): AclLogic { throw new Error('Applying access to the contents of a protected storage resource is not allowed.') } if (context.inherited) return materializeInheritedContainer(context, subject, modes, 'contents') - const sharedAuthorization = context.authorizations.find(authorization => + const matchingAuthorizations = context.authorizations.filter(authorization => authorization.default?.includes(context.resource) && - subjectMatchesAuthorization(subject, authorization) && - ['agent', 'agentClass', 'agentGroup', 'origin'].reduce((count, key) => - count + authorization[key].length, 0) > 1) + subjectMatchesAuthorization(subject, authorization)) - if (sharedAuthorization) { - return splitDirectContainerContentsAuthorization(context, sharedAuthorization, subject, modes) - } - - const existingDefaultOnly = context.authorizations.find(authorization => - authorization.default?.includes(context.resource) && - !authorization.accessTo?.includes(context.resource) && - authorization[subject.type]?.includes(subject.iri) && - (authorization.agent.length + authorization.agentClass.length + authorization.agentGroup.length + authorization.origin.length) === 1) - - if (existingDefaultOnly && !context.inherited) { - // The upstream planner can safely update a default-only rule in - // place; unlike a resource grant it will not add acl:accessTo. - return planAuthorizationGrant(context, subject, modes) + if (matchingAuthorizations.length) { + return splitDirectContainerContentsAuthorizations(context, matchingAuthorizations, subject, modes) } const subjectKey = subject.type @@ -449,14 +465,12 @@ export function createAclLogic(store): AclLogic { const defaultPredicate = ACL + 'default' if (!context.inherited) { - const sharedAuthorization = context.authorizations.find(authorization => + const matchingAuthorizations = context.authorizations.filter(authorization => authorization.default?.includes(context.resource) && - subjectMatchesAuthorization(subject, authorization) && - ['agent', 'agentClass', 'agentGroup', 'origin'].reduce((count, key) => - count + authorization[key].length, 0) > 1) + subjectMatchesAuthorization(subject, authorization)) - if (sharedAuthorization) { - return splitDirectContainerContentsAuthorization(context, sharedAuthorization, subject) + if (matchingAuthorizations.length) { + return splitDirectContainerContentsAuthorizations(context, matchingAuthorizations, subject) } const deletes = context.dataset.filter(statement => @@ -471,66 +485,103 @@ export function createAclLogic(store): AclLogic { return { target: context.defaultACLResource, deletes, inserts: [] } } - const plan = materializeInheritedContainer(context, subject, undefined, 'contents', true) - if (!plan.inserts.length) { + const hasInheritedDefault = context.authorizations.some(authorization => + authorization.default?.includes(context.resource) && + subjectMatchesAuthorization(subject, authorization)) + if (!hasInheritedDefault) { throw new Error(`No default authorization found for ${subject.iri}`) } + const plan = materializeInheritedContainer(context, subject, undefined, 'contents', true) return plan } - function splitDirectContainerContentsAuthorization ( + function splitDirectContainerContentsAuthorizations ( context: ACLContext, - authorization: Authorization, + authorizations: Authorization[], subject: AccessSubject, modes?: AccessMode[] ): PatchPlan { const freshId = createAuthorizationIdAllocator(context) - const subjects = subjectKeys.flatMap(key => - authorization[key].map(iri => ({ key, iri })) - ) - const remainingSubjects = subjects.filter(({ key, iri }) => - !(key === subject.type && iri === subject.iri)) - const target = namedNode(freshId(`${context.defaultACLResource}#split-1`)) - const retained = namedNode(freshId(`${context.defaultACLResource}#retained-1`)) const inserts: PatchPlan['inserts'] = [] const addRule = ( rule: ReturnType, ruleSubjects: Array<{ key: typeof subjectKeys[number], iri: string }>, ruleModes: AccessMode[], - includeAccessTo: boolean, - includeDefault: boolean + accessTo: string[], + defaults: string[], + conditions: string[] ) => { - if (!ruleSubjects.length || (!includeAccessTo && !includeDefault)) return + if (!ruleSubjects.length || (!accessTo.length && !defaults.length)) return inserts.push( quad(rule, namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), namedNode(ACL + 'Authorization')), - ...(includeAccessTo ? [quad(rule, namedNode(ACL + 'accessTo'), namedNode(context.resource))] : []), - ...(includeDefault ? [quad(rule, namedNode(ACL + 'default'), namedNode(context.resource))] : []), + ...accessTo.map(target => quad(rule, namedNode(ACL + 'accessTo'), namedNode(target))), + ...defaults.map(target => quad(rule, namedNode(ACL + 'default'), namedNode(target))), ...ruleModes.map(mode => quad(rule, namedNode(ACL + 'mode'), namedNode(`http://www.w3.org/ns/auth/acl#${mode}`))), + ...conditions.map(condition => quad(rule, namedNode(ACL + 'condition'), namedNode(condition))), ...ruleSubjects.map(({ key, iri }) => quad(rule, namedNode(ACL + key), namedNode(iri))) ) } - const hasAccessTo = authorization.accessTo.includes(context.resource) - const hasDefault = authorization.default.includes(context.resource) - addRule(retained, remainingSubjects, authorization.mode, hasAccessTo, hasDefault) - if (modes) { - addRule(target, [{ key: subject.type, iri: subject.iri }], modes, hasAccessTo, hasDefault) - } + const deletes: PatchPlan['deletes'] = [] + authorizations.forEach((authorization, index) => { + const subjects = subjectKeys.flatMap(key => + authorization[key].map(iri => ({ key, iri })) + ) + const remainingSubjects = subjects.filter(({ key, iri }) => + !(key === subject.type && iri === subject.iri)) + const baseId = `${context.defaultACLResource}#split-${index + 1}` + + if (!modes && subjects.length === 1 && remainingSubjects.length === 0) { + deletes.push(...context.dataset.filter(statement => + statement.subject.value === authorization.id && + statement.predicate.value === ACL + 'default' && + statement.object.value === context.resource)) + return + } + + deletes.push(...context.dataset.filter(statement => statement.subject.value === authorization.id)) + const conditions = (authorization.condition ?? []).map(condition => condition.id) + addRule(namedNode(freshId(`${context.defaultACLResource}#retained-${index + 1}`)), remainingSubjects, authorization.mode, authorization.accessTo, authorization.default, conditions) + const retainedDefaults = authorization.default.filter(target => target !== context.resource) + if (authorization.accessTo.length || retainedDefaults.length) { + addRule( + namedNode(freshId(`${baseId}-retained`)), + [{ key: subject.type, iri: subject.iri }], + authorization.mode, + authorization.accessTo, + retainedDefaults, + conditions + ) + } + if (modes) { + addRule( + namedNode(freshId(`${baseId}`)), + [{ key: subject.type, iri: subject.iri }], + modes, + [], + authorization.default.filter(target => target === context.resource), + conditions + ) + } + }) return { target: context.defaultACLResource, - deletes: context.dataset.filter(statement => statement.subject.value === authorization.id), + deletes, inserts } } async function planRevoke(resourceURL: string | NamedNode, subject: AccessSubject): Promise { const context = await findEffectiveAcl(resourceURL) - assertProtectedControlPreserved(context, subject) if (context.inherited && new URL(context.resource).pathname.endsWith('/')) { - return materializeInheritedContainer(context, subject, undefined, 'folder+contents', true) + const plan = materializeInheritedContainer(context, subject, undefined, 'folder+contents', true) + assertProtectedControlPreserved(context, plan) + return plan } - return withContainerDefaults(context, planAuthorizationRevoke(context, subject)) + const plan = withContainerDefaults(context, planAuthorizationRevoke(context, subject)) + assertProtectedControlPreserved(context, plan) + return plan } async function planPublicRead(resourceURL: string | NamedNode, enabled: boolean): Promise { diff --git a/src/index.ts b/src/index.ts index 39294985..7413655f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,7 +7,7 @@ const authSession = solidLogicSingleton.authn.authSession const store = solidLogicSingleton.store export { ACL_LINK, ACCESS_ROLES, PUBLIC_ACCESS_ROLES, WRITE_LOCKED_OWNER_ROLE, Authenticated, Public, classifyContainerAccessScope, analyzeContainerAccessScope, classifyAuthorizationScope, filterAuthorizationsByContainerScope } from './acl/aclLogic' -export type { AccessRole, ContainerAccessScope, ContainerAccessScopeAnalysis, ContainerAccessScopeResult, PublicAccessRole } from './acl/aclLogic' +export type { AccessRole, ContainerAccessScope, ContainerAccessScopeResult, PublicAccessRole } from './acl/aclLogic' export { offlineTestID, appContext } from './authn/authUtil' export { performServerSideLogout } from './authn/serverLogout' export { reloadOnIdentityReplaced } from './authSession/identityState' diff --git a/test/aclLogic.test.ts b/test/aclLogic.test.ts index da73ca31..bff82606 100644 --- a/test/aclLogic.test.ts +++ b/test/aclLogic.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import { Fetcher, Store, namedNode, sym, UpdateManager } from 'rdflib' +import { Fetcher, Store, literal, namedNode, sym, UpdateManager } from 'rdflib' import { ACL, applyPlan, buildACLContext, findEffectiveACL, parseTurtle, planGrant, planPublicRead, planRevoke, Public, quad, type PatchPlan, type Quad } from '@dokieli/web-access-control' import { ACL_LINK, WRITE_LOCKED_OWNER_ROLE, analyzeContainerAccessScope, classifyAuthorizationScope, classifyContainerAccessScope, createAclLogic, filterAuthorizationsByContainerScope } from '../src/acl/aclLogic' @@ -336,13 +336,16 @@ describe('createAclLogic', () => { const alice = 'https://example.com/alice#me' const bob = 'https://example.com/bob#me' const authorization = namedNode('https://example.com/alice/.acl#shared') + const condition = namedNode('https://example.com/alice/.acl#trusted-client') const statements = [ quad(authorization, namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(authorization, namedNode(ACL + 'condition'), condition), quad(authorization, namedNode(ACL + 'default'), resource), quad(authorization, namedNode(ACL + 'agent'), namedNode(alice)), quad(authorization, namedNode(ACL + 'agent'), namedNode(bob)), quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Read')), - quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Write')) + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Write')), + quad(condition, namedNode(ACL + 'description'), literal('trusted client only', 'en')) ] vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, @@ -357,14 +360,18 @@ describe('createAclLogic', () => { mode: ['Read', 'Write'], default: [resource.value], accessTo: [], - condition: [], + condition: [{ + id: condition.value, + blankNode: false, + properties: { [ACL + 'description']: ['trusted client only'] } + }], blankNode: false }], dataset: statements } as any) const plan = await aclLogic.planGrantContainerContents(resource, { type: 'agent', iri: alice }, ['Read']) - expect(plan.deletes).toEqual(statements) + expect(plan.deletes).toEqual(statements.filter(statement => statement.subject.equals(authorization))) const aliceRule = plan.inserts.find(statement => statement.predicate.value === ACL + 'agent' && statement.object.value === alice)?.subject @@ -378,6 +385,133 @@ describe('createAclLogic', () => { .some(statement => statement.predicate.value === ACL + 'mode' && statement.object.value === ACL + 'Write')).toBe(false) expect(plan.inserts.filter(statement => statement.subject.equals(bobRule!)) .some(statement => statement.predicate.value === ACL + 'mode' && statement.object.value === ACL + 'Write')).toBe(true) + expect(plan.inserts.filter(statement => statement.subject.equals(aliceRule!)) + .some(statement => statement.predicate.value === ACL + 'condition' && statement.object.equals(condition))).toBe(true) + expect(plan.inserts.filter(statement => statement.subject.equals(bobRule!)) + .some(statement => statement.predicate.value === ACL + 'condition' && statement.object.equals(condition))).toBe(true) + }) + + it('processes every matching default authorization for a subject', async () => { + const resource = sym('https://example.com/alice/') + const alice = 'https://example.com/alice#me' + const bob = 'https://example.com/bob#me' + const carol = 'https://example.com/carol#me' + const first = namedNode(resource.value + '.acl#alice-bob') + const second = namedNode(resource.value + '.acl#alice-carol') + const statements = [first, second].flatMap((authorization, index) => [ + quad(authorization, namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(authorization, namedNode(ACL + 'default'), resource), + quad(authorization, namedNode(ACL + 'agent'), namedNode(alice)), + quad(authorization, namedNode(ACL + 'agent'), namedNode(index === 0 ? bob : carol)), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Read')), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Write')) + ]) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: false, + authorizations: [bob, carol].map((other, index) => ({ + id: [first, second][index].value, + agent: [alice, other], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read', 'Write'], + default: [resource.value], + accessTo: [], + condition: [], + blankNode: false + })), + dataset: statements + } as any) + + const plan = await aclLogic.planGrantContainerContents(resource, { type: 'agent', iri: alice }, ['Read']) + expect(plan.deletes).toEqual(statements) + expect(plan.inserts.filter(statement => + statement.predicate.value === ACL + 'agent' && + [bob, carol].includes(statement.object.value))).toHaveLength(2) + const aliceRules = new Set(plan.inserts + .filter(statement => statement.predicate.value === ACL + 'agent' && statement.object.value === alice) + .map(statement => statement.subject.value)) + expect(aliceRules).toHaveLength(2) + for (const rule of aliceRules) { + expect(plan.inserts.some(statement => + statement.subject.value === rule && + statement.predicate.value === ACL + 'mode' && + statement.object.value === ACL + 'Read')).toBe(true) + expect(plan.inserts.some(statement => + statement.subject.value === rule && + statement.predicate.value === ACL + 'mode' && + statement.object.value === ACL + 'Write')).toBe(false) + } + }) + + it('splits a single-subject folder-and-contents rule when changing contents access', async () => { + const resource = sym('https://example.com/alice/') + const alice = 'https://example.com/alice#me' + const unrelatedFolder = 'https://example.com/other-folder/' + const unrelatedContents = 'https://example.com/other/' + const authorization = namedNode(resource.value + '.acl#alice') + const statements = [ + quad(authorization, namedNode(ACL + 'type'), namedNode(ACL + 'Authorization')), + quad(authorization, namedNode(ACL + 'accessTo'), resource), + quad(authorization, namedNode(ACL + 'accessTo'), namedNode(unrelatedFolder)), + quad(authorization, namedNode(ACL + 'default'), resource), + quad(authorization, namedNode(ACL + 'default'), namedNode(unrelatedContents)), + quad(authorization, namedNode(ACL + 'agent'), namedNode(alice)), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Read')), + quad(authorization, namedNode(ACL + 'mode'), namedNode(ACL + 'Write')) + ] + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: false, + authorizations: [{ + id: authorization.value, + agent: [alice], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read', 'Write'], + accessTo: [resource.value, unrelatedFolder], + default: [resource.value, unrelatedContents], + condition: [], + blankNode: false + }], + dataset: statements + } as any) + + const plan = await aclLogic.planGrantContainerContents(resource, { type: 'agent', iri: alice }, ['Read']) + expect(plan.deletes).toEqual(statements) + const aliceRules = [...new Set(plan.inserts + .filter(statement => statement.predicate.value === ACL + 'agent' && statement.object.value === alice) + .map(statement => statement.subject.value))] + expect(aliceRules).toHaveLength(2) + const folderRule = aliceRules.find(rule => plan.inserts.some(statement => + statement.subject.value === rule && + statement.predicate.value === ACL + 'accessTo')) + const contentsRule = aliceRules.find(rule => plan.inserts.some(statement => + statement.subject.value === rule && + statement.predicate.value === ACL + 'default' && + statement.object.value === resource.value)) + expect(folderRule).toBeDefined() + expect(contentsRule).toBeDefined() + expect(plan.inserts.some(statement => + statement.subject.value === folderRule && + statement.predicate.value === ACL + 'mode' && + statement.object.value === ACL + 'Write')).toBe(true) + expect(plan.inserts.some(statement => + statement.subject.value === folderRule && + statement.predicate.value === ACL + 'accessTo' && + statement.object.value === unrelatedFolder)).toBe(true) + expect(plan.inserts.some(statement => + statement.subject.value === folderRule && + statement.predicate.value === ACL + 'default' && + statement.object.value === unrelatedContents)).toBe(true) + expect(plan.inserts.some(statement => + statement.subject.value === contentsRule && + statement.predicate.value === ACL + 'mode' && + statement.object.value === ACL + 'Write')).toBe(false) }) it('allocates deterministic, collision-free IDs when splitting a shared authorization', async () => { @@ -507,22 +641,104 @@ describe('createAclLogic', () => { } as any)).rejects.toThrow('No default authorization found') }) + it('rejects inherited contents revocation when only unrelated defaults match', async () => { + const resource = sym('https://example.com/alice/') + const subject = { type: 'agent', iri: 'https://example.com/person#me' } + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: true, + authorizations: [{ + id: 'https://example.com/.acl#owner', + agent: ['https://example.com/owner#me'], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read'], + default: [resource.value], + accessTo: [], + condition: [], + blankNode: false + }], + dataset: [] + } as any) + + await expect(aclLogic.planRevokeContainerContents(resource, subject as any)) + .rejects.toThrow('No default authorization found') + }) + it('keeps the last Control authorization on a protected resource', async () => { const resource = sym('https://example.com/alice/') const subject = { type: 'agent', iri: 'https://example.com/profile/card#me' } store.holds.mockReturnValue(true) vi.mocked(findEffectiveACL).mockResolvedValue({ resource: resource.value, + defaultACLResource: resource.value + '.acl', + inherited: false, + dataset: [], authorizations: [{ + id: resource.value + '.acl#owner', agent: [subject.iri], - mode: ['Read', 'Write', 'Control'] + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Read', 'Write', 'Control'], + accessTo: [resource.value], + default: [], + condition: [], + blankNode: false }] } as any) + const controlRule = namedNode(resource.value + '.acl#owner') + const deletedControl = quad(controlRule, namedNode(ACL + 'mode'), namedNode(ACL + 'Control')) + vi.mocked(planGrant).mockReturnValue({ target: resource.value + '.acl', deletes: [deletedControl], inserts: [] }) + vi.mocked(planRevoke).mockReturnValue({ target: resource.value + '.acl', deletes: [deletedControl], inserts: [] }) await expect(aclLogic.planGrant(resource, subject as any, ['Read'])).rejects.toThrow('retain at least one Control') await expect(aclLogic.planRevoke(resource, subject as any)).rejects.toThrow('retain at least one Control') }) + it('does not count duplicate inherited Control rules as surviving control', async () => { + const resource = sym('https://example.com/alice/') + const subject = { type: 'agent', iri: 'https://example.com/profile/card#me' } + store.holds.mockReturnValue(true) + vi.mocked(findEffectiveACL).mockResolvedValue({ + resource: resource.value, + defaultACLResource: 'https://example.com/.acl', + inherited: true, + dataset: [], + authorizations: [ + { + id: 'https://example.com/.acl#owner-folder', + agent: [subject.iri], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Control'], + accessTo: [resource.value], + default: [], + condition: [], + blankNode: false + }, + { + id: 'https://example.com/.acl#owner-contents', + agent: [subject.iri], + agentClass: [], + agentGroup: [], + origin: [], + mode: ['Control'], + accessTo: [], + default: [resource.value], + condition: [], + blankNode: false + } + ] + } as any) + vi.mocked(planRevoke).mockImplementation(actualPlanRevoke as any) + + await expect(aclLogic.planRevoke(resource, subject as any)).rejects.toThrow('retain at least one Control') + }) + it('delegates planPublicRead through the effective ACL context', async () => { const resource = sym('https://example.com/resource.ttl') const plan = { updates: [] } @@ -659,6 +875,16 @@ describe('createAclLogic', () => { statement.predicate.value === conditionClient.value && statement.object.value === conditionValue.value )).toBe(true) + const replacementRules = new Set(plan.inserts + .filter(statement => + statement.predicate.value === 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type' && + statement.object.value === ACL + 'Authorization') + .map(statement => statement.subject.value)) + for (const rule of replacementRules) { + expect(plan.inserts.some(statement => + statement.subject.value === rule && + statement.predicate.value === ACL + 'condition')).toBe(true) + } }) it('rejects unsupported condition properties instead of silently dropping them', async () => { @@ -718,6 +944,8 @@ describe('createAclLogic', () => { const subject = { type: 'agent' as const, iri: 'https://example.com/viewer#me' } const collidingId = resource.value + '.acl#inherited-1' const conditionId = 'https://example.com/.acl#client-condition' + const conditionNode = namedNode(conditionId) + const description = literal('only from the trusted client', 'en') vi.mocked(findEffectiveACL).mockResolvedValue(inheritedContext(resource.value, [{ id: collidingId, agent: ['https://example.com/owner#me'], agentClass: [], agentGroup: [], origin: [], @@ -730,7 +958,11 @@ describe('createAclLogic', () => { } }], blankNode: false - }], [quad(namedNode(collidingId), namedNode(ACL + 'Authorization'), namedNode(ACL + 'Authorization'))])) + }], [ + quad(namedNode(collidingId), namedNode(ACL + 'Authorization'), namedNode(ACL + 'Authorization')), + quad(conditionNode, namedNode(ACL + 'ClientCondition'), namedNode('https://example.com/client')), + quad(conditionNode, namedNode(ACL + 'description'), description) + ])) const plan = await aclLogic.planGrantContainer(resource, subject, ['Read']) const ruleIds = new Set(plan.inserts @@ -742,9 +974,13 @@ describe('createAclLogic', () => { expect(plan.inserts.some(statement => statement.predicate.value === ACL + 'condition' && statement.object.value !== conditionId)).toBe(true) - expect(plan.inserts.some(statement => - statement.predicate.value === ACL + 'description' && - statement.object.value === 'only from the trusted client')).toBe(true) + const descriptionStatement = plan.inserts.find(statement => + statement.predicate.value === ACL + 'description') + if (!descriptionStatement || descriptionStatement.object.termType !== 'Literal') { + throw new Error('Expected the cloned description to remain an RDF literal') + } + expect(descriptionStatement.object.value).toBe(description.value) + expect(descriptionStatement.object.language).toBe('en') }) it('preserves inherited default access when materializing a contents-only grant', async () => { From 51a1b730049278a6f77d5230993ff13a91d74b59 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Wed, 21 Oct 2026 16:07:11 +1100 Subject: [PATCH 21/32] handle unknown public Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/resource/resourceLogic.ts | 5 ++++- src/resource/resourceMetadata.ts | 5 +++-- src/types.ts | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index 3c5bcf01..4cc5daf4 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -70,6 +70,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t let contentType: string | undefined let canEdit = false let isPublic = false + let isPublicKnown = false let eTag: string | undefined let modified: string | undefined @@ -80,6 +81,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t const accessFlags = readWacAccessInfo(response.headers.get('wac-allow')) canEdit = accessFlags.canEdit isPublic = accessFlags.isPublic + isPublicKnown = accessFlags.isPublicKnown eTag = response.headers.get('etag') ?? undefined modified = store.anyValue(subject as any, ns.dct('modified')) || store.anyValue(subject as any, ns.dc('modified')) || undefined } @@ -105,6 +107,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t const accessFlags = readWacAccessInfo(wacAllow) canEdit = canEdit || accessFlags.canEdit isPublic = isPublic || accessFlags.isPublic + isPublicKnown = isPublicKnown || accessFlags.isPublicKnown const responseETag = store.anyValue(responseNode as any, ns.httph('etag')) || undefined if (eTag === undefined) { eTag = responseETag @@ -115,7 +118,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t } const aclUri = store.any(subject, ACL_LINK)?.value || undefined - const access: ResourceAccess = { canEdit, isPublic } + const access: ResourceAccess = { canEdit, isPublic, isPublicKnown } return { contentType, access, aclUri, eTag, modified } } diff --git a/src/resource/resourceMetadata.ts b/src/resource/resourceMetadata.ts index 02afeb91..d5e57c6f 100644 --- a/src/resource/resourceMetadata.ts +++ b/src/resource/resourceMetadata.ts @@ -16,7 +16,7 @@ function parseWacAllowHeader (headerValue: string | null | undefined) { export function readWacAccessInfo (wacAllow: string | null | undefined) { if (!wacAllow) { - return { canEdit: false, isPublic: false } + return { canEdit: false, isPublic: false, isPublicKnown: false } } const permissions = parseWacAllowHeader(wacAllow) @@ -25,6 +25,7 @@ export function readWacAccessInfo (wacAllow: string | null | undefined) { return { canEdit: userModes.has('write'), - isPublic: publicModes.has('read') || publicModes.has('write') + isPublic: publicModes.has('read') || publicModes.has('write'), + isPublicKnown: true } } diff --git a/src/types.ts b/src/types.ts index 15c78b9d..2457574a 100644 --- a/src/types.ts +++ b/src/types.ts @@ -126,6 +126,8 @@ export type ResourceDeleteOptions = { export type ResourceAccess = { canEdit: boolean isPublic: boolean + /** False when the server did not provide WAC-Allow metadata. */ + isPublicKnown?: boolean } export type ResourceAccessWithDelete = ResourceAccess & { From 2ca93fb699a973f34b2dc5fccdf3cb3858bd9226 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 23 Oct 2026 12:18:28 +1100 Subject: [PATCH 22/32] prefer authfetch to fetch --- src/logic/solidLogicSingleton.ts | 6 +++--- test/logic.test.ts | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/logic/solidLogicSingleton.ts b/src/logic/solidLogicSingleton.ts index 41620c45..1f457ee6 100644 --- a/src/logic/solidLogicSingleton.ts +++ b/src/logic/solidLogicSingleton.ts @@ -15,9 +15,9 @@ const _fetch = async (url, requestInit) => { : (sessionAny?.info?.webId || sessionAny?.webId) if (sessionWebId && !omitCreds) { // see https://github.com/solidos/solidos/issues/114 // In fact fetch should respect credentials omit itself - const authenticatedFetch = (typeof sessionAny.fetch === 'function') - ? sessionAny.fetch.bind(sessionAny) - : (typeof sessionAny.authFetch === 'function' ? sessionAny.authFetch.bind(sessionAny) : null) + const authenticatedFetch = (typeof sessionAny.authFetch === 'function') + ? sessionAny.authFetch.bind(sessionAny) + : (typeof sessionAny.fetch === 'function' ? sessionAny.fetch.bind(sessionAny) : null) if (authenticatedFetch) { return authenticatedFetch(url, requestInit) } diff --git a/test/logic.test.ts b/test/logic.test.ts index bab2e330..083065f8 100644 --- a/test/logic.test.ts +++ b/test/logic.test.ts @@ -89,4 +89,17 @@ describe('solidLogicSingleton fetch bridge', () => { expect(sessionAny.authFetch).toHaveBeenCalledTimes(1) expect(fetchMock).not.toHaveBeenCalled() }) + + it('prefers authFetch over an unauthenticated session fetch', async () => { + const sessionAny = authSession as any + setSessionIdentity('https://alice.example/profile#me') + sessionAny.fetch = vi.fn().mockResolvedValue(new Response('unauthenticated')) + sessionAny.authFetch = vi.fn().mockResolvedValue(new Response('authenticated')) + + const response = await singletonFetch('https://example.com/resource') + + expect(await response.text()).toBe('authenticated') + expect(sessionAny.authFetch).toHaveBeenCalledTimes(1) + expect(sessionAny.fetch).not.toHaveBeenCalled() + }) }) From 884f8c13e8fc859226633f74724dfebc2394a684 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Fri, 23 Oct 2026 12:28:12 +1100 Subject: [PATCH 23/32] fixed tests --- test/resource/resourceLogic.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 17acfcf6..6673b4a0 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -98,7 +98,7 @@ describe('createResourceLogic', () => { content: '<> a <#Thing>.', metadata: { contentType: 'text/turtle', - access: { canEdit: true, isPublic: true, isPublicKnown: true }, + access: { canEdit: true, canManageAccess: false, isPublic: true, isPublicKnown: true }, aclUri: undefined, eTag: '"abc"', modified: '2026-08-10T00:00:00Z' @@ -208,6 +208,7 @@ describe('createResourceLogic', () => { expect(metadata.access).toEqual({ canEdit: true, + canManageAccess: false, isPublic: true, isPublicKnown: true, canDelete: false @@ -240,6 +241,7 @@ describe('createResourceLogic', () => { expect(metadata.access).toEqual({ canEdit: true, + canManageAccess: false, isPublic: true, isPublicKnown: true, canDelete: false @@ -260,6 +262,7 @@ describe('createResourceLogic', () => { expect(metadata.access).toEqual({ canEdit: false, + canManageAccess: false, isPublic: false, isPublicKnown: false, canDelete: false From 310cb0376e560ffa627d855f694553deece86b82 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Mon, 26 Oct 2026 21:39:29 +1100 Subject: [PATCH 24/32] feat(resource): add cached media type detection Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- package-lock.json | 4 +-- package.json | 2 +- src/resource/resourceLogic.ts | 42 ++++++++++++++++++++++++++++- src/types.ts | 4 +++ test/resource/resourceLogic.test.ts | 31 +++++++++++++++++++++ 5 files changed, 79 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65a0ab74..28fb516e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.1-4", + "version": "6.0.1-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.1-4", + "version": "6.0.1-5", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.1.0", diff --git a/package.json b/package.json index b80fb5fa..9a1e3b77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.1-4", + "version": "6.0.1-5", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index a090a4f2..5df5d0f7 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -1,4 +1,4 @@ -import { NamedNode, sym } from 'rdflib' +import { NamedNode, sym, Util } from 'rdflib' import { ACL_LINK } from '../acl/aclLogic' import { ns } from '../util/ns' import { assertSuccessfulHttpResponse, isMissingError } from './resourceHttp' @@ -55,6 +55,42 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t return pathEnd.startsWith('.') || pathEnd.endsWith('.acl') || pathEnd.endsWith('.meta') || pathEnd.endsWith('~') } + function isMediaType(resourceNode: NamedNode, mediaType: string) { + const typeURIs = store.findTypeURIs(resourceNode as any) + const normalizedMediaType = mediaType.toLowerCase() + const mediaTypePrefix = Util.mediaTypeClass(`${normalizedMediaType}/*`).uri.split('*')[0] + + if (Object.keys(typeURIs).some(typeURI => typeURI.startsWith(mediaTypePrefix))) { + return true + } + + const mediaTypeClasses: Record = { + audio: 'http://purl.org/dc/dcmitype/Sound', + image: 'http://purl.org/dc/dcmitype/Image', + video: 'http://purl.org/dc/dcmitype/MovingImage' + } + if (mediaTypeClasses[normalizedMediaType] in typeURIs) { + return true + } + + const contentTypes = store.fetcher.getHeader(resourceNode, 'content-type') || [] + return contentTypes.some((contentType: string) => + contentType.split(';', 1)[0].trim().toLowerCase().startsWith(`${normalizedMediaType}/`) + ) + } + + function isImage(resourceNode: NamedNode) { + return isMediaType(resourceNode, 'image') + } + + function isAudio(resourceNode: NamedNode) { + return isMediaType(resourceNode, 'audio') + } + + function isVideo(resourceNode: NamedNode) { + return isMediaType(resourceNode, 'video') + } + function isWebId(resource: string | NamedNode) { const uri = typeof resource === 'string' ? resource : resource.value @@ -259,6 +295,10 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t containerHasIndexDocument, isStorageRoot, isHiddenFile, + isMediaType, + isImage, + isAudio, + isVideo, isWebId } } diff --git a/src/types.ts b/src/types.ts index 0d118b64..56c1cfe4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -173,6 +173,10 @@ export interface ResourceLogic { containerHasIndexDocument: (container: NamedNode) => boolean, isStorageRoot: (resource: NamedNode) => boolean, isHiddenFile: (resource: NamedNode) => boolean, + isMediaType: (resource: NamedNode, mediaType: string) => boolean, + isImage: (resource: NamedNode) => boolean, + isAudio: (resource: NamedNode) => boolean, + isVideo: (resource: NamedNode) => boolean, isWebId: (resource: string | NamedNode) => boolean } diff --git a/test/resource/resourceLogic.test.ts b/test/resource/resourceLogic.test.ts index 6673b4a0..5bcb673d 100644 --- a/test/resource/resourceLogic.test.ts +++ b/test/resource/resourceLogic.test.ts @@ -17,6 +17,7 @@ function buildResourceLogic(overrides: { fetcher: { webOperation: vi.fn(overrides.webOperation ?? (async () => { throw new Error('unexpected webOperation') })), _fetch: vi.fn(async (..._args: any[]) => ({ ok: true })), + getHeader: vi.fn().mockReturnValue([]), load: vi.fn(), unload: vi.fn() }, @@ -28,6 +29,7 @@ function buildResourceLogic(overrides: { any: vi.fn().mockReturnValue(undefined), holds: vi.fn().mockReturnValue(false), each: vi.fn().mockReturnValue([]), + findTypeURIs: vi.fn().mockReturnValue({}), removeMatches: vi.fn(), removeDocument: vi.fn(), sym @@ -144,6 +146,35 @@ describe('createResourceLogic', () => { expect(resourceLogic.isHiddenFile(sym('https://example.com/workspace/file.ttl'))).toBe(false) }) + it('recognizes media from RDF types and cached content-type headers without fetching', () => { + const { resourceLogic, store } = buildResourceLogic() + const image = sym('https://example.com/workspace/image.png') + const audio = sym('https://example.com/workspace/audio.mp3') + const video = sym('https://example.com/workspace/video.mp4') + + store.fetcher.getHeader.mockImplementation((resource: any) => { + if (resource.uri === image.uri) return ['image/png; charset=binary'] + if (resource.uri === audio.uri) return ['audio/mpeg'] + return [] + }) + + expect(resourceLogic.isImage(image)).toBe(true) + expect(resourceLogic.isAudio(audio)).toBe(true) + expect(resourceLogic.isVideo(video)).toBe(false) + expect(store.fetcher.webOperation).not.toHaveBeenCalled() + }) + + it('recognizes RDF media types when no content-type header is cached', () => { + const { resourceLogic, store } = buildResourceLogic() + const image = sym('https://example.com/workspace/image') + store.findTypeURIs.mockReturnValue({ + 'http://purl.org/dc/dcmitype/Image': true + }) + + expect(resourceLogic.isImage(image)).toBe(true) + expect(store.fetcher.webOperation).not.toHaveBeenCalled() + }) + it('builds index resources consistently for containers with or without a trailing slash', () => { const { resourceLogic } = buildResourceLogic() From 52da86865cdf6e7bb22256c399af4a02f72368a4 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Tue, 3 Nov 2026 07:01:58 +1100 Subject: [PATCH 25/32] move vite to devdepencies --- package-lock.json | 689 ++++++++++++++++++++++++++-------------------- package.json | 7 +- 2 files changed, 399 insertions(+), 297 deletions(-) diff --git a/package-lock.json b/package-lock.json index 28fb516e..075703a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,7 @@ "dependencies": { "@dokieli/web-access-control": "^1.1.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", - "solid-namespace": "^0.5.4", - "vite": "^8.0.16", - "vitest": "^4.1.9" + "solid-namespace": "^0.5.4" }, "devDependencies": { "@typescript-eslint/parser": "^8.61.1", @@ -27,6 +25,7 @@ "ts-loader": "^9.6.1", "tslib": "^2.8.1", "typescript": "^5.9.3", + "vite": "^8.0.16", "vitest": "^4.1.9" }, "engines": { @@ -121,14 +120,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz", - "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==", + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.12.tgz", + "integrity": "sha512-2W76mhjrpQFO1lK5e8IvGYB2D0YZ7S2R1Z2BjO2ZUYuW+amcpK/z60U6ZZmzskwoa7sJ6XohP/Wg8H5KxXI/IA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.8", - "@babel/types": "^7.29.8", + "@babel/parser": "^7.29.12", + "@babel/types": "^7.29.11", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -195,9 +194,9 @@ "license": "ISC" }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz", - "integrity": "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==", + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.12.tgz", + "integrity": "sha512-ACxGoWMV866q/QlZHeCOaQZAR5QclKsIvkAmlDemqjm6+6Bynijs1mH068BzH2N2e+wSuDmBWY87fqKfvhi1Lw==", "dev": true, "license": "MIT", "dependencies": { @@ -206,7 +205,7 @@ "@babel/helper-optimise-call-expression": "^7.29.7", "@babel/helper-replace-supers": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", - "@babel/traverse": "^7.29.7", + "@babel/traverse": "^7.29.12", "semver": "^6.3.1" }, "engines": { @@ -423,9 +422,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", - "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.11.tgz", + "integrity": "sha512-snZbO7MEDOof+hvNa97EjEY7qD7h2kwvQr5AJC3ZhQudKW5dnej6k3kP9NQV88hJwaS8vDqRLFo9rivLEhle2g==", "dev": true, "license": "MIT", "engines": { @@ -482,13 +481,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.29.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz", - "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==", + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.12.tgz", + "integrity": "sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.8" + "@babel/types": "^7.29.11" }, "bin": { "parser": "bin/babel-parser.js" @@ -795,9 +794,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.7.tgz", - "integrity": "sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ==", + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.12.tgz", + "integrity": "sha512-nEreZBofjfd6FG621xe9Rk3+tMGBXf1nAuFrR6NUGF67fkQbSQf3NrbRuhgWRn+zb0qcy9XVok1GVFI/t9wWVQ==", "dev": true, "license": "MIT", "dependencies": { @@ -845,9 +844,9 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.29.7.tgz", - "integrity": "sha512-qV0OGGBVacduzQHE649JyCneOFI/maT+YKsO+K4Yi3xv2wTPNjM/W2o2gdzMwEAZz7fXNTHAe0NcSg30bIN69g==", + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.29.11.tgz", + "integrity": "sha512-f8kTDM/nTvpLeafb+TJ4jboFr/Y3BbC+QzgPpPGzSKJqWLnj9LW0WLqv4XKA11LX5sr+EgvLE6Ix3YsCEusodw==", "dev": true, "license": "MIT", "dependencies": { @@ -856,7 +855,7 @@ "@babel/helper-globals": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-replace-supers": "^7.29.7", - "@babel/traverse": "^7.29.7" + "@babel/traverse": "^7.29.10" }, "engines": { "node": ">=6.9.0" @@ -1482,9 +1481,9 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.8.tgz", - "integrity": "sha512-4S9ksMGVWUshvgK0mKfvZky7leuG5/uoFVwMpAomJ8bMoDJiNHRVmc1EglwW/CmGVSqqWpEbXm9FmbRit22qoA==", + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.11.tgz", + "integrity": "sha512-5xWGhfuMgbOfIjsk/I2c4uMnoqRwQdKYi4QjvybQrcEVE0G9/p3qmIkp2Sxe8YF8DGNNVs5whfwNqIM5684XoQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1804,18 +1803,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.29.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.10.tgz", - "integrity": "sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==", + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.12.tgz", + "integrity": "sha512-MscXe/NAZcOkYEsRajHZFt3ynsb22PUi6CTrp5U7+RYycR9By84mn9mFN54YgfITiqK4hFx3Ju3tZSyzfpS5ew==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.8", + "@babel/generator": "^7.29.12", "@babel/helper-globals": "^7.29.7", - "@babel/parser": "^7.29.9", + "@babel/parser": "^7.29.12", "@babel/template": "^7.29.7", - "@babel/types": "^7.29.8", + "@babel/types": "^7.29.11", "debug": "^4.3.1" }, "engines": { @@ -1823,13 +1822,13 @@ } }, "node_modules/@babel/types": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", - "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.11.tgz", + "integrity": "sha512-WCsemW40Cpc6gouC1SrY6PBaZ+oLRlEVY9XBvZBI7il/HyUrb2nJ505wE1MHEFyDZNnrWDEuy4jL50WVHfTTSQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-string-parser": "^7.29.11", "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { @@ -2281,7 +2280,7 @@ "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -2303,7 +2302,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -2313,7 +2312,7 @@ "version": "0.3.11", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", - "devOptional": true, + "dev": true, "license": "MIT", "peer": true, "dependencies": { @@ -2325,14 +2324,14 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -2359,9 +2358,10 @@ } }, "node_modules/@oxc-project/types": { - "version": "0.153.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.153.0.tgz", - "integrity": "sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==", + "version": "0.156.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.156.0.tgz", + "integrity": "sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/oxc-project" @@ -2386,12 +2386,13 @@ } }, "node_modules/@rolldown/binding-android-arm-eabi": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.16.tgz", + "integrity": "sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==", "cpu": [ "arm" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2402,12 +2403,13 @@ } }, "node_modules/@rolldown/binding-android-arm64": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.16.tgz", + "integrity": "sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==", "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2418,12 +2420,13 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.16.tgz", + "integrity": "sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==", "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2434,12 +2437,13 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.16.tgz", + "integrity": "sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==", "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2450,12 +2454,13 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.16.tgz", + "integrity": "sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==", "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2466,12 +2471,13 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.16.tgz", + "integrity": "sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==", "cpu": [ "arm" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2482,12 +2488,13 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.16.tgz", + "integrity": "sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==", "cpu": [ "arm64" ], + "dev": true, "libc": [ "glibc" ], @@ -2501,12 +2508,13 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.16.tgz", + "integrity": "sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==", "cpu": [ "arm64" ], + "dev": true, "libc": [ "musl" ], @@ -2520,12 +2528,13 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.16.tgz", + "integrity": "sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==", "cpu": [ "ppc64" ], + "dev": true, "libc": [ "glibc" ], @@ -2539,12 +2548,13 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.16.tgz", + "integrity": "sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==", "cpu": [ "s390x" ], + "dev": true, "libc": [ "glibc" ], @@ -2558,12 +2568,13 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.16.tgz", + "integrity": "sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==", "cpu": [ "x64" ], + "dev": true, "libc": [ "glibc" ], @@ -2577,12 +2588,13 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.16.tgz", + "integrity": "sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==", "cpu": [ "x64" ], + "dev": true, "libc": [ "musl" ], @@ -2596,12 +2608,13 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.16.tgz", + "integrity": "sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==", "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2612,12 +2625,13 @@ } }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.16.tgz", + "integrity": "sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==", "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2628,12 +2642,13 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "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==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.16.tgz", + "integrity": "sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==", "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2678,12 +2693,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", + "dev": true, "license": "MIT" }, "node_modules/@rollup/pluginutils": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz", - "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.5.1.tgz", + "integrity": "sha512-P9ZvnfouRu4MSC+ilERaw6FmZs8zqKhpHxEs4aGDGWQAMzQGXnhvCSvoNwokfNvdt7t3Y5Y4p6gStQgezeIqug==", "dev": true, "license": "MIT", "dependencies": { @@ -2753,9 +2769,9 @@ "license": "MIT" }, "node_modules/@types/estree": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", - "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.10.tgz", + "integrity": "sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==", "dev": true, "license": "MIT" }, @@ -2774,9 +2790,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "26.6.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz", - "integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==", + "version": "26.6.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.6.tgz", + "integrity": "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==", "license": "MIT", "dependencies": { "undici-types": "~8.9.0" @@ -2791,16 +2807,16 @@ "peer": true }, "node_modules/@typescript-eslint/parser": { - "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==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.72.1.tgz", + "integrity": "sha512-ZGwZP4OCfyA0AQTpEAMWz+rtX01DRhQWW5hB0ucKDEIX5U7jdmPSaMx94rQfaPAQzIYz2BimOgKOJtjfpRFQ9g==", "dev": true, "license": "MIT", "dependencies": { - "@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", + "@typescript-eslint/scope-manager": "8.72.1", + "@typescript-eslint/types": "8.72.1", + "@typescript-eslint/typescript-estree": "8.72.1", + "@typescript-eslint/visitor-keys": "8.72.1", "debug": "^4.4.3" }, "engines": { @@ -2816,14 +2832,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.71.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.71.1.tgz", - "integrity": "sha512-Oijc9RUsohHjncg6iGi7gCtjnEjYt9FWv9u6ygK8uKcHK5eLjLAkqERQ9BaytbpceOFdk6kifPCS/zAZE+A99g==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.72.1.tgz", + "integrity": "sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.71.1", - "@typescript-eslint/types": "^8.71.1", + "@typescript-eslint/tsconfig-utils": "^8.72.1", + "@typescript-eslint/types": "^8.72.1", "debug": "^4.4.3" }, "engines": { @@ -2838,14 +2854,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.71.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.71.1.tgz", - "integrity": "sha512-1YUDZXdTnXLlob03SFHBipdyMBsDVm7zoSz0ytTJ39dk5J1TgsTK03VlR/dLXG/RLLUrPcYbD4rp23BmHxHP0w==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.72.1.tgz", + "integrity": "sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.71.1", - "@typescript-eslint/visitor-keys": "8.71.1" + "@typescript-eslint/types": "8.72.1", + "@typescript-eslint/visitor-keys": "8.72.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2856,9 +2872,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "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==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.72.1.tgz", + "integrity": "sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==", "dev": true, "license": "MIT", "engines": { @@ -2873,9 +2889,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.71.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.71.1.tgz", - "integrity": "sha512-ybYnPTUwg3VQQOFEiBPLs8Jxl1ry2vXdn1kVKguomBbvxpetdu3MKTNDqFNUrlG8ylP9MpZosmXMFYlGQHk1oQ==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.72.1.tgz", + "integrity": "sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==", "dev": true, "license": "MIT", "engines": { @@ -2887,16 +2903,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.71.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.71.1.tgz", - "integrity": "sha512-pSKSEK1JJpHs6KiKVtABCE4iJK5d7FLFzDXQNBQ2oRY7LEd3UwOt3TZemTgu9syTIf56dJWlTn/pdmrO9oKUXQ==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.72.1.tgz", + "integrity": "sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==", "dev": true, "license": "MIT", "dependencies": { - "@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", + "@typescript-eslint/project-service": "8.72.1", + "@typescript-eslint/tsconfig-utils": "8.72.1", + "@typescript-eslint/types": "8.72.1", + "@typescript-eslint/visitor-keys": "8.72.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -2915,13 +2931,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.71.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.71.1.tgz", - "integrity": "sha512-0GxiUGqMU0qXJt58cBsiG3DP8lUmBaFo2vChtUX+CT7PnR3v/VGLLrzVP4K9r1lNiZXjHYefMBbPunplr09v6w==", + "version": "8.72.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.72.1.tgz", + "integrity": "sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.71.1", + "@typescript-eslint/types": "8.72.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -2942,14 +2958,14 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.11.tgz", - "integrity": "sha512-8MVGEFnJIcdGjcbfKmeq8z0pZHH0JlVtoVZH9Q/qwUp6wyFnEJUBMrw9DCaj+ra3vShGmhavjalMIhPNxZAUcw==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.12.tgz", + "integrity": "sha512-6S7/iVknKglLAxMFxQGNppBI0iqJS2NgM6FBxavitj7KaDq/vywOWGf6dGu7F2L1Qy0G6S3uTp7aGshHrzK8JA==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.1.11", + "@vitest/utils": "4.1.12", "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", @@ -2963,8 +2979,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.1.11", - "vitest": "4.1.11" + "@vitest/browser": "4.1.12", + "vitest": "4.1.12" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2973,16 +2989,16 @@ } }, "node_modules/@vitest/expect": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.11.tgz", - "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.12.tgz", + "integrity": "sha512-vFlTt+YEu9WBpNjdGayNmlMVzrWPi1+sv853/7t2FU7hpO5gAFBKHzQmkCq5Xjpr+evegF2994LQT3hF3mRlqQ==", "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.1.11", - "@vitest/utils": "4.1.11", + "@vitest/spy": "4.1.12", + "@vitest/utils": "4.1.12", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" }, @@ -2991,13 +3007,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.11.tgz", - "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.12.tgz", + "integrity": "sha512-fKShNpKZzupWZuY0z7egydvL0sqW4INEZBEExMBMAa6izlENEVHwoXgdaTCaBZ5fwlr4xf2o1wXC83n9RpO+NA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.1.11", + "@vitest/spy": "4.1.12", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -3018,9 +3034,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.11.tgz", - "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.12.tgz", + "integrity": "sha512-XW9O8+Mxx4VpCtkYdMJLZQQwsVryP9wk7cPKDxtXFfwSak6yRh5+2fep/Y0XF/ElBvJHq8bcYdi6aeuai0opZA==", "dev": true, "license": "MIT", "dependencies": { @@ -3031,13 +3047,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.11.tgz", - "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.12.tgz", + "integrity": "sha512-NKlVKCr5QnCe8jijdMnmkpHHU+WTqiLFR6G0pHji9uRjXK9xJl1k1nTw6F3pOOj2PDcsDt2GKQMI7wIsaT491w==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.1.11", + "@vitest/utils": "4.1.12", "pathe": "^2.0.3" }, "funding": { @@ -3045,14 +3061,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.11.tgz", - "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.12.tgz", + "integrity": "sha512-ko1y1Qgb/slzQ9mr+b89Cuqud8WG1TKtsPD8r7ZUBdvVOGt85Af2HwCqHujrhwJq95hs/9RM7fcAPg57o1vlzw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.11", - "@vitest/utils": "4.1.11", + "@vitest/pretty-format": "4.1.12", + "@vitest/utils": "4.1.12", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -3061,9 +3077,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.11.tgz", - "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.12.tgz", + "integrity": "sha512-RGq9x4JNGNTZHEJxvN0oSiJjeSCExm0n2gZKKJZHY9cX5AVA6M7VJILBT3ZJ/tJ/0J9uWT7fETV9/btoi//vSg==", "dev": true, "license": "MIT", "funding": { @@ -3071,13 +3087,13 @@ } }, "node_modules/@vitest/utils": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.11.tgz", - "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.12.tgz", + "integrity": "sha512-Q3awXrwOfEV+qc3WmO5ONyE0yO7Q1gQ9/oyHxGLZ/pl7N3NO/ZztqQwKLuwMkV+CA1JYSIeO3gkHnRDIo4AVaA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.11", + "@vitest/pretty-format": "4.1.12", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" }, @@ -3086,32 +3102,62 @@ } }, "node_modules/@volar/language-core": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.28.tgz", - "integrity": "sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==", + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.30.tgz", + "integrity": "sha512-73fjwEV8wat6aOZ6U/y/hqtE30ocrIWECg67b0txGczOMNw+MffLmvJ5fnFfN9drVUEYZzLdaNo6VAy6G6avMw==", "dev": true, "license": "MIT", "dependencies": { - "@volar/source-map": "2.4.28" + "@volar/source-map": "2.4.30" + } + }, + "node_modules/@volar/language-service": { + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.30.tgz", + "integrity": "sha512-w/xDsASiqC71ggCOm7sTDXDNk/l72XEptodeRC68tgZ0e5QM4hM3zAqBGC7mBctvhrpYwKfMG+t9xcUo2hEFtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.30", + "vscode-languageserver-protocol": "^3.17.5", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "typescript": "<7" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@volar/source-map": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.28.tgz", - "integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==", + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.30.tgz", + "integrity": "sha512-zym1ob/KwDDyN+0jGVtxwbxJSRRnUvv5HspCtz3yEfVVdCG4/dzxJktMGPAgemqRuVs81O0o/y0q3qOUErR8kg==", "dev": true, "license": "MIT" }, "node_modules/@volar/typescript": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.28.tgz", - "integrity": "sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==", + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.30.tgz", + "integrity": "sha512-/DgA5tgYFPfrLFuSjIMXMGHk1LQv2+P8eny6+BhGNzFJELWIW7UZlc56ZLIRFhLsPpMfIFxM8/HvOPBggrjTZg==", "dev": true, "license": "MIT", "dependencies": { - "@volar/language-core": "2.4.28", + "@volar/language-core": "2.4.30", + "@volar/language-service": "2.4.30", "path-browserify": "^1.0.1", "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "typescript": "<7" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@webassemblyjs/ast": { @@ -3340,7 +3386,7 @@ "version": "8.19.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz", "integrity": "sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==", - "devOptional": true, + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -3741,9 +3787,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.11.28", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.28.tgz", - "integrity": "sha512-br0LOmjJqr6Rt4AEkadbcNf67Zpo7EPwKsWbjnRrJIa1QYFHQBqM4C7F2WTbV8ahTEcg1Eo+Y0aWjjORInYFyA==", + "version": "2.11.34", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.34.tgz", + "integrity": "sha512-Aqr8mA1kIvyJ3UY5YAY7ib8LSo1DmDMbMnVqGPtsKW1LxaFQFwn9Eb3yvq2fUKJsRvaXjnAV7R5osqETapzNiA==", "dev": true, "license": "Apache-2.0", "bin": { @@ -3767,9 +3813,9 @@ } }, "node_modules/browserslist": { - "version": "4.29.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.3.tgz", - "integrity": "sha512-1R4kiYKXGViqEN0CnoDrXc1StD9niAwu+j2dukWzrD4bJgsD4lDmEp0CRbc6E/vYJIfTHwPmwyaKtVSudICdPA==", + "version": "4.29.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.5.tgz", + "integrity": "sha512-khTmKu5NGYTotqcYo8Bew2k4RAE9PuXRSFRXG2lQBrCEQHyeQ/vX6gKMxfokwywBsLiXZMnHsmWMG1pnO8J7uQ==", "dev": true, "funding": [ { @@ -3787,11 +3833,11 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.11.26", - "caniuse-lite": "^1.0.30001813", - "electron-to-chromium": "^1.5.439", - "node-releases": "^2.0.57", - "update-browserslist-db": "^1.3.3" + "baseline-browser-mapping": "^2.11.33", + "caniuse-lite": "^1.0.30001819", + "electron-to-chromium": "^1.5.464", + "node-releases": "^2.0.60", + "update-browserslist-db": "^1.3.4" }, "bin": { "browserslist": "cli.js" @@ -3828,7 +3874,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "devOptional": true, + "dev": true, "license": "MIT", "peer": true }, @@ -3893,9 +3939,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001815", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001815.tgz", - "integrity": "sha512-uDybUEyfgbyJJ93J1vikTylBX31AkdVYeVPeffMQpf8XN7hSfr0oZOn4VFOIMNvtU5+rHvC5Udg2TgtJKHm23Q==", + "version": "1.0.30001820", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001820.tgz", + "integrity": "sha512-gfWD6MxqVCqAOwmODfZf7DchWvlrA+SRdNX7ceLfg3xRqe5ssjjpF7EgslC/0tiLiNTajdaNN/q8c/5u/7Gz8w==", "dev": true, "funding": [ { @@ -3998,7 +4044,7 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "devOptional": true, + "dev": true, "license": "MIT", "peer": true }, @@ -4017,9 +4063,9 @@ "license": "MIT" }, "node_modules/confbox": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.3.1.tgz", - "integrity": "sha512-cKUSoKa8YxFZZSmraVi7onONx3amu77ngK3kGpsYHDH7drPwCRkQE1RYMPlLRrMtnciRj274XNRxcHxnKmDSnA==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.3.2.tgz", + "integrity": "sha512-ZUAKhKlkCOrIGKc8cj7zek9s9z1mveHif/25nUshI2BzCRzF7KH7KHa+Lnh2ubq+e1tIlaFuP763mzW4qVoehg==", "dev": true, "license": "MIT" }, @@ -4031,13 +4077,13 @@ "license": "MIT" }, "node_modules/core-js-compat": { - "version": "3.50.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.50.0.tgz", - "integrity": "sha512-XGpFGbMLHwSt74YLTKho7Ib242qi6O8MSX+sRokV4oz7iKXvQWGYZthjIhjRGMxjzVkAubBO512dKGYcefmX3Q==", + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.51.0.tgz", + "integrity": "sha512-52r6fkXgxv4GLMjmFcMWRx7X9bw071xTTdrDcdyPGRqU2oE+9pCG0bAOMifSBdLw0JRBZKEF0q3B55qPlLuE8g==", "dev": true, "license": "MIT", "dependencies": { - "browserslist": "^4.28.7" + "browserslist": "^4.29.3" }, "engines": { "node": ">=6.4.0" @@ -4236,6 +4282,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "dev": true, "license": "Apache-2.0", "engines": { "node": ">=8" @@ -4284,9 +4331,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.452", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.452.tgz", - "integrity": "sha512-cVvk1YBSj6571VmV6hdJTqj94Y79xSu8cj6Y9t6ae4Y4431z8/7EJFvu3rVp90xhfuv9BpPKUmaLfTo4+FOGBg==", + "version": "1.5.472", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.472.tgz", + "integrity": "sha512-s4+nfT29b0FKpVKoaIxl2pWsoNcn7A/nMPSrxayw4T3BsmPeV2lF9Y06BsAQeMGhCTQ4nYJ5XST7jkqe4ZEqFw==", "dev": true, "license": "ISC" }, @@ -4957,9 +5004,9 @@ } }, "node_modules/exsolve": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.3.tgz", - "integrity": "sha512-kuzL9zherLQoqDeQaS55AiiIg1kb4KYXaSusTtgZTPlvKP2gGCI82LNmBNh5RjDVUXIcmgx+/Mx7vPwRzBbhJA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.2.0.tgz", + "integrity": "sha512-h1pQPR9XoeSMdntRNCjyTznaume4UpfXrULBnlkZ2CUM/G5eSa+pBByGldO5uR8dxbPC+OuJXsPPNf+JZ81ADg==", "dev": true, "license": "MIT" }, @@ -5006,6 +5053,7 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, "license": "MIT", "engines": { "node": ">=12.0.0" @@ -5107,6 +5155,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -6235,6 +6284,7 @@ "version": "1.33.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz", "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==", + "dev": true, "license": "MPL-2.0", "dependencies": { "detect-libc": "^2.0.3" @@ -6267,6 +6317,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6287,6 +6338,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6307,6 +6359,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6327,6 +6380,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6347,6 +6401,7 @@ "cpu": [ "arm" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6367,6 +6422,7 @@ "cpu": [ "arm64" ], + "dev": true, "libc": [ "glibc" ], @@ -6390,6 +6446,7 @@ "cpu": [ "arm64" ], + "dev": true, "libc": [ "musl" ], @@ -6413,6 +6470,7 @@ "cpu": [ "x64" ], + "dev": true, "libc": [ "glibc" ], @@ -6436,6 +6494,7 @@ "cpu": [ "x64" ], + "dev": true, "libc": [ "musl" ], @@ -6459,6 +6518,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6479,6 +6539,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MPL-2.0", "optional": true, "os": [ @@ -6696,14 +6757,13 @@ } }, "node_modules/minimizer-webpack-plugin": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.13.1.tgz", - "integrity": "sha512-1mhAfvachWYYOm8tpmany5NLuvP+F2wxZWBSX8DC0uFS2wJpM9q3rWgN9wBooAH9d5V12wX0BjyJe4fMjHMarQ==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.14.0.tgz", + "integrity": "sha512-PnvQXCJxhgH2ZVVO7Lj0sM6q8L1XGxnUvd8wVQIRwi8khMCLq5wg0Ngxe44bcuZL2FSN81RdVE7YHEVzTKsQDQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.31", "jest-worker": "^27.4.5", "schema-utils": "^4.6.0", "terser": "^5.51.0" @@ -6825,6 +6885,7 @@ "version": "3.3.20", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz", "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==", + "dev": true, "funding": [ { "type": "github", @@ -6922,9 +6983,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.58", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.58.tgz", - "integrity": "sha512-BdiKAgbfRlvfMq/XzO/AF9NPmaA8a+YpLAyAFTVFBj3gARrAIfWvNq7Q7NE4se3KgFu0KkrvQMxTS0XVnsGzHg==", + "version": "2.0.63", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.63.tgz", + "integrity": "sha512-6li2QanLsAXpIH2R6j77MzRyvOyrvdTqlKtO4CgBdHGNvN99ZZfyxszHc5o5+IZBWD5u6Hzwg83JoGXmqZNG9Q==", "dev": true, "license": "MIT", "engines": { @@ -7212,12 +7273,14 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, "license": "ISC" }, "node_modules/picomatch": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -7227,14 +7290,14 @@ } }, "node_modules/pkg-types": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.3.tgz", - "integrity": "sha512-j/lCFdcppV0JxWpCEITdbDltBxPP6cHT+yNJ6Go2OgoSA9518X847X9z0p6LtA4Nc16+eQzCZjRrWanTGvHJ5w==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.4.0.tgz", + "integrity": "sha512-07Fys7iVx0X6TcviMOgogM1Lk33ZyqOezMnU79S+kffWqwolG/5W9V8EgQSeYCIfFTYVgssRbnH630Oa2+soBA==", "dev": true, "license": "MIT", "dependencies": { "confbox": "^0.3.1", - "exsolve": "^1.1.1", + "exsolve": "^1.1.3", "pathe": "^2.0.3" } }, @@ -7249,9 +7312,10 @@ } }, "node_modules/postcss": { - "version": "8.5.29", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.29.tgz", - "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==", + "version": "8.5.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.32.tgz", + "integrity": "sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==", + "dev": true, "funding": [ { "type": "opencollective", @@ -7268,7 +7332,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.19", + "nanoid": "^3.3.20", "picocolors": "^1.1.1", "source-map-js": "^1.2.2" }, @@ -7572,12 +7636,13 @@ } }, "node_modules/rolldown": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.13.tgz", - "integrity": "sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==", + "version": "1.2.16", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.16.tgz", + "integrity": "sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==", + "dev": true, "license": "MIT", "dependencies": { - "@oxc-project/types": "=0.153.0", + "@oxc-project/types": "=0.156.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -7587,21 +7652,21 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@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" + "@rolldown/binding-android-arm-eabi": "1.2.16", + "@rolldown/binding-android-arm64": "1.2.16", + "@rolldown/binding-darwin-arm64": "1.2.16", + "@rolldown/binding-darwin-x64": "1.2.16", + "@rolldown/binding-freebsd-x64": "1.2.16", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.16", + "@rolldown/binding-linux-arm64-gnu": "1.2.16", + "@rolldown/binding-linux-arm64-musl": "1.2.16", + "@rolldown/binding-linux-ppc64-gnu": "1.2.16", + "@rolldown/binding-linux-s390x-gnu": "1.2.16", + "@rolldown/binding-linux-x64-gnu": "1.2.16", + "@rolldown/binding-linux-x64-musl": "1.2.16", + "@rolldown/binding-openharmony-arm64": "1.2.16", + "@rolldown/binding-win32-arm64-msvc": "1.2.16", + "@rolldown/binding-win32-x64-msvc": "1.2.16" } }, "node_modules/rrweb-cssom": { @@ -7707,9 +7772,9 @@ } }, "node_modules/schema-utils": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.8.1.tgz", - "integrity": "sha512-x39pYlJPyH7Uge5QO64B9XGP9zLDc9WNmiQZc+CE3IzZPvMu3lHOuAMGpYNoPixEL7MSWlGhYTg5UlLSL8G6iw==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.8.2.tgz", + "integrity": "sha512-iKlak3OFHF0dgD1nZRvgWQzG+P1TiEcMnLSBtIVBg937z5Jd6WE1c3SyZkXIyCfPHowL35yMsVvIjotm1c1qiw==", "dev": true, "license": "MIT", "peer": true, @@ -7960,9 +8025,9 @@ "license": "MIT" }, "node_modules/solidos-toolkit": { - "version": "1.0.0-dev.c11da40967c5d278451118142650415d688d8d4c", - "resolved": "https://registry.npmjs.org/solidos-toolkit/-/solidos-toolkit-1.0.0-dev.c11da40967c5d278451118142650415d688d8d4c.tgz", - "integrity": "sha512-i5FOuvpBBbXfYpRKBv4ygdccO5EUUpfo2rp1HoOspG+AOKMVeFqizuPokl+RZX6AVn3AulqRfnlo+NUEWkidEA==", + "version": "1.0.0-dev.2fb6be508170f3b28ca79d738aae71cd48f6d87e", + "resolved": "https://registry.npmjs.org/solidos-toolkit/-/solidos-toolkit-1.0.0-dev.2fb6be508170f3b28ca79d738aae71cd48f6d87e.tgz", + "integrity": "sha512-EQMddD3jV0YiPdPuEfBTRc1+QynYiIBwxMs8e3+F/gEP0lfIvSUjFSXCYsJxQxY8rqsEb4YXR4JW/5b1JRtdTQ==", "dev": true, "dependencies": { "@babel/core": "^7.29.0", @@ -7984,7 +8049,7 @@ "pane-registry": "^3.1.1 || ^3.1.2-0 || >=5.0.2-0 <6.0.0", "rdflib": "^2.3.6", "solid-logic": "^4.0.7 || ^4.0.8-0 || >=6.0.1-0 <7.0.0", - "solid-ui": "^3.1.2 || ^3.1.3-0 || >=5.0.1-0 <6.0.0", + "solid-ui": "^3.1.2 || ^3.1.3-0 || >=5.0.1-0 <6.0.0 || ^5.0.2-0", "vite": "^8.0.0", "vitest": "^4.0.0" }, @@ -8013,7 +8078,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "devOptional": true, + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -8023,6 +8088,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz", "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -8032,7 +8098,7 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "devOptional": true, + "dev": true, "license": "MIT", "peer": true, "dependencies": { @@ -8212,7 +8278,7 @@ "version": "5.51.2", "resolved": "https://registry.npmjs.org/terser/-/terser-5.51.2.tgz", "integrity": "sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "peer": true, "dependencies": { @@ -8249,6 +8315,7 @@ "version": "0.2.17", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -8375,9 +8442,9 @@ } }, "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.9.1.tgz", + "integrity": "sha512-a4Ux9VKuIMHsOS7ENbEq6hK2ZGYIT27Rtl0E4eD9KqwxhKiQeMZE/9xb3IdYwWaSOyIBQLExhQgXDTYoiCxnWA==", "dev": true, "license": "0BSD" }, @@ -8512,9 +8579,9 @@ } }, "node_modules/undici": { - "version": "6.29.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.29.0.tgz", - "integrity": "sha512-R+RODBqp6i2pPflGdq+xIOUkl+RNfGgHwoinecKu/JCuf2uO06cOKoDbI2P7Dn6KcswdKwrczbU6IYJ6K8X+wg==", + "version": "6.29.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.29.1.tgz", + "integrity": "sha512-EvRlUt/QqAEvXdQeRMYUfwOQsfzpDztykrG2owGEE/rBOBoYv9uF39ZzsNDh4lTFHhTr2XOZjKkYgueD12ZmGA==", "dev": true, "license": "MIT", "engines": { @@ -8742,15 +8809,16 @@ } }, "node_modules/vite": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.4.tgz", - "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==", + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz", + "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==", + "dev": true, "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.7", - "postcss": "^8.5.29", - "rolldown": "~1.2.12", + "postcss": "^8.5.30", + "rolldown": "~1.2.14", "tinyglobby": "^0.2.17" }, "bin": { @@ -8767,7 +8835,7 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", - "@vitejs/devtools": "^0.7.1", + "@vitejs/devtools": "^0.7.1 || ^0.8.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", @@ -8842,19 +8910,19 @@ } }, "node_modules/vitest": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.11.tgz", - "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==", + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.12.tgz", + "integrity": "sha512-5eWdz2yb3ajxWF3C8C4TjkXl7FGm3n2E/VlazALrQHzK7nYMSGFnCZto0bbPNl77AwkOZVLk0YnBAejUu0NiWA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.1.11", - "@vitest/mocker": "4.1.11", - "@vitest/pretty-format": "4.1.11", - "@vitest/runner": "4.1.11", - "@vitest/snapshot": "4.1.11", - "@vitest/spy": "4.1.11", - "@vitest/utils": "4.1.11", + "@vitest/expect": "4.1.12", + "@vitest/mocker": "4.1.12", + "@vitest/pretty-format": "4.1.12", + "@vitest/runner": "4.1.12", + "@vitest/snapshot": "4.1.12", + "@vitest/spy": "4.1.12", + "@vitest/utils": "4.1.12", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", @@ -8882,12 +8950,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.1.11", - "@vitest/browser-preview": "4.1.11", - "@vitest/browser-webdriverio": "4.1.11", - "@vitest/coverage-istanbul": "4.1.11", - "@vitest/coverage-v8": "4.1.11", - "@vitest/ui": "4.1.11", + "@vitest/browser-playwright": "4.1.12", + "@vitest/browser-preview": "4.1.12", + "@vitest/browser-webdriverio": "^4.1.11", + "@vitest/coverage-istanbul": "4.1.12", + "@vitest/coverage-v8": "4.1.12", + "@vitest/ui": "4.1.12", "happy-dom": "*", "jsdom": "*", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -8931,6 +8999,41 @@ } } }, + "node_modules/vscode-jsonrpc": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-10.0.0.tgz", + "integrity": "sha512-USSfxg0vDIpTQqlQBGxF3mBARyoS8cU7LHLpbYNh6dOJt32dlskxPWB0Irrh5TllTmyf7oNLAvqDqzklbwwnpA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.17.0" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.18.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.5.tgz", + "integrity": "sha512-FW4fBMzZ99N8xeob4py0l050wgCoRgTpEq5Xcsb9lM1bc29UKGR/wSV+4knaqFxssFHajy7OzNiKP/m3U1ZEuA==", + "dev": true, + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "10.0.0", + "vscode-languageserver-types": "3.18.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.16.tgz", + "integrity": "sha512-qeNEuOi9a3qkqRf7Gfez2WL2VwlBTLCNekHBGO9kxPVUp9XuY15yfTJ9jwvOwKI0I2MhUUfZq95NSp+LK1CLQg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.18.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.5.tgz", + "integrity": "sha512-kPd6+JQNz3HMJvjKlqUxERSlZHAntl/aGpsk7ImwIh0ewDKDcjgAEyVSYciPiOJD3ftbK9IrfiqUeTZLSbCizw==", + "dev": true, + "license": "MIT" + }, "node_modules/vscode-uri": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz", @@ -8976,9 +9079,9 @@ } }, "node_modules/webpack": { - "version": "5.112.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.112.0.tgz", - "integrity": "sha512-NIBpsRuCll036haDDt/CfcTDfsWNR9Z782nMRMI9D377BsGcYzZDTNU5TyzhCJzPIcihAxMBaMAhq2WSaDrH8Q==", + "version": "5.112.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.112.2.tgz", + "integrity": "sha512-B2tp1LI9D8GVpPDqprdt12ukTkXXahj9MzqSWJq4faSPgOUM7CdZaGAB6HrL/8E6UwbBpdj4vzWDbKoFnVoU6g==", "dev": true, "license": "MIT", "peer": true, @@ -8996,9 +9099,9 @@ "graceful-fs": "^4.2.11", "mime-db": "^1.54.0", "minimizer-webpack-plugin": "^5.13.0", - "schema-utils": "^4.5.0", + "schema-utils": "^4.8.1", "tapable": "^2.3.0", - "watchpack": "^2.6.1", + "watchpack": "^2.6.3", "webpack-sources": "^3.6.0" }, "bin": { @@ -9018,9 +9121,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.6.0.tgz", - "integrity": "sha512-EIMmPVvNI0CYXyRPp34F2Qk7W37/BZVZIofS6LAUnrNjCVahS+hO4mxwFJDjQjODTGZDtVzLYoN2+1dYkhk9qA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.7.0.tgz", + "integrity": "sha512-PdUhbCycwEgiS1hB/FBDksWKg/ashAIuJKqwdbPn8/dFVgU5LxQiBvG0js6VRRIzPujMrStYCczywp82P0KWng==", "dev": true, "license": "MIT", "peer": true, @@ -9217,9 +9320,9 @@ } }, "node_modules/ws": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.0.tgz", - "integrity": "sha512-Ydggc987+RO0AnWtZ/7Wq9FtNvcrL1b/RO0ud9mWjUPgDrsAAwQSF51sm2hm1XofbU/4jkpGEsLFsZZxU+1DOg==", + "version": "8.22.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.1.tgz", + "integrity": "sha512-oyL6OPYme/CmiFvNuGzeoxCJ4nOrZE2O1FwM9MWM1AsGri6nLXB2pg+lNA8aLeXMSav0J6eIVS1j6vUPzUtK9g==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index 9a1e3b77..188b0ee6 100644 --- a/package.json +++ b/package.json @@ -54,21 +54,20 @@ "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", "eslint-plugin-import": "^2.32.0", - "vitest": "^4.1.9", "jsdom": "^21.1.0", "rdflib": "^2.4.1", "ts-loader": "^9.6.1", "tslib": "^2.8.1", "typescript": "^5.9.3", "@vitest/coverage-v8": "^4.1.9", + "vite": "^8.0.16", + "vitest": "^4.1.9", "solidos-toolkit": "dev" }, "dependencies": { "@dokieli/web-access-control": "^1.1.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", - "solid-namespace": "^0.5.4", - "vite": "^8.0.16", - "vitest": "^4.1.9" + "solid-namespace": "^0.5.4" }, "solidosDependencies": [ "rdflib" From 86fc380fa22d058046da4ca150c73f357de243b4 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sat, 7 Nov 2026 14:32:46 +1100 Subject: [PATCH 26/32] fix recursive delete --- src/resource/resourceLogic.ts | 2 +- test/resourceLogic.test.ts | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index 5df5d0f7..c2e7bc0d 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -269,7 +269,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t } if (resourceParent) { - store.removeMatches(resourceParent, ns.ldp('contains'), resourceNode, resourceParent.doc()) + store.removeMatches(resourceParent, ns.ldp('contains'), resourceNode) } store.removeDocument(resourceNode) diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 1bc176ac..38d38e01 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -96,8 +96,8 @@ describe('resourceLogic', () => { expect(store.fetcher._fetch).toHaveBeenCalledWith(member.value, { method: 'DELETE' }) expect(store.fetcher._fetch).toHaveBeenCalledWith(container.value, { method: 'DELETE' }) expect(store.removeMatches).toHaveBeenCalledTimes(2) - expect(store.removeMatches).toHaveBeenNthCalledWith(1, container, sym('http://www.w3.org/ns/ldp#contains'), member, container.doc()) - expect(store.removeMatches).toHaveBeenNthCalledWith(2, sym('https://example.com/'), sym('http://www.w3.org/ns/ldp#contains'), container, sym('https://example.com/').doc()) + expect(store.removeMatches).toHaveBeenNthCalledWith(1, container, sym('http://www.w3.org/ns/ldp#contains'), member) + expect(store.removeMatches).toHaveBeenNthCalledWith(2, sym('https://example.com/'), sym('http://www.w3.org/ns/ldp#contains'), container) expect(store.removeDocument).toHaveBeenCalledWith(member) expect(store.removeDocument).toHaveBeenCalledWith(container) }) @@ -125,6 +125,21 @@ describe('resourceLogic', () => { expect(store.removeDocument).toHaveBeenCalledWith(resource) }) + it('surfaces document cleanup failures instead of reporting success', async () => { + const resourceLogic = createResourceLogic(store, aclLogic, containerLogic, typeIndexLogic) + const resource = sym('https://example.com/resource.ttl') + + containerLogic.isContainer.mockReturnValue(false) + store.removeDocument.mockImplementation(() => { + throw new Error( + 'Statement to be removed is not on store: "https://example.com/resource.ttl"' + ) + }) + + await expect(resourceLogic.recursiveDelete(resource)).rejects.toThrow('Statement to be removed is not on store:') + expect(store.fetcher.unload).not.toHaveBeenCalled() + }) + it('recognizes only profile-card.ttl WebIDs', () => { const resourceLogic = createResourceLogic(store, aclLogic, containerLogic, typeIndexLogic) From 049e4dc7d3ce90acb7aae4c66320823be336556d Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sat, 7 Nov 2026 06:46:46 +1100 Subject: [PATCH 27/32] Bring over upload from the widgets so it can be reused Prompt: move the uploadFiles from solid-ui widgets to resource logic, remove ui, add resilient file failure, return structured messages for results. Co-authored-by: GPT-5.6 Luna --- package-lock.json | 319 ++++++++++++++++++---------------- package.json | 3 +- src/index.ts | 3 +- src/resource/resourceLogic.ts | 82 ++++++++- src/types.ts | 20 +++ test/resourceLogic.test.ts | 83 ++++++++- 6 files changed, 353 insertions(+), 157 deletions(-) diff --git a/package-lock.json b/package-lock.json index 075703a3..bb50b1a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,17 @@ { "name": "solid-logic", - "version": "6.0.1-5", + "version": "6.0.1-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.1-5", + "version": "6.0.1-6", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.1.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", + "mime-types": "^3.0.2", "solid-namespace": "^0.5.4" }, "devDependencies": { @@ -79,21 +80,21 @@ } }, "node_modules/@babel/core": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", - "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.13.tgz", + "integrity": "sha512-j1nvOQCZYSgp7HLmisnCXFTpVvFODiijQ9QHkORfGKWH6YDtskTEeCJS7eV545GZ9UBzrq0e2xsOd5QQ5PjIqw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.7", - "@babel/helper-compilation-targets": "^7.29.7", - "@babel/helper-module-transforms": "^7.29.7", - "@babel/helpers": "^7.29.7", - "@babel/parser": "^7.29.7", + "@babel/generator": "^7.29.13", + "@babel/helper-compilation-targets": "^7.29.13", + "@babel/helper-module-transforms": "^7.29.13", + "@babel/helpers": "^7.29.13", + "@babel/parser": "^7.29.13", "@babel/template": "^7.29.7", - "@babel/traverse": "^7.29.7", - "@babel/types": "^7.29.7", + "@babel/traverse": "^7.29.13", + "@babel/types": "^7.29.11", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -110,9 +111,9 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -120,13 +121,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.12", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.12.tgz", - "integrity": "sha512-2W76mhjrpQFO1lK5e8IvGYB2D0YZ7S2R1Z2BjO2ZUYuW+amcpK/z60U6ZZmzskwoa7sJ6XohP/Wg8H5KxXI/IA==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.13.tgz", + "integrity": "sha512-T5FRo+RzVHvGjWOuF1Ljc44b+NXAOazodHkGUHp4I3zCkQ4/sNVJm56h1S278LMR0bY5xBhztGziSbli8zObIw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.12", + "@babel/parser": "^7.29.13", "@babel/types": "^7.29.11", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", @@ -150,9 +151,9 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", - "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.13.tgz", + "integrity": "sha512-8WxJ4/Vmes3ghacj8VOJy3NW8eyHiFY/4thU/LSBuBE470+igjR/j1ZTNn8fV5VdNrLx6iXUwig526UdOvfP0w==", "dev": true, "license": "MIT", "dependencies": { @@ -177,9 +178,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -194,9 +195,9 @@ "license": "ISC" }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.29.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.12.tgz", - "integrity": "sha512-ACxGoWMV866q/QlZHeCOaQZAR5QclKsIvkAmlDemqjm6+6Bynijs1mH068BzH2N2e+wSuDmBWY87fqKfvhi1Lw==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.13.tgz", + "integrity": "sha512-fo8/Fr44/DMV71FQjk/HA0Npmu3bo5DFoWTCW1dhUR8Vx3NFfAVeEy0TbcBpt4e+hd2QhdmWgmspHo/9iWj8RA==", "dev": true, "license": "MIT", "dependencies": { @@ -204,8 +205,8 @@ "@babel/helper-member-expression-to-functions": "^7.29.7", "@babel/helper-optimise-call-expression": "^7.29.7", "@babel/helper-replace-supers": "^7.29.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", - "@babel/traverse": "^7.29.12", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.13", + "@babel/traverse": "^7.29.13", "semver": "^6.3.1" }, "engines": { @@ -216,9 +217,9 @@ } }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -244,9 +245,9 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -271,14 +272,14 @@ } }, "node_modules/@babel/helper-define-polyfill-provider/node_modules/resolve": { - "version": "1.22.13", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.13.tgz", - "integrity": "sha512-Dj/cW9zBV2aRj6XzCxuGIs3ESZKv02jixne3q6jFZYZ3/Tg09gHHviSMDL4kObh9pqSahdRHEnDoaP2gn8YLhA==", + "version": "1.22.14", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.14.tgz", + "integrity": "sha512-1ZjYvR9sbkiwC5+9QHetqW5HmA2pHRMaoupD01t2HlYnV/vydC2zPwLixhsMieSWVZt0JJRg5LVIk0Ow1D/TrA==", "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "is-core-module": "^2.17.0", + "is-core-module": "^2.18.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -331,15 +332,15 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", - "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.13.tgz", + "integrity": "sha512-/U96wOz+SCoZ7Da/8kjDGltcNY280JPQcRNPK0Hk3PTbdpaiBDQImtC6JsbVwb1HGMr3usZQU2WsWVjhYNmRzw==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7", - "@babel/traverse": "^7.29.7" + "@babel/traverse": "^7.29.13" }, "engines": { "node": ">=6.9.0" @@ -408,23 +409,23 @@ } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.29.7.tgz", - "integrity": "sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.29.13.tgz", + "integrity": "sha512-Abm4rKIH0tmCayJLwcoeOkdzpYUphTbO52fHhyEBHn7S0R+ni4epNLI/8nq1L0DN2Bl0u5qmgWm2Og/z4fBb+Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.29.7", - "@babel/types": "^7.29.7" + "@babel/traverse": "^7.29.13", + "@babel/types": "^7.29.11" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.29.11", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.11.tgz", - "integrity": "sha512-snZbO7MEDOof+hvNa97EjEY7qD7h2kwvQr5AJC3ZhQudKW5dnej6k3kP9NQV88hJwaS8vDqRLFo9rivLEhle2g==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.13.tgz", + "integrity": "sha512-fWegr+WsEsiMVW4KUNdIIzzMTZSzNiqhy0//6+2MRi2d5NFNsL/AYwBQW8eBnRbTBVRnDVzjaJEUqKaCWjMMdQ==", "dev": true, "license": "MIT", "engines": { @@ -467,23 +468,23 @@ } }, "node_modules/@babel/helpers": { - "version": "7.29.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.10.tgz", - "integrity": "sha512-EMCx3AGZ3WfAl6ht7AyQoPm2Lh+BGYEMdc4Q6Hf7uSCDOZFuLq44qNwL+iaim8VlyYhRAo4X43+weadK8ZB4Yg==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.13.tgz", + "integrity": "sha512-laoRpD/kO/iA4CDlgJbixHekg7oPvWALK0PQyK3Ob2I2njZRvVAD77RfWCIImtqWCq6KijoBoZK7bp/HlTWASQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.29.7", - "@babel/types": "^7.29.8" + "@babel/types": "^7.29.11" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.29.12", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.12.tgz", - "integrity": "sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.13.tgz", + "integrity": "sha512-fJM50YYjlTiBhgdkGmC1tBpv+FMAyo4annf2X6Aks+0yRlaiVkYW/3f07xAfVVkYIoZ9fFZp+mEThUFnuybhkQ==", "dev": true, "license": "MIT", "dependencies": { @@ -546,14 +547,14 @@ } }, "node_modules/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.7.tgz", - "integrity": "sha512-oBNVCvnO5tND+xSopWvV8WNGfpTfgP4Zr/YXXSj8zfmcPktp5Ku/aZlsIowgSD4fjmgHn6sGmB9APVsU5zOdhA==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.13.tgz", + "integrity": "sha512-7RpEgFZq9xNRHsWwPLFQpjPOi0ZECE2QZWMBes+vgK7E02krjOfPiYtnHTIUF2nCDyeCJPvSAj0AP4NTVf4hsw==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.13" }, "engines": { "node": ">=6.9.0" @@ -794,9 +795,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.29.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.12.tgz", - "integrity": "sha512-nEreZBofjfd6FG621xe9Rk3+tMGBXf1nAuFrR6NUGF67fkQbSQf3NrbRuhgWRn+zb0qcy9XVok1GVFI/t9wWVQ==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.13.tgz", + "integrity": "sha512-q7f5zYLtDLqO11ydQK1w2RqZ1m5kmcAlmgZlfXssKgqVyL8+HgDvWXMxvuEz8TuJfq1UNsY9sB6ABjjtQkN6wA==", "dev": true, "license": "MIT", "dependencies": { @@ -882,14 +883,14 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.29.7.tgz", - "integrity": "sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.29.13.tgz", + "integrity": "sha512-X2meXB39NOPPmmshSRJzyd50hX9uCzbscNQwVCjLCtq363PZIJFFxJIeZPpgAewC570vpdeGIHTcltwd0QUlJg==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", - "@babel/traverse": "^7.29.7" + "@babel/traverse": "^7.29.13" }, "engines": { "node": ">=6.9.0" @@ -1014,14 +1015,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.7.tgz", - "integrity": "sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.13.tgz", + "integrity": "sha512-dFjiIw+xBYpgLhYDc1QFQOZmMX44se0YCmXUjPsm9SQEj9HaCJAjvVnK6/yK9iE4E1LaKU5fIAKVJPZWCbKwXw==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.13" }, "engines": { "node": ">=6.9.0" @@ -1455,9 +1456,9 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -1733,9 +1734,9 @@ } }, "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -1778,9 +1779,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.29.10", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.10.tgz", - "integrity": "sha512-NpugTzbKgGrNe45Ui32cN8vCFFMxVtP/9rtfwv0nP5FRDAjvYBxJcLVpYA9mr1jxP6cnIT7x9LUzuDTbWYYNRA==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.13.tgz", + "integrity": "sha512-v+oN26xP4YIlQsbQ/CbTH1WG5m/l/DjKKZNy/Kp3f/AFvbgt7Em/D0FeMM3O2hX0YzeN2M16W8lOpyhIkfCBcQ==", "dev": true, "license": "MIT", "engines": { @@ -1803,16 +1804,16 @@ } }, "node_modules/@babel/traverse": { - "version": "7.29.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.12.tgz", - "integrity": "sha512-MscXe/NAZcOkYEsRajHZFt3ynsb22PUi6CTrp5U7+RYycR9By84mn9mFN54YgfITiqK4hFx3Ju3tZSyzfpS5ew==", + "version": "7.29.13", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.13.tgz", + "integrity": "sha512-0ve0xMlFA73dgY1oyJRY6RoW+/bncdcOQqg6jjYcVfXBK90OdLXjm9R6lmRetdZVrPjXkKIoMVBqYFPjcAlZ4Q==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.12", + "@babel/generator": "^7.29.13", "@babel/helper-globals": "^7.29.7", - "@babel/parser": "^7.29.12", + "@babel/parser": "^7.29.13", "@babel/template": "^7.29.7", "@babel/types": "^7.29.11", "debug": "^4.3.1" @@ -3720,9 +3721,9 @@ } }, "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -3787,9 +3788,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.11.34", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.34.tgz", - "integrity": "sha512-Aqr8mA1kIvyJ3UY5YAY7ib8LSo1DmDMbMnVqGPtsKW1LxaFQFwn9Eb3yvq2fUKJsRvaXjnAV7R5osqETapzNiA==", + "version": "2.11.35", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.35.tgz", + "integrity": "sha512-GNk8KX52CHqeNKGk8+7tZnQab/2k1t/BgrUHPKNdijzpEhF1saPQZHVKb6m5loSAxB39gyrTYw34Qf9CQ3u1qQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -3939,9 +3940,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001820", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001820.tgz", - "integrity": "sha512-gfWD6MxqVCqAOwmODfZf7DchWvlrA+SRdNX7ceLfg3xRqe5ssjjpF7EgslC/0tiLiNTajdaNN/q8c/5u/7Gz8w==", + "version": "1.0.30001823", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001823.tgz", + "integrity": "sha512-TQ5s/djDjNk1axreUW+4rULH+BmdCMLiJkhaXnO5wqivG7tITkSUj4ItIdzqdZHKaXcHAV8dhH3JxOM7/7bwqw==", "dev": true, "funding": [ { @@ -4331,16 +4332,16 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.472", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.472.tgz", - "integrity": "sha512-s4+nfT29b0FKpVKoaIxl2pWsoNcn7A/nMPSrxayw4T3BsmPeV2lF9Y06BsAQeMGhCTQ4nYJ5XST7jkqe4ZEqFw==", + "version": "1.5.478", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.478.tgz", + "integrity": "sha512-pftG+ma5Lm8O6/p45bhYT6StBN5ziQymaRzmCZwFl8DwWHKPPD93FdOmP1aqftcepolQYvrcyTLa17kE8Yf+jg==", "dev": true, "license": "ISC" }, "node_modules/enhanced-resolve": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.26.0.tgz", - "integrity": "sha512-9vhedylFonb2YGogzUKX6+Ja72gOJbN1QHAqdrvqLwhdl/QWbKopzoUC9EbQNVsAns/bx/4uyqalrQAoy1IByw==", + "version": "5.26.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.26.1.tgz", + "integrity": "sha512-PPnnSJq3azKOIewXR/uppBV/6h98dprBJ/WaQ9Qgj10xX1lJLNfg+XShpbsrSqcDSy2yYYyhfXM1wWhftqgyzw==", "dev": true, "license": "MIT", "peer": true, @@ -4791,9 +4792,9 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -5151,6 +5152,29 @@ "node": ">= 6" } }, + "node_modules/form-data/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/form-data/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -5682,9 +5706,9 @@ } }, "node_modules/is-core-module": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.17.0.tgz", - "integrity": "sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.18.0.tgz", + "integrity": "sha512-qyax9fgaKOEC4qK8WZn7Q4IcoZC9RC1O1fFxRcRTq/oMMkWT/uXpqpXa12kzWR409zAt1drYN9N9BO26UmBCmw==", "dev": true, "license": "MIT", "dependencies": { @@ -6708,26 +6732,28 @@ "peer": true }, "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", "license": "MIT", "dependencies": { - "mime-db": "1.52.0" + "mime-db": "^1.54.0" }, "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/minimatch": { @@ -6927,9 +6953,9 @@ } }, "node_modules/node-exports-info/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.2.tgz", + "integrity": "sha512-GYrCADwpu6yV5OAvchkQ27Z5wwMxWAEMg5NNWjyHh/5DboFFqbdbvYNIvZouQpxXyeMPoTOh0vdPYKlf0ZswdQ==", "dev": true, "license": "ISC", "bin": { @@ -7546,16 +7572,16 @@ } }, "node_modules/regexpu-core": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.5.3.tgz", - "integrity": "sha512-E8VgUoSK+LMQrLboDxavm76MTBGrQhx9RiNuomRmYnZ10Uw12HrI8fkxOOncktb2hBpzIZ9SV/347euQHG5z+g==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.5.4.tgz", + "integrity": "sha512-VpdamrZ9bw4YmvMZfTA3Yg8IHU9Guvg21bonvgjC4l3KfBkOqCPJesHakz7cQeE4Vh4zz4r4Gy6igAcnJxZv9g==", "dev": true, "license": "MIT", "dependencies": { "regenerate": "^1.5.0", "regenerate-unicode-properties": "^10.3.0", "regjsgen": "^0.8.0", - "regjsparser": "^0.13.0", + "regjsparser": "^0.14.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.2.1" }, @@ -7571,9 +7597,9 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.4.tgz", - "integrity": "sha512-EWV80YgFaVgFrjGCAsV7oybp4GOxbls5RzBg8OB0nKEVXsBJR1JlV8Di1JhCROg3MzTfe1RI8yitIm1eOs68iA==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.14.1.tgz", + "integrity": "sha512-IeYboCLG1KBNRksrZQIZ1SV5KVWZiR0ikFokOcA0n63vLvlaFvCsfxN+fd4aXwL0KW3YD+ByRzIgo9ZAHdbldw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -7772,9 +7798,9 @@ } }, "node_modules/schema-utils": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.8.2.tgz", - "integrity": "sha512-iKlak3OFHF0dgD1nZRvgWQzG+P1TiEcMnLSBtIVBg937z5Jd6WE1c3SyZkXIyCfPHowL35yMsVvIjotm1c1qiw==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.8.3.tgz", + "integrity": "sha512-qIfo3f+lRNqnMPgpXSKvUhsT3pY5U+ppmgGr4j8LanFP3W/Ze+xj8DY/dPb5qVu3m6qFIMyMWKVRLNKxrNhxWg==", "dev": true, "license": "MIT", "peer": true, @@ -7795,7 +7821,7 @@ "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^5.112.0" + "webpack": "^5.0.0" }, "peerDependenciesMeta": { "webpack": { @@ -7844,9 +7870,9 @@ "peer": true }, "node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.6.tgz", + "integrity": "sha512-9lpSSU4Mly3mrtruwLs1eLK6+gzbzqeBFwRNjIjE+9LuDpWdYctrQlQ3ej1Ilgi7gknpsTRnPoLP8DpCHqHIJw==", "dev": true, "license": "ISC", "bin": { @@ -8809,16 +8835,16 @@ } }, "node_modules/vite": { - "version": "8.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz", - "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.6.tgz", + "integrity": "sha512-UI7dK29NnS54Fk+mmo7o+jI6U8Fp7hDl+X5Q1k45WH+d4dSlbLVUETGQ+hfkNgvLQGyoElPj837nZyv4MBc0VA==", "dev": true, "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.7", - "postcss": "^8.5.30", - "rolldown": "~1.2.14", + "postcss": "^8.5.32", + "rolldown": "~1.2.16", "tinyglobby": "^0.2.17" }, "bin": { @@ -9138,17 +9164,6 @@ "dev": true, "license": "MIT" }, - "node_modules/webpack/node_modules/mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/whatwg-encoding": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", diff --git a/package.json b/package.json index 188b0ee6..49bd6556 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.1-5", + "version": "6.0.1-6", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", @@ -67,6 +67,7 @@ "dependencies": { "@dokieli/web-access-control": "^1.1.0", "@uvdsl/solid-oidc-client-browser": "^0.2.3", + "mime-types": "^3.0.2", "solid-namespace": "^0.5.4" }, "solidosDependencies": [ diff --git a/src/index.ts b/src/index.ts index 1a25c758..df1e01fb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,8 @@ export { createTypeIndexLogic } from './typeIndex/typeIndexLogic' export { createDirectoryLogic, DEFAULT_DIRECTORY_CATALOG_URL, DEFAULT_DIRECTORY_SOURCES } from './directory/directoryLogic' export type { AccessControlSubjectKind, AccessControlSubject } from './acl/accessControlSubjects' export type { ACLContext, AccessMode, AccessSubject, Authorization, PatchPlan } from './types' -export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ResourceLogic, ResourceContent, ResourceMetadata, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' +export { ResourceUploadError } from './types' +export type { AppDetails, SolidNamespace, AuthenticationContext, SolidLogic, ResourceLogic, ResourceContent, ResourceMetadata, ResourceUploadResult, ChatLogic, DirectoryLogic, DirectoryEntry, DirectorySearchOptions, DirectoryRelationshipLabel, DirectorySource } from './types' export { UnauthorizedError, CrossOriginForbiddenError, SameOriginForbiddenError, NotFoundError, FetchError, NotEditableError, WebOperationError } from './logic/CustomError' export { diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index c2e7bc0d..c29475f2 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -3,10 +3,89 @@ import { ACL_LINK } from '../acl/aclLogic' import { ns } from '../util/ns' import { assertSuccessfulHttpResponse, isMissingError } from './resourceHttp' import { readWacAccessInfo } from './resourceMetadata' -import { type ResourceAccess, type ResourceAccessWithDelete, type ResourceContent, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type TypeIndexLogic } from '../types' +import { ResourceUploadError, type ResourceAccess, type ResourceAccessWithDelete, type ResourceContent, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type ResourceUploadResult, type TypeIndexLogic } from '../types' import type { AclLogic } from '../types' +import * as mime from 'mime-types' export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, typeIndexLogic: TypeIndexLogic): ResourceLogic { + function uploadFiles ( + files: File[], + fileBase: string, + imageBase: string + ): Promise { + const getUploadError = (destUri: string | undefined, error: unknown) => { + const uploadError = typeof error === 'object' && error !== null + ? error as { response?: { status?: unknown }, status?: unknown, message?: unknown } + : undefined + const responseStatus = uploadError?.response?.status + const directStatus = uploadError?.status + const status = typeof responseStatus === 'number' + ? responseStatus + : typeof directStatus === 'number' ? directStatus : undefined + const message = error instanceof Error + ? error.message + : typeof uploadError?.message === 'string' + ? uploadError.message + : typeof error === 'string' ? error : 'Upload failed' + return new ResourceUploadError(message, destUri, status) + } + + const upload = (file: File): Promise => new Promise(resolve => { + const reader = new FileReader() + reader.onload = event => { + try { + const data = event.target?.result + if (!(data instanceof ArrayBuffer)) { + resolve({ success: false, file, error: getUploadError(undefined, new Error('Unable to read file as an ArrayBuffer')) }) + return + } + + let suffix = '' + let contentType = file.type + if (!contentType) { + contentType = mime.lookup(file.name) || '' + if (!contentType) { + resolve({ success: false, file, error: getUploadError(undefined, new Error('Filename has no recognized content type')) }) + return + } + } else { + const extension = mime.extension(file.type) + if (extension && extension !== 'false' && !file.name.endsWith(`.${extension}`) && file.type !== mime.lookup(file.name)) { + suffix = `_.${extension}` + } + } + + const folderName = file.type.startsWith('image/') ? imageBase || fileBase : fileBase + const destUri = `${folderName}${folderName.endsWith('/') ? '' : '/'}${encodeURIComponent(file.name)}${suffix}` + + store.fetcher.webOperation('PUT', destUri, { data, contentType }).then( + () => resolve({ success: true, file, uploadedUri: destUri }), + error => resolve({ success: false, file, error: getUploadError(destUri, error) }) + ) + } catch (error) { + resolve({ success: false, file, error: getUploadError(undefined, error) }) + } + } + reader.onerror = () => { + resolve({ success: false, file, error: getUploadError(undefined, new Error('Unable to read file')) }) + } + reader.onabort = () => { + resolve({ success: false, file, error: getUploadError(undefined, new Error('File reading was aborted')) }) + } + try { + reader.readAsArrayBuffer(file) + } catch (error) { + resolve({ success: false, file, error: getUploadError(undefined, error) }) + } + }).catch(error => ({ + success: false as const, + file, + error: getUploadError(undefined, error) + })) + + return Promise.all(files.map(upload)) + } + function createContainer(url: string) { return containerLogic.createContainer(url) } @@ -282,6 +361,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t } return { + uploadFiles, recursiveDelete, deleteResourceAndTypeIndexIfExists, fetchMetadata, diff --git a/src/types.ts b/src/types.ts index 56c1cfe4..61c617a4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -154,12 +154,32 @@ export type ResourceMetadataWithDelete = ResourceMetadata & { access: ResourceAccessWithDelete } +export class ResourceUploadError extends Error { + constructor( + message: string, + public readonly destinationUri?: string, + public readonly status?: number + ) { + super(message) + this.name = 'ResourceUploadError' + } +} + +export type ResourceUploadResult = + | { success: true, file: File, uploadedUri: string } + | { success: false, file: File, error: ResourceUploadError } + export type ResourceContent = { content: string metadata: ResourceMetadata } export interface ResourceLogic { + uploadFiles: ( + files: File[], + fileBase: string, + imageBase: string + ) => Promise, recursiveDelete: (resource: NamedNode, options?: ResourceDeleteOptions) => Promise, deleteResourceAndTypeIndexIfExists: (resource: NamedNode, user?: NamedNode | null) => Promise, fetchMetadata: (subject: NamedNode) => Promise, diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 38d38e01..39df1b7b 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -6,8 +6,13 @@ import { type AclLogic, type TypeIndexLogic } from '../src/types' const makeStore = () => { const fetcher = { _fetch: vi.fn(), - unload: vi.fn() - } as unknown as Fetcher & { _fetch: ReturnType; unload: ReturnType } + unload: vi.fn(), + webOperation: vi.fn() + } as unknown as Fetcher & { + _fetch: ReturnType + unload: ReturnType + webOperation: ReturnType + } return { fetcher, @@ -80,6 +85,7 @@ describe('resourceLogic', () => { getScopedAppsFromIndex: vi.fn() } store.fetcher._fetch.mockResolvedValue(new Response('deleted', { status: 200 })) + store.fetcher.webOperation.mockResolvedValue(new Response(null, { status: 201 })) }) it('deletes container members before deleting the container itself', async () => { @@ -147,4 +153,77 @@ describe('resourceLogic', () => { expect(resourceLogic.isWebId(sym('https://alice.example.com/profile/card#me'))).toBe(false) expect(resourceLogic.isWebId(sym('https://alice.example.com/profile/card.jsonld#me'))).toBe(false) }) + + it('uploads image files to the image folder and adds the MIME extension when needed', async () => { + const resourceLogic = createResourceLogic(store, aclLogic, containerLogic, typeIndexLogic) + const file = new File(['image'], 'photo', { type: 'image/jpeg' }) + + const [result] = await resourceLogic.uploadFiles( + [file], + 'https://example.com/files/', + 'https://example.com/images/' + ) + + expect(result).toEqual({ + success: true, + file, + uploadedUri: 'https://example.com/images/photo_.jpg' + }) + expect(store.fetcher.webOperation).toHaveBeenCalledWith( + 'PUT', + 'https://example.com/images/photo_.jpg', + expect.objectContaining({ contentType: 'image/jpeg' }) + ) + }) + + it('returns structured per-file failures without preventing other uploads', async () => { + const resourceLogic = createResourceLogic(store, aclLogic, containerLogic, typeIndexLogic) + const quotaFile = new File(['large'], 'quota.txt', { type: 'text/plain' }) + const successfulFile = new File(['ok'], 'ok.txt', { type: 'text/plain' }) + const unknownErrorFile = new File(['bad'], 'unknown-error.txt', { type: 'text/plain' }) + const unknownTypeFile = new File(['data'], 'file.unknownextension123', { type: '' }) + store.fetcher.webOperation.mockImplementation((_method, uri) => { + if (uri.endsWith('/quota.txt')) { + return Promise.reject({ response: { status: 413 }, message: 'Payload too large' }) + } + if (uri.endsWith('/ok.txt')) { + return Promise.resolve(new Response(null, { status: 201 })) + } + if (uri.endsWith('/unknown-error.txt')) return Promise.reject(null) + return Promise.reject(null) + }) + + const results = await resourceLogic.uploadFiles( + [quotaFile, successfulFile, unknownErrorFile, unknownTypeFile], + 'https://example.com/files', + 'https://example.com/images' + ) + + expect(results[0]).toMatchObject({ + success: false, + file: quotaFile, + error: { + name: 'ResourceUploadError', + message: 'Payload too large', + destinationUri: 'https://example.com/files/quota.txt', + status: 413 + } + }) + expect(results[1]).toEqual({ + success: true, + file: successfulFile, + uploadedUri: 'https://example.com/files/ok.txt' + }) + expect(results[2]).toMatchObject({ + success: false, + file: unknownErrorFile, + error: { name: 'ResourceUploadError', message: 'Upload failed' } + }) + expect(results[3]).toMatchObject({ + success: false, + file: unknownTypeFile, + error: { name: 'ResourceUploadError', status: undefined } + }) + expect(store.fetcher.webOperation).toHaveBeenCalledTimes(3) + }) }) From 130612f55825af946c38f74a4fec797836b8234d Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sat, 7 Nov 2026 09:09:19 +1100 Subject: [PATCH 28/32] Fix variable name for folderName assignment Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/resource/resourceLogic.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index c29475f2..cfcf2929 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -55,7 +55,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t } } - const folderName = file.type.startsWith('image/') ? imageBase || fileBase : fileBase + const folderName = contentType.startsWith('image/') ? imageBase || fileBase : fileBase const destUri = `${folderName}${folderName.endsWith('/') ? '' : '/'}${encodeURIComponent(file.name)}${suffix}` store.fetcher.webOperation('PUT', destUri, { data, contentType }).then( From 706e0348ac5f6c65807824759af73c78450f1472 Mon Sep 17 00:00:00 2001 From: Sharon Stratsianis Date: Sat, 7 Nov 2026 09:09:46 +1100 Subject: [PATCH 29/32] Improve error handling for file upload response Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/resource/resourceLogic.ts | 10 +++++----- src/types.ts | 3 +-- test/resourceLogic.test.ts | 6 ++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index cfcf2929..9adfe7fc 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -10,8 +10,7 @@ import * as mime from 'mime-types' export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, typeIndexLogic: TypeIndexLogic): ResourceLogic { function uploadFiles ( files: File[], - fileBase: string, - imageBase: string + destination: string ): Promise { const getUploadError = (destUri: string | undefined, error: unknown) => { const uploadError = typeof error === 'object' && error !== null @@ -55,11 +54,12 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t } } - const folderName = contentType.startsWith('image/') ? imageBase || fileBase : fileBase - const destUri = `${folderName}${folderName.endsWith('/') ? '' : '/'}${encodeURIComponent(file.name)}${suffix}` + const destUri = `${destination}${destination.endsWith('/') ? '' : '/'}${encodeURIComponent(file.name)}${suffix}` store.fetcher.webOperation('PUT', destUri, { data, contentType }).then( - () => resolve({ success: true, file, uploadedUri: destUri }), + response => resolve(response.ok + ? { success: true, file, uploadedUri: destUri } + : { success: false, file, error: new ResourceUploadError(`HTTP error on PUT! Status: ${response.status}`, destUri, response.status) }), error => resolve({ success: false, file, error: getUploadError(destUri, error) }) ) } catch (error) { diff --git a/src/types.ts b/src/types.ts index 61c617a4..dcd38a95 100644 --- a/src/types.ts +++ b/src/types.ts @@ -177,8 +177,7 @@ export type ResourceContent = { export interface ResourceLogic { uploadFiles: ( files: File[], - fileBase: string, - imageBase: string + destination: string ) => Promise, recursiveDelete: (resource: NamedNode, options?: ResourceDeleteOptions) => Promise, deleteResourceAndTypeIndexIfExists: (resource: NamedNode, user?: NamedNode | null) => Promise, diff --git a/test/resourceLogic.test.ts b/test/resourceLogic.test.ts index 39df1b7b..ba9fba82 100644 --- a/test/resourceLogic.test.ts +++ b/test/resourceLogic.test.ts @@ -154,13 +154,12 @@ describe('resourceLogic', () => { expect(resourceLogic.isWebId(sym('https://alice.example.com/profile/card.jsonld#me'))).toBe(false) }) - it('uploads image files to the image folder and adds the MIME extension when needed', async () => { + it('uploads image files to the destination and adds the MIME extension when needed', async () => { const resourceLogic = createResourceLogic(store, aclLogic, containerLogic, typeIndexLogic) const file = new File(['image'], 'photo', { type: 'image/jpeg' }) const [result] = await resourceLogic.uploadFiles( [file], - 'https://example.com/files/', 'https://example.com/images/' ) @@ -195,8 +194,7 @@ describe('resourceLogic', () => { const results = await resourceLogic.uploadFiles( [quotaFile, successfulFile, unknownErrorFile, unknownTypeFile], - 'https://example.com/files', - 'https://example.com/images' + 'https://example.com/files' ) expect(results[0]).toMatchObject({ From 70e892e627094a8c2864aa08ddc20ae6b1a40e1a Mon Sep 17 00:00:00 2001 From: timea-solid <4144203+timea-solid@users.noreply.github.com> Date: Mon, 9 Nov 2026 10:50:28 +0100 Subject: [PATCH 30/32] log what we delete --- src/resource/resourceLogic.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/resource/resourceLogic.ts b/src/resource/resourceLogic.ts index 9adfe7fc..8b127f4f 100644 --- a/src/resource/resourceLogic.ts +++ b/src/resource/resourceLogic.ts @@ -6,6 +6,7 @@ import { readWacAccessInfo } from './resourceMetadata' import { ResourceUploadError, type ResourceAccess, type ResourceAccessWithDelete, type ResourceContent, type ResourceDeleteOptions, type ResourceLogic, type ResourceMetadata, type ResourceMetadataWithDelete, type ResourceUploadResult, type TypeIndexLogic } from '../types' import type { AclLogic } from '../types' import * as mime from 'mime-types' +import * as debug from '../util/debug' export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, typeIndexLogic: TypeIndexLogic): ResourceLogic { function uploadFiles ( @@ -353,6 +354,7 @@ export function createResourceLogic(store, aclLogic: AclLogic, containerLogic, t store.removeDocument(resourceNode) store.fetcher.unload(resourceNode.doc()) + debug.log(`Deleted resource: ${resourceNode.value}`) return deleted } From 5339fd91b72c860031f84d623c86fd71213eb58e Mon Sep 17 00:00:00 2001 From: bourgeoa Date: Mon, 16 Nov 2026 14:48:42 +0100 Subject: [PATCH 31/32] update dependencies --- package-lock.json | 311 +++++++++++++++++++++++++++++----------------- package.json | 16 +-- 2 files changed, 207 insertions(+), 120 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb50b1a4..0e12e190 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,19 +15,19 @@ "solid-namespace": "^0.5.4" }, "devDependencies": { - "@typescript-eslint/parser": "^8.61.1", - "@vitest/coverage-v8": "^4.1.9", - "eslint": "^9.39.4", + "@typescript-eslint/parser": "^8.72.2", + "@vitest/coverage-v8": "^4.1.12", + "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-import": "^2.32.0", - "jsdom": "^21.1.0", + "jsdom": "^21.1.2", "rdflib": "^2.4.1", "solidos-toolkit": "dev", - "ts-loader": "^9.6.1", - "tslib": "^2.8.1", + "ts-loader": "^9.6.2", + "tslib": "^2.9.1", "typescript": "^5.9.3", - "vite": "^8.0.16", - "vitest": "^4.1.9" + "vite": "^8.3.8", + "vitest": "^4.1.12" }, "engines": { "node": ">=18" @@ -1962,6 +1962,40 @@ "n3": "^2.2.0" } }, + "node_modules/@emnapi/core": { + "version": "2.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-2.0.0-beta.2.tgz", + "integrity": "sha512-MzCVoWtcg4Pm2B3je5mMvYMvj3MmBKw+fU7vbsJc9/iT8ip6/eYIHo/Dsm/mr+wsHB6SEyJDuxB09Yy6r/8+4A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "2.2.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "2.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-2.0.0-beta.2.tgz", + "integrity": "sha512-JcrSPzPvZuNZvJqPTF9Fw25LbOJ8avzFVlaf2grmH4Cku0oGP47tRgqPZadcfj3YoZMHkFVnCYFbQM8I+i5QEw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/wasi-threads": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-2.2.0.tgz", + "integrity": "sha512-JP7OYH38Q7+pyTAe14raZHLQIK7BDKbdwji+Xi3pcd/6QkJYQH3SX4wu6EplGrGJWRepoNzedfm0G3B9Z4e9Rw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", @@ -2358,6 +2392,28 @@ "@lit-labs/ssr-dom-shim": "^1.5.0" } }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.6.tgz", + "integrity": "sha512-mRyDmEw9/fCDXCGfL1sbgIw/GUK0PVxRW4YwgPN61F3LQ+fSyoBFarJVzgGyhF6kRzEQZ0FejDqm4WLXSeqQmw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tybys/wasm-util": "^0.10.3" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=23.5.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1 || 2.0.0-beta.2", + "@emnapi/runtime": "^1.7.1 || 2.0.0-beta.2" + } + }, "node_modules/@oxc-project/types": { "version": "0.156.0", "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.156.0.tgz", @@ -2387,9 +2443,9 @@ } }, "node_modules/@rolldown/binding-android-arm-eabi": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.16.tgz", - "integrity": "sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.19.tgz", + "integrity": "sha512-e+Ebe0WT+9tbXmNKPIiC8YrWAHYwug3m6i4p3rZGGulfZri1jtI4HslT+OZnFf/OIHowWF71DTlHwXBP2SiA7A==", "cpu": [ "arm" ], @@ -2404,9 +2460,9 @@ } }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.16.tgz", - "integrity": "sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.19.tgz", + "integrity": "sha512-hOombrTJ+szt2ciEzS7oCA78lMPBgF5UMQWCJIyNfnrI7GLl8HYoFqCnpL2gcPOaXMqryGCU5ExdQKyDDcC+yA==", "cpu": [ "arm64" ], @@ -2421,9 +2477,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.16.tgz", - "integrity": "sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.19.tgz", + "integrity": "sha512-XoMA2pwCKGTQzUjPgtRwkedH4WmXhdIPKT6l6oOxd1PUbNodGI6DcBekgN7EC//+x3pfBYX/qL1gNmZAqivw5g==", "cpu": [ "arm64" ], @@ -2438,9 +2494,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.16.tgz", - "integrity": "sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.19.tgz", + "integrity": "sha512-zo8EsSSwMZCY/e+fRnGaX02YGgvJD0yvhNi/9hpGPA2MJ9ZF8dPCw75UGfpI6OpQ/myR/dIYmogRvqiZD0TrXg==", "cpu": [ "x64" ], @@ -2455,9 +2511,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.16.tgz", - "integrity": "sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.19.tgz", + "integrity": "sha512-O8ISAOfI1nj7AuBPd30FSF47z7f7lzlk5poQVGgiikvQuGEBFYvW8ki+UEnT+YJPnNGjQzn304klt4O9FUE7mA==", "cpu": [ "x64" ], @@ -2472,9 +2528,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.16.tgz", - "integrity": "sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.19.tgz", + "integrity": "sha512-/lYCba5NO0yq4S0jGMH8QTBtkvQxoXjoQWzF5BcWp9MjB9jxVRD1GQDNofkVjcOj30DWyhLIN/4Oe60JKzaONw==", "cpu": [ "arm" ], @@ -2489,9 +2545,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.16.tgz", - "integrity": "sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.19.tgz", + "integrity": "sha512-pm/apFMBnSbFb3O6nG5pHO1iqHhZrjGDFEjSm+ot9J17XXPvH9L90y5h+jgfHCE+Qdlsvy8qKEcU4VKxgjD+vA==", "cpu": [ "arm64" ], @@ -2509,9 +2565,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.16.tgz", - "integrity": "sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.19.tgz", + "integrity": "sha512-K1SmQp3FFichn8oqrNIwvFoZ5wcvjC7goBzpaMNvLf9FZc+QB/QvLmnpJZgAAGHiD980tP8FZZnXk2K94rvlxg==", "cpu": [ "arm64" ], @@ -2529,9 +2585,9 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.16.tgz", - "integrity": "sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.19.tgz", + "integrity": "sha512-I0xwD57jP/3A7+5UPZin2w8Y7XHEmEM5zqpYZOcQ45MlNW6tUJUziymV3yRr7rL4vwyfEcRsRksC4a7Kc08p5Q==", "cpu": [ "ppc64" ], @@ -2549,9 +2605,9 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.16.tgz", - "integrity": "sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.19.tgz", + "integrity": "sha512-BrtEHT24SNXj9HiXqy+s/kXiSiQGt6EKCPUlRirAoIioVxKGnbXBUEkbZASAei7iZJB0/Ynm+0JP00Ipx7AnSw==", "cpu": [ "s390x" ], @@ -2569,9 +2625,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.16.tgz", - "integrity": "sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.19.tgz", + "integrity": "sha512-rm75/9DkHKeU2WnA8w4X94WGYgLlDCFCfkQC+4bguVJmC/jvDRv2B+2wLOYhyE0fVuv7//Ckk39OoOufyCu76Q==", "cpu": [ "x64" ], @@ -2589,9 +2645,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.16.tgz", - "integrity": "sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.19.tgz", + "integrity": "sha512-irh/4+iYFM4GAzpluDErgjz89bj6NDtqqMAG/6O1LG38Ed3NpyebzCpcVNkFW8uhy+/3/BocUvnXDR33CXWe9A==", "cpu": [ "x64" ], @@ -2609,9 +2665,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.16.tgz", - "integrity": "sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.19.tgz", + "integrity": "sha512-+KWTWNoPt+CfSq94CiceWu3yPE+QzkaG+phPyz9G60tmZLwfQkcA4AeksafzvJAw4pvg1mcd5a1TkUqVv0s4JA==", "cpu": [ "arm64" ], @@ -2625,10 +2681,29 @@ "node": "^20.19.0 || >=22.12.0" } }, + "node_modules/@rolldown/binding-wasm32-wasi": { + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.2.19.tgz", + "integrity": "sha512-7EH+skOsl5qpWnK0vzamgJFhOv1cwxQpsxm8tI883K9fur5c27p8q87fzEO6BbBPabA2/+s/zR63/pLc137iOg==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "2.0.0-beta.2", + "@emnapi/runtime": "2.0.0-beta.2", + "@napi-rs/wasm-runtime": "1.2.6" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=23.5.0" + } + }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.16.tgz", - "integrity": "sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.19.tgz", + "integrity": "sha512-3Q1Yg1Q7tEvBWoZf5rFvG/GKZQPgwfru+p4wBajDfJFBs0SHCpL++dfTjW9gyAKd1T7ZpIYvdaUax7Pa/IhFVQ==", "cpu": [ "arm64" ], @@ -2643,9 +2718,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.16.tgz", - "integrity": "sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.19.tgz", + "integrity": "sha512-y/sqRRc6d7hECzOFc5n3LSeqctmIp9mMjY1Kq4s14uLPd/LZ4z7i1zrW6fMtp2mPeuQIC4e6ULMcwQzMomqQag==", "cpu": [ "x64" ], @@ -2751,6 +2826,17 @@ "node": ">= 10" } }, + "node_modules/@tybys/wasm-util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz", + "integrity": "sha512-W3c4gRigFS0T/Ma4qIYF3GDAc5AQdHb1yL5znJT1Zv1YaD9Kitx656wBjvr19qbiosmZT8lWDM5BEMynUqX65A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@types/chai": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", @@ -2808,16 +2894,16 @@ "peer": true }, "node_modules/@typescript-eslint/parser": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.72.1.tgz", - "integrity": "sha512-ZGwZP4OCfyA0AQTpEAMWz+rtX01DRhQWW5hB0ucKDEIX5U7jdmPSaMx94rQfaPAQzIYz2BimOgKOJtjfpRFQ9g==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.72.2.tgz", + "integrity": "sha512-llP+T1YuJOLlxEciP6OyQGtz5SMxyn+9LA2BvZw5RmToGVa1y4beEDVQL6Gje7T5WFYh19WREjDCN9Ev4gm5AA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.72.1", - "@typescript-eslint/types": "8.72.1", - "@typescript-eslint/typescript-estree": "8.72.1", - "@typescript-eslint/visitor-keys": "8.72.1", + "@typescript-eslint/scope-manager": "8.72.2", + "@typescript-eslint/types": "8.72.2", + "@typescript-eslint/typescript-estree": "8.72.2", + "@typescript-eslint/visitor-keys": "8.72.2", "debug": "^4.4.3" }, "engines": { @@ -2833,14 +2919,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.72.1.tgz", - "integrity": "sha512-fAuVMkwdO/huI8nyo/WKnNKf6Gag93S56Rh3Ts5mGcavwSdaN8tRg1gCeIGX8PF+nzp1BjGfO4gHhGzW1J6jTg==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.72.2.tgz", + "integrity": "sha512-6y5dLTZdHhI8Eh3yIQ/bfQhRKwn5e+TpJj64o18Cngc0iW/BCrVvrr6zGYqXPnYH31u6YXAYiFh0+qxX5mybJw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.72.1", - "@typescript-eslint/types": "^8.72.1", + "@typescript-eslint/tsconfig-utils": "^8.72.2", + "@typescript-eslint/types": "^8.72.2", "debug": "^4.4.3" }, "engines": { @@ -2855,14 +2941,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.72.1.tgz", - "integrity": "sha512-lC/t6eMCZZQAAKZEYGL6RDVSuFehpdmMT6h+nJIjIa6oylN/PwDgDVtEIbB7O9xFfZYtZAYLoLlDNWKJhtF+uQ==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.72.2.tgz", + "integrity": "sha512-iIoMJ6/8c1/QpFNyFjU0d1YzPco4MsZjQw0k3V+vfzNWAFmUmvhlyMoYEoYYDQZXc+J6Gi1X5XcxlzW2taIIGQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.72.1", - "@typescript-eslint/visitor-keys": "8.72.1" + "@typescript-eslint/types": "8.72.2", + "@typescript-eslint/visitor-keys": "8.72.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2873,9 +2959,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.72.1.tgz", - "integrity": "sha512-e4D5R5vpeAEPBxT2BAzsFQL3sbwyeeeo5+aczgNSRK1V734jE7pTqaGFU+fXapWEQwnZbpFaTn32+Z8DwS6OTg==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.72.2.tgz", + "integrity": "sha512-+h3iCgZXuTNtoLXcnnjP12ZUHLMqoUcIHPfQrFEXTUqvb9dF8QK9b5nv5VtSo5fLkdHuks8ehbTzZj3rImAm9w==", "dev": true, "license": "MIT", "engines": { @@ -2890,9 +2976,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.72.1.tgz", - "integrity": "sha512-LmE5IhQet1BWOWEXqBrVtBPsMAOQ6Nzk35d+WLh3mk4EUF33sqlfxjio1MdYeSvKSG5skactKKuixBIKXhL4Rw==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.72.2.tgz", + "integrity": "sha512-Xfn37OLZx03+PCU7qWx9DTv2FCRh1E6fk2+wONeNY15HXIwtcwuveaSwVpGAUptkNmPQegRxW5JyRel9T7wrog==", "dev": true, "license": "MIT", "engines": { @@ -2904,16 +2990,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.72.1.tgz", - "integrity": "sha512-DAlUoUV93hIvrtIQLwCbmZQYVZwOMhiHJrOVUUIWicFZaIYjTRqlY3I/NZevfkLmSqkNHRu2qYDcq9lrn16oOQ==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.72.2.tgz", + "integrity": "sha512-pQEGqIK/cqEvKivVWaFLYpe7XYejFxfuAOi4mu1oAWFvIo36aRHI9esRFTUxcIy/z8N482RJyH+LpZB0ZIU7Ow==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.72.1", - "@typescript-eslint/tsconfig-utils": "8.72.1", - "@typescript-eslint/types": "8.72.1", - "@typescript-eslint/visitor-keys": "8.72.1", + "@typescript-eslint/project-service": "8.72.2", + "@typescript-eslint/tsconfig-utils": "8.72.2", + "@typescript-eslint/types": "8.72.2", + "@typescript-eslint/visitor-keys": "8.72.2", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -2932,13 +3018,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.72.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.72.1.tgz", - "integrity": "sha512-SB8xqipSzZHUePCCLNeYxqnxq83X61/qzNhjQGbTfjxGZIeOEP7tBgWYX05Tcd6CgE02WdTJnh5b8kMZJ/+bnQ==", + "version": "8.72.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.72.2.tgz", + "integrity": "sha512-NAGrjn0Pitjqzq/GkgMC4kBYm233PQ8GffyQ9+kTA3AlNQYEzOf25EIM02BAHZv5FRJSpHpJk+OGUxVkOB93GQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.72.1", + "@typescript-eslint/types": "8.72.2", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -3801,9 +3887,9 @@ } }, "node_modules/brace-expansion": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", - "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", + "version": "5.0.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.13.tgz", + "integrity": "sha512-Vh3dmFbc4wZeox7M9I/0L9GfFd83Su4+yCck/OF9Gi/P/dAHn0RT7X4K9R7gMNMhDck3DvhR6QXsnQdjjgwNvQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7662,9 +7748,9 @@ } }, "node_modules/rolldown": { - "version": "1.2.16", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.16.tgz", - "integrity": "sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==", + "version": "1.2.19", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.19.tgz", + "integrity": "sha512-QIiV1J9d0pzN4jeeTH4sjPy0AZ6cAy2cG0ExeoE1+U8Rvj+hR3gYkokx0YbeUNGlZqiQJJ2utcETe0oKXwzsuA==", "dev": true, "license": "MIT", "dependencies": { @@ -7678,21 +7764,22 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm-eabi": "1.2.16", - "@rolldown/binding-android-arm64": "1.2.16", - "@rolldown/binding-darwin-arm64": "1.2.16", - "@rolldown/binding-darwin-x64": "1.2.16", - "@rolldown/binding-freebsd-x64": "1.2.16", - "@rolldown/binding-linux-arm-gnueabihf": "1.2.16", - "@rolldown/binding-linux-arm64-gnu": "1.2.16", - "@rolldown/binding-linux-arm64-musl": "1.2.16", - "@rolldown/binding-linux-ppc64-gnu": "1.2.16", - "@rolldown/binding-linux-s390x-gnu": "1.2.16", - "@rolldown/binding-linux-x64-gnu": "1.2.16", - "@rolldown/binding-linux-x64-musl": "1.2.16", - "@rolldown/binding-openharmony-arm64": "1.2.16", - "@rolldown/binding-win32-arm64-msvc": "1.2.16", - "@rolldown/binding-win32-x64-msvc": "1.2.16" + "@rolldown/binding-android-arm-eabi": "1.2.19", + "@rolldown/binding-android-arm64": "1.2.19", + "@rolldown/binding-darwin-arm64": "1.2.19", + "@rolldown/binding-darwin-x64": "1.2.19", + "@rolldown/binding-freebsd-x64": "1.2.19", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.19", + "@rolldown/binding-linux-arm64-gnu": "1.2.19", + "@rolldown/binding-linux-arm64-musl": "1.2.19", + "@rolldown/binding-linux-ppc64-gnu": "1.2.19", + "@rolldown/binding-linux-s390x-gnu": "1.2.19", + "@rolldown/binding-linux-x64-gnu": "1.2.19", + "@rolldown/binding-linux-x64-musl": "1.2.19", + "@rolldown/binding-openharmony-arm64": "1.2.19", + "@rolldown/binding-wasm32-wasi": "1.2.19", + "@rolldown/binding-win32-arm64-msvc": "1.2.19", + "@rolldown/binding-win32-x64-msvc": "1.2.19" } }, "node_modules/rrweb-cssom": { @@ -8835,16 +8922,16 @@ } }, "node_modules/vite": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.6.tgz", - "integrity": "sha512-UI7dK29NnS54Fk+mmo7o+jI6U8Fp7hDl+X5Q1k45WH+d4dSlbLVUETGQ+hfkNgvLQGyoElPj837nZyv4MBc0VA==", + "version": "8.3.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.8.tgz", + "integrity": "sha512-LzOn3h9rG/0vhLdXrV4yJ4QFA9eEoqCl+Yx+kGJd7aB9w6nfNgVHKSYwLPZUHrz4ZGa+t+kXjV9itvcHDLQouA==", "dev": true, "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.7", "postcss": "^8.5.32", - "rolldown": "~1.2.16", + "rolldown": "~1.2.18", "tinyglobby": "^0.2.17" }, "bin": { diff --git a/package.json b/package.json index 49bd6556..5508ce9a 100644 --- a/package.json +++ b/package.json @@ -50,18 +50,18 @@ "node": ">=18" }, "devDependencies": { - "@typescript-eslint/parser": "^8.61.1", - "eslint": "^9.39.4", + "@typescript-eslint/parser": "^8.72.2", + "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-import": "^2.32.0", - "jsdom": "^21.1.0", + "jsdom": "^21.1.2", "rdflib": "^2.4.1", - "ts-loader": "^9.6.1", - "tslib": "^2.8.1", + "ts-loader": "^9.6.2", + "tslib": "^2.9.1", "typescript": "^5.9.3", - "@vitest/coverage-v8": "^4.1.9", - "vite": "^8.0.16", - "vitest": "^4.1.9", + "@vitest/coverage-v8": "^4.1.12", + "vite": "^8.3.8", + "vitest": "^4.1.12", "solidos-toolkit": "dev" }, "dependencies": { From 89793092ff4700af7d9b893eeaccb21e994154da Mon Sep 17 00:00:00 2001 From: bourgeoa Date: Mon, 16 Nov 2026 14:54:55 +0100 Subject: [PATCH 32/32] 6.1.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e12e190..651a2f6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solid-logic", - "version": "6.0.1-6", + "version": "6.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solid-logic", - "version": "6.0.1-6", + "version": "6.1.0", "license": "MIT", "dependencies": { "@dokieli/web-access-control": "^1.1.0", diff --git a/package.json b/package.json index 5508ce9a..ced17778 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solid-logic", - "version": "6.0.1-6", + "version": "6.1.0", "description": "Core business logic of SolidOS", "main": "dist/index.cjs.js", "module": "dist/index.esm.js",